Update app.py

app.py

@@ -1,8 +1,9 @@
 """
-app.py  -  Second Brain Gradio Application
+app.py  —  Second Brain Gradio Application
 """
 
 import os
+import json
 import gradio as gr
 from datetime import date, datetime
 
@@ -23,7 +24,6 @@ from core.styles import CSS
 init_db()
 init_groq()
 
-# Deadline added to headers
 TASK_HEADERS = ["ID", "Done", "Title", "Area", "Urgency", "Importance", "Mind", "Min", "Deadline", "Scheduled"]
 _whisper_model = None
 
@@ -44,18 +44,13 @@ def _fmt_tasks(tasks):
     for t in tasks:
         deadline = t.get("deadline_date") or ""
         if deadline:
-            # Highlight imminent deadlines
             try:
                 dl = date.fromisoformat(deadline)
                 days_left = (dl - date.today()).days
-                if days_left < 0:
-                    deadline = f"\u274c {deadline}"
-                elif days_left == 0:
-                    deadline = f"\U0001f6a8 TODAY"
-                elif days_left == 1:
-                    deadline = f"\u26a0\ufe0f tmrw"
-                elif days_left <= 3:
-                    deadline = f"\u23f0 {deadline}"
+                if days_left < 0:   deadline = f"\u274c {deadline}"
+                elif days_left == 0: deadline = "\U0001f6a8 TODAY"
+                elif days_left == 1: deadline = "\u26a0\ufe0f tmrw"
+                elif days_left <= 3: deadline = f"\u23f0 {deadline}"
             except ValueError:
                 pass
         rows.append([
@@ -91,8 +86,7 @@ def _transcribe(audio_path):
     return " ".join(seg.text for seg in segments).strip()
 
 def _build_clar_html(clarifications):
-    if not clarifications:
-        return ""
+    if not clarifications: return ""
     items = "".join(f"<li style='margin:4px 0'>{q}</li>" for q in clarifications)
     return (
         f'<div style="margin:10px 0;padding:12px;background:#0c0f1a;'
@@ -113,14 +107,12 @@ def _run_parse(task_text, user_id):
         area_choices = [area_val] + area_choices
     return result, _build_clar_html(clars), bool(clars), area_val, clars
 
-# Parse result -> UI outputs
-# Outputs: parsed_panel, f_title, clar_html, f_area, f_urgency, f_importance,
-#          f_state, f_time, f_deadline, f_is_habit, f_interval, parse_status,
-#          clar_reply_row, clar_questions_state, original_task_state
-# (15 values — date field removed, deadline added)
 def _parse_result_to_outputs(result, clar_html, has_clar, area_val, clars, task_text, status=""):
     if not status:
         status = _ok("AI classified your task \u2014 answer the questions above." if has_clar else "AI classified your task \u2713")
+    # Extract deadline from AI result
+    deadline = result.get("deadline_date") or ""
+    if deadline and deadline.lower() in ("null","none","n/a",""): deadline = ""
     return (
         gr.update(visible=True),
         result.get("title", task_text),
@@ -129,7 +121,7 @@ def _parse_result_to_outputs(result, clar_html, has_clar, area_val, clars, task_
         result.get("importance", "Important"),
         result.get("state_of_mind", "Easy"),
         int(result.get("time_estimate") or 30),
-        "",          # deadline_date — left empty for user to fill if needed
+        deadline,
         False, "Daily",
         status,
         gr.update(visible=has_clar),
@@ -159,8 +151,7 @@ def handle_register(username, password, wake, sleep, focus, goals_text):
     if not uid:
         return None, "", _err(msg), gr.update(visible=True), gr.update(visible=False)
     create_default_life_areas(uid)
-    if goals_text.strip():
-        save_goals(uid, goals_text)
+    if goals_text.strip(): save_goals(uid, goals_text)
     ctx = create_blank_context(uid, {"wake_time": wake or "07:30", "sleep_time": sleep or "23:00", "focus_peak": focus or "Morning"})
     save_user_context(uid, ctx)
     spawn_due_habits(uid)
@@ -171,7 +162,7 @@ def handle_logout(user_id):
 
 
 # =============================================================================
-# TODAY TAB
+# TODAY / ALL TASKS
 # =============================================================================
 
 def refresh_today(user_id):
@@ -183,9 +174,7 @@ def refresh_today(user_id):
     return _fmt_tasks(tasks), _stat(s["total"],"Today","#a78bfa"), _stat(s["done"],"Done","#4ade80"), _stat(s["remaining"],"Left",c)
 
 def refresh_all_tasks_auto(user_id):
-    """Refresh the All Tasks tab with all tasks regardless of date."""
-    if not user_id:
-        return []
+    if not user_id: return []
     return _fmt_tasks(get_tasks(user_id))
 
 def show_text_panel():  return gr.update(visible=True),  gr.update(visible=False), gr.update(visible=False)
@@ -193,11 +182,11 @@ def show_voice_panel(): return gr.update(visible=False), gr.update(visible=True)
 def show_plan_panel():  return gr.update(visible=False), gr.update(visible=False), gr.update(visible=True)
 def hide_panels():      return gr.update(visible=False), gr.update(visible=False), gr.update(visible=False)
 
+
 # ── Text parse ─────────────────────────────────────────────────────────────────
 
 def handle_parse_text(task_text, user_id):
-    if not task_text.strip():
-        return _EMPTY_PARSE
+    if not task_text.strip(): return _EMPTY_PARSE
     return _parse_result_to_outputs(*_run_parse(task_text, user_id), task_text)
 
 def handle_clarification_reply(user_reply, original_task, clarifications, user_id):
@@ -208,12 +197,13 @@ def handle_clarification_reply(user_reply, original_task, clarifications, user_i
     result, clar_html_val, still_has, area_val, remaining = _run_parse(enriched, user_id)
     if not still_has:
         clar_html_val = '<span style="color:#4ade80;font-size:13px">\u2713 Classification updated!</span>'
+    deadline = result.get("deadline_date") or ""
+    if deadline and deadline.lower() in ("null","none","n/a",""): deadline = ""
     return (
         result.get("title", original_task), clar_html_val, area_val,
         result.get("urgency","Not Urgent"), result.get("importance","Important"),
         result.get("state_of_mind","Easy"), int(result.get("time_estimate") or 30),
-        "",  # deadline stays empty
-        gr.update(visible=still_has), remaining,
+        deadline, gr.update(visible=still_has), remaining,
     )
 
 def handle_clar_voice(audio_path, original_task, clarifications, user_id):
@@ -225,8 +215,6 @@ def handle_clar_voice(audio_path, original_task, clarifications, user_id):
     except Exception:
         return (gr.update(),)*8 + (gr.update(visible=True), clarifications)
 
-# ── Voice parse ────────────────────────────────────────────────────────────────
-
 def handle_voice_parse(audio_path, user_id):
     if audio_path is None:
         return _EMPTY_PARSE[:11] + (_err("No audio recorded."),) + _EMPTY_PARSE[12:]
@@ -241,8 +229,6 @@ def handle_voice_parse(audio_path, user_id):
     status  = _ok(f'Heard: "{preview}" \u2014 classified \u2713' + (" Please answer questions." if has_clar else ""))
     return _parse_result_to_outputs(result, clar_html, has_clar, area_val, clars, text, status)
 
-# ── Confirm task — saves WITHOUT a scheduled date ──────────────────────────────
-
 def handle_confirm_task(user_id, title, area, urgency, importance, state,
                         time_est, deadline, is_habit, habit_interval):
     if not user_id:
@@ -254,146 +240,166 @@ def handle_confirm_task(user_id, title, area, urgency, importance, state,
         "state_of_mind": state, "time_estimate": int(time_est or 30),
         "deadline_date": deadline.strip() if deadline else "",
         "is_habit": is_habit, "habit_interval": habit_interval if is_habit else "",
-    }, scheduled_date="")  # <- no date assigned; scheduler does this
+    }, scheduled_date="")
     rows, s1, s2, s3 = refresh_today(user_id)
     all_rows = refresh_all_tasks_auto(user_id)
     return _ok("Task saved! Use \u2018Plan My Tasks\u2019 to schedule it."), rows, s1, s2, s3, all_rows, gr.update(visible=False)
 
+# ── Quick toggle/delete from table (uses selected row ID) ─────────────────────
+
+def handle_action_today(evt: gr.SelectData, tasks_data, user_id, action):
+    """Called when a row is clicked in today_df then action button pressed."""
+    if not user_id or tasks_data is None or len(tasks_data) == 0: return refresh_today(user_id) + (_ok(""),)
+    # evt.index is [row, col]; grab the ID from col 0
+    try:
+        row_idx = evt.index[0] if hasattr(evt, 'index') else 0
+        task_id = int(tasks_data[row_idx][0])
+    except Exception:
+        return refresh_today(user_id) + (_ok("Select a row first"),)
+    if action == "done": toggle_task_complete(task_id, user_id)
+    else: delete_task(task_id, user_id)
+    rows, s1, s2, s3 = refresh_today(user_id)
+    return rows, s1, s2, s3, _ok("Done" if action=="done" else "Deleted")
+
+def handle_toggle_today_id(task_id, user_id):
+    if task_id and user_id: toggle_task_complete(int(task_id), user_id)
+    rows, s1, s2, s3 = refresh_today(user_id)
+    return rows, s1, s2, s3, _ok("Updated")
+
+def handle_delete_today_id(task_id, user_id):
+    if task_id and user_id: delete_task(int(task_id), user_id)
+    rows, s1, s2, s3 = refresh_today(user_id)
+    return rows, s1, s2, s3, _ok("Deleted")
+
+def handle_toggle_all_id(task_id, user_id):
+    if task_id and user_id: toggle_task_complete(int(task_id), user_id)
+    return _fmt_tasks(get_tasks(user_id)), _ok("Updated")
+
+def handle_delete_all_id(task_id, user_id):
+    if task_id and user_id: delete_task(int(task_id), user_id)
+    return _fmt_tasks(get_tasks(user_id)), _ok("Deleted")
+
 
 # =============================================================================
-# SMART TASK SCHEDULER (Plan My Tasks)
+# SMART TASK SCHEDULER — with confirm flow
 # =============================================================================
 
 def handle_smart_schedule(user_id, prompt):
-    """
-    RAG-style scheduler: reads all unscheduled tasks + user context/goals/patterns,
-    then assigns each task to the best future date based on the user's request.
-    Updates the DB and shows results. Never touches past dates.
-    """
+    """Step 1: Generate proposals and show them for user review. Don't apply yet."""
     if not user_id:
-        return _err("Not logged in."), ""
+        return _err("Not logged in."), "", gr.update(visible=False), gr.update(visible=False), []
 
-    # Get ALL unscheduled tasks (across all dates)
     unscheduled = get_tasks(user_id, only_unscheduled=True, include_completed=False)
     if not unscheduled:
-        # Also check if user wants to reschedule today or future tasks
         all_tasks = get_tasks(user_id, include_completed=False)
         if not all_tasks:
-            return _err("You have no tasks yet. Add some tasks first."), ""
-        # If everything is already scheduled, offer to reschedule
+            return _err("No tasks yet. Add some tasks first."), "", gr.update(visible=False), gr.update(visible=False), []
         unscheduled = all_tasks
-        prompt = prompt + " (Note: all tasks already have dates; feel free to reassign them)"
+        prompt = (prompt or "") + " (All tasks already have dates; feel free to reassign.)"
 
     ctx   = _ensure_context(user_id)
     goals = get_goals(user_id)
     now   = datetime.now()
 
     result = smart_schedule_tasks(
-        tasks            = unscheduled,
-        user_context     = ctx,
-        user_goals       = goals,
-        scheduling_prompt= prompt or "Schedule my tasks intelligently across the next week.",
-        current_dt       = now,
+        tasks=unscheduled, user_context=ctx, user_goals=goals,
+        scheduling_prompt=prompt or "Schedule my tasks intelligently across the next week.",
+        current_dt=now,
     )
 
-    # Apply assignments to DB
-    assigned_count = 0
-    for a in result.get("assignments", []):
-        try:
-            task_id = int(a["task_id"])
-            assigned_date = a["assigned_date"]
-            assign_task_date(task_id, user_id, assigned_date)
-            assigned_count += 1
-        except (ValueError, KeyError, TypeError):
-            pass
-
-    # Build result HTML
-    COLOR = {"Flow": "#0ea5e9", "Easy": "#4ade80", "Quick": "#a78bfa", "Personal": "#f87171",
-             "Urgent": "#f87171", "Not Urgent": "#4ade80", "Habit": "#a78bfa"}
+    # Build PREVIEW html — do NOT apply to DB yet
+    COLOR = {"Flow":"#0ea5e9","Easy":"#4ade80","Quick":"#a78bfa","Personal":"#f87171"}
+    task_lookup = {t["id"]: t for t in unscheduled}
+    assignments = result.get("assignments", [])
 
-    # Summary header
     html = (
-        f'<div style="margin-bottom:14px;padding:12px;background:#0c0f1a;border-radius:10px;">'
+        f'<div style="padding:12px;background:#0c0f1a;border-radius:10px;margin-bottom:12px">'
         f'<div style="color:#a78bfa;font-size:12px;font-weight:600;margin-bottom:6px">'
-        f'\U0001f9e0 AI Scheduling Complete \u2014 {assigned_count} task(s) assigned</div>'
-        f'<p style="color:#94a3b8;font-size:13px;margin:0">{result.get("summary", "")}</p>'
+        f'\U0001f9e0 AI Proposal \u2014 {len(assignments)} task(s) scheduled</div>'
+        f'<p style="color:#94a3b8;font-size:13px;margin:0 0 8px">{result.get("summary","")}</p>'
+        f'<p style="color:#f59e0b;font-size:12px;margin:0">\u26a0 Review below, then <b>Confirm & Apply</b> or refine with a follow-up prompt.</p>'
         f'</div>'
     )
 
-    # Assignments grouped by date
     by_date = {}
-    assignments = result.get("assignments", [])
-    # Build a quick lookup from task_id to task data
-    task_lookup = {t["id"]: t for t in unscheduled}
-
     for a in assignments:
-        d = a.get("assigned_date", "?")
-        by_date.setdefault(d, []).append(a)
+        by_date.setdefault(a.get("assigned_date","?"), []).append(a)
 
     for d in sorted(by_date.keys()):
         try:
             dl = date.fromisoformat(d)
-            days_from_now = (dl - date.today()).days
-            if days_from_now == 0:  label = f"{d} (Today)"
-            elif days_from_now == 1: label = f"{d} (Tomorrow)"
-            else:                   label = f"{d} ({dl.strftime('%A')})"
+            dfn = (dl - date.today()).days
+            if dfn == 0:   lbl = f"{d} (Today)"
+            elif dfn == 1: lbl = f"{d} (Tomorrow)"
+            else:          lbl = f"{d} ({dl.strftime('%A')})"
         except ValueError:
-            label = d
-
-        html += f'<div style="margin:10px 0 4px;color:#60a5fa;font-size:11px;font-weight:600;text-transform:uppercase;letter-spacing:.6px">\U0001f4c5 {label}</div>'
+            lbl = d
+        html += f'<div style="margin:10px 0 4px;color:#60a5fa;font-size:11px;font-weight:600;text-transform:uppercase">\U0001f4c5 {lbl}</div>'
         for a in by_date[d]:
-            tid   = a.get("task_id")
-            task  = task_lookup.get(int(tid) if tid else -1, {})
-            sm    = task.get("state_of_mind","Easy")
-            c     = COLOR.get(sm, "#6366f1")
-            deadline_str = ""
+            tid  = a.get("task_id")
+            task = task_lookup.get(int(tid) if tid else -1, {})
+            sm   = task.get("state_of_mind","Easy")
+            c    = COLOR.get(sm,"#6366f1")
+            st   = a.get("start_time","")
+            et   = a.get("end_time","")
+            time_block = f'<span style="color:#60a5fa;font-size:11px;font-weight:600">{st}\u2013{et}</span> &nbsp;' if st and et else ""
+            dl_str = ""
             if task.get("deadline_date"):
-                deadline_str = f' | \u23f3 deadline {task["deadline_date"]}'
+                dl_str = f' &nbsp;|\u23f3 due {task["deadline_date"]}'
             html += (
                 f'<div class="sched-card" style="border-left-color:{c};margin-bottom:6px">'
-                f'<div class="sched-title">{a.get("title","")}</div>'
-                f'<div class="sched-meta">{task.get("life_area") or "—"} · {sm} · {task.get("time_estimate") or "?"}min{deadline_str}</div>'
+                f'<div style="display:flex;justify-content:space-between;align-items:baseline">'
+                f'<div class="sched-title">{a.get("title","")}</div>{time_block}</div>'
+                f'<div class="sched-meta">{task.get("life_area") or "—"} · {sm} · {task.get("time_estimate") or "?"}min{dl_str}</div>'
                 f'<div class="sched-why">\U0001f4a1 {a.get("reasoning","")}</div>'
                 f'</div>'
             )
 
-    # Skipped tasks
-    skipped = result.get("skipped", [])
+    skipped = result.get("skipped",[])
     if skipped:
-        html += '<div style="margin-top:12px;color:#334155;font-size:11px;font-weight:600;text-transform:uppercase">Not scheduled</div>'
+        html += '<div style="margin-top:12px;color:#475569;font-size:11px;font-weight:600;text-transform:uppercase">Not scheduled</div>'
         for s in skipped:
-            html += f'<div style="color:#475569;font-size:12px;padding:3px 0">\u2717 {s.get("title","")} \u2014 {s.get("reason","")}</div>'
-
-    # All Tasks board (update after scheduling)
-    all_rows = refresh_all_tasks_auto(user_id)
-    return html, all_rows
-
-def handle_toggle_today(task_id, user_id):
-    if task_id and user_id: toggle_task_complete(int(task_id), user_id)
-    rows, s1, s2, s3 = refresh_today(user_id)
-    return rows, s1, s2, s3, _ok("Updated")
-
-def handle_delete_today(task_id, user_id):
-    if task_id and user_id: delete_task(int(task_id), user_id)
-    rows, s1, s2, s3 = refresh_today(user_id)
-    return rows, s1, s2, s3, _ok("Deleted")
+            html += f'<div style="color:#475569;font-size:12px;padding:2px 0">\u2717 {s.get("title","")} \u2014 {s.get("reason","")}</div>'
 
+    for w in result.get("warnings",[]):
+        html += f'<div style="color:#f59e0b;font-size:12px;margin-top:6px">\u26a0 {w}</div>'
 
-# =============================================================================
-# ALL TASKS TAB
-# =============================================================================
+    # Store result in JSON for confirm step
+    pending_json = json.dumps(result)
+    return html, pending_json, gr.update(visible=True), gr.update(visible=True), []
 
-def refresh_all_tasks(user_id, filter_area="All", only_today=False):
-    if not user_id: return []
-    return _fmt_tasks(get_tasks(user_id, filter_area=filter_area, only_today=only_today))
+def handle_confirm_schedule(user_id, pending_json, all_df_placeholder):
+    """Step 2: User clicked Confirm — apply assignments to DB."""
+    if not user_id or not pending_json:
+        return _err("Nothing to confirm."), [], gr.update(visible=False), gr.update(visible=False)
+    try:
+        result = json.loads(pending_json)
+    except Exception:
+        return _err("Could not parse proposal."), [], gr.update(visible=False), gr.update(visible=False)
 
-def handle_toggle_all(task_id, user_id, filter_area, only_today):
-    if task_id and user_id: toggle_task_complete(int(task_id), user_id)
-    return refresh_all_tasks(user_id, filter_area, only_today), _ok("Updated")
+    count = 0
+    for a in result.get("assignments",[]):
+        try:
+            assign_task_date(int(a["task_id"]), user_id, a["assigned_date"])
+            count += 1
+        except Exception:
+            pass
 
-def handle_delete_all(task_id, user_id, filter_area, only_today):
-    if task_id and user_id: delete_task(int(task_id), user_id)
-    return refresh_all_tasks(user_id, filter_area, only_today), _ok("Deleted")
+    all_rows = refresh_all_tasks_auto(user_id)
+    return _ok(f"\u2713 {count} tasks scheduled!"), all_rows, gr.update(visible=False), gr.update(visible=False)
+
+def handle_refine_schedule(user_id, new_prompt, pending_json):
+    """Step 2 alt: User typed a refinement — re-run scheduler with the old result as context."""
+    if not user_id or not new_prompt.strip():
+        return gr.update(), gr.update(), gr.update(), gr.update(), gr.update()
+    combined = new_prompt
+    if pending_json:
+        try:
+            old = json.loads(pending_json)
+            combined = f"{new_prompt}\n\n(Previous proposal summary: {old.get('summary','')})"
+        except Exception:
+            pass
+    return handle_smart_schedule(user_id, combined)
 
 
 # =============================================================================
@@ -414,14 +420,22 @@ def _parse_ids(text, valid_ids):
     import re as _re
     return [int(n) for n in _re.findall(r'\b(\d+)\b', text) if int(n) in valid_ids]
 
+def _chat_msg(role, text):
+    """Return a (user_msg, assistant_msg) tuple for Gradio Chatbot (non-messages mode)."""
+    if role == "assistant":
+        return (None, text)
+    else:
+        return (text, None)
+
 def handle_start_journal(user_id):
-    blank = ([], [], False, gr.update(interactive=False), gr.update(interactive=False), gr.update(interactive=False), [], "marking", "")
+    blank_outputs = ([], [], False,
+                     gr.update(interactive=False), gr.update(interactive=False), gr.update(interactive=False),
+                     [], "marking", "")
     if not user_id:
-        return ([(None, "\u26a0 Please sign in first.")],) + blank[1:]
+        return ([(None, "\u26a0 Please sign in first.")],) + blank_outputs[1:]
     tasks = get_tasks(user_id, only_today=True)
     if not tasks:
-        msg = "No tasks logged for today. Add and schedule some tasks first, then come back to reflect!"
-        return ([(None, msg)],) + blank[1:]
+        return ([(None, "No tasks scheduled for today. Add and schedule tasks first, then come back to reflect!")],) + blank_outputs[1:]
 
     tasks_state = [{
         "task_id": t["id"], "title": t["title"], "life_area": t.get("life_area",""),
@@ -436,20 +450,20 @@ def handle_start_journal(user_id):
     if completed == total and total > 0:
         opener = f"\U0001f389 You knocked out all **{total}** tasks today \u2014 great work!\n\n{task_md}\n\nDid the day feel productive or were you grinding through it?"
     elif completed == 0:
-        opener = (f"Here\'s what was on your plate today:\n\n{task_md}\n\n"
+        opener = (f"Here's what was on your plate today:\n\n{task_md}\n\n"
                   f"None are marked complete yet. Tell me which ones you finished "
                   f"(e.g. *\"I did #1 and #3\"*), or say **skip** to start reflecting.")
     else:
         incomplete = [t for t in tasks_state if not t["completed"]]
         inc_str    = ", ".join(f"#{t['task_id']}" for t in incomplete[:4])
-        opener = (f"Here\'s today\'s list:\n\n{task_md}\n\n"
+        opener = (f"Here's today's list:\n\n{task_md}\n\n"
                   f"Done: **{completed}/{total}**. Still open: {inc_str}. "
                   f"Tell me if you finished any more, or say **skip** to reflect.")
 
-    first_msg = (None, opener)
+    chat = [(None, opener)]
     hist = [{"role": "assistant", "content": opener, "focus": "task_review"}]
     return (
-        [first_msg], hist, True,
+        chat, hist, True,
         gr.update(interactive=True), gr.update(interactive=True), gr.update(interactive=True),
         tasks_state, "marking", "",
     )
@@ -461,14 +475,14 @@ def handle_journal_message(user_id, user_text, audio_path, chat, hist, tasks_sta
         try:
             transcribed = _transcribe(audio_path)
             if transcribed:
-                user_text  = transcribed
+                user_text = transcribed
                 voice_used = True
         except Exception as e:
-            err = (None, f"\u26a0 Couldn\'t transcribe audio: {e}. Please type instead.")
-            return list(chat) + [err], hist, "", None, tasks_state, active, phase, ""
+            chat = list(chat) + [(None, f"\u26a0 Transcription error: {e}. Please type instead.")]
+            return chat, hist, "", None, tasks_state, active, phase, ""
 
     if not active or not user_text.strip():
-        return chat, hist, "", None, tasks_state, active, phase, ""
+        return list(chat), hist, "", None, tasks_state, active, phase, ""
 
     display_text = f"\U0001f3a4 *{user_text}*" if voice_used else user_text
     chat = list(chat) + [(display_text, None)]
@@ -487,7 +501,7 @@ def handle_journal_message(user_id, user_text, audio_path, chat, hist, tasks_sta
 
         titles_str = ", ".join(updated)
         confirm    = (f"Got it \u2014 marked **{titles_str}** as complete \u2705\n\n" if updated else "")
-        skip_words = {"done","skip","reflect","none","nothing","no more","that\'s it","let\'s go","start","go","next","continue"}
+        skip_words = {"done","skip","reflect","none","nothing","no more","start","go","next","continue","all"}
         wants_skip = any(w in user_text.lower() for w in skip_words)
         done_count = sum(1 for t in tasks_state if t["completed"])
 
@@ -495,16 +509,16 @@ def handle_journal_message(user_id, user_text, audio_path, chat, hist, tasks_sta
             ctx     = _ensure_context(user_id)
             opening = build_opening_question(ctx, tasks_state)
             bridge  = confirm + opening["question"]
-            ai_msg  = (None, bridge)
+            chat    = list(chat) + [(None, bridge)]
             hist.append({"role": "assistant", "content": bridge, "focus": opening["question_focus"]})
-            return list(chat) + [ai_msg], hist, "", None, tasks_state, active, "reflecting", ""
+            return chat, hist, "", None, tasks_state, active, "reflecting", ""
         else:
             remaining = [t for t in tasks_state if not t["completed"]]
             rem_str   = " | ".join(f"#{t['task_id']} {t['title']}" for t in remaining[:5])
             follow    = confirm + f"Still pending: {rem_str}\n\nAnything else done? Or say **skip** to start reflecting."
-            ai_msg    = (None, follow)
+            chat      = list(chat) + [(None, follow)]
             hist.append({"role": "assistant", "content": follow, "focus": "task_marking"})
-            return list(chat) + [ai_msg], hist, "", None, tasks_state, active, "marking", ""
+            return chat, hist, "", None, tasks_state, active, "marking", ""
 
     # Phase: reflecting
     if phase == "reflecting":
@@ -512,23 +526,23 @@ def handle_journal_message(user_id, user_text, audio_path, chat, hist, tasks_sta
             ctx    = _ensure_context(user_id)
             result = get_next_journal_question(ctx, tasks_state, hist)
         except Exception as e:
-            err_msg = (None, f"\u26a0 AI error: {e}. Try sending again.")
-            return list(chat) + [err_msg], hist, "", None, tasks_state, active, phase, ""
+            chat = list(chat) + [(None, f"\u26a0 AI error: {e}. Try again.")]
+            return chat, hist, "", None, tasks_state, active, phase, ""
 
         if result.get("session_complete"):
-            closing = "That\'s a solid reflection \u2014 I have plenty to work with. \U0001f9e0 Hit **Finish & Save** to lock in your insights!"
-            ai_msg  = (None, closing)
+            closing = "That's a solid reflection \u2014 I have plenty to work with. \U0001f9e0 Hit **Finish & Save** to lock in your insights!"
+            chat    = list(chat) + [(None, closing)]
             hist.append({"role": "assistant", "content": closing, "focus": "complete"})
-            return list(chat) + [ai_msg], hist, "", None, tasks_state, active, "done", _ok("Session complete \u2014 click Finish & Save")
+            return chat, hist, "", None, tasks_state, active, "done", _ok("Session complete \u2014 click Finish & Save")
 
-        next_q = result.get("question") or "Anything else you\'d like to reflect on?"
-        ai_msg = (None, next_q)
+        next_q = result.get("question") or "Anything else you'd like to reflect on?"
+        chat   = list(chat) + [(None, next_q)]
         hist.append({"role": "assistant", "content": next_q, "focus": result.get("question_focus","")})
-        return list(chat) + [ai_msg], hist, "", None, tasks_state, active, "reflecting", ""
+        return chat, hist, "", None, tasks_state, active, "reflecting", ""
 
     # Phase: done
-    nudge = (None, "Session complete! Click **Finish & Save** to save your insights.")
-    return list(chat) + [nudge], hist, "", None, tasks_state, active, "done", ""
+    chat = list(chat) + [(None, "Session complete! Click **Finish & Save** to save your insights.")]
+    return chat, hist, "", None, tasks_state, active, "done", ""
 
 
 def handle_finish_journal(user_id, chat, hist, tasks_state):
@@ -540,55 +554,111 @@ def handle_finish_journal(user_id, chat, hist, tasks_state):
         save_user_context(user_id, updated)
     except Exception as e:
         return list(chat) + [(None, f"\u26a0 Save failed: {e}")], _err("Save failed")
-
-    total  = len(tasks_state)
-    done   = sum(1 for t in tasks_state if t.get("completed"))
-    rate   = round(done / total * 100) if total else 0
-    notes  = updated.get("learned_patterns",{}).get("notes",[])
+    total    = len(tasks_state)
+    done     = sum(1 for t in tasks_state if t.get("completed"))
+    rate     = round(done / total * 100) if total else 0
+    notes    = updated.get("learned_patterns",{}).get("notes",[])
     notes_md = "\n".join(f"\u2022 {n}" for n in notes[-3:]) if notes else "\u2022 Keep reflecting to build patterns"
-    summary = (
-        f"\u2705 **Insights saved!** {done}/{total} tasks ({rate}%) complete today.\n\n"
-        f"**What I learned:**\n{notes_md}\n\n"
-        f"I\'ll use this to make tomorrow\'s scheduling smarter. Great work today! \U0001f319"
-    )
+    summary  = (f"\u2705 **Insights saved!** {done}/{total} tasks ({rate}%) complete today.\n\n"
+                f"**What I learned:**\n{notes_md}\n\n"
+                f"I'll use this to make tomorrow's scheduling smarter. Great work! \U0001f319")
     return list(chat) + [(None, summary)], _ok(f"Saved! {done}/{total} tasks ({rate}%)")
 
-
 def handle_restart_journal():
     return [], [], False, gr.update(interactive=False), gr.update(interactive=False), gr.update(interactive=False), [], "marking", ""
 
 
 # =============================================================================
-# LIFE AREAS & GOALS
+# AREAS & GOALS
 # =============================================================================
 
-def render_areas(user_id):
-    if not user_id: return "", [], []
+def render_areas_html(user_id):
+    if not user_id: return ""
     areas = get_life_areas(user_id)
-    chips = "".join(
-        f'<span class="chip" style="background:{a["color"]}22;color:{a["color"]};border:1px solid {a["color"]}44">{a["name"]}</span> '
-        for a in areas
-    )
-    html  = f'<div style="margin:4px 0">{chips}</div>' if chips else '<p style="color:#334155;font-size:13px">No areas yet.</p>'
+    tasks = get_tasks(user_id)
+    # Count tasks per area
+    counts = {}
+    for t in tasks:
+        a = t.get("life_area","")
+        if a: counts[a] = counts.get(a,0) + 1
+    max_count = max(counts.values()) if counts else 1
+    if not areas:
+        return '<p style="color:#475569;font-size:13px">No areas yet. Add one below.</p>'
+    html = '<div style="display:flex;flex-direction:column;gap:10px">'
+    for a in areas:
+        name  = a["name"]
+        color = a["color"]
+        cnt   = counts.get(name, 0)
+        bar_w = max(4, round(cnt / max_count * 100)) if max_count else 4
+        html += (
+            f'<div style="padding:12px 14px;background:#0c0f1a;border-radius:10px;'
+            f'border-left:3px solid {color};display:flex;align-items:center;gap:12px">'
+            f'<div style="flex:1">'
+            f'<div style="color:{color};font-size:13px;font-weight:600">{name}</div>'
+            f'<div style="margin-top:6px;height:4px;background:#1e293b;border-radius:2px">'
+            f'<div style="width:{bar_w}%;height:4px;background:{color};border-radius:2px"></div></div>'
+            f'<div style="color:#475569;font-size:11px;margin-top:3px">{cnt} task{"s" if cnt!=1 else ""}</div>'
+            f'</div>'
+            f'<button onclick="this.closest(\'.gradio-container\').dispatchEvent(new CustomEvent(\'del-area\',{{detail:\'{name}\'}})); return false;" '
+            f'style="background:none;border:1px solid #334155;color:#475569;padding:4px 8px;'
+            f'border-radius:6px;font-size:11px;cursor:pointer" title="Remove {name}">\u2717</button>'
+            f'</div>'
+        )
+    html += '</div>'
+    return html
+
+def render_areas_list(user_id):
+    if not user_id: return "", []
+    areas = get_life_areas(user_id)
+    tasks_all = get_tasks(user_id)
+    counts = {}
+    for t in tasks_all:
+        a = t.get("life_area","")
+        if a: counts[a] = counts.get(a,0) + 1
+    max_count = max(counts.values()) if counts else 1
+
+    if not areas:
+        html = '<p style="color:#475569;font-size:13px">No areas yet. Add one below.</p>'
+    else:
+        html = '<div style="display:flex;flex-direction:column;gap:8px">'
+        for a in areas:
+            name  = a["name"]
+            color = a["color"]
+            cnt   = counts.get(name, 0)
+            bar_w = max(4, round(cnt / max_count * 100)) if max_count else 4
+            html += (
+                f'<div style="padding:12px 14px;background:#0c0f1a;border-radius:10px;'
+                f'border-left:3px solid {color};display:flex;align-items:center;gap:12px">'
+                f'<div style="flex:1">'
+                f'<div style="color:{color};font-size:13px;font-weight:600">{name}</div>'
+                f'<div style="margin-top:6px;height:4px;background:#1e293b;border-radius:2px">'
+                f'<div style="width:{bar_w}%;height:4px;background:{color};border-radius:2px"></div></div>'
+                f'<div style="color:#475569;font-size:11px;margin-top:3px">{cnt} task{"s" if cnt!=1 else ""}</div>'
+                f'</div>'
+                f'<button style="background:none;border:1px solid #ef444444;color:#f87171;padding:4px 10px;'
+                f'border-radius:6px;font-size:11px;cursor:pointer"\n'
+                f'onclick="void(0)">\u2717 Remove</button>'
+                f'</div>'
+            )
+        html += '</div>'
     names = [a["name"] for a in areas]
-    return html, names, names
+    return html, names
 
 def handle_add_area(user_id, name, color):
     ok, msg = add_life_area(user_id, name, color)
-    html, names, _ = render_areas(user_id)
+    html, names = render_areas_list(user_id)
     ct = "#4ade80" if ok else "#f87171"
     return f'<span style="color:{ct};font-size:13px">{msg}</span>', html, gr.update(choices=names, value=None), gr.update(value="")
 
 def handle_del_area(user_id, name):
-    if not name: return _err("Select an area first."), "", []
-    ok, msg = delete_life_area(user_id, name)
-    html, names, _ = render_areas(user_id)
-    ct = "#4ade80" if ok else "#f87171"
-    return f'<span style="color:{ct};font-size:13px">{msg}</span>', html, gr.update(choices=names, value=None)
+    if not name: return _err("Select an area first."), ""
+    delete_life_area(user_id, name)
+    html, names = render_areas_list(user_id)
+    return _ok(f'"{name}" removed.'), html
 
 def handle_save_goals(user_id, goals_text):
     if not user_id: return _err("Not logged in.")
-    save_goals(user_id, goals_text)
+    save_goals(uid=user_id, goals_text=goals_text)
     return _ok("Goals saved!")
 
 def load_goals_txt(user_id):
@@ -596,7 +666,7 @@ def load_goals_txt(user_id):
 
 
 # =============================================================================
-# PREFERENCES
+# PREFERENCES & AI MEMORY
 # =============================================================================
 
 def load_prefs(user_id):
@@ -608,7 +678,8 @@ def load_prefs(user_id):
 def handle_save_prefs(user_id, wake, sleep, focus, brk, flow_max):
     if not user_id: return _err("Not logged in.")
     ctx = _ensure_context(user_id)
-    ctx["preferences"].update({"wake_time":wake or "07:30","sleep_time":sleep or "23:00","focus_peak":focus or "Morning","break_duration_minutes":int(brk or 10),"max_flow_block_minutes":int(flow_max or 90)})
+    ctx["preferences"].update({"wake_time":wake or "07:30","sleep_time":sleep or "23:00","focus_peak":focus or "Morning",
+                                "break_duration_minutes":int(brk or 10),"max_flow_block_minutes":int(flow_max or 90)})
     save_user_context(user_id, ctx)
     return _ok("Preferences saved!")
 
@@ -616,21 +687,95 @@ def render_context_html(user_id):
     if not user_id: return "<p style='color:#334155'>Not logged in.</p>"
     ctx = load_user_context(user_id)
     if not ctx: return "<p style='color:#334155;font-size:13px'>No AI context yet. Complete a journal session to build it.</p>"
-    lp = ctx.get("learned_patterns",{}); sf = ctx.get("scheduling_feedback",{}); pref = ctx.get("preferences",{})
-    def _row(l,v): return f'<div style="display:flex;justify-content:space-between;padding:5px 0;border-bottom:1px solid #1e293b"><span style="color:#475569;font-size:12px">{l}</span><span style="color:#cbd5e1;font-size:12px">{v}</span></div>'
-    def _hdr(t): return f'<div style="color:#a78bfa;font-size:10px;font-weight:600;letter-spacing:1px;text-transform:uppercase;margin:14px 0 8px">{t}</div>'
-    html = "<div style='font-size:13px'>" + _hdr("Preferences")
-    html += _row("Wake",pref.get("wake_time","\u2014"))+_row("Sleep",pref.get("sleep_time","\u2014"))+_row("Peak Focus",pref.get("focus_peak","\u2014"))
-    html += _hdr("Learned Patterns")
-    html += _row("Avg overrun",f'{lp.get("avg_task_overrun_pct",0)}%')+_row("Flow batching",str(lp.get("flow_batch_capable","Unknown")))
-    html += _row("Days tracked",str(sf.get("total_days_scheduled",0)))+_row("Avg completion",f'{round(sf.get("avg_completion_rate",0)*100)}%')
-    notes = lp.get("notes",[])
+    lp   = ctx.get("learned_patterns",{})
+    sf   = ctx.get("scheduling_feedback",{})
+    pref = ctx.get("preferences",{})
+    _ver = ctx.get("version",1)
+    _upd = (ctx.get("last_updated") or "")[:10]
+
+    # Notes with timestamps (notes are stored as strings; newer ones may have timestamps embedded)
+    notes      = lp.get("notes",[])
+    history    = ctx.get("history_summary",[])
+    rates      = sf.get("last_7_day_completion_rates",[])
+    avg_rate   = round(sf.get("avg_completion_rate",0)*100)
+    overrun    = lp.get("avg_task_overrun_pct",0)
+    days       = sf.get("total_days_scheduled",0)
+
+    # ── Mini SVG bar chart for last-7-day completion ───────────────────────
+    chart_html = ""
+    if rates:
+        bar_w = 28
+        gap   = 6
+        chart_w = len(rates)*(bar_w+gap)
+        chart_h = 60
+        bars = ""
+        for idx, r in enumerate(rates[-7:]):
+            x = idx*(bar_w+gap)
+            h = max(4, round(r*chart_h))
+            y = chart_h - h
+            col = "#4ade80" if r >= 0.7 else "#f59e0b" if r >= 0.4 else "#f87171"
+            pct = round(r*100)
+            bars += (f'<rect x="{x}" y="{y}" width="{bar_w}" height="{h}" fill="{col}" rx="3"/>'
+                     f'<text x="{x+bar_w//2}" y="{chart_h+14}" text-anchor="middle" '
+                     f'fill="#475569" font-size="9">{pct}%</text>')
+        chart_html = (
+            f'<div style="margin:12px 0 8px">'
+            f'<div style="color:#a78bfa;font-size:10px;font-weight:600;letter-spacing:1px;text-transform:uppercase;margin-bottom:8px">Last {len(rates[-7:])} Day Completion</div>'
+            f'<svg width="{chart_w}" height="{chart_h+20}" style="overflow:visible">{bars}</svg>'
+            f'</div>'
+        )
+
+    # ── Overrun pill ───────────────────────────────────────────────────────
+    overrun_col = "#4ade80" if overrun <= 10 else "#f59e0b" if overrun <= 30 else "#f87171"
+
+    # ── Stats row ─────────────────────────────────────────────────────────
+    def _pill(val, label, color):
+        return (f'<div style="flex:1;background:#0c0f1a;border-radius:8px;padding:10px 12px;text-align:center">'
+                f'<div style="color:{color};font-size:18px;font-weight:700">{val}</div>'
+                f'<div style="color:#475569;font-size:10px;margin-top:2px">{label}</div></div>')
+
+    stats_row = (
+        f'<div style="display:flex;gap:8px;margin-bottom:14px">'
+        f'{_pill(days,"Days tracked","#a78bfa")}'
+        f'{_pill(str(avg_rate)+"%","Avg completion","#4ade80")}'
+        f'{_pill(str(overrun)+"%","Task overrun",overrun_col)}'
+        f'{_pill(str(lp.get("flow_batch_capable","?")), "Flow batching","#60a5fa")}'
+        f'</div>'
+    )
+
+    # ── AI Notes with timestamps ───────────────────────────────────────────
+    notes_html = ""
     if notes:
-        html += _hdr("AI Notes")
-        html += "".join(f'<div style="color:#94a3b8;font-size:12px;padding:3px 0">\u2022 {n}</div>' for n in notes[-5:])
-    _ver = ctx.get("version", 1)
-    _upd = (ctx.get("last_updated") or "—")[:10]
-    html += f'<div style="color:#334155;font-size:11px;margin-top:12px">v{_ver} · {_upd}</div></div>'
+        notes_html = '<div style="color:#a78bfa;font-size:10px;font-weight:600;letter-spacing:1px;text-transform:uppercase;margin:14px 0 8px">AI Insights</div>'
+        for n in notes[-8:]:
+            # Notes may be plain strings or "YYYY-MM-DD: text"
+            if ": " in str(n) and str(n)[:10].count("-") == 2:
+                ts, txt = n.split(": ",1)
+            else:
+                ts, txt = _upd, str(n)
+            notes_html += (
+                f'<div style="display:flex;gap:8px;padding:6px 0;border-bottom:1px solid #1e293b;align-items:flex-start">'
+                f'<span style="color:#334155;font-size:10px;white-space:nowrap;padding-top:1px">{ts}</span>'
+                f'<span style="color:#94a3b8;font-size:12px">\u2022 {txt}</span>'
+                f'</div>'
+            )
+
+    # ── History summary ────────────────────────────────────────────────────
+    hist_html = ""
+    if history:
+        hist_html = '<div style="color:#a78bfa;font-size:10px;font-weight:600;letter-spacing:1px;text-transform:uppercase;margin:14px 0 8px">Session History</div>'
+        for h in history[-5:]:
+            hist_html += f'<div style="color:#475569;font-size:12px;padding:3px 0">\u2022 {h}</div>'
+
+    html = (
+        f'<div style="font-size:13px">'
+        f'<div style="color:#334155;font-size:11px;margin-bottom:12px">v{_ver} \u00b7 last updated {_upd}</div>'
+        f'{stats_row}'
+        f'{chart_html}'
+        f'{notes_html}'
+        f'{hist_html}'
+        f'</div>'
+    )
     return html
 
 
@@ -653,8 +798,13 @@ with gr.Blocks(title="\U0001f9e0 Second Brain") as demo:
     # Clarification — voice panel
     vclar_questions_state = gr.State([])
     voriginal_task_state  = gr.State("")
+    # Scheduler pending state
+    sched_pending_state = gr.State("")
+    # Selected task ids
+    today_sel_state = gr.State(None)
+    all_sel_state   = gr.State(None)
 
-    # AUTH
+    # ── AUTH ─────────────────────────────────────────────────────────────────
     with gr.Column(visible=True, elem_id="auth-card") as auth_section:
         gr.HTML('<div id="brand-logo">\U0001f9e0 Second Brain</div>')
         gr.HTML('<div id="brand-sub">Your intelligent productivity companion</div>')
@@ -674,46 +824,44 @@ with gr.Blocks(title="\U0001f9e0 Second Brain") as demo:
                 reg_btn     = gr.Button("Create Account", elem_classes="btn-primary")
                 reg_msg     = gr.HTML("")
 
-    # MAIN APP
+    # ── MAIN APP ─────────────────────────────────────────────────────────────
     with gr.Column(visible=False) as app_section:
-
         with gr.Row(elem_id="top-header"):
             header_html = gr.HTML('<div id="top-header-brand">\U0001f9e0 Second Brain</div><div id="top-header-user">\u2014</div>')
             logout_btn  = gr.Button("Sign Out", elem_classes="btn-secondary", scale=0)
 
         with gr.Tabs():
 
-            # TAB 1: TODAY
+            # ── TAB 1: TODAY ────────────────────────────────────────────────
             with gr.Tab("\U0001f4c5 Today"):
                 with gr.Row():
                     stat_total  = gr.HTML(_stat("\u2014","Today","#a78bfa"))
                     stat_done   = gr.HTML(_stat("\u2014","Done","#4ade80"))
                     stat_remain = gr.HTML(_stat("\u2014","Left","#f87171"))
                 with gr.Row():
-                    btn_add_text  = gr.Button("\u270f\ufe0f Add Task (Text)",  elem_classes="btn-primary",   scale=3)
+                    btn_add_text  = gr.Button("\u270f\ufe0f Add Task (Text)",   elem_classes="btn-primary",   scale=3)
                     btn_add_voice = gr.Button("\U0001f399\ufe0f Add Task (Voice)", elem_classes="btn-accent", scale=3)
-                    btn_plan_day  = gr.Button("\U0001f9e0 Plan My Tasks",       elem_classes="btn-secondary", scale=3)
-                    btn_refresh   = gr.Button("\u21bb",                          elem_classes="btn-secondary", scale=1)
+                    btn_plan_day  = gr.Button("\U0001f9e0 Plan My Tasks",        elem_classes="btn-secondary", scale=3)
+                    btn_refresh   = gr.Button("\u21bb",                           elem_classes="btn-secondary", scale=1)
 
-                # Text panel
+                # ── Text capture panel ────────────────────────────────────
                 with gr.Column(visible=False, elem_classes="panel") as text_panel:
                     gr.HTML('<div class="sec-label">Describe Your Task</div>')
-                    task_input = gr.Textbox(label="", placeholder="e.g. Finish the client proposal, it\'s really important", lines=2)
+                    task_input = gr.Textbox(label="", placeholder="e.g. Finish the proposal by Friday, it's really urgent", lines=2)
                     with gr.Row():
                         btn_parse       = gr.Button("\U0001f916 Parse with AI", elem_classes="btn-primary")
                         btn_cancel_text = gr.Button("Cancel",                    elem_classes="btn-secondary")
-
                     with gr.Column(visible=False) as parsed_panel:
                         parse_status = gr.HTML("")
                         clar_html    = gr.HTML("")
                         with gr.Column(visible=False) as clar_reply_row:
                             gr.HTML('<div class="sec-label" style="margin-top:8px">Answer the questions above</div>')
                             with gr.Row():
-                                clar_text_input  = gr.Textbox(label="Type your answer", lines=2, scale=4, placeholder="e.g. It\'s urgent, about 2 hours, for my manager")
-                                clar_audio_input = gr.Audio(sources=["microphone"], type="filepath", label="\U0001f3a4 Or speak", scale=1)
+                                clar_text_input  = gr.Textbox(label="Type your answer", lines=2, scale=4)
+                                clar_audio_input = gr.Audio(sources=["microphone"], type="filepath", label="\U0001f3a4", scale=1)
                             btn_clar_submit = gr.Button("\U0001f504 Re-classify", elem_classes="btn-accent")
                         gr.HTML('<div class="sec-label" style="margin-top:12px">Review & Confirm</div>')
-                        gr.HTML('<p style="color:#475569;font-size:12px;margin:0 0 10px">Date will be assigned by the AI scheduler \u2014 just save and use \u201cPlan My Tasks\u201d.</p>')
+                        gr.HTML('<p style="color:#475569;font-size:12px;margin:0 0 10px">Deadline is auto-extracted from your text. Date will be assigned by the AI scheduler.</p>')
                         with gr.Row():
                             f_title = gr.Textbox(label="Title", scale=3)
                             f_area  = gr.Dropdown(label="Life Area", choices=["Work","Health","Finance","Learning","Personal","Family","Other"], scale=1)
@@ -723,7 +871,7 @@ with gr.Blocks(title="\U0001f9e0 Second Brain") as demo:
                             f_state      = gr.Dropdown(label="State of Mind", choices=["Flow","Easy","Quick","Personal"],             value="Easy")
                         with gr.Row():
                             f_time     = gr.Number(label="Minutes", value=30, minimum=5, scale=1)
-                            f_deadline = gr.Textbox(label="\U0001f3af Deadline (YYYY-MM-DD, optional)", placeholder="2026-03-01", scale=2)
+                            f_deadline = gr.Textbox(label="\U0001f3af Deadline (YYYY-MM-DD)", placeholder="auto-filled or type", scale=2)
                             f_is_habit = gr.Checkbox(label="\u267b\ufe0f Habit", scale=1)
                             f_interval = gr.Dropdown(label="Recurs", choices=["Daily","Weekly","Weekdays","Weekends","Monthly"], value="Daily", visible=False, scale=1)
                         with gr.Row():
@@ -731,16 +879,15 @@ with gr.Blocks(title="\U0001f9e0 Second Brain") as demo:
                             btn_discard = gr.Button("\u2717 Discard",   elem_classes="btn-danger")
                         save_msg = gr.HTML("")
 
-                # Voice panel
+                # ── Voice capture panel ───────────────────────────────────
                 with gr.Column(visible=False, elem_classes="panel") as voice_panel:
                     gr.HTML('<div class="sec-label">Add Task by Voice</div>')
-                    gr.HTML('<p style="color:#475569;font-size:13px;margin-bottom:12px">Record your task \u2014 Whisper transcribes it, AI classifies it. Same flow as text.</p>')
+                    gr.HTML('<p style="color:#475569;font-size:13px;margin-bottom:12px">Say your task naturally including any deadline \u2014 AI extracts it all.</p>')
                     voice_audio_input = gr.Audio(sources=["microphone","upload"], type="filepath", label="")
                     with gr.Row():
                         btn_voice_parse  = gr.Button("\U0001f916 Transcribe & Classify", elem_classes="btn-primary")
                         btn_cancel_voice = gr.Button("Cancel",                            elem_classes="btn-secondary")
                     voice_status = gr.HTML("")
-
                     with gr.Column(visible=False) as voice_parsed_panel:
                         voice_transcribed_txt = gr.Textbox(label="Transcribed text (editable)", lines=1)
                         voice_clar_html       = gr.HTML("")
@@ -748,10 +895,9 @@ with gr.Blocks(title="\U0001f9e0 Second Brain") as demo:
                             gr.HTML('<div class="sec-label" style="margin-top:8px">Answer the questions above</div>')
                             with gr.Row():
                                 vclar_text  = gr.Textbox(label="Type your answer", lines=2, scale=4)
-                                vclar_audio = gr.Audio(sources=["microphone"], type="filepath", label="\U0001f3a4 Or speak", scale=1)
+                                vclar_audio = gr.Audio(sources=["microphone"], type="filepath", label="\U0001f3a4", scale=1)
                             btn_vclar_submit = gr.Button("\U0001f504 Re-classify", elem_classes="btn-accent")
                         gr.HTML('<div class="sec-label" style="margin-top:12px">Review & Confirm</div>')
-                        gr.HTML('<p style="color:#475569;font-size:12px;margin:0 0 10px">Date assigned by AI scheduler after saving.</p>')
                         with gr.Row():
                             vf_title = gr.Textbox(label="Title", scale=3)
                             vf_area  = gr.Dropdown(label="Life Area", choices=["Work","Health","Finance","Learning","Personal","Family","Other"], scale=1)
@@ -761,7 +907,7 @@ with gr.Blocks(title="\U0001f9e0 Second Brain") as demo:
                             vf_state      = gr.Dropdown(label="State of Mind", choices=["Flow","Easy","Quick","Personal"],             value="Easy")
                         with gr.Row():
                             vf_time     = gr.Number(label="Minutes", value=30, minimum=5, scale=1)
-                            vf_deadline = gr.Textbox(label="\U0001f3af Deadline (optional)", placeholder="2026-03-01", scale=2)
+                            vf_deadline = gr.Textbox(label="\U0001f3af Deadline (YYYY-MM-DD)", placeholder="auto-filled or type", scale=2)
                             vf_is_habit = gr.Checkbox(label="\u267b\ufe0f Habit", scale=1)
                             vf_interval = gr.Dropdown(label="Recurs", choices=["Daily","Weekly","Weekdays","Weekends","Monthly"], value="Daily", visible=False, scale=1)
                         with gr.Row():
@@ -769,49 +915,58 @@ with gr.Blocks(title="\U0001f9e0 Second Brain") as demo:
                             btn_voice_discard = gr.Button("\u2717 Discard",   elem_classes="btn-danger")
                         voice_save_msg = gr.HTML("")
 
-                # Plan My Tasks panel
+                # ── Plan My Tasks panel ───────────────────────────────────
                 with gr.Column(visible=False, elem_classes="panel") as plan_panel:
                     gr.HTML('<div class="sec-label">Plan My Tasks</div>')
-                    gr.HTML('<p style="color:#475569;font-size:13px;margin-bottom:12px">'
-                            'The AI reads your unscheduled tasks, your learned patterns, goals, and current time \u2014 '
-                            'then assigns each task to the best future date. It never places tasks in the past.'
-                            '</p>')
+                    gr.HTML('<p style="color:#475569;font-size:13px;margin-bottom:10px">'
+                            'The AI reads your unscheduled tasks, patterns, goals and current time \u2014 '
+                            'proposes a schedule with time blocks. Review before applying.</p>')
                     plan_prompt = gr.Textbox(
                         label="Tell the AI what you want",
-                        placeholder="e.g. \'Clear today, schedule everything from tomorrow\' or \'Focus on Work tasks this week\' or \'I have a free morning Thursday\'",
-                        lines=3
+                        placeholder="e.g. 'Clear today, schedule from tomorrow' or 'Focus on Work tasks this week, I have Thursday free'",
+                        lines=2
                     )
                     with gr.Row():
-                        btn_gen_sched   = gr.Button("\U0001f9e0 Run AI Scheduler", elem_classes="btn-primary")
+                        btn_gen_sched   = gr.Button("\U0001f9e0 Generate Proposal", elem_classes="btn-primary")
                         btn_cancel_plan = gr.Button("Cancel",                       elem_classes="btn-secondary")
                     schedule_html = gr.HTML("")
 
+                    # Confirm/Refine row — hidden until proposal generated
+                    with gr.Column(visible=False) as sched_confirm_row:
+                        gr.HTML('<div style="margin:10px 0 6px;color:#f59e0b;font-size:12px">'
+                                '\u26a0 Review the proposal above. Confirm to apply, or type a refinement.</div>')
+                        with gr.Row():
+                            btn_sched_confirm = gr.Button("\u2713 Confirm & Apply", elem_classes="btn-success", scale=2)
+                            btn_sched_cancel  = gr.Button("\u2717 Discard",          elem_classes="btn-danger",   scale=1)
+                        refine_prompt = gr.Textbox(label="Or refine (optional)", placeholder="e.g. 'Move the Flow tasks to morning'", lines=1)
+                        btn_refine    = gr.Button("\U0001f504 Re-generate with refinement", elem_classes="btn-accent")
+                    sched_status = gr.HTML("")
+
                 gr.HTML('<div class="sec-label" style="margin-top:20px">Today\'s Tasks</div>')
                 today_df = gr.Dataframe(headers=TASK_HEADERS, interactive=False, wrap=True)
+                gr.HTML('<p style="color:#475569;font-size:11px;margin:4px 0 8px">Enter task ID then click action:</p>')
                 with gr.Row():
-                    today_done_id  = gr.Number(label="Task ID \u2014 toggle done", precision=0, scale=2)
+                    today_task_id  = gr.Number(label="Task ID", precision=0, scale=1, minimum=1)
                     btn_today_done = gr.Button("\u2705 Mark Done", elem_classes="btn-success", scale=2)
-                    today_del_id   = gr.Number(label="Task ID \u2014 delete",      precision=0, scale=2)
-                    btn_today_del  = gr.Button("\U0001f5d1 Delete", elem_classes="btn-danger", scale=2)
+                    btn_today_del  = gr.Button("\U0001f5d1 Delete",  elem_classes="btn-danger",  scale=2)
                 today_action_msg = gr.HTML("")
 
-            # TAB 2: ALL TASKS
+            # ── TAB 2: ALL TASKS ─────────────────────────────────────────
             with gr.Tab("\U0001f4cb All Tasks"):
-                gr.HTML('<p style="color:#475569;font-size:13px;margin-bottom:10px">All tasks including unscheduled ones. Filter and manage here.</p>')
+                gr.HTML('<p style="color:#475569;font-size:13px;margin-bottom:10px">All tasks including unscheduled. Enter ID then click action.</p>')
                 with gr.Row():
                     all_filter    = gr.Dropdown(label="Filter by Area", choices=["All"], value="All", scale=3)
-                    all_today_chk = gr.Checkbox(label="Today only", value=False, scale=1)
+                    all_today_chk = gr.Checkbox(label="Today only",       value=False, scale=1)
                     all_unsched   = gr.Checkbox(label="Unscheduled only", value=False, scale=1)
                     btn_all_ref   = gr.Button("\u21bb Refresh", elem_classes="btn-secondary", scale=1)
                 all_df = gr.Dataframe(headers=TASK_HEADERS, interactive=False, wrap=True)
                 with gr.Row():
-                    all_done_id  = gr.Number(label="Task ID \u2014 toggle done", precision=0, scale=2)
+                    all_task_id  = gr.Number(label="Task ID", precision=0, scale=1, minimum=1)
                     btn_all_done = gr.Button("\u2705 Done",    elem_classes="btn-success", scale=2)
-                    all_del_id   = gr.Number(label="Task ID \u2014 delete",      precision=0, scale=2)
                     btn_all_del  = gr.Button("\U0001f5d1 Delete", elem_classes="btn-danger", scale=2)
                 all_action_msg = gr.HTML("")
 
-            # TAB 3: JOURNAL
+            # ── TAB 3: JOURNAL ────────────────────────────────────────────
             with gr.Tab("\U0001f4d3 Journal"):
                 gr.HTML('<p style="color:#475569;font-size:13px;margin-bottom:12px">End-of-day reflection. Chat naturally \u2014 AI marks tasks, asks questions, updates your profile.</p>')
                 journal_chatbot = gr.Chatbot(label="", height=440)
@@ -825,28 +980,29 @@ with gr.Blocks(title="\U0001f9e0 Second Brain") as demo:
                     btn_j_restart = gr.Button("\u21ba Reset",          elem_classes="btn-secondary", scale=1)
                 journal_msg = gr.HTML("")
 
-            # TAB 4: AREAS & GOALS
+            # ── TAB 4: AREAS & GOALS ──────────────────────────────────────
             with gr.Tab("\U0001f5c2 Areas & Goals"):
                 gr.HTML('<div class="sec-label">Your Life Areas</div>')
                 areas_display = gr.HTML("")
+                gr.HTML('<div style="margin-top:14px;color:#475569;font-size:11px">To remove an area, select it from the dropdown and click Remove:</div>')
                 with gr.Row():
-                    new_area_name  = gr.Textbox(label="New area name", placeholder="e.g. Side Project", scale=3)
+                    del_area_dd  = gr.Dropdown(label="Select area to remove", choices=[], scale=4, allow_custom_value=False)
+                    btn_del_area = gr.Button("\u2717 Remove", elem_classes="btn-danger", scale=1)
+                del_area_msg = gr.HTML("")
+                gr.HTML('<div class="sec-label" style="margin-top:16px">Add New Area</div>')
+                with gr.Row():
+                    new_area_name  = gr.Textbox(label="Name", placeholder="e.g. Side Project", scale=3)
                     new_area_color = gr.ColorPicker(label="Color", value="#6366f1", scale=1)
-                    btn_add_area   = gr.Button("Add", elem_classes="btn-primary", scale=1)
+                    btn_add_area   = gr.Button("+ Add", elem_classes="btn-primary", scale=1)
                 area_msg = gr.HTML("")
-                gr.HTML('<div class="sec-label" style="margin-top:24px">Remove Area</div>')
-                with gr.Row():
-                    del_area_dd  = gr.Dropdown(label="Select area to remove", choices=[], scale=4)
-                    btn_del_area = gr.Button("Remove", elem_classes="btn-danger", scale=1)
-                del_area_msg = gr.HTML("")
                 gr.HTML('<hr>')
                 gr.HTML('<div class="sec-label">Big-Picture Goals</div>')
-                gr.HTML('<p style="color:#475569;font-size:13px;margin-bottom:10px">The AI factors these in when scheduling and prioritising.</p>')
+                gr.HTML('<p style="color:#475569;font-size:13px;margin-bottom:10px">The AI factors these into scheduling and prioritisation.</p>')
                 goals_input    = gr.Textbox(label="One goal per line", lines=5, placeholder="Launch my SaaS\nRun 5K\nLearn ML")
                 btn_save_goals = gr.Button("Save Goals", elem_classes="btn-primary")
                 goals_msg      = gr.HTML("")
 
-            # TAB 5: PREFERENCES
+            # ── TAB 5: PREFERENCES ───────────────────────────────────────
             with gr.Tab("\u2699\ufe0f Preferences"):
                 gr.HTML('<div class="sec-label">Scheduling Preferences</div>')
                 with gr.Row():
@@ -860,7 +1016,7 @@ with gr.Blocks(title="\U0001f9e0 Second Brain") as demo:
                 prefs_msg = gr.HTML("")
                 gr.HTML('<hr>')
                 gr.HTML('<div class="sec-label">AI Memory</div>')
-                gr.HTML('<p style="color:#475569;font-size:13px;margin-bottom:10px">What the AI has learned about you. Updates after each journal session.</p>')
+                gr.HTML('<p style="color:#475569;font-size:13px;margin-bottom:10px">Stats, charts, and insights the AI has learned about you. Updates after each journal session.</p>')
                 ctx_display = gr.HTML("")
                 btn_ref_ctx = gr.Button("\u21bb Refresh", elem_classes="btn-secondary")
 
@@ -878,7 +1034,7 @@ with gr.Blocks(title="\U0001f9e0 Second Brain") as demo:
     ).then(_header_html, [user_id_state, username_state], [header_html]
     ).then(refresh_today, [user_id_state], [today_df, stat_total, stat_done, stat_remain]
     ).then(refresh_all_tasks_auto, [user_id_state], [all_df]
-    ).then(lambda uid: render_areas(uid)[:2], [user_id_state], [areas_display, del_area_dd]
+    ).then(lambda uid: render_areas_list(uid), [user_id_state], [areas_display, del_area_dd]
     ).then(load_prefs, [user_id_state], [pref_wake, pref_sleep, pref_focus, pref_break, pref_flow_max]
     ).then(load_goals_txt, [user_id_state], [goals_input])
 
@@ -887,7 +1043,7 @@ with gr.Blocks(title="\U0001f9e0 Second Brain") as demo:
     ).then(_header_html, [user_id_state, username_state], [header_html]
     ).then(refresh_today, [user_id_state], [today_df, stat_total, stat_done, stat_remain]
     ).then(refresh_all_tasks_auto, [user_id_state], [all_df]
-    ).then(lambda uid: render_areas(uid)[:2], [user_id_state], [areas_display, del_area_dd])
+    ).then(lambda uid: render_areas_list(uid), [user_id_state], [areas_display, del_area_dd])
 
     logout_btn.click(handle_logout, [user_id_state], [user_id_state, username_state, auth_section, app_section])
 
@@ -903,63 +1059,50 @@ with gr.Blocks(title="\U0001f9e0 Second Brain") as demo:
     f_is_habit.change(lambda v: gr.update(visible=v), [f_is_habit], [f_interval])
     vf_is_habit.change(lambda v: gr.update(visible=v), [vf_is_habit], [vf_interval])
 
-    # Text task flow
-    # Outputs: parsed_panel, f_title, clar_html, f_area, f_urgency, f_importance,
-    #          f_state, f_time, f_deadline, f_is_habit, f_interval, parse_status,
-    #          clar_reply_row, clar_questions_state, original_task_state
+    # ── Text task flow ────────────────────────────────────────────────────
     _TEXT_PARSE_OUT = [parsed_panel, f_title, clar_html, f_area, f_urgency, f_importance,
                        f_state, f_time, f_deadline, f_is_habit, f_interval, parse_status,
                        clar_reply_row, clar_questions_state, original_task_state]
-    # clar reply outputs: f_title, clar_html, f_area, f_urgency, f_importance,
-    #                     f_state, f_time, f_deadline, clar_reply_row, clar_questions_state
     _TEXT_CLAR_OUT  = [f_title, clar_html, f_area, f_urgency, f_importance,
                        f_state, f_time, f_deadline, clar_reply_row, clar_questions_state]
 
     btn_parse.click(handle_parse_text, [task_input, user_id_state], _TEXT_PARSE_OUT)
-
     btn_clar_submit.click(
         handle_clarification_reply,
         [clar_text_input, original_task_state, clar_questions_state, user_id_state],
         _TEXT_CLAR_OUT
     ).then(lambda: ("", None), outputs=[clar_text_input, clar_audio_input])
-
     clar_audio_input.change(
         handle_clar_voice,
         [clar_audio_input, original_task_state, clar_questions_state, user_id_state],
         _TEXT_CLAR_OUT
     ).then(lambda: None, outputs=[clar_audio_input])
-
     btn_discard.click(lambda: gr.update(visible=False), outputs=[parsed_panel])
-    # Confirm saves task + refreshes BOTH today and all_tasks
     btn_confirm.click(
         handle_confirm_task,
         [user_id_state, f_title, f_area, f_urgency, f_importance, f_state, f_time, f_deadline, f_is_habit, f_interval],
         [save_msg, today_df, stat_total, stat_done, stat_remain, all_df, parsed_panel]
     )
 
-    # Voice task flow
+    # ── Voice task flow ───────────────────────────────────────────────────
     _VOICE_PARSE_OUT = [voice_parsed_panel, voice_transcribed_txt,
                         voice_clar_html, vf_area, vf_urgency, vf_importance,
                         vf_state, vf_time, vf_deadline, vf_is_habit, vf_interval,
-                        voice_status, voice_clar_row,
-                        vclar_questions_state, voriginal_task_state]
+                        voice_status, voice_clar_row, vclar_questions_state, voriginal_task_state]
     _VOICE_CLAR_OUT  = [vf_title, voice_clar_html, vf_area, vf_urgency, vf_importance,
                         vf_state, vf_time, vf_deadline, voice_clar_row, vclar_questions_state]
 
     btn_voice_parse.click(handle_voice_parse, [voice_audio_input, user_id_state], _VOICE_PARSE_OUT)
-
     btn_vclar_submit.click(
         handle_clarification_reply,
         [vclar_text, voriginal_task_state, vclar_questions_state, user_id_state],
         _VOICE_CLAR_OUT
     ).then(lambda: ("", None), outputs=[vclar_text, vclar_audio])
-
     vclar_audio.change(
         handle_clar_voice,
         [vclar_audio, voriginal_task_state, vclar_questions_state, user_id_state],
         _VOICE_CLAR_OUT
     ).then(lambda: None, outputs=[vclar_audio])
-
     btn_voice_discard.click(lambda: gr.update(visible=False), outputs=[voice_parsed_panel])
     btn_voice_confirm.click(
         handle_confirm_task,
@@ -967,61 +1110,81 @@ with gr.Blocks(title="\U0001f9e0 Second Brain") as demo:
         [voice_save_msg, today_df, stat_total, stat_done, stat_remain, all_df, voice_parsed_panel]
     )
 
-    # Smart scheduler — updates both schedule_html and all_df
+    # ── Scheduler with confirm flow ───────────────────────────────────────
+    # Step 1: generate proposal (5 outputs)
+    _SCHED_PROP_OUTS = [schedule_html, sched_pending_state, sched_confirm_row, sched_confirm_row, all_df]
+
     btn_gen_sched.click(
-        handle_smart_schedule, [user_id_state, plan_prompt],
-        [schedule_html, all_df]
+        handle_smart_schedule,
+        [user_id_state, plan_prompt],
+        [schedule_html, sched_pending_state, sched_confirm_row, btn_sched_confirm, all_df]
+    )
+
+    # Step 2a: confirm → apply
+    btn_sched_confirm.click(
+        handle_confirm_schedule,
+        [user_id_state, sched_pending_state, all_df],
+        [sched_status, all_df, sched_confirm_row, btn_sched_confirm]
     ).then(refresh_today, [user_id_state], [today_df, stat_total, stat_done, stat_remain])
 
-    btn_today_done.click(handle_toggle_today, [today_done_id, user_id_state], [today_df, stat_total, stat_done, stat_remain, today_action_msg])
-    btn_today_del.click(handle_delete_today,   [today_del_id, user_id_state],  [today_df, stat_total, stat_done, stat_remain, today_action_msg])
+    # Step 2b: discard
+    btn_sched_cancel.click(
+        lambda: ("", gr.update(visible=False), gr.update(visible=False)),
+        outputs=[schedule_html, sched_confirm_row, btn_sched_confirm]
+    )
+
+    # Step 2c: refine
+    btn_refine.click(
+        handle_refine_schedule,
+        [user_id_state, refine_prompt, sched_pending_state],
+        [schedule_html, sched_pending_state, sched_confirm_row, btn_sched_confirm, all_df]
+    ).then(lambda: "", outputs=[refine_prompt])
+
+    # ── Today task actions ────────────────────────────────────────────────
+    btn_today_done.click(
+        handle_toggle_today_id, [today_task_id, user_id_state],
+        [today_df, stat_total, stat_done, stat_remain, today_action_msg]
+    )
+    btn_today_del.click(
+        handle_delete_today_id, [today_task_id, user_id_state],
+        [today_df, stat_total, stat_done, stat_remain, today_action_msg]
+    )
 
-    # All Tasks
-    def refresh_all_tasks_filtered(user_id, filter_area, only_today, only_unsched):
+    # ── All Tasks ─────────────────────────────────────────────────────────
+    def refresh_all_filtered(user_id, filter_area, only_today, only_unsched):
         if not user_id: return []
         return _fmt_tasks(get_tasks(user_id, filter_area=filter_area, only_today=only_today, only_unscheduled=only_unsched))
 
-    btn_all_ref.click(refresh_all_tasks_filtered,   [user_id_state, all_filter, all_today_chk, all_unsched], [all_df])
-    all_filter.change(refresh_all_tasks_filtered,   [user_id_state, all_filter, all_today_chk, all_unsched], [all_df])
-    all_today_chk.change(refresh_all_tasks_filtered,[user_id_state, all_filter, all_today_chk, all_unsched], [all_df])
-    all_unsched.change(refresh_all_tasks_filtered,  [user_id_state, all_filter, all_today_chk, all_unsched], [all_df])
-
-    def handle_toggle_all_f(task_id, user_id, filter_area, only_today, only_unsched):
-        if task_id and user_id: toggle_task_complete(int(task_id), user_id)
-        return refresh_all_tasks_filtered(user_id, filter_area, only_today, only_unsched), _ok("Updated")
-    def handle_delete_all_f(task_id, user_id, filter_area, only_today, only_unsched):
-        if task_id and user_id: delete_task(int(task_id), user_id)
-        return refresh_all_tasks_filtered(user_id, filter_area, only_today, only_unsched), _ok("Deleted")
+    btn_all_ref.click(refresh_all_filtered,    [user_id_state, all_filter, all_today_chk, all_unsched], [all_df])
+    all_filter.change(refresh_all_filtered,    [user_id_state, all_filter, all_today_chk, all_unsched], [all_df])
+    all_today_chk.change(refresh_all_filtered, [user_id_state, all_filter, all_today_chk, all_unsched], [all_df])
+    all_unsched.change(refresh_all_filtered,   [user_id_state, all_filter, all_today_chk, all_unsched], [all_df])
 
-    btn_all_done.click(handle_toggle_all_f, [all_done_id, user_id_state, all_filter, all_today_chk, all_unsched], [all_df, all_action_msg])
-    btn_all_del.click(handle_delete_all_f,  [all_del_id,  user_id_state, all_filter, all_today_chk, all_unsched], [all_df, all_action_msg])
+    btn_all_done.click(handle_toggle_all_id, [all_task_id, user_id_state], [all_df, all_action_msg])
+    btn_all_del.click(handle_delete_all_id,  [all_task_id, user_id_state], [all_df, all_action_msg])
 
-    # Journal
+    # ── Journal ───────────────────────────────────────────────────────────
     _J_START_OUT = [journal_chatbot, journal_hist_state, journal_active,
                     j_answer, btn_j_send, j_audio_in, journal_tasks_state,
                     journal_phase_state, journal_msg]
-    _J_MSG_IN  = [user_id_state, j_answer, j_audio_in, journal_chatbot,
-                  journal_hist_state, journal_tasks_state, journal_active, journal_phase_state]
-    _J_MSG_OUT = [journal_chatbot, journal_hist_state, j_answer, j_audio_in,
-                  journal_tasks_state, journal_active, journal_phase_state, journal_msg]
+    _J_MSG_IN    = [user_id_state, j_answer, j_audio_in, journal_chatbot,
+                    journal_hist_state, journal_tasks_state, journal_active, journal_phase_state]
+    _J_MSG_OUT   = [journal_chatbot, journal_hist_state, j_answer, j_audio_in,
+                    journal_tasks_state, journal_active, journal_phase_state, journal_msg]
 
     btn_j_start.click(handle_start_journal, [user_id_state], _J_START_OUT)
-    btn_j_send.click(handle_journal_message, _J_MSG_IN, _J_MSG_OUT)
-    j_answer.submit(handle_journal_message,  _J_MSG_IN, _J_MSG_OUT)
-    j_audio_in.change(handle_journal_message, _J_MSG_IN, _J_MSG_OUT)
+    btn_j_send.click(handle_journal_message,   _J_MSG_IN, _J_MSG_OUT)
+    j_answer.submit(handle_journal_message,    _J_MSG_IN, _J_MSG_OUT)
+    j_audio_in.change(handle_journal_message,  _J_MSG_IN, _J_MSG_OUT)
 
     btn_j_finish.click(
         handle_finish_journal,
         [user_id_state, journal_chatbot, journal_hist_state, journal_tasks_state],
         [journal_chatbot, journal_msg]
     )
-    btn_j_restart.click(handle_restart_journal, outputs=[
-        journal_chatbot, journal_hist_state, journal_active,
-        j_answer, btn_j_send, j_audio_in, journal_tasks_state,
-        journal_phase_state, journal_msg
-    ])
+    btn_j_restart.click(handle_restart_journal, outputs=_J_START_OUT)
 
-    # Areas & Goals
+    # ── Areas & Goals ─────────────────────────────────────────────────────
     btn_add_area.click(
         handle_add_area, [user_id_state, new_area_name, new_area_color],
         [area_msg, areas_display, del_area_dd, new_area_name]
@@ -1029,12 +1192,13 @@ with gr.Blocks(title="\U0001f9e0 Second Brain") as demo:
 
     btn_del_area.click(
         handle_del_area, [user_id_state, del_area_dd],
-        [del_area_msg, areas_display, del_area_dd]
+        [del_area_msg, areas_display]
+    ).then(lambda uid: render_areas_list(uid)[1], [user_id_state], [del_area_dd]
     ).then(lambda uid: gr.update(choices=_area_choices(uid), value="All"), [user_id_state], [all_filter])
 
     btn_save_goals.click(handle_save_goals, [user_id_state, goals_input], [goals_msg])
 
-    # Preferences
+    # ── Preferences ───────────────────────────────────────────────────────
     btn_save_prefs.click(
         handle_save_prefs,
         [user_id_state, pref_wake, pref_sleep, pref_focus, pref_break, pref_flow_max],