Update app.py

app.py

@@ -1,5 +1,5 @@
 """
-app.py  —  Second Brain Gradio Application
+app.py  -  Second Brain Gradio Application
 """
 
 import os
@@ -10,12 +10,12 @@ 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,
-    load_user_context, save_user_context, spawn_due_habits,
+    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 (
     init_groq, create_blank_context,
-    parse_task_with_groq, generate_schedule,
+    parse_task_with_groq, smart_schedule_tasks,
     build_opening_question, get_next_journal_question, synthesize_journal,
 )
 from core.styles import CSS
@@ -23,30 +23,54 @@ from core.styles import CSS
 init_db()
 init_groq()
 
-TASK_HEADERS = ["ID", "Done", "Title", "Area", "Urgency", "Importance", "Mind", "Min", "Date"]
+# Deadline added to headers
+TASK_HEADERS = ["ID", "Done", "Title", "Area", "Urgency", "Importance", "Mind", "Min", "Deadline", "Scheduled"]
 _whisper_model = None
 
 
-# ═══════════════════════════════════════════════════════════════════════════════
+# =============================================================================
 # SHARED HELPERS
-# ═══════════════════════════════════════════════════════════════════════════════
+# =============================================================================
 
-def _ok(msg):   return f'<span style="color:#4ade80;font-size:13px">✓ {msg}</span>'
-def _err(msg):  return f'<span style="color:#f87171;font-size:13px">⚠ {msg}</span>'
-def _info(msg): return f'<span style="color:#60a5fa;font-size:13px">ℹ {msg}</span>'
+def _ok(msg):   return f'<span style="color:#4ade80;font-size:13px">\u2713 {msg}</span>'
+def _err(msg):  return f'<span style="color:#f87171;font-size:13px">\u26a0 {msg}</span>'
+def _info(msg): return f'<span style="color:#60a5fa;font-size:13px">\u2139 {msg}</span>'
 
 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):
-    return [[
-        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["state_of_mind"] or "—",
-        str(t["time_estimate"]) + "m" if t["time_estimate"] else "—",
-        t["scheduled_date"] or "—",
-    ] for t in tasks]
+    rows = []
+    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}"
+            except ValueError:
+                pass
+        rows.append([
+            t["id"],
+            "\u2705" if t["is_completed"] else "\u2b1c",
+            ("\U0001f501 " if t["is_habit"] else "") + t["title"],
+            t["life_area"]     or "\u2014",
+            t["urgency"]       or "\u2014",
+            t["importance"]    or "\u2014",
+            t["state_of_mind"] or "\u2014",
+            str(t["time_estimate"]) + "m" if t["time_estimate"] else "\u2014",
+            deadline or "\u2014",
+            t["scheduled_date"] or "\u2014 unscheduled",
+        ])
+    return rows
 
 def _area_choices(user_id):
     return ["All"] + (get_life_area_names(user_id) if user_id else [])
@@ -73,7 +97,7 @@ def _build_clar_html(clarifications):
     return (
         f'<div style="margin:10px 0;padding:12px;background:#0c0f1a;'
         f'border-left:3px solid #a78bfa;border-radius:8px">'
-        f'<div style="color:#a78bfa;font-size:11px;font-weight:600;margin-bottom:6px">⚠ Please clarify:</div>'
+        f'<div style="color:#a78bfa;font-size:11px;font-weight:600;margin-bottom:6px">\u26a0 Please clarify:</div>'
         f'<ul style="color:#94a3b8;font-size:13px;margin:0;padding-left:16px">{items}</ul></div>'
     )
 
@@ -89,10 +113,14 @@ 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=""):
-    """Convert a parse result into the standard 15-value tuple for UI outputs."""
     if not status:
-        status = _ok("AI classified your task — answer the questions above." if has_clar else "AI classified your task ✓")
+        status = _ok("AI classified your task \u2014 answer the questions above." if has_clar else "AI classified your task \u2713")
     return (
         gr.update(visible=True),
         result.get("title", task_text),
@@ -101,7 +129,8 @@ 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),
-        str(date.today()), False, "Daily",
+        "",          # deadline_date — left empty for user to fill if needed
+        False, "Daily",
         status,
         gr.update(visible=has_clar),
         clars, task_text,
