Update app.py

app.py

@@ -15,6 +15,7 @@ HuggingFace Spaces:
 """
 
 import os
+import json as _json
 import gradio as gr
 from datetime import date, datetime
 
@@ -23,7 +24,7 @@ from core.database import (
     init_db, register_user, login_user, get_username,
     create_default_life_areas, save_goals, get_goals,
     get_life_areas, get_life_area_names, add_life_area, delete_life_area,
-    get_tasks, save_task, toggle_task_complete, delete_task, get_today_stats,
+    get_tasks, save_task, assign_task_date, toggle_task_complete, delete_task, get_today_stats,
     load_user_context, save_user_context, spawn_due_habits,
 )
 from core.ai_engine import (
@@ -37,7 +38,7 @@ from core.styles import CSS
 init_db()
 init_groq()                         # reads GROQ_API_KEY from env
 
-TASK_HEADERS = ["ID", "Done", "Title", "Area", "Urgency", "Importance", "Mind", "Min", "Date"]
+TASK_HEADERS = ["ID", "Done", "Title", "Area", "Urgency", "Importance", "Mind", "Min", "Deadline", "Scheduled"]
 
 
 # ═══════════════════════════════════════════════════════════════════════════════
@@ -52,18 +53,33 @@ def _stat(val, label, color):
     return f'<div class="stat-card"><div class="stat-num" style="color:{color}">{val}</div><div class="stat-label">{label}</div></div>'
 
 def _fmt_tasks(tasks: list) -> list:
+    _today = date.today()
     rows = []
     for t in tasks:
+        dl = (t.get("deadline_date") or "").strip()
+        if dl and dl.lower() not in ("null", "none", ""):
+            try:
+                diff = (date.fromisoformat(dl) - _today).days
+                if diff < 0:    dl = f"❌ {dl}"
+                elif diff == 0: dl = "🚨 TODAY"
+                elif diff == 1: dl = "⚠️ tomorrow"
+                elif diff <= 3: dl = f"⏰ {dl}"
+            except ValueError:
+                pass
+        else:
+            dl = "—"
+        sched = (t.get("scheduled_date") or "").strip()
         rows.append([
             t["id"],
             "✅" if t["is_completed"] else "⬜",
             ("🔁 " if t["is_habit"] else "") + t["title"],
-            t["life_area"]    or "—",
-            t["urgency"]      or "—",
-            t["importance"]   or "—",
+            t["life_area"]     or "—",
+            t["urgency"]       or "—",
+            t["importance"]    or "—",
             t["state_of_mind"] or "—",
             str(t["time_estimate"]) + "m" if t["time_estimate"] else "—",
-            t["scheduled_date"] or "—",
+            dl,
+            sched if sched else "⬜ unscheduled",
         ])
     return rows
 
@@ -174,6 +190,9 @@ def handle_parse_text(task_text, user_id):
     if area_val not in area_choices:
         area_choices = [area_val] + area_choices
 
+    raw_dl = result.get("deadline_date") or ""
+    dl_val = "" if str(raw_dl).lower() in ("null", "none", "n/a", "") else str(raw_dl)
+
     return (
         gr.update(visible=True),
         result.get("title", task_text),
@@ -183,13 +202,13 @@ def handle_parse_text(task_text, user_id):
         result.get("importance", "Important"),
         result.get("state_of_mind", "Easy"),
         int(result.get("time_estimate") or 30),
-        str(date.today()),
+        dl_val,
         False,
         "Daily",
-        _ok("AI classified your task — please answer the clarification questions above." if has_clarifications else "AI classified your task"),
-        gr.update(visible=has_clarifications),  # clar_reply_row
-        clarifications,                          # clar_questions_state
-        task_text,                               # original_task_state
+        _ok("AI classified ✓ — answer questions above." if has_clarifications else "AI classified ✓"),
+        gr.update(visible=has_clarifications),
+        clarifications,
+        task_text,
     )
 
 
@@ -264,69 +283,121 @@ _whisper_model = None
 
 
 def handle_confirm_task(user_id, title, area, urgency, importance, state,
-                        time_est, sched_date, is_habit, habit_interval):
+                        time_est, deadline, is_habit, habit_interval):
     if not user_id:
-        return _err("Not logged in."), [], _stat("—","Today","#a78bfa"), _stat("—","Done","#4ade80"), _stat("—","Left","#f87171"), gr.update(visible=False)
+        return _err("Not logged in."), [], _stat("—","Today","#a78bfa"), _stat("—","Done","#4ade80"), _stat("—","Left","#f87171"), [], gr.update(visible=False)
     if not title.strip():
-        return _err("Title cannot be empty."), [], _stat("—","Today","#a78bfa"), _stat("—","Done","#4ade80"), _stat("—","Left","#f87171"), gr.update(visible=True)
+        return _err("Title cannot be empty."), [], _stat("—","Today","#a78bfa"), _stat("—","Done","#4ade80"), _stat("—","Left","#f87171"), [], gr.update(visible=True)
 
     task = {
         "title": title, "life_area": area,
         "urgency": urgency, "importance": importance, "state_of_mind": state,
         "time_estimate": int(time_est or 30),
+        "deadline_date": (deadline or "").strip(),
         "is_habit": is_habit,
         "habit_interval": habit_interval if is_habit else "",
     }
-    save_task(user_id, task, sched_date)
+    save_task(user_id, task, scheduled_date="")   # saved unscheduled — planner assigns date
     rows, s1, s2, s3 = refresh_today(user_id)
-    return _ok("Task saved!"), rows, s1, s2, s3, gr.update(visible=False)
-
-
-def handle_generate_schedule(user_id, prompt):
-    if not user_id:
-        return _err("Not logged in.")
-    tasks = get_tasks(user_id, only_today=True, include_completed=False)
-    if not tasks:
-        return _err("No incomplete tasks today to schedule.")
-
-    ctx   = _ensure_context(user_id)
-    goals = get_goals(user_id)
-    sched = generate_schedule(ctx, tasks, prompt or "Schedule my day sensibly.", goals)
+    all_rows = _fmt_tasks(get_tasks(user_id))
+    return _ok("✓ Task saved! Use 'Plan My Day' to schedule it."), rows, s1, s2, s3, all_rows, gr.update(visible=False)
 
-    if "error" in sched and "scheduled_tasks" not in sched:
-        return _err(f"Scheduling failed: {sched.get('error')}")
 
+def _render_sched_html(sched):
     COLOR = {"Flow": "#0ea5e9", "Easy": "#4ade80", "Quick": "#a78bfa", "Personal": "#f87171"}
-    html  = (
-        f'<div style="margin-bottom:14px">'
-        f'<span style="color:#a78bfa;font-size:12px;font-weight:600">📅 {sched.get("schedule_date","Today")}</span>'
-        f'<p style="color:#475569;font-size:13px;margin:6px 0 0">{sched.get("day_summary","")}</p>'
+    html = (
+        f'<div style="padding:12px;background:#0c1a0c;border-radius:8px;margin-bottom:12px">'
+        f'<div style="color:#4ade80;font-size:12px;font-weight:700">📅 {sched.get("schedule_date","Today")}</div>'
+        f'<div style="color:#94a3b8;font-size:13px;margin-top:4px">{sched.get("day_summary","")}</div>'
         f'</div>'
     )
-
     for t in sched.get("scheduled_tasks", []):
         sm = t.get("state_of_mind", "Easy")
         c  = COLOR.get(sm, "#6366f1")
         html += (
-            f'<div class="sched-card" style="border-left-color:{c}">'
-            f'<div class="sched-time">{t.get("start_time")} – {t.get("end_time")}</div>'
-            f'<div class="sched-title">{t.get("title")}</div>'
-            f'<div class="sched-meta">{t.get("life_area","—")} · {sm} · {t.get("duration_minutes")}min</div>'
+            f'<div class="sched-card" style="border-left-color:{c};margin-bottom:6px">'
+            f'<div class="sched-time">{t.get("start_time","?")} – {t.get("end_time","?")}</div>'
+            f'<div class="sched-title">{t.get("title","")}</div>'
+            f'<div class="sched-meta">{t.get("life_area","—")} · {sm} · {t.get("duration_minutes","?")}min</div>'
             f'<div class="sched-why">{t.get("scheduling_reason","")}</div>'
             f'</div>'
         )
-
     if sched.get("deferred_tasks"):
-        html += '<div style="margin-top:12px;color:#334155;font-size:11px;font-weight:600;letter-spacing:.6px;text-transform:uppercase">Deferred</div>'
+        html += '<div style="color:#475569;font-size:11px;font-weight:600;margin:10px 0 4px;text-transform:uppercase">Deferred</div>'
         for t in sched["deferred_tasks"]:
-            html += f'<div style="color:#475569;font-size:12px;padding:3px 0">✗ {t["title"]} — {t.get("reason","")}</div>'
-
+            html += f'<div style="color:#475569;font-size:12px;padding:2px 0">✗ {t["title"]} — {t.get("reason","")}</div>'
     for w in sched.get("warnings", []):
-        html += f'<div style="margin-top:8px;color:#f59e0b;font-size:12px">⚠ {w}</div>'
-
+        html += f'<div style="color:#f59e0b;font-size:12px;margin-top:6px">⚠ {w}</div>'
     return html
 
 
+def handle_generate_schedule(user_id, prompt):
+    """Step 1: generate proposal only. Nothing written to DB."""
+    if not user_id:
+        return _err("Not logged in."), "", gr.update(visible=False)
+    tasks = get_tasks(user_id, include_completed=False)
+    if not tasks:
+        return _err("No tasks found. Add some tasks first."), "", gr.update(visible=False)
+    ctx   = _ensure_context(user_id)
+    goals = get_goals(user_id)
+    try:
+        sched = generate_schedule(ctx, tasks, prompt or "Schedule all my tasks intelligently across upcoming days.", goals)
+    except Exception as e:
+        return _err(f"Scheduling error: {e}"), "", gr.update(visible=False)
+    if "error" in sched and "scheduled_tasks" not in sched:
+        return _err(f"Scheduling failed: {sched.get('error')}"), "", gr.update(visible=False)
+    html = _render_sched_html(sched)
+    return html, _json.dumps(sched), gr.update(visible=True)
+
+
+def handle_confirm_schedule(user_id, pending_json):
+    """Step 2a: apply the proposed schedule to the database."""
+    if not user_id or not pending_json:
+        return _err("Nothing to confirm."), gr.update(visible=False), [], []
+    try:
+        sched = _json.loads(pending_json)
+    except Exception:
+        return _err("Could not read proposal."), gr.update(visible=False), [], []
+    count = 0
+    sched_date = sched.get("schedule_date", str(date.today()))
+    for t in sched.get("scheduled_tasks", []):
+        tid = t.get("task_id") or t.get("id")
+        if tid:
+            try:
+                assign_task_date(int(tid), user_id, sched_date)
+                count += 1
+            except Exception:
+                pass
+    all_rows = _fmt_tasks(get_tasks(user_id))
+    today_rows = _fmt_tasks(get_tasks(user_id, only_today=True))
+    return _ok(f"✓ {count} tasks scheduled for {sched_date}!"), gr.update(visible=False), all_rows, today_rows
+
+
+def handle_refine_schedule(user_id, refinement, pending_json):
+    """Step 2b: re-run with a refinement instruction."""
+    if not user_id or not refinement.strip():
+        return gr.update(), gr.update(), gr.update()
+    hint = ""
+    if pending_json:
+        try:
+            old = _json.loads(pending_json)
+            hint = f"\n\nPrevious plan summary: {old.get('day_summary', '')}"
+        except Exception:
+            pass
+    return handle_generate_schedule(user_id, refinement + hint)
+
+
+def handle_manual_assign(task_id, task_date, user_id):
+    """Manually assign a date to a specific task."""
+    if not task_id or not task_date or not user_id:
+        return _err("Enter task ID and date.")
+    try:
+        assign_task_date(int(task_id), user_id, task_date.strip())
+        return _ok(f"Task #{int(task_id)} assigned to {task_date.strip()}")
+    except Exception as e:
+        return _err(f"Error: {e}")
+
+
 def handle_toggle_today(task_id, user_id):
     if task_id and user_id:
         toggle_task_complete(int(task_id), user_id)
@@ -423,16 +494,8 @@ def handle_start_journal(user_id, tasks_state):
     if not tasks_state:
         return [], [], False, gr.update(interactive=False), gr.update(interactive=False), _err("Load today's tasks first.")
 
-    try:
-        ctx     = _ensure_context(user_id)
-        opening = build_opening_question(ctx, tasks_state)
-    except Exception as e:
-        return (
-            [{"role": "assistant", "content": f"⚠ Could not start session: {e}"}],
-            [], False,
-            gr.update(interactive=False), gr.update(interactive=False),
-            _err(f"Start failed: {e}")
-        )
+    ctx     = _ensure_context(user_id)
+    opening = build_opening_question(ctx, tasks_state)
     chat    = [{"role": "assistant", "content": opening["question"]}]
     hist    = [{"role": "assistant", "content": opening["question"], "focus": opening["question_focus"]}]
 
@@ -448,24 +511,17 @@ def handle_send_answer(user_id, answer, chat, hist, tasks_state, active):
     if not active or not answer.strip():
         return chat, hist, "", ""
 
-    # Append user message as dict (Gradio 4.44 requires dict format for Chatbot)
     chat = list(chat) + [{"role": "user", "content": answer}]
     hist = list(hist) + [{"role": "user", "content": answer}]
 
-    ctx = _ensure_context(user_id)
-    try:
-        result = get_next_journal_question(ctx, tasks_state, hist)
-    except Exception as e:
-        chat = list(chat) + [{"role": "assistant", "content": f"⚠ AI error: {e}. Please try again."}]
-        return chat, hist, "", _err(f"AI error: {e}")
+    ctx    = _ensure_context(user_id)
+    result = get_next_journal_question(ctx, tasks_state, hist)
 
     if result.get("session_complete"):
-        bot_reply = "✅ That's enough for today. Click **Finish & Save** to update your profile."
-        hist.append({"role": "assistant", "content": bot_reply})
-        chat = list(chat) + [{"role": "assistant", "content": bot_reply}]
+        chat = list(chat) + [{"role": "assistant", "content": "✅ That's enough for today. Click **Finish & Save** to update your profile."}]
         return chat, hist, "", _ok("Session complete — save when ready")
 
-    next_q = result.get("question", "Anything else you'd like to reflect on?")
+    next_q = result.get("question", "")
     hist.append({"role": "assistant", "content": next_q, "focus": result.get("question_focus", "")})
     chat = list(chat) + [{"role": "assistant", "content": next_q}]
     return chat, hist, "", ""
@@ -475,12 +531,9 @@ def handle_finish_journal(user_id, chat, hist, tasks_state):
     if not user_id or not hist:
         return chat, _err("Nothing to save.")
 
-    try:
-        ctx     = _ensure_context(user_id)
-        updated = synthesize_journal(ctx, tasks_state, hist)
-        save_user_context(user_id, updated)
-    except Exception as e:
-        return chat, _err(f"Save failed: {e}")
+    ctx     = _ensure_context(user_id)
+    updated = synthesize_journal(ctx, tasks_state, hist)
+    save_user_context(user_id, updated)
 
     total = len(tasks_state)
     done  = sum(1 for t in tasks_state if t.get("completed"))
@@ -654,6 +707,76 @@ def render_context_html(user_id):
     return html
 
 
+# ═════════════════════════════════════════════════════════════════════════════��═
+# CALENDAR VIEW
+# ═══════════════════════════════════════════════════════════════════════════════
+
+def render_calendar(user_id):
+    if not user_id:
+        return "<p style='color:#475569;font-size:13px'>Sign in to view calendar.</p>"
+    tasks = get_tasks(user_id)
+    if not tasks:
+        return "<p style='color:#475569;font-size:13px'>No tasks yet.</p>"
+    _today = date.today()
+    COLOR = {"Flow":"#0ea5e9","Easy":"#4ade80","Quick":"#a78bfa","Personal":"#f87171"}
+    by_date, unscheduled = {}, []
+    for t in tasks:
+        sd = (t.get("scheduled_date") or "").strip()
+        if sd:
+            by_date.setdefault(sd, []).append(t)
+        else:
+            unscheduled.append(t)
+    html = ""
+    for d in sorted(by_date.keys()):
+        try:
+            dt   = date.fromisoformat(d)
+            diff = (dt - _today).days
+            if diff == 0:   label = f"TODAY — {dt.strftime('%a, %b %d')}"
+            elif diff == 1: label = f"TOMORROW — {dt.strftime('%a, %b %d')}"
+            elif diff < 0:  label = dt.strftime('%a, %b %d') + " (past)"
+            else:           label = dt.strftime('%a, %b %d')
+            hdr = "#a78bfa" if diff == 0 else "#60a5fa" if diff > 0 else "#334155"
+        except ValueError:
+            label, hdr = d, "#60a5fa"
+        html += (f'<div style="margin-bottom:20px">'
+                 f'<div style="color:{hdr};font-size:11px;font-weight:700;letter-spacing:1px;'
+                 f'text-transform:uppercase;padding:6px 0;border-bottom:1px solid #1e293b;margin-bottom:8px">'
+                 f'📅 {label}</div>')
+        for t in by_date[d]:
+            sm   = t.get("state_of_mind","Easy")
+            c    = COLOR.get(sm,"#6366f1")
+            done = t.get("is_completed")
+            dl   = (t.get("deadline_date") or "").strip()
+            dl_badge = (f'<span style="background:#f8714422;color:#f87171;font-size:10px;'
+                        f'padding:1px 5px;border-radius:4px;margin-left:6px">due {dl}</span>'
+                        ) if dl and dl.lower() not in ("null","none","") else ""
+            html += (f'<div style="padding:8px 10px;margin-bottom:4px;background:#0c0f1a;border-radius:8px;'
+                     f'border-left:3px solid {c};opacity:{"0.4" if done else "1"}">'
+                     f'<div style="color:#cbd5e1;font-size:13px">{"✅" if done else "⬜"} '
+                     f'<b>#{t["id"]}</b> {t["title"]}{dl_badge}</div>'
+                     f'<div style="color:#475569;font-size:11px;margin-top:2px">'
+                     f'{t.get("life_area","—")} · {sm} · {t.get("time_estimate","?")}min</div></div>')
+        html += '</div>'
+    if unscheduled:
+        html += ('<div style="margin-top:10px"><div style="color:#334155;font-size:11px;font-weight:700;'
+                 'letter-spacing:1px;text-transform:uppercase;padding:6px 0;border-bottom:1px solid #1e293b;margin-bottom:8px">'
+                 '⬜ UNSCHEDULED — Use Plan My Day to assign dates</div>')
+        for t in unscheduled:
+            sm = t.get("state_of_mind","Easy")
+            c  = COLOR.get(sm,"#6366f1")
+            dl = (t.get("deadline_date") or "").strip()
+            dl_badge = (f'<span style="background:#f8714422;color:#f87171;font-size:10px;'
+                        f'padding:1px 5px;border-radius:4px;margin-left:6px">due {dl}</span>'
+                        ) if dl and dl.lower() not in ("null","none","") else ""
+            html += (f'<div style="padding:8px 10px;margin-bottom:4px;background:#0c0f1a;border-radius:8px;'
+                     f'border-left:3px solid {c}">'
+                     f'<div style="color:#94a3b8;font-size:13px">⬜ <b>#{t["id"]}</b> {t["title"]}{dl_badge}</div>'
+                     f'<div style="color:#475569;font-size:11px;margin-top:2px">'
+                     f'{t.get("life_area","—")} · {sm} · {t.get("time_estimate","?")}min</div></div>')
+        html += '</div>'
+    return html or "<p style='color:#475569'>No tasks.</p>"
+
+
 # ═══════════════════════════════════════════════════════════════════════════════
 # UI BUILD
 # ═══════════════════════════════════════════════════════════════════════════════
@@ -763,7 +886,7 @@ with gr.Blocks(title="🧠 Second Brain") as demo:
                             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, allow_custom_value=True)
+                                                  scale=1)
                         with gr.Row():
                             f_urgency    = gr.Dropdown(label="Urgency",
                                                        choices=["Urgent","Not Urgent","Habit"], value="Not Urgent")
@@ -774,7 +897,7 @@ with gr.Blocks(title="🧠 Second Brain") as demo:
                                                        choices=["Flow","Easy","Quick","Personal"], value="Easy")
                         with gr.Row():
                             f_time    = gr.Number(label="Minutes", value=30, minimum=5, scale=1)
-                            f_date    = gr.Textbox(label="Scheduled Date", value=str(date.today()), scale=1)
+                            f_date    = gr.Textbox(label="Deadline (YYYY-MM-DD, optional)", placeholder="e.g. 2026-03-15", value="", scale=1)
                             f_is_habit = gr.Checkbox(label="♻️ This is a habit", scale=1)
                             f_interval = gr.Dropdown(label="Recurs",
                                                      choices=["Daily","Weekly","Weekdays","Weekends","Monthly"],
@@ -799,16 +922,34 @@ with gr.Blocks(title="🧠 Second Brain") as demo:
                 # ── Plan My Day panel ─────────────────────────────────────
                 with gr.Column(visible=False, elem_classes="panel") as plan_panel:
                     gr.HTML('<div class="sec-label">Plan My Day</div>')
-                    gr.HTML('<p style="color:#334155;font-size:13px;margin-bottom:12px">The AI reads your tasks, context, and goals to build the optimal schedule.</p>')
+                    gr.HTML('<p style="color:#94a3b8;font-size:13px;margin-bottom:10px">AI schedules ALL your unscheduled tasks using your patterns and goals. Review before applying.</p>')
                     plan_prompt = gr.Textbox(
-                        label="Any fixed events or preferences today?",
-                        placeholder="e.g. I have a meeting at 10am, want deep work in the morning, done by 7pm",
-                        lines=3
+                        label="Instructions (optional)",
+                        placeholder="e.g. 'Schedule everything for this week' or 'I have a meeting at 2pm, focus on Work tasks'",
+                        lines=2
                     )
                     with gr.Row():
-                        btn_gen_sched  = gr.Button("✨ Generate Schedule", elem_classes="btn-primary")
+                        btn_gen_sched   = gr.Button("🧠 Generate Plan", elem_classes="btn-primary")
                         btn_cancel_plan = gr.Button("Cancel", elem_classes="btn-secondary")
-                    schedule_html = gr.HTML("")
+                    schedule_html  = gr.HTML("")
+                    sched_pending  = gr.State("")
+                    with gr.Column(visible=False) as sched_confirm_row:
+                        gr.HTML('<div style="padding:10px;background:#0c1a0c;border-radius:8px;margin:8px 0">'
+                                '<span style="color:#4ade80;font-weight:600;font-size:13px">👆 Review the plan above, then:</span></div>')
+                        with gr.Row():
+                            btn_sched_ok      = gr.Button("✅ Confirm & Apply", elem_classes="btn-success", scale=2)
+                            btn_sched_discard = gr.Button("✗ Discard",          elem_classes="btn-danger",  scale=1)
+                        gr.HTML('<div style="color:#475569;font-size:12px;margin:10px 0 4px">💬 Or refine it:</div>')
+                        with gr.Row():
+                            sched_refine_txt = gr.Textbox(label="", placeholder="e.g. Move Flow tasks to morning, skip Fridays", scale=4)
+                            btn_sched_refine = gr.Button("🔄 Re-plan", elem_classes="btn-accent", scale=1)
+                        gr.HTML('<div style="color:#475569;font-size:12px;margin:10px 0 4px">📌 Or manually assign a task:</div>')
+                        with gr.Row():
+                            manual_tid  = gr.Number(label="Task ID", precision=0, scale=1)
+                            manual_date = gr.Textbox(label="Date (YYYY-MM-DD)", placeholder=str(date.today()), scale=2)
+                            btn_manual  = gr.Button("Assign Date", elem_classes="btn-secondary", scale=1)
+                        manual_msg  = gr.HTML("")
+                    sched_status = gr.HTML("")
 
                 # ── Today's task table ────────────────────────────────────
                 gr.HTML('<div class="sec-label" style="margin-top:20px">Today\'s Tasks</div>')
@@ -838,7 +979,16 @@ with gr.Blocks(title="🧠 Second Brain") as demo:
                 all_action_msg = gr.HTML("")
 
             # ─────────────────────────────────────────────────────────────
-            # TAB 3: JOURNAL
+            # TAB 3: CALENDAR
+            # ─────────────────────────────────────────────────────────────
+            with gr.Tab("📆 Calendar"):
+                gr.HTML('<p style="color:#475569;font-size:13px;margin-bottom:10px">All tasks grouped by scheduled date. Unscheduled tasks appear at the bottom — use Plan My Day to assign them.</p>')
+                with gr.Row():
+                    btn_cal_refresh = gr.Button("↻ Refresh", elem_classes="btn-secondary", scale=1)
+                calendar_html = gr.HTML("")
+
+            # ─────────────────────────────────────────────────────────────
+            # TAB 4: JOURNAL
             # ─────────────────────────────────────────────────────────────
             with gr.Tab("📓 Journal"):
                 gr.HTML('<p style="color:#334155;font-size:13px;margin-bottom:16px">Mark today\'s tasks complete, then reflect. The AI updates your profile to improve tomorrow\'s schedule.</p>')
@@ -940,6 +1090,11 @@ with gr.Blocks(title="🧠 Second Brain") as demo:
     ).then(
         refresh_today, [user_id_state],
         [today_df, stat_total, stat_done, stat_remain]
+    ).then(
+        lambda uid: _fmt_tasks(get_tasks(uid)) if uid else [],
+        [user_id_state], [all_df]
+    ).then(
+        render_calendar, [user_id_state], [calendar_html]
     ).then(
         lambda uid: render_areas(uid)[0:2],
         [user_id_state], [areas_display, del_area_dd]
@@ -960,6 +1115,11 @@ with gr.Blocks(title="🧠 Second Brain") as demo:
     ).then(
         refresh_today, [user_id_state],
         [today_df, stat_total, stat_done, stat_remain]
+    ).then(
+        lambda uid: _fmt_tasks(get_tasks(uid)) if uid else [],
+        [user_id_state], [all_df]
+    ).then(
+        render_calendar, [user_id_state], [calendar_html]
     ).then(
         lambda uid: render_areas(uid)[0:2],
         [user_id_state], [areas_display, del_area_dd]
@@ -1024,25 +1184,56 @@ with gr.Blocks(title="🧠 Second Brain") as demo:
         handle_confirm_task,
         [user_id_state, f_title, f_area, f_urgency, f_importance, f_state,
          f_time, f_date, f_is_habit, f_interval],
-        [save_msg, today_df, stat_total, stat_done, stat_remain, parsed_panel]
-    )
+        [save_msg, today_df, stat_total, stat_done, stat_remain, all_df, parsed_panel]
+    ).then(render_calendar, [user_id_state], [calendar_html])
 
     btn_gen_sched.click(
         handle_generate_schedule,
         [user_id_state, plan_prompt],
-        [schedule_html]
+        [schedule_html, sched_pending, sched_confirm_row]
+    )
+    btn_sched_ok.click(
+        handle_confirm_schedule,
+        [user_id_state, sched_pending],
+        [sched_status, sched_confirm_row, all_df, today_df]
+    ).then(render_calendar, [user_id_state], [calendar_html])
+    btn_sched_discard.click(
+        lambda: ("", gr.update(visible=False)),
+        outputs=[schedule_html, sched_confirm_row]
     )
+    btn_sched_refine.click(
+        handle_refine_schedule,
+        [user_id_state, sched_refine_txt, sched_pending],
+        [schedule_html, sched_pending, sched_confirm_row]
+    ).then(lambda: "", outputs=[sched_refine_txt])
+    btn_manual.click(
+        handle_manual_assign,
+        [manual_tid, manual_date, user_id_state],
+        [manual_msg]
+    ).then(
+        lambda uid: _fmt_tasks(get_tasks(uid)) if uid else [],
+        [user_id_state], [all_df]
+    ).then(render_calendar, [user_id_state], [calendar_html])
 
     btn_today_done.click(
         handle_toggle_today,
         [today_done_id, user_id_state],
         [today_df, stat_total, stat_done, stat_remain, today_action_msg]
-    )
+    ).then(
+        lambda uid: _fmt_tasks(get_tasks(uid)) if uid else [],
+        [user_id_state], [all_df]
+    ).then(render_calendar, [user_id_state], [calendar_html])
     btn_today_del.click(
         handle_delete_today,
         [today_del_id, user_id_state],
         [today_df, stat_total, stat_done, stat_remain, today_action_msg]
-    )
+    ).then(
+        lambda uid: _fmt_tasks(get_tasks(uid)) if uid else [],
+        [user_id_state], [all_df]
+    ).then(render_calendar, [user_id_state], [calendar_html])
+
+    # ── Calendar tab ──────────────────────────────────────────────────────────
+    btn_cal_refresh.click(render_calendar, [user_id_state], [calendar_html])
 
     # ── All Tasks tab ──────────────────────────────────────────────────────
 
@@ -1065,12 +1256,12 @@ with gr.Blocks(title="🧠 Second Brain") as demo:
         handle_toggle_all,
         [all_done_id, user_id_state, all_filter, all_today_chk],
         [all_df, all_action_msg]
-    )
+    ).then(render_calendar, [user_id_state], [calendar_html])
     btn_all_del.click(
         handle_delete_all,
         [all_del_id, user_id_state, all_filter, all_today_chk],
         [all_df, all_action_msg]
-    )
+    ).then(render_calendar, [user_id_state], [calendar_html])
 
     # ── Journal tab ────────────────────────────────────────────────────────