create-walle 0.9.11 → 0.9.13

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

@@ -191,6 +191,15 @@
     transition: all 0.15s;
   }
   .btn:hover { background: var(--border); }
+  .btn[aria-disabled="true"],
+  .btn:disabled {
+    opacity: 0.55;
+    cursor: not-allowed;
+  }
+  .btn[aria-disabled="true"]:hover,
+  .btn:disabled:hover {
+    background: var(--bg-lighter);
+  }
   .pe-copilot-tab.active { background: var(--accent); color: #1a1b26; border-color: var(--accent); }
   .pe-copilot-tab.active:hover { background: var(--accent-hover); }
   .btn.primary { background: var(--accent); color: #1a1b26; border-color: var(--accent); }
@@ -302,6 +311,7 @@
   .session-item.active .idle-hint { color: #1a1b26; opacity: 0.6; }
   .session-item .label {
     flex: 1;
+    min-width: 0;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
@@ -414,6 +424,10 @@
   #session-list .agent-badge { display: none; }
   /* Branch badge */
   .branch-badge {
+    display: inline-block;
+    max-width: 92px;
+    overflow: hidden;
+    text-overflow: ellipsis;
     font-size: 9px;
     background: rgba(125, 211, 252, 0.15);
     color: #7dd3fc;
@@ -423,7 +437,38 @@
     flex-shrink: 0;
     margin-left: 2px;
   }
+  .session-item.has-worktree-attn .branch-badge { max-width: 60px; }
   .session-item.active .branch-badge { color: #0ea5e9; background: rgba(14, 165, 233, 0.15); }
+  .worktree-attn-badge {
+    display: inline-flex;
+    align-items: center;
+    gap: 4px;
+    min-width: 0;
+    max-width: 70px;
+    font-size: 9px;
+    font-weight: 700;
+    line-height: 1.3;
+    letter-spacing: 0.01em;
+    background: rgba(245, 158, 11, 0.14);
+    border: 1px solid rgba(245, 158, 11, 0.28);
+    color: #f6c177;
+    padding: 1px 5px;
+    border-radius: 5px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    flex-shrink: 0;
+  }
+  .worktree-attn-badge .wt-part {
+    display: inline-flex;
+    align-items: center;
+    gap: 1px;
+  }
+  .session-item.active .worktree-attn-badge {
+    background: rgba(245, 158, 11, 0.28);
+    border-color: rgba(120, 53, 15, 0.22);
+    color: #3f2a05;
+  }
   /* cwd conflict banner */
   .cwd-conflict-banner {
     background: rgba(251, 191, 36, 0.12);
@@ -997,6 +1042,18 @@
     opacity: 0.6;
   }
   .thought-group:hover { opacity: 0.8; }
+  .thought-group.tool-activity-group {
+    background: rgba(224, 175, 104, 0.025);
+    border-left-color: rgba(224, 175, 104, 0.32);
+  }
+  .thought-group.tool-activity-group .thought-group-label {
+    color: var(--yellow);
+  }
+  .thought-group.tool-activity-group .thought-group-preview {
+    font-family: 'SF Mono', ui-monospace, monospace;
+    font-style: normal;
+    font-size: 10.5px;
+  }
   .thought-group .thought-group-header {
     padding: 6px 12px;
     cursor: pointer;
@@ -1065,6 +1122,14 @@
   .thought-group .thought-group-items .review-msg .msg-header {
     margin-bottom: 2px;
   }
+  .thought-group.tool-activity-group .thought-group-items .review-msg {
+    background: rgba(224, 175, 104, 0.025);
+  }
+  .thought-group .tool-result-item .msg-text {
+    color: var(--fg-dim);
+    font-family: 'SF Mono', ui-monospace, monospace;
+    font-size: 11.5px;
+  }
 
   /* Summary/system messages */
   .review-msg.summary {
@@ -2090,6 +2155,78 @@
     gap: 8px;
     margin-top: 16px;
   }
+  .update-wizard-overlay { z-index: 130; }
+  .update-wizard-modal {
+    width: min(520px, 92vw);
+    min-width: 0;
+    padding: 0;
+    overflow: hidden;
+  }
+  .update-wizard-head {
+    display: flex;
+    gap: 12px;
+    padding: 18px 20px 14px;
+    border-bottom: 1px solid var(--border);
+    background: linear-gradient(135deg, rgba(122,162,247,0.14), rgba(187,154,247,0.07));
+  }
+  .update-wizard-icon {
+    width: 34px;
+    height: 34px;
+    border-radius: 8px;
+    background: var(--accent);
+    color: #1a1b26;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 18px;
+    font-weight: 800;
+    flex-shrink: 0;
+  }
+  .update-wizard-title h3 { margin: 0 0 4px; font-size: 16px; }
+  .update-wizard-title p { margin: 0; color: var(--fg-dim); font-size: 12px; line-height: 1.5; }
+  .update-wizard-body { padding: 16px 20px 18px; }
+  .update-version-grid {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    gap: 8px;
+    margin-bottom: 12px;
+  }
+  .update-version-cell {
+    border: 1px solid var(--border);
+    border-radius: 8px;
+    padding: 10px 12px;
+    background: var(--bg);
+  }
+  .update-version-cell span {
+    display: block;
+    color: var(--fg-dim);
+    font-size: 10px;
+    text-transform: uppercase;
+    letter-spacing: 0.04em;
+    margin-bottom: 4px;
+  }
+  .update-version-cell strong {
+    font-family: 'SF Mono', 'Fira Code', monospace;
+    color: var(--fg);
+    font-size: 13px;
+  }
+  .update-wizard-note {
+    color: var(--fg-dim);
+    font-size: 12px;
+    line-height: 1.5;
+    margin: 0;
+  }
+  .update-wizard-actions {
+    display: flex;
+    justify-content: flex-end;
+    gap: 8px;
+    margin-top: 16px;
+  }
+  @media (max-width: 520px) {
+    .update-version-grid { grid-template-columns: 1fr; }
+    .update-wizard-actions { flex-wrap: wrap; }
+    .update-wizard-actions .btn { flex: 1 1 auto; }
+  }
 
   /* Agent Picker Grid */
   .ns-agent-grid {
@@ -2827,6 +2964,35 @@
     <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>
   </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>
+        </div>
+      </div>
+      <div class="update-wizard-body">
+        <div class="update-version-grid">
+          <div class="update-version-cell">
+            <span>Installed</span>
+            <strong id="update-current-version">v?</strong>
+          </div>
+          <div class="update-version-cell">
+            <span>Available</span>
+            <strong id="update-latest-version">v?</strong>
+          </div>
+        </div>
+        <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>
+        </div>
+      </div>
+    </div>
+  </div>
   <div id="main">
     <div id="sidebar">
       <div class="sidebar-section">
@@ -3035,7 +3201,7 @@
             </div>
             <div style="display:flex;gap:8px;align-items:center;">
               <button id="wt-prune-all-btn" class="btn" style="display:none;font-size:12px;padding:6px 10px;color:var(--red,#f7768e);border-color:var(--red,#f7768e);" onclick="submitPruneGhosts()" title="Remove ghost worktrees with corrupt or missing paths">🗑 Prune ghosts</button>
-              <button id="wt-sync-all-btn" class="btn" style="display:none;font-size:12px;padding:6px 10px;background:rgba(224,175,104,0.10);color:#e0af68;border:1px solid rgba(224,175,104,0.35);" onclick="submitSyncAllWorktrees()" title="Sync every clean branch that is behind main">↓ Sync all</button>
+              <button id="wt-sync-all-btn" class="btn" style="display:none;font-size:12px;padding:6px 10px;background:rgba(224,175,104,0.10);color:#e0af68;border:1px solid rgba(224,175,104,0.35);" onclick="submitSyncAllWorktrees()" title="Sync every clean inactive branch that is behind main">↓ Sync all</button>
               <button class="btn" style="font-size:12px;padding:6px 10px;" onclick="loadWorktreesPanel()" title="Refresh worktree list">↻</button>
               <button class="btn primary" style="font-size:12px;padding:6px 14px;" onclick="showCreateWorktreeDialog()">+ New Worktree</button>
             </div>
@@ -3095,7 +3261,7 @@
                       <span class="pcard-default-tag" data-default-tag="anthropic" style="display:none;font-size:10px;background:var(--accent);color:#0d1117;padding:1px 6px;border-radius:3px;font-weight:600;letter-spacing:0.5px;">DEFAULT</span>
                     </div>
                     <div style="display:flex;align-items:center;gap:8px;">
-                      <button class="pcard-star" data-default-btn="anthropic" title="Set as default provider" aria-label="Set Anthropic as default" style="background:none;border:none;cursor:pointer;font-size:18px;color:var(--fg-dim);padding:0 4px;line-height:1;">☆</button>
+                      <button class="pcard-star" data-default-btn="anthropic" title="Set as default Wall-E provider" aria-label="Set Anthropic as default Wall-E provider" style="background:none;border:none;cursor:pointer;font-size:18px;color:var(--fg-dim);padding:0 4px;line-height:1;">☆</button>
                       <label class="pcard-toggle" style="position:relative;display:inline-block;width:36px;height:20px;flex-shrink:0;">
                         <input type="checkbox" data-toggle="anthropic" style="opacity:0;width:0;height:0;">
                         <span class="pcard-slider" style="position:absolute;cursor:pointer;inset:0;background:var(--border);border-radius:20px;transition:0.2s;"></span>
@@ -3183,7 +3349,7 @@
                       <span class="pcard-default-tag" data-default-tag="openai" style="display:none;font-size:10px;background:var(--accent);color:#0d1117;padding:1px 6px;border-radius:3px;font-weight:600;letter-spacing:0.5px;">DEFAULT</span>
                     </div>
                     <div style="display:flex;align-items:center;gap:8px;">
-                      <button class="pcard-star" data-default-btn="openai" title="Set as default provider" aria-label="Set OpenAI as default" style="background:none;border:none;cursor:pointer;font-size:18px;color:var(--fg-dim);padding:0 4px;line-height:1;">☆</button>
+                      <button class="pcard-star" data-default-btn="openai" title="Set as default Wall-E provider" aria-label="Set OpenAI as default Wall-E provider" style="background:none;border:none;cursor:pointer;font-size:18px;color:var(--fg-dim);padding:0 4px;line-height:1;">☆</button>
                       <label class="pcard-toggle" style="position:relative;display:inline-block;width:36px;height:20px;flex-shrink:0;">
                         <input type="checkbox" data-toggle="openai" style="opacity:0;width:0;height:0;">
                         <span class="pcard-slider" style="position:absolute;cursor:pointer;inset:0;background:var(--border);border-radius:20px;transition:0.2s;"></span>
@@ -3245,7 +3411,7 @@
                       <span class="pcard-default-tag" data-default-tag="google" style="display:none;font-size:10px;background:var(--accent);color:#0d1117;padding:1px 6px;border-radius:3px;font-weight:600;letter-spacing:0.5px;">DEFAULT</span>
                     </div>
                     <div style="display:flex;align-items:center;gap:8px;">
-                      <button class="pcard-star" data-default-btn="google" title="Set as default provider" aria-label="Set Google as default" style="background:none;border:none;cursor:pointer;font-size:18px;color:var(--fg-dim);padding:0 4px;line-height:1;">☆</button>
+                      <button class="pcard-star" data-default-btn="google" title="Set as default Wall-E provider" aria-label="Set Google as default Wall-E provider" style="background:none;border:none;cursor:pointer;font-size:18px;color:var(--fg-dim);padding:0 4px;line-height:1;">☆</button>
                       <label class="pcard-toggle" style="position:relative;display:inline-block;width:36px;height:20px;flex-shrink:0;">
                         <input type="checkbox" data-toggle="google" style="opacity:0;width:0;height:0;">
                         <span class="pcard-slider" style="position:absolute;cursor:pointer;inset:0;background:var(--border);border-radius:20px;transition:0.2s;"></span>
@@ -3306,7 +3472,7 @@
                       <span class="pcard-default-tag" data-default-tag="ollama" style="display:none;font-size:10px;background:var(--accent);color:#0d1117;padding:1px 6px;border-radius:3px;font-weight:600;letter-spacing:0.5px;">DEFAULT</span>
                     </div>
                     <div style="display:flex;align-items:center;gap:8px;">
-                      <button class="pcard-star" data-default-btn="ollama" title="Set as default provider" aria-label="Set Ollama as default" style="background:none;border:none;cursor:pointer;font-size:18px;color:var(--fg-dim);padding:0 4px;line-height:1;">☆</button>
+                      <button class="pcard-star" data-default-btn="ollama" title="Set as default Wall-E provider" aria-label="Set Ollama as default Wall-E provider" style="background:none;border:none;cursor:pointer;font-size:18px;color:var(--fg-dim);padding:0 4px;line-height:1;">☆</button>
                       <label class="pcard-toggle" style="position:relative;display:inline-block;width:36px;height:20px;flex-shrink:0;">
                         <input type="checkbox" data-toggle="ollama" style="opacity:0;width:0;height:0;">
                         <span class="pcard-slider" style="position:absolute;cursor:pointer;inset:0;background:var(--border);border-radius:20px;transition:0.2s;"></span>
@@ -3349,7 +3515,7 @@
                       <span class="pcard-default-tag" data-default-tag="deepseek" style="display:none;font-size:10px;background:var(--accent);color:#0d1117;padding:1px 6px;border-radius:3px;font-weight:600;letter-spacing:0.5px;">DEFAULT</span>
                     </div>
                     <div style="display:flex;align-items:center;gap:8px;">
-                      <button class="pcard-star" data-default-btn="deepseek" title="Set as default provider" aria-label="Set DeepSeek as default" style="background:none;border:none;cursor:pointer;font-size:18px;color:var(--fg-dim);padding:0 4px;line-height:1;">☆</button>
+                      <button class="pcard-star" data-default-btn="deepseek" title="Set as default Wall-E provider" aria-label="Set DeepSeek as default Wall-E provider" style="background:none;border:none;cursor:pointer;font-size:18px;color:var(--fg-dim);padding:0 4px;line-height:1;">☆</button>
                       <label class="pcard-toggle" style="position:relative;display:inline-block;width:36px;height:20px;flex-shrink:0;">
                         <input type="checkbox" data-toggle="deepseek" style="opacity:0;width:0;height:0;">
                         <span class="pcard-slider" style="position:absolute;cursor:pointer;inset:0;background:var(--border);border-radius:20px;transition:0.2s;"></span>
@@ -4290,32 +4456,102 @@ function showCwdConflict(msg) {
 }
 
 // --- Update Banner ---
-let _updateDismissedVersion = localStorage.getItem('update_dismissed_version') || '';
+function _safeStorageGet(storage, key) {
+  try { return storage.getItem(key) || ''; } catch { return ''; }
+}
+function _safeStorageSet(storage, key, value) {
+  try { storage.setItem(key, value); } catch {}
+}
+
+let _updateDismissedVersion = _safeStorageGet(localStorage, 'update_dismissed_version');
+let _updateWizardSnoozedVersion = _safeStorageGet(sessionStorage, 'update_wizard_snoozed_version');
+let _updateCurrentVersion = '';
+let _updateLatestVersion = '';
+let _updateApplying = false;
+
+function _setUpdateVersions(current, latest) {
+  _updateCurrentVersion = current || '';
+  _updateLatestVersion = latest || '';
+
+  const banner = document.getElementById('update-banner');
+  if (banner) {
+    banner.dataset.currentVersion = _updateCurrentVersion;
+    banner.dataset.latestVersion = _updateLatestVersion;
+  }
+
+  const cur = document.getElementById('update-current-version');
+  const lat = document.getElementById('update-latest-version');
+  if (cur) cur.textContent = _updateCurrentVersion ? `v${_updateCurrentVersion}` : 'v?';
+  if (lat) lat.textContent = _updateLatestVersion ? `v${_updateLatestVersion}` : 'v?';
+}
+
+function _hideUpdateWizard() {
+  const wizard = document.getElementById('update-wizard');
+  if (wizard) wizard.classList.add('hidden');
+}
+
+function _hideUpdatePrompts() {
+  const banner = document.getElementById('update-banner');
+  if (banner) banner.style.display = 'none';
+  _hideUpdateWizard();
+}
+
+function _setUpdateApplying(applying) {
+  _updateApplying = applying;
+  const bannerBtn = document.getElementById('update-apply-btn');
+  const wizardBtn = document.getElementById('update-wizard-apply-btn');
+  if (bannerBtn) {
+    bannerBtn.textContent = applying ? 'Updating...' : 'Update Now';
+    bannerBtn.disabled = applying;
+  }
+  if (wizardBtn) {
+    wizardBtn.textContent = applying ? 'Updating...' : 'Upgrade CTM';
+    wizardBtn.disabled = applying;
+  }
+}
 
 function showUpdateBanner(current, latest) {
-  if (_updateDismissedVersion === latest) return;
+  if (!latest || _updateDismissedVersion === latest) return;
+  _setUpdateVersions(current, latest);
   const banner = document.getElementById('update-banner');
   const msg = document.getElementById('update-banner-msg');
   if (!banner || !msg) return;
   msg.textContent = `Update available: v${current} \u2192 v${latest}`;
   banner.style.display = 'flex';
+  showUpdateWizard(current, latest);
+}
+
+function showUpdateWizard(current, latest) {
+  if (!latest || _updateDismissedVersion === latest || _updateWizardSnoozedVersion === latest || _updateApplying) return;
+  _setUpdateVersions(current, latest);
+  const wizard = document.getElementById('update-wizard');
+  if (!wizard) return;
+  wizard.classList.remove('hidden');
+  setTimeout(() => {
+    const btn = document.getElementById('update-wizard-apply-btn');
+    if (btn && !btn.disabled) btn.focus();
+  }, 0);
+}
+
+function snoozeUpdateWizard() {
+  if (_updateLatestVersion) {
+    _updateWizardSnoozedVersion = _updateLatestVersion;
+    _safeStorageSet(sessionStorage, 'update_wizard_snoozed_version', _updateLatestVersion);
+  }
+  _hideUpdateWizard();
 }
 
 function dismissUpdate() {
-  const banner = document.getElementById('update-banner');
-  if (banner) banner.style.display = 'none';
-  // Remember dismissal for this version
-  const msg = document.getElementById('update-banner-msg')?.textContent || '';
-  const m = msg.match(/v([\d.]+)$/);
-  if (m) {
-    _updateDismissedVersion = m[1];
-    localStorage.setItem('update_dismissed_version', m[1]);
+  _hideUpdatePrompts();
+  if (_updateLatestVersion) {
+    _updateDismissedVersion = _updateLatestVersion;
+    _safeStorageSet(localStorage, 'update_dismissed_version', _updateLatestVersion);
   }
 }
 
 async function applyUpdate() {
-  const btn = document.getElementById('update-apply-btn');
-  if (btn) { btn.textContent = 'Updating...'; btn.disabled = true; }
+  if (_updateApplying) return;
+  _setUpdateApplying(true);
   try {
     const resp = await fetch('/api/updates/apply', { method: 'POST' });
     const data = await resp.json();
@@ -4324,11 +4560,12 @@ async function applyUpdate() {
       dismissUpdate();
     } else {
       toast('Already up to date.', { type: 'success' });
-      if (btn) { btn.textContent = 'Update Now'; btn.disabled = false; }
+      _hideUpdatePrompts();
+      _setUpdateApplying(false);
     }
   } catch (e) {
     toast('Update failed: ' + e.message, { type: 'error' });
-    if (btn) { btn.textContent = 'Update Now'; btn.disabled = false; }
+    _setUpdateApplying(false);
   }
 }
 
@@ -4356,6 +4593,7 @@ const state = window._ctmState = {
   token: getCookie('ctm_token'),
   sessions: new Map(),   // id -> { term, fitAddon, container }
   activeTab: null,       // session id or 'rules'
+  lastActiveWorkSessionId: null, // last non-Wall-E session used as repo context
   tabOrder: [],          // session ids in tab order
   reviewingSessionId: null,  // currently reviewed session
   sidebarCollapsed: false,
@@ -4491,7 +4729,7 @@ function connect() {
         (state._sessionsListDone || Promise.resolve()).then(() => onServerReady());
         break;
       case 'walle-error':
-        if (msg.error && (msg.error.includes('API key') || msg.error.includes('ANTHROPIC_API_KEY')))
+        if (!msg.providerError && msg.error && (msg.error.includes('API key') || msg.error.includes('ANTHROPIC_API_KEY')))
           msg.error = 'Wall-E needs an API key configured. Go to Settings to add one.';
         WalleSession.handleError(msg); break;
     }
@@ -4924,6 +5162,7 @@ function _clientDetectAgentType(cmd) {
 
 const CLIENT_AGENT_CAPABILITIES = {
   claude: { structuredTranscript: true, promptNavigation: 'transcript', review: true, resume: true },
+  '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 },
@@ -4935,6 +5174,7 @@ function _clientNormalizeAgentType(value) {
   const v = String(value).toLowerCase().replace(/_/g, '-');
   if (CLIENT_AGENT_CAPABILITIES[v]) return v;
   if (v === 'claude-code') return 'claude';
+  if (v === 'claude-desktop-session' || v === 'desktop') return 'claude-desktop';
   if (v === 'gemini-cli') return 'gemini';
   return _clientDetectAgentType(v);
 }
@@ -4961,7 +5201,9 @@ function _stripAnsiForActivity(data) {
 
 const _CLAUDE_STATUS_FRAGMENT_RE = /^(?:[✻✳✢✶◐◓◑◒⏺●○■□✔✓]+|Run|Runn|Runni|Runnin|Running\.{0,3}|unning|Thinking\.{0,3}|\(?ctrl\+o\s*to\s*expand\)?|>?\s*esc\s+to\s+interrupt|[⏵>]+\s*(?:accept edits|auto mode)\s+on\s+\(shift\+tab\s+to\s+cycle\)(?:\s*·\s*esc\s+to\s+interrupt)?(?:\s*·\s*ctrl\+t\s+to\s+(?:show|hide)\s+task)?|ctrl\+t\s+to\s+show\s+tasks?|\?\s+for\s+shortcuts|Native installation exists but .*? is not in your PATH\. Run:|echo\s+['"]export\s+PATH=.*)$/i;
 const _CODEX_STATUS_FRAGMENT_RE = /^[\s\d•◦·∙●○WwOoRrKkIiNnGg]+$/u;
+const _CODEX_BUSY_STATUS_LINE_RE = /^(?:working(?:\s*\([^)]*\))?(?:\s*[•◦·∙●○]\s*esc\s+to\s+interrupt)?|(?:working\s*)?esc\s+to\s+interrupt)$/iu;
 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 _isClaudeRedraw(data) {
@@ -4982,6 +5224,7 @@ function _isCodexRedraw(data) {
 }
 
 function _hasCodexBusyStatusFragment(text) {
+  if (_CODEX_BUSY_HINT_RE.test(String(text || ''))) return true;
   const letters = String(text || '').toLowerCase().replace(/[^a-z]/g, '');
   if (letters.length < 3) return false;
   if (letters.includes(_CODEX_BUSY_WORD)) return true;
@@ -4996,8 +5239,8 @@ function _isClientCodexStatusOnlyOutput(session, data) {
   if (_clientAgentTypeForSession(session) !== 'codex') return false;
   const stripped = _stripAnsiForActivity(data).trim();
   return (
-    stripped.length <= 80 &&
-    _CODEX_STATUS_FRAGMENT_RE.test(stripped) &&
+    stripped.length <= 160 &&
+    (_CODEX_STATUS_FRAGMENT_RE.test(stripped) || _CODEX_BUSY_STATUS_LINE_RE.test(stripped)) &&
     _isCodexRedraw(data)
   );
 }
@@ -5022,8 +5265,8 @@ function _isClientActiveOutput(session, data) {
     return false;
   }
   if (agentType === 'codex' &&
-      stripped.length <= 80 &&
-      _CODEX_STATUS_FRAGMENT_RE.test(stripped) &&
+      stripped.length <= 160 &&
+      (_CODEX_STATUS_FRAGMENT_RE.test(stripped) || _CODEX_BUSY_STATUS_LINE_RE.test(stripped)) &&
       _isCodexRedraw(data)) {
     return _hasCodexBusyStatusFragment(stripped);
   }
@@ -5393,7 +5636,7 @@ function createTerminal(id, opts) {
             const size = s.term.options.fontSize;
             s.term.options.fontSize = size + 1;
             s.term.options.fontSize = size;
-            if (s.fitAddon) s.fitAddon.fit();
+            _fitTerminalPreservingViewport(s, id);
           }
         });
       });
@@ -5528,13 +5771,13 @@ function createTerminal(id, opts) {
           s.writer.queue = '';
           s.writer.scheduled = false;
           if (batch) chunkedWrite(s, batch, () => {
-            if (s.writer.followMode && !s.writer._userScrollLocked && s.term) s.term.scrollToBottom();
+            if (s.writer.followMode && !s.writer._userScrollLocked && s.term) _ensureScrolledToBottom(s);
           });
         });
       }
       // Skip scrollToBottom if the RAF batcher is already scheduled —
       // it will handle scrolling, and doing it here too competes for main thread.
-      if (!s.writer.scheduled) s.term.scrollToBottom();
+      if (!s.writer.scheduled) _ensureScrolledToBottom(s);
     }
   });
 
@@ -5551,11 +5794,11 @@ function createTerminal(id, opts) {
       requestAnimationFrame(() => {
         const s = state.sessions.get(id);
         if (s && s.term) {
-          s.fitAddon.fit();
           // Returning from alt screen — scroll to bottom and re-enable follow
           s.writer.followMode = true;
           s.writer._userScrollLocked = false;
-          s.term.scrollToBottom();
+          _fitTerminalPreservingViewport(s, id);
+          _ensureScrolledToBottom(s);
           // Re-focus after fit — fitAddon.fit() can cause textarea focus loss
           // during the alt→normal buffer transition, leaving input unresponsive.
           if (state.activeTab === id) focusTerminalIfSafe(id);
@@ -5591,8 +5834,9 @@ function createTerminal(id, opts) {
     // Scroll: handle locally instead of forwarding as mouse escape sequences
     screenEl.addEventListener('wheel', (e) => {
       const buf = term.buffer.active;
+      const current = state.sessions.get(id) || { _id: id, term, writer, container };
       const hasScrollback = buf.baseY > 0;
-      const atBottom = buf.viewportY >= buf.baseY;
+      const atBottom = _isAtTerminalFollowBottom(current);
       if (e.deltaY < 0 && hasScrollback) {
         // Scrolling UP — only lock follow mode if there's scrollback to scroll through.
         // Without this guard, scrolling up on a terminal with no scrollback (e.g., during
@@ -5609,7 +5853,7 @@ function createTerminal(id, opts) {
           term.scrollLines(Math.max(1, Math.round(Math.abs(e.deltaY) / 20)));
         }
         // Check if user scrolled back to bottom — unlock follow mode
-        if (buf.viewportY >= buf.baseY && writer._userScrollLocked) {
+        if (_isAtTerminalFollowBottom(current) && writer._userScrollLocked) {
           writer.followMode = true;
           writer._userScrollLocked = false;
         }
@@ -5623,9 +5867,10 @@ function createTerminal(id, opts) {
   // both user and programmatic scrolls (fit reflow, scrollToLine, etc.).
   // Unlock only happens via the wheel handler (real user scroll to bottom).
   term.onScroll(() => {
+    if (writer._programmaticScrollDepth) return;
     if (writer._userScrollLocked) return; // locked — only wheel can unlock
-    const buf = term.buffer.active;
-    writer.followMode = buf.viewportY >= buf.baseY;
+    const current = state.sessions.get(id) || { _id: id, term, writer, container };
+    writer.followMode = _isAtTerminalFollowBottom(current);
   });
 
   state.sessions.set(id, { _id: id, term, fitAddon, searchAddon, container, needsFontRefresh: true, writer, promptLines: [], promptNavIdx: -1, _webglAddon, _loadWebgl });
@@ -6047,6 +6292,14 @@ function activateTab(id) {
 
   const specialPanels = ['rules', 'insights', 'permissions', 'prompts', 'codereview', 'walle', 'models', 'backups', 'worktrees', 'setup'];
   const isPanel = specialPanels.includes(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;
+  }
+  if (!isPanel && state.sessions.has(id)) {
+    const next = state.sessions.get(id);
+    if (next && next.meta?.type !== 'walle') state.lastActiveWorkSessionId = id;
+  }
 
   // Phase 2B: dispose the PREVIOUS session's xterm.js terminal to free memory.
   // Only one xterm.js instance should exist at a time (tmux-style). The headless
@@ -6244,6 +6497,7 @@ function activateTab(id) {
         const savedQueue = s.writer.queue; // preserve output buffered while stub
         // Preserve status state — createTerminal replaces the session object entirely
         const savedWaiting = s._waitingForInput;
+        const savedWaitingAt = s._waitingForInputAt;
         const savedLastOut = s._lastOutputAt;
         const savedLastIn = s._lastInputAt;
         const savedAuthoritativeSource = s._authoritativeSource;
@@ -6262,6 +6516,7 @@ function activateTab(id) {
           s2.meta = savedMeta;
           s2.writer.queue = savedQueue; // restore buffered output for flush
           s2._waitingForInput = savedWaiting;
+          s2._waitingForInputAt = savedWaitingAt;
           s2._lastOutputAt = savedLastOut;
           s2._lastInputAt = savedLastIn;
           s2._authoritativeSource = savedAuthoritativeSource;
@@ -7583,6 +7838,37 @@ function _buildSparklineSVG(data) {
   return '<svg width="' + w + '" height="' + ht + '" viewBox="0 0 ' + w + ' ' + ht + '" style="vertical-align:middle;"><polyline points="' + points + '" fill="none" stroke="#7aa2f7" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/></svg>';
 }
 
+function _benchScoreValue(b) {
+  var v = b && b.trusted_avg_score != null ? b.trusted_avg_score : b && b.avg_score;
+  v = Number(v);
+  return isFinite(v) ? v : null;
+}
+function _benchTrustStatus(b) {
+  if (b && b.trust_status) return String(b.trust_status);
+  var trusted = Number((b && b.trusted_evals) || 0);
+  var minTrusted = Number((b && b.min_trusted_evals) || 10);
+  if (trusted >= minTrusted) return 'trusted';
+  return trusted > 0 ? 'provisional' : 'legacy';
+}
+function _benchTrustColor(status) {
+  if (status === 'trusted') return '#9ece6a';
+  if (status === 'provisional') return '#e0af68';
+  return '#f7768e';
+}
+function _benchCiLabel(b) {
+  var low = b && b.trusted_score_confidence_low != null ? b.trusted_score_confidence_low : b && b.score_confidence_low;
+  var high = b && b.trusted_score_confidence_high != null ? b.trusted_score_confidence_high : b && b.score_confidence_high;
+  low = Number(low);
+  high = Number(high);
+  if (!isFinite(low) || !isFinite(high)) return '-';
+  return low.toFixed(2) + '-' + high.toFixed(2);
+}
+function _benchMetaValue(v) {
+  if (Array.isArray(v)) return v.length ? v.join(', ') : '-';
+  if (v == null || v === '') return '-';
+  return String(v);
+}
+
 function renderScorecardDashboard(scorecard, models, benchmarks, benchmarkCoverage) {
   var el = document.getElementById('models-scorecard-dashboard');
   var filtered = scorecard.filter(function(m) { return m.stats && m.stats.total_evals > 0; });
@@ -7630,12 +7916,25 @@ function renderScorecardDashboard(scorecard, models, benchmarks, benchmarkCovera
     if (coverageBits.length) {
       h += '<div style="margin:-2px 0 8px 0;color:var(--fg-dim,#565f89);font-size:11px;">' + escHtml(coverageBits.join(' | ')) + '</div>';
     }
+    var trustedGroups = 0, provisionalGroups = 0, legacyGroups = 0;
+    benchmarks.forEach(function(b) {
+      var status = _benchTrustStatus(b);
+      if (status === 'trusted') trustedGroups++;
+      else if (status === 'provisional') provisionalGroups++;
+      else legacyGroups++;
+    });
+    h += '<div style="margin:-2px 0 8px 0;color:var(--fg-dim,#565f89);font-size:11px;">Trust coverage: ' +
+      '<span style="color:#9ece6a;">' + trustedGroups + ' trusted</span>, ' +
+      '<span style="color:#e0af68;">' + provisionalGroups + ' provisional</span>, ' +
+      '<span style="color:#f7768e;">' + legacyGroups + ' legacy</span> model groups</div>';
 
     // Comparison table
     h += '<div style="overflow-x:auto;margin-bottom:14px;"><table style="width:100%;border-collapse:collapse;font-size:12px;">' +
       '<thead><tr style="background:var(--bg-card,#24283b);color:var(--fg-dim,#565f89);text-align:left;">' +
       '<th style="padding:8px 14px;font-weight:500;">Model</th>' +
       '<th style="padding:8px;font-weight:500;">Composite</th>' +
+      '<th style="padding:8px;font-weight:500;">Trust</th>' +
+      '<th style="padding:8px;font-weight:500;">CI</th>' +
       '<th style="padding:8px;font-weight:500;">Code Gen</th>' +
       '<th style="padding:8px;font-weight:500;">Tool Use</th>' +
       '<th style="padding:8px;font-weight:500;">Planning</th>' +
@@ -7646,10 +7945,17 @@ function renderScorecardDashboard(scorecard, models, benchmarks, benchmarkCovera
       '</tr></thead><tbody>';
 
     benchmarks.forEach(function(b, idx) {
-      var q = b.avg_score || 0;
-      var qColor = _qualityZoneColor(q);
+      var q = _benchScoreValue(b);
+      var qColor = _qualityZoneColor(q || 0);
       var provBadge = '<span style="font-size:9px;padding:1px 5px;border-radius:3px;background:' + (pColors[b.provider] || '#565f89') + '22;color:' + (pColors[b.provider] || '#565f89') + ';margin-left:6px;">' + escHtml(b.provider) + '</span>';
       var rankBadge = idx === 0 ? '<span style="font-size:9px;padding:1px 5px;border-radius:3px;background:#9ece6a22;color:#9ece6a;margin-left:4px;">#1</span>' : '';
+      var trustStatus = _benchTrustStatus(b);
+      var trustColor = _benchTrustColor(trustStatus);
+      var trustedEvals = Number(b.trusted_evals || 0);
+      var minTrusted = Number(b.min_trusted_evals || 10);
+      var trustBadge = '<span style="font-size:9px;padding:1px 5px;border-radius:3px;background:' + trustColor + '22;color:' + trustColor + ';font-weight:600;">' + escHtml(trustStatus.toUpperCase()) + '</span>';
+      var trustDetail = trustedEvals + '/' + minTrusted + ' trusted';
+      var ciLabel = _benchCiLabel(b);
 
       var successfulEvals = b.successful_evals != null ? b.successful_evals : b.total_evals;
       var errorCount = b.errors || 0;
@@ -7658,7 +7964,9 @@ function renderScorecardDashboard(scorecard, models, benchmarks, benchmarkCovera
 
       h += '<tr data-bench-idx="' + idx + '" style="border-top:1px solid var(--border,#292e42);cursor:pointer;">' +
         '<td style="padding:6px 14px;color:var(--fg,#c0caf5);font-weight:500;">' + escHtml(b.model) + provBadge + rankBadge + '</td>' +
-        '<td style="padding:6px 8px;color:' + qColor + ';font-weight:600;">' + (successfulEvals ? q.toFixed(3) : '-') + '</td>';
+        '<td style="padding:6px 8px;color:' + qColor + ';font-weight:600;">' + (successfulEvals && q != null ? q.toFixed(3) : '-') + '</td>' +
+        '<td style="padding:6px 8px;">' + trustBadge + '<div style="font-size:9px;color:var(--fg-dim,#565f89);margin-top:2px;">' + escHtml(trustDetail) + '</div></td>' +
+        '<td style="padding:6px 8px;color:var(--fg-dim,#565f89);font-variant-numeric:tabular-nums;">' + escHtml(ciLabel) + '</td>';
 
       // Category scores with inline bars
       ['codeGen', 'toolUse', 'planning', 'efficiency'].forEach(function(cat) {
@@ -7680,7 +7988,7 @@ function renderScorecardDashboard(scorecard, models, benchmarks, benchmarkCovera
       '</tr>';
 
       // Expandable detail row with radar + all 11 dimensions
-      h += '<tr data-bench-detail="' + idx + '" style="display:none;"><td colspan="9" style="padding:0;background:var(--bg,#1a1b26);"></td></tr>';
+      h += '<tr data-bench-detail="' + idx + '" style="display:none;"><td colspan="11" style="padding:0;background:var(--bg,#1a1b26);"></td></tr>';
     });
     h += '</tbody></table></div>';
 
@@ -7759,7 +8067,41 @@ function renderScorecardDashboard(scorecard, models, benchmarks, benchmarkCovera
         detailRow.style.display = '';
         var td = detailRow.querySelector('td');
         var b = benchmarks[idx];
-        if (!b || !b.dimensions) { td.textContent = 'No dimension data.'; return; }
+        if (!b) { td.textContent = 'No benchmark data.'; return; }
+
+        var detailScore = _benchScoreValue(b);
+        var detailTrust = _benchTrustStatus(b);
+        var detailTrustColor = _benchTrustColor(detailTrust);
+        var metaItems = [
+          ['Score Source', b.trusted_avg_score != null ? 'trusted mean' : 'successful mean'],
+          ['Composite', detailScore != null ? detailScore.toFixed(3) : '-'],
+          ['Trust', detailTrust + ' (' + Number(b.trusted_evals || 0) + '/' + Number(b.min_trusted_evals || 10) + ')'],
+          ['95% CI', _benchCiLabel(b)],
+          ['Samples', Number(b.sample_count || 0) + ' unique / ' + Number(b.total_evals || 0) + ' rows'],
+          ['Datasets', _benchMetaValue(b.dataset_versions)],
+          ['Scorers', _benchMetaValue(b.scorer_versions)],
+          ['Methods', _benchMetaValue(b.scoring_methods)],
+          ['Evaluators', _benchMetaValue(b.evaluator_versions)],
+          ['Artifacts', String(b.artifact_count || 0)],
+          ['Last Eval', _benchMetaValue(b.last_eval_at)]
+        ];
+        var metaHtml = '<div style="display:grid;grid-template-columns:repeat(auto-fit,minmax(150px,1fr));gap:8px;margin-bottom:14px;">';
+        metaItems.forEach(function(item) {
+          var color = item[0] === 'Trust' ? detailTrustColor : 'var(--fg,#c0caf5)';
+          metaHtml += '<div style="min-width:0;border-top:1px solid var(--border,#292e42);padding-top:6px;">' +
+            '<div style="font-size:9px;color:var(--fg-dim,#565f89);text-transform:uppercase;">' + escHtml(item[0]) + '</div>' +
+            '<div style="font-size:11px;color:' + color + ';overflow:hidden;text-overflow:ellipsis;white-space:nowrap;" title="' + escHtml(item[1]) + '">' + escHtml(item[1]) + '</div>' +
+          '</div>';
+        });
+        metaHtml += '</div>';
+
+        if (!b.dimensions) {
+          var noDimsHtml = '<div style="padding:14px;">' + metaHtml +
+            '<div style="font-size:11px;color:var(--fg-dim,#565f89);">No dimension data for this benchmark group.</div>' +
+          '</div>';
+          td.innerHTML = DOMPurify.sanitize(noDimsHtml, { ADD_TAGS: svgTags, ADD_ATTR: svgAttrs });
+          return;
+        }
 
         var dimNames = ['correctness', 'codeQuality', 'diffAccuracy', 'partialProgress', 'toolEfficiency', 'contextManagement', 'errorHandling', 'planQuality', 'turnEconomy', 'iterativeRefinement', 'costEfficiency'];
         var dimLabels = ['Correct', 'Code Qual', 'Diff Acc', 'Partial', 'Tool Eff', 'Ctx Mgmt', 'Err Hand', 'Plan Qual', 'Turn Econ', 'Iter Refine', 'Cost Eff'];
@@ -7821,9 +8163,12 @@ function renderScorecardDashboard(scorecard, models, benchmarks, benchmarkCovera
         });
         barsHtml += '</div>';
 
-        var detailHtml = '<div style="padding:14px;display:flex;gap:20px;align-items:flex-start;flex-wrap:wrap;">' +
+        var detailHtml = '<div style="padding:14px;">' +
+          metaHtml +
+          '<div style="display:flex;gap:20px;align-items:flex-start;flex-wrap:wrap;">' +
           '<div>' + radarSvg + '</div>' +
           '<div style="flex:1;min-width:200px;">' + barsHtml + '</div>' +
+          '</div>' +
         '</div>';
 
         td.innerHTML = DOMPurify.sanitize(detailHtml, { ADD_TAGS: svgTags, ADD_ATTR: svgAttrs });
@@ -8990,6 +9335,9 @@ function _restoreBackup(type, name) {
 var _wtCache = { repoRoot: '', items: [], counts: {} };
 var _wtModalState = { branch: '', name: '', mode: null, cwd: '' };
 var _wtCurrentFilter = 'all';
+var _wtLoadSeq = 0;
+var _wtRefreshSeq = 0;
+var _wtLastActionNotice = null;
 var _wtSanitize = function(s) {
   return String(s || '').trim().replace(/[^a-zA-Z0-9_-]/g, '-').replace(/-+/g, '-').replace(/^-|-$/g, '');
 };
@@ -9070,7 +9418,7 @@ function _wtRunRecommendedAction(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 === 'finish_work') return openMergeModal(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') {
     toast(action.reason || 'Review local main in a terminal before worktree operations.', { type: 'warning', title: 'Main needs attention' });
@@ -9116,14 +9464,56 @@ function _wtSyncAllEligible(wts) {
   });
 }
 
-async function loadWorktreesPanel() {
+function _wtWorktreesListUrl(token) {
+  var params = new URLSearchParams();
+  params.set('token', token || '');
+  params.set('_wt_refresh', String(Date.now()) + '-' + (++_wtRefreshSeq));
+  return '/api/worktrees?' + params.toString();
+}
+
+function _wtSkippedReasonSummary(skippedBranches) {
+  var counts = {};
+  var rows = Array.isArray(skippedBranches) ? skippedBranches : [];
+  rows.forEach(function(row) {
+    var reason = row && row.reason ? String(row.reason) : 'skipped';
+    counts[reason] = (counts[reason] || 0) + 1;
+  });
+  return Object.keys(counts).map(function(reason) {
+    return counts[reason] + ' ' + reason;
+  }).join(', ');
+}
+
+function _wtBuildSyncAllNotice(d) {
+  var failed = d.failed || 0;
+  var skipped = d.skipped || 0;
+  var synced = d.synced || 0;
+  var msg = 'Sync all finished: ' + synced + ' synced';
+  if (failed) msg += ', ' + failed + ' failed';
+  if (skipped) {
+    var reasons = _wtSkippedReasonSummary(d.skippedBranches || []);
+    msg += ', ' + skipped + ' skipped';
+    if (reasons) msg += ' (' + reasons + ')';
+    msg += '. Skipped worktrees can still show behind until active sessions are closed and dirty files are committed or stashed';
+  }
+  return {
+    tone: failed ? 'warning' : (skipped ? 'warning' : 'success'),
+    title: 'Worktrees refreshed',
+    message: msg + '.',
+  };
+}
+
+async function loadWorktreesPanel(opts) {
+  opts = opts || {};
   var body = document.getElementById('worktrees-body');
   if (!body) return;
-  body.textContent = 'Loading…';
+  var requestId = ++_wtLoadSeq;
+  if (!opts.silent) body.textContent = 'Loading…';
   try {
     var token = (state && state.token) ? state.token : '';
-    var r = await fetch('/api/worktrees?token=' + encodeURIComponent(token));
+    var r = await fetch(_wtWorktreesListUrl(token), { cache: 'no-store' });
+    if (!r.ok) throw new Error('HTTP ' + r.status);
     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 };
 
@@ -9136,18 +9526,36 @@ async function loadWorktreesPanel() {
       syncAllBtn.textContent = '↓ Sync all' + (syncTargets.length > 0 ? ' (' + syncTargets.length + ')' : '');
       syncAllBtn.disabled = false;
       syncAllBtn.title = syncTargets.length > 0
-        ? 'Sync ' + syncTargets.length + ' clean branch(es) that are behind main'
-        : 'No clean branches are behind main';
+        ? 'Sync ' + syncTargets.length + ' clean inactive branch(es) that are behind main'
+        : 'No clean inactive branches are behind main';
     }
 
     _wtRenderFilterChips(d.counts || {}, wts);
     _wtRenderBody(body, wts);
     _wtUpdateNavBadge(d.counts || {});
   } catch (e) {
+    if (requestId !== _wtLoadSeq) return;
     body.textContent = 'Failed to load worktrees: ' + e.message;
   }
 }
 
+function _wtRenderActionNotice(frag) {
+  var notice = _wtLastActionNotice;
+  if (!notice || !notice.message) return;
+  var color = notice.tone === 'success' ? '#9ece6a' : notice.tone === 'warning' ? '#e0af68' : '#7aa2f7';
+  var bg = notice.tone === 'success' ? 'rgba(158,206,106,0.08)' : notice.tone === 'warning' ? 'rgba(224,175,104,0.08)' : 'rgba(122,162,247,0.08)';
+  var wrap = document.createElement('div');
+  wrap.style.cssText = 'border:1px solid var(--border);border-left:3px solid ' + color + ';border-radius:8px;background:' + bg + ';padding:10px 12px;margin-bottom:12px;font-size:12px;color:var(--fg,#c0caf5);line-height:1.45;';
+  var title = document.createElement('div');
+  title.style.cssText = 'font-weight:600;margin-bottom:2px;color:' + color + ';';
+  title.textContent = notice.title || 'Worktree action';
+  var msg = document.createElement('div');
+  msg.style.cssText = 'color:var(--fg-dim,#a9b1d6);';
+  msg.textContent = notice.message;
+  wrap.append(title, msg);
+  frag.appendChild(wrap);
+}
+
 function _wtRenderBody(body, wts) {
   if (wts.length === 0) {
     _wtClearChildren(body);
@@ -9158,6 +9566,7 @@ function _wtRenderBody(body, wts) {
     return;
   }
   var frag = document.createDocumentFragment();
+  _wtRenderActionNotice(frag);
   _wtRenderSummary(frag, wts, _wtCache.counts || {});
   var visible = 0;
   for (var wt of wts) {
@@ -9282,7 +9691,7 @@ function _wtRenderCard(frag, wt) {
   if (wt.state === 'ahead') {
     pill.style.cursor = 'pointer';
     pill.title = 'Click to merge into main';
-    pill.onclick = function() { openMergeModal(wt); };
+    pill.onclick = function() { _wtOpenMergeOrExplain(wt); };
   } else if (wt.state === 'behind' || wt.state === 'diverged') {
     pill.style.cursor = 'pointer';
     pill.title = 'Click to sync from main';
@@ -9382,12 +9791,15 @@ function _wtRenderCard(frag, wt) {
         mergeBtn.className = 'btn';
         mergeBtn.style.cssText = 'font-size:11px;padding:4px 10px;background:rgba(74,222,128,0.12);color:#4ade80;border:1px solid rgba(74,222,128,0.3);';
         mergeBtn.textContent = 'Merge';
-        mergeBtn.disabled = !!wt.sessionId || wt.unmergedCommits === 0 || wt.dirtyFiles > 0 || wt.behind > 0;
-        if (wt.sessionId) mergeBtn.title = 'Close the active session before merging';
-        else if (wt.dirtyFiles > 0) mergeBtn.title = 'Commit or stash dirty files before merging';
-        else if (wt.behind > 0) mergeBtn.title = 'Sync from main before merging';
-        else if (wt.unmergedCommits === 0) mergeBtn.title = 'Nothing to merge — already integrated with main';
-        mergeBtn.onclick = function() { openMergeModal(wt); };
+        var mergeBlockReason = _wtMergeBlockReason(wt);
+        if (mergeBlockReason) {
+          mergeBtn.setAttribute('aria-disabled', 'true');
+          mergeBtn.title = mergeBlockReason;
+        } else {
+          mergeBtn.removeAttribute('aria-disabled');
+          mergeBtn.title = 'Merge this branch into main';
+        }
+        mergeBtn.onclick = function() { _wtOpenMergeOrExplain(wt); };
         actions.appendChild(mergeBtn);
       }
 
@@ -9482,6 +9894,7 @@ async function submitSyncWorktree() {
     }
     if (!r.ok || d.error) throw new Error(d.error || ('HTTP ' + r.status));
     closeModal('wt-sync-modal');
+    _wtLastActionNotice = { tone: 'success', title: 'Worktrees refreshed', message: 'Synced ' + st.branch + ' from main.' };
     toast('Synced ' + st.branch + ' from main', { type: 'success' });
     await loadWorktreesPanel();
   } catch (e) {
@@ -9494,10 +9907,10 @@ async function submitSyncWorktree() {
 async function submitSyncAllWorktrees() {
   var targets = _wtSyncAllEligible((_wtCache && _wtCache.items) || []);
   if (targets.length === 0) {
-    toast('No clean branches are behind main', { type: 'info' });
+    toast('No clean inactive branches are behind main', { type: 'info' });
     return;
   }
-  if (!confirm('Sync ' + targets.length + ' clean branch(es) from main? Dirty, detached, and ghost worktrees will be skipped.')) return;
+  if (!confirm('Sync ' + targets.length + ' clean branch(es) from main? Dirty, active-session, detached, and ghost worktrees will be skipped.')) return;
   var btn = document.getElementById('wt-sync-all-btn');
   if (btn) { btn.disabled = true; btn.textContent = 'Syncing all…'; }
   try {
@@ -9517,6 +9930,11 @@ async function submitSyncAllWorktrees() {
     var msg = 'Synced ' + synced + ' branch(es)';
     if (failed) msg += ', ' + failed + ' failed';
     if (skipped) msg += ', ' + skipped + ' skipped';
+    if (skipped && d.skippedBranches) {
+      var reasons = _wtSkippedReasonSummary(d.skippedBranches);
+      if (reasons) msg += ' (' + reasons + ')';
+    }
+    _wtLastActionNotice = _wtBuildSyncAllNotice(d);
     toast(msg, { type: failed ? 'warning' : 'success', duration: failed ? 10000 : 5000 });
     await loadWorktreesPanel();
   } catch (e) {
@@ -9783,7 +10201,7 @@ async function wtFinishAction(action) {
   }
 
   closeModal('wt-finish-modal');
-  if (action === 'merge') return openMergeModal(resolved);
+  if (action === 'merge') return _wtOpenMergeOrExplain(resolved);
   if (action === 'pr') return openCreatePRModal(resolved);
   if (action === 'delete') return openDeleteModal(resolved);
 }
@@ -9855,7 +10273,31 @@ async function submitCreateWorktree() {
 }
 
 // ── Merge modal ─────────────────────────────────────────────────────
+function _wtMergeBlockReason(wt) {
+  wt = wt || {};
+  if (!wt.branch || wt.branch === 'HEAD') return 'Recover this worktree onto a branch before merging.';
+  if (wt.sessionId) return 'Close the active session before merging: ' + (wt.sessionLabel || wt.branch) + '.';
+  if ((wt.dirtyFiles || 0) > 0) return 'Commit or stash dirty files before merging.';
+  if ((wt.behind || 0) > 0) return 'Sync from main before merging.';
+  if ((wt.unmergedCommits || 0) === 0 && (wt.ahead || 0) === 0) return 'Nothing to merge — this branch is already integrated with main.';
+  return '';
+}
+
+function _wtOpenMergeOrExplain(wt) {
+  var reason = _wtMergeBlockReason(wt);
+  if (reason) {
+    toast(reason, { type: 'warning', title: 'Merge unavailable', duration: 7000 });
+    return;
+  }
+  openMergeModal(wt);
+}
+
 function openMergeModal(wt) {
+  var blockReason = _wtMergeBlockReason(wt);
+  if (blockReason) {
+    toast(blockReason, { type: 'warning', title: 'Merge unavailable', duration: 7000 });
+    return;
+  }
   _wtModalState = { branch: wt.branch, name: wt.branch, worktreeName: wt.worktreeName || '', mode: 'merge', cwd: _wtCache.repoRoot || '' };
   var sum = document.getElementById('wt-merge-summary');
   if (sum) sum.textContent = 'Merge "' + wt.branch + '" into main.';
@@ -10071,8 +10513,7 @@ function onCreated(msg) {
 
   requestAnimationFrame(() => {
     const s = state.sessions.get(id);
-    s.fitAddon.fit();
-    send({ type: 'resize', id, cols: term.cols, rows: term.rows });
+    _fitTerminalPreservingViewport(s, id, { sendResize: true });
   });
 
   // Notify the prompt editor so it can send pending prompts
@@ -10211,7 +10652,7 @@ function chunkedWrite(s, data, onDone) {
           s.writer.scheduled = false;
           if (!next) return;
           chunkedWrite(s, next, () => {
-            if (f && !s.writer._userScrollLocked) s.term.scrollToBottom();
+            if (f && !s.writer._userScrollLocked) _ensureScrolledToBottom(s);
           });
         });
       }
@@ -10245,7 +10686,7 @@ function onOutput(msg) {
       && (data.length <= 10 || _visibleEchoChars(data).length <= 64)) {
     s.term.write(data);
     s._lastOutputAt = Date.now(); // keystroke echoes are always real activity
-    if (s.writer.followMode && !s.writer._userScrollLocked) s.term.scrollToBottom();
+    if (s.writer.followMode && !s.writer._userScrollLocked) _ensureScrolledToBottom(s);
     return;
   }
 
@@ -10289,7 +10730,7 @@ function onOutput(msg) {
       s.writer.scheduled = false;
       if (follow) {
         chunkedWrite(s, batch, () => {
-          if (follow && !s.writer._userScrollLocked) s.term.scrollToBottom();
+          if (follow && !s.writer._userScrollLocked) _ensureScrolledToBottom(s);
         });
       } else {
         // Not following — write without moving viewport
@@ -10309,28 +10750,12 @@ function onOutput(msg) {
           try {
             const dims = s.fitAddon.proposeDimensions();
             if (dims && (dims.cols !== s.term.cols || dims.rows !== s.term.rows)) {
-              const buf = s.term.buffer.active;
-              const wasAtBottom = buf.viewportY >= buf.baseY;
-              const oldCols = s.term.cols;
-              const savedLine2 = buf.viewportY;
-              const savedAnchor = wasAtBottom ? null : _getScrollAnchor(s.term);
-              const savedFollow2 = s.writer.followMode;
-              s.fitAddon.fit();
-              s.writer.followMode = savedFollow2;
-              send({ type: 'resize', id: sid, cols: s.term.cols, rows: s.term.rows });
-              if (wasAtBottom) {
-                s.term.scrollToBottom();
-              } else if (s.term.cols !== oldCols) {
-                _restoreScrollAnchor(s.term, savedAnchor);
-                s._promptLinesResolved = false;
-              } else {
-                s.term.scrollToLine(savedLine2);
-              }
+              _fitTerminalPreservingViewport(s, sid, { sendResize: true });
               return;
             }
           } catch (_) { /* proposeDimensions may fail if container hidden */ }
           if (s.writer.followMode) {
-            s.term.scrollToBottom();
+            _ensureScrolledToBottom(s);
           }
         }
       }, 1500);
@@ -10341,11 +10766,7 @@ function onOutput(msg) {
         if (banner) {
           banner.remove();
           s._bannerCleared = true;
-          const ln = s.term.buffer.active.viewportY;
-          const ab = s.writer.followMode;
-          s.fitAddon.fit();
-          s.writer.followMode = ab; // restore after fit reflow
-          if (!ab) s.term.scrollToLine(ln);
+          _fitTerminalPreservingViewport(s, sid);
         } else {
           s._bannerCleared = true; // no banner exists, skip future checks
         }
@@ -10366,8 +10787,7 @@ setInterval(() => {
   if (!id) return;
   const s = state.sessions.get(id);
   if (!s || !s.term) return;
-  const buf = s.term.buffer.active;
-  const atBottom = buf.baseY > 0 && buf.viewportY >= buf.baseY;
+  const atBottom = _isAtTerminalFollowBottom(s);
 
   // Fix 1: followMode is false but viewport IS at bottom — unlock
   if (!s.writer.followMode && atBottom && !s.writer._chunking) {
@@ -10390,31 +10810,177 @@ setInterval(() => {
       s.writer.queue = '';
       s.writer.scheduled = false;
       if (batch) chunkedWrite(s, batch, () => {
-        if (s.writer.followMode && !s.writer._userScrollLocked && s.term) s.term.scrollToBottom();
+        if (s.writer.followMode && !s.writer._userScrollLocked && s.term) _ensureScrolledToBottom(s);
       });
     });
   }
 }, 2000);
 
-// Ensure the terminal viewport is scrolled to the bottom — defensive helper
-// that syncs BOTH xterm's internal viewportY AND the .xterm-viewport DOM
-// scrollTop, across 2 animation frames. Handles edge cases where a tab-switch
-// container toggle (display:none → display:flex) desynchronizes the DOM scroll
-// from xterm's internal state.
+function _terminalFollowViewportTarget(s) {
+  if (!s || !s.term) return 0;
+  const buf = s.term.buffer.active;
+  const baseY = buf.baseY || 0;
+  const rows = s.term.rows || 0;
+  if (rows <= 0) return baseY;
+
+  const agentType = _clientAgentTypeForSession(s);
+  if (agentType !== 'codex') return baseY;
+
+  // Codex restores often carry a screen drawn at the previous PTY height. When
+  // CTM opens a taller browser viewport, xterm appends blank screen rows below
+  // the live prompt. Literal scrollToBottom then anchors those blanks, making
+  // the input look stuck halfway up the terminal. Anchor the last meaningful
+  // screen row at the viewport bottom when the blank tail is large.
+  const screenStart = baseY;
+  const screenEnd = baseY + rows - 1;
+  let lastMeaningful = -1;
+  for (let row = screenEnd; row >= screenStart; row--) {
+    const line = buf.getLine(row);
+    if (line && line.translateToString(true).trim()) {
+      lastMeaningful = row;
+      break;
+    }
+  }
+  if (lastMeaningful < 0) return baseY;
+  const cursorAbs = baseY + (buf.cursorY || 0);
+  const anchor = Math.max(lastMeaningful, cursorAbs);
+  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));
+}
+
+function _withProgrammaticTerminalScroll(s, fn) {
+  if (!s || !s.writer) {
+    try { fn(); } catch {}
+    return;
+  }
+  s.writer._programmaticScrollDepth = (s.writer._programmaticScrollDepth || 0) + 1;
+  try { fn(); } catch {}
+  requestAnimationFrame(() => requestAnimationFrame(() => {
+    if (!s.writer) return;
+    s.writer._programmaticScrollDepth = Math.max(0, (s.writer._programmaticScrollDepth || 1) - 1);
+  }));
+}
+
+function _scrollTerminalToFollowBottom(s) {
+  if (!s || !s.term) return;
+  const target = _terminalFollowViewportTarget(s);
+  _withProgrammaticTerminalScroll(s, () => {
+    s.term.scrollToLine(target);
+    const buf = s.term.buffer.active;
+    const vp = s.container ? s.container.querySelector('.xterm-viewport') : null;
+    if (vp && target >= buf.baseY) {
+      try { vp.scrollTop = vp.scrollHeight; } catch {}
+    }
+  });
+}
+
+function _isAtTerminalFollowBottom(s) {
+  if (!s || !s.term) return false;
+  const target = _terminalFollowViewportTarget(s);
+  const buf = s.term.buffer.active;
+  const viewportY = buf.viewportY || 0;
+  const baseY = buf.baseY || 0;
+  return Math.abs(viewportY - target) <= 1 || Math.abs(viewportY - baseY) <= 1;
+}
+
+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;
+  if (rows < 20 || Math.abs((buf.viewportY || 0) - baseY) > 1) return null;
+
+  const meaningful = [];
+  let promptAbs = -1;
+  let hasCompletedTurnOutputAfterPrompt = 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()) meaningful.push(abs);
+  }
+  if (promptAbs < 0 || meaningful.length < 2) 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;
+    break;
+  }
+  if (!hasCompletedTurnOutputAfterPrompt) return null;
+
+  let best = null;
+  for (let i = 1; i < meaningful.length; i++) {
+    const prev = meaningful[i - 1];
+    const next = meaningful[i];
+    if (next > promptAbs) break;
+    const gapRows = next - prev - 1;
+    if (!best || gapRows > best.gapRows) best = { startAbs: prev + 1, nextAbs: next, gapRows };
+  }
+  const threshold = Math.max(8, Math.floor(rows * 0.18));
+  if (!best || best.gapRows < threshold) return null;
+  const keepRows = 2;
+  const deleteRows = best.gapRows - keepRows;
+  if (deleteRows <= 0) return null;
+  return { startAbs: best.startAbs, deleteRows };
+}
+
+function _compactCodexInternalBlankGap(s, onDone) {
+  if (!s || !s.term || s._codexBlankGapCompacting) return false;
+  const gap = _findCodexInternalBlankGap(s);
+  if (!gap) return false;
+  const buf = s.term.buffer.active;
+  const baseY = buf.baseY || 0;
+  const deleteScreenRow = Math.max(1, gap.startAbs - baseY + 1);
+  const cursorAbs = baseY + (buf.cursorY || 0);
+  const nextCursorAbs = cursorAbs >= gap.startAbs ? Math.max(baseY, cursorAbs - gap.deleteRows) : cursorAbs;
+  const nextCursorRow = Math.max(1, nextCursorAbs - baseY + 1);
+  const nextCursorCol = Math.max(1, (buf.cursorX || 0) + 1);
+  const seq = '\x1b[' + deleteScreenRow + ';1H\x1b[' + gap.deleteRows + 'M\x1b[' + nextCursorRow + ';' + nextCursorCol + 'H';
+
+  s._codexBlankGapCompacting = true;
+  if (s.writer) s.writer._programmaticScrollDepth = (s.writer._programmaticScrollDepth || 0) + 1;
+  let finished = false;
+  const finish = () => {
+    if (finished) return;
+    finished = true;
+    s._codexBlankGapCompacting = false;
+    requestAnimationFrame(() => requestAnimationFrame(() => {
+      if (s.writer) s.writer._programmaticScrollDepth = Math.max(0, (s.writer._programmaticScrollDepth || 1) - 1);
+    }));
+    if (onDone) onDone();
+  };
+  try {
+    s.term.write(seq, finish);
+    setTimeout(finish, 500);
+  } catch (_) {
+    finish();
+  }
+  return true;
+}
+
+// Ensure the terminal viewport is scrolled to the user's active bottom. For
+// 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.
 function _ensureScrolledToBottom(s) {
   if (!s || !s.term) return;
   if (s.writer && s.writer._userScrollLocked) return;
-  try { s.term.scrollToBottom(); } catch {}
-  const vp = s.container ? s.container.querySelector('.xterm-viewport') : null;
-  if (vp) { try { vp.scrollTop = vp.scrollHeight; } catch {} }
+  if (_compactCodexInternalBlankGap(s, () => _ensureScrolledToBottom(s))) return;
+  _scrollTerminalToFollowBottom(s);
   requestAnimationFrame(() => {
     if (!s.term) return;
     if (s.writer && s.writer._userScrollLocked) return;
-    try { s.term.scrollToBottom(); } catch {}
-    if (vp) { try { vp.scrollTop = vp.scrollHeight; } catch {} }
+    _scrollTerminalToFollowBottom(s);
   });
 }
 
@@ -10518,7 +11084,7 @@ function onSnapshot(msg) {
       s._autoReflowAttempted = true;
       send({ type: 'snapshot', id: msg.id, cols: s.term.cols, rows: s.term.rows });
     } else {
-      s.term.scrollToBottom();
+      _ensureScrolledToBottom(s);
     }
     return;
   }
@@ -10532,7 +11098,7 @@ function onSnapshot(msg) {
   try {
     const dims = s.fitAddon.proposeDimensions();
     if (dims && (dims.cols !== s.term.cols || dims.rows !== s.term.rows)) {
-      s.fitAddon.fit();
+      _fitTerminalPreservingViewport(s, id);
     }
   } catch {}
   // [DO-NOT-REMOVE] misformatted-output fix — fixes user-reported bug:
@@ -10589,7 +11155,6 @@ function onSnapshot(msg) {
   const snapshotDone = () => {
     s.writer.followMode = true;
     s.writer._userScrollLocked = false;
-    s.term.scrollToBottom();
     // Double-RAF the scroll — the browser may reset .xterm-viewport scrollTop to 0
     // when the container goes display:none → display:flex during tab switch.
     // xterm's internal viewportY is correct, but the DOM scrollTop can lag a frame
@@ -10897,6 +11462,29 @@ function tabOrderSortCmp(aEntry, bEntry) {
   return (ai === -1 ? 9999 : ai) - (bi === -1 ? 9999 : bi);
 }
 
+function worktreeAttentionBadge(s) {
+  const wt = s?.meta?.worktreeStatus;
+  if (!wt || !wt.needsAttention) return '';
+  const branch = wt.branch || s?.meta?.branch || '';
+  if (!branch || branch === 'main' || branch === 'master') return '';
+  const dirtyFiles = Number(wt.dirtyFiles || 0);
+  const unmergedCommits = Number(wt.unmergedCommits || 0);
+  if (dirtyFiles <= 0 && unmergedCommits <= 0) return '';
+
+  const parts = [];
+  const titleParts = [];
+  if (dirtyFiles > 0) {
+    parts.push(`<span class="wt-part" aria-hidden="true">&#9998;${dirtyFiles}</span>`);
+    titleParts.push(`${dirtyFiles} uncommitted file${dirtyFiles === 1 ? '' : 's'}`);
+  }
+  if (unmergedCommits > 0) {
+    parts.push(`<span class="wt-part" aria-hidden="true">&#8593;${unmergedCommits}</span>`);
+    titleParts.push(`${unmergedCommits} commit${unmergedCommits === 1 ? '' : 's'} not on main`);
+  }
+  const title = `${branch}: ${titleParts.join(', ')}`;
+  return `<span class="worktree-attn-badge" title="${escHtml(title)}" aria-label="${escHtml(title)}">${parts.join('')}</span>`;
+}
+
 let _renderSessionListTimer = null;
 function renderSessionList(force) {
   if (!force) {
@@ -10977,11 +11565,13 @@ function renderSessionList(force) {
     ).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>` : '';
-    return `${groupSep}<div class="session-group${isActive ? ' active' : ''}" data-session-id="${id}"><div class="session-item ${isActive ? 'active' : ''} ${isStale ? 'stale' : ''} ${sStatus.cls === 'running' ? 'running' : ''}" data-session-id="${id}" data-agent="${agentType}" onclick="sessionItemClick('${id}', event)" ondblclick="sessionItemDblClick('${id}', event)">
+    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>
       ${providerIconSvg(agentType, 14)}
       <span class="label">${escHtml(label)}</span>
       ${branchBadge}
+      ${worktreeBadge}
       ${statusTag}
       <span class="agent-badge ${agentType}">${agentLabel}</span>
       ${idleHint}
@@ -11047,6 +11637,13 @@ function getSessionStatus(s) {
     }
   }
 
+  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' };
 
   // Primary: SessionStream status (received via WS stream-status events).
@@ -11061,8 +11658,6 @@ function getSessionStatus(s) {
   // 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;
-  const serverWorking = s._serverWorkingAt && (now - s._serverWorkingAt) < 10000;
-  if (serverWorking) return { cls: 'running', text: 'Running' };
   if (s._waitingForInput && !recentOutput) return { cls: 'waiting', text: 'Waiting' };
   if (recentOutput) return { cls: 'running', text: 'Running' };
   const justSentInput = s._lastInputAt && (now - s._lastInputAt) < 3000;
@@ -11383,11 +11978,7 @@ function showCompactBannerIfStale(id, s) {
   s.container.prepend(banner);
   // Refit terminal since banner takes space — preserve scroll position
   requestAnimationFrame(() => {
-    const ln = s.term.buffer.active.viewportY;
-    const atBot = s.writer.followMode;
-    s.fitAddon.fit();
-    s.writer.followMode = atBot; // restore after fit reflow
-    if (!atBot) s.term.scrollToLine(ln);
+    _fitTerminalPreservingViewport(s, id);
   });
 }
 
@@ -11404,11 +11995,7 @@ function dismissCompactBanner(id) {
     if (banner) {
       banner.remove();
       requestAnimationFrame(() => {
-        const ln = s.term.buffer.active.viewportY;
-        const atBot = s.writer.followMode;
-        s.fitAddon.fit();
-        s.writer.followMode = atBot; // restore after fit reflow
-        if (!atBot) s.term.scrollToLine(ln);
+        _fitTerminalPreservingViewport(s, id);
       });
     }
   }
@@ -12140,20 +12727,7 @@ function toggleSidebar() {
     setTimeout(() => {
       const s = state.sessions.get(state.activeTab);
       if (!s) return;
-      const wasAtBottom = s.writer.followMode;
-      const savedLine = s.term.buffer.active.viewportY;
-      const oldCols = s.term.cols;
-      const savedAnchor = wasAtBottom ? null : _getScrollAnchor(s.term);
-      s.fitAddon.fit();
-      s.writer.followMode = wasAtBottom; // restore after fit reflow
-      if (!wasAtBottom) {
-        if (s.term.cols !== oldCols) {
-          _restoreScrollAnchor(s.term, savedAnchor);
-          s._promptLinesResolved = false;
-        } else {
-          s.term.scrollToLine(savedLine);
-        }
-      }
+      _fitTerminalPreservingViewport(s, state.activeTab);
     }, 100);
   }
 }
@@ -12606,8 +13180,7 @@ function renderPaneTree() {
         s.term.options.fontSize = sz;
         s._suppressResize = false;
       }
-      s.fitAddon.fit();
-      send({ type: 'resize', id: leaf.sessionId, cols: s.term.cols, rows: s.term.rows });
+      _fitTerminalPreservingViewport(s, leaf.sessionId, { sendResize: true });
     });
   });
 }
@@ -12714,11 +13287,51 @@ function fitAllVisibleTerminals() {
     if (!leaf.sessionId) return;
     var s = state.sessions.get(leaf.sessionId);
     if (!s || !s.fitAddon || !s.term) return;
-    s.fitAddon.fit();
-    send({ type: 'resize', id: leaf.sessionId, cols: s.term.cols, rows: s.term.rows });
+    _fitTerminalPreservingViewport(s, leaf.sessionId, { sendResize: true });
   });
 }
 
+function _isTerminalFollowingVisualBottom(s) {
+  if (!s || !s.term) return false;
+  if (s.writer && s.writer._userScrollLocked) return false;
+  return !!(s.writer && s.writer.followMode) || _isAtTerminalFollowBottom(s);
+}
+
+function _fitTerminalPreservingViewport(s, sessionId, opts) {
+  opts = opts || {};
+  if (!s || !s.term || !s.fitAddon) return;
+  const buf = s.term.buffer.active;
+  const wasFollowing = _isTerminalFollowingVisualBottom(s);
+  const savedLine = buf.viewportY;
+  const oldCols = s.term.cols;
+  const savedAnchor = wasFollowing ? null : _getScrollAnchor(s.term);
+  const savedFollow = s.writer ? !!s.writer.followMode : false;
+  const savedLocked = s.writer ? !!s.writer._userScrollLocked : false;
+
+  s.fitAddon.fit();
+
+  if (s.writer) {
+    s.writer.followMode = savedFollow;
+    s.writer._userScrollLocked = savedLocked;
+  }
+  if (opts.sendResize && sessionId) {
+    send({ type: 'resize', id: sessionId, cols: s.term.cols, rows: s.term.rows });
+  }
+
+  if (wasFollowing) {
+    if (s.writer) {
+      s.writer.followMode = true;
+      s.writer._userScrollLocked = false;
+    }
+    _ensureScrolledToBottom(s);
+  } else if (s.term.cols !== oldCols) {
+    _withProgrammaticTerminalScroll(s, () => _restoreScrollAnchor(s.term, savedAnchor));
+    s._promptLinesResolved = false;
+  } else {
+    _withProgrammaticTerminalScroll(s, () => s.term.scrollToLine(savedLine));
+  }
+}
+
 function saveSplitLayout() {
   // Save whichever layout is active (current or saved/suspended)
   var layout = state.splitRoot || state.savedSplitLayout;
@@ -12946,26 +13559,7 @@ function fitActiveTerminal() {
     if (state.activeTab && state.sessions.has(state.activeTab)) {
       const s = state.sessions.get(state.activeTab);
       if (!s.term || !s.fitAddon) return; // stub session — no terminal yet
-      const buf = s.term.buffer.active;
-      const wasAtBottom = buf.viewportY >= buf.baseY;
-      const savedLine = buf.viewportY;
-      const oldCols = s.term.cols;
-      const savedAnchor = wasAtBottom ? null : _getScrollAnchor(s.term);
-      const savedFollow = s.writer.followMode;
-      s.fitAddon.fit();
-      s.writer.followMode = savedFollow; // restore after fit reflow
-      send({ type: 'resize', id: state.activeTab, cols: s.term.cols, rows: s.term.rows });
-      if (wasAtBottom) {
-        s.term.scrollToBottom();
-      } else if (s.term.cols !== oldCols) {
-        // Cols changed — reflow shifted content, use anchor search
-        _restoreScrollAnchor(s.term, savedAnchor);
-        // Invalidate prompt line positions — reflow shifts them
-        s._promptLinesResolved = false;
-      } else {
-        // Same cols — just restore line position
-        s.term.scrollToLine(savedLine);
-      }
+      _fitTerminalPreservingViewport(s, state.activeTab, { sendResize: true });
     }
   });
 }
@@ -13050,8 +13644,7 @@ window.addEventListener('resize', updateTabOverflowBtn);
         const size = s.term.options.fontSize;
         s.term.options.fontSize = size + 1;
         s.term.options.fontSize = size;
-        if (s.fitAddon) s.fitAddon.fit();
-        send({ type: 'resize', id: sid, cols: s.term.cols, rows: s.term.rows });
+        _fitTerminalPreservingViewport(s, sid, { sendResize: true });
       }, 200);
     }
     // Re-watch with the new DPI value
@@ -13376,8 +13969,9 @@ async function loadRecentSessions() {
   populateModelFilter(allRecentSessions);
   renderFilteredSessions();
 
-  // Resolve pending hash session (deep link to session review)
-  if (state.pendingHashSession) {
+  // Resolve pending review hash sessions here. Active #session=<id> hashes are
+  // handled by onServerReady(), after live PTY sessions have been restored.
+  if (state.pendingHashSession && state.pendingHashType === 'review') {
     const s = allRecentSessions.find(x => x.sessionId === state.pendingHashSession)
       || allRecentSessions.find(x => x.provisionalId === state.pendingHashSession);
     if (s) {
@@ -14854,7 +15448,7 @@ 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', shell: 'Shell' };
+const AGENT_LABELS = { walle: 'Wall-E', codex: 'Codex', gemini: 'Gemini', claude: 'Claude Code', 'claude-desktop': 'Claude Desktop', shell: 'Shell' };
 function getAgentType(s) {
   if (!s) return 'shell';
   if (s.meta?.type === 'walle') return 'walle';
@@ -14870,6 +15464,7 @@ function providerIconSvg(agentType, sizePx) {
   // 16x16 viewBox, fill / stroke = currentColor.
   let inner;
   switch (agentType) {
+    case 'claude-desktop':
     case 'claude':
       // Anthropic / Claude brand mark (the asterisk-sparkle from claude.ai's
       // favicon). Original path is on a 248×248 grid; we keep that viewBox
@@ -15652,7 +16247,7 @@ function onSkillSessionCreated(msg) {
     const newWidth = Math.max(150, Math.min(600, e.clientX));
     sidebar.style.width = newWidth + 'px';
     if (state.activeTab && state.sessions.has(state.activeTab)) {
-      state.sessions.get(state.activeTab).fitAddon.fit();
+      _fitTerminalPreservingViewport(state.sessions.get(state.activeTab), state.activeTab);
     }
   });
 
@@ -17136,13 +17731,18 @@ function onDataChanged(msg) {
 // Track active title flash so it can be cancelled when input is sent
 let _titleFlashStop = null;
 
-// Clear waiting state for a session (tab indicator + title flash)
-function clearWaitingState(sessionId) {
+// Clear waiting state for a session (tab indicator + title flash).
+// markInput is only for actual user input paths; server-side resume signals
+// should not manufacture a "just sent input" running window.
+function clearWaitingState(sessionId, opts = {}) {
   const s = state.sessions.get(sessionId);
   if (!s) return;
   const wasWaiting = s._waitingForInput;
   s._waitingForInput = false;
-  s._lastInputAt = Date.now();
+  s._waitingForInputAt = 0;
+  const now = opts.timestamp || Date.now();
+  if (opts.markInput !== false) s._lastInputAt = now;
+  if (opts.markWorking) s._serverWorkingAt = now;
   // Only do DOM work if the session was actually in waiting state
   if (wasWaiting) {
     const tabs = document.querySelectorAll('#tabbar .tab');
@@ -17205,10 +17805,18 @@ function onSessionActivity(msg) {
     if (!s) continue;
     const oldBucket = activeActivityBucket(s);
     const oldStatus = getSessionStatus(s).cls;
-    if (serverState === 'thinking') s._serverWorkingAt = Date.now();
+    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();
+      if (s._waitingForInput && activityIsNewerThanWaiting) {
+        clearWaitingState(id, { markInput: false, markWorking: true });
+      }
+    }
     if (s.meta && ts) {
       const prev = SessionActivityUtils.parseTimeMs(s.meta.lastActivity);
-      const next = SessionActivityUtils.parseTimeMs(ts);
+      const next = serverTs;
       if (next && next > prev) s.meta.lastActivity = ts;
     }
     if (currentActiveSort === 'by_activity' && (oldBucket !== activeActivityBucket(s) || oldStatus !== getSessionStatus(s).cls)) {
@@ -17223,7 +17831,7 @@ function onSessionActivity(msg) {
 // cannot reliably distinguish TUI redraws from real output.
 function onSessionResumed(msg) {
   const s = state.sessions.get(msg.id);
-  if (s) s._waitingForInput = false;
+  if (s) clearWaitingState(msg.id, { markInput: false, markWorking: true, timestamp: msg.timestamp || Date.now() });
 }
 
 // Authoritative session state (hooks or OTEL). Wins over the regex fallback.
@@ -17236,7 +17844,7 @@ function onAuthoritativeStatus(msg) {
   s._authoritativeStatusAt = msg.timestamp || Date.now();
   // 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);
+  if (s._working && s._waitingForInput) clearWaitingState(msg.id, { markInput: false, markWorking: true, timestamp: s._authoritativeStatusAt });
   // Update sidebar dot class
   const item = document.querySelector('.session-item[data-session-id="' + CSS.escape(msg.id) + '"]');
   if (item) {
@@ -17324,7 +17932,10 @@ const _lastNotif = {};
 function onWaitingForInput(msg) {
   const sessionId = msg.id;
   const session = state.sessions.get(sessionId);
-  if (session) session._waitingForInput = true;
+  if (session) {
+    session._waitingForInput = true;
+    session._waitingForInputAt = msg.timestamp || Date.now();
+  }
   // 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)) {
@@ -17525,8 +18136,30 @@ window.addEventListener('message', (e) => {
 // --- Hash routing ---
 const NAV_TARGETS = ['sessions', 'prompts', 'rules', 'insights', 'permissions', 'codereview', 'walle', 'models', 'backups', 'worktrees', 'setup'];
 
-function handleHashRoute() {
+function _parseHashRoute() {
   const hash = location.hash.slice(1);
+  const parts = hash ? hash.split('&') : [];
+  const firstPart = parts[0] || '';
+  const isNav = NAV_TARGETS.includes(firstPart);
+  const params = {};
+  for (const part of (isNav ? parts.slice(1) : parts)) {
+    const eq = part.indexOf('=');
+    if (eq > 0) params[part.slice(0, eq)] = decodeURIComponent(part.slice(eq + 1));
+  }
+  return { hash, firstPart, isNav, params };
+}
+
+function captureInitialSessionHashIntent() {
+  const route = _parseHashRoute();
+  if (route.params.session) {
+    state.pendingHashSession = route.params.session;
+    state.pendingHashType = 'active';
+  }
+}
+
+function handleHashRoute() {
+  const route = _parseHashRoute();
+  const hash = route.hash;
 
   // No hash — fall back to saved nav pref from DB
   if (!hash) {
@@ -17545,16 +18178,9 @@ function handleHashRoute() {
   }
 
   // Parse: first segment may be a nav target, rest are key=value params
-  const parts = hash.split('&');
-  const firstPart = parts[0];
-  const isNav = NAV_TARGETS.includes(firstPart);
-
-  // Parse key=value params (skip first part if it's a nav target)
-  const params = {};
-  for (const part of (isNav ? parts.slice(1) : parts)) {
-    const eq = part.indexOf('=');
-    if (eq > 0) params[part.slice(0, eq)] = decodeURIComponent(part.slice(eq + 1));
-  }
+  const firstPart = route.firstPart;
+  const isNav = route.isNav;
+  const params = route.params;
 
   // Check for nav target: #permissions, #prompts, #rules, #insights, #sessions, #codereview
   if (isNav && !Object.keys(params).length) {
@@ -17687,6 +18313,7 @@ if (sessionStorage.getItem('ctm_restarting')) {
     }
   }, 30000);
 }
+captureInitialSessionHashIntent();
 connect();
 state._prefsLoaded = loadPrefs().then(() => {
   loadRecentSessions();
@@ -17706,7 +18333,7 @@ function onQueueState(msg) {
   // Scroll terminal to bottom when queue is active (only if user hasn't scrolled up)
   if (msg.sessionId) {
     const s = state.sessions.get(msg.sessionId);
-    if (s && s.writer.followMode) s.term.scrollToBottom();
+    if (s && s.writer.followMode) _ensureScrolledToBottom(s);
   }
 }
 
@@ -18165,7 +18792,7 @@ async function refreshQpPromptItems() {
       if (p.images && p.images.length > 0) {
         const newImages = p.images.map(img => ({
           id: img.id, filename: img.filename, path: img.file_path,
-          url: '/api/images/file/' + img.filename,
+          url: qpImageUrl(img),
         }));
         if (JSON.stringify(item.images || []) !== JSON.stringify(newImages)) {
           item.images = newImages;
@@ -18199,6 +18826,12 @@ function promptContentToText(prompt) {
   return prompt.content || '';
 }
 
+function qpImageUrl(img) {
+  const source = String(img?.path || img?.file_path || img?.filename || '');
+  const basename = source.split(/[\\/]/).filter(Boolean).pop() || '';
+  return '/api/images/file/' + encodeURIComponent(basename);
+}
+
 async function addSelectedPromptToQp() {
   const sel = document.getElementById('qp-prompt-select');
   const promptId = parseInt(sel.value);
@@ -18213,7 +18846,7 @@ async function addSelectedPromptToQp() {
       text: promptContentToText(prompt),
       images: (prompt.images || []).map(img => ({
         id: img.id, filename: img.filename, path: img.file_path,
-        url: '/api/images/file/' + img.filename,
+        url: qpImageUrl(img),
       })),
     });
     saveQpDraft();
@@ -18789,7 +19422,7 @@ async function sendQueueFromPanel() {
       item.status = 'sent';
       saveQpDraft();
       renderQpItems();
-      session.term.scrollToBottom();
+      _ensureScrolledToBottom(session);
     } catch (e) {
       toast('Failed to send: ' + e.message, { type: 'error' });
     }
@@ -18828,7 +19461,7 @@ activateTab = function(id) {
   // Re-fit terminal after queue panel may have changed layout
   requestAnimationFrame(() => {
     const s = state.sessions.get(id);
-    if (s && s.fitAddon) s.fitAddon.fit();
+    if (s && s.fitAddon) _fitTerminalPreservingViewport(s, id);
   });
 };