@@ -109,14 +138,14 @@ def _parse_result_to_outputs(result, clar_html, has_clar, area_val, clars, task_
 
 _EMPTY_PARSE = (
     gr.update(visible=False), "", "", "Work", "Not Urgent", "Important",
-    "Easy", 30, str(date.today()), False, "Daily", "",
+    "Easy", 30, "", False, "Daily", "",
     gr.update(visible=False), [], "",
 )
 
 
-# ═══════════════════════════════════════════════════════════════════════════════
+# =============================================================================
 # AUTH
-# ═══════════════════════════════════════════════════════════════════════════════
+# =============================================================================
 
 def handle_login(username, password):
     uid, msg = login_user(username, password)
@@ -141,18 +170,24 @@ def handle_logout(user_id):
     return None, "", gr.update(visible=True), gr.update(visible=False)
 
 
-# ═══════════════════════════════════════════════════════════════════════════════
+# =============================================================================
 # TODAY TAB
-# ═══════════════════════════════════════════════════════════════════════════════
+# =============================================================================
 
 def refresh_today(user_id):
     if not user_id:
-        return [], _stat("—","Today","#a78bfa"), _stat("—","Done","#4ade80"), _stat("—","Left","#f87171")
+        return [], _stat("\u2014","Today","#a78bfa"), _stat("\u2014","Done","#4ade80"), _stat("\u2014","Left","#f87171")
     tasks = get_tasks(user_id, only_today=True)
     s = get_today_stats(user_id)
     c = "#4ade80" if s["remaining"] == 0 and s["total"] > 0 else "#f87171"
     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 []
+    return _fmt_tasks(get_tasks(user_id))
+
 def show_text_panel():  return gr.update(visible=True),  gr.update(visible=False), gr.update(visible=False)
 def show_voice_panel(): return gr.update(visible=False), gr.update(visible=True),  gr.update(visible=False)
 def show_plan_panel():  return gr.update(visible=False), gr.update(visible=False), gr.update(visible=True)
@@ -167,29 +202,30 @@ def handle_parse_text(task_text, user_id):
 
 def handle_clarification_reply(user_reply, original_task, clarifications, user_id):
     if not user_reply.strip():
-        return (gr.update(),)*7 + (gr.update(visible=True), [])
+        return (gr.update(),)*8 + (gr.update(visible=True), [])
     q_block  = "\n".join(f"Q: {q}" for q in clarifications)
     enriched = f"{original_task}\n\nUser clarification:\n{q_block}\nA: {user_reply}"
     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">✓ Classification updated!</span>'
+        clar_html_val = '<span style="color:#4ade80;font-size:13px">\u2713 Classification updated!</span>'
     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,
     )
 
 def handle_clar_voice(audio_path, original_task, clarifications, user_id):
     if not audio_path:
-        return (gr.update(),)*7 + (gr.update(visible=True), [])
+        return (gr.update(),)*8 + (gr.update(visible=True), [])
     try:
         reply = _transcribe(audio_path)
         return handle_clarification_reply(reply, original_task, clarifications, user_id)
-    except Exception as e:
-        return (gr.update(),)*7 + (gr.update(visible=True), clarifications)
+    except Exception:
+        return (gr.update(),)*8 + (gr.update(visible=True), clarifications)
 
-# ── Voice parse — full pipeline ────────────────────────────────────────────────
+# ── Voice parse ────────────────────────────────────────────────────────────────
 
 def handle_voice_parse(audio_path, user_id):
     if audio_path is None:
@@ -201,47 +237,136 @@ def handle_voice_parse(audio_path, user_id):
     if not text:
         return _EMPTY_PARSE[:-2] + (_err("Could not hear anything. Try again."), gr.update(visible=False), [], "")
     result, clar_html, has_clar, area_val, clars = _run_parse(text, user_id)
-    preview = text[:50] + ("…" if len(text) > 50 else "")
-    status  = _ok(f'Heard: "{preview}" — classified ✓' + (" Please answer questions." if has_clar else ""))
+    preview = text[:50] + ("\u2026" if len(text) > 50 else "")
+    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 ───────────────────────────────────────────────────────────────
+# ── Confirm task — saves WITHOUT a scheduled date ──────────────────────────────
 
-def handle_confirm_task(user_id, title, area, urgency, importance, state, time_est, sched_date, is_habit, habit_interval):
+def handle_confirm_task(user_id, title, area, urgency, importance, state,
+                        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("\u2014","Today","#a78bfa"), _stat("\u2014","Done","#4ade80"), _stat("\u2014","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("\u2014","Today","#a78bfa"), _stat("\u2014","Done","#4ade80"), _stat("\u2014","Left","#f87171"), [], gr.update(visible=True)
     save_task(user_id, {
         "title": title, "life_area": area, "urgency": urgency, "importance": importance,
         "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 "",
-    }, sched_date)
+    }, scheduled_date="")  # <- no date assigned; scheduler does this
     rows, s1, s2, s3 = refresh_today(user_id)
-    return _ok("Task saved!"), rows, s1, s2, s3, gr.update(visible=False)
+    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)
 
