create-walle 0.9.13 → 0.9.15

package/template/claude-task-manager/public/index.html

@@ -30,6 +30,7 @@
     --green: #9ece6a;
     --red: #f7768e;
     --yellow: #e0af68;
+    --purple: #bb9af7;
     --border: #3b4261;
     --tab-height: 38px;
     --sidebar-width: 260px;
@@ -71,6 +72,36 @@
     white-space: nowrap;
     margin-right: 4px;
   }
+  #topbar .app-version {
+    color: var(--fg-dim);
+    font-size: 11px;
+    font-weight: 600;
+    letter-spacing: 0;
+    line-height: 1;
+    white-space: nowrap;
+    border: 1px solid rgba(122, 162, 247, 0.24);
+    border-radius: 5px;
+    padding: 3px 6px;
+    background: rgba(122, 162, 247, 0.08);
+  }
+  #topbar .app-version.update-available {
+    color: var(--yellow);
+    border-color: rgba(224, 175, 104, 0.45);
+    background: rgba(224, 175, 104, 0.10);
+  }
+  .setup-version-pill {
+    display: inline-flex;
+    align-items: center;
+    gap: 4px;
+    color: var(--fg-dim);
+    font-size: 12px;
+    font-weight: 600;
+    border: 1px solid var(--border);
+    border-radius: 6px;
+    padding: 3px 8px;
+    background: rgba(122, 162, 247, 0.08);
+    white-space: nowrap;
+  }
   .sidebar-toggle {
     background: none;
     border: none;
@@ -266,6 +297,7 @@
   .session-item[data-agent="walle"] { border-left-color: #f59e0b; }
   .session-item[data-agent="codex"] { border-left-color: #22c55e; }
   .session-item[data-agent="gemini"] { border-left-color: #3b82f6; }
+  .session-item[data-agent="opencode"] { border-left-color: #a78bfa; }
   .session-item[data-agent="shell"] { border-left-color: #6b7280; }
   .session-item.active[data-agent] { border-left-color: rgba(26,27,38,0.3); }
   /* Provider icon: monochrome SVG; color comes from currentColor.
@@ -282,6 +314,7 @@
   .session-item[data-agent="walle"]  .provider-icon { color: #f59e0b; }
   .session-item[data-agent="codex"]  .provider-icon { color: #22c55e; }
   .session-item[data-agent="gemini"] .provider-icon { color: #3b82f6; }
+  .session-item[data-agent="opencode"] .provider-icon { color: #a78bfa; }
   .session-item[data-agent="shell"]  .provider-icon { color: #9ca3af; }
   .session-item.active .provider-icon { color: #1a1b26; opacity: 0.85; }
   /* Tab header icon — inherits the same per-agent color. */
@@ -290,6 +323,7 @@
   .tab[data-agent="walle"]  .provider-icon { color: #f59e0b; }
   .tab[data-agent="codex"]  .provider-icon { color: #22c55e; }
   .tab[data-agent="gemini"] .provider-icon { color: #3b82f6; }
+  .tab[data-agent="opencode"] .provider-icon { color: #a78bfa; }
   .tab[data-agent="shell"]  .provider-icon { color: #9ca3af; }
   .tab.active .provider-icon { color: var(--fg); opacity: 0.95; }
   .session-item .dot {
@@ -439,6 +473,9 @@
   }
   .session-item.has-worktree-attn .branch-badge { max-width: 60px; }
   .session-item.active .branch-badge { color: #0ea5e9; background: rgba(14, 165, 233, 0.15); }
+  .branch-badge.namespaced {
+    border: 1px solid rgba(125, 211, 252, 0.18);
+  }
   .worktree-attn-badge {
     display: inline-flex;
     align-items: center;
@@ -742,15 +779,17 @@
   .review-actions .action-btn.pinned-active { color: var(--yellow); border-color: var(--yellow); }
   .review-actions .action-btn.active-mode { color: var(--accent); border-color: var(--accent); background: rgba(122,162,247,0.12); }
 
-  /* Truncate mode */
-  #review-messages.truncate-mode .review-msg.user .msg-header,
-  #review-messages.truncate-mode .review-msg.user.key-msg .msg-header {
-    position: relative;
-    cursor: pointer;
-  }
-  #review-messages.truncate-mode .review-msg.user .msg-header::after {
-    content: '✂ Cut from here';
-    position: absolute;
+	  /* Truncate mode */
+	  #review-messages.truncate-mode .prompt-turn:not(.setup-turn) .prompt-turn-header,
+	  #review-messages.truncate-mode .review-msg.user .msg-header,
+	  #review-messages.truncate-mode .review-msg.user.key-msg .msg-header {
+	    position: relative;
+	    cursor: pointer;
+	  }
+	  #review-messages.truncate-mode .prompt-turn:not(.setup-turn) .prompt-turn-header::after,
+	  #review-messages.truncate-mode .review-msg.user .msg-header::after {
+	    content: '✂ Cut from here';
+	    position: absolute;
     right: 0;
     top: 50%;
     transform: translateY(-50%);
@@ -764,13 +803,16 @@
     transition: opacity 0.15s;
     pointer-events: none;
   }
-  #review-messages.truncate-mode .review-msg.user .msg-header:hover::after {
-    opacity: 1;
-  }
-  #review-messages.truncate-mode .review-msg.user .msg-header:hover {
-    background: rgba(122,162,247,0.08);
-    border-radius: 4px;
-  }
+	  #review-messages.truncate-mode .review-msg.user .msg-header:hover::after {
+	    opacity: 1;
+	  }
+	  #review-messages.truncate-mode .prompt-turn:not(.setup-turn) .prompt-turn-header:hover::after {
+	    opacity: 1;
+	  }
+	  #review-messages.truncate-mode .prompt-turn:not(.setup-turn) .prompt-turn-header:hover,
+	  #review-messages.truncate-mode .review-msg.user .msg-header:hover {
+	    background: rgba(122,162,247,0.08);
+	  }
   /* Marked-for-deletion state */
   #review-messages .review-msg.truncate-remove {
     opacity: 0.3;
@@ -949,12 +991,115 @@
     scroll-behavior: smooth;
   }
   #review-messages::-webkit-scrollbar { width: 6px; }
-  #review-messages::-webkit-scrollbar-track { background: transparent; }
-  #review-messages::-webkit-scrollbar-thumb { background: var(--border); border-radius: 3px; }
-  #review-messages::-webkit-scrollbar-thumb:hover { background: var(--fg-dim); }
-
-  /* Scroll to bottom button */
-  .scroll-bottom-btn {
+	  #review-messages::-webkit-scrollbar-track { background: transparent; }
+	  #review-messages::-webkit-scrollbar-thumb { background: var(--border); border-radius: 3px; }
+	  #review-messages::-webkit-scrollbar-thumb:hover { background: var(--fg-dim); }
+
+	  .conversation-view > .conversation-load-older,
+	  .conversation-view > .prompt-turn,
+	  .conversation-view > .review-msg,
+	  .conversation-view > .thought-group,
+	  .conversation-view > [data-conversation-state] {
+	    flex: 0 0 auto;
+	  }
+
+	  .prompt-turn {
+	    margin-bottom: 14px;
+	    border: 1px solid rgba(65, 72, 104, 0.75);
+	    border-left: 3px solid var(--accent);
+	    border-radius: 8px;
+	    background: rgba(36, 40, 59, 0.36);
+	    overflow: hidden;
+	  }
+	  .prompt-turn.setup-turn {
+	    border-left-color: var(--purple, #bb9af7);
+	    background: rgba(187, 154, 247, 0.035);
+	  }
+	  .prompt-turn-header {
+	    display: grid;
+	    grid-template-columns: auto minmax(0, 1fr) auto;
+	    align-items: start;
+	    gap: 8px;
+	    padding: 8px 10px 8px 8px;
+	    cursor: pointer;
+	    user-select: none;
+	  }
+	  .prompt-turn-header:hover { background: rgba(255,255,255,0.025); }
+	  .prompt-turn-header:focus-visible {
+	    outline: 2px solid var(--accent);
+	    outline-offset: -2px;
+	  }
+	  .prompt-turn-chevron {
+	    display: inline-block;
+	    margin-top: 17px;
+	    color: var(--fg-dim);
+	    font-size: 10px;
+	    transition: transform 0.15s;
+	  }
+	  .prompt-turn.expanded .prompt-turn-chevron { transform: rotate(90deg); }
+	  .prompt-turn-head-main { min-width: 0; }
+	  .prompt-turn-prompt.review-msg {
+	    margin: 0;
+	    padding: 8px 10px;
+	    border-left-width: 2px;
+	    border-radius: 6px;
+	    background: rgba(122, 162, 247, 0.07);
+	  }
+	  .prompt-turn-prompt .msg-header { margin-bottom: 5px; }
+	  .prompt-turn-meta {
+	    display: flex;
+	    flex-wrap: wrap;
+	    justify-content: flex-end;
+	    gap: 4px;
+	    min-width: 118px;
+	    padding-top: 5px;
+	  }
+	  .prompt-turn-badge {
+	    display: inline-flex;
+	    align-items: center;
+	    min-height: 18px;
+	    padding: 1px 7px;
+	    border: 1px solid var(--border);
+	    border-radius: 999px;
+	    color: var(--fg-dim);
+	    background: rgba(0, 0, 0, 0.10);
+	    font-size: 10.5px;
+	    white-space: nowrap;
+	  }
+	  .prompt-turn-alert.warning {
+	    color: var(--yellow);
+	    border-color: rgba(224, 175, 104, 0.48);
+	    background: rgba(224, 175, 104, 0.08);
+	  }
+	  .prompt-turn-alert.error {
+	    color: var(--red);
+	    border-color: rgba(247, 118, 118, 0.55);
+	    background: rgba(247, 118, 118, 0.08);
+	  }
+	  .prompt-turn-response {
+	    display: none;
+	    padding: 0 12px 12px 29px;
+	    border-top: 1px solid rgba(65, 72, 104, 0.45);
+	  }
+	  .prompt-turn.expanded .prompt-turn-response { display: block; }
+	  .prompt-turn-response > .review-msg,
+	  .prompt-turn-response > .thought-group {
+	    margin-top: 8px;
+	    margin-bottom: 0;
+	  }
+	  .prompt-turn-empty,
+	  .prompt-turn-setup-title {
+	    color: var(--fg-dim);
+	    font-size: 12px;
+	    padding: 8px 10px;
+	  }
+	  .prompt-turn-setup-title {
+	    color: var(--purple, #bb9af7);
+	    font-weight: 600;
+	  }
+
+	  /* Scroll to bottom button */
+	  .scroll-bottom-btn {
     display: none;
     position: absolute;
     bottom: 20px;
@@ -1008,11 +1153,17 @@
   .prompt-nav-list-item.current { color: var(--accent); font-weight: 600; }
   .prompt-nav-list-item.not-in-buffer { color: var(--fg-dim); cursor: default; }
   .prompt-nav-list-item.not-in-buffer:hover { background: rgba(255,255,255,0.03); }
+  .prompt-nav-list-item.latest-unmapped { color: var(--fg); cursor: pointer; }
   .prompt-nav-badge-unreachable {
     display: inline-block; font-size: 9px; font-weight: 600; padding: 1px 5px; border-radius: 3px;
     background: rgba(224,175,104,0.12); color: #e0af68; vertical-align: baseline;
     letter-spacing: 0.03em; margin-right: 4px; flex-shrink: 0;
   }
+  .prompt-nav-badge-latest {
+    display: inline-block; font-size: 9px; font-weight: 600; padding: 1px 5px; border-radius: 3px;
+    background: rgba(122,162,247,0.14); color: var(--accent); vertical-align: baseline;
+    letter-spacing: 0.03em; margin-right: 4px; flex-shrink: 0;
+  }
   .prompt-nav-list-item.not-in-buffer .prompt-text { color: var(--fg-dim); }
 
   .review-msg {
@@ -1589,10 +1740,28 @@
     transition: all 0.1s;
   }
   .tab .tab-label {
+    flex: 1 1 auto;
     overflow: hidden;
     text-overflow: ellipsis;
     min-width: 0;
   }
+  .tab > .branch-badge { max-width: 64px; }
+  .tab.tab-title-clipped > .branch-badge { display: none; }
+  .tab.pinned-tab {
+    flex: 0 0 auto;
+    min-width: 86px;
+  }
+  .tab.pinned-tab::before {
+    content: '';
+    display: inline-block;
+    width: 6px;
+    height: 6px;
+    border-radius: 999px;
+    background: var(--accent);
+    opacity: 0.75;
+    flex: 0 0 auto;
+  }
+  .tab.pinned-tab .tab-label { flex: 0 0 auto; }
   .tab:hover { color: var(--fg); background: var(--bg-light); }
   .tab.active {
     color: var(--fg);
@@ -1624,6 +1793,7 @@
   .tab[draggable="true"] { cursor: grab; }
   .tab[draggable="true"]:active { cursor: grabbing; }
   .tab.tab-drag-over { border-left: 2px solid var(--accent); }
+  .tab.tab-drop-after { border-right: 2px solid var(--accent); }
   .tab .tab-icon {
     color: var(--green, #9ece6a);
     font-size: 10px;
@@ -1761,6 +1931,49 @@
   }
   .term-container.active { display: flex; flex-direction: column; }
   .term-container .xterm { flex: 1; height: 0; min-height: 0; overflow: hidden; }
+  .codex-final-panel {
+    display: none;
+    flex: 0 0 auto;
+    max-height: 34vh;
+    margin: 8px 12px 0;
+    border: 1px solid rgba(126, 203, 255, 0.28);
+    border-left: 3px solid var(--accent, #7aa2f7);
+    border-radius: 6px;
+    background: rgba(17, 19, 31, 0.96);
+    overflow: hidden;
+    color: var(--fg, #c0caf5);
+  }
+  .codex-final-panel.visible { display: flex; flex-direction: column; }
+  .codex-final-header {
+    display: flex; align-items: center; justify-content: space-between; gap: 12px;
+    padding: 7px 10px;
+    border-bottom: 1px solid rgba(126, 203, 255, 0.16);
+    color: var(--accent, #7aa2f7);
+    font-size: 11px;
+    font-weight: 700;
+    text-transform: uppercase;
+    letter-spacing: 0;
+  }
+  .codex-final-close {
+    border: 0;
+    background: transparent;
+    color: var(--fg-dim, #565f89);
+    cursor: pointer;
+    font-size: 14px;
+    line-height: 1;
+    padding: 2px 4px;
+  }
+  .codex-final-close:hover { color: var(--fg, #c0caf5); }
+  .codex-final-body {
+    flex: 1 1 auto;
+    min-height: 0;
+    padding: 10px 12px 12px;
+    overflow: auto;
+    white-space: pre-wrap;
+    font-family: 'SF Mono', 'Fira Code', 'Cascadia Code', monospace;
+    font-size: 12px;
+    line-height: 1.55;
+  }
   /* Prevent macOS elastic overscroll from hijacking trackpad scroll inside terminal */
   .term-container .xterm-viewport { overscroll-behavior: contain; }
   /* Loading overlay for tab-switch snapshot restore */
@@ -2022,14 +2235,298 @@
   #welcome {
     display: flex;
     flex-direction: column;
-    align-items: center;
-    justify-content: center;
+    align-items: stretch;
+    justify-content: flex-start;
     flex: 1;
-    gap: 16px;
+    gap: 12px;
+    overflow: auto;
+    padding: 18px;
     color: var(--fg-dim);
   }
+  #welcome h1,
   #welcome h2 { color: var(--fg); font-size: 18px; font-weight: 600; }
   #welcome p { font-size: 13px; max-width: 400px; text-align: center; line-height: 1.6; }
+  .standup-dashboard {
+    width: 100%;
+    max-width: 1280px;
+    margin: 0 auto;
+    display: flex;
+    flex-direction: column;
+    gap: 12px;
+    min-height: 0;
+  }
+  .standup-header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    gap: 18px;
+    border: 1px solid var(--border);
+    background: rgba(122,162,247,0.045);
+    border-radius: 8px;
+    padding: 18px 20px;
+  }
+  .standup-heading {
+    min-width: 0;
+    display: flex;
+    align-items: center;
+  }
+  #welcome .standup-title {
+    margin: 0;
+    font-size: 30px;
+    line-height: 1.05;
+    font-weight: 750;
+    letter-spacing: 0;
+    color: var(--fg);
+  }
+  .standup-meta {
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    gap: 8px;
+    justify-content: flex-end;
+  }
+  .standup-counts {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 6px;
+  }
+  .standup-count {
+    border: 1px solid var(--border);
+    border-radius: 6px;
+    padding: 5px 7px;
+    background: var(--bg-light);
+    color: var(--fg);
+    font-size: 11px;
+    white-space: nowrap;
+  }
+  .standup-count strong {
+    font-size: 13px;
+    margin-right: 4px;
+  }
+  .standup-updated {
+    font-size: 11px;
+    color: var(--fg-dim);
+    white-space: nowrap;
+  }
+  .standup-actions {
+    display: flex;
+    gap: 6px;
+    flex-wrap: wrap;
+    justify-content: flex-end;
+  }
+  .standup-action-btn {
+    background: var(--bg-light);
+    color: var(--fg);
+    border: 1px solid var(--border);
+    border-radius: 6px;
+    padding: 6px 9px;
+    font-size: 12px;
+    cursor: pointer;
+    min-height: 30px;
+  }
+  .standup-action-btn:hover {
+    border-color: var(--accent);
+    color: var(--accent);
+  }
+  .standup-action-btn.primary {
+    background: var(--accent);
+    border-color: var(--accent);
+    color: var(--bg);
+    font-weight: 700;
+  }
+  .standup-attention {
+    display: none;
+    border: 1px solid rgba(224, 175, 104, 0.35);
+    background: rgba(224, 175, 104, 0.08);
+    border-radius: 8px;
+    padding: 10px 12px;
+    color: var(--fg);
+    gap: 10px;
+    align-items: center;
+    justify-content: space-between;
+  }
+  .standup-attention.active { display: flex; }
+  .standup-attention-main {
+    min-width: 0;
+    display: flex;
+    flex-direction: column;
+    gap: 3px;
+  }
+  .standup-attention-title {
+    font-size: 13px;
+    font-weight: 700;
+    color: var(--yellow);
+  }
+  .standup-attention-body {
+    font-size: 12px;
+    color: var(--fg-dim);
+    overflow-wrap: anywhere;
+  }
+  .standup-lanes {
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(260px, 1fr));
+    gap: 10px;
+    align-items: start;
+  }
+  .standup-lane {
+    border: 1px solid var(--border);
+    border-radius: 8px;
+    background: rgba(255,255,255,0.018);
+    min-width: 0;
+    overflow: hidden;
+  }
+  .standup-lane-header {
+    padding: 10px 11px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    gap: 8px;
+    border-bottom: 1px solid var(--border);
+  }
+  .standup-lane-title {
+    display: flex;
+    align-items: center;
+    gap: 7px;
+    min-width: 0;
+    color: var(--fg);
+    font-weight: 700;
+    font-size: 13px;
+  }
+  .standup-lane-dot {
+    width: 7px;
+    height: 7px;
+    border-radius: 50%;
+    flex-shrink: 0;
+    background: var(--fg-dim);
+  }
+  .standup-lane[data-lane="needs_user"] .standup-lane-dot { background: var(--yellow); }
+  .standup-lane[data-lane="ready_review"] .standup-lane-dot { background: var(--green); }
+  .standup-lane[data-lane="running"] .standup-lane-dot { background: var(--blue); }
+  .standup-lane[data-lane="continue_later"] .standup-lane-dot { background: var(--purple); }
+  .standup-lane-count {
+    color: var(--fg-dim);
+    font-size: 11px;
+    border: 1px solid var(--border);
+    border-radius: 999px;
+    padding: 2px 7px;
+    background: var(--bg);
+  }
+  .standup-lane-body {
+    padding: 8px;
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+  }
+  .standup-card {
+    border: 1px solid var(--border);
+    border-radius: 8px;
+    background: var(--bg-light);
+    padding: 10px;
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+    min-width: 0;
+  }
+  .standup-card-top {
+    display: flex;
+    align-items: flex-start;
+    justify-content: space-between;
+    gap: 8px;
+    min-width: 0;
+  }
+  .standup-card-title {
+    min-width: 0;
+    color: var(--fg);
+    font-size: 13px;
+    font-weight: 700;
+    line-height: 1.25;
+    overflow-wrap: anywhere;
+  }
+  .standup-card-subtitle {
+    color: var(--fg-dim);
+    font-size: 11px;
+    margin-top: 3px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  .standup-badge {
+    flex-shrink: 0;
+    border: 1px solid var(--border);
+    border-radius: 999px;
+    padding: 2px 7px;
+    font-size: 10px;
+    color: var(--fg-dim);
+    background: var(--bg);
+    white-space: nowrap;
+    max-width: 110px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+  .standup-badge.status-running { color: var(--blue); border-color: rgba(122,162,247,0.45); }
+  .standup-badge.status-waiting,
+  .standup-badge.status-waiting_input { color: var(--yellow); border-color: rgba(224,175,104,0.45); }
+  .standup-badge.status-idle { color: var(--green); border-color: rgba(158,206,106,0.35); }
+  .standup-card-text {
+    font-size: 12px;
+    line-height: 1.4;
+    color: var(--fg-dim);
+    overflow-wrap: anywhere;
+  }
+  .standup-card-text strong {
+    color: var(--fg);
+    font-weight: 600;
+  }
+  .standup-evidence {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 5px;
+  }
+  .standup-chip {
+    font-size: 10px;
+    color: var(--fg-dim);
+    border: 1px solid rgba(255,255,255,0.08);
+    border-radius: 999px;
+    padding: 2px 6px;
+    background: rgba(0,0,0,0.14);
+    max-width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  .standup-card-actions {
+    display: flex;
+    gap: 6px;
+    flex-wrap: wrap;
+  }
+  .standup-card-actions .standup-action-btn {
+    padding: 5px 8px;
+    min-height: 28px;
+    font-size: 11px;
+  }
+  .standup-empty,
+  .standup-loading,
+  .standup-error {
+    border: 1px dashed var(--border);
+    border-radius: 8px;
+    padding: 20px;
+    text-align: center;
+    color: var(--fg-dim);
+    font-size: 13px;
+    background: rgba(255,255,255,0.018);
+  }
+  .standup-error { color: var(--red); border-color: rgba(247,118,142,0.45); }
+  @media (max-width: 760px) {
+    #welcome { padding: 12px; }
+    .standup-header {
+      flex-direction: column;
+      align-items: stretch;
+      padding: 16px;
+    }
+    #welcome .standup-title { font-size: 24px; }
+    .standup-meta { justify-content: flex-start; }
+    .standup-attention { align-items: flex-start; flex-direction: column; }
+  }
   .shortcut-grid {
     display: grid;
     grid-template-columns: auto auto;
@@ -2921,6 +3418,7 @@
         </div>
       </div>
       <span class="logo">CTM</span>
+      <span class="app-version" id="app-version-label" title="Installed CTM / Wall-E bundle version">v?</span>
     </div>
     <nav class="topbar-nav" id="topbar-nav">
       <button class="nav-pill active" data-nav="sessions" onclick="navTo('sessions')" title="Terminal sessions">Sessions</button>
@@ -2961,16 +3459,16 @@
   <div id="update-banner" style="display:none;background:linear-gradient(90deg,#1a1b2e,#1e2030);border-bottom:1px solid var(--border);padding:6px 16px;font-size:12px;color:var(--fg-dim,#a9b1d6);align-items:center;gap:10px;">
     <span style="color:#bb9af7;">&#x2191;</span>
     <span id="update-banner-msg">Update available</span>
-    <button id="update-apply-btn" onclick="applyUpdate()" style="background:#7aa2f7;color:#1a1b26;border:none;padding:3px 10px;border-radius:4px;font-size:11px;cursor:pointer;font-weight:600;">Update Now</button>
-    <button onclick="dismissUpdate()" style="background:none;border:none;color:var(--fg-dim);cursor:pointer;margin-left:auto;opacity:0.6;font-size:14px;">&times;</button>
+    <button id="update-apply-btn" onclick="applyUpdate('banner')" style="background:#7aa2f7;color:#1a1b26;border:none;padding:3px 10px;border-radius:4px;font-size:11px;cursor:pointer;font-weight:600;">Update Now</button>
+    <button onclick="dismissUpdate('banner')" style="background:none;border:none;color:var(--fg-dim);cursor:pointer;margin-left:auto;opacity:0.6;font-size:14px;">&times;</button>
   </div>
   <div class="modal-overlay update-wizard-overlay hidden" id="update-wizard" role="dialog" aria-modal="true" aria-labelledby="update-wizard-heading">
     <div class="modal update-wizard-modal">
       <div class="update-wizard-head">
         <div class="update-wizard-icon">&#x2191;</div>
         <div class="update-wizard-title">
-          <h3 id="update-wizard-heading">Upgrade CTM?</h3>
-          <p>A newer CTM release is available.</p>
+          <h3 id="update-wizard-heading">Upgrade CTM / Wall-E?</h3>
+          <p>A newer create-walle release is available.</p>
         </div>
       </div>
       <div class="update-wizard-body">
@@ -2987,8 +3485,8 @@
         <p class="update-wizard-note">The updater will run in the background and CTM will restart when the upgrade is ready.</p>
         <div class="update-wizard-actions">
           <button class="btn" onclick="snoozeUpdateWizard()">Later</button>
-          <button class="btn" onclick="dismissUpdate()">Skip This Version</button>
-          <button class="btn primary" id="update-wizard-apply-btn" onclick="applyUpdate()">Upgrade CTM</button>
+          <button class="btn" onclick="dismissUpdate('wizard')">Skip This Version</button>
+          <button class="btn primary" id="update-wizard-apply-btn" onclick="applyUpdate('wizard')">Upgrade CTM</button>
         </div>
       </div>
     </div>
@@ -3028,8 +3526,8 @@
             <option value="name">A-Z</option>
             <option value="messages">Most Used</option>
           </select>
-          <select id="model-filter" onchange="setModelFilter(this.value)" title="Filter by model" style="background:var(--bg);color:var(--fg-dim);border:1px solid var(--border);padding:2px 4px;border-radius:3px;font-size:10px;max-width:130px;cursor:pointer;">
-            <option value="">All Models</option>
+          <select id="model-filter" onchange="setAgentFilter(this.value)" title="Filter by coding agent" style="background:var(--bg);color:var(--fg-dim);border:1px solid var(--border);padding:2px 4px;border-radius:3px;font-size:10px;max-width:150px;cursor:pointer;">
+            <option value="">All Agents</option>
           </select>
         </div>
         <div class="display-toggle">
@@ -3068,21 +3566,26 @@
       </div>
       <div id="terminal-area">
         <div id="welcome">
-          <h2 style="font-size:24px;margin-bottom:4px;">Welcome to CTM</h2>
-          <p style="color:var(--fg-dim);margin-bottom:20px;">Manage Claude Code sessions, prompts, and your AI assistant Wall-E.</p>
-          <button class="btn primary" onclick="showNewSessionModal()" style="font-size:15px;padding:8px 24px;margin-bottom:28px;">New Session</button>
-          <div style="display:flex;gap:16px;max-width:680px;">
-            <div onclick="navTo('sessions')" style="flex:1;padding:14px;background:rgba(255,255,255,0.03);border:1px solid var(--border);border-radius:8px;cursor:pointer;">
-              <div style="font-weight:600;margin-bottom:4px;color:var(--fg);">Sessions</div>
-              <div style="font-size:12px;color:var(--fg-dim);">Run and manage Claude Code terminal sessions</div>
-            </div>
-            <div onclick="navTo('prompts')" style="flex:1;padding:14px;background:rgba(255,255,255,0.03);border:1px solid var(--border);border-radius:8px;cursor:pointer;">
-              <div style="font-weight:600;margin-bottom:4px;color:var(--fg);">Prompts</div>
-              <div style="font-size:12px;color:var(--fg-dim);">Save, organize, and send prompts to Claude</div>
+          <div class="standup-dashboard" id="standup-dashboard" onclick="standupHandleDashboardClick(event)">
+            <div class="standup-header">
+              <div class="standup-heading">
+                <h1 class="standup-title">Session Overview</h1>
+              </div>
+              <div class="standup-meta">
+                <div class="standup-counts" id="standup-counts"></div>
+                <span class="standup-updated" id="standup-updated"></span>
+                <div class="standup-actions">
+                  <button class="standup-action-btn" type="button" data-standup-action="refresh">Refresh</button>
+                  <button class="standup-action-btn primary" type="button" onclick="showNewSessionModal()">New Session</button>
+                </div>
+              </div>
             </div>
-            <div onclick="navTo('walle')" style="flex:1;padding:14px;background:rgba(255,255,255,0.03);border:1px solid var(--border);border-radius:8px;cursor:pointer;">
-              <div style="font-weight:600;margin-bottom:4px;color:var(--fg);display:flex;align-items:center;gap:6px;"><img src="/walle-icon.svg" width="18" height="18"> WALL-E</div>
-              <div style="font-size:12px;color:var(--fg-dim);">Your personal AI assistant — chat, tasks, and insights</div>
+            <div class="standup-attention" id="standup-attention"></div>
+            <div class="standup-loading" id="standup-loading">Loading sessions...</div>
+            <div class="standup-error" id="standup-error" style="display:none;"></div>
+            <div class="standup-lanes" id="standup-lanes"></div>
+            <div class="standup-empty" id="standup-empty" style="display:none;">
+              No active sessions.
             </div>
           </div>
         </div>
@@ -3212,7 +3715,10 @@
         <div id="setup-panel">
           <div class="setup-header">
             <div style="display:flex;justify-content:space-between;align-items:baseline;">
-              <h2>Wall-E Setup</h2>
+              <div style="display:flex;align-items:center;gap:8px;min-width:0;">
+                <h2>Wall-E Setup</h2>
+                <span class="setup-version-pill" id="setup-version-label" title="Installed CTM / Wall-E bundle version">Version loading...</span>
+              </div>
               <div style="display:flex;align-items:center;gap:6px;">
                 <span class="status-dot ok" id="setup-owner-dot"></span>
                 <input type="text" id="setup-owner-name" placeholder="Your Name" style="background:transparent;border:none;border-bottom:1px solid var(--border);color:var(--fg);font-size:14px;padding:2px 0;width:120px;outline:none;text-align:right;" title="Owner name">
@@ -3593,13 +4099,13 @@
                   <div id="setup-mcp-integrations"><div style="color:var(--fg-dim);font-size:12px;padding:8px 0;">Loading…</div></div>
                   <div class="btn-row" style="margin-top:8px;">
                     <button class="setup-btn setup-btn-secondary" id="setup-mcp-test-btn" onclick="SETUP.testMcpConnection()" disabled>Test Connection</button>
-                    <button class="setup-btn setup-btn-secondary" id="setup-mcp-fix-btn" onclick="SETUP.fixMcpConfigs()" style="display:none">Fix All</button>
+                    <button class="setup-btn setup-btn-secondary" id="setup-mcp-fix-btn" onclick="SETUP.fixMcpConfigs()" style="display:none">Repair Configs</button>
                     <span class="test-result" id="setup-mcp-test-result"></span>
                   </div>
                   <details style="margin-top:14px;">
                     <summary style="cursor:pointer;font-size:12px;color:var(--fg-dim);">Manual setup instructions</summary>
                     <div style="margin-top:8px;font-size:12px;color:var(--fg-dim);line-height:1.6;">
-                      Add this to your tool's MCP config:
+                      Add this to JSON-based MCP configs:
                       <pre style="background:var(--bg);border:1px solid var(--border);border-radius:6px;padding:10px 12px;margin-top:6px;font-size:11px;color:var(--fg);overflow-x:auto;"><code>{
   "mcpServers": {
     "wall-e": {
@@ -3608,9 +4114,14 @@
     }
   }
 }</code></pre>
+                      <div style="margin-top:8px;">For Codex, add this to <code style="font-size:11px;">~/.codex/config.toml</code>:</div>
+                      <pre style="background:var(--bg);border:1px solid var(--border);border-radius:6px;padding:10px 12px;margin-top:6px;font-size:11px;color:var(--fg);overflow-x:auto;"><code>[mcp_servers."wall-e"]
+url = "http://localhost:<span id="setup-mcp-port-display-toml">3457</span>/mcp"</code></pre>
                       <div style="margin-top:6px;">
                         <strong style="color:var(--fg);">Config file locations:</strong><br>
-                        Claude Code: <code style="font-size:11px;">~/.claude/mcp.json</code><br>
+                        Claude Code project: <code style="font-size:11px;">~/.claude/mcp.json</code><br>
+                        Claude Code global: <code style="font-size:11px;">~/.claude.json</code><br>
+                        Codex: <code style="font-size:11px;">~/.codex/config.toml</code><br>
                         Cursor: <code style="font-size:11px;">~/.cursor/mcp.json</code><br>
                         Windsurf: <code style="font-size:11px;">~/.codeium/windsurf/mcp_config.json</code><br>
                         Claude Desktop: <code style="font-size:11px;">~/Library/Application Support/Claude/claude_desktop_config.json</code>
@@ -3682,8 +4193,6 @@
                   </div>
                 </div>
               </div>
-
-              <div id="setup-version-label"></div>
             </div>
           </div>
         </div>
@@ -4392,6 +4901,8 @@
 <script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script>
 <script src="js/session-search-utils.js"></script>
 <script src="js/session-activity-utils.js"></script>
+<script src="js/session-status-precedence.js"></script>
+<script src="js/terminal-restore-state.js"></script>
 <script src="js/walle-session.js"></script>
 <script src="js/message-renderer.js"></script>
 <script src="js/stream-view.js"></script>
@@ -4463,15 +4974,87 @@ function _safeStorageSet(storage, key, value) {
   try { storage.setItem(key, value); } catch {}
 }
 
+function setAppVersion(version, info = {}) {
+  const cleanVersion = String(version || '').trim();
+  const label = cleanVersion ? `v${cleanVersion}` : 'v?';
+  const product = info.product || 'create-walle';
+  const latest = String(info.latestVersion || '').trim();
+
+  const topbar = document.getElementById('app-version-label');
+  if (topbar) {
+    topbar.textContent = label;
+    topbar.classList.toggle('update-available', !!(latest && cleanVersion && latest !== cleanVersion));
+    topbar.title = cleanVersion
+      ? `Installed CTM / Wall-E bundle version: ${product} ${label}`
+      : 'Installed CTM / Wall-E bundle version unknown';
+    if (latest && cleanVersion && latest !== cleanVersion) {
+      topbar.title += `; update available: v${latest}`;
+    }
+    if (info.components) {
+      const ctm = info.components.ctm ? `CTM package ${info.components.ctm}` : '';
+      const walle = info.components.wallE ? `Wall-E package ${info.components.wallE}` : '';
+      const parts = [ctm, walle].filter(Boolean);
+      if (parts.length) topbar.title += ` (${parts.join(', ')})`;
+    }
+  }
+
+  const setup = document.getElementById('setup-version-label');
+  if (setup) {
+    setup.textContent = cleanVersion ? `CTM / Wall-E ${label}` : 'Version unknown';
+    setup.title = topbar ? topbar.title : 'Installed CTM / Wall-E bundle version';
+  }
+}
+window.setAppVersion = setAppVersion;
+
+function loadAppVersion() {
+  fetch('/api/app/version')
+    .then(r => r.json())
+    .then(data => {
+      if (data && data.version) setAppVersion(data.version, data);
+    })
+    .catch(() => {});
+}
+
 let _updateDismissedVersion = _safeStorageGet(localStorage, 'update_dismissed_version');
 let _updateWizardSnoozedVersion = _safeStorageGet(sessionStorage, 'update_wizard_snoozed_version');
 let _updateCurrentVersion = '';
 let _updateLatestVersion = '';
 let _updateApplying = false;
+const _updateTelemetryShown = new Set();
+
+function _trackUpdateTelemetry(event, fields = {}) {
+  const payload = {
+    event,
+    currentVersion: _updateCurrentVersion,
+    latestVersion: _updateLatestVersion,
+    ...fields,
+  };
+  fetch('/api/updates/telemetry', {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify(payload),
+  }).catch(() => {});
+}
+
+function _trackUpdatePromptShown(surface) {
+  if (!_updateLatestVersion) return;
+  const key = `${surface}:${_updateLatestVersion}`;
+  if (_updateTelemetryShown.has(key)) return;
+  _updateTelemetryShown.add(key);
+  _trackUpdateTelemetry('prompt_shown', { surface });
+}
+
+function _rememberDismissedUpdate() {
+  if (_updateLatestVersion) {
+    _updateDismissedVersion = _updateLatestVersion;
+    _safeStorageSet(localStorage, 'update_dismissed_version', _updateLatestVersion);
+  }
+}
 
 function _setUpdateVersions(current, latest) {
   _updateCurrentVersion = current || '';
   _updateLatestVersion = latest || '';
+  setAppVersion(_updateCurrentVersion, { latestVersion: _updateLatestVersion });
 
   const banner = document.getElementById('update-banner');
   if (banner) {
@@ -4518,6 +5101,7 @@ function showUpdateBanner(current, latest) {
   if (!banner || !msg) return;
   msg.textContent = `Update available: v${current} \u2192 v${latest}`;
   banner.style.display = 'flex';
+  _trackUpdatePromptShown('banner');
   showUpdateWizard(current, latest);
 }
 
@@ -4527,6 +5111,7 @@ function showUpdateWizard(current, latest) {
   const wizard = document.getElementById('update-wizard');
   if (!wizard) return;
   wizard.classList.remove('hidden');
+  _trackUpdatePromptShown('wizard');
   setTimeout(() => {
     const btn = document.getElementById('update-wizard-apply-btn');
     if (btn && !btn.disabled) btn.focus();
@@ -4534,6 +5119,7 @@ function showUpdateWizard(current, latest) {
 }
 
 function snoozeUpdateWizard() {
+  _trackUpdateTelemetry('action', { action: 'later', surface: 'wizard' });
   if (_updateLatestVersion) {
     _updateWizardSnoozedVersion = _updateLatestVersion;
     _safeStorageSet(sessionStorage, 'update_wizard_snoozed_version', _updateLatestVersion);
@@ -4541,38 +5127,44 @@ function snoozeUpdateWizard() {
   _hideUpdateWizard();
 }
 
-function dismissUpdate() {
+function dismissUpdate(surface = 'unknown') {
+  _trackUpdateTelemetry('action', { action: 'skip', surface });
   _hideUpdatePrompts();
-  if (_updateLatestVersion) {
-    _updateDismissedVersion = _updateLatestVersion;
-    _safeStorageSet(localStorage, 'update_dismissed_version', _updateLatestVersion);
-  }
+  _rememberDismissedUpdate();
 }
 
-async function applyUpdate() {
+async function applyUpdate(surface = 'unknown') {
   if (_updateApplying) return;
+  _trackUpdateTelemetry('action', { action: 'apply', surface });
   _setUpdateApplying(true);
   try {
     const resp = await fetch('/api/updates/apply', { method: 'POST' });
     const data = await resp.json();
     if (data.status === 'updating') {
+      _trackUpdateTelemetry('action', { action: 'apply_started', surface });
       toast('Update started. CTM will restart shortly...', { type: 'info', duration: 8000 });
-      dismissUpdate();
+      _hideUpdatePrompts();
+      _rememberDismissedUpdate();
     } else {
+      _trackUpdateTelemetry('action', { action: 'already_up_to_date', surface });
       toast('Already up to date.', { type: 'success' });
       _hideUpdatePrompts();
       _setUpdateApplying(false);
     }
   } catch (e) {
+    _trackUpdateTelemetry('action', { action: 'apply_failed', surface });
     toast('Update failed: ' + e.message, { type: 'error' });
     _setUpdateApplying(false);
   }
 }
 
 function checkForUpdates() {
-  fetch('/api/updates/check')
+  fetch('/api/updates/check?refresh=1')
     .then(r => r.json())
     .then(data => {
+      if (data.currentVersion) {
+        setAppVersion(data.currentVersion, { latestVersion: data.latestVersion });
+      }
       if (data.updateAvailable) {
         showUpdateBanner(data.currentVersion, data.latestVersion);
       }
@@ -4581,6 +5173,7 @@ function checkForUpdates() {
 }
 
 // Check on page load
+setTimeout(loadAppVersion, 0);
 setTimeout(checkForUpdates, 3000);
 
 // --- State ---
@@ -4594,6 +5187,7 @@ const state = window._ctmState = {
   sessions: new Map(),   // id -> { term, fitAddon, container }
   activeTab: null,       // session id or 'rules'
   lastActiveWorkSessionId: null, // last non-Wall-E session used as repo context
+  standup: { loading: false, data: null, lastLoadedAt: 0 },
   tabOrder: [],          // session ids in tab order
   reviewingSessionId: null,  // currently reviewed session
   sidebarCollapsed: false,
@@ -4683,6 +5277,7 @@ function connect() {
       case 'created': onCreated(msg); break;
       case 'output': onOutput(msg); break;
       case 'snapshot': onSnapshot(msg); break;
+      case 'codex-terminal-final': onCodexTerminalFinal(msg); break;
       case 'exit': onExit(msg); break;
       case 'restarting': onRestarting(msg); break;
       case 'sessions': state._sessionsListDone = onSessionsList(msg); break;
@@ -4715,6 +5310,7 @@ function connect() {
       case 'walle-progress': WalleSession.handleProgress(msg); break;
       case 'walle-response': WalleSession.handleResponse(msg); break;
       case 'walle-history': WalleSession.handleHistory(msg); break;
+      case 'walle-model': WalleSession.handleModel(msg); break;
       case 'server-restarting':
         // Server broadcast this BEFORE closing connections — set flag so onclose
         // knows this is intentional and shows the overlay immediately.
@@ -4834,7 +5430,7 @@ function onServerReady() {
   }
 
   // 2. Restore active tab — single source of truth for session activation.
-  // Priority: saved pref > pending hash > first session in tab order.
+  // Priority: explicit hash > saved session > pinned Sessions overview.
   // SKIP this step if the user is on a non-session nav panel (walle, prompts, etc.):
   // handleHashRoute already navigated there, and activateTab would switch away.
   const currentNav = document.querySelector('.nav-pill.active')?.dataset?.nav || 'sessions';
@@ -4848,13 +5444,15 @@ function onServerReady() {
     // auto-activating in onSessionsList.
     if (hashTarget && state.sessions.has(hashTarget)) {
       activateTab(hashTarget);
+    } else if (state._forceSessionsOverview) {
+      state._forceSessionsOverview = false;
+      showStandupDashboard({ skipHash: true });
     } else if (savedTarget && state.sessions.has(savedTarget)) {
       activateTab(savedTarget);
     } else if (savedTarget === 'review' && state.tabOrder.includes('review')) {
       activateTab('review');
-    } else if (!state.activeTab || !state.sessions.has(state.activeTab)) {
-      const first = state.tabOrder.find(t => state.sessions.has(t));
-      if (first) activateTab(first);
+    } else if (!state.activeTab || (!state.sessions.has(state.activeTab) && state.activeTab !== SESSIONS_OVERVIEW_TAB_ID)) {
+      showStandupDashboard({ skipHash: true });
     }
   }
 
@@ -5156,6 +5754,7 @@ function _clientDetectAgentType(cmd) {
   if (c.includes('claude')) return 'claude';
   if (c.includes('codex')) return 'codex';
   if (c.includes('gemini')) return 'gemini';
+  if (c.includes('opencode') || c.includes('open-code')) return 'opencode';
   if (c.includes('wall-e') || c.includes('walle')) return 'walle';
   return null;
 }
@@ -5165,7 +5764,8 @@ const CLIENT_AGENT_CAPABILITIES = {
   'claude-desktop': { structuredTranscript: true, promptNavigation: 'transcript', review: true, resume: false },
   codex: { structuredTranscript: true, promptNavigation: 'transcript', review: true, resume: true },
   gemini: { structuredTranscript: false, promptNavigation: 'terminal', review: false, resume: true },
-  walle: { structuredTranscript: true, promptNavigation: 'none', review: true, resume: false },
+  opencode: { structuredTranscript: false, promptNavigation: 'terminal', review: false, resume: true },
+  walle: { structuredTranscript: true, promptNavigation: 'chat', review: true, resume: false },
   shell: { structuredTranscript: false, promptNavigation: 'terminal', review: false, resume: false },
 };
 
@@ -5176,6 +5776,7 @@ function _clientNormalizeAgentType(value) {
   if (v === 'claude-code') return 'claude';
   if (v === 'claude-desktop-session' || v === 'desktop') return 'claude-desktop';
   if (v === 'gemini-cli') return 'gemini';
+  if (v === 'open-code' || v === 'opencode-cli') return 'opencode';
   return _clientDetectAgentType(v);
 }
 
@@ -5206,6 +5807,41 @@ const _CODEX_BUSY_WORD = 'working';
 const _CODEX_BUSY_HINT_RE = /esc\s+to\s+interrupt/i;
 const _GEMINI_STATUS_FRAGMENT_RE = /^(?:[\s\d•◦·∙●○✦✧◆◇◐◓◑◒|\/\\-]+|Thinking\.{0,3}|Working\.{0,3}|Running\.{0,3}|Responding\.{0,3}|Loading\.{0,3}|esc\s+to\s+(?:cancel|interrupt)|ctrl\+c\s+to\s+(?:quit|cancel)|press\s+enter\s+to\s+send|shift\+enter\s+for\s+newline)$/i;
 
+function _inputMayResolveWaiting(data, session) {
+  const text = String(data || '');
+  if (!text) return false;
+  if (text.indexOf('\r') >= 0 || text.indexOf('\n') >= 0) return true;
+  if (text.indexOf('\x03') >= 0 || text.indexOf('\x04') >= 0) return true;
+  const reason = session?._waitingReason || '';
+  if (reason === 'approval' || reason === 'choice') {
+    return /^[\s]*[12yYnN\u001b][\s]*$/.test(text);
+  }
+  return false;
+}
+
+const _CODEX_MUTED_PROMPT_BG = new Set(['237', '238']);
+function _normalizeCodexPromptBackground(session, data) {
+  if (_clientAgentTypeForSession(session) !== 'codex') return data;
+  const text = String(data || '');
+  if (text.indexOf('\x1b[') < 0 || text.indexOf('48;5;23') < 0) return data;
+  return text.replace(/\x1b\[([0-9;]*)m/g, (seq, rawParams) => {
+    const params = rawParams === '' ? ['0'] : rawParams.split(';');
+    const hasMutedPromptBg = params.some((value, i) => (
+      value === '48' && params[i + 1] === '5' && _CODEX_MUTED_PROMPT_BG.has(params[i + 2])
+    ));
+    if (!hasMutedPromptBg) return seq;
+    const next = [];
+    for (let i = 0; i < params.length; i++) {
+      if (params[i] === '48' && params[i + 1] === '5' && _CODEX_MUTED_PROMPT_BG.has(params[i + 2])) {
+        i += 2;
+        continue;
+      }
+      next.push(params[i]);
+    }
+    return next.length ? `\x1b[${next.join(';')}m` : '';
+  });
+}
+
 function _isClaudeRedraw(data) {
   const s = String(data || '');
   return (
@@ -5283,7 +5919,8 @@ function _zerolagConfigFor(agentType) {
   // Prompt character per agent — the addon scans the buffer bottom-up for this
   // char. offset 2 = input starts 2 cells after the prompt char (char + space).
   if (agentType === 'claude') return { type: 'character', char: '❯', offset: 2 }; // ❯
-  if (agentType === 'codex') return { type: 'character', char: '›', offset: 2 };
+  // Codex intentionally disabled: its ratatui redraws can leave stale lower
+  // prompt markers, and the character scanner can strand typed text there.
   // Gemini intentionally disabled until we verify its prompt format.
   // Re-enable after a quick live-session check of its actual TUI layout.
   return null;
@@ -5354,6 +5991,65 @@ function _createTerminalStub(id) {
   });
 }
 
+function createCodexFinalPanel(id) {
+  const panel = document.createElement('div');
+  panel.className = 'codex-final-panel';
+  panel.dataset.sessionId = id;
+
+  const header = document.createElement('div');
+  header.className = 'codex-final-header';
+  const title = document.createElement('span');
+  title.textContent = 'Latest Codex Answer';
+  const close = document.createElement('button');
+  close.type = 'button';
+  close.className = 'codex-final-close';
+  close.title = 'Dismiss';
+  close.textContent = '×';
+  close.onclick = function() {
+    const s = state.sessions.get(id);
+    if (s && s._codexFinal) s._codexFinalDismissed = s._codexFinal.fingerprint || true;
+    _renderCodexFinalPanel(id);
+  };
+  header.appendChild(title);
+  header.appendChild(close);
+
+  const body = document.createElement('div');
+  body.className = 'codex-final-body';
+  panel.appendChild(header);
+  panel.appendChild(body);
+  return panel;
+}
+
+function _renderCodexFinalPanel(id) {
+  const s = state.sessions.get(id);
+  if (!s || !s.container) return;
+  const panel = s.container.querySelector('.codex-final-panel');
+  if (!panel) return;
+  const final = s._codexFinal;
+  const hiddenByView = typeof _streamState !== 'undefined' && _streamState.activeView.get(id) === 'conversation';
+  const dismissed = final && s._codexFinalDismissed === final.fingerprint;
+  const shouldShow = !!(final && final.text && !dismissed && !hiddenByView);
+  panel.classList.toggle('visible', shouldShow);
+  if (!shouldShow) return;
+  const body = panel.querySelector('.codex-final-body');
+  if (body) body.textContent = final.text;
+}
+
+function onCodexTerminalFinal(msg) {
+  const id = msg && msg.id;
+  if (!id) return;
+  const s = state.sessions.get(id);
+  if (!s) return;
+  const existingFingerprint = s._codexFinal && s._codexFinal.fingerprint;
+  s._codexFinal = {
+    text: String(msg.text || ''),
+    timestamp: msg.timestamp || Date.now(),
+    fingerprint: msg.fingerprint || String(msg.text || '').slice(0, 64),
+  };
+  if (existingFingerprint !== s._codexFinal.fingerprint) s._codexFinalDismissed = null;
+  _renderCodexFinalPanel(id);
+}
+
 function createTerminal(id, opts) {
   opts = opts || {};
   // Phase 1B: if a stub exists, remove its container first
@@ -5411,6 +6107,7 @@ function createTerminal(id, opts) {
     // snapshot message. No PTY round-trip — instant snapshot restore.
     s.term.clear();
     try { s.term.clearTextureAtlas(); } catch {}
+    _markClientUiRefreshOutputSuppression(s);
     send({ type: 'reflow', id: id, cols: s.term.cols, rows: s.term.rows });
   };
   toolbar.appendChild(reflowBtn);
@@ -5543,6 +6240,7 @@ function createTerminal(id, opts) {
   });
 
   // Add conversation view inside the container so it travels with pane reparenting
+  container.appendChild(createCodexFinalPanel(id));
   if (typeof createConversationView === 'function') {
     container.appendChild(createConversationView(id));
   }
@@ -5753,8 +6451,9 @@ function createTerminal(id, opts) {
     // The addon scans the xterm buffer for the prompt char and clears pending text
     // once the server echo catches up — safe alongside CTM's immediate-send model.
     _zerolagFeedInput(_s, data);
-    // Only clear waiting state if actually waiting (avoid DOM work on every keystroke)
-    if (_s && _s._waitingForInput) clearWaitingState(id);
+    // Only resolve waiting on submit/choice keystrokes. Plain prompt typing
+    // should keep the sidebar in Waiting, not manufacture a Running window.
+    if (_s && _s._waitingForInput && _inputMayResolveWaiting(data, _s)) clearWaitingState(id);
     // User typed something — re-enable follow mode and scroll to bottom.
     const s = _s;
     if (s) {
@@ -5784,6 +6483,7 @@ function createTerminal(id, opts) {
   term.onResize(({ cols, rows }) => {
     const s = state.sessions.get(id);
     if (s && s._suppressResize) return; // Skip during font metric refresh
+    _markClientUiRefreshOutputSuppression(s);
     send({ type: 'resize', id, cols, rows });
   });
 
@@ -5871,10 +6571,18 @@ function createTerminal(id, opts) {
     if (writer._userScrollLocked) return; // locked — only wheel can unlock
     const current = state.sessions.get(id) || { _id: id, term, writer, container };
     writer.followMode = _isAtTerminalFollowBottom(current);
+    requestAnimationFrame(() => _alignXtermHelperTextareaToViewport(current));
   });
 
-  state.sessions.set(id, { _id: id, term, fitAddon, searchAddon, container, needsFontRefresh: true, writer, promptLines: [], promptNavIdx: -1, _webglAddon, _loadWebgl });
-  // Attach local echo overlay for known agent types (claude today; codex/gemini pending prompt verification).
+  const sessionEntry = { _id: id, term, fitAddon, searchAddon, container, needsFontRefresh: true, writer, promptLines: [], promptNavIdx: -1, _webglAddon, _loadWebgl };
+  state.sessions.set(id, sessionEntry);
+  if (typeof term.onWriteParsed === 'function') {
+    sessionEntry._helperAlignDisposer = term.onWriteParsed(() => {
+      const current = state.sessions.get(id);
+      if (current) _alignXtermHelperTextareaToViewport(current);
+    });
+  }
+  // Attach local echo overlay for known agent types (Claude today; Codex/Gemini pending prompt verification).
   _attachZerolag(state.sessions.get(id), id);
   return { term, fitAddon, container };
 }
@@ -5904,6 +6612,12 @@ function _extractPromptPreview(text) {
   // (e.g., system-reminder, local-command-caveat, available-deferred-tools)
   // User text never contains these hyphenated XML tag patterns.
   let stripped = text
+    // User prompts can start with image attachments before the actual text.
+    // Drop the attachment block so prompt navigation indexes the user's words,
+    // not the image placeholder.
+    .replace(/<image\b[^>]*>[\s\S]*?<\/image>/gi, '')
+    .replace(/<\/?image\b[^>]*>/gi, '')
+    .replace(/^\s*\[Image #\d+\]\s*$/gmi, '')
     // Remove matched open/close tag pairs with hyphenated names (system tags)
     .replace(/<([a-z][a-z0-9]*(?:-[a-z0-9]+)+)[^>]*>[\s\S]*?<\/\1>/gi, '')
     // Remove any remaining orphaned hyphenated system tags
@@ -5956,11 +6670,64 @@ function _isTerminalPromptLine(agentType, text) {
 // API results are cached and only re-fetched every 30s to avoid input lag.
 const _promptScanCache = {}; // { [sessionId]: { ts, previews } }
 
-function scanPromptLines(id) {
+function _promptPreviewsEqual(a, b) {
+  if (!Array.isArray(a) || !Array.isArray(b) || a.length !== b.length) return false;
+  for (let i = 0; i < a.length; i++) {
+    if (a[i] !== b[i]) return false;
+  }
+  return true;
+}
+
+function _promptCacheKeyMatchesSession(key, id, s) {
+  if (!key || key === id || key.startsWith(id + ':')) return true;
+  if (s?.meta?.claudeSessionId && key.startsWith(s.meta.claudeSessionId)) return true;
+  if (s?.meta?.agentSessionId && key.startsWith(s.meta.agentSessionId)) return true;
+  if (s?.meta?.agentSessionToken && key.startsWith(s.meta.agentSessionToken)) return true;
+  return false;
+}
+
+function invalidatePromptScanCacheForSession(id) {
+  const s = state.sessions.get(id);
+  for (const key of Object.keys(_promptScanCache)) {
+    if (_promptCacheKeyMatchesSession(key, id, s)) delete _promptScanCache[key];
+  }
+}
+
+function _recordLivePromptPreview(id, text) {
+  const s = state.sessions.get(id);
+  if (!s) return;
+  const cleaned = _extractPromptPreview(text);
+  if (!cleaned) return;
+  const previews = Array.isArray(s.promptPreviews) ? s.promptPreviews.slice() : [];
+  if (previews[previews.length - 1] === cleaned) return;
+  previews.push(cleaned);
+  s.promptPreviews = previews;
+  s.promptLines = previews.map((_, i) => Array.isArray(s.promptLines) && i < s.promptLines.length ? s.promptLines[i] : -1);
+  s.promptNavIdx = -1;
+  s._promptLinesResolved = false;
+  promptNavUpdateBadge(id);
+
+  for (const key of Object.keys(_promptScanCache)) {
+    if (_promptCacheKeyMatchesSession(key, id, s)) {
+      _promptScanCache[key] = { ts: Date.now(), previews: previews.slice() };
+    }
+  }
+}
+
+window._ctmRecordLivePromptPreview = _recordLivePromptPreview;
+
+function scanPromptLines(id, opts) {
+  opts = opts || {};
   const s = state.sessions.get(id);
   if (!s) return;
   const agentType = _clientAgentTypeForSession(s);
   const caps = _clientAgentCaps(agentType);
+  if (caps.promptNavigation === 'chat') {
+    if (window.WalleSession && typeof window.WalleSession.updatePromptNav === 'function') {
+      window.WalleSession.updatePromptNav(id);
+    }
+    return;
+  }
   // Find projectEntry and Claude session ID for the API call
   // The CTM tab ID (id) may differ from the Claude JSONL session ID
   let projectEntry = null;
@@ -5985,8 +6752,8 @@ function scanPromptLines(id) {
     const apiProjectEntry = agentType === 'codex' ? '' : projectEntry;
     const cacheKey = claudeId + ':' + (apiProjectEntry || 'codex');
     const cache = _promptScanCache[cacheKey];
-    if (cache && Date.now() - cache.ts < 30000) {
-      if (!s.promptPreviews || s.promptPreviews.length !== cache.previews.length) {
+    if (!opts.force && cache && Date.now() - cache.ts < 30000) {
+      if (!_promptPreviewsEqual(s.promptPreviews, cache.previews)) {
         s.promptLines = cache.previews.map(() => -1);
         s.promptPreviews = cache.previews;
         s.promptNavIdx = -1;
@@ -5994,7 +6761,7 @@ function scanPromptLines(id) {
       promptNavUpdateBadge(id);
       return;
     }
-    _scanPromptLinesFromAPI(id, apiProjectEntry, claudeId);
+    return _scanPromptLinesFromAPI(id, apiProjectEntry, claudeId);
   } else {
     _scanPromptLinesFromTerminal(id);
   }
@@ -6005,7 +6772,13 @@ async function _scanPromptLinesFromAPI(id, projectEntry, claudeId) {
   if (!s) return;
   const apiId = claudeId || id; // Use Claude session ID for the API, tab ID for state
   try {
-    const res = await fetch(`/api/session/messages?id=${apiId}&project=${encodeURIComponent(projectEntry || '')}&token=${state.token}`);
+    const params = new URLSearchParams({
+      id: apiId,
+      project: projectEntry || '',
+      token: state.token,
+      nocache: '1',
+    });
+    const res = await fetch(`/api/session/messages?${params.toString()}`);
     const raw = await res.json();
     const messages = Array.isArray(raw) ? raw : (Array.isArray(raw.messages) ? raw.messages : null);
     if (raw.error || !messages) {
@@ -6153,11 +6926,16 @@ function _ensurePromptBufferPositions(id) {
 
 function promptNavGo(id, dir) {
   const s = state.sessions.get(id);
-  if (!s || s.promptLines.length === 0) return;
+  if (!s) return;
+  if (_clientAgentTypeForSession(s) === 'walle' && window.WalleSession && typeof window.WalleSession.promptNavGo === 'function') {
+    window.WalleSession.promptNavGo(id, dir);
+    return;
+  }
+  if (!Array.isArray(s.promptLines) || s.promptLines.length === 0) return;
   // Always re-resolve from current buffer (may have grown)
   _applyPromptCache(id);
 
-  const total = s.promptLines.length;
+  const total = Array.isArray(s.promptLines) ? s.promptLines.length : 0;
   let newIdx;
   if (s.promptNavIdx < 0) {
     // No prompt selected yet: up goes to last, down goes to first
@@ -6179,6 +6957,7 @@ function promptNavGo(id, dir) {
       promptNavUpdateBadge(id);
       return;
     }
+    if (_jumpToLatestUnmappedPrompt(s, id, newIdx)) return;
     newIdx += dir; // Skip non-navigable, continue in same direction
   }
 }
@@ -6186,6 +6965,7 @@ function promptNavGo(id, dir) {
 function promptNavUpdateBadge(id) {
   const s = state.sessions.get(id);
   if (!s) return;
+  if (!s.container || typeof s.container.querySelector !== 'function') return;
   const nav = s.container.querySelector('.prompt-nav');
   if (!nav) return;
   const badge = nav.querySelector('.prompt-nav-badge');
@@ -6198,16 +6978,40 @@ function promptNavUpdateBadge(id) {
   nextBtn.disabled = total === 0;
 }
 
-function promptNavToggleList(id) {
+function _isLatestPromptIndex(s, idx) {
+  return !!s && Array.isArray(s.promptLines) && idx === s.promptLines.length - 1;
+}
+
+function _jumpToLatestUnmappedPrompt(s, id, idx) {
+  if (!_isLatestPromptIndex(s, idx) || !s.term) return false;
+  s.promptNavIdx = idx;
+  if (s.writer) {
+    s.writer.followMode = true;
+    s.writer._userScrollLocked = false;
+  }
+  _ensureScrolledToBottom(s);
+  if (s.term.refresh && s.term.rows) s.term.refresh(0, s.term.rows - 1);
+  promptNavUpdateBadge(id);
+  return true;
+}
+
+async function promptNavToggleList(id) {
   const s = state.sessions.get(id);
   if (!s) return;
-  // Always re-resolve positions from current buffer (buffer may have grown)
-  _applyPromptCache(id);
   const nav = s.container.querySelector('.prompt-nav');
   if (!nav) return;
   // Close existing list
   const existing = nav.querySelector('.prompt-nav-list');
   if (existing) { existing.remove(); return; }
+
+  // The user opens this list specifically to see the current prompt history.
+  // Bypass the 30s prompt cache here; otherwise a newly submitted prompt can
+  // be visible in Conversation while this dropdown still shows the previous
+  // transcript snapshot.
+  await scanPromptLines(id, { force: true });
+  // Re-resolve positions from current buffer (buffer may have grown) after the
+  // fresh transcript read updates previews.
+  _applyPromptCache(id);
   if (s.promptLines.length === 0) return;
 
   // Build list showing preview text for each prompt (deduplicated)
@@ -6235,13 +7039,14 @@ function promptNavToggleList(id) {
     if (seenTexts.has(text)) continue;
     seenTexts.add(text);
     const inBuffer = s.promptLines[i] >= 0;
+    const latestUnmapped = !inBuffer && _isLatestPromptIndex(s, i);
     const item = document.createElement('div');
-    item.className = 'prompt-nav-list-item' + (i === s.promptNavIdx ? ' current' : '') + (inBuffer ? '' : ' not-in-buffer');
+    item.className = 'prompt-nav-list-item' + (i === s.promptNavIdx ? ' current' : '') + (inBuffer ? '' : (latestUnmapped ? ' latest-unmapped' : ' not-in-buffer'));
     if (!inBuffer) {
       item.style.display = 'flex'; item.style.alignItems = 'baseline';
       const badge = document.createElement('span');
-      badge.className = 'prompt-nav-badge-unreachable';
-      badge.textContent = 'unreachable';
+      badge.className = latestUnmapped ? 'prompt-nav-badge-latest' : 'prompt-nav-badge-unreachable';
+      badge.textContent = latestUnmapped ? 'latest' : 'unreachable';
       const textSpan = document.createElement('span');
       textSpan.className = 'prompt-text';
       textSpan.textContent = text;
@@ -6264,8 +7069,10 @@ function promptNavToggleList(id) {
         s.term.refresh(0, s.term.rows - 1);
         promptNavUpdateBadge(id);
         list.remove();
+      } else if (_jumpToLatestUnmappedPrompt(s, id, idx)) {
+        list.remove();
       }
-      // If still not in buffer, keep dropdown open (don't silently close)
+      // If an older prompt is still not in buffer, keep dropdown open (don't silently close)
     }; })(i);
     list.appendChild(item);
   }
@@ -6292,6 +7099,9 @@ function activateTab(id) {
 
   const specialPanels = ['rules', 'insights', 'permissions', 'prompts', 'codereview', 'walle', 'models', 'backups', 'worktrees', 'setup'];
   const isPanel = specialPanels.includes(id);
+  if (!isPanel && state.sessions.has(id)) {
+    state._savedActiveSession = id;
+  }
   if (state.activeTab && state.activeTab !== id && state.sessions.has(state.activeTab)) {
     const prev = state.sessions.get(state.activeTab);
     if (prev && prev.meta?.type !== 'walle') state.lastActiveWorkSessionId = state.activeTab;
@@ -6323,6 +7133,8 @@ function activateTab(id) {
           // Trim trailing empty lines to keep the saved text compact
           while (lines.length && lines[lines.length - 1] === '') lines.pop();
           prevSession._savedScrollbackText = lines.join('\r\n');
+          prevSession._savedScrollbackStats = _terminalPlainTextStats(prevSession._savedScrollbackText);
+          prevSession._savedScrollbackCapturedAt = Date.now();
         } catch {}
         // Overlay holds a DOM ref inside the xterm container; detach before disposing
         // the terminal so it doesn't try to re-render against a dead _renderService.
@@ -6480,6 +7292,11 @@ function activateTab(id) {
       if (!s.container || !document.getElementById('walle-session-' + id)) {
         WalleSession.renderSession(id);
       }
+      if (s.needsAttach || !s._walleHistoryRequested) {
+        s.needsAttach = false;
+        s._walleHistoryRequested = true;
+        send({ type: 'attach', id });
+      }
       s.container.classList.add('active');
       history.replaceState(null, '', location.pathname + location.search + '#session=' + id);
       savePref('active_session', id);
@@ -6508,6 +7325,11 @@ function activateTab(id) {
         const savedCachedSnapshot = s._cachedSnapshot;
         const savedCachedSnapshotCols = s._cachedSnapshotCols;
         const savedCachedSnapshotRows = s._cachedSnapshotRows;
+        const savedScrollbackText = s._savedScrollbackText;
+        const savedScrollbackStats = s._savedScrollbackStats;
+        const savedScrollbackCapturedAt = s._savedScrollbackCapturedAt;
+        const savedCodexFinal = s._codexFinal;
+        const savedCodexFinalDismissed = s._codexFinalDismissed;
         // Make container visible first — term.open() needs non-zero dimensions
         s.container.classList.add('active');
         createTerminal(id, { active: true });  // replaces stub in state.sessions, cleans up old container
@@ -6527,8 +7349,14 @@ function activateTab(id) {
           s2._cachedSnapshot = savedCachedSnapshot;
           s2._cachedSnapshotCols = savedCachedSnapshotCols;
           s2._cachedSnapshotRows = savedCachedSnapshotRows;
+          s2._savedScrollbackText = savedScrollbackText;
+          s2._savedScrollbackStats = savedScrollbackStats;
+          s2._savedScrollbackCapturedAt = savedScrollbackCapturedAt;
+          s2._codexFinal = savedCodexFinal;
+          s2._codexFinalDismissed = savedCodexFinalDismissed;
           s2.needsAttach = true;
           s2.needsFontRefresh = true;
+          _renderCodexFinalPanel(id);
         }
       }
       // Re-read in case stub was replaced
@@ -6541,7 +7369,17 @@ function activateTab(id) {
 
       const canRestoreExitedText = !!(sReal._exited && sReal._savedScrollbackText && sReal.term);
       const hasCachedSnapshot = !!(sReal._cachedSnapshot && sReal.term);
-      if (!canRestoreExitedText && !hasCachedSnapshot && sReal.term) {
+      const shouldRestoreSavedText = !!(!sReal._exited && sReal._savedScrollbackText && sReal.term
+        && (!hasCachedSnapshot || _snapshotLooksShorterThanSaved(sReal, sReal._cachedSnapshot)));
+      const shouldShowInitialOverlay = typeof TerminalRestoreState !== 'undefined'
+        ? TerminalRestoreState.shouldShowInitialOverlay({
+          hasTerminal: !!sReal.term,
+          canRestoreExitedText,
+          hasCachedSnapshot,
+          shouldRestoreSavedText,
+        })
+        : (!canRestoreExitedText && !hasCachedSnapshot && !shouldRestoreSavedText && sReal.term);
+      if (shouldShowInitialOverlay) {
         // No cached snapshot — first-ever activation. Show loading overlay.
         _showLoadingOverlay(sReal);
       }
@@ -6581,14 +7419,23 @@ function activateTab(id) {
         // match the local terminal. Otherwise wait for the fresh server snapshot
         // requested below; painting an old-width full-screen TUI is what causes
         // Codex/Claude output to appear garbled until a manual reflow.
-        if (canRestoreExitedText && sReal._savedScrollbackText && sReal.term) {
-          const text = sReal._savedScrollbackText + '\r\n';
-          // Keep the reset inside xterm's write queue. A synchronous reset can
-          // run before older queued writes have parsed, leaving stale bytes
-          // ahead of the restored text.
-          sReal.term.write(TERMINAL_FULL_RESET + text, () => _ensureScrolledToBottom(sReal));
+        const cachedSnapshotDimsMatch = hasCachedSnapshot
+          ? _snapshotDimsMatchTerm(sReal, sReal._cachedSnapshotCols, sReal._cachedSnapshotRows)
+          : false;
+        const restoreDecision = typeof TerminalRestoreState !== 'undefined'
+          ? TerminalRestoreState.activationRestoreDecision({
+            canRestoreExitedText,
+            shouldRestoreSavedText,
+            hasCachedSnapshot,
+            cachedSnapshotDimsMatch,
+          })
+          : null;
+        if ((restoreDecision?.action === 'restore-saved-scrollback' || !restoreDecision) && canRestoreExitedText && sReal._savedScrollbackText && sReal.term) {
+          _restoreSavedScrollbackText(sReal, () => _ensureScrolledToBottom(sReal));
+        } else if ((restoreDecision?.action === 'restore-saved-scrollback' || !restoreDecision) && shouldRestoreSavedText) {
+          _restoreSavedScrollbackText(sReal, () => _ensureScrolledToBottom(sReal));
         } else if (hasCachedSnapshot && sReal._cachedSnapshot && sReal.term) {
-          if (_snapshotDimsMatchTerm(sReal, sReal._cachedSnapshotCols, sReal._cachedSnapshotRows)) {
+          if (restoreDecision?.action === 'restore-cached-snapshot' || (!restoreDecision && cachedSnapshotDimsMatch)) {
             _restoreSnapshotData(sReal, sReal._cachedSnapshot, () => _ensureScrolledToBottom(sReal));
           } else {
             _showLoadingOverlay(sReal);
@@ -6621,6 +7468,7 @@ function activateTab(id) {
           try { sReal.term.refresh(0, Math.max(0, sReal.term.rows - 1)); } catch {}
         }
 
+        _markClientUiRefreshOutputSuppression(sReal);
         send({ type: 'resize', id, cols: sReal.term.cols, rows: sReal.term.rows });
         sReal.writer.followMode = true;
         sReal.writer._userScrollLocked = false;
@@ -6630,8 +7478,11 @@ function activateTab(id) {
         // (We previously experimented with flushing this into the terminal first,
         // but that races against the authoritative snapshot replay and can leave
         // interleaved/corrupted state.)
-        sReal.writer.queue = '';
-        if (sReal.needsAttach) {
+        const requestDecision = typeof TerminalRestoreState !== 'undefined'
+          ? TerminalRestoreState.activationRequestDecision({ needsAttach: !!sReal.needsAttach })
+          : { messageType: sReal.needsAttach ? 'attach' : 'snapshot', clearStaleQueue: true };
+        if (requestDecision.clearStaleQueue) sReal.writer.queue = '';
+        if (requestDecision.messageType === 'attach') {
           // Attach already sends a snapshot response — no separate snapshot request needed.
           sReal.needsAttach = false;
           send({ type: 'attach', id, cols: sReal.term.cols, rows: sReal.term.rows });
@@ -6699,6 +7550,7 @@ function activateTab(id) {
             sReal.term.clear();
             sReal.term.clearTextureAtlas();
           } catch {}
+          _markClientUiRefreshOutputSuppression(sReal);
           send({ type: 'reflow', id, cols: sReal.term.cols, rows: sReal.term.rows });
         }, 6000);
         focusTerminalIfSafe(id);
@@ -6785,6 +7637,233 @@ function updateTopbarContext(activeId) {
   }
 }
 
+const STANDUP_LANE_LABELS = {
+  needs_user: 'Needs User',
+  ready_review: 'Ready Review',
+  running: 'Running',
+  continue_later: 'Continue Later',
+};
+const SESSIONS_OVERVIEW_TAB_ID = '__sessions_overview__';
+
+function standupEsc(value) {
+  return escHtml(String(value == null ? '' : value));
+}
+
+function standupStatusClass(status) {
+  return 'status-' + String(status || 'unknown').toLowerCase().replace(/[^a-z0-9_-]/g, '-');
+}
+
+function standupIsVisible() {
+  const welcome = document.getElementById('welcome');
+  return !!(welcome && welcome.style.display !== 'none');
+}
+
+function isSessionsOverviewActive() {
+  return state.activeTab === SESSIONS_OVERVIEW_TAB_ID && standupIsVisible();
+}
+
+function showStandupDashboard(opts) {
+  opts = opts || {};
+  if (!opts.skipHash) {
+    history.replaceState(null, '', location.pathname + location.search);
+  }
+  if (!opts.skipPersist) {
+    state._savedActiveNav = 'sessions';
+    savePref('active_nav', 'sessions');
+  }
+  for (const [, s] of state.sessions) {
+    if (s.container) s.container.classList.remove('active');
+  }
+  ['rules-panel', 'review-panel', 'codereview-panel', 'insights-panel', 'permissions-panel', 'prompts-panel', 'walle-panel'].forEach(id => {
+    const el = document.getElementById(id);
+    if (el) el.classList.remove('active');
+  });
+  ['models-panel', 'backups-panel', 'worktrees-panel', 'setup-panel'].forEach(id => {
+    const el = document.getElementById(id);
+    if (el) { el.classList.remove('active'); el.style.display = 'none'; }
+  });
+
+  state.activeTab = SESSIONS_OVERVIEW_TAB_ID;
+  _subscribeVisibleSessions();
+  const welcome = document.getElementById('welcome');
+  if (welcome) welcome.style.display = 'flex';
+  const sidebar = document.getElementById('sidebar');
+  if (sidebar && !state.sidebarManuallyHidden) {
+    sidebar.classList.remove('collapsed');
+    document.getElementById('sidebar-resize').style.display = '';
+  }
+  const tabbar = document.getElementById('tabbar');
+  if (tabbar) tabbar.style.display = '';
+  const queueBtn = document.getElementById('topbar-queue-btn');
+  if (queueBtn) queueBtn.style.display = 'none';
+  const queuePanel = document.getElementById('queue-panel');
+  const queueResize = document.getElementById('queue-panel-resize');
+  if (queuePanel) queuePanel.style.display = 'none';
+  if (queueResize) queueResize.style.display = 'none';
+  state.queuePanelOpen = false;
+  if (typeof updateQueueBtnHighlight === 'function') updateQueueBtnHighlight();
+
+  syncNavPills('sessions');
+  updateTopbarContext('sessions');
+  renderTabs();
+  renderSessionList();
+  loadStandupDashboard({ silent: !!state.standup.data });
+}
+
+function refreshStandupIfVisible() {
+  if (standupIsVisible()) loadStandupDashboard({ silent: !!state.standup.data });
+}
+
+let _standupRefreshTimer = null;
+function scheduleStandupRefresh(delayMs = 600) {
+  if (!standupIsVisible()) return;
+  if (_standupRefreshTimer) return;
+  _standupRefreshTimer = setTimeout(() => {
+    _standupRefreshTimer = null;
+    refreshStandupIfVisible();
+  }, delayMs);
+}
+
+async function loadStandupDashboard(opts) {
+  opts = opts || {};
+  if (state.standup.loading) return;
+  state.standup.loading = true;
+  const loading = document.getElementById('standup-loading');
+  const error = document.getElementById('standup-error');
+  if (loading && (!state.standup.data || !opts.silent)) loading.style.display = '';
+  if (error) { error.style.display = 'none'; error.textContent = ''; }
+  try {
+    const url = '/api/sessions/standup' + (opts.force ? '?force=1' : '');
+    const resp = await fetch(url);
+    if (!resp.ok) throw new Error(`HTTP ${resp.status}`);
+    const data = await resp.json();
+    state.standup.data = data;
+    state.standup.lastLoadedAt = Date.now();
+    renderStandupDashboard(data);
+  } catch (e) {
+    if (error) {
+      error.textContent = 'Standup refresh failed: ' + (e.message || e);
+      error.style.display = '';
+    }
+  } finally {
+    state.standup.loading = false;
+    if (loading) loading.style.display = 'none';
+  }
+}
+
+function renderStandupDashboard(data) {
+  const countsEl = document.getElementById('standup-counts');
+  const updatedEl = document.getElementById('standup-updated');
+  const attentionEl = document.getElementById('standup-attention');
+  const lanesEl = document.getElementById('standup-lanes');
+  const emptyEl = document.getElementById('standup-empty');
+  if (!countsEl || !lanesEl) return;
+
+  const counts = data.counts || {};
+  countsEl.innerHTML = [
+    ['total', 'Total'],
+    ['needs_user', 'Needs User'],
+    ['ready_review', 'Review'],
+    ['running', 'Running'],
+    ['continue_later', 'Later'],
+  ].map(([key, label]) => (
+    `<span class="standup-count"><strong>${standupEsc(counts[key] || 0)}</strong>${standupEsc(label)}</span>`
+  )).join('');
+  if (updatedEl) updatedEl.textContent = data.generatedAt ? `Updated ${timeAgo(data.generatedAt)}` : '';
+
+  const laneSessions = (data.lanes || []).flatMap(lane => lane.sessions || []);
+  const sessions = (data.sessions && data.sessions.length) ? data.sessions : laneSessions;
+  const attention = sessions.find(s => s.lane === 'needs_user');
+  if (attentionEl) {
+    if (attention) {
+      attentionEl.classList.add('active');
+      attentionEl.innerHTML = `
+        <div class="standup-attention-main">
+          <div class="standup-attention-title">${standupEsc(attention.actionLabel)}: ${standupEsc(attention.title)}</div>
+          <div class="standup-attention-body">${standupEsc(attention.recommendation)}</div>
+        </div>
+        <button class="standup-action-btn primary" type="button" data-standup-action="open" data-session-id="${standupEsc(attention.id)}">Open</button>
+      `;
+    } else {
+      attentionEl.classList.remove('active');
+      attentionEl.innerHTML = '';
+    }
+  }
+
+  if (emptyEl) emptyEl.style.display = sessions.length ? 'none' : '';
+  lanesEl.innerHTML = (data.lanes || []).map(renderStandupLane).join('');
+}
+
+function renderStandupLane(lane) {
+  const sessions = lane.sessions || [];
+  const body = sessions.length
+    ? sessions.map(renderStandupCard).join('')
+    : '<div class="standup-card-text" style="padding:4px 2px;">Clear</div>';
+  return `
+    <section class="standup-lane" data-lane="${standupEsc(lane.id)}">
+      <div class="standup-lane-header">
+        <div class="standup-lane-title"><span class="standup-lane-dot"></span><span>${standupEsc(lane.title || STANDUP_LANE_LABELS[lane.id] || lane.id)}</span></div>
+        <span class="standup-lane-count">${standupEsc(sessions.length)}</span>
+      </div>
+      <div class="standup-lane-body">${body}</div>
+    </section>
+  `;
+}
+
+function renderStandupCard(card) {
+  const subtitle = [card.agent, card.model || card.provider, card.branch].filter(Boolean).join(' / ');
+  const progress = card.progress || card.intent || '';
+  const canReview = card.capabilities && card.capabilities.review;
+  const chips = (card.evidence || []).map(item => `<span class="standup-chip" title="${standupEsc(item)}">${standupEsc(item)}</span>`).join('');
+  return `
+    <article class="standup-card">
+      <div class="standup-card-top">
+        <div style="min-width:0;">
+          <div class="standup-card-title">${standupEsc(card.title || card.id)}</div>
+          <div class="standup-card-subtitle" title="${standupEsc(subtitle)}">${standupEsc(subtitle || card.cwd || '')}</div>
+        </div>
+        <span class="standup-badge ${standupStatusClass(card.status)}">${standupEsc(card.status || 'unknown')}</span>
+      </div>
+      <div class="standup-card-text"><strong>${standupEsc(card.actionLabel || 'Next')}</strong> ${standupEsc(card.recommendation || '')}</div>
+      ${progress ? `<div class="standup-card-text">${standupEsc(progress)}</div>` : ''}
+      ${chips ? `<div class="standup-evidence">${chips}</div>` : ''}
+      <div class="standup-card-actions">
+        <button class="standup-action-btn primary" type="button" data-standup-action="open" data-session-id="${standupEsc(card.id)}">Open</button>
+        ${canReview ? `<button class="standup-action-btn" type="button" data-standup-action="review" data-session-id="${standupEsc(card.id)}">Review</button>` : ''}
+      </div>
+    </article>
+  `;
+}
+
+function standupHandleDashboardClick(event) {
+  const btn = event.target.closest('[data-standup-action]');
+  if (!btn) return;
+  const action = btn.dataset.standupAction;
+  const sessionId = btn.dataset.sessionId;
+  if (action === 'refresh') {
+    loadStandupDashboard({ force: true });
+  } else if (action === 'open') {
+    standupOpenSession(sessionId);
+  } else if (action === 'review') {
+    standupReviewSession(sessionId);
+  }
+}
+
+function standupOpenSession(sessionId) {
+  if (!sessionId || !state.sessions.has(sessionId)) {
+    toast('Session is no longer active', { type: 'warning' });
+    loadStandupDashboard({ force: true });
+    return false;
+  }
+  activateTab(sessionId);
+  return true;
+}
+
+function standupReviewSession(sessionId) {
+  if (!standupOpenSession(sessionId)) return;
+  setTimeout(() => openSessionReview(sessionId), 0);
+}
+
 let _prevNav = null; // track previous nav section for Alt+Tab swap
 
 function toggleNavMore() {
@@ -6802,23 +7881,45 @@ function _closeNavMoreOutside(e) {
   if (!document.getElementById('nav-more-wrap').contains(e.target)) closeNavMore();
 }
 
+function showSessionsWorkspace() {
+  const candidates = [
+    state.activeTab,
+    state.lastActiveWorkSessionId,
+    state._savedActiveSession,
+  ].filter(Boolean);
+  for (const id of candidates) {
+    if (state.sessions.has(id)) {
+      activateTab(id);
+      return true;
+    }
+  }
+  const fromTabs = state.tabOrder.slice().reverse().find(id => state.sessions.has(id));
+  if (fromTabs) {
+    activateTab(fromTabs);
+    return true;
+  }
+  showStandupDashboard();
+  return false;
+}
+
 function navTo(target, opts) {
   // Stop dictation when switching tabs (dictation follows focus)
   if (typeof LI !== 'undefined' && LI.isRecording()) LI.stopRecording();
   // Track previous nav for Alt+Tab toggle
   const currentNav = document.querySelector('.nav-pill.active')?.dataset?.nav || 'sessions';
-  if (target !== currentNav) _prevNav = currentNav;
+  const effectiveTarget = target === 'command' ? 'sessions' : target;
+  if (effectiveTarget !== currentNav) _prevNav = currentNav;
   // Update URL hash
   if (!opts || !opts.skipHash) {
-    if (target === 'sessions') {
+    if (effectiveTarget === 'sessions') {
       history.replaceState(null, '', location.pathname + location.search);
     } else {
-      history.replaceState(null, '', location.pathname + location.search + '#' + target);
+      history.replaceState(null, '', location.pathname + location.search + '#' + effectiveTarget);
     }
   }
   // Persist active nav target so refresh restores it
   if (!opts || !opts.skipPersist) {
-    savePref('active_nav', target);
+    savePref('active_nav', effectiveTarget);
   }
   // Save per-tab deep state when navigating away
   if (state.activeTab === 'prompts' && target !== 'prompts' && typeof PE !== 'undefined' && PE.state.currentPromptId) {
@@ -6831,40 +7932,12 @@ function navTo(target, opts) {
     // overwrite the correct value (both are fire-and-forget async PUTs).
   }
   if (target === 'sessions') {
-    // Switch to last active session (prefer saved, then first available), or show welcome
-    const savedSession = state._savedActiveSession && state.sessions.has(state._savedActiveSession) ? state._savedActiveSession : null;
-    const lastSession = savedSession || state.tabOrder.find(t => state.sessions.has(t));
-    if (lastSession) {
-      activateTab(lastSession);
-    } else {
-      // Reset to welcome
-      state.activeTab = null;
-      document.getElementById('welcome').style.display = '';
-      document.getElementById('rules-panel').classList.remove('active');
-      document.getElementById('insights-panel').classList.remove('active');
-      document.getElementById('permissions-panel').classList.remove('active');
-      document.getElementById('prompts-panel').classList.remove('active');
-      document.getElementById('review-panel').classList.remove('active');
-      document.getElementById('codereview-panel').classList.remove('active');
-      document.getElementById('walle-panel').classList.remove('active');
-      var mdlPanel = document.getElementById('models-panel');
-      if (mdlPanel) { mdlPanel.classList.remove('active'); mdlPanel.style.display = 'none'; }
-      var bkPanel = document.getElementById('backups-panel');
-      if (bkPanel) bkPanel.classList.remove('active');
-      var stPanel = document.getElementById('setup-panel');
-      if (stPanel) { stPanel.classList.remove('active'); stPanel.style.display = 'none'; }
-      // Restore sidebar & tabbar
-      const sidebar = document.getElementById('sidebar');
-      if (!state.sidebarManuallyHidden) {
-        sidebar.classList.remove('collapsed');
-        document.getElementById('sidebar-resize').style.display = '';
-      }
-      document.getElementById('tabbar').style.display = '';
-      syncNavPills('sessions');
-      updateTopbarContext('sessions');
-      renderTabs();
-      renderSessionList();
-    }
+    showSessionsWorkspace();
+  } else if (target === 'command') {
+    // Backward-compatible alias for old #command links. The surface now lives as
+    // the pinned Overview tab inside Sessions.
+    state._forceSessionsOverview = true;
+    showStandupDashboard({ skipHash: true, skipPersist: true });
   } else if (target === 'prompts') {
     openPromptEditor();
   } else if (target === 'rules') {
@@ -9332,8 +10405,8 @@ function _restoreBackup(type, name) {
 
 // Rolling cache of the last fetched worktree list so modals (merge/delete)
 // can look up metadata by branch name without re-querying the server.
-var _wtCache = { repoRoot: '', items: [], counts: {} };
-var _wtModalState = { branch: '', name: '', mode: null, cwd: '' };
+var _wtCache = { repoRoot: '', items: [], counts: {}, namespace: 'claude' };
+var _wtModalState = { branch: '', name: '', mode: null, cwd: '', namespace: 'claude' };
 var _wtCurrentFilter = 'all';
 var _wtLoadSeq = 0;
 var _wtRefreshSeq = 0;
@@ -9417,7 +10490,7 @@ function _wtRunRecommendedAction(wt) {
   if (action.kind === 'open_session' || action.kind === 'review_dirty') return _wtOpenSessionFor(wt);
   if (action.kind === 'prune') return submitPruneGhosts();
   if (action.kind === 'recover_branch') return submitRecoverDetached(wt);
-  if (action.kind === 'sync_branch') return openSyncModal(wt);
+  if (action.kind === 'sync_branch') return _wtOpenSyncOrExplain(wt);
   if (action.kind === 'finish_work') return _wtOpenMergeOrExplain(wt);
   if (action.kind === 'cleanup') return openDeleteModal(wt);
   if (action.kind === 'update_main' || action.kind === 'push_main' || action.kind === 'reconcile_main') {
@@ -9437,6 +10510,24 @@ function _wtRecommendedButton(wt) {
   return btn;
 }
 
+function _wtSyncBlockReason(wt) {
+  if (!wt || wt.isMain) return '';
+  if (wt.sessionId) return 'Close the active session before syncing from main.';
+  if ((wt.dirtyFiles || 0) > 0) return 'Commit or stash dirty files before syncing from main.';
+  if (!wt.branch || wt.branch === 'HEAD' || wt.state === 'detached') return 'Recover this worktree onto a branch before syncing from main.';
+  if (wt.isGhost || wt.state === 'ghost') return 'Prune or recover this ghost worktree before syncing from main.';
+  return '';
+}
+
+function _wtOpenSyncOrExplain(wt) {
+  var reason = _wtSyncBlockReason(wt);
+  if (reason) {
+    toast(reason, { type: 'warning', title: 'Sync unavailable', duration: 7000 });
+    return;
+  }
+  openSyncModal(wt);
+}
+
 function _wtMetric(label, value, tone) {
   var chip = document.createElement('span');
   var color = tone === 'good' ? '#9ece6a' : tone === 'warn' ? '#e0af68' : tone === 'bad' ? '#f7768e' : 'var(--fg-dim,#a9b1d6)';
@@ -9467,10 +10558,27 @@ function _wtSyncAllEligible(wts) {
 function _wtWorktreesListUrl(token) {
   var params = new URLSearchParams();
   params.set('token', token || '');
+  var cwd = _wtCwdForRequest();
+  if (cwd) params.set('cwd', cwd);
   params.set('_wt_refresh', String(Date.now()) + '-' + (++_wtRefreshSeq));
   return '/api/worktrees?' + params.toString();
 }
 
+function _wtCwdForRequest() {
+  var cwd = '';
+  try {
+    if (currentProjectFilter) cwd = currentProjectFilter;
+  } catch (_) {}
+  if (!cwd) {
+    try { cwd = getLastSessionCwd(); } catch (_) {}
+  }
+  if (!cwd && _wtCache && _wtCache.repoRoot) cwd = _wtCache.repoRoot;
+  if (cwd) {
+    try { cwd = _stripWorktreePath(cwd); } catch (_) {}
+  }
+  return cwd || '';
+}
+
 function _wtSkippedReasonSummary(skippedBranches) {
   var counts = {};
   var rows = Array.isArray(skippedBranches) ? skippedBranches : [];
@@ -9515,7 +10623,7 @@ async function loadWorktreesPanel(opts) {
     var d = await r.json();
     if (requestId !== _wtLoadSeq) return;
     var wts = d.worktrees || [];
-    _wtCache = { repoRoot: d.cwd || '', items: wts, counts: d.counts || {}, mainRemote: d.mainRemote || null };
+    _wtCache = { repoRoot: d.cwd || '', items: wts, counts: d.counts || {}, mainRemote: d.mainRemote || null, namespace: 'claude' };
 
     var pruneBtn = document.getElementById('wt-prune-all-btn');
     if (pruneBtn) pruneBtn.style.display = (d.counts && d.counts.ghost > 0) ? '' : 'none';
@@ -9681,10 +10789,23 @@ function _wtRenderCard(frag, wt) {
   nameWrap.style.cssText = 'display:flex;align-items:center;gap:8px;flex-wrap:wrap;min-width:0;';
 
   var branchEl = document.createElement('span');
-  branchEl.style.cssText = 'font-weight:600;font-size:14px;color:var(--fg,#c0caf5);';
-  branchEl.textContent = wt.branch || '(detached)';
+  branchEl.style.cssText = 'font-weight:600;font-size:14px;color:var(--fg,#c0caf5);min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;max-width:280px;';
+  var branchInfo = branchDisplayParts(wt.branch || '');
+  branchEl.textContent = branchInfo.full ? branchInfo.short : '(detached)';
+  if (branchInfo.full) {
+    branchEl.title = branchDisplayTitle(branchInfo.full);
+    branchEl.dataset.branchFull = branchInfo.full;
+  }
   nameWrap.appendChild(branchEl);
 
+  if (branchInfo.compactNamespace) {
+    var nsBadge = document.createElement('span');
+    nsBadge.style.cssText = 'font-size:10px;background:rgba(125,211,252,0.10);color:#7dd3fc;padding:1px 6px;border-radius:4px;max-width:86px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;';
+    nsBadge.textContent = branchInfo.compactNamespace;
+    nsBadge.title = branchDisplayTitle(branchInfo.full);
+    nameWrap.appendChild(nsBadge);
+  }
+
   var pill = document.createElement('span');
   pill.style.cssText = 'font-size:10px;background:' + stateInfo.bg + ';color:' + stateInfo.color + ';padding:2px 8px;border-radius:10px;font-weight:500;cursor:default;';
   pill.textContent = stateInfo.label;
@@ -9693,9 +10814,14 @@ function _wtRenderCard(frag, wt) {
     pill.title = 'Click to merge into main';
     pill.onclick = function() { _wtOpenMergeOrExplain(wt); };
   } else if (wt.state === 'behind' || wt.state === 'diverged') {
-    pill.style.cursor = 'pointer';
-    pill.title = 'Click to sync from main';
-    pill.onclick = function() { openSyncModal(wt); };
+    var pillSyncBlockReason = _wtSyncBlockReason(wt);
+    if (pillSyncBlockReason) {
+      pill.title = pillSyncBlockReason;
+    } else {
+      pill.style.cursor = 'pointer';
+      pill.title = 'Click to sync from main';
+      pill.onclick = function() { openSyncModal(wt); };
+    }
   } else if (wt.state === 'ghost') {
     pill.style.cursor = 'pointer';
     pill.title = 'Click to prune all ghosts';
@@ -9707,7 +10833,7 @@ function _wtRenderCard(frag, wt) {
     var nonCanon = document.createElement('span');
     nonCanon.style.cssText = 'font-size:10px;background:rgba(224,175,104,0.12);color:#e0af68;padding:1px 6px;border-radius:4px;';
     nonCanon.textContent = 'non-standard path';
-    nonCanon.title = 'Lives outside .claude/worktrees/ — consider git worktree move';
+    nonCanon.title = 'Lives outside agent-owned .claude/.walle worktrees — consider git worktree move';
     nameWrap.appendChild(nonCanon);
   }
   if (stale && wt.state !== 'primary') {
@@ -9765,12 +10891,20 @@ function _wtRenderCard(frag, wt) {
       }
 
       if ((wt.state === 'behind' || wt.state === 'diverged') && (!wt.recommendedAction || wt.recommendedAction.kind !== 'sync_branch')) {
+        var syncBlockReason = _wtSyncBlockReason(wt);
         var syncBtn = document.createElement('button');
         syncBtn.className = 'btn';
         syncBtn.style.cssText = 'font-size:11px;padding:4px 10px;background:rgba(224,175,104,0.10);color:#e0af68;border:1px solid rgba(224,175,104,0.3);';
-        syncBtn.textContent = '↓ Sync';
-        syncBtn.title = 'Pull main into this worktree';
-        syncBtn.onclick = function() { openSyncModal(wt); };
+        if (syncBlockReason) {
+          syncBtn.textContent = 'Sync blocked';
+          syncBtn.setAttribute('aria-disabled', 'true');
+          syncBtn.title = syncBlockReason;
+          syncBtn.onclick = function() { _wtOpenSyncOrExplain(wt); };
+        } else {
+          syncBtn.textContent = '↓ Sync';
+          syncBtn.title = 'Pull main into this worktree';
+          syncBtn.onclick = function() { openSyncModal(wt); };
+        }
         actions.appendChild(syncBtn);
       }
 
@@ -9821,7 +10955,10 @@ function _wtRenderCard(frag, wt) {
 
   var summaryEl = document.createElement('div');
   summaryEl.style.cssText = 'font-size:12px;color:' + stateInfo.color + ';margin:2px 0 6px;font-weight:500;';
-  summaryEl.textContent = wt.summary || '';
+  var summaryText = wt.summary || '';
+  var summarySyncBlockReason = (wt.state === 'behind' || wt.state === 'diverged') ? _wtSyncBlockReason(wt) : '';
+  if (summarySyncBlockReason) summaryText += (summaryText ? ' - ' : '') + summarySyncBlockReason;
+  summaryEl.textContent = summaryText;
   card.appendChild(summaryEl);
 
   var metrics = document.createElement('div');
@@ -9863,6 +11000,11 @@ function _wtRenderCard(frag, wt) {
 }
 
 function openSyncModal(wt) {
+  var syncBlockReason = _wtSyncBlockReason(wt);
+  if (syncBlockReason) {
+    toast(syncBlockReason, { type: 'warning', title: 'Sync unavailable', duration: 7000 });
+    return;
+  }
   _wtModalState = { branch: wt.branch, name: wt.branch, mode: 'sync', cwd: _wtCache.repoRoot || '' };
   var sum = document.getElementById('wt-sync-summary');
   if (sum) sum.textContent = 'Pull main into "' + wt.branch + '" (' + wt.behind + ' commits behind).';
@@ -9947,7 +11089,10 @@ async function submitPruneGhosts() {
   if (!confirm('Remove all ghost worktrees? This cleans up corrupt or missing worktree entries from git.')) return;
   try {
     var token = (state && state.token) ? state.token : '';
-    var r = await fetch('/api/worktrees/prune?token=' + encodeURIComponent(token), { method: 'POST' });
+    var params = new URLSearchParams();
+    params.set('token', token);
+    if (_wtCache.repoRoot) params.set('cwd', _wtCache.repoRoot);
+    var r = await fetch('/api/worktrees/prune?' + params.toString(), { method: 'POST' });
     var d = await r.json();
     if (!r.ok || d.error) throw new Error(d.error || ('HTTP ' + r.status));
     var n = (d.prunedPaths || []).length;
@@ -10208,7 +11353,7 @@ async function wtFinishAction(action) {
 
 // ── Create modal ────────────────────────────────────────────────────
 function showCreateWorktreeDialog() {
-  _wtModalState = { branch: '', name: '', mode: 'create', cwd: _wtCache.repoRoot || '' };
+  _wtModalState = { branch: '', name: '', mode: 'create', cwd: _wtCache.repoRoot || '', namespace: _wtCache.namespace || 'claude' };
   var name = document.getElementById('wt-create-name'); if (name) name.value = '';
   var base = document.getElementById('wt-create-base'); if (base) base.value = '';
   var err = document.getElementById('wt-create-err'); if (err) err.textContent = '';
@@ -10223,7 +11368,8 @@ function _wtPreviewPath() {
   var raw = (document.getElementById('wt-create-name') || {}).value || '';
   var sanitized = _wtSanitize(raw);
   var preview = document.getElementById('wt-create-path-preview');
-  if (preview) preview.textContent = '.claude/worktrees/' + (sanitized || '<name>');
+  var ns = (_wtModalState.namespace === 'walle') ? '.walle' : '.claude';
+  if (preview) preview.textContent = ns + '/worktrees/' + (sanitized || '<name>');
   var nameErr = document.getElementById('wt-create-name-err');
   if (!nameErr) return;
   if (raw && !sanitized) nameErr.textContent = 'Name must contain letters, digits, underscore, or hyphen.';
@@ -10244,6 +11390,7 @@ async function submitCreateWorktree() {
     var body = { name: name };
     if (base) body.base_branch = base;
     if (_wtCache.repoRoot) body.cwd = _wtCache.repoRoot;
+    if (_wtModalState.namespace) body.namespace = _wtModalState.namespace;
     var token = (state && state.token) ? state.token : '';
     var r = await fetch('/api/worktrees/create?token=' + encodeURIComponent(token), {
       method: 'POST',
@@ -10431,14 +11578,14 @@ async function moveToWorktree(sessionId) {
   var sess = state.sessions.get(sessionId);
   if (!sess) return;
   var cwd = (sess.meta && sess.meta.cwd) || '';
-  if (!cwd || cwd.includes('.claude/worktrees/')) {
+  if (!cwd || _nsIsAgentWorktreePath(cwd)) {
     toast('Session is already in a worktree', { type: 'warning' });
     return;
   }
   var sessLabel = (sess.meta && sess.meta.label) || '';
   var defaultName = _wtSanitize(sessLabel.toLowerCase()) || ('wt-' + Date.now().toString(36));
   // Reuse the create modal but with the session's cwd + prefilled name.
-  _wtCache = { repoRoot: cwd, items: _wtCache.items };
+  _wtCache = { repoRoot: cwd, items: _wtCache.items, namespace: (sess.meta && sess.meta.type === 'walle') ? 'walle' : 'claude' };
   showCreateWorktreeDialog();
   var nameInput = document.getElementById('wt-create-name');
   if (nameInput) { nameInput.value = defaultName; _wtPreviewPath(); }
@@ -10460,7 +11607,17 @@ async function moveToWorktree(sessionId) {
 function onCreated(msg) {
   if (msg.sessionType === 'walle') {
     const { id, label, cwd } = msg;
-    const s = { meta: { label: label, cwd: cwd, type: 'walle' }, walleState: null };
+    const s = {
+      meta: {
+        label: label,
+        cwd: cwd,
+        type: 'walle',
+        agentType: 'walle',
+        model_id: msg.model_id || null,
+        model_provider: msg.model_provider || null,
+      },
+      walleState: null,
+    };
     const container = document.createElement('div');
     container.className = 'walle-session';
     container.id = 'walle-session-' + id;
@@ -10484,7 +11641,7 @@ function onCreated(msg) {
   if (s && !s.meta) {
     s.meta = {
       id,
-      label,
+      label: cleanSessionLabelForBranch(label, msg.branch || ''),
       pid,
       cwd,
       cmd: msg.cmd || '',
@@ -10492,6 +11649,7 @@ function onCreated(msg) {
       model_id: msg.model_id || null,
       model_provider: msg.model_provider || null,
       branch: msg.branch || null,
+      userRenamed: !!msg.userRenamed,
       agentType: msg.agentType || null,
       agentCapabilities: msg.agentCapabilities || null,
       claudeSessionId: msg.claudeSessionId || null,
@@ -10647,6 +11805,7 @@ function chunkedWrite(s, data, onDone) {
         s.writer.scheduled = true;
         requestAnimationFrame(() => {
           const next = s.writer.queue;
+          _clearStaleTerminalScrollLock(s);
           const f = s.writer.followMode;
           s.writer.queue = '';
           s.writer.scheduled = false;
@@ -10673,7 +11832,7 @@ function onOutput(msg) {
     return;
   }
 
-  let data = msg.data;
+  let data = _normalizeCodexPromptBackground(s, msg.data);
 
   // Direct-write bypass for keystroke echoes (ECHO_DIRECT_WRITE).
   // If this is small output arriving shortly after input, and no chunking is in progress,
@@ -10693,8 +11852,11 @@ function onOutput(msg) {
   // Keep local status activity aligned with the server's provider detectors.
   // Claude/Codex idle redraws can leak printable "Running"/"Working" fragments;
   // those should paint the terminal, but they must not keep status stuck Running.
-  if (_isClientActiveOutput(s, data) && !(s._waitingForInput && _isClientCodexStatusOnlyOutput(s, data))) {
-    s._lastOutputAt = Date.now();
+  const suppressUiRefreshOutput = _shouldSuppressClientUiRefreshOutput(s, data);
+  if (_isClientActiveOutput(s, data) && !suppressUiRefreshOutput && !(s._waitingForInput && _isClientCodexStatusOnlyOutput(s, data))) {
+    const now = Date.now();
+    s._lastOutputAt = now;
+    if (!s._waitingForInput) _markClientCodexRunningEvidence(s, now, now);
     // Don't clear _waitingForInput here — TUI redraws still leak visible chars
     // (spinner glyphs, prompt text). Only server-sent 'session-resumed' should clear it.
   }
@@ -10725,6 +11887,7 @@ function onOutput(msg) {
     s.writer.scheduled = true;
     requestAnimationFrame(() => {
       const batch = s.writer.queue;
+      _clearStaleTerminalScrollLock(s);
       const follow = s.writer.followMode;
       s.writer.queue = '';
       s.writer.scheduled = false;
@@ -10787,19 +11950,8 @@ setInterval(() => {
   if (!id) return;
   const s = state.sessions.get(id);
   if (!s || !s.term) return;
-  const atBottom = _isAtTerminalFollowBottom(s);
-
-  // Fix 1: followMode is false but viewport IS at bottom — unlock
-  if (!s.writer.followMode && atBottom && !s.writer._chunking) {
-    s.writer.followMode = true;
-    s.writer._userScrollLocked = false;
-  }
-
-  // Fix 2: _userScrollLocked is true but viewport is at bottom — unlock
-  if (s.writer._userScrollLocked && atBottom) {
-    s.writer._userScrollLocked = false;
-    s.writer.followMode = true;
-  }
+  const unlockedAtBottom = _clearStaleTerminalScrollLock(s);
+  if (unlockedAtBottom) _ensureScrolledToBottom(s);
 
   // Fix 3: queue has data, nothing is draining it — force flush
   if (s.writer.queue && s.writer.queue.length > 0 && !s.writer.scheduled && !s.writer._chunking) {
@@ -10847,7 +11999,68 @@ function _terminalFollowViewportTarget(s) {
   const blankTailRows = screenEnd - anchor;
   const threshold = Math.max(6, Math.floor(rows * 0.20));
   if (blankTailRows < threshold) return baseY;
-  return Math.max(0, Math.min(baseY, anchor - rows + 1));
+  const target = Math.max(0, Math.min(baseY, anchor - rows + 1));
+  return _codexViewportHasPromptGaps(s, target) ? baseY : target;
+}
+
+function _codexViewportHasPromptGaps(s, start) {
+  if (!s || !s.term) return false;
+  const buf = s.term.buffer.active;
+  const rows = s.term.rows || 0;
+  if (rows <= 0) return false;
+  const first = Math.max(0, start || 0);
+  const last = first + rows - 1;
+  let promptCount = 0;
+  let maxBlankRun = 0;
+  let currentBlankRun = 0;
+  let seenText = false;
+  for (let row = first; row <= last; row++) {
+    const line = buf.getLine(row);
+    const text = line ? line.translateToString(true) : '';
+    const trimmed = text.trim();
+    if (trimmed.startsWith('›')) promptCount += 1;
+    if (trimmed) {
+      if (seenText) maxBlankRun = Math.max(maxBlankRun, currentBlankRun);
+      seenText = true;
+      currentBlankRun = 0;
+    } else if (seenText) {
+      currentBlankRun += 1;
+    }
+  }
+  const threshold = Math.max(8, Math.floor(rows * 0.18));
+  return promptCount >= 2 && maxBlankRun >= threshold;
+}
+
+function _alignXtermHelperTextareaToViewport(s) {
+  if (!s || !s.term || !s.container) return;
+  if (_clientAgentTypeForSession(s) !== 'codex') return;
+  const buf = s.term.buffer.active;
+  const baseY = buf.baseY || 0;
+  const viewportY = buf.viewportY || 0;
+  const visualRow = baseY + (buf.cursorY || 0) - viewportY;
+  if (visualRow < 0 || visualRow >= (s.term.rows || 0)) return;
+  const ta = s.container.querySelector('.xterm-helper-textarea');
+  if (!ta) return;
+  let cellHeight = 0;
+  let cellWidth = 0;
+  try {
+    const cell = s.term._core?._renderService?.dimensions?.css?.cell || {};
+    cellHeight = cell.height || 0;
+    cellWidth = cell.width || 0;
+  } catch {}
+  if (!cellHeight || !cellWidth) {
+    const screen = s.container.querySelector('.xterm-screen');
+    if (screen) {
+      const rect = screen.getBoundingClientRect();
+      cellHeight = cellHeight || (s.term.rows ? rect.height / s.term.rows : 0);
+      cellWidth = cellWidth || (s.term.cols ? rect.width / s.term.cols : 0);
+    }
+  }
+  if (!cellHeight || !cellWidth) return;
+  ta.style.left = ((buf.cursorX || 0) * cellWidth) + 'px';
+  ta.style.top = (visualRow * cellHeight) + 'px';
+  ta.style.height = cellHeight + 'px';
+  ta.style.lineHeight = cellHeight + 'px';
 }
 
 function _withProgrammaticTerminalScroll(s, fn) {
@@ -10874,6 +12087,7 @@ function _scrollTerminalToFollowBottom(s) {
       try { vp.scrollTop = vp.scrollHeight; } catch {}
     }
   });
+  requestAnimationFrame(() => _alignXtermHelperTextareaToViewport(s));
 }
 
 function _isAtTerminalFollowBottom(s) {
@@ -10885,10 +12099,19 @@ function _isAtTerminalFollowBottom(s) {
   return Math.abs(viewportY - target) <= 1 || Math.abs(viewportY - baseY) <= 1;
 }
 
+function _clearStaleTerminalScrollLock(s) {
+  if (!s || !s.term || !s.writer || s.writer._chunking) return false;
+  if ((s.writer._userScrollLocked || !s.writer.followMode) && _isAtTerminalFollowBottom(s)) {
+    s.writer._userScrollLocked = false;
+    s.writer.followMode = true;
+    return true;
+  }
+  return false;
+}
+
 function _findCodexInternalBlankGap(s) {
   if (!s || !s.term) return null;
   if (_clientAgentTypeForSession(s) !== 'codex') return null;
-  if (s.writer && s.writer._userScrollLocked) return null;
   const buf = s.term.buffer.active;
   const rows = s.term.rows || 0;
   const baseY = buf.baseY || 0;
@@ -10896,25 +12119,30 @@ function _findCodexInternalBlankGap(s) {
 
   const meaningful = [];
   let promptAbs = -1;
-  let hasCompletedTurnOutputAfterPrompt = false;
+  let promptCount = 0;
+  let hasNonStatusAfterPrompt = false;
   for (let offset = 0; offset < rows; offset++) {
     const abs = baseY + offset;
     const line = buf.getLine(abs);
     const text = line ? line.translateToString(true) : '';
-    if (text.trim().startsWith('›')) promptAbs = abs;
+    if (text.trim().startsWith('›')) {
+      promptAbs = abs;
+      promptCount += 1;
+    }
     if (text.trim()) meaningful.push(abs);
   }
   if (promptAbs < 0 || meaningful.length < 2) return null;
+  if (_codexHasActiveSkillPickerAfterPrompt(s, meaningful, promptAbs)) return null;
   for (const abs of meaningful) {
     if (abs <= promptAbs) continue;
     const line = buf.getLine(abs);
     const text = line ? line.translateToString(true).trim() : '';
     if (!text) continue;
     if (/^gpt-[\w.-]+\s+/i.test(text) || /\b(x?high|medium|low)\b.*\s-\s/.test(text)) continue;
-    hasCompletedTurnOutputAfterPrompt = true;
+    hasNonStatusAfterPrompt = true;
     break;
   }
-  if (!hasCompletedTurnOutputAfterPrompt) return null;
+  if (!hasNonStatusAfterPrompt && promptCount < 2) return null;
 
   let best = null;
   for (let i = 1; i < meaningful.length; i++) {
@@ -10932,6 +12160,22 @@ function _findCodexInternalBlankGap(s) {
   return { startAbs: best.startAbs, deleteRows };
 }
 
+function _codexHasActiveSkillPickerAfterPrompt(s, meaningfulRows, promptAbs) {
+  if (!s || !s.term || !Array.isArray(meaningfulRows)) return false;
+  const buf = s.term.buffer.active;
+  let sawSkill = false;
+  let sawHint = false;
+  for (const abs of meaningfulRows) {
+    if (abs <= promptAbs) continue;
+    const line = buf.getLine(abs);
+    const text = line ? line.translateToString(true).trim() : '';
+    if (!text) continue;
+    if (/\[Skill\]/.test(text)) sawSkill = true;
+    if (/^press\s+enter\s+to\s+insert(?:\s+or\s+esc\s+to\s+close)?$/i.test(text)) sawHint = true;
+  }
+  return sawSkill && sawHint;
+}
+
 function _compactCodexInternalBlankGap(s, onDone) {
   if (!s || !s.term || s._codexBlankGapCompacting) return false;
   const gap = _findCodexInternalBlankGap(s);
@@ -10970,17 +12214,22 @@ function _compactCodexInternalBlankGap(s, onDone) {
 // most terminals this is xterm's literal bottom. For Codex restored TUI
 // screens, it is the last meaningful row before a large blank tail.
 //
-// Skip if the user has manually scrolled (`_userScrollLocked`) — we don't want
-// to yank them back to the bottom if they were reading scrollback.
+// Skip if the user has manually scrolled away from the active bottom — we don't
+// want to yank them back while they are reading scrollback.
 function _ensureScrolledToBottom(s) {
   if (!s || !s.term) return;
-  if (s.writer && s.writer._userScrollLocked) return;
+  _clearStaleTerminalScrollLock(s);
+  // Repair a corrupted Codex current screen even if follow mode is locked.
+  // The scroll lock should prevent viewport jumps, not preserve synthetic blank
+  // rows left by TUI clear/redraw races.
   if (_compactCodexInternalBlankGap(s, () => _ensureScrolledToBottom(s))) return;
+  if (s.writer && s.writer._userScrollLocked) return;
   _scrollTerminalToFollowBottom(s);
   requestAnimationFrame(() => {
     if (!s.term) return;
     if (s.writer && s.writer._userScrollLocked) return;
     _scrollTerminalToFollowBottom(s);
+    requestAnimationFrame(() => _alignXtermHelperTextareaToViewport(s));
   });
 }
 
@@ -11016,8 +12265,69 @@ function _snapshotDimsMatchTerm(s, cols, rows) {
   return c === s.term.cols && r === s.term.rows;
 }
 
+function _terminalPlainTextStats(text) {
+  const raw = String(text || '');
+  const lines = raw.split(/\r\n|\n|\r/);
+  let nonBlank = 0;
+  let printableChars = 0;
+  let first = '';
+  let last = '';
+  for (const line of lines) {
+    const trimmed = String(line || '').trim();
+    if (!trimmed) continue;
+    nonBlank++;
+    printableChars += trimmed.length;
+    if (!first) first = trimmed;
+    last = trimmed;
+  }
+  return { nonBlank, printableChars, first, last };
+}
+
+function _terminalAnsiTextStats(data) {
+  const text = String(data || '')
+    .replace(/\x1b\][^\x07\x1b]*(?:\x07|\x1b\\)/g, '')
+    .replace(/\x1b\[[0-9;?]*[ -/]*[@-~]/g, (seq) => {
+      const final = seq[seq.length - 1];
+      return (final === 'H' || final === 'f') ? '\n' : '';
+    })
+    .replace(/\x1bc/g, '\n')
+    .replace(/\r\n/g, '\n')
+    .replace(/\r/g, '\n')
+    .replace(/[\x00-\x08\x0b-\x1f\x7f]/g, '');
+  return _terminalPlainTextStats(text);
+}
+
+function _snapshotLooksShorterThanSaved(s, data) {
+  if (!s || !s._savedScrollbackText || !data) return false;
+  const saved = s._savedScrollbackStats || _terminalPlainTextStats(s._savedScrollbackText);
+  if (!saved || saved.nonBlank < 20 || saved.printableChars < 500) return false;
+  // The tab-away capture is only a guard for the restore immediately after
+  // disposal. Do not let an old local copy override future authoritative
+  // snapshots after the session has moved on.
+  if (s._savedScrollbackCapturedAt && Date.now() - s._savedScrollbackCapturedAt > 5 * 60 * 1000) return false;
+  const snapshot = _terminalAnsiTextStats(data);
+  if (!snapshot) return false;
+  const lostManyLines = snapshot.nonBlank < Math.floor(saved.nonBlank * 0.65);
+  const lostManyChars = snapshot.printableChars < Math.floor(saved.printableChars * 0.75);
+  return lostManyLines && lostManyChars && (saved.nonBlank - snapshot.nonBlank) >= 12;
+}
+
+function _restoreSavedScrollbackText(s, onDone) {
+  if (!s || !s.term || !s._savedScrollbackText) { if (onDone) onDone(); return; }
+  try { s.term.clearTextureAtlas(); } catch {}
+  try {
+    if (s.writer) {
+      s.writer.queue = '';
+      s.writer._snapshotGen = (s.writer._snapshotGen || 0) + 1;
+    }
+  } catch {}
+  const text = s._savedScrollbackText + '\r\n';
+  s.term.write(TERMINAL_FULL_RESET + text, onDone);
+}
+
 function _restoreSnapshotData(s, data, onDone) {
   if (!s || !s.term || !data) { if (onDone) onDone(); return; }
+  data = _normalizeCodexPromptBackground(s, data);
   try { s.term.clearTextureAtlas(); } catch {}
   try {
     if (s.writer) {
@@ -11134,6 +12444,7 @@ function onSnapshot(msg) {
   const ptyRows = msg.ptyRows || msg.rows || localRows;
   const dimsMismatch = localCols !== ptyCols || localRows !== ptyRows;
   if (dimsMismatch) {
+    _markClientUiRefreshOutputSuppression(s);
     send({ type: 'resize', id: msg.id, cols: localCols, rows: localRows });
     _showLoadingOverlay(s);
     if (!s._dimFixPending) {
@@ -11141,6 +12452,7 @@ function onSnapshot(msg) {
       setTimeout(() => {
         s._dimFixPending = false;
         if (state.activeTab === msg.id || isSessionVisibleInSplit(msg.id)) {
+          _markClientUiRefreshOutputSuppression(s);
           send({ type: 'reflow', id: msg.id, cols: s.term.cols, rows: s.term.rows });
         }
       }, 500);
@@ -11166,7 +12478,11 @@ function onSnapshot(msg) {
     _forceTerminalPaint(s);
     scanPromptLines(msg.id);
   };
-  _restoreSnapshotData(s, msg.data, snapshotDone);
+  if (_snapshotLooksShorterThanSaved(s, msg.data)) {
+    _restoreSavedScrollbackText(s, snapshotDone);
+  } else {
+    _restoreSnapshotData(s, msg.data, snapshotDone);
+  }
 }
 
 // --- Loading overlay for tab-switch restore ---
@@ -11259,13 +12575,14 @@ async function onSessionsList(msg) {
 
   // Add tabs for sessions we don't have terminals for (reconnect scenario)
   for (const sess of msg.sessions) {
+    if (sess && sess.label) sess.label = cleanSessionLabelForBranch(sess.label, sess.branch || '');
     if (!state.sessions.has(sess.id)) {
       if (sess.type === 'walle') {
         const container = document.createElement('div');
         container.className = 'walle-session';
         container.id = 'walle-session-' + sess.id;
         document.getElementById('terminal-area').appendChild(container);
-        const s = { meta: { ...sess, type: 'walle' }, walleState: null, container: container };
+        const s = { meta: { ...sess, type: 'walle' }, walleState: null, container: container, needsAttach: true };
         state.sessions.set(sess.id, s);
         WalleSession.renderSession(sess.id);
       } else {
@@ -11284,6 +12601,11 @@ async function onSessionsList(msg) {
     if (existing) {
       existing.meta = sess;
       if (sess.type === 'walle') existing.meta.type = 'walle';
+      const liveStatus = normalizeLiveSessionStatus(sess.liveStatus);
+      if (liveStatus) {
+        existing._serverLiveStatus = liveStatus;
+        existing._serverLiveStatusAt = SessionActivityUtils.parseTimeMs(sess.liveStatusAt) || Date.now();
+      }
     }
   }
 
@@ -11325,6 +12647,7 @@ async function onSessionsList(msg) {
 
   // Refresh queue builder session list
   if (typeof refreshQpSessionList === 'function') refreshQpSessionList();
+  if (typeof refreshStandupIfVisible === 'function') refreshStandupIfVisible();
 
   // Auto-activate from hash (only for active PTY sessions).
   // During post-restart, defer activation to onServerReady() which has the correct
@@ -11485,6 +12808,164 @@ function worktreeAttentionBadge(s) {
   return `<span class="worktree-attn-badge" title="${escHtml(title)}" aria-label="${escHtml(title)}">${parts.join('')}</span>`;
 }
 
+function escapeRegExpText(value) {
+  return String(value || '').replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+
+function branchDisplayParts(branch) {
+  const full = String(branch || '').trim().replace(/^refs\/heads\//, '');
+  if (!full) {
+    return { full: '', short: '', namespace: '', displayNamespace: '', compactNamespace: '', isMain: false, hasNamespace: false };
+  }
+  const isMain = full === 'main' || full === 'master';
+  const parts = full.split('/').filter(Boolean);
+  const short = parts.length > 0 ? parts[parts.length - 1] : full;
+  const namespaceParts = parts.length > 1 ? parts.slice(0, -1) : [];
+  const displayNamespaceParts = namespaceParts[0] === 'ctm' ? namespaceParts.slice(1) : namespaceParts;
+  const abbrev = (segment) => {
+    const s = String(segment || '').trim();
+    const key = s.toLowerCase();
+    const known = {
+      codex: 'cx',
+      'wall-e': 'we',
+      walle: 'we',
+      claude: 'cc',
+      'claude-code': 'cc',
+      opencode: 'oc',
+      'open-code': 'oc',
+      gemini: 'gm',
+    };
+    if (known[key]) return known[key];
+    if (s.length <= 6) return s;
+    const initials = s.split(/[-_.\s]+/).filter(Boolean).map(p => p[0]).join('');
+    if (initials.length >= 2 && initials.length <= 4) return initials.toLowerCase();
+    return s.slice(0, 2).toLowerCase();
+  };
+  const namespace = namespaceParts.join('/');
+  const displayNamespace = displayNamespaceParts.join('/');
+  const compactNamespace = displayNamespaceParts.map(abbrev).filter(Boolean).join('/');
+  return {
+    full,
+    short,
+    namespace,
+    displayNamespace,
+    compactNamespace,
+    isMain,
+    hasNamespace: namespaceParts.length > 0,
+  };
+}
+
+function branchDisplayTitle(branch) {
+  const info = branchDisplayParts(branch);
+  if (!info.full) return '';
+  const parts = ['Branch: ' + info.full];
+  if (info.displayNamespace) parts.push('Namespace: ' + info.displayNamespace);
+  if (info.short && info.short !== info.full) parts.push('Name: ' + info.short);
+  return parts.join('\n');
+}
+
+function branchBadgeHtml(branch, icon) {
+  const info = branchDisplayParts(branch);
+  if (!info.full || info.isMain) return '';
+  const title = branchDisplayTitle(info.full);
+  const classes = 'branch-badge' + (info.hasNamespace ? ' namespaced' : '');
+  const text = (icon || '') + (icon ? ' ' : '') + info.short;
+  return `<span class="${classes}" title="${escHtml(title)}" aria-label="${escHtml(title)}" data-branch-full="${escHtml(info.full)}" data-branch-short="${escHtml(info.short)}" data-branch-namespace="${escHtml(info.displayNamespace || '')}">${escHtml(text)}</span>`;
+}
+
+function branchMetaHtml(branch) {
+  const info = branchDisplayParts(branch);
+  if (!info.full) return '';
+  return `<span title="${escHtml(branchDisplayTitle(info.full))}" data-branch-full="${escHtml(info.full)}">${escHtml(info.short)}</span>`;
+}
+
+function stripBranchFromSessionLabel(label, branch) {
+  const text = String(label || '').replace(/\s+/g, ' ').trim();
+  const branchText = String(branch || '').trim();
+  if (!text || !branchText || branchText === 'main' || branchText === 'master') return text;
+  const branchInfo = branchDisplayParts(branchText);
+  const candidates = Array.from(new Set([
+    branchInfo.full || branchText,
+    branchInfo.short,
+    branchInfo.displayNamespace && branchInfo.short ? `${branchInfo.displayNamespace}/${branchInfo.short}` : '',
+    branchInfo.compactNamespace && branchInfo.short ? `${branchInfo.compactNamespace}/${branchInfo.short}` : '',
+    branchText.length > 12 ? branchText.slice(0, 12) + '..' : branchText,
+    branchText.length > 15 ? branchText.slice(0, 15) + '...' : branchText,
+  ].filter(Boolean))).sort((a, b) => b.length - a.length);
+  let cleaned = text;
+  for (const candidate of candidates) {
+    if (cleaned.toLowerCase() === candidate.toLowerCase()) {
+      cleaned = '';
+      break;
+    }
+    const re = new RegExp('(?:\\s*[\\u25ED\\u260D]\\s*' + escapeRegExpText(candidate) + '\\s*)+$', 'i');
+    cleaned = cleaned.replace(re, '').trim();
+  }
+  return cleaned;
+}
+
+function cleanSessionLabelForBranch(label, branch) {
+  return stripBranchFromSessionLabel(label, branch) || String(label || '').replace(/\s+/g, ' ').trim();
+}
+
+function activeSessionFallbackLabel(s, id) {
+  const meta = s?.meta || {};
+  if (meta.type === 'walle') return 'Wall-E session';
+  const cmd = String(meta.cmd || '').toLowerCase();
+  if (cmd.includes('codex')) return 'Codex session';
+  if (cmd.includes('gemini')) return 'Gemini session';
+  if (cmd.includes('opencode') || cmd.includes('open-code')) return 'OpenCode session';
+  if (cmd.includes('claude')) return 'Claude Code session';
+  return id ? `Session ${String(id).slice(0, 8)}` : 'Session';
+}
+
+function activeSessionHasUserRenamedLabel(s, id) {
+  const meta = s?.meta || {};
+  if (meta.userRenamed) return true;
+  const agentId = meta.agentSessionId || meta.agentSessionToken || meta.claudeSessionId || '';
+  if (typeof allRecentSessions === 'undefined' || !Array.isArray(allRecentSessions)) return false;
+  return allRecentSessions.some(r => r && r.userRenamed && (
+    r.sessionId === id ||
+    r.provisionalId === id ||
+    (agentId && (r.sessionId === agentId || r.agentSessionId === agentId))
+  ));
+}
+
+function activeSessionDisplayLabel(s, id) {
+  const branch = s?.meta?.branch || '';
+  const raw = String(s?.meta?.label || '').replace(/\s+/g, ' ').trim();
+  const cleaned = stripBranchFromSessionLabel(raw, branch);
+  if (activeSessionHasUserRenamedLabel(s, id) && raw) return cleaned || raw;
+  return cleaned || activeSessionFallbackLabel(s, id);
+}
+
+function updateTabTitleTooltips() {
+  const labels = document.querySelectorAll('#tabbar-scroll .tab .tab-label');
+  labels.forEach(label => {
+    if (label.querySelector('input')) return;
+    const tab = label.closest('.tab');
+    if (tab) tab.classList.remove('tab-title-clipped');
+    const fullTitle = (label.dataset.fullTitle || label.textContent || '').trim();
+    if (!fullTitle) {
+      label.removeAttribute('title');
+      label.removeAttribute('aria-label');
+      return;
+    }
+    let isClipped = label.scrollWidth > label.clientWidth + 1;
+    if (isClipped && tab && tab.querySelector(':scope > .branch-badge')) {
+      tab.classList.add('tab-title-clipped');
+      isClipped = label.scrollWidth > label.clientWidth + 1;
+    }
+    if (isClipped) {
+      label.title = fullTitle;
+      label.setAttribute('aria-label', fullTitle);
+    } else {
+      label.removeAttribute('title');
+      label.removeAttribute('aria-label');
+    }
+  });
+}
+
 let _renderSessionListTimer = null;
 function renderSessionList(force) {
   if (!force) {
@@ -11541,7 +13022,8 @@ function renderSessionList(force) {
       }
     }
     const isActive = state.activeTab === id;
-    const label = s.meta?.label || id.slice(0, 8);
+    const branchName = s.meta?.branch || '';
+    const label = activeSessionDisplayLabel(s, id);
     const lastAct = SessionActivityUtils.sessionTouchedAtMs(s) || s.meta?.lastActivity || s.meta?.createdAt || 0;
     const idleMs = Date.now() - lastAct;
     const isStale = idleMs > 24 * 60 * 60 * 1000;
@@ -11563,8 +13045,7 @@ function renderSessionList(force) {
     }).map(p =>
       `<span class="prompt-badge" onclick="event.stopPropagation();openPromptInEditor(${p.prompt_id})" title="${escHtml(p.title || 'Prompt')}">${escHtml((p.title || 'Prompt').slice(0, 20))}</span>`
     ).join('');
-    const branchName = s.meta?.branch || '';
-    const branchBadge = branchName && branchName !== 'main' ? `<span class="branch-badge" title="Branch: ${escHtml(branchName)}">&#9741; ${escHtml(branchName.length > 15 ? branchName.slice(0, 15) + '...' : branchName)}</span>` : '';
+    const branchBadge = branchBadgeHtml(branchName, '\u260D');
     const worktreeBadge = worktreeAttentionBadge(s);
     return `${groupSep}<div class="session-group${isActive ? ' active' : ''}" data-session-id="${id}"><div class="session-item ${isActive ? 'active' : ''} ${isStale ? 'stale' : ''} ${sStatus.cls === 'running' ? 'running' : ''} ${worktreeBadge ? 'has-worktree-attn' : ''}" data-session-id="${id}" data-agent="${agentType}" onclick="sessionItemClick('${id}', event)" ondblclick="sessionItemDblClick('${id}', event)">
       <span class="dot"></span>
@@ -11615,17 +13096,149 @@ function setActiveSort(mode) {
 // Primary source: SessionStream status (server-side, computed from JSONL events + PTY activity)
 // Fallback: local PTY signals (_lastOutputAt, _waitingForInput) for sessions not yet tracked
 const AUTHORITATIVE_STATUS_TTL_MS = 120000;
+const SERVER_LIVE_STATUS_TTL_MS = 10000;
+const CODEX_RUNNING_HOLD_MS = 15000;
+const UI_REFRESH_STATUS_ONLY_SUPPRESS_MS = 2500;
+function normalizeLiveSessionStatus(status) {
+  if (typeof SessionStatusPrecedence !== 'undefined' && SessionStatusPrecedence.normalizeLiveSessionStatus) {
+    return SessionStatusPrecedence.normalizeLiveSessionStatus(status);
+  }
+  const text = String(status || '').toLowerCase();
+  if (!text) return '';
+  if (text === 'busy' || text === 'active' || text === 'thinking') return 'running';
+  if (text === 'waiting_input' || text === 'waiting-for-input') return 'waiting';
+  if (['running', 'waiting', 'idle', 'exited'].includes(text)) return text;
+  return '';
+}
+
+function liveStatusResult(status) {
+  if (typeof SessionStatusPrecedence !== 'undefined' && SessionStatusPrecedence.liveStatusResult) {
+    const resolved = SessionStatusPrecedence.liveStatusResult(status);
+    return resolved ? { cls: resolved.cls, text: resolved.text } : null;
+  }
+  const normalized = normalizeLiveSessionStatus(status);
+  if (!normalized) return null;
+  const statusMap = { running: 'Running', waiting: 'Waiting', idle: 'Idle', exited: 'Exited' };
+  return { cls: normalized, text: statusMap[normalized] || 'Idle' };
+}
+
+function _clientTimeMs(value, fallback) {
+  if (typeof SessionStatusPrecedence !== 'undefined' && SessionStatusPrecedence.parseTimeMs) {
+    const parser = typeof SessionActivityUtils !== 'undefined' ? SessionActivityUtils.parseTimeMs : undefined;
+    return SessionStatusPrecedence.parseTimeMs(value, fallback, parser);
+  }
+  if (value == null || value === '') return fallback || 0;
+  if (typeof SessionActivityUtils !== 'undefined' && SessionActivityUtils.parseTimeMs) {
+    const parsed = SessionActivityUtils.parseTimeMs(value);
+    if (parsed) return parsed;
+  }
+  if (typeof value === 'number' && Number.isFinite(value)) return value;
+  const parsed = Date.parse(String(value));
+  return Number.isFinite(parsed) ? parsed : (fallback || 0);
+}
+
+function _isClientBlockingWaitingReason(reason) {
+  return reason === 'approval' || reason === 'choice';
+}
+
+function _isClientCodexSession(s) {
+  return _clientAgentTypeForSession(s) === 'codex';
+}
+
+function _markClientCodexRunningEvidence(s, eventTimestamp, now = Date.now()) {
+  if (!_isClientCodexSession(s)) return;
+  const eventAt = _clientTimeMs(eventTimestamp, now) || now;
+  const previousEventAt = s._codexRunningEvidenceAt || 0;
+  if (previousEventAt && eventAt <= previousEventAt) {
+    s._codexRunningLastDetectionAt = Math.max(s._codexRunningLastDetectionAt || 0, now);
+    return;
+  }
+  s._codexRunningEvidenceAt = Math.max(s._codexRunningEvidenceAt || 0, eventAt);
+  s._codexRunningLastDetectionAt = Math.max(s._codexRunningLastDetectionAt || 0, now);
+  s._codexRunningHoldUntil = Math.max(
+    s._codexRunningHoldUntil || 0,
+    now + CODEX_RUNNING_HOLD_MS
+  );
+}
+
+function _clientCodexRunningHoldResult(s, now = Date.now()) {
+  if (!_isClientCodexSession(s)) return null;
+  if (_isClientBlockingWaitingReason(s._waitingReason || '')) return null;
+  const recentPromptTypingAt = s._waitingForInput && s.writer ? (s.writer._lastInputAt || 0) : 0;
+  if (recentPromptTypingAt && (now - recentPromptTypingAt) < 3000) return null;
+  const holdUntil = s._codexRunningHoldUntil || 0;
+  if (holdUntil > now) return { cls: 'running', text: 'Running' };
+  return null;
+}
+
+function _markClientUiRefreshOutputSuppression(s) {
+  if (!s) return;
+  s._uiRefreshStatusOnlySuppressUntil = Date.now() + UI_REFRESH_STATUS_ONLY_SUPPRESS_MS;
+}
+
+function _shouldSuppressClientUiRefreshOutput(s, data) {
+  if (!s) return false;
+  const until = s._uiRefreshStatusOnlySuppressUntil || 0;
+  return !!(until && Date.now() < until && _isClientCodexStatusOnlyOutput(s, data));
+}
+
 function getSessionStatus(s) {
+  if (typeof SessionStatusPrecedence !== 'undefined' && SessionStatusPrecedence.resolveSessionStatus) {
+    const now = Date.now();
+    const codexRunningHold = _clientCodexRunningHoldResult(s, now);
+    const resolved = SessionStatusPrecedence.resolveSessionStatus({
+      metaType: s.meta?.type,
+      walleGenerating: !!s.walleState?.isGenerating,
+      serverLiveStatus: s._serverLiveStatus,
+      serverLiveStatusAt: s._serverLiveStatusAt,
+      serverWorkingAt: s._serverWorkingAt,
+      serverWorkingEventAt: s._serverWorkingEventAt || s._serverWorkingAt,
+      waitingForInput: !!s._waitingForInput,
+      waitingForInputAt: s._waitingForInputAt,
+      streamStatus: s._streamStatus,
+      streamStatusAt: s._streamStatusAt,
+      lastOutputAt: s._lastOutputAt,
+      metaLastPtyActivity: s.meta?.lastPtyActivity,
+      authoritativeSource: s._authoritativeSource,
+      authoritativeStatusAt: s._authoritativeStatusAt,
+      working: !!s._working,
+      codexRunningHold: !!codexRunningHold,
+      lastInputAt: s._lastInputAt || s.writer?._lastInputAt,
+    }, {
+      now,
+      parseTimeMs: typeof SessionActivityUtils !== 'undefined' ? SessionActivityUtils.parseTimeMs : undefined,
+    });
+    if (resolved) return { cls: resolved.cls, text: resolved.text };
+  }
   if (s.meta?.type === 'walle' && s.walleState) {
     if (s.walleState.isGenerating) return { cls: 'running', text: 'Running' };
-    return { cls: 'waiting', text: 'Waiting' };
+    return { cls: 'idle', text: 'Idle' };
   }
   const now = Date.now();
+  const statusMap = { running: 'Running', waiting: 'Waiting', idle: 'Idle', exited: 'Exited' };
+
+  const serverLiveStatus = liveStatusResult(s._serverLiveStatus);
+  if (serverLiveStatus && s._serverLiveStatusAt && (now - s._serverLiveStatusAt) < SERVER_LIVE_STATUS_TTL_MS) {
+    return serverLiveStatus;
+  }
+
+  const serverWorkingAt = s._serverWorkingAt || 0;
+  const serverWorkingEventAt = s._serverWorkingEventAt || serverWorkingAt;
+  const waitingAt = s._waitingForInputAt || 0;
+  const serverWorking = serverWorkingAt &&
+    (now - serverWorkingAt) < 10000 &&
+    (!s._waitingForInput || !waitingAt || serverWorkingEventAt >= waitingAt);
+  const streamFresh = !!(s._streamStatus && s._streamStatusAt && (now - s._streamStatusAt) < 60000);
+  const streamRunning = streamFresh && normalizeLiveSessionStatus(s._streamStatus) === 'running';
+  const lastOut = Math.max(s._lastOutputAt || 0, s.meta?.lastPtyActivity || 0);
+  const recentOutput = lastOut && (now - lastOut) < 5000;
+  const codexRunningHold = _clientCodexRunningHoldResult(s, now);
 
-  // Authoritative (hook or OTEL) is the strongest signal — CliDeck-style.
+  // Hook/OTEL signals are next after the server's unified live projection.
   // Trust fresh hook/OTEL signals, but do not let a lost stop-hook pin a session
   // on Running forever. Stale authoritative signals fall through to SessionStream
-  // and local PTY evidence.
+  // and local PTY evidence. Conversely, a fresh authoritative idle signal must
+  // not mask newer Codex/PTY evidence that is visibly still working.
   if (s._authoritativeSource) {
     const authAt = s._authoritativeStatusAt || 0;
     const authFresh = authAt && (now - authAt) < AUTHORITATIVE_STATUS_TTL_MS;
@@ -11633,31 +13246,29 @@ function getSessionStatus(s) {
       if (s._working) return { cls: 'running', text: 'Running' };
       // Not working — distinguish "waiting for input" (regex or hook 'menu') from "idle".
       if (s._waitingForInput) return { cls: 'waiting', text: 'Waiting' };
+      const newerRunningEvidence =
+        serverWorking ||
+        (streamRunning && (!authAt || (s._streamStatusAt || 0) >= authAt)) ||
+        (recentOutput && (!authAt || lastOut >= authAt));
+      if (newerRunningEvidence) return { cls: 'running', text: 'Running' };
       return { cls: 'idle', text: 'Idle' };
     }
   }
 
-  const serverWorkingAt = s._serverWorkingAt || 0;
-  const waitingAt = s._waitingForInputAt || 0;
-  const serverWorking = serverWorkingAt &&
-    (now - serverWorkingAt) < 10000 &&
-    (!s._waitingForInput || !waitingAt || serverWorkingAt >= waitingAt);
   if (serverWorking) return { cls: 'running', text: 'Running' };
 
   if (s._waitingForInput) return { cls: 'waiting', text: 'Waiting' };
+  if (codexRunningHold) return codexRunningHold;
 
   // Primary: SessionStream status (received via WS stream-status events).
   // Trust it if received within the last 60s (reconciliation runs every 60s).
   // Do not override fresh stream status with local PTY output; that produced
   // running/idle flicker when local echo arrived after a settled stream status.
-  if (s._streamStatus && s._streamStatusAt && (now - s._streamStatusAt) < 60000) {
-    const statusMap = { running: 'Running', waiting: 'Waiting', idle: 'Idle', exited: 'Exited' };
+  if (streamFresh) {
     return { cls: s._streamStatus, text: statusMap[s._streamStatus] || 'Idle' };
   }
 
   // Fallback: old PTY-based signals (for sessions not tracked by SessionStream)
-  const lastOut = Math.max(s._lastOutputAt || 0, s.meta?.lastActivity || 0);
-  const recentOutput = lastOut && (now - lastOut) < 5000;
   if (s._waitingForInput && !recentOutput) return { cls: 'waiting', text: 'Waiting' };
   if (recentOutput) return { cls: 'running', text: 'Running' };
   const justSentInput = s._lastInputAt && (now - s._lastInputAt) < 3000;
@@ -11731,34 +13342,35 @@ function recentItemDblClick(id, event) {
 // Shared helper: attach event listeners for inline rename inputs
 function setupRenameInput(input, currentText, finish) {
   // Stop events from bubbling to parent (e.g., activateTab → steal focus)
-  for (const evt of ['click', 'mousedown', 'dblclick']) {
+  for (const evt of ['click', 'mousedown', 'mouseup', 'pointerdown', 'dblclick']) {
     input.addEventListener(evt, (e) => e.stopPropagation());
   }
   input.addEventListener('blur', finish);
   input.addEventListener('keydown', (e) => {
-    if (e.key === 'Enter') { e.preventDefault(); input.blur(); }
-    if (e.key === 'Escape') { input.value = currentText; input.blur(); }
+    e.stopPropagation();
+    if (e.key === 'Enter') { e.preventDefault(); finish(); }
+    if (e.key === 'Escape') { e.preventDefault(); input.value = currentText; finish(); }
   });
+  input.addEventListener('keyup', (e) => e.stopPropagation());
 }
 
 function startRenameSession(sessionId, labelEl) {
   // Guard: already editing
   if (labelEl.querySelector('input')) return;
-  const currentText = labelEl.textContent.trim();
+  const branch = state.sessions.get(sessionId)?.meta?.branch || '';
+  const currentText = cleanSessionLabelForBranch(labelEl.textContent.trim(), branch);
   const input = document.createElement('input');
   input.type = 'text';
   input.value = currentText;
   input.style.cssText = 'width:100%;background:var(--bg);color:var(--fg);border:1px solid var(--accent);border-radius:3px;padding:1px 4px;font-size:12px;outline:none;';
   labelEl.textContent = '';
   labelEl.appendChild(input);
-  input.focus();
-  input.select();
 
   let done = false;
   function finish() {
     if (done) return;
     done = true;
-    const newName = input.value.trim();
+    const newName = cleanSessionLabelForBranch(input.value.trim(), branch);
     if (newName && newName !== currentText) {
       // Persist to DB via REST API
       fetch(`/api/sessions/rename?token=${state.token}`, {
@@ -11768,7 +13380,7 @@ function startRenameSession(sessionId, labelEl) {
       });
       // Update active session label
       const active = state.sessions.get(sessionId);
-      if (active && active.meta) active.meta.label = newName;
+      if (active && active.meta) { active.meta.label = newName; active.meta.userRenamed = true; }
       // Update recent session list
       const recent = allRecentSessions.find(x => x.sessionId === sessionId);
       if (recent) { recent.aiTitle = newName; recent.userRenamed = true; }
@@ -11793,6 +13405,8 @@ function startRenameSession(sessionId, labelEl) {
   }
 
   setupRenameInput(input, currentText, finish);
+  input.focus();
+  input.select();
 }
 
 function startRenameReviewTitle(titleEl) {
@@ -11807,8 +13421,6 @@ function startRenameReviewTitle(titleEl) {
   input.style.cssText = 'width:100%;background:var(--bg);color:var(--fg);border:1px solid var(--accent);border-radius:5px;padding:4px 8px;font-size:15px;font-weight:600;outline:none;';
   titleEl.textContent = '';
   titleEl.appendChild(input);
-  input.focus();
-  input.select();
 
   let done = false;
   function finish() {
@@ -11824,7 +13436,7 @@ function startRenameReviewTitle(titleEl) {
       const s = allRecentSessions.find(x => x.sessionId === sessionId);
       if (s) { s.aiTitle = newName; s.userRenamed = true; }
       const active = state.sessions.get(sessionId);
-      if (active && active.meta) active.meta.label = newName;
+      if (active && active.meta) { active.meta.label = newName; active.meta.userRenamed = true; }
       titleEl.textContent = newName;
       renderFilteredSessions();
       renderSessionList();
@@ -11835,6 +13447,8 @@ function startRenameReviewTitle(titleEl) {
   }
 
   setupRenameInput(input, currentText, finish);
+  input.focus();
+  input.select();
 }
 
 function startRenameReviewTabLabel(labelEl) {
@@ -11848,8 +13462,6 @@ function startRenameReviewTabLabel(labelEl) {
   input.style.cssText = 'width:100%;background:var(--bg);color:var(--fg);border:1px solid var(--accent);border-radius:3px;padding:1px 4px;font-size:12px;outline:none;';
   labelEl.textContent = '';
   labelEl.appendChild(input);
-  input.focus();
-  input.select();
 
   let done = false;
   function finish() {
@@ -11865,7 +13477,7 @@ function startRenameReviewTabLabel(labelEl) {
       const s = allRecentSessions.find(x => x.sessionId === sessionId);
       if (s) { s.aiTitle = newName; s.userRenamed = true; }
       const active = state.sessions.get(sessionId);
-      if (active && active.meta) active.meta.label = newName;
+      if (active && active.meta) { active.meta.label = newName; active.meta.userRenamed = true; }
       const reviewTitleEl = document.getElementById('review-title');
       if (reviewTitleEl) reviewTitleEl.textContent = newName;
     }
@@ -11879,6 +13491,8 @@ function startRenameReviewTabLabel(labelEl) {
   }
 
   setupRenameInput(input, rawText, finish);
+  input.focus();
+  input.select();
 }
 
 function startRenameRecentSession(sessionId, spanEl) {
@@ -11889,8 +13503,6 @@ function startRenameRecentSession(sessionId, spanEl) {
   input.style.cssText = 'width:100%;background:var(--bg);color:var(--fg);border:1px solid var(--accent);border-radius:3px;padding:2px 4px;font-size:12px;outline:none;';
   spanEl.textContent = '';
   spanEl.appendChild(input);
-  input.focus();
-  input.select();
 
   let done = false;
   function finish() {
@@ -11909,7 +13521,7 @@ function startRenameRecentSession(sessionId, spanEl) {
       if (s) { s.aiTitle = newName; s.userRenamed = true; }
       // Also update active session if applicable
       const active = state.sessions.get(sessionId);
-      if (active && active.meta) active.meta.label = newName;
+      if (active && active.meta) { active.meta.label = newName; active.meta.userRenamed = true; }
       // Update review title if this session is being reviewed
       if (state.reviewingSessionId === sessionId) {
         const reviewTitleEl = document.getElementById('review-title');
@@ -11929,6 +13541,8 @@ function startRenameRecentSession(sessionId, spanEl) {
   }
 
   setupRenameInput(input, currentText, finish);
+  input.focus();
+  input.select();
 }
 
 async function loadSessionPrompts(sessionId) {
@@ -12001,6 +13615,37 @@ function dismissCompactBanner(id) {
   }
 }
 
+function createSessionsOverviewTab() {
+  const tab = document.createElement('div');
+  tab.className = `tab pinned-tab sessions-overview-tab ${isSessionsOverviewActive() ? 'active' : ''}`;
+  tab.dataset.sessionId = SESSIONS_OVERVIEW_TAB_ID;
+  tab.dataset.pinned = 'true';
+  tab.draggable = false;
+  tab.title = 'Sessions overview';
+  tab.onclick = () => showStandupDashboard();
+
+  const tabLabel = document.createElement('span');
+  tabLabel.className = 'tab-label';
+  tabLabel.textContent = 'Overview';
+  tabLabel.dataset.fullTitle = 'Overview';
+  tab.appendChild(tabLabel);
+  tab.ondragover = function(e) {
+    if (!isMovableTabDrag(_tabDragId)) return;
+    e.preventDefault();
+    e.dataTransfer.dropEffect = 'move';
+    tab.classList.add('tab-drop-after');
+  };
+  tab.ondragleave = function() { tab.classList.remove('tab-drop-after'); };
+  tab.ondrop = function(e) {
+    e.preventDefault();
+    tab.classList.remove('tab-drop-after');
+    if (moveTabToStart(_tabDragId)) {
+      _tabDragId = null;
+    }
+  };
+  return tab;
+}
+
 let _renderTabsTimer = null;
 let _renderTabsLastHash = '';
 function renderTabs(force) {
@@ -12029,6 +13674,8 @@ function renderTabs(force) {
   // Remove old tabs
   scrollContainer.querySelectorAll('.tab').forEach(t => t.remove());
 
+  scrollContainer.insertBefore(createSessionsOverviewTab(), addBtn);
+
   for (const id of state.tabOrder) {
     if (id === 'rules') {
       const tab = document.createElement('div');
@@ -12105,7 +13752,7 @@ function renderTabs(force) {
 
     const s = state.sessions.get(id);
     if (!s) continue;
-    const label = s.meta?.label || id.slice(0, 8);
+    const label = activeSessionDisplayLabel(s, id);
 
     const tab = document.createElement('div');
     tab.className = `tab ${state.activeTab === id ? 'active' : ''}`;
@@ -12113,22 +13760,27 @@ function renderTabs(force) {
     tab.dataset.agent = getAgentType(s);
     tab.draggable = true;
     const tabBranch = s.meta?.branch || '';
-    const tabBranchText = tabBranch && tabBranch !== 'main' ? ' [' + escHtml(tabBranch.length > 12 ? tabBranch.slice(0, 12) + '..' : tabBranch) + ']' : '';
     tab.textContent = '';
     const tabIcon = document.createElement('span');
     tabIcon.className = 'tab-icon';
     tabIcon.innerHTML = providerIconSvg(tab.dataset.agent, 12);
-    const tabLabel = document.createElement('span'); tabLabel.className = 'tab-label'; tabLabel.textContent = label + (tabBranchText ? '' : '');
-    if (tabBranch && tabBranch !== 'main') {
-      const branchEl = document.createElement('span');
-      branchEl.className = 'branch-badge';
-      branchEl.style.cssText = 'font-size:9px;margin-left:3px';
-      branchEl.textContent = '\u25ED ' + (tabBranch.length > 12 ? tabBranch.slice(0, 12) + '..' : tabBranch);
-      tabLabel.appendChild(branchEl);
+    const tabLabel = document.createElement('span'); tabLabel.className = 'tab-label'; tabLabel.textContent = label; tabLabel.dataset.fullTitle = label;
+    let tabBranchEl = null;
+    const tabBranchInfo = branchDisplayParts(tabBranch);
+    if (tabBranchInfo.full && !tabBranchInfo.isMain) {
+      tabBranchEl = document.createElement('span');
+      tabBranchEl.className = 'branch-badge' + (tabBranchInfo.hasNamespace ? ' namespaced' : '');
+      tabBranchEl.style.cssText = 'font-size:9px;margin-left:3px';
+      tabBranchEl.textContent = '\u25ED ' + tabBranchInfo.short;
+      tabBranchEl.title = branchDisplayTitle(tabBranchInfo.full);
+      tabBranchEl.setAttribute('aria-label', tabBranchEl.title);
+      tabBranchEl.dataset.branchFull = tabBranchInfo.full;
+      tabBranchEl.dataset.branchShort = tabBranchInfo.short;
+      tabBranchEl.dataset.branchNamespace = tabBranchInfo.displayNamespace || '';
     }
     const tabClose = document.createElement('span'); tabClose.className = 'close-tab'; tabClose.textContent = '\u00d7';
     tabClose.onclick = function(e) { e.stopPropagation(); killSession(id); };
-    tab.appendChild(tabIcon); tab.appendChild(tabLabel); tab.appendChild(tabClose);
+    tab.appendChild(tabIcon); tab.appendChild(tabLabel); if (tabBranchEl) tab.appendChild(tabBranchEl); tab.appendChild(tabClose);
     tab.onclick = function(e) { sessionItemClick(id, e); };
     tab.ondblclick = function(e) {
       e.preventDefault();
@@ -12188,6 +13840,7 @@ function updateTabOverflowBtn() {
   const countEl = document.getElementById('tab-overflow-count');
   const tabs = scrollContainer.querySelectorAll('.tab');
   const isOverflowing = scrollContainer.scrollWidth > scrollContainer.clientWidth + 2;
+  updateTabTitleTooltips();
   btn.classList.toggle('visible', isOverflowing);
   if (isOverflowing && countEl) {
     countEl.textContent = tabs.length;
@@ -12204,6 +13857,12 @@ function toggleTabOverflow(e) {
   menu = document.createElement('div');
   menu.className = 'tab-overflow-menu';
 
+  const overviewItem = document.createElement('div');
+  overviewItem.className = 'tab-overflow-item' + (isSessionsOverviewActive() ? ' active' : '');
+  overviewItem.innerHTML = `<span class="overflow-dot" style="background:var(--accent)"></span><span class="overflow-label">Overview</span>`;
+  overviewItem.onclick = function() { menu.remove(); showStandupDashboard(); };
+  menu.appendChild(overviewItem);
+
   for (const id of state.tabOrder) {
     // Skip tabs that aren't rendered
     if (id === 'codereview' || id === 'walle') continue;
@@ -12257,6 +13916,22 @@ document.getElementById('tabbar-scroll').addEventListener('wheel', function(e) {
 
 // --- Tab drag-and-drop reorder ---
 let _tabDragId = null;
+function isMovableTabDrag(id) {
+  return !!id && state.tabOrder.includes(id);
+}
+
+function moveTabToStart(id) {
+  const from = state.tabOrder.indexOf(id);
+  if (from === -1) return false;
+  if (from > 0) {
+    state.tabOrder.splice(from, 1);
+    state.tabOrder.unshift(id);
+    saveTabOrder();
+    renderTabs();
+  }
+  return true;
+}
+
 function saveTabOrder() {
   // Save session IDs and review tab (for position restore after restart)
   const sessionOrder = state.tabOrder.filter(id => state.sessions.has(id) || id === 'review');
@@ -12265,7 +13940,7 @@ function saveTabOrder() {
 
 // --- Actions ---
 function getLastSessionCwd() {
-  const isWorktree = (p) => p && p.includes('/.claude/worktrees/');
+  const isWorktree = (p) => _nsIsAgentWorktreePath(p);
   // Try most recently active session's cwd, preferring non-worktree paths
   let latest = null;
   let latestNonWt = null;
@@ -12304,6 +13979,14 @@ function _nsNormalizeCwdForCompare(p) {
   return String(p || '').replace(/\/+$/, '');
 }
 
+function _nsIsAgentWorktreePath(p) {
+  return /\/\.(?:claude|walle)\/worktrees\//.test(String(p || ''));
+}
+
+function _nsWorktreeNamespaceForAgent(agentType) {
+  return agentType === 'walle' ? 'walle' : 'claude';
+}
+
 function _nsAgentUsesCodeWorkspace() {
   var val = document.getElementById('ns-agent').value || 'claude:';
   var agent = val.replace(/:$/, '');
@@ -12334,8 +14017,8 @@ async function _maybeRecommendWorktreeForNewSession(force) {
   if (!modal || modal.classList.contains('hidden')) return;
   var seq = ++_nsWorktreeRecommendSeq;
   var cwd = _nsNormalizeCwdForCompare((document.getElementById('ns-cwd') || {}).value || '');
-  if (!cwd || cwd.indexOf('/.claude/worktrees/') !== -1 || !_nsAgentUsesCodeWorkspace()) {
-    _nsApplyWorktreeRecommendation(false, cwd && cwd.indexOf('/.claude/worktrees/') !== -1
+  if (!cwd || _nsIsAgentWorktreePath(cwd) || !_nsAgentUsesCodeWorkspace()) {
+    _nsApplyWorktreeRecommendation(false, cwd && _nsIsAgentWorktreePath(cwd)
       ? 'Already inside a worktree'
       : 'Isolated branch & files for parallel work');
     return;
@@ -12346,7 +14029,10 @@ async function _maybeRecommendWorktreeForNewSession(force) {
 
   try {
     var token = (state && state.token) ? state.token : '';
-    var r = await fetch('/api/worktrees?token=' + encodeURIComponent(token));
+    var params = new URLSearchParams();
+    params.set('token', token);
+    params.set('cwd', cwd);
+    var r = await fetch('/api/worktrees?' + params.toString());
     var d = await r.json();
     if (seq !== _nsWorktreeRecommendSeq || _nsWorktreeTouched) return;
     var latestCwd = _nsNormalizeCwdForCompare((document.getElementById('ns-cwd') || {}).value || '');
@@ -12483,6 +14169,8 @@ function onAgentChange() {
   var val = document.getElementById('ns-agent').value || '';
   var isCustom = val.startsWith('custom:');
   document.getElementById('ns-custom-fields').style.display = isCustom ? 'block' : 'none';
+  toggleWorktreeFields({ silent: true });
+  _maybeRecommendWorktreeForNewSession(false);
 }
 
 function createSession() {
@@ -12532,7 +14220,12 @@ function createSession() {
     fetch('/api/worktrees/create', {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ name: wtName, cwd: cwd }),
+      body: JSON.stringify({
+        name: wtName,
+        cwd: cwd,
+        namespace: _nsWorktreeNamespaceForAgent(agentType),
+        agentType: agentType,
+      }),
     })
       .then(function(r) { return r.json(); })
       .then(function(d) {
@@ -12595,8 +14288,7 @@ function killSession(id) {
     const next = nextSession || state.tabOrder[state.tabOrder.length - 1];
     if (next) activateTab(next);
     else {
-      state.activeTab = null;
-      document.getElementById('welcome').style.display = 'flex';
+      showStandupDashboard();
     }
   }
   renderTabs();
@@ -12627,10 +14319,7 @@ function closeAllTabs() {
   // Close special tabs too
   state.tabOrder = state.tabOrder.filter(t => !['rules', 'insights', 'permissions'].includes(t) && !t.startsWith('review'));
   saveTabOrder();
-  state.activeTab = null;
-  document.getElementById('welcome').style.display = 'flex';
-  renderTabs();
-  renderSessionList();
+  showStandupDashboard();
 }
 
 function closeOtherTabs(keepId) {
@@ -12677,7 +14366,7 @@ function _showTabContextMenu(e, tabId) {
 
   const sess = state.sessions.get(tabId);
   const label = sess?.meta?.label || tabId.slice(0, 8);
-  const hasWorktree = !!(sess?.meta?.cwd && sess.meta.cwd.includes('.claude/worktrees/'));
+  const hasWorktree = !!(sess?.meta?.cwd && _nsIsAgentWorktreePath(sess.meta.cwd));
   menu.innerHTML = `
     <div class="ctx-item" onclick="killSession('${escAttr(tabId)}')">Close</div>
     <div class="ctx-item${sessionCount <= 1 ? ' disabled' : ''}" onclick="${sessionCount > 1 ? `closeOtherTabs('${escAttr(tabId)}')` : ''}" ${sessionCount <= 1 ? 'style="opacity:0.3;pointer-events:none"' : ''}>Close Others</div>
@@ -12898,48 +14587,179 @@ function _createSearchBarEl() {
   return bar;
 }
 
+function _isConversationSearchVisible(s) {
+  if (!s || !s.container) return false;
+  const convView = s.container.querySelector('.conversation-view');
+  if (!convView) return false;
+  if (convView.style.display && convView.style.display !== 'none') return true;
+  try {
+    return window.getComputedStyle(convView).display !== 'none';
+  } catch {
+    return false;
+  }
+}
+
+function _clearConversationSearchHighlights(root) {
+  if (!root) return;
+  root.querySelectorAll('.review-search-highlight').forEach(el => {
+    const parent = el.parentNode;
+    if (!parent) return;
+    parent.replaceChild(document.createTextNode(el.textContent), el);
+    parent.normalize();
+  });
+}
+
+function _clearSearchBarEffects(s, mode) {
+  if (!s) return;
+  if (mode === 'conversation') {
+    _clearConversationSearchHighlights(s.container && s.container.querySelector('.conversation-view'));
+  } else if (s.searchAddon) {
+    s.searchAddon.clearDecorations();
+  }
+}
+
+function _conversationSearchTargets(root) {
+  if (!root) return [];
+  return Array.from(root.querySelectorAll([
+    '.msg-text',
+    '.conversation-state',
+  ].join(',')));
+}
+
+function _wireTerminalSearchBar(s, bar) {
+  const input = bar.querySelector('input');
+  const countEl = bar.querySelector('.search-count');
+  let _searchDebounce = null;
+  input.addEventListener('input', () => {
+    clearTimeout(_searchDebounce);
+    _searchDebounce = setTimeout(() => {
+      const q = input.value;
+      if (q) {
+        s.searchAddon.findNext(q, { regex: false, caseSensitive: false, incremental: true });
+      } else {
+        s.searchAddon.clearDecorations();
+        countEl.textContent = '';
+      }
+    }, 100);
+  });
+  input.addEventListener('keydown', (ev) => {
+    if (ev.key === 'Enter') {
+      ev.preventDefault();
+      if (input.value) {
+        if (ev.shiftKey) s.searchAddon.findPrevious(input.value, { regex: false, caseSensitive: false });
+        else s.searchAddon.findNext(input.value, { regex: false, caseSensitive: false });
+      }
+    }
+    if (ev.key === 'Escape') { ev.preventDefault(); closeTermSearch(); }
+  });
+  bar.querySelector('.search-next').onclick = () => { if (input.value) s.searchAddon.findNext(input.value, { regex: false, caseSensitive: false }); };
+  bar.querySelector('.search-prev').onclick = () => { if (input.value) s.searchAddon.findPrevious(input.value, { regex: false, caseSensitive: false }); };
+  bar.querySelector('.search-close').onclick = () => closeTermSearch();
+}
+
+function _scrollToConversationSearchMatch(bar, idx) {
+  const state = bar._conversationSearchState;
+  if (!state || idx < 0 || idx >= state.matches.length) return;
+  state.matches.forEach(m => m.classList.remove('current'));
+  const match = state.matches[idx];
+  match.classList.add('current');
+
+  const msgText = match.closest('.msg-text');
+  if (msgText && msgText.classList.contains('collapsed')) {
+    msgText.classList.remove('collapsed');
+    const btn = msgText.nextElementSibling;
+    if (btn && btn.classList.contains('msg-expand')) btn.textContent = 'Show less';
+  }
+
+	  const msgEl = match.closest('.review-msg');
+	  if (msgEl && msgEl.style.display === 'none') msgEl.style.display = '';
+
+	  const turnEl = match.closest('.prompt-turn');
+	  if (turnEl) setPromptTurnExpanded(turnEl, true);
+
+	  const group = match.closest('.thought-group, .review-msg.skill-body, .review-msg.local-cmd, .review-msg.summary');
+	  if (group && !group.classList.contains('expanded')) group.classList.add('expanded');
+
+  match.scrollIntoView({ behavior: 'smooth', block: 'center' });
+  const countEl = bar.querySelector('.search-count');
+  if (countEl) countEl.textContent = `${idx + 1} / ${state.matches.length}`;
+}
+
+function _wireConversationSearchBar(s, bar) {
+  const input = bar.querySelector('input');
+  const countEl = bar.querySelector('.search-count');
+  const searchState = { matches: [], idx: -1 };
+  bar._conversationSearchState = searchState;
+
+  const update = () => {
+    const convView = s.container && s.container.querySelector('.conversation-view');
+    _clearConversationSearchHighlights(convView);
+    searchState.matches = [];
+    searchState.idx = -1;
+
+    const query = input.value.trim();
+    if (!query || !convView) {
+      countEl.textContent = '';
+      return;
+    }
+
+    const queryLower = query.toLowerCase();
+    _conversationSearchTargets(convView).forEach(el => highlightInNode(el, queryLower));
+    searchState.matches = Array.from(convView.querySelectorAll('.review-search-highlight'));
+    const count = searchState.matches.length;
+    countEl.textContent = count > 0 ? `${count} found` : 'No results';
+    if (count > 0) {
+      searchState.idx = 0;
+      _scrollToConversationSearchMatch(bar, 0);
+    }
+  };
+
+  const nav = (dir) => {
+    if (!searchState.matches.length) return;
+    searchState.idx = (searchState.idx + dir + searchState.matches.length) % searchState.matches.length;
+    _scrollToConversationSearchMatch(bar, searchState.idx);
+  };
+
+  input.addEventListener('input', update);
+  input.addEventListener('keydown', (ev) => {
+    if (ev.key === 'Enter') {
+      ev.preventDefault();
+      nav(ev.shiftKey ? -1 : 1);
+    }
+    if (ev.key === 'Escape') { ev.preventDefault(); closeTermSearch(); }
+  });
+  bar.querySelector('.search-next').onclick = () => nav(1);
+  bar.querySelector('.search-prev').onclick = () => nav(-1);
+  bar.querySelector('.search-close').onclick = () => closeTermSearch();
+}
+
+function _ensureSearchBarForMode(s, mode) {
+  let bar = s.container.querySelector('.term-search-bar');
+  if (bar && bar.dataset.searchMode === mode) return bar;
+  if (bar) {
+    _clearSearchBarEffects(s, bar.dataset.searchMode);
+    bar.remove();
+  }
+  bar = _createSearchBarEl();
+  bar.dataset.searchMode = mode;
+  s.container.style.position = 'relative';
+  s.container.appendChild(bar);
+  if (mode === 'conversation') _wireConversationSearchBar(s, bar);
+  else _wireTerminalSearchBar(s, bar);
+  return bar;
+}
+
 function openTermSearch() {
   const id = state.activeTab;
   const s = id && state.sessions.get(id);
-  if (!s || !s.searchAddon) return;
-  let bar = s.container.querySelector('.term-search-bar');
-  if (!bar) {
-    bar = _createSearchBarEl();
-    s.container.style.position = 'relative';
-    s.container.appendChild(bar);
-    const input = bar.querySelector('input');
-    const countEl = bar.querySelector('.search-count');
-    let _searchDebounce = null;
-    input.addEventListener('input', () => {
-      clearTimeout(_searchDebounce);
-      _searchDebounce = setTimeout(() => {
-        const q = input.value;
-        if (q) {
-          s.searchAddon.findNext(q, { regex: false, caseSensitive: false, incremental: true });
-        } else {
-          s.searchAddon.clearDecorations();
-          countEl.textContent = '';
-        }
-      }, 100);
-    });
-    input.addEventListener('keydown', (ev) => {
-      if (ev.key === 'Enter') {
-        ev.preventDefault();
-        if (input.value) {
-          if (ev.shiftKey) s.searchAddon.findPrevious(input.value, { regex: false, caseSensitive: false });
-          else s.searchAddon.findNext(input.value, { regex: false, caseSensitive: false });
-        }
-      }
-      if (ev.key === 'Escape') { ev.preventDefault(); closeTermSearch(); }
-    });
-    bar.querySelector('.search-next').onclick = () => { if (input.value) s.searchAddon.findNext(input.value, { regex: false, caseSensitive: false }); };
-    bar.querySelector('.search-prev').onclick = () => { if (input.value) s.searchAddon.findPrevious(input.value, { regex: false, caseSensitive: false }); };
-    bar.querySelector('.search-close').onclick = () => closeTermSearch();
-  }
+  if (!s || !s.container) return;
+  const mode = _isConversationSearchVisible(s) ? 'conversation' : 'terminal';
+  if (mode === 'terminal' && !s.searchAddon) return;
+  const bar = _ensureSearchBarForMode(s, mode);
   bar.style.display = 'flex';
   const input = bar.querySelector('input');
   input.focus();
-  if (s.term.hasSelection()) {
+  if (mode === 'terminal' && s.term && s.term.hasSelection && s.term.hasSelection()) {
     input.value = s.term.getSelection();
     if (input.value) {
       input.dispatchEvent(new Event('input'));
@@ -12951,16 +14771,16 @@ function openTermSearch() {
 function closeTermSearch() {
   // Close search on whichever session has a visible bar (may differ from activeTab after tab switch)
   for (const [, s] of state.sessions) {
-    if (!s.container || !s.searchAddon) continue;
+    if (!s.container) continue;
     const bar = s.container.querySelector('.term-search-bar');
     if (bar && bar.style.display !== 'none') {
       bar.style.display = 'none';
-      s.searchAddon.clearDecorations();
+      _clearSearchBarEffects(s, bar.dataset.searchMode);
       bar.querySelector('.search-count').textContent = '';
     }
   }
   const active = state.activeTab && state.sessions.get(state.activeTab);
-  if (active && active.term) focusTerminalIfSafe(state.activeTab, { force: true });
+  if (active && active.term && !_isConversationSearchVisible(active)) focusTerminalIfSafe(state.activeTab, { force: true });
 }
 
 
@@ -13315,6 +15135,7 @@ function _fitTerminalPreservingViewport(s, sessionId, opts) {
     s.writer._userScrollLocked = savedLocked;
   }
   if (opts.sendResize && sessionId) {
+    _markClientUiRefreshOutputSuppression(s);
     send({ type: 'resize', id: sessionId, cols: s.term.cols, rows: s.term.rows });
   }
 
@@ -13794,9 +15615,10 @@ async function loadPrefs() {
         if (sortSel) sortSel.value = prefs.session_sort;
       }
 
-      // Restore model filter
-      if (prefs.model_filter) {
-        currentModelFilter = prefs.model_filter;
+      // Restore agent filter. Ignore the legacy model_filter value so stale
+      // raw model IDs (for example fake-model) never reappear as filters.
+      if (prefs.agent_filter) {
+        currentAgentFilter = SessionSearchUtils.normalizeRecentAgentType(prefs.agent_filter) || '';
       }
 
       // (empty sessions hidden by default — no pref needed)
@@ -13965,8 +15787,9 @@ async function loadRecentSessions() {
       pinnedSessionIds.push(s.sessionId);
     }
   }
-  populateProjectFilter(allRecentSessions);
-  populateModelFilter(allRecentSessions);
+  const sidebarSessions = getRecentSidebarSessions();
+  populateProjectFilter(sidebarSessions);
+  populateAgentFilter(sidebarSessions);
   renderFilteredSessions();
 
   // Resolve pending review hash sessions here. Active #session=<id> hashes are
@@ -13995,7 +15818,7 @@ async function loadRecentSessions() {
       // If not post-restart (e.g. normal page load with saved review), restore active tab now
       if (!state._postRestart) {
         const _hashNav = location.hash.slice(1).split('&')[0];
-        const _isHashPanel = ['rules', 'insights', 'permissions', 'prompts', 'codereview', 'walle', 'models', 'backups'].includes(_hashNav);
+        const _isHashPanel = ['command', 'rules', 'insights', 'permissions', 'prompts', 'codereview', 'walle', 'models', 'backups', 'worktrees', 'setup'].includes(_hashNav);
         if (_isHashPanel) {
           navTo(_hashNav, { skipHash: true });
         } else if (state._savedActiveSession && state._savedActiveSession !== 'review') {
@@ -14034,6 +15857,8 @@ async function loadRecentSessions() {
         scanPromises.push(_scanPromptLinesFromAPI(id, apiProjectEntry, claudeId));
       } else if (caps.promptNavigation === 'terminal') {
         _scanPromptLinesFromTerminal(id);
+      } else if (caps.promptNavigation === 'chat' && window.WalleSession && typeof window.WalleSession.updatePromptNav === 'function') {
+        window.WalleSession.updatePromptNav(id);
       }
     }
   }
@@ -14073,7 +15898,7 @@ function _recentSidebarFilterState() {
     isCtmSession,
     emptyMode: showEmptyOnly ? 'only' : 'exclude',
     project: currentProjectFilter,
-    model: currentModelFilter,
+    agent: currentAgentFilter,
   };
 }
 
@@ -14082,7 +15907,7 @@ function _applyRecentSidebarFilters(sessions, filters) {
 }
 
 function getFilteredSessions() {
-  return _applyRecentSidebarFilters(allRecentSessions);
+  return _applyRecentSidebarFilters(getRecentSidebarSessions());
 }
 
 let titleGenInProgress = false;
@@ -14105,6 +15930,7 @@ function _activeTabSessionCandidate(id, s) {
     sessionId: id,
     provisionalId: id,
     agentSessionId: s?.meta?.agentSessionId || s?.meta?.agentSessionToken || s?.meta?.claudeSessionId || '',
+    agent: _clientAgentTypeForSession(s),
     project: s?.meta?.cwd || '',
     projectEntry: '',
     cwd: s?.meta?.cwd || '',
@@ -14121,24 +15947,39 @@ function _activeTabSessionCandidate(id, s) {
     fileModifiedAt,
     timestamp: new Date(s?.meta?.createdAt || Date.now()).toISOString(),
     version: '',
-    gitBranch: '',
+    gitBranch: s?.meta?.branch || '',
     fileSize: s?.meta?.fileSize || 0,
   };
 }
 
+function _activeTabSessionCandidates() {
+  const candidates = [];
+  for (const [id, s] of state.sessions) candidates.push(_activeTabSessionCandidate(id, s));
+  return candidates;
+}
+
+function getRecentSidebarSessions() {
+  return SessionSearchUtils.mergeRecentSessionCandidates(allRecentSessions, _activeTabSessionCandidates());
+}
+
 function renderFilteredSessions() {
   // Skip re-render if user just clicked a result (250ms timer in flight)
   if (_recentClickTimer) return;
   // Skip re-render if user is actively renaming a session in the recent list
   const recentList = document.getElementById('recent-list');
   if (recentList && recentList.querySelector('input[type="text"]')) return;
-  const q = document.getElementById('recent-search').value.toLowerCase();
+  const q = SessionSearchUtils.normalizeSearchValue(document.getElementById('recent-search').value);
   const sidebarFilters = _recentSidebarFilterState();
-  let sessions = getFilteredSessions();
+  const sidebarSessions = getRecentSidebarSessions();
+  populateAgentFilter(sidebarSessions);
+  let sessions = _applyRecentSidebarFilters(sidebarSessions, sidebarFilters);
   if (q && !aiSearchMode) {
     // First filter local metadata
     const metaMatches = new Set();
-    const recentIds = new Set(sessions.map(s => s.sessionId));
+    const recentIds = new Set();
+    for (const s of sessions) {
+      for (const id of SessionSearchUtils.getSearchableSessionIds(s)) recentIds.add(id);
+    }
     sessions = sessions.filter(s => {
       // Also check active session label (tab name)
       const activeLabel = _activeSessionLabel(s.sessionId, state.sessions.get(s.sessionId));
@@ -14315,7 +16156,7 @@ function sessionItemHtml(s) {
   const ago = timeAgo(SessionActivityUtils.sessionTouchedValue(s));
   const project = s.project.replace(/^\/Users\/[^/]+\//, '~/');
   const displayText = sessionDisplayText(s, '(empty session)');
-  const branch = s.gitBranch ? `<span>${escHtml(s.gitBranch)}</span>` : '';
+  const branch = s.gitBranch ? branchMetaHtml(s.gitBranch) : '';
   const emptyTag = s.isEmpty ? '<span style="color:var(--yellow);font-size:9px;margin-left:4px">[empty]</span>' : '';
   const deviceTag = (!thisDevice && s.hostname) ? `<span style="color:var(--accent);font-size:9px;margin-left:4px">${escHtml(s.hostname)}</span>` : '';
   const msgCount = s.userMsgCount > 0 ? `<span>${s.userMsgCount} msgs</span>` : '';
@@ -14334,11 +16175,30 @@ function sessionItemHtml(s) {
   </div>`;
 }
 
+function recentSearchEmptyHtml(label) {
+  const input = document.getElementById('recent-search');
+  const rawQuery = (input?.value || '').trim();
+  const normalizedQuery = SessionSearchUtils.normalizeSearchValue(rawQuery);
+  const details = [];
+  if (rawQuery && normalizedQuery && rawQuery.toLowerCase() !== normalizedQuery) {
+    details.push('searching as "' + escHtml(normalizedQuery) + '"');
+  }
+  if (currentAgentFilter) details.push('agent ' + escHtml(SessionSearchUtils.recentAgentFilterLabel(currentAgentFilter)));
+  if (currentProjectFilter) details.push('project ' + escHtml(currentProjectFilter.replace(/^\/Users\/[^/]+/, '~')));
+  details.push(showEmptyOnly ? 'empty only' : 'non-empty');
+  if (document.getElementById('this-device')?.checked !== false) details.push('this device');
+  if (document.getElementById('hide-ctm')?.checked) details.push('hide CTM');
+  const detailHtml = rawQuery && details.length
+    ? '<div style="margin-top:6px;color:var(--fg-dim);line-height:1.35">Filters: ' + details.join(', ') + '</div>'
+    : '';
+  return '<div style="padding:10px;font-size:12px;color:var(--fg-dim)">' + escHtml(label || 'No sessions found') + detailHtml + '</div>';
+}
+
 function renderRecentSessions(sessions) {
   const list = document.getElementById('recent-session-list');
 
   if (sessions.length === 0) {
-    list.innerHTML = '<div style="padding:10px;font-size:12px;color:var(--fg-dim)">No sessions found</div>';
+    list.innerHTML = recentSearchEmptyHtml('No sessions found');
     return;
   }
 
@@ -14768,15 +16628,20 @@ async function reviewSession(sessionId, projectEntry, title, sessionData, opts)
       return;
     }
 
-    // Chunked rendering: show first batch immediately, render rest progressively
-    const groups = groupMessages(messages);
-    const FIRST_BATCH = 20;
-    const CHUNK_SIZE = 30;
-    const container = document.getElementById('review-messages');
+	    // Chunked rendering: show first batch immediately, render rest progressively.
+	    // The top-level unit is now a prompt turn: user prompt first, with
+	    // assistant/tool/system detail collapsed underneath.
+	    const turns = groupMessagesIntoTurns(messages);
+	    const FIRST_BATCH = 20;
+	    const CHUNK_SIZE = 30;
+	    const container = document.getElementById('review-messages');
+	    container.dataset.turnMode = 'review';
+	    container.dataset.sessionId = sessionId;
 
-    // renderGroup returns sanitized HTML (uses DOMPurify internally)
-    const firstHtml = groups.slice(0, FIRST_BATCH).map(renderGroup).join('');
-    container.innerHTML = DOMPurify.sanitize(firstHtml, { ADD_ATTR: ['style', 'data-idx', 'data-role'] });
+	    // renderReviewTurn returns sanitized inner message HTML (uses DOMPurify
+	    // internally via formatMsgText); sanitize the wrapper before insertion.
+	    const firstHtml = turns.slice(0, FIRST_BATCH).map(renderReviewTurn).join('');
+	    container.innerHTML = DOMPurify.sanitize(firstHtml, { ADD_ATTR: ['style', 'data-idx', 'data-role', 'data-turn-id', 'data-msg-idx', 'data-parent-uuid', 'role', 'tabindex', 'aria-expanded'] });
 
     // Show partial load indicator if backend couldn't load all files
     if (isPartial) {
@@ -14788,20 +16653,20 @@ async function reviewSession(sessionId, projectEntry, title, sessionData, opts)
     }
 
     // Render remaining groups in async chunks to avoid blocking the main thread
-    if (groups.length > FIRST_BATCH) {
-      let offset = FIRST_BATCH;
-      const renderNextChunk = () => {
-        if (offset >= groups.length) {
-          toggleToolMsgs();
-          reviewPromptNavReset();
-          return;
-        }
-        const end = Math.min(offset + CHUNK_SIZE, groups.length);
-        const chunkHtml = groups.slice(offset, end).map(renderGroup).join('');
-        container.insertAdjacentHTML('beforeend', DOMPurify.sanitize(chunkHtml, { ADD_ATTR: ['style', 'data-idx', 'data-role'] }));
-        offset = end;
-        requestAnimationFrame(renderNextChunk);
-      };
+	    if (turns.length > FIRST_BATCH) {
+	      let offset = FIRST_BATCH;
+	      const renderNextChunk = () => {
+	        if (offset >= turns.length) {
+	          toggleToolMsgs();
+	          reviewPromptNavReset();
+	          return;
+	        }
+	        const end = Math.min(offset + CHUNK_SIZE, turns.length);
+	        const chunkHtml = turns.slice(offset, end).map(renderReviewTurn).join('');
+	        container.insertAdjacentHTML('beforeend', DOMPurify.sanitize(chunkHtml, { ADD_ATTR: ['style', 'data-idx', 'data-role', 'data-turn-id', 'data-msg-idx', 'data-parent-uuid', 'role', 'tabindex', 'aria-expanded'] }));
+	        offset = end;
+	        requestAnimationFrame(renderNextChunk);
+	      };
       requestAnimationFrame(renderNextChunk);
     }
 
@@ -14847,14 +16712,16 @@ function _wireReviewLiveStream(sessionId) {
   }
 }
 
-// Pre-process messages into renderable groups (cheap — no markdown yet)
-// groupMessages was extracted to public/js/message-renderer.js (Phase 1).
-function groupMessages(messages) { return MR.groupMessages(messages); }
+	// Pre-process messages into renderable groups (cheap — no markdown yet)
+	// groupMessages was extracted to public/js/message-renderer.js (Phase 1).
+	function groupMessages(messages) { return MR.groupMessages(messages); }
+	function groupMessagesIntoTurns(messages) { return MR.groupMessagesIntoTurns(messages); }
 
-// Render a single group to HTML string
-function renderGroup(g) { return MR.renderGroup(g); }
+	// Render a single group to HTML string
+	function renderGroup(g) { return MR.renderGroup(g); }
+	function renderReviewTurn(turn, i) { return MR.renderReviewTurn(turn, i); }
 
-function renderGroupedMessages(messages) { return MR.groupMessages(messages).map(MR.renderGroup).join(''); }
+	function renderGroupedMessages(messages) { return MR.groupMessages(messages).map(MR.renderGroup).join(''); }
 
 function renderSelfThoughtMsg(m, i, stripped) { return MR.renderSelfThoughtMsg(m, i, stripped); }
 
@@ -14864,12 +16731,48 @@ function classifyMessage(m, stripped, isToolOnly) { return MR.classifyMessage(m,
 
 function renderReviewMsg(m, i, msgType) { return MR.renderReviewMsg(m, i, msgType); }
 
-function toggleMsgExpand(btn) {
-  const textEl = btn.previousElementSibling;
-  const isCollapsed = textEl.classList.contains('collapsed');
-  textEl.classList.toggle('collapsed');
-  btn.textContent = isCollapsed ? 'Show less' : 'Show more';
-}
+	function toggleMsgExpand(btn) {
+	  const textEl = btn.previousElementSibling;
+	  const isCollapsed = textEl.classList.contains('collapsed');
+	  textEl.classList.toggle('collapsed');
+	  btn.textContent = isCollapsed ? 'Show less' : 'Show more';
+	}
+
+	function setPromptTurnExpanded(turnEl, expanded) {
+	  if (!turnEl) return;
+	  if (typeof MR !== 'undefined' && typeof MR.setPromptTurnExpanded === 'function') {
+	    MR.setPromptTurnExpanded(turnEl, expanded);
+	    return;
+	  }
+	  turnEl.classList.toggle('expanded', !!expanded);
+	  const header = turnEl.querySelector('.prompt-turn-header');
+	  if (header) header.setAttribute('aria-expanded', expanded ? 'true' : 'false');
+	}
+
+	function togglePromptTurn(headerEl) {
+	  const turnEl = headerEl && headerEl.closest('.prompt-turn');
+	  if (!turnEl) return;
+	  setPromptTurnExpanded(turnEl, !turnEl.classList.contains('expanded'));
+	}
+
+	document.addEventListener('click', (e) => {
+	  const header = e.target.closest && e.target.closest('#review-messages .prompt-turn-header');
+	  if (!header) return;
+	  const reviewMessages = document.getElementById('review-messages');
+	  if (reviewMessages && reviewMessages.classList.contains('truncate-mode')) return;
+	  if (e.target.closest('a,button,input,textarea,select')) return;
+	  togglePromptTurn(header);
+	});
+
+	document.addEventListener('keydown', (e) => {
+	  const header = e.target.closest && e.target.closest('#review-messages .prompt-turn-header');
+	  if (!header) return;
+	  const reviewMessages = document.getElementById('review-messages');
+	  if (reviewMessages && reviewMessages.classList.contains('truncate-mode')) return;
+	  if (e.key !== 'Enter' && e.key !== ' ') return;
+	  e.preventDefault();
+	  togglePromptTurn(header);
+	});
 
 // --- Review Search ---
 let _reviewSearchMatches = [];
@@ -14963,19 +16866,26 @@ function scrollToSearchMatch(idx) {
   const match = _reviewSearchMatches[idx];
   match.classList.add('current');
 
-  // Expand collapsed message if match is inside one
-  const msgText = match.closest('.msg-text');
-  if (msgText && msgText.classList.contains('collapsed')) {
-    msgText.classList.remove('collapsed');
+	  // Expand collapsed message if match is inside one
+	  const msgText = match.closest('.msg-text');
+	  if (msgText && msgText.classList.contains('collapsed')) {
+	    msgText.classList.remove('collapsed');
     const btn = msgText.nextElementSibling;
     if (btn && btn.classList.contains('msg-expand')) btn.textContent = 'Show less';
   }
 
-  // Unhide tool-only messages if match is inside one
-  const msgEl = match.closest('.review-msg');
-  if (msgEl && msgEl.style.display === 'none') msgEl.style.display = '';
+	  // Unhide tool-only messages if match is inside one
+	  const msgEl = match.closest('.review-msg');
+	  if (msgEl && msgEl.style.display === 'none') msgEl.style.display = '';
 
-  match.scrollIntoView({ behavior: 'smooth', block: 'center' });
+	  // Search includes collapsed response detail. Expand the owning prompt
+	  // turn and any nested collapsible group before scrolling to the match.
+	  const turnEl = match.closest('.prompt-turn');
+	  if (turnEl) setPromptTurnExpanded(turnEl, true);
+	  const group = match.closest('.thought-group, .review-msg.skill-body, .review-msg.local-cmd, .review-msg.summary');
+	  if (group && !group.classList.contains('expanded')) group.classList.add('expanded');
+
+	  match.scrollIntoView({ behavior: 'smooth', block: 'center' });
   document.getElementById('review-search-count').textContent = `${idx + 1} / ${_reviewSearchMatches.length}`;
 }
 
@@ -15034,16 +16944,16 @@ function toggleTruncateMode(sessionId, project) {
   document.getElementById('truncate-info').textContent = 'Click a user message to set the cut point.';
   document.getElementById('truncate-do-btn').style.display = 'none';
 
-  // Add click handlers to user message headers
-  msgEl.querySelectorAll('.review-msg.user .msg-header').forEach(header => {
-    header._truncateClick = () => selectTruncatePoint(header);
-    header.addEventListener('click', header._truncateClick);
-  });
-}
+	  // Add click handlers to prompt turn headers
+	  msgEl.querySelectorAll('.prompt-turn:not(.setup-turn) .prompt-turn-header').forEach(header => {
+	    header._truncateClick = () => selectTruncatePoint(header);
+	    header.addEventListener('click', header._truncateClick);
+	  });
+	}
 
-function selectTruncatePoint(headerEl) {
-  const msgEl = headerEl.closest('.review-msg');
-  const container = document.getElementById('review-messages');
+	function selectTruncatePoint(headerEl) {
+	  const msgEl = headerEl.closest('.prompt-turn') || headerEl.closest('.review-msg');
+	  const container = document.getElementById('review-messages');
 
   // Find the message index from data-msg-idx on the msg-text child
   const textEl = msgEl.querySelector('[data-msg-idx]');
@@ -15056,9 +16966,9 @@ function selectTruncatePoint(headerEl) {
   container.querySelectorAll('.truncate-remove').forEach(el => el.classList.remove('truncate-remove'));
   container.querySelectorAll('.truncate-cut-line').forEach(el => el.remove());
 
-  // Use direct children of the container to avoid nested-element double-counting
-  const directChildren = Array.from(container.children).filter(el =>
-    el.classList.contains('review-msg') || el.classList.contains('thought-group'));
+	  // Use direct children of the container to avoid nested-element double-counting
+	  const directChildren = Array.from(container.children).filter(el =>
+	    el.classList.contains('prompt-turn') || el.classList.contains('review-msg') || el.classList.contains('thought-group'));
 
   // "Cut from here" — the clicked message and everything after it gets removed.
   // We keep the previous assistant response as the last kept item.
@@ -15113,10 +17023,10 @@ function cancelTruncate() {
   msgEl.querySelectorAll('.truncate-cut-line').forEach(el => el.remove());
 
   // Remove click handlers
-  msgEl.querySelectorAll('.review-msg.user .msg-header').forEach(header => {
-    if (header._truncateClick) {
-      header.removeEventListener('click', header._truncateClick);
-      delete header._truncateClick;
+	  msgEl.querySelectorAll('.prompt-turn:not(.setup-turn) .prompt-turn-header').forEach(header => {
+	    if (header._truncateClick) {
+	      header.removeEventListener('click', header._truncateClick);
+	      delete header._truncateClick;
     }
   });
 
@@ -15162,12 +17072,12 @@ function scrollReviewToBottom() {
 let _reviewPromptEls = [];
 let _reviewPromptIdx = -1;
 
-function reviewPromptNavReset() {
-  const container = document.getElementById('review-messages');
-  _reviewPromptEls = container ? Array.from(container.querySelectorAll('.review-msg.user')) : [];
-  _reviewPromptIdx = -1;
-  reviewPromptNavUpdateBadge();
-}
+	function reviewPromptNavReset() {
+	  const container = document.getElementById('review-messages');
+	  _reviewPromptEls = container ? Array.from(container.querySelectorAll('.prompt-turn:not(.setup-turn)')) : [];
+	  _reviewPromptIdx = -1;
+	  reviewPromptNavUpdateBadge();
+	}
 
 function reviewPromptNavGo(dir) {
   if (_reviewPromptEls.length === 0) return;
@@ -15224,12 +17134,12 @@ function reviewPromptNavToggleList() {
   if (existing) { existing.remove(); return; }
   if (_reviewPromptEls.length === 0) return;
 
-  const list = document.createElement('div');
-  list.className = 'prompt-nav-list';
-  // Show most recent first
-  for (let i = _reviewPromptEls.length - 1; i >= 0; i--) {
-    const msgText = _reviewPromptEls[i].querySelector('.msg-text');
-    let text = msgText ? msgText.textContent.trim() : '(empty)';
+	  const list = document.createElement('div');
+	  list.className = 'prompt-nav-list';
+	  // Show most recent first
+	  for (let i = _reviewPromptEls.length - 1; i >= 0; i--) {
+	    const msgText = _reviewPromptEls[i].querySelector('.prompt-turn-prompt .msg-text');
+	    let text = msgText ? msgText.textContent.trim() : '(empty)';
     if (text.length > 80) text = text.slice(0, 80) + '\u2026';
     const item = document.createElement('div');
     item.className = 'prompt-nav-list-item' + (i === _reviewPromptIdx ? ' current' : '');
@@ -15288,65 +17198,60 @@ function setSessionSort(sort) {
   renderFilteredSessions();
 }
 
-let currentModelFilter = '';
-function setModelFilter(model) {
-  currentModelFilter = model;
-  savePref('model_filter', model);
+let currentAgentFilter = '';
+function setAgentFilter(agent) {
+  currentAgentFilter = SessionSearchUtils.normalizeRecentAgentType(agent) || '';
+  savePref('agent_filter', currentAgentFilter);
   refreshRecentSearchAfterFilterChange();
 }
 
-function isSyntheticModelName(model) {
-  return typeof model === 'string' && /^<[^>]+>$/.test(model.trim());
-}
-
-function modelFilterPriority(model) {
-  const m = String(model || '').toLowerCase();
-  if (/^(gpt-|o[1-9]|codex-)/.test(m)) return 0;
-  if (/^claude-/.test(m)) return 1;
-  if (/^gemini-/.test(m)) return 2;
-  return 3;
-}
-
-function modelFilterLabel(model) {
-  if (/^claude-/.test(model)) return model.replace(/^claude-/, '');
-  return model;
+// Back-compat for older cached markup/tests that still call the old handler.
+function setModelFilter(agent) {
+  setAgentFilter(agent);
 }
 
-function populateModelFilter(sessions) {
+function populateAgentFilter(sessions) {
   const sel = document.getElementById('model-filter');
   if (!sel) return;
-  const models = new Map();
+  const agents = new Map();
   for (const s of sessions) {
-    if (s.model && !isSyntheticModelName(s.model)) {
-      models.set(s.model, (models.get(s.model) || 0) + 1);
-    }
+    const agent = SessionSearchUtils.getRecentSessionAgentType(s);
+    agents.set(agent, (agents.get(agent) || 0) + 1);
   }
-  const sorted = [...models.entries()].sort((a, b) => {
-    const pa = modelFilterPriority(a[0]);
-    const pb = modelFilterPriority(b[0]);
+  const sorted = [...agents.entries()].sort((a, b) => {
+    const pa = SessionSearchUtils.recentAgentFilterPriority(a[0]);
+    const pb = SessionSearchUtils.recentAgentFilterPriority(b[0]);
     if (pa !== pb) return pa - pb;
     if (b[1] !== a[1]) return b[1] - a[1];
-    return String(b[0]).localeCompare(String(a[0]), undefined, { numeric: true, sensitivity: 'base' });
+    return SessionSearchUtils.recentAgentFilterLabel(a[0]).localeCompare(
+      SessionSearchUtils.recentAgentFilterLabel(b[0]),
+      undefined,
+      { numeric: true, sensitivity: 'base' }
+    );
   });
   const prev = sel.value;
   // Build options safely using DOM APIs
   while (sel.options.length > 0) sel.remove(0);
   const allOpt = document.createElement('option');
   allOpt.value = '';
-  allOpt.textContent = 'All Models (' + sessions.length + ')';
+  allOpt.textContent = 'All Agents (' + sessions.length + ')';
   sel.add(allOpt);
-  for (const [m, count] of sorted) {
+  for (const [agent, count] of sorted) {
     const opt = document.createElement('option');
-    opt.value = m;
-    opt.textContent = modelFilterLabel(m) + ' (' + count + ')';
+    opt.value = agent;
+    opt.textContent = SessionSearchUtils.recentAgentFilterLabel(agent) + ' (' + count + ')';
     sel.add(opt);
   }
-  const nextValue = prev || currentModelFilter || '';
-  sel.value = models.has(nextValue) ? nextValue : '';
-  if (currentModelFilter && !models.has(currentModelFilter)) currentModelFilter = '';
+  const nextValue = SessionSearchUtils.normalizeRecentAgentType(prev || currentAgentFilter || '');
+  sel.value = agents.has(nextValue) ? nextValue : '';
+  if (currentAgentFilter && !agents.has(currentAgentFilter)) currentAgentFilter = '';
+}
+
+function populateModelFilter(sessions) {
+  populateAgentFilter(sessions);
 }
 
-// Strip worktree suffix from project path: /repo/.claude/worktrees/name → /repo
+// Strip worktree suffix from project path: /repo/.claude|.walle/worktrees/name → /repo
 function _stripWorktreePath(p) {
   return SessionSearchUtils.stripWorktreePath(p);
 }
@@ -15448,13 +17353,14 @@ function escHtml(s) {
 // element (.session-item or .tab) sets color via CSS so the icon inherits the
 // per-provider hue and inverts cleanly when the row is active (light bg, dark text).
 // Returns an HTML string with title for screen-readers + hover tooltip.
-const AGENT_LABELS = { walle: 'Wall-E', codex: 'Codex', gemini: 'Gemini', claude: 'Claude Code', 'claude-desktop': 'Claude Desktop', shell: 'Shell' };
+const AGENT_LABELS = { walle: 'Wall-E', codex: 'Codex', gemini: 'Gemini', opencode: 'OpenCode', claude: 'Claude Code', 'claude-desktop': 'Claude Desktop', shell: 'Shell' };
 function getAgentType(s) {
   if (!s) return 'shell';
   if (s.meta?.type === 'walle') return 'walle';
-  const cmd = s.meta?.cmd || '';
+  const cmd = String(s.meta?.cmd || '').toLowerCase();
   if (cmd.includes('codex')) return 'codex';
   if (cmd.includes('gemini')) return 'gemini';
+  if (cmd.includes('opencode') || cmd.includes('open-code')) return 'opencode';
   if (cmd.includes('claude')) return 'claude';
   return 'shell';
 }
@@ -15500,6 +17406,12 @@ function providerIconSvg(agentType, sizePx) {
       // provider icons in the same row.
       inner = '<path fill="currentColor" d="M8 0.8 L9 7 L15.2 8 L9 9 L8 15.2 L7 9 L0.8 8 L7 7 Z"/>';
       break;
+    case 'opencode':
+      // Code brackets with a center dot: compact enough for tabs, distinct
+      // from the generic terminal prompt used for plain shell sessions.
+      inner = '<path fill="none" stroke="currentColor" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round" d="M6 4 L3 8 L6 12 M10 4 L13 8 L10 12"/>'
+            + '<circle cx="8" cy="8" r="1.2" fill="currentColor"/>';
+      break;
     case 'shell':
       // >_  prompt — universal terminal metaphor.
       inner = '<path fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" d="M2.5 5 L6 8 L2.5 11 M8.5 12 L13.5 12"/>';
@@ -15765,7 +17677,7 @@ function _matchesPaletteQuery(item, q) {
 }
 
 function searchSessionPalette(query) {
-  const q = (query || '').trim().toLowerCase();
+  const q = SessionSearchUtils.normalizeSearchValue(query);
   const { activeItems, recentItems } = _sessionPaletteSourceItems();
   const filteredActive = activeItems.filter((it) => _matchesPaletteQuery(it, q));
   const filteredRecent = recentItems.filter((it) => _matchesPaletteQuery(it, q));
@@ -15900,19 +17812,19 @@ async function performServerSearch(query) {
     if (data.results && data.results.length > 0) {
       _serverSearchActive = true;
       // Apply the exact same sidebar filters to server results as the local
-      // list. Otherwise the badge can count rows hidden by Empty/project/model
+      // list. Otherwise the badge can count rows hidden by Empty/project/agent
       // filters while the rendered list says "No sessions found".
       const sidebarFilters = _recentSidebarFilterState();
-      const serverFiltered = _applyRecentSidebarFilters(data.results, sidebarFilters);
+      const serverFiltered = SessionSearchUtils.dedupeSessionCandidates(_applyRecentSidebarFilters(data.results, sidebarFilters));
       if (serverFiltered.length === 0) {
-        // All server results were filtered out (e.g., Empty/project/model).
+        // All server results were filtered out (e.g., Empty/project/agent).
         // Fall back to local-only rendering
         _serverSearchActive = false;
         renderFilteredSessions();
         return;
       }
       // Merge server results with local matches so local hits aren't lost
-      const lq = query.toLowerCase();
+      const lq = SessionSearchUtils.normalizeSearchValue(query);
       const localSessions = getFilteredSessions().filter(s => {
         const activeLabel = _activeSessionLabel(s.sessionId, state.sessions.get(s.sessionId));
         return SessionSearchUtils.sessionMatchesRecentSearchQuery(s, lq, activeLabel);
@@ -15931,11 +17843,12 @@ async function performServerSearch(query) {
           localSessions.push(candidate);
         }
       }
-      const serverIds = new Set(serverFiltered.map(r => r.sessionId));
       const merged = [...serverFiltered];
+      const mergedIdentityIndex = SessionSearchUtils.createSessionIdentityIndex(merged);
       let localOnlyCount = 0;
       for (const ls of localSessions) {
-        if (!serverIds.has(ls.sessionId)) {
+        const existing = SessionSearchUtils.findSessionIdentityMatch(mergedIdentityIndex, ls);
+        if (!existing) {
           const idScore = SessionSearchUtils.scoreSessionIdMatch(ls, lq);
           if (idScore > 0) {
             ls._score = idScore / 1000;
@@ -15950,7 +17863,10 @@ async function performServerSearch(query) {
             ls._matchField = exactTitle ? 'title (exact)' : titleContains ? 'title' : 'metadata';
           }
           merged.push(ls);
+          for (const id of SessionSearchUtils.getSearchableSessionIds(ls)) mergedIdentityIndex.set(id, ls);
           localOnlyCount++;
+        } else {
+          SessionSearchUtils.mergeRecentSessionMetadata(existing, ls);
         }
       }
       merged.sort((a, b) => (b._score || 0) - (a._score || 0) || SessionActivityUtils.sessionTouchedAtMs(b) - SessionActivityUtils.sessionTouchedAtMs(a));
@@ -15975,7 +17891,7 @@ function renderServerSearchResults(results, total, query) {
     return;
   }
   const list = document.getElementById('recent-session-list');
-  const terms = query.toLowerCase().split(/\s+/).filter(t => t.length >= 2);
+  const terms = SessionSearchUtils.normalizeSearchValue(query).split(/\s+/).filter(t => t.length >= 2);
   updateSearchCount(total);
 
   function highlightTerms(text) {
@@ -15993,7 +17909,7 @@ function renderServerSearchResults(results, total, query) {
     const displayText = sessionDisplayText(s, '(empty session)');
     const project = s.project.replace(/^\/Users\/[^/]+\//, '~/');
     const ago = timeAgo(SessionActivityUtils.sessionTouchedValue(s));
-    const branch = s.gitBranch ? `<span>${escHtml(s.gitBranch)}</span>` : '';
+    const branch = s.gitBranch ? branchMetaHtml(s.gitBranch) : '';
     const msgCount = s.userMsgCount > 0 ? `<span>${s.userMsgCount} msgs</span>` : '';
     const isPinned = pinnedSessionIds.includes(s.sessionId);
     const pinCls = isPinned ? ' pinned' : '';
@@ -16024,7 +17940,7 @@ function renderServerSearchResults(results, total, query) {
 
   // Note: html is safe — all user data is escaped via escHtml(), highlights use <mark> only.
   // DOMPurify was stripping onclick/ondblclick/oncontextmenu handlers, breaking click-to-review.
-  list.innerHTML = html || '<div style="padding:10px;font-size:12px;color:var(--fg-dim)">No results found</div>';
+  list.innerHTML = html || recentSearchEmptyHtml('No results found');
 }
 
 function updateSearchCount(count) {
@@ -17724,6 +19640,9 @@ function onDataChanged(msg) {
   }
   if (r === 'models' || r === 'model-registry' || r === 'providers') {
     _modelRegistryCache = null; // Invalidate cache so switchers re-fetch
+    if (typeof WalleSession !== 'undefined' && WalleSession.invalidateModelCache) {
+      WalleSession.invalidateModelCache();
+    }
   }
 }
 
@@ -17740,9 +19659,16 @@ function clearWaitingState(sessionId, opts = {}) {
   const wasWaiting = s._waitingForInput;
   s._waitingForInput = false;
   s._waitingForInputAt = 0;
+  s._waitingReason = '';
   const now = opts.timestamp || Date.now();
   if (opts.markInput !== false) s._lastInputAt = now;
-  if (opts.markWorking) s._serverWorkingAt = now;
+  if (opts.markWorking) {
+    s._serverWorkingAt = now;
+    s._serverWorkingEventAt = opts.eventTimestamp || now;
+    s._serverLiveStatus = 'running';
+    s._serverLiveStatusAt = now;
+    _markClientCodexRunningEvidence(s, opts.eventTimestamp || now, now);
+  }
   // Only do DOM work if the session was actually in waiting state
   if (wasWaiting) {
     const tabs = document.querySelectorAll('#tabbar .tab');
@@ -17800,18 +19726,38 @@ function playNotificationSound(type) {
 function onSessionActivity(msg) {
   if (!msg.sessions) return;
   let shouldRerender = false;
-  for (const { id, ts, state: serverState } of msg.sessions) {
+  for (const { id, ts, state: serverState, status } of msg.sessions) {
     const s = state.sessions.get(id);
     if (!s) continue;
     const oldBucket = activeActivityBucket(s);
     const oldStatus = getSessionStatus(s).cls;
     const serverTs = SessionActivityUtils.parseTimeMs(ts) || Date.now();
-    if (serverState === 'thinking' || serverState === 'active') {
-      const waitingAt = s._waitingForInputAt || 0;
-      const activityIsNewerThanWaiting = !s._waitingForInput || !waitingAt || serverTs >= waitingAt;
-      if (activityIsNewerThanWaiting) s._serverWorkingAt = Date.now();
+    const liveStatus = normalizeLiveSessionStatus(status || serverState);
+    const waitingAt = s._waitingForInputAt || 0;
+    const activityIsNewerThanWaiting = !s._waitingForInput || !waitingAt || serverTs >= waitingAt;
+    if (liveStatus && (liveStatus !== 'running' || activityIsNewerThanWaiting)) {
+      s._serverLiveStatus = liveStatus;
+      s._serverLiveStatusAt = Date.now();
+      if (s.meta) s.meta.liveStatus = liveStatus;
+      if (liveStatus !== 'running') {
+        s._serverWorkingAt = 0;
+        s._serverWorkingEventAt = 0;
+        s._codexRunningHoldUntil = 0;
+      }
+    }
+    if (liveStatus === 'waiting') {
+      if (!s._waitingForInput) s._waitingForInputAt = serverTs;
+      s._waitingForInput = true;
+    }
+    if (liveStatus === 'running') {
+      if (activityIsNewerThanWaiting) {
+        const receivedAt = Date.now();
+        s._serverWorkingAt = receivedAt;
+        s._serverWorkingEventAt = serverTs;
+        _markClientCodexRunningEvidence(s, serverTs, receivedAt);
+      }
       if (s._waitingForInput && activityIsNewerThanWaiting) {
-        clearWaitingState(id, { markInput: false, markWorking: true });
+        clearWaitingState(id, { markInput: false, markWorking: true, eventTimestamp: serverTs });
       }
     }
     if (s.meta && ts) {
@@ -17824,6 +19770,7 @@ function onSessionActivity(msg) {
     }
   }
   if (shouldRerender) renderSessionList();
+  if (typeof scheduleStandupRefresh === 'function') scheduleStandupRefresh();
 }
 
 // Server signals that a previously-idle session has resumed generating output.
@@ -17832,6 +19779,7 @@ function onSessionActivity(msg) {
 function onSessionResumed(msg) {
   const s = state.sessions.get(msg.id);
   if (s) clearWaitingState(msg.id, { markInput: false, markWorking: true, timestamp: msg.timestamp || Date.now() });
+  if (typeof scheduleStandupRefresh === 'function') scheduleStandupRefresh();
 }
 
 // Authoritative session state (hooks or OTEL). Wins over the regex fallback.
@@ -17842,6 +19790,11 @@ function onAuthoritativeStatus(msg) {
   s._authoritativeSource = msg.source || 'hook';
   s._working = !!msg.working;
   s._authoritativeStatusAt = msg.timestamp || Date.now();
+  s._serverLiveStatus = s._working ? 'running' : 'idle';
+  s._serverLiveStatusAt = s._authoritativeStatusAt;
+  if (s.meta) s.meta.liveStatus = s._serverLiveStatus;
+  if (s._working) _markClientCodexRunningEvidence(s, s._authoritativeStatusAt, Date.now());
+  else s._codexRunningHoldUntil = 0;
   // When the agent is working, explicitly clear "waiting for input" state —
   // the regex fallback may have left it set before hooks took over.
   if (s._working && s._waitingForInput) clearWaitingState(msg.id, { markInput: false, markWorking: true, timestamp: s._authoritativeStatusAt });
@@ -17852,6 +19805,7 @@ function onAuthoritativeStatus(msg) {
     item.classList.toggle('idle',    !msg.working);
     item.classList.remove('stale');  // authoritative signal supersedes staleness
   }
+  if (typeof scheduleStandupRefresh === 'function') scheduleStandupRefresh();
 }
 
 // Agent's internal session ID captured via OTEL — lets us surface real resume IDs in UI.
@@ -17891,9 +19845,7 @@ function onAgentLinked(msg) {
       if (msg.model_provider) s.meta.model_provider = msg.model_provider;
       populateModelSwitcher(ctmId);
     }
-    for (const key of Object.keys(_promptScanCache)) {
-      if (key === ctmId || key.startsWith(ctmId + ':') || key.startsWith(agentId)) delete _promptScanCache[key];
-    }
+    invalidatePromptScanCacheForSession(ctmId);
     scanPromptLines(ctmId);
   }
   for (const recent of allRecentSessions || []) {
@@ -17935,17 +19887,16 @@ function onWaitingForInput(msg) {
   if (session) {
     session._waitingForInput = true;
     session._waitingForInputAt = msg.timestamp || Date.now();
+    session._waitingReason = msg.reason || 'input';
+    session._serverLiveStatus = 'waiting';
+    session._serverLiveStatusAt = session._waitingForInputAt;
+    session._codexRunningHoldUntil = 0;
+    if (session.meta) session.meta.liveStatus = 'waiting';
   }
+  if (typeof scheduleStandupRefresh === 'function') scheduleStandupRefresh();
   // Re-scan prompts — JSONL is fully written when Claude yields back to user.
   // Invalidate cache so we get fresh data (not stale 30s cached results).
-  for (const key of Object.keys(_promptScanCache)) {
-    if (key === sessionId || key.startsWith(sessionId + ':') ||
-        (session?.meta?.claudeSessionId && key.startsWith(session.meta.claudeSessionId)) ||
-        (session?.meta?.agentSessionId && key.startsWith(session.meta.agentSessionId)) ||
-        (session?.meta?.agentSessionToken && key.startsWith(session.meta.agentSessionToken))) {
-      delete _promptScanCache[key];
-    }
-  }
+  invalidatePromptScanCacheForSession(sessionId);
   scanPromptLines(sessionId);
   const label = msg.label || session?.meta?.label || sessionId.slice(0, 8);
   const reason = msg.reason || 'input';
@@ -18134,7 +20085,9 @@ window.addEventListener('message', (e) => {
 });
 
 // --- Hash routing ---
-const NAV_TARGETS = ['sessions', 'prompts', 'rules', 'insights', 'permissions', 'codereview', 'walle', 'models', 'backups', 'worktrees', 'setup'];
+// Keep "command" as a route alias for old links; the UI now renders this as
+// the pinned Overview tab inside Sessions.
+const NAV_TARGETS = ['sessions', 'command', 'prompts', 'rules', 'insights', 'permissions', 'codereview', 'walle', 'models', 'backups', 'worktrees', 'setup'];
 
 function _parseHashRoute() {
   const hash = location.hash.slice(1);
@@ -18163,10 +20116,15 @@ function handleHashRoute() {
 
   // No hash — fall back to saved nav pref from DB
   if (!hash) {
-    if (state._savedActiveNav && NAV_TARGETS.includes(state._savedActiveNav) && state._savedActiveNav !== 'sessions') {
-      navTo(state._savedActiveNav, { skipHash: false, skipPersist: true });
+    if (state._savedActiveNav === 'command') {
+      navTo('command', { skipHash: false, skipPersist: true });
+      return;
+    }
+    const savedNav = state._savedActiveNav === 'command' ? 'sessions' : state._savedActiveNav;
+    if (savedNav && NAV_TARGETS.includes(savedNav) && savedNav !== 'sessions') {
+      navTo(savedNav, { skipHash: false, skipPersist: true });
       // Restore deep state (e.g., open prompt) after nav
-      if (state._savedActiveNav === 'prompts' && state._savedActivePrompt) {
+      if (savedNav === 'prompts' && state._savedActivePrompt) {
         setTimeout(() => PE.openPrompt(state._savedActivePrompt), 200);
       }
     } else if (state._savedActiveSession) {
@@ -18182,7 +20140,7 @@ function handleHashRoute() {
   const isNav = route.isNav;
   const params = route.params;
 
-  // Check for nav target: #permissions, #prompts, #rules, #insights, #sessions, #codereview
+  // Check for nav target: #command alias, #permissions, #prompts, #rules, #insights, #sessions, #codereview
   if (isNav && !Object.keys(params).length) {
     navTo(firstPart, { skipHash: true });
     // For prompts without explicit prompt param, restore saved prompt from DB
@@ -18319,6 +20277,7 @@ state._prefsLoaded = loadPrefs().then(() => {
   loadRecentSessions();
   // Restore hash from saved nav if no hash present
   handleHashRoute();
+  refreshStandupIfVisible();
 });
 refreshSessionPrompts();