-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.")
-    sched = generate_schedule(_ensure_context(user_id), tasks, prompt or "Schedule my day sensibly.", get_goals(user_id))
-    if "error" in sched and "scheduled_tasks" not in sched:
-        return _err(f"Scheduling failed: {sched.get('error')}")
-    COLOR = {"Flow":"#0ea5e9","Easy":"#4ade80","Quick":"#a78bfa","Personal":"#f87171"}
-    html  = (f'<div style="margin-bottom:14px"><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></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}"><div class="sched-time">{t.get("start_time")} – {t.get("end_time")}</div>'
-                 f'<div class="sched-title">{t.get("title")}</div><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></div>')
-    if sched.get("deferred_tasks"):
-        html += '<div style="margin-top:12px;color:#334155;font-size:11px;font-weight:600;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>'
-    for w in sched.get("warnings", []):
-        html += f'<div style="margin-top:8px;color:#f59e0b;font-size:12px">⚠ {w}</div>'
-    return html
+
+# =============================================================================
+# SMART TASK SCHEDULER (Plan My Tasks)
+# =============================================================================
+
+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.
+    """
+    if not user_id:
+        return _err("Not logged in."), ""
+
+    # 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
+        unscheduled = all_tasks
+        prompt = prompt + " (Note: all tasks already have dates; feel free to reassign them)"
+
+    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,
+    )
+
+    # 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"}
+
+    # Summary header
+    html = (
+        f'<div style="margin-bottom:14px;padding:12px;background:#0c0f1a;border-radius:10px;">'
+        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'</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)
+
+    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')})"
+        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>'
+        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 = ""
+            if task.get("deadline_date"):
+                deadline_str = f' | \u23f3 deadline {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","\u2014")} \u00b7 {sm} \u00b7 {task.get("time_estimate","?")}min{deadline_str}</div>'
+                f'<div class="sched-why">\U0001f4a1 {a.get("reasoning","")}</div>'
+                f'</div>'
+            )
+
+    # Skipped tasks
+    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>'
+        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)
@@ -254,12 +379,13 @@ def handle_delete_today(task_id, user_id):
     return rows, s1, s2, s3, _ok("Deleted")
 
 
-# ═══════════════════════════════════════════════════════════════════════════════
+# =============================================================================
 # ALL TASKS TAB
-# ═══════════════════════════════════════════════════════════════════════════════
+# =============================================================================
 
 def refresh_all_tasks(user_id, filter_area="All", only_today=False):
-    return _fmt_tasks(get_tasks(user_id, filter_area=filter_area, only_today=only_today)) if user_id else []
+    if not user_id: return []
+    return _fmt_tasks(get_tasks(user_id, filter_area=filter_area, only_today=only_today))
 
 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)
@@ -270,31 +396,31 @@ def handle_delete_all(task_id, user_id, filter_area, only_today):
     return refresh_all_tasks(user_id, filter_area, only_today), _ok("Deleted")
 
 
-# ═══════════════════════════════════════════════════════════════════════════════
-# JOURNAL — CHAT-FIRST, VOICE-AWARE
-# ═══════════════════════════════════════════════════════════════════════════════
+# =============================================================================
+# JOURNAL
+# =============================================================================
 
 def _task_list_md(tasks):
     if not tasks: return "*No tasks found.*"
     lines = []
     for t in tasks:
         tid    = t.get("task_id") or t.get("id")
-        status = "✅" if (t.get("is_completed") or t.get("completed")) else "⬜"
-        dur    = f" · {t['actual_duration']}m actual" if t.get("actual_duration") else ""
-        lines.append(f"{status} **#{tid}** {t['title']} _{t.get('life_area','')} · {t.get('time_estimate','')}m{dur}_")
+        status = "\u2705" if (t.get("is_completed") or t.get("completed")) else "\u2b1c"
+        dur    = f" \u00b7 {t['actual_duration']}m actual" if t.get("actual_duration") else ""
+        lines.append(f"{status} **#{tid}** {t['title']} _{t.get('life_area','')} \u00b7 {t.get('time_estimate','')}m{dur}_")
     return "\n".join(lines)
 
 def _parse_ids(text, valid_ids):
-    import re
-    return [int(n) for n in re.findall(r'\b(\d+)\b', text) if int(n) in 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 handle_start_journal(user_id):
     blank = ([], [], False, gr.update(interactive=False), gr.update(interactive=False), gr.update(interactive=False), [], "marking", "")
     if not user_id:
-        return ([(None, "⚠ Please sign in first.")],) + blank[1:]
+        return ([(None, "\u26a0 Please sign in first.")],) + blank[1:]
     tasks = get_tasks(user_id, only_today=True)
     if not tasks:
-        msg = "You don't have any tasks logged for today. Add some tasks first, then come back to reflect!"
+        msg = "No tasks logged for today. Add and schedule some tasks first, then come back to reflect!"
         return ([(None, msg)],) + blank[1:]
 
     tasks_state = [{
@@ -308,16 +434,16 @@ def handle_start_journal(user_id):
     task_md   = _task_list_md(tasks_state)
 
     if completed == total and total > 0:
-        opener = f"🎉 You knocked out all **{total}** tasks today — great work!\n\n{task_md}\n\nDid the day feel productive, or were you grinding through it?"
+        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 go straight to reflecting.")
+                  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"
-                  f"You've done **{completed}/{total}** so far. Still open: {inc_str}. "
+        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)
@@ -330,8 +456,6 @@ def handle_start_journal(user_id):
 
 
 def handle_journal_message(user_id, user_text, audio_path, chat, hist, tasks_state, active, phase):
-    """Unified handler for text + voice journal messages."""
-    # Resolve voice input
     voice_used = False
     if audio_path is not None:
         try:
@@ -340,19 +464,17 @@ def handle_journal_message(user_id, user_text, audio_path, chat, hist, tasks_sta
                 user_text  = transcribed
                 voice_used = True
         except Exception as e:
-            err = (None, f"⚠ Couldn't transcribe audio: {e}. Please type instead.")
+            err = (None, f"\u26a0 Couldn\'t transcribe audio: {e}. Please type instead.")
             return list(chat) + [err], hist, "", None, tasks_state, active, phase, ""
 
     if not active or not user_text.strip():
         return chat, hist, "", None, tasks_state, active, phase, ""
 
-    # Show voice transcription as label if voice was used
-    display_text = f"🎙 *{user_text}*" if voice_used else user_text
-    user_msg = (display_text, None)
-    chat = list(chat) + [user_msg]
+    display_text = f"\U0001f3a4 *{user_text}*" if voice_used else user_text
+    chat = list(chat) + [(display_text, None)]
     hist = list(hist) + [{"role": "user", "content": user_text}]
 
-    # ── Phase: marking ────────────────────────────────────────────────────────
+    # Phase: marking tasks
     if phase == "marking":
         valid_ids = {t["task_id"] for t in tasks_state}
         mentioned = _parse_ids(user_text, valid_ids)
@@ -363,72 +485,71 @@ def handle_journal_message(user_id, user_text, audio_path, chat, hist, tasks_sta
                 t["completed"] = True
                 updated.append(t["title"])
 
-        confirm     = (f"Got it — marked **{', '.join(updated)}** as complete ✅\n\n" if updated else "")
-        skip_words  = {"done","skip","reflect","none","nothing","no more","that's it","let's go","start","go","next","continue"}
-        wants_skip  = any(w in user_text.lower() for w in skip_words)
-        total       = len(tasks_state)
-        done_count  = sum(1 for t in tasks_state if t["completed"])
+        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"}
+        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"])
 
-        if wants_skip or done_count == total or (updated and done_count > 0):
-            # Move to reflection
+        if wants_skip or done_count == len(tasks_state) or (updated and done_count > 0):
             ctx     = _ensure_context(user_id)
             opening = build_opening_question(ctx, tasks_state)
             bridge  = confirm + opening["question"]
             ai_msg  = (None, bridge)
             hist.append({"role": "assistant", "content": bridge, "focus": opening["question_focus"]})
-            return chat + [ai_msg], hist, "", None, tasks_state, active, "reflecting", ""
+            return list(chat) + [ai_msg], 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 you finished? Or say **skip** to start reflecting."
-            ai_msg     = (None, follow)
+            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)
             hist.append({"role": "assistant", "content": follow, "focus": "task_marking"})
-            return chat + [ai_msg], hist, "", None, tasks_state, active, "marking", ""
+            return list(chat) + [ai_msg], hist, "", None, tasks_state, active, "marking", ""
 
-    # ── Phase: reflecting ─────────────────────────────────────────────────────
+    # Phase: reflecting
     if phase == "reflecting":
         try:
             ctx    = _ensure_context(user_id)
             result = get_next_journal_question(ctx, tasks_state, hist)
         except Exception as e:
-            err_msg = (None, f"⚠ AI error: {e}. Try sending again.")
-            return chat + [err_msg], hist, "", None, tasks_state, active, phase, ""
+            err_msg = (None, f"\u26a0 AI error: {e}. Try sending again.")
+            return list(chat) + [err_msg], hist, "", None, tasks_state, active, phase, ""
 
         if result.get("session_complete"):
-            closing = "That's a solid reflection — you've given me plenty to work with. 🧠 Hit **Finish & Save** to lock in your insights!"
+            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)
             hist.append({"role": "assistant", "content": closing, "focus": "complete"})
-            return chat + [ai_msg], hist, "", None, tasks_state, active, "done", _ok("Session complete — click Finish & Save")
+            return list(chat) + [ai_msg], 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 add about today?"
+        next_q = result.get("question") or "Anything else you\'d like to reflect on?"
         ai_msg = (None, next_q)
         hist.append({"role": "assistant", "content": next_q, "focus": result.get("question_focus","")})
-        return chat + [ai_msg], hist, "", None, tasks_state, active, "reflecting", ""
+        return list(chat) + [ai_msg], hist, "", None, tasks_state, active, "reflecting", ""
 
-    # ── Phase: done ───────────────────────────────────────────────────────────
-    nudge = (None, "Session is complete! Click **Finish & Save** to save your insights.")
-    return chat + [nudge], hist, "", None, tasks_state, active, "done", ""
+    # Phase: done
+    nudge = (None, "Session complete! Click **Finish & Save** to save your insights.")
+    return list(chat) + [nudge], hist, "", None, tasks_state, active, "done", ""
 
 
 def handle_finish_journal(user_id, chat, hist, tasks_state):
     if not user_id or not hist:
-        return list(chat) + [(None, "⚠ Nothing to save yet.")], ""
+        return list(chat) + [(None, "\u26a0 Nothing to save yet.")], ""
     try:
         ctx     = _ensure_context(user_id)
         updated = synthesize_journal(ctx, tasks_state, hist)
         save_user_context(user_id, updated)
     except Exception as e:
-        return list(chat) + [(None, f"⚠ Save failed: {e}")], _err("Save failed")
+        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",[])
-    notes_md = "\n".join(f"• {n}" for n in notes[-3:]) if notes else "• Keep reflecting to build patterns"
+    notes_md = "\n".join(f"\u2022 {n}" for n in notes[-3:]) if notes else "\u2022 Keep reflecting to build patterns"
     summary = (
-        f"✅ **Insights saved!** {done}/{total} tasks ({rate}%) complete today.\n\n"
+        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 schedule smarter. Great work today! 🌙"
+        f"I\'ll use this to make tomorrow\'s scheduling smarter. Great work today! \U0001f319"
     )
     return list(chat) + [(None, summary)], _ok(f"Saved! {done}/{total} tasks ({rate}%)")
 
@@ -437,9 +558,9 @@ def handle_restart_journal():
     return [], [], False, gr.update(interactive=False), gr.update(interactive=False), gr.update(interactive=False), [], "marking", ""
 
 
-# ═══════════════════════════════════════════════════════════════════════════════
-# AREAS & GOALS
-# ═══════════════════════════════════════════════════════════════════════════════
+# =============================================================================
+# LIFE AREAS & GOALS
+# =============================================================================
 
 def render_areas(user_id):
     if not user_id: return "", [], []
@@ -455,15 +576,15 @@ def render_areas(user_id):
 def handle_add_area(user_id, name, color):
     ok, msg = add_life_area(user_id, name, color)
     html, names, _ = render_areas(user_id)
-    color_txt = "#4ade80" if ok else "#f87171"
-    return f'<span style="color:{color_txt};font-size:13px">{msg}</span>', html, gr.update(choices=names, value=None), gr.update(value="")
+    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)
-    color_txt = "#4ade80" if ok else "#f87171"
-    return f'<span style="color:{color_txt};font-size:13px">{msg}</span>', html, gr.update(choices=names, value=None)
+    ct = "#4ade80" if ok else "#f87171"
+    return f'<span style="color:{ct};font-size:13px">{msg}</span>', html, gr.update(choices=names, value=None)
 
 def handle_save_goals(user_id, goals_text):
     if not user_id: return _err("Not logged in.")
@@ -474,9 +595,9 @@ def load_goals_txt(user_id):
     return "\n".join(get_goals(user_id)) if user_id else ""
 
 
-# ═══════════════════════════════════════════════════════════════════════════════
+# =============================================================================
 # PREFERENCES
-# ═══════════════════════════════════════════════════════════════════════════════
+# =============================================================================
 
 def load_prefs(user_id):
     ctx = load_user_context(user_id) if user_id else None
@@ -499,23 +620,23 @@ def render_context_html(user_id):
     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","—"))+_row("Sleep",pref.get("sleep_time","—"))+_row("Peak Focus",pref.get("focus_peak","—"))
+    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",[])
     if notes:
         html += _hdr("AI Notes")
-        html += "".join(f'<div style="color:#94a3b8;font-size:12px;padding:3px 0">• {n}</div>' for n in notes[-5:])
-    html += f'<div style="color:#334155;font-size:11px;margin-top:12px">v{ctx.get("version",1)} · {ctx.get("last_updated","—")[:10]}</div></div>'
+        html += "".join(f'<div style="color:#94a3b8;font-size:12px;padding:3px 0">\u2022 {n}</div>' for n in notes[-5:])
+    html += f'<div style="color:#334155;font-size:11px;margin-top:12px">v{ctx.get("version",1)} \u00b7 {ctx.get("last_updated","\u2014")[:10]}</div></div>'
     return html
 
 
-# ═══════════════════════════════════════════════════════════════════════════════
+# =============================================================================
 # UI
-# ═══════════════════════════════════════════════════════════════════════════════
+# =============================================================================
 
-with gr.Blocks(title="🧠 Second Brain") as demo:
+with gr.Blocks(title="\U0001f9e0 Second Brain") as demo:
 
     user_id_state  = gr.State(None)
     username_state = gr.State("")
@@ -531,54 +652,54 @@ with gr.Blocks(title="🧠 Second Brain") as demo:
     vclar_questions_state = gr.State([])
     voriginal_task_state  = gr.State("")
 
-    # ── AUTH ──────────────────────────────────────────────────────────────────
+    # AUTH
     with gr.Column(visible=True, elem_id="auth-card") as auth_section:
-        gr.HTML('<div id="brand-logo">🧠 Second Brain</div>')
+        gr.HTML('<div id="brand-logo">\U0001f9e0 Second Brain</div>')
         gr.HTML('<div id="brand-sub">Your intelligent productivity companion</div>')
         with gr.Tabs():
             with gr.Tab("Sign In"):
                 login_user_in = gr.Textbox(label="Username", placeholder="your username")
-                login_pass_in = gr.Textbox(label="Password", type="password", placeholder="••••••••")
+                login_pass_in = gr.Textbox(label="Password", type="password", placeholder="\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022")
                 login_btn     = gr.Button("Sign In", elem_classes="btn-primary")
                 login_msg     = gr.HTML("")
             with gr.Tab("Create Account"):
                 reg_user_in = gr.Textbox(label="Username",               placeholder="choose a username")
-                reg_pass_in = gr.Textbox(label="Password (min 6 chars)", type="password", placeholder="••••••••")
+                reg_pass_in = gr.Textbox(label="Password (min 6 chars)", type="password")
                 reg_wake    = gr.Textbox(label="Wake time",  value="07:30")
                 reg_sleep   = gr.Textbox(label="Sleep time", value="23:00")
                 reg_focus   = gr.Dropdown(label="Peak focus", choices=["Morning","Afternoon","Evening","Night"], value="Morning")
-                reg_goals   = gr.Textbox(label="Big-picture goals (one per line, optional)", lines=3, placeholder="Launch my startup\nGet fit\nLearn ML")
+                reg_goals   = gr.Textbox(label="Big-picture goals (optional)", lines=3, placeholder="Launch my startup\nGet fit\nLearn ML")
                 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">🧠 Second Brain</div><div id="top-header-user">—</div>')
+            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 ─────────────────────────────────────────────────
-            with gr.Tab("📅 Today"):
+            # TAB 1: TODAY
+            with gr.Tab("\U0001f4c5 Today"):
                 with gr.Row():
-                    stat_total  = gr.HTML(_stat("—","Today","#a78bfa"))
-                    stat_done   = gr.HTML(_stat("—","Done","#4ade80"))
-                    stat_remain = gr.HTML(_stat("—","Left","#f87171"))
+                    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("✏️ Add Task (Text)",  elem_classes="btn-primary",   scale=3)
-                    btn_add_voice = gr.Button("🎙️ Add Task (Voice)", elem_classes="btn-accent",    scale=3)
-                    btn_plan_day  = gr.Button("🗓 Plan My Day",       elem_classes="btn-secondary", scale=3)
-                    btn_refresh   = gr.Button("↻",                    elem_classes="btn-secondary", scale=1)
+                    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)
 
-                # ── Text panel ────────────────────────────────────────────────
+                # Text 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 by tomorrow, it's really important", lines=2)
+                    task_input = gr.Textbox(label="", placeholder="e.g. Finish the client proposal, it\'s really important", lines=2)
                     with gr.Row():
-                        btn_parse       = gr.Button("🤖 Parse with AI", elem_classes="btn-primary")
-                        btn_cancel_text = gr.Button("Cancel",           elem_classes="btn-secondary")
+                        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("")
@@ -586,12 +707,11 @@ with gr.Blocks(title="🧠 Second Brain") as demo:
                         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="🎙 Or speak", scale=1)
-                            btn_clar_submit = gr.Button("🔄 Re-classify", elem_classes="btn-accent")
+                                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)
+                            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>')
                         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)
@@ -601,22 +721,22 @@ with gr.Blocks(title="🧠 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_date     = gr.Textbox(label="Scheduled Date", value=str(date.today()), scale=1)
-                            f_is_habit = gr.Checkbox(label="♻️ This is a habit", scale=1)
+                            f_deadline = gr.Textbox(label="\U0001f3af Deadline (YYYY-MM-DD, optional)", placeholder="2026-03-01", 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():
-                            btn_confirm = gr.Button("✓ Save Task", elem_classes="btn-success")
-                            btn_discard = gr.Button("✗ Discard",   elem_classes="btn-danger")
+                            btn_confirm = gr.Button("\u2713 Save Task", elem_classes="btn-success")
+                            btn_discard = gr.Button("\u2717 Discard",   elem_classes="btn-danger")
                         save_msg = gr.HTML("")
 
-                # ── Voice panel ───────────────────────────────────────────────
+                # Voice 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 — Whisper transcribes it, then AI classifies it automatically. Same flow as text.</p>')
+                    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>')
                     voice_audio_input = gr.Audio(sources=["microphone","upload"], type="filepath", label="")
                     with gr.Row():
-                        btn_voice_parse  = gr.Button("🤖 Transcribe & Classify", elem_classes="btn-primary")
-                        btn_cancel_voice = gr.Button("Cancel",                   elem_classes="btn-secondary")
+                        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:
@@ -625,11 +745,11 @@ with gr.Blocks(title="🧠 Second Brain") as demo:
                         with gr.Column(visible=False) as voice_clar_row:
                             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,
-                                                          placeholder="e.g. It's urgent, about 90 minutes, very high priority")
-                                vclar_audio = gr.Audio(sources=["microphone"], type="filepath", label="🎙 Or speak", scale=1)
-                            btn_vclar_submit = gr.Button("🔄 Re-classify", elem_classes="btn-accent")
+                                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)
+                            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)
@@ -639,65 +759,72 @@ with gr.Blocks(title="🧠 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_date     = gr.Textbox(label="Scheduled Date", value=str(date.today()), scale=1)
-                            vf_is_habit = gr.Checkbox(label="♻️ This is a habit", scale=1)
+                            vf_deadline = gr.Textbox(label="\U0001f3af Deadline (optional)", placeholder="2026-03-01", 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():
-                            btn_voice_confirm = gr.Button("✓ Save Task", elem_classes="btn-success")
-                            btn_voice_discard = gr.Button("✗ Discard",   elem_classes="btn-danger")
+                            btn_voice_confirm = gr.Button("\u2713 Save Task", elem_classes="btn-success")
+                            btn_voice_discard = gr.Button("\u2717 Discard",   elem_classes="btn-danger")
                         voice_save_msg = gr.HTML("")
 
-                # ── Plan My Day panel ─────────────────────────────────────────
+                # Plan My Tasks 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:#475569;font-size:13px;margin-bottom:12px">AI reads your tasks, context, and goals to build the optimal time-blocked schedule.</p>')
-                    plan_prompt = gr.Textbox(label="Any fixed events or notes?", placeholder="e.g. Meeting at 10am, deep work morning, done by 7pm", lines=3)
+                    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>')
+                    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
+                    )
                     with gr.Row():
-                        btn_gen_sched   = gr.Button("✨ Generate Schedule", elem_classes="btn-primary")
-                        btn_cancel_plan = gr.Button("Cancel",               elem_classes="btn-secondary")
+                        btn_gen_sched   = gr.Button("\U0001f9e0 Run AI Scheduler", elem_classes="btn-primary")
+                        btn_cancel_plan = gr.Button("Cancel",                       elem_classes="btn-secondary")
                     schedule_html = 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)
                 with gr.Row():
-                    today_done_id  = gr.Number(label="Task ID — toggle done", precision=0, scale=2)
-                    btn_today_done = gr.Button("✅ Mark Done", elem_classes="btn-success", scale=2)
-                    today_del_id   = gr.Number(label="Task ID — delete",      precision=0, scale=2)
-                    btn_today_del  = gr.Button("🗑 Delete",    elem_classes="btn-danger",  scale=2)
+                    today_done_id  = gr.Number(label="Task ID \u2014 toggle done", precision=0, scale=2)
+                    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)
                 today_action_msg = gr.HTML("")
 
-            # ── TAB 2: ALL TASKS ─────────────────────────────────────────────
-            with gr.Tab("📋 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>')
                 with gr.Row():
-                    all_filter    = gr.Dropdown(label="Filter by Area", choices=["All"], value="All", scale=4)
+                    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)
-                    btn_all_ref   = gr.Button("↻ Refresh", elem_classes="btn-secondary", 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 — toggle done", precision=0, scale=2)
-                    btn_all_done = gr.Button("✅ Done",   elem_classes="btn-success", scale=2)
-                    all_del_id   = gr.Number(label="Task ID — delete",      precision=0, scale=2)
-                    btn_all_del  = gr.Button("🗑 Delete", elem_classes="btn-danger",  scale=2)
+                    all_done_id  = gr.Number(label="Task ID \u2014 toggle done", precision=0, scale=2)
+                    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 ───────────────────────────────────────────────
-            with gr.Tab("📓 Journal"):
-                gr.HTML('<p style="color:#475569;font-size:13px;margin-bottom:12px">End-of-day reflection. Chat naturally — the AI marks tasks, asks questions, and updates your profile.</p>')
+            # 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)
                 with gr.Row():
-                    j_answer   = gr.Textbox(label="", placeholder="Type or use the mic…", lines=1,
-                                             scale=5, interactive=False, show_label=False)
-                    j_audio_in = gr.Audio(sources=["microphone"], type="filepath",
-                                          label="🎙", scale=1, interactive=False)
-                    btn_j_send = gr.Button("Send →", elem_classes="btn-accent", scale=1, interactive=False)
+                    j_answer   = gr.Textbox(label="", placeholder="Type or use the mic\u2026", lines=1, scale=5, interactive=False, show_label=False)
+                    j_audio_in = gr.Audio(sources=["microphone"], type="filepath", label="\U0001f3a4", scale=1, interactive=False)
+                    btn_j_send = gr.Button("Send \u2192", elem_classes="btn-accent", scale=1, interactive=False)
                 with gr.Row():
-                    btn_j_start   = gr.Button("▶ Start Session",  elem_classes="btn-primary",   scale=3)
-                    btn_j_finish  = gr.Button("✓ Finish & Save",   elem_classes="btn-success",   scale=3)
-                    btn_j_restart = gr.Button("↺ Reset",           elem_classes="btn-secondary", scale=1)
+                    btn_j_start   = gr.Button("\u25b6 Start Session", elem_classes="btn-primary",   scale=3)
+                    btn_j_finish  = gr.Button("\u2713 Finish & Save", elem_classes="btn-success",   scale=3)
+                    btn_j_restart = gr.Button("\u21ba Reset",          elem_classes="btn-secondary", scale=1)
                 journal_msg = gr.HTML("")
 
-            # ── TAB 4: AREAS & GOALS ─────────────────────────────────────────
-            with gr.Tab("🗂 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("")
                 with gr.Row():
@@ -717,8 +844,8 @@ with gr.Blocks(title="🧠 Second Brain") as demo:
                 btn_save_goals = gr.Button("Save Goals", elem_classes="btn-primary")
                 goals_msg      = gr.HTML("")
 
-            # ── TAB 5: PREFERENCES ───────────────────────────────────────────
-            with gr.Tab("⚙️ Preferences"):
+            # TAB 5: PREFERENCES
+            with gr.Tab("\u2699\ufe0f Preferences"):
                 gr.HTML('<div class="sec-label">Scheduling Preferences</div>')
                 with gr.Row():
                     pref_wake  = gr.Textbox(label="Wake time",  placeholder="07:30", scale=1)
@@ -731,22 +858,24 @@ with gr.Blocks(title="🧠 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">Everything the AI has learned about you. Updates after each journal session.</p>')
+                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>')
                 ctx_display = gr.HTML("")
-                btn_ref_ctx = gr.Button("↻ Refresh", elem_classes="btn-secondary")
+                btn_ref_ctx = gr.Button("\u21bb Refresh", elem_classes="btn-secondary")
+
 
-    # ═════════════════════════════════════════════════════════════════════════
+    # =========================================================================
     # EVENT WIRING
-    # ═════════════════════════════════════════════════════════════════════════
+    # =========================================================================
 
-    # ── Auth ──────────────────────────────────────────────────────────────────
     def _header_html(uid, uname):
-        return f'<div id="top-header-brand">🧠 Second Brain</div><div id="top-header-user">👤 {uname}</div>'
+        return f'<div id="top-header-brand">\U0001f9e0 Second Brain</div><div id="top-header-user">\U0001f464 {uname}</div>'
 
+    # Auth
     login_btn.click(handle_login, [login_user_in, login_pass_in],
         [user_id_state, username_state, login_msg, auth_section, app_section]
     ).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(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])
@@ -755,12 +884,13 @@ with gr.Blocks(title="🧠 Second Brain") as demo:
         [user_id_state, username_state, reg_msg, auth_section, app_section]
     ).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])
 
     logout_btn.click(handle_logout, [user_id_state], [user_id_state, username_state, auth_section, app_section])
 
-    # ── Panels ──────────────────────────────────────────────────���─────────────
-    btn_add_text.click(show_text_panel,  outputs=[text_panel, voice_panel, plan_panel])
+    # Panels
+    btn_add_text.click(show_text_panel,   outputs=[text_panel, voice_panel, plan_panel])
     btn_add_voice.click(show_voice_panel, outputs=[text_panel, voice_panel, plan_panel])
     btn_plan_day.click(show_plan_panel,   outputs=[text_panel, voice_panel, plan_panel])
     btn_cancel_text.click(hide_panels,    outputs=[text_panel, voice_panel, plan_panel])
@@ -771,103 +901,125 @@ with gr.Blocks(title="🧠 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 ─────────────────────────────────────────────────────────
-    _TEXT_PARSE_OUTPUTS = [parsed_panel, f_title, clar_html, f_area, f_urgency, f_importance,
-                           f_state, f_time, f_date, f_is_habit, f_interval, parse_status,
-                           clar_reply_row, clar_questions_state, original_task_state]
-    _TEXT_CLAR_OUTPUTS  = [f_title, clar_html, f_area, f_urgency, f_importance,
-                           f_state, f_time, clar_reply_row, clar_questions_state]
+    # 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_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_OUTPUTS)
+    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_OUTPUTS
+        _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_OUTPUTS
+        _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_date, f_is_habit, f_interval],
-        [save_msg, today_df, stat_total, stat_done, stat_remain, parsed_panel]
+        [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_PARSE_OUTPUTS = [voice_parsed_panel, voice_transcribed_txt,
-                            voice_clar_html, vf_area, vf_urgency, vf_importance,
-                            vf_state, vf_time, vf_date, vf_is_habit, vf_interval,
-                            voice_status, voice_clar_row,
-                            vclar_questions_state, voriginal_task_state]
-    _VOICE_CLAR_OUTPUTS  = [vf_title, voice_clar_html, vf_area, vf_urgency, vf_importance,
-                            vf_state, vf_time, voice_clar_row, vclar_questions_state]
+    # 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_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_OUTPUTS)
+    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_OUTPUTS
+        _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_OUTPUTS
+        _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,
-        [user_id_state, vf_title, vf_area, vf_urgency, vf_importance, vf_state, vf_time, vf_date, vf_is_habit, vf_interval],
-        [voice_save_msg, today_df, stat_total, stat_done, stat_remain, voice_parsed_panel]
+        [user_id_state, vf_title, vf_area, vf_urgency, vf_importance, vf_state, vf_time, vf_deadline, vf_is_habit, vf_interval],
+        [voice_save_msg, today_df, stat_total, stat_done, stat_remain, all_df, voice_parsed_panel]
     )
 
-    # ── Schedule ───────────────────────────────────────────────────────────────
-    btn_gen_sched.click(handle_generate_schedule, [user_id_state, plan_prompt], [schedule_html])
+    # Smart scheduler — updates both schedule_html and all_df
+    btn_gen_sched.click(
+        handle_smart_schedule, [user_id_state, plan_prompt],
+        [schedule_html, all_df]
+    ).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])
 
-    # ── All Tasks ──────────────────────────────────────────────────────────────
-    btn_all_ref.click(refresh_all_tasks,   [user_id_state, all_filter, all_today_chk], [all_df])
-    all_filter.change(refresh_all_tasks,   [user_id_state, all_filter, all_today_chk], [all_df])
-    all_today_chk.change(refresh_all_tasks,[user_id_state, all_filter, all_today_chk], [all_df])
-    btn_all_done.click(handle_toggle_all,  [all_done_id, user_id_state, all_filter, all_today_chk], [all_df, all_action_msg])
-    btn_all_del.click(handle_delete_all,   [all_del_id,  user_id_state, all_filter, all_today_chk], [all_df, all_action_msg])
-
-    # ── Journal ────────────────────────────────────────────────────────────────
-    _J_START_OUTPUTS = [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_INPUTS  = [user_id_state, j_answer, j_audio_in, journal_chatbot,
-                      journal_hist_state, journal_tasks_state, journal_active, journal_phase_state]
-    _J_MSG_OUTPUTS = [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_OUTPUTS)
-    btn_j_send.click(handle_journal_message, _J_MSG_INPUTS, _J_MSG_OUTPUTS)
-    j_answer.submit(handle_journal_message,  _J_MSG_INPUTS, _J_MSG_OUTPUTS)
-    j_audio_in.change(handle_journal_message, _J_MSG_INPUTS, _J_MSG_OUTPUTS)
+    # All Tasks
+    def refresh_all_tasks_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_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])
+
+    # 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]
+
+    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_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=[
+        journal_chatbot, journal_hist_state, journal_active,
+        j_answer, btn_j_send, j_audio_in, journal_tasks_state,
+        journal_phase_state, journal_msg
+    ])
 
-    # ── 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]
@@ -880,7 +1032,7 @@ with gr.Blocks(title="🧠 Second Brain") as demo:
 
     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],
@@ -888,6 +1040,6 @@ with gr.Blocks(title="🧠 Second Brain") as demo:
     )
     btn_ref_ctx.click(render_context_html, [user_id_state], [ctx_display])
 
-# ── Launch ─────────────────────────────────────────────────────────────────────
+
 if __name__ == "__main__":
     demo.launch(server_name="0.0.0.0", server_port=7860, css=CSS)