create-walle 0.10.2 → 0.10.3

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

@@ -224,10 +224,10 @@
       <div id="nav-more-wrap">
         <button class="nav-pill" id="nav-more-button" onclick="toggleNavMore()" title="More pages" aria-haspopup="menu" aria-expanded="false">More <span style="font-size:10px;">&#9662;</span></button>
         <div id="nav-more-dropdown" role="menu" aria-label="More pages">
+          <button class="nav-pill" data-nav="machines" onclick="navTo('machines');closeNavMore()" title="Machines — how this Mac is used and by which sessions" role="menuitem">Machines</button>
           <button class="nav-pill" data-nav="insights" onclick="navTo('insights');closeNavMore()" role="menuitem">Insights</button>
           <button class="nav-pill" data-nav="permissions" onclick="navTo('permissions');closeNavMore()" role="menuitem">Permissions</button>
           <button class="nav-pill" data-nav="worktrees" onclick="navTo('worktrees');closeNavMore()" role="menuitem">Worktrees</button>
-          <button class="nav-pill" data-nav="machines" onclick="navTo('machines');closeNavMore()" role="menuitem">Machines</button>
         </div>
       </div>
       <button class="nav-pill" data-nav="setup" onclick="navTo('setup')" title="Setup & Settings" style="margin-left:auto;font-size:16px;padding:4px 8px;">⚙</button>
@@ -310,6 +310,10 @@
       </span>
       <button id="restart-banner-reload" type="button" onclick="reloadForInstalledUpdate('banner')" hidden>Reload</button>
       <button id="restart-banner-dismiss" type="button" onclick="dismissRestartBanner()" title="Dismiss" aria-label="Dismiss restart notice" hidden>&times;</button>
+      <!-- WP-2 (docs/external-causality-kill-session-loss-2026-10-27.html §5 D-5, §6, §8 WP-2, AC-2a):
+           the dead adopted host's ONE action. Sits after the restart/reload pair so the existing
+           restart-group geometry is untouched; visibility + copy come from RestartBannerPolicy. -->
+      <button id="restart-banner-resume" type="button" onclick="resumeHostDeadSessions()" hidden>Resume</button>
     </span>
   </div>
   <div class="modal-overlay update-wizard-overlay hidden" id="update-wizard" role="dialog" aria-modal="true" aria-labelledby="update-wizard-heading">
@@ -346,6 +350,7 @@
       <div class="sidebar-section">
         <div style="display:flex;align-items:center;justify-content:space-between;gap:6px;">
           <h3 style="margin-bottom:0">Active Sessions</h3>
+          <span id="active-computer-filter-chip" style="margin-left:auto"></span>
           <select id="active-sort" onchange="setActiveSort(this.value)" title="Sort active sessions" style="background:var(--bg);color:var(--fg-dim);border:1px solid var(--border);padding:2px 4px;border-radius:3px;font-size:10px;cursor:pointer;">
             <option value="by_activity">By activity</option>
             <option value="tab_order">Tab order</option>
@@ -359,7 +364,7 @@
       </div>
       <div class="sidebar-section" style="border-top:1px solid var(--border)">
         <div style="display:flex;align-items:center;justify-content:space-between;margin-bottom:6px;">
-          <h3 style="margin-bottom:0;display:flex;align-items:center;gap:6px;">Recent Sessions <span id="recent-refreshing-chip" class="recent-refreshing-chip" hidden>Refreshing</span></h3>
+          <h3 style="margin-bottom:0;display:flex;align-items:center;gap:6px;">Recent Sessions <span id="recent-refreshing-chip" class="recent-refreshing-chip" hidden>Refreshing</span> <span id="recent-computer-filter-chip"></span></h3>
           <button class="mini-btn delete" onclick="cleanEmptySessions()" title="Delete all empty sessions" style="background:var(--bg);border:1px solid var(--border);color:var(--red);padding:2px 6px;border-radius:3px;font-size:9px;cursor:pointer;">Clean Empty</button>
         </div>
         <div id="prefs-load-error" role="status">
@@ -2274,7 +2279,7 @@ url = "http://localhost:<span id="setup-mcp-port-display-toml">3457</span>/mcp"<
                   <button class="btn primary small" onclick="PE.createManualBackup()">Backup Now</button>
                 </div>
                 <div style="padding:12px;font-size:12px;color:var(--fg-dim);border-bottom:1px solid var(--border);background:var(--bg-light);">
-                  Daily auto-backups are created automatically. Backups older than 30 days are cleaned up (minimum 5 kept).
+                  Daily auto-backups are created automatically. Old backups are removed after each backup — set how many days to keep in Setup → Backups (default 3).
                 </div>
                 <div id="pe-backup-list" style="flex:1;overflow-y:auto;padding:10px;"></div>
               </div>
@@ -2778,7 +2783,7 @@ url = "http://localhost:<span id="setup-mcp-port-display-toml">3457</span>/mcp"<
 <script src="https://cdn.jsdelivr.net/npm/html2canvas@1.4.1/dist/html2canvas.min.js" crossorigin="anonymous"></script>
 <script src="js/session-surface-runtime.js?v=__CTM_ASSET_EPOCH__"></script>
 <script src="js/presentation-arbiter.js?v=__CTM_ASSET_EPOCH__"></script>
-<script src="js/lifecycle-cover-render.js?v=__CTM_ASSET_EPOCH__"></script><script src="js/porter-stemmer.js?v=__CTM_ASSET_EPOCH__"></script><script src="js/session-search-utils.js?v=__CTM_ASSET_EPOCH__"></script><script src="js/recent-active-identity-index.js?v=__CTM_ASSET_EPOCH__"></script>
+<script src="js/lifecycle-cover-render.js?v=__CTM_ASSET_EPOCH__"></script><script src="js/porter-stemmer.js?v=__CTM_ASSET_EPOCH__"></script><script src="js/agent-command.js?v=__CTM_ASSET_EPOCH__"></script><script src="js/session-search-utils.js?v=__CTM_ASSET_EPOCH__"></script><script src="js/recent-active-identity-index.js?v=__CTM_ASSET_EPOCH__"></script>
 <script src="js/session-activity-utils.js?v=__CTM_ASSET_EPOCH__"></script>
 <script src="js/session-status-precedence.js?v=__CTM_ASSET_EPOCH__"></script>
 <script src="js/session-phase.js?v=__CTM_ASSET_EPOCH__"></script>
@@ -2846,6 +2851,7 @@ url = "http://localhost:<span id="setup-mcp-port-display-toml">3457</span>/mcp"<
 <script src="js/walle-session-runtime-helpers.js?v=__CTM_ASSET_EPOCH__"></script>
 <script src="js/core/01-util.js?v=__CTM_ASSET_EPOCH__"></script>
 <script src="js/core/02-toast.js?v=__CTM_ASSET_EPOCH__"></script>
+<script src="js/core/pending-create.js?v=__CTM_ASSET_EPOCH__"></script>
 <script src="js/model-picker.js?v=__CTM_ASSET_EPOCH__"></script>
 <script src="js/private-model-lifetime.js?v=__CTM_ASSET_EPOCH__"></script>
 <script src="js/session-model-picker.js?v=__CTM_ASSET_EPOCH__"></script>
@@ -2857,6 +2863,7 @@ url = "http://localhost:<span id="setup-mcp-port-display-toml">3457</span>/mcp"<
 <script src="js/terminal-reference-adapter.js?v=__CTM_ASSET_EPOCH__"></script><script src="js/document-review-links.js?v=__CTM_ASSET_EPOCH__"></script>
 <script src="js/conversation-turn-cards.js?v=__CTM_ASSET_EPOCH__"></script>
 <script src="js/root-review-actions.js?v=__CTM_ASSET_EPOCH__"></script>
+<script src="js/pasted-content.js?v=__CTM_ASSET_EPOCH__"></script>
 <script src="js/message-renderer.js?v=__CTM_ASSET_EPOCH__"></script>
 <script src="js/native-subagent-review.js?v=__CTM_ASSET_EPOCH__"></script>
 <script src="js/main-thread-budget.js?v=__CTM_ASSET_EPOCH__"></script>
@@ -2927,7 +2934,10 @@ url = "http://localhost:<span id="setup-mcp-port-display-toml">3457</span>/mcp"<
 <script src="js/background-work.js?v=__CTM_ASSET_EPOCH__"></script>
 <script src="js/core/session-selectors.js?v=__CTM_ASSET_EPOCH__"></script>
 <script src="js/core/session-commands.js?v=__CTM_ASSET_EPOCH__"></script>
+<script src="js/core/active-session-groups.js?v=__CTM_ASSET_EPOCH__"></script><script src="js/core/recent-machine-source.js?v=__CTM_ASSET_EPOCH__"></script>
 <script src="js/core/worker-tree.js?v=__CTM_ASSET_EPOCH__"></script>
+<!-- S-43 (WP-7): the New Session agent grid + the dsh card's Model select. -->
+<script src="js/new-session-agent-grid.js?v=__CTM_ASSET_EPOCH__"></script>
 <script src="js/terminal-input-policy.js?v=__CTM_ASSET_EPOCH__"></script>
 <script src="js/session-transport-state.js?v=__CTM_ASSET_EPOCH__"></script>
 <script src="js/terminal-surface-resume-policy.js?v=__CTM_ASSET_EPOCH__"></script>
@@ -2955,6 +2965,7 @@ url = "http://localhost:<span id="setup-mcp-port-display-toml">3457</span>/mcp"<
 <script src="js/terminal/runtime-18.js?v=__CTM_ASSET_EPOCH__"></script>
 <script src="js/terminal/runtime-19.js?v=__CTM_ASSET_EPOCH__"></script>
 <script src="js/terminal/runtime-20.js?v=__CTM_ASSET_EPOCH__"></script>
+<script src="js/terminal/conv-only-session.js?v=__CTM_ASSET_EPOCH__"></script>
 <script src="js/sidebar-active-reveal.js?v=__CTM_ASSET_EPOCH__"></script>
 <script src="js/terminal/runtime-21.js?v=__CTM_ASSET_EPOCH__"></script>
 <script src="js/terminal/runtime-23.js?v=__CTM_ASSET_EPOCH__"></script>
@@ -3677,7 +3688,7 @@ const state = window._ctmState = {
     minClientBuildStale: false,
     clientUpdateDiskEpoch: '',
   },
-  restartBanner: { walle: null, ctm: { reloadRequired: false, backendRestartRequired: false, protocolIncompatible: false, loadedBuildId: '', latestBuildId: '' } },
+  restartBanner: { walle: null, hostDead: null, ctm: { reloadRequired: false, backendRestartRequired: false, protocolIncompatible: false, loadedBuildId: '', latestBuildId: '' } },
   splitRoot: null,       // Binary tree of panes (null = single-pane mode)
   savedSplitLayout: null, // Suspended split tree (saved when switching to non-split tab)
   focusedPaneId: null,   // ID of focused leaf pane
@@ -4411,10 +4422,11 @@ function _dispatchWebSocketMessage(msg) {
     case 'ui-prefs-changed': onUiPrefsChanged(msg); break;
     case 'session-surface-preference': onSessionSurfacePreference(msg); break;
     case 'created': onCreated(msg); break;
+    case 'create-accepted': if (typeof PendingCreate !== 'undefined') PendingCreate.accepted(msg); break;
     case 'submit-prompt-status':
       window.CTMPromptSubmission?.handleStatus(msg);
       _handlePromptOutboxStatus(msg);
-      qpReconcileSubmissionMessage(msg);
+      qpReconcileSubmissionMessage(msg); if (typeof _convOnlyHandleSubmitStatus === 'function') _convOnlyHandleSubmitStatus(msg);
       break;
     case 'input-dropped': onInputDropped(msg); break;
     case 'output': onOutput(msg); break;
@@ -4461,6 +4473,7 @@ function _dispatchWebSocketMessage(msg) {
     case 'resume-blocked': onSessionResumeBlocked(msg); break;
     case 'resume-retry-noop': onResumeRetryNoop(msg); break;
     case 'error': {
+      if (typeof PendingCreate !== 'undefined' && PendingCreate.settleError(msg)) break;
       // WP-5 (§6.3/AC-5a): a machine-scoped failure (machine_unreachable, or the box's own code)
       // is SHOWN — the user picks another machine or fixes the box. Never retried here, and every
       // other error frame keeps its existing console-only path.
@@ -4556,6 +4569,12 @@ function _dispatchWebSocketMessage(msg) {
       state._restarting = true;
       _transitionSessionTransport({ type: 'server-restarting' });
       break;
+    case 'host-dead':
+      // WP-2 (docs/external-causality-kill-session-loss-2026-10-27.html §5 D-5, §6, §8 WP-2,
+      // AC-2a): an adopted host died with sessions still attached. Same banner element as every
+      // other restart fact — see public/js/app/restart-banner.js's setHostDeadFacts.
+      setHostDeadFacts(msg);
+      break;
     case 'server-ready':
       window.CtmSessionModelPicker?.resetRequestCache?.();
       state._serverReady = true;
@@ -5444,13 +5463,22 @@ function applyTabOrder(saved) {
   const restorableIds = state.tabOrder.filter(id => state.sessions.has(id) || id === 'review');
   const nonRestorableIds = state.tabOrder.filter(id => !state.sessions.has(id) && id !== 'review');
   const ordered = [];
+  // WP-5 (S-12, remote-session-child-transcript-model-truth-and-restart-2026-10-27.html): a saved id
+  // this client has never been told about — a BOX session whose catalog has not landed yet after a hub
+  // restart. It is NOT pushed into state.tabOrder (no renderer or keyboard cycle may see a tab with no
+  // session); it is remembered so the next saveTabOrder() writes it back where it was saved, instead of
+  // losing the pref and letting the session append at the END of the strip when the catalog arrives.
+  const undelivered = new Set();
   for (const id of saved) {
     if (restorableIds.includes(id)) ordered.push(id);
+    else if (!nonRestorableIds.includes(id) && id !== 'review') undelivered.add(id);
   }
   for (const id of restorableIds) {
     if (!ordered.includes(id)) ordered.push(id);
   }
   state.tabOrder = [...nonRestorableIds, ...ordered];
+  state._undeliveredTabIds = undelivered;
+  state._undeliveredTabSaved = saved.slice();
 }
 
 function _sessionOwnershipMeta(session) {
@@ -7071,33 +7099,73 @@ async function loadInstanceSourceLedgers() {
 // to macOS) or NFS mounts, so macOS re-prompts for file access on every restart. Full Disk
 // Access is a superset that, under the stable Dev-ID identity, persists — one grant ends it.
 // We can only detect + guide; Apple forbids granting FDA programmatically.
+// WP-3 (D-9, docs/signin-flow-restart-settle-and-fda-target-identity-2026-10-26.html): the
+// banner names the EXACT exec the grant must be charged to (cap.fdaTargets / messages.fdaTarget,
+// both probed from the running exec path by the server — never a fixed "Coding Task Manager"),
+// stays up after Grant with a "Check again" button, re-checks once per window focus (no new
+// timer: release/ownership-registry.json keys client timers by ordinal), and offers
+// "Restart Wall-E" on the split verdict (CTM's probe says granted, Wall-E's Messages probe
+// still says denied — a running daemon may need the relaunch).
 let _fdaCapabilityChecked = false;
+let _fdaFocusHandlerBound = false;
+let _fdaBannerAfterGrant = false;
+let _fdaBannerOpts = null;
 const FDA_BANNER_DISMISS_KEY = 'ctm_fda_banner_dismissed_v1';
 
-async function checkFdaCapability() {
+// One probe, two callers: the boot check and the re-check. Best-effort — a failed probe
+// returns null and never blocks the UI.
+async function _fetchFdaState() {
   try {
-    if (localStorage.getItem(FDA_BANNER_DISMISS_KEY) === '1') return;
     const r = await fetch(`/api/capabilities?token=${state.token}`);
-    if (!r.ok) return;
+    if (!r.ok) return null;
     const cap = await r.json();
     // S-44 (imessage-memory-source WP-4): reuse this banner for the iMessage FDA
     // need too, rather than building a second one — best-effort, never blocks.
-    let imessageNeedsFda = false;
+    let messages = null;
     if (cap && cap.platform === 'darwin') {
       try {
         const mr = await fetch('/api/wall-e/gws/accounts?summary=1', { cache: 'no-store' });
         if (mr.ok) {
           const md = await mr.json();
-          const messages = md && md.macosNative && md.macosNative.messages;
-          if (messages && messages.dbPresent && !messages.fullDiskAccess) imessageNeedsFda = true;
+          messages = (md && md.macosNative && md.macosNative.messages) || null;
         }
-      } catch { /* expected: the Wall-E gws/accounts probe is best-effort — a failed fetch just means imessageNeedsFda stays false and the banner falls back to CTM's own needsAttention check */ }
+      } catch { /* expected: the Wall-E gws/accounts probe is best-effort — a failed fetch just leaves messages null and the banner falls back to CTM's own needsAttention check */ }
+    }
+    return { cap, messages, imessageNeedsFda: !!(messages && messages.dbPresent && !messages.fullDiskAccess) };
+  } catch { /* best-effort — never block the UI on this */ return null; }
+}
+
+async function checkFdaCapability() {
+  try {
+    if (localStorage.getItem(FDA_BANNER_DISMISS_KEY) === '1') return;
+    const probed = await _fetchFdaState();
+    if (!probed) return;
+    if (probed.cap && (probed.cap.needsAttention || probed.imessageNeedsFda)) {
+      showFdaBanner(probed.cap, { imessageNeedsFda: probed.imessageNeedsFda, messages: probed.messages });
+    } else {
+      hideFdaBanner();
     }
-    if (cap && (cap.needsAttention || imessageNeedsFda)) showFdaBanner(cap, { imessageNeedsFda });
-    else hideFdaBanner();
   } catch { /* best-effort — never block the UI on this */ }
 }
 
+// Re-check an EXISTING banner in place (window focus / "Check again"). Never creates one —
+// checkFdaCapability owns first paint. When nothing is left to fix it hides the banner and,
+// if the user had already granted, confirms once.
+async function refreshFdaBanner() {
+  const banner = document.getElementById('fda-capability-banner');
+  if (!banner) return;
+  const probed = await _fetchFdaState();
+  if (!probed) return;
+  if (probed.cap && (probed.cap.needsAttention || probed.imessageNeedsFda)) {
+    _applyFdaBannerState(banner, probed.cap, { imessageNeedsFda: probed.imessageNeedsFda, messages: probed.messages });
+  } else {
+    const wasAfterGrant = _fdaBannerAfterGrant;
+    _fdaBannerAfterGrant = false;
+    hideFdaBanner();
+    if (wasAfterGrant) toast('Full Disk Access granted. Wall-E can read Messages now.', { type: 'success', duration: 7000 });
+  }
+}
+
 function hideFdaBanner() {
   const b = document.getElementById('fda-capability-banner');
   if (b) b.remove();
@@ -7105,40 +7173,83 @@ function hideFdaBanner() {
 
 function showFdaBanner(cap, opts) {
   opts = opts || {};
-  if (document.getElementById('fda-capability-banner')) return;
-  const count = Number(cap.networkSessionCount) || 0;
-  const denials = Array.isArray(cap.accessDenials) ? cap.accessDenials : [];
+  const existing = document.getElementById('fda-capability-banner');
+  if (existing) { _applyFdaBannerState(existing, cap, opts); return; } // one banner, updated in place
+  const banner = document.createElement('div');
+  banner.id = 'fda-capability-banner';
+  banner.className = 'fda-capability-banner';
+  _applyFdaBannerState(banner, cap, opts);
+  document.body.appendChild(banner);
+}
+
+function _escFda(s) {
+  return String(s == null ? '' : s).replace(/[&<>"']/g, (c) => (
+    { '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#39;' }[c]));
+}
+
+// The exec identities a grant must be charged to: Wall-E's Messages target when the Messages
+// need is what raised the banner, else every target CTM reported. Empty (an older server that
+// sends no fdaTargets) keeps the pre-WP-3, path-less sentence.
+function _fdaBannerTargets(cap, messages, messagesLed) {
+  if (messagesLed && messages && messages.fdaTarget && messages.fdaTarget.path) return [messages.fdaTarget];
+  const out = [];
+  for (const t of (cap && Array.isArray(cap.fdaTargets) ? cap.fdaTargets : [])) if (t && t.path) out.push(t);
+  return out;
+}
+
+function _fdaBannerMessage(cap, opts) {
+  const count = Number(cap && cap.networkSessionCount) || 0;
+  const denials = cap && Array.isArray(cap.accessDenials) ? cap.accessDenials : [];
+  const messages = opts.messages || null;
+  const messagesLed = !!opts.imessageNeedsFda && !(cap && cap.needsAttention);
+  const targets = _fdaBannerTargets(cap, messages, messagesLed);
+  const named = targets.length ? ` to <code>${_escFda(targets.map((t) => t.path).join(' and '))}</code>` : '';
   // Prefer the specific, observed cause (e.g. Codex couldn't read ~/.codex) over the generic
   // count — it's actionable and explains why a session just failed to load.
   let message;
   if (denials.length) {
-    const esc = (s) => String(s == null ? '' : s).replace(/[&<>"']/g, (c) => (
-      { '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#39;' }[c]));
     const d = denials[0];
     const who = d.provider ? d.provider.charAt(0).toUpperCase() + d.provider.slice(1) : 'An agent';
     const where = (d.path || '').replace(/\/config\.toml$/, '') || d.path || 'a file';
-    message = `${esc(who)} couldn't read <code>${esc(where)}</code> (it's on Dropbox/iCloud or a network volume), so the session failed to load. <strong>Grant Full Disk Access once</strong> to fix it.`;
-  } else if (opts.imessageNeedsFda && !cap.needsAttention) {
-    message = `<strong>Grant Full Disk Access once</strong> so Wall-E can read your Messages history.`;
+    message = `${_escFda(who)} couldn't read <code>${_escFda(where)}</code> (it's on Dropbox/iCloud or a network volume), so the session failed to load. <strong>Grant Full Disk Access once</strong>${named} to fix it.`;
+  } else if (messagesLed) {
+    message = `<strong>Grant Full Disk Access once</strong>${named} so Wall-E can read your Messages history.`;
   } else {
-    message = `CTM has ${count} session${count === 1 ? '' : 's'} on a network/Dropbox volume, so macOS keeps asking for file access on every restart. <strong>Grant Full Disk Access once</strong> to stop it.`;
+    message = `CTM has ${count} session${count === 1 ? '' : 's'} on a network/Dropbox volume, so macOS keeps asking for file access on every restart. <strong>Grant Full Disk Access once</strong>${named} to stop it.`;
   }
   // S-44: append the iMessage sentence whenever Wall-E's Messages mirror also needs
   // FDA, even if the banner's primary trigger was CTM's own network-volume/denial check.
-  if (opts.imessageNeedsFda && cap.needsAttention) {
+  if (opts.imessageNeedsFda && cap && cap.needsAttention) {
     message += ' iMessage history needs Full Disk Access for Wall-E.';
   }
-  const banner = document.createElement('div');
-  banner.id = 'fda-capability-banner';
-  banner.className = 'fda-capability-banner';
+  // Homebrew's `node` is ad-hoc signed under a versioned Cellar path, so its row can look
+  // granted while the running binary never matches — name the trap only when it applies.
+  if (targets.some((t) => t.displayName === 'node')) {
+    message += ' System Settings lists it as “node”; another “node” row does not count.';
+  }
+  return message;
+}
+
+// Write the banner's text + buttons for the current state. Idempotent on an existing node, so a
+// re-check updates the banner in place instead of stacking a second one (D-9).
+function _applyFdaBannerState(banner, cap, opts) {
+  opts = opts || {};
+  _fdaBannerOpts = opts;
+  const afterGrant = _fdaBannerAfterGrant;
+  const splitVerdict = !!(cap && cap.fdaGranted === true && opts.messages && opts.messages.fullDiskAccess === false);
   banner.innerHTML = `
     <span class="fda-banner-icon">&#128274;</span>
-    <span class="fda-banner-text">${message}</span>
-    <button class="fda-banner-grant" type="button">Grant Full Disk Access</button>
+    <span class="fda-banner-text">${_fdaBannerMessage(cap, opts)}</span>
+    <button class="fda-banner-grant" type="button">${afterGrant ? 'Open Settings again' : 'Grant Full Disk Access'}</button>
+    ${afterGrant ? '<button class="fda-banner-check" type="button">Check again</button>' : ''}
+    ${splitVerdict ? '<button class="fda-banner-restart-walle" type="button">Restart Wall-E</button>' : ''}
     <button class="fda-banner-later" type="button">Later</button>
     <button class="fda-banner-never" type="button" title="Don't show again">Don't show again</button>`;
-  document.body.appendChild(banner);
   banner.querySelector('.fda-banner-grant').addEventListener('click', () => grantFdaAccess(cap));
+  const check = banner.querySelector('.fda-banner-check');
+  if (check) check.addEventListener('click', refreshFdaBanner);
+  const restart = banner.querySelector('.fda-banner-restart-walle');
+  if (restart) restart.addEventListener('click', () => svcAction('walle', 'restart', { confirmed: true }));
   banner.querySelector('.fda-banner-later').addEventListener('click', hideFdaBanner);
   banner.querySelector('.fda-banner-never').addEventListener('click', () => {
     try { localStorage.setItem(FDA_BANNER_DISMISS_KEY, '1'); } catch {}
@@ -7148,19 +7259,30 @@ function showFdaBanner(cap, opts) {
 
 async function grantFdaAccess(cap) {
   const fallbackHint = (cap && cap.hint) ||
-    'Open System Settings → Privacy & Security → Full Disk Access and add "Coding Task Manager".';
+    'Open System Settings → Privacy & Security → Full Disk Access and turn on the highlighted file.';
+  // One focus listener per page: the user leaving/returning from System Settings is the
+  // natural re-check trigger, and there is no orderly ordinal left for a new client timer.
+  if (!_fdaFocusHandlerBound) {
+    _fdaFocusHandlerBound = true;
+    window.addEventListener('focus', () => {
+      if (document.getElementById('fda-capability-banner')) refreshFdaBanner();
+    });
+  }
   try {
     const r = await fetch(`/api/capabilities/open-fda?token=${state.token}`, { method: 'POST' });
     const d = await r.json().catch(() => ({}));
     if (d && d.ok) {
-      toast('Add "Coding Task Manager" to the opened Full Disk Access list, then restart CTM once — macOS will stop asking.', { type: 'info', title: 'Full Disk Access', duration: 12000 });
-    } else {
-      toast(fallbackHint, { type: 'warning', title: 'Grant Full Disk Access', duration: 14000 });
+      toast(`Full Disk Access opened on ${d.hostname || 'this Mac'}: add the highlighted file, turn it on, then click Check again.`, { type: 'info', title: 'Full Disk Access', duration: 14000 });
+      // The banner stays up (D-9) in its after-grant state, so the user can confirm or retry.
+      _fdaBannerAfterGrant = true;
+      const banner = document.getElementById('fda-capability-banner');
+      if (banner) _applyFdaBannerState(banner, cap, _fdaBannerOpts || {});
+      return;
     }
+    toast(fallbackHint, { type: 'warning', title: 'Grant Full Disk Access', duration: 14000 });
   } catch {
     toast(fallbackHint, { type: 'warning', title: 'Grant Full Disk Access', duration: 14000 });
   }
-  hideFdaBanner();
 }
 
 // --- Global services-health banner (golden-four alarms + actionable Wall-E
@@ -7964,15 +8086,7 @@ window.addEventListener('storage', (event) => {
 // Enabled per-session by agent type. Shell + unknown agents skip overlay
 // (their prompt format is variable; bad overlay positioning is user-visible).
 function _clientDetectAgentType(cmd) {
-  if (!cmd) return null;
-  const c = String(cmd).toLowerCase();
-  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('cursor')) return 'cursor';
-  if (c.includes('wall-e') || c.includes('walle')) return 'walle';
-  return null;
+  return window.CtmAgentCommand.detectAgentType(cmd);
 }
 
 const CTM_AGENT_UI_FLAGS = __CTM_AGENT_UI_FLAGS__;
@@ -7980,14 +8094,17 @@ window.CTM_AGENT_UI_FLAGS = CTM_AGENT_UI_FLAGS;
 const CTM_LIFECYCLE_FLAGS = __CTM_LIFECYCLE_FLAGS__;
 window.CTM_LIFECYCLE_FLAGS = CTM_LIFECYCLE_FLAGS;
 const CLIENT_AGENT_CAPABILITIES = {
-  claude: { surfaces:{conv:{available:true,live:true,source:'canonical-rows'},cli:{available:true,source:'pty'}}, structuredTranscript: true, semanticInput: true, semanticQueue: true, semanticApprovals: true, inputFidelity: 'pty', controlFidelity: 'hook', steer:'queue-interrupt',rewind:false,branch:false,modelControl: false, branching: false, export: true, messages: {stream:true,durable:true,branching:false}, input:{send:true,queue:true,interrupt:true,attachments:true}, approvals:{authoritative:true,resolve:true}, work:{phase:true,tasks:true,subagents:true}, controls:{model:false,cwd:false,sandbox:false}, artifacts:{files:true,diffs:true,tests:true}, promptNavigation: 'transcript', review: true, resume: true, runningHoldMs: 15000 },
-  'claude-desktop': { surfaces:{conv:{available:true,live:false,source:'canonical-rows'},cli:{available:false}}, structuredTranscript: true, semanticInput: false, semanticQueue: false, semanticApprovals: false, promptNavigation: 'transcript', review: true, resume: false, convert: true },
-  codex: { surfaces:{conv:{available:true,live:true,source:'canonical-rows'},cli:{available:true,source:'pty'}}, structuredTranscript: true, semanticInput: true, semanticQueue: true, semanticApprovals: true, inputFidelity: 'pty', controlFidelity: 'runtime', steer:'queue-interrupt',rewind:false,branch:false,modelControl: false, branching: false, export: true, messages:{stream:true,durable:true,branching:false},input:{send:true,queue:true,interrupt:true,attachments:true},approvals:{authoritative:true,resolve:true},work:{phase:true,tasks:true,subagents:true},controls:{model:false,cwd:false,sandbox:false},artifacts:{files:true,diffs:true,tests:true}, promptNavigation: 'transcript', review: true, resume: true },
-  gemini: { surfaces:{conv:{available:false},cli:{available:true,source:'pty'}}, structuredTranscript: false, semanticInput: true, semanticQueue: true, semanticApprovals: false, promptNavigation: 'terminal', review: false, resume: true },
-  opencode: { surfaces:{conv:{available:true,live:true,source:'canonical-rows'},cli:{available:true,source:'pty'}}, structuredTranscript: true, semanticInput: true, semanticQueue: true, semanticApprovals: false, inputFidelity:'pty',controlFidelity:'runtime',steer:'queue-interrupt',rewind:false,branch:false,modelControl:false,branching:false,export:true,messages:{stream:true,durable:true,branching:false},input:{send:true,queue:true,interrupt:true,attachments:true},approvals:{authoritative:false,resolve:false},work:{phase:true,tasks:true,subagents:false},controls:{model:false,cwd:false,sandbox:false},artifacts:{files:true,diffs:true,tests:true}, promptNavigation: 'transcript', review: true, resume: true },
-  walle: { surfaces:{web:{available:true,interactive:true,source:'walle-native'},conv:{available:true,live:true,source:'canonical-rows'},cli:{available:false,source:'pty'}}, structuredTranscript: true, semanticInput: true, semanticQueue: true, semanticApprovals: true, inputFidelity:'native',controlFidelity:'native',steer:true,rewind:true,branch:true,modelControl:true,branching:true,export:true,messages:{stream:true,durable:true,branching:true},input:{send:true,queue:true,interrupt:true,attachments:true},approvals:{authoritative:true,resolve:true},work:{phase:true,tasks:true,subagents:true},controls:{model:true,cwd:true,sandbox:true},artifacts:{files:true,diffs:true,tests:true}, promptNavigation: 'chat', review: true, resume: false },
-  cursor: { surfaces:{conv:{available:false},cli:{available:true,source:'pty'}}, structuredTranscript: false, semanticInput: true, semanticQueue: true, semanticApprovals: false, promptNavigation: 'terminal', review: false, resume: true, runningHoldMs: 10000 },
-  shell: { surfaces:{conv:{available:false},cli:{available:true,source:'pty'}}, structuredTranscript: false, semanticInput: false, semanticQueue: false, semanticApprovals: false, promptNavigation: 'terminal', review: false, resume: false },
+  claude: { surfaces:{conv:{available:true,live:true,source:'canonical-rows'},cli:{available:true,source:'pty'}}, structuredTranscript: true, semanticInput: true, semanticQueue: true, semanticApprovals: true, inputFidelity: 'pty', controlFidelity: 'hook', steer:'queue-interrupt',rewind:false,branch:false,modelControl: false, branching: false, export: true, messages: {stream:true,durable:true,branching:false}, input:{send:true,queue:true,interrupt:true,attachments:true}, approvals:{authoritative:true,resolve:true}, work:{phase:true,tasks:true,subagents:true}, controls:{model:false,cwd:false,sandbox:false}, artifacts:{files:true,diffs:true,tests:true}, promptNavigation: 'transcript', historyReader: 'transcript', review: true, resume: true, runningHoldMs: 15000 },
+  'claude-desktop': { surfaces:{conv:{available:true,live:false,source:'canonical-rows'},cli:{available:false}}, structuredTranscript: true, semanticInput: false, semanticQueue: false, semanticApprovals: false, promptNavigation: 'transcript', historyReader: 'none', review: true, resume: false, convert: true },
+  codex: { surfaces:{conv:{available:true,live:true,source:'canonical-rows'},cli:{available:true,source:'pty'}}, structuredTranscript: true, semanticInput: true, semanticQueue: true, semanticApprovals: true, inputFidelity: 'pty', controlFidelity: 'runtime', steer:'queue-interrupt',rewind:false,branch:false,modelControl: false, branching: false, export: true, messages:{stream:true,durable:true,branching:false},input:{send:true,queue:true,interrupt:true,attachments:true},approvals:{authoritative:true,resolve:true},work:{phase:true,tasks:true,subagents:true},controls:{model:false,cwd:false,sandbox:false},artifacts:{files:true,diffs:true,tests:true}, promptNavigation: 'transcript', historyReader: 'transcript', review: true, resume: true },
+  gemini: { surfaces:{conv:{available:false},cli:{available:true,source:'pty'}}, structuredTranscript: false, semanticInput: true, semanticQueue: true, semanticApprovals: false, promptNavigation: 'terminal', historyReader: 'none', review: false, resume: true },
+  opencode: { surfaces:{conv:{available:true,live:true,source:'canonical-rows'},cli:{available:true,source:'pty'}}, structuredTranscript: true, semanticInput: true, semanticQueue: true, semanticApprovals: false, inputFidelity:'pty',controlFidelity:'runtime',steer:'queue-interrupt',rewind:false,branch:false,modelControl:false,branching:false,export:true,messages:{stream:true,durable:true,branching:false},input:{send:true,queue:true,interrupt:true,attachments:true},approvals:{authoritative:false,resolve:false},work:{phase:true,tasks:true,subagents:false},controls:{model:false,cwd:false,sandbox:false},artifacts:{files:true,diffs:true,tests:true}, promptNavigation: 'transcript', historyReader: 'none', review: true, resume: true },
+  walle: { surfaces:{web:{available:true,interactive:true,source:'walle-native'},conv:{available:true,live:true,source:'canonical-rows'},cli:{available:false,source:'pty'}}, structuredTranscript: true, semanticInput: true, semanticQueue: true, semanticApprovals: true, inputFidelity:'native',controlFidelity:'native',steer:true,rewind:true,branch:true,modelControl:true,branching:true,export:true,messages:{stream:true,durable:true,branching:true},input:{send:true,queue:true,interrupt:true,attachments:true},approvals:{authoritative:true,resolve:true},work:{phase:true,tasks:true,subagents:true},controls:{model:true,cwd:true,sandbox:true},artifacts:{files:true,diffs:true,tests:true}, promptNavigation: 'chat', historyReader: 'none', review: true, resume: false },
+  cursor: { surfaces:{conv:{available:false},cli:{available:true,source:'pty'}}, structuredTranscript: false, semanticInput: true, semanticQueue: true, semanticApprovals: false, promptNavigation: 'terminal', historyReader: 'none', review: false, resume: true, runningHoldMs: 10000 },
+  shell: { surfaces:{conv:{available:false},cli:{available:true,source:'pty'}}, structuredTranscript: false, semanticInput: false, semanticQueue: false, semanticApprovals: false, promptNavigation: 'terminal', historyReader: 'none', review: false, resume: false },
+  // WP-7 (S-44): mirrors lib/agent-capabilities.js's dsh row — conv-only (surfaces.cli.available
+  // false ⇒ no xterm anywhere, AC-7b), ACP input/control fidelity, no attachments until WP-10.
+  dsh: { surfaces:{conv:{available:true,live:true,source:'canonical-rows'},cli:{available:false,source:'pty'}}, structuredTranscript: true, semanticInput: true, semanticQueue: false, semanticApprovals: true, inputFidelity:'acp', controlFidelity:'acp', steer:'queue-interrupt', rewind:false, branch:false, modelControl:false, branching:false, export:true, messages:{stream:true,durable:true,branching:false}, input:{send:true,queue:false,interrupt:true,attachments:false}, approvals:{authoritative:true,resolve:true}, work:{phase:true,tasks:false,subagents:false}, controls:{model:false,cwd:false,sandbox:false}, artifacts:{files:true,diffs:false,tests:false}, historyReader: 'none', promptNavigation: 'transcript', review: false, resume: true },
 };
 
 function _clientNormalizeAgentType(value) {
@@ -7995,6 +8112,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 === 'deepseek-harness' || v === 'deepseek') return 'dsh';
   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';
@@ -10562,8 +10680,8 @@ function _liveWheelSteps(e, writer, rowHeightPx, rows, wheelRecorder) {
 // (a frozen function-size ceiling, lint/file-size-baseline.json) only pays ONE line per call
 // site for reader-enter/prefetch/frame-note -- the actual logic lives in history-app-seam.js.
 function _continuousController(id) { return window.TerminalHistoryViewport && window.TerminalHistoryViewport.get(id); }
-function _enterContinuousForSession(id, deltaYPx) { const c = _continuousController(id); if (c && window.HistoryAppSeam) window.HistoryAppSeam.enterContinuous(c, 'reader-enter', { deltaYPx }); }
-function _prefetchContinuousForSession(id, reason) { const c = _continuousController(id); if (c && window.HistoryAppSeam) window.HistoryAppSeam.prefetchContinuousPage(c, { reason }); }
+function _enterContinuousForSession(id, deltaYPx) { const c = _continuousController(id); if (c && window.HistoryAppSeam && window.HistoryAppSeam.historyReader(state.sessions.get(id))) window.HistoryAppSeam.enterContinuous(c, 'reader-enter', { deltaYPx }); }
+function _prefetchContinuousForSession(id, reason) { const c = _continuousController(id); if (c && window.HistoryAppSeam && window.HistoryAppSeam.historyReader(state.sessions.get(id))) window.HistoryAppSeam.prefetchContinuousPage(c, { reason }); }
 function _wheelDeltaPx(e, term) {
   let ch = 0;
   try { ch = term._core._renderService.dimensions.css.cell.height; } catch {}
@@ -10588,6 +10706,24 @@ function _requestTerminalScrollOverlayRefresh(id, writer, current) {
     _updateTerminalCurrentPromptChip(id);
   });
 }
+// WP-7 (S-52/S-57, AC-7b): a session whose CLIENT capabilities have no CLI surface (dsh today) is
+// conv-only — it must never build an xterm, and no bootstrap may wait for a PTY attach that will
+// never arrive. The rule reads the capability table, never the agent name, so it generalizes: every
+// existing createTerminal() call site (the `created` ack, the lazy activateTab path, the sessions-list
+// race path) goes through this wrapper and is answered with the conv-only shape instead.
+const _createTerminalPtySurface = createTerminal;
+createTerminal = function createTerminalGated(id, opts) {
+  // The `created` ack calls this BEFORE it writes the session meta, so the frame's own agent identity
+  // (opts) decides first; every later call site already has the meta.
+  const optCaps = (opts && opts.agentCapabilities) || (opts && opts.agentType && typeof _clientAgentCaps === 'function' ? _clientAgentCaps(opts.agentType) : null);
+  const optsConvOnly = !!(optCaps && optCaps.surfaces && optCaps.surfaces.cli && optCaps.surfaces.cli.available === false);
+  if ((optsConvOnly || (typeof _sessionCliUnavailable === 'function' && _sessionCliUnavailable(id)))
+      && typeof _ensureConvOnlySessionClientShape === 'function') {
+    const shaped = _ensureConvOnlySessionClientShape(id, { ...((state.sessions.get(id) || {}).meta || {}), ...(opts && opts.agentType ? { agentType: opts.agentType } : {}), ...(optCaps ? { agentCapabilities: optCaps } : {}) });
+    return shaped || { term: null, fitAddon: null };
+  }
+  return _createTerminalPtySurface(id, opts);
+};
 function createTerminal(id, opts) {
   opts = opts || {};
   const candidateRecovery = opts.candidateRecovery === true;
@@ -11140,7 +11276,9 @@ function createTerminal(id, opts) {
     }
     if (_terminalShouldHandleCtrlVPasteShortcut(e) && _terminalImagePasteEnabledForSession(id)) {
       e.preventDefault();
-      _terminalHandleShortcutPaste({ mode: 'token' });
+      _terminalHandleShortcutPaste(_terminalIsMacPlatform()
+        ? { mode: 'token' }
+        : { mode: 'token', controlVPassthrough: true });
       return false;
     }
     return true;
@@ -12085,7 +12223,7 @@ function createTerminal(id, opts) {
   async function _terminalRemoveDraftAttachment(id, attachment, metricEvent, options = {}) {
     const Draft = window.TerminalAttachmentDraft;
     const draft = _terminalAttachmentDraftState(id);
-    if (!Draft || !draft || !attachment || !draft.attachments.includes(attachment)) return false;
+    if (!Draft || !draft || !attachment || !draft.attachments.includes(attachment) || !Draft.canRemoveAttachment(draft, attachment.clientId)) return false;
     const owned = _terminalDraftUploadOwnership(id);
     const current = () => Boolean(owned.lifetime && owned.lifetime === _terminalRootDraftLifetime
       && !owned.reason && owned.context && owned.context.draft === draft
@@ -12115,7 +12253,7 @@ function createTerminal(id, opts) {
     const draft = _terminalAttachmentDraftState(id);
     const action = Draft && Draft.dismissDisposition(draft, attachment);
     if (action === 'disabled' || !action) return false;
-    if (action === 'cancel') return _terminalCancelAttachmentUpload(id, attachment);
+    if (action === 'cancel' || action === 'dismiss-submitted') return action === 'cancel' ? _terminalCancelAttachmentUpload(id, attachment) : (Draft.dismissSubmitted(draft) && (_terminalAttachmentMetric(id, 'indeterminate_dismissed_by_user', { attachmentCount: draft.attachments.length }), _terminalRenderAttachmentDraft(id), true));   // R-3b: post-Enter removal is LOCAL only -- no server DELETE, no re-send
     const metric = action === 'detach' ? 'attached_detached_by_user' : 'chip_dismissed_by_user';
     const owned = _terminalDraftUploadOwnership(id);
     const removed = _terminalRemoveDraftAttachment(id, attachment, metric);
@@ -12335,7 +12473,7 @@ function createTerminal(id, opts) {
       if (membershipSnapshot.known) {
         const tokenAttachments = draft.attachments.filter(item => item && item.mode !== 'path');
         const derived = Orchestration.deriveObservedMembership({
-          attachments: tokenAttachments,
+          attachments: tokenAttachments, provider: _clientAgentTypeForSession(s),
           observedTokens: membershipSnapshot.tokens,
           scan: {
             known: membershipSnapshot.known === true,
@@ -13145,7 +13283,7 @@ function createTerminal(id, opts) {
         : 'confirmed',
     }));
     if (!list.length) return { ok: true, links: [], skipped: [] };
-    const response = await fetch('/api/session/image-refs?token=' + encodeURIComponent(state.token || ''), {
+    const response = await fetch('/api/sessions/' + encodeURIComponent(id) + '/image-refs?token=' + encodeURIComponent(state.token || ''), {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
       keepalive: true,
@@ -13433,10 +13571,12 @@ function createTerminal(id, opts) {
         return true;
       } catch (error) {
         if (!current()) return false;
-        Draft.markIndeterminate(draft, error && error.message ? error.message : error);
+        const outcome = Draft.failSubmission(draft, error && error.message ? error.message : error);
         _terminalRenderAttachmentDraft(id);
         if (typeof toast === 'function') {
-          toast('Image submission is still interrupted. Retry when the connection recovers.', {
+          toast(outcome === 'indeterminate'
+            ? 'Image submission is still interrupted. Retry when the connection recovers.'
+            : 'Image send failed: ' + (error && error.message ? error.message : error), {
             type: 'error', duration: 4000,
           });
         }
@@ -13641,14 +13781,12 @@ function createTerminal(id, opts) {
         // second time: if the deadline branch (or a supersession) already cleared/replaced
         // the submission, this is a no-op.
         if (!ownerCurrent() || !draft.submission || draft.submission.id !== started.submission.id) return false;
-        const frozen = frozenRef.count;
-        if (frozen > 0) Draft.markIndeterminate(draft, err && err.message ? err.message : err);
-        else Draft.abortSubmission(draft, err && err.message ? err.message : err);
-        _terminalSettleAttachmentDeferredInput(id, 'submit-catch', frozen > 0 ? 'indeterminate' : 'aborted');   // F-D: before the render, which settles too
+        const outcome = Draft.failSubmission(draft, err && err.message ? err.message : err);
+        _terminalSettleAttachmentDeferredInput(id, 'submit-catch', outcome === 'indeterminate' ? 'indeterminate' : 'aborted');   // F-D: before the render, which settles too
         _terminalRenderAttachmentDraft(id);
-        _terminalAttachmentMetric(id, frozen > 0 ? 'freeze_indeterminate' : 'submission_blocked', { attachmentCount: attachments.length });
+        _terminalAttachmentMetric(id, outcome === 'indeterminate' ? 'freeze_indeterminate' : 'submission_blocked', { attachmentCount: attachments.length });
         if (typeof toast === 'function') {
-          toast(frozen > 0
+          toast(outcome === 'indeterminate'
             ? 'Image send state is unknown. Review the provider prompt before retrying.'
             : 'Image attachment failed: ' + (err && err.message ? err.message : err), {
             type: 'error',
@@ -13992,9 +14130,16 @@ function createTerminal(id, opts) {
     if (!e || e.type !== 'keydown') return false;
     if (!e.ctrlKey || e.metaKey || e.altKey || e.shiftKey) return false;
     if (String(e.key || '').toLowerCase() !== 'v') return false;
-    // On non-macOS platforms Ctrl+V already produces a native paste event with
-    // clipboardData. Only bridge macOS Control+V, which otherwise reaches xterm
-    // as a control character and never exposes image clipboard data.
+    // xterm.js 6 handles Ctrl+V keydown itself off macOS: it cancels the keydown and sends
+    // \x16 to the PTY, so the browser never fires a `paste` event with clipboardData
+    // (xterm.js #2478). Claim the keydown on every platform and read the clipboard here;
+    // off macOS a non-image clipboard forwards exactly \x16 (controlVPassthrough, see
+    // _terminalHandleShortcutPaste). Design: docs/nightly-linux-host-portability-2026-10-27.html
+    // section 9.4 WP-14 (decision D-13 option d).
+    return true;
+  }
+
+  function _terminalIsMacPlatform() {
     return /Mac|iPhone|iPad|iPod/i.test(String(navigator.platform || ''));
   }
 
@@ -14022,6 +14167,12 @@ function createTerminal(id, opts) {
         await _terminalInsertPastedImageFiles(files, opts);
         return;
       }
+      if (opts.controlVPassthrough) {
+        // Off macOS, Ctrl+V with no image keeps its terminal meaning (^V for Claude Code's own
+        // image paste, vim, shells). Text paste is Ctrl+Shift+V / the native paste event.
+        _terminalForwardObservedInput(id, '\x16', { resolveWaiting: false });
+        return;
+      }
       if (navigator.clipboard && typeof navigator.clipboard.readText === 'function') {
         const text = await navigator.clipboard.readText();
         if (text) {
@@ -14358,7 +14509,7 @@ function createTerminal(id, opts) {
             exited: current._exited,
             agentKind,
             hasScrollback,
-            readerOpen: !!(window.TerminalHistoryViewport && window.TerminalHistoryViewport.isActive(id)), // WP-0 §5 D-3
+            readerOpen: !!(window.TerminalHistoryViewport && window.TerminalHistoryViewport.isActive(id)), historyReader: !!(window.HistoryAppSeam && window.HistoryAppSeam.historyReader(current)), // WP-0 §5 D-3; WP-1 D-1/D-3: reader only where a source exists
           }),
           {
             terminalMouseState: window.StateSyncClient?.terminalMouseState,
@@ -14454,7 +14605,7 @@ function createTerminal(id, opts) {
           wheelRecorder.record(wheelDecisionForDiag.route, {
             bufferType: buf.type, baseY: buf.baseY, deltaY: e.deltaY, action: wheelDecisionForDiag.action,
             appMouse: wheelDecisionForDiag.mouseActive, isAlt: wheelDecisionForDiag.isAlt,
-            mouseSource: wheelDecisionForDiag.mouseState && wheelDecisionForDiag.mouseState.source, frameTracking: wheelDecisionForDiag.frameTracking,
+            mouseSource: wheelDecisionForDiag.mouseState && wheelDecisionForDiag.mouseState.source, frameTracking: wheelDecisionForDiag.frameTracking, historyReader: wheelDecisionForDiag.historyReader,
           });
         }
       }
@@ -17744,9 +17895,8 @@ function syncNavPills(activeId) {
   const navPills = document.querySelectorAll('#topbar-nav .nav-pill');
   const specialPanels = ['rules', 'insights', 'permissions', 'prompts', 'codereview', 'walle', 'models', 'backups', 'worktrees', 'machines', 'setup'];
   const navId = specialPanels.includes(activeId) ? activeId : 'sessions';
-  navPills.forEach(pill => {
-    pill.classList.toggle('active', pill.dataset.nav === navId);
-  });
+  navPills.forEach(pill => pill.classList.toggle('active', pill.dataset.nav === navId));
+  document.getElementById('nav-more-button')?.classList.toggle('nav-more-has-active', !!document.querySelector('#nav-more-dropdown .nav-pill.active'));
 }
 
 function updateTopbarContext(activeId) {
@@ -18217,7 +18367,7 @@ async function standupPerformDeepSearch(query) {
   standupRerender();
   const liveQuery = () => String(state.standup.searchQuery || '').trim();
   try {
-    const url = `/api/sessions/standup/search?q=${encodeURIComponent(query)}&token=${state.token}`;
+    const url = `/api/sessions/standup/search?q=${encodeURIComponent(query)}&token=${state.token}&scope=fleet`;
     const resp = await fetch(url, { cache: 'no-store', signal: controller.signal });
     // Stale-response drop: the user may have kept typing while this was in flight — compare
     // against the LIVE input, not the query we sent (same guard the sidebar's
@@ -18790,7 +18940,7 @@ function renderStandupHistoryCard(result) {
       <div class="standup-card-top">
         <div style="min-width:0;">
           <div class="standup-card-title">${standupEsc(title)}</div>
-          <div class="standup-card-subtitle">${standupEsc(meta || result.sessionId || '')}</div>
+          <div class="standup-card-subtitle">${typeof machineChipHtml === 'function' ? machineChipHtml(result) : ''}${standupEsc(meta || result.sessionId || '')}</div>
         </div>
         ${ago ? `<span class="standup-badge">${standupEsc(ago)}</span>` : ''}
       </div>
@@ -19094,6 +19244,7 @@ function showWallePanel() {
 const _pendingResumeProjections = new Map();
 
 function onCreated(msg) {
+  if (typeof PendingCreate !== 'undefined') PendingCreate.settleCreated(msg);
   // A `created` carrying a restore/deferred-start source is a BACKGROUND
   // announcement (e.g. the server auto-resuming a deferred Wall-E session and
   // broadcasting `created` to every connected client), not a session this user
@@ -19163,13 +19314,18 @@ function onCreated(msg) {
   if (priorSession) _clearTerminalBootstrapAttempt(priorSession, id, 'created-replacement');
   // wp1-fix1-brief.md Failure B: a sessions-list race can pre-build this session's surface (createTerminal via _ensureTerminalSessionClientShape, runtime-20.js) before this `created` ack; createTerminal only removes a PRIOR container when it has no `.term`, so a fully-built one was left mounted while this call appended a second `#term-<id>` -- two `.resume-chip`s, strict-mode violation. Retire it with the same full teardown first.
   if (priorSession?.term && priorSession.container) _disposeSessionClientSurface(priorSession);
-  const { term, fitAddon } = createTerminal(id, { active: true });
+  const { term, fitAddon } = createTerminal(id, { active: true, agentType: msg.agentType || _clientDetectAgentType(msg.cmd || ''), agentCapabilities: msg.agentCapabilities || null });
 
   // Set initial meta so the session appears in the active sessions list immediately
   const s = state.sessions.get(id);
   if (s) {
     s._exited = false;
     s.needsAttach = true;
+    // AC-7b (WP-7): a conv-only session (client caps have no CLI surface) never waits for a PTY
+    // attach — the server sends no terminal frames for it, so the attach bookkeeping above is
+    // cleared immediately. The literal assignment stays so the source-text wiring assertion in
+    // tests/terminal-bootstrap-client-wiring.test.js:2442 still describes this handler.
+    if (s._convOnly === true) s.needsAttach = false;
     s._terminalBootstrapPending = false;
     s._terminalBootstrapRequestSocketGeneration = 0;
     s._terminalBootstrapRequestProcessGeneration = 0;
@@ -20816,7 +20972,7 @@ function _stateSyncFrameDeps(s, msg) {
     writeFrame: (out, complete) => (pane ? pane.writeFrame(out, complete) : _writeStateSyncFrame(s, out, complete)),
     onStage: (stage, seq) => _noteStateSyncFrameStage(s, msg, stage, seq),
     sendAck: (seq) => send(_stateSyncFrameAckPayload(s, msg, seq)),
-    requestKeyframe: (reason) => _requestStateSyncKeyframe(msg.id, { reason }),
+    requestKeyframe: (reason, opts) => _requestStateSyncKeyframe(msg.id, { reason, ...(opts || {}) }),
     cellCodec: window.StateSyncCellCodec,
     send,
     onRendered: pane ? pane.onRendered : _stateSyncFrameOnRendered(s, msg, contentFrameV2),
@@ -23716,6 +23872,10 @@ function onSessionRestoreDeferred(msg) {
   if (!s) return;
   _clearExhaustedResumeBlock(s);
   const starting = !!msg.starting;
+  // WP-2 (live-defer-wake-adopted-host-death-2026-10-28.html R-4): a NON-starting deferred frame means
+  // this session's process is gone and nothing is being resumed -- retire the route (no preserveRoute)
+  // so the next activation of this tab sends a fresh terminal-bootstrap and the server can wake it.
+  if (!starting) _clearTerminalBootstrapAttempt(s, id, 'restore-deferred', { keepCold: true });
   if (!starting && /parked/i.test(String(msg.message || ''))) {
     _applySessionLifecycleState(s, 'parked');
     if (s.meta) s.meta.parkReason = String(msg.reason || '');
@@ -24428,7 +24588,16 @@ async function onSessionsList(msg, options = {}) {
       if (s) s.needsAttach = true;
     }
     if (!state.tabOrder.includes(sess.id)) {
-      state.tabOrder.push(sess.id);
+      // WP-5 (AC-5b/5c): a tab the restore deferred because the hub had not delivered its session
+      // yet (a BOX session before the catalog lands) comes back at its SAVED place — right after the
+      // nearest saved predecessor present now — instead of appending at the end of the strip.
+      if (state._undeliveredTabIds && state._undeliveredTabIds.has(sess.id)) {
+        state.tabOrder.splice(
+          _undeliveredTabInsertIndex(sess.id, state._undeliveredTabSaved || [], state.tabOrder), 0, sess.id);
+        state._undeliveredTabIds.delete(sess.id);
+      } else {
+        state.tabOrder.push(sess.id);
+      }
     }
     // Store metadata (preserve type for Wall-E sessions)
     const existing = state.sessions.get(sess.id);
@@ -24703,12 +24872,22 @@ async function onSessionsList(msg, options = {}) {
       _maybeRearmTerminalBootstrapFromInventory(existing, sess, { restoring });
     }
   }
+  // WP-1 (D-7/§6.4): the stubs are in place — adopt a pending New Session that showed up as a row.
+  if (typeof PendingCreate !== 'undefined') PendingCreate.adoptFromList(msg.sessions || []);
   // D-7: a FULL list that omits the id is the server's own evidence that the close landed — only
   // then is the pending entry dropped (no timer). A restoring list is partial by design, so it is no evidence.
   if (!restoring) for (const pendingId of Array.from(state.pendingCloseIds.keys())) {
     if (!serverIds.has(pendingId)) state.pendingCloseIds.delete(pendingId);
   }
 
+  // WP-5 (AC-5d): SETTLE the undelivered set. A non-restoring list from a hub with every machine's
+  // catalog delivered (`machinesPending` absent or 0) classifies every id: present ⇒ it is in
+  // state.sessions (the arrival above already placed it); absent ⇒ the hub is done telling us, so the
+  // id is dropped at the next save instead of being rewritten forever. Settling itself saves nothing.
+  if (!restoring && !(msg.machinesPending > 0) && state._undeliveredTabIds && state._undeliveredTabIds.size) {
+    state._undeliveredTabIds.clear();
+  }
+
   if (!options.skipStreamStatusRefresh && !restoring && typeof refreshStreamStatuses === 'function') {
     await refreshStreamStatuses({ force: true, render: false, timeoutMs: 3000,
       lease: options.lease, socket: options.socket, isCurrent: ownsRoot });
@@ -25324,7 +25503,7 @@ function populateModelSwitcher(sessionId, opts) {
     leadHost.appendChild(tagEl);
   });
   if (chipView.showTokens) _renderModelTokenBadge(leadHost, s.meta?.tokens);
-  chip.title = chipView.title;
+  chip.title = chipView.title; if (window.CTMCodingModelPresentation) window.CTMCodingModelPresentation.syncNativeSubagentChip(chip, s, _clientAgentTypeForSession(s)); // WP-3 D-6: passive 'native sub-agents off' chip
 
   // The request decoration + delegate segment (never the lead label: D-3), then the registry names.
   if (window.CtmSessionModelPicker) window.CtmSessionModelPicker.syncChip(sessionId, chip);
@@ -25384,6 +25563,9 @@ let currentActiveSort = 'by_activity';
 let activeListExpanded = false;
 let activeListVisibleLimit = 6;
 let activeProjectCollapsedKeys = new Set();
+let currentActiveComputerFilter = null; // null = all computers, '' = Local, else an instanceId (pref active_computer_filter)
+let activeComputerMenuSig = null;
+let activeComputerSeenLabels = new Map();
 const ACTIVE_LIST_VISIBLE_LIMIT = 6;
 const ACTIVE_LIST_MIN_VISIBLE = 3;
 const ACTIVE_LIST_ROW_STEP_PX = 44;
@@ -25790,6 +25972,35 @@ function toggleActiveProjectGroup(key, event) {
   renderSessionList(true);
 }
 
+function setActiveComputerFilter(v) {
+  currentActiveComputerFilter = typeof v === 'string' ? v : null;
+  savePref('active_computer_filter', currentActiveComputerFilter);
+  if (recentSourceChanged(currentActiveComputerFilter)) loadRecentSessions().catch(() => {});
+  renderSessionList(true);
+  refreshRecentSearchAfterFilterChange();
+}
+
+// G-3: the removable chip in both list headers (empty when the filter is null).
+function syncActiveComputerFilterChips(label) {
+  const html = currentActiveComputerFilter === null ? '' : activeComputerFilterChipHtml({ label, escHtml });
+  for (const id of ['active-computer-filter-chip', 'recent-computer-filter-chip']) {
+    const el = document.getElementById(id);
+    if (el && el.innerHTML !== html) el.innerHTML = html;
+  }
+}
+
+// F-5: rewrite the Computers optgroup only when its signature changed (an open native menu survives re-renders).
+function syncActiveComputerMenu() {
+  const sel = document.getElementById('active-sort');
+  if (!sel) return;
+  const f = currentActiveComputerFilter;
+  const m = activeComputerMenuModel(Array.from(state.sessions.values()).filter(s => s && s.meta), f, activeComputerSeenLabels);
+  for (const [k, l] of m.labels) activeComputerSeenLabels.set(k, l);
+  sel.classList.toggle('computer-filtered', f !== null);
+  sel.title = f === null ? 'Sort active sessions' : 'Sort active sessions \u00b7 showing ' + m.labels.get(f) + ' only';
+  activeComputerMenuSig = applyActiveComputerOptgroup(sel, m, activeComputerMenuSig);
+  syncActiveComputerFilterChips(f === null ? '' : (m.labels.get(f) || (f === '' ? 'Local' : f)));
+}
 
 function activeListSessionCount() {
   return Array.from(state.sessions.values()).filter(s => s && s.meta).length;
@@ -25909,18 +26120,68 @@ function workspaceTrackingAttentionStatus(tracking) {
   };
 }
 
+// WP-3b (docs/local-landing-queue-multi-session-integration-2026-10-26.html §8 WP-3): the landing
+// queue's chip TEXT. This pair of formatters (here and public/m/app.js) must produce byte-identical
+// strings for the same input — that is the phone parity rule, so they change together. Nothing here
+// is HTML: the callers escape, and the parts carry only numbers and closed-set state words.
+function landingEtaText(etaSeconds) {
+  return typeof etaSeconds === 'number' && Number.isFinite(etaSeconds)
+    ? `${Math.round(etaSeconds / 60)}m` : '';
+}
+function landingQueueText(landing) {
+  if (!landing || typeof landing !== 'object') return '';
+  if (typeof landing.position === 'number' && Number.isFinite(landing.position)) {
+    const total = Number.isFinite(Number(landing.total)) ? Number(landing.total) : 0;
+    const eta = landingEtaText(landing.eta_s);
+    return `⇡#${landing.position}/${total}${eta ? ` · ${eta}` : ''}`;
+  }
+  const state = typeof landing.state === 'string' ? landing.state.trim() : '';
+  return state ? `⇡${state}` : '';
+}
+// The conflict radar is deliberately NOT on the session row: a pairwise count ("⚠L3 ×14") on every
+// idle row was mostly ledger-file noise nobody could act on. It stays in the details panel's Radar
+// row (session-workspace-tracking.js) and the walle_landing_conflicts MCP tool.
+function landingChipText(landing) {
+  return landingQueueText(landing);
+}
+function landingBadgeParts(landing) {
+  const parts = [];
+  const titles = [];
+  const queueText = landingQueueText(landing);
+  if (queueText) {
+    parts.push(`<span class="wt-part wt-landing" aria-hidden="true">${escHtml(queueText)}</span>`);
+    const state = typeof landing.state === 'string' && landing.state.trim() ? ` ${landing.state.trim()}` : '';
+    const eta = landingEtaText(landing.eta_s);
+    titles.push(`landing queue${state}${eta ? `, ETA ${eta}` : ''}`);
+  }
+  return { parts, titles };
+}
+// The badge for a session whose ONLY news is the landing queue — same element, same class, no
+// attention parts. Returns '' when there is nothing to show, which is what keeps a session with
+// neither attention nor landing byte-identical to before.
+function landingBadgeHtml(s, parts, titles) {
+  if (!parts.length) return '';
+  const label = [activeSessionBranchName(s), ...titles].filter(Boolean).join(': ');
+  return `<span class="worktree-attn-badge" title="${escHtml(label)}" aria-label="${escHtml(label)}">${parts.join('')}</span>`;
+}
+
 function worktreeAttentionBadge(s) {
   const tracking = typeof SessionWorkspaceTracking !== 'undefined' ? SessionWorkspaceTracking.trackingForSession(s) : null;
+  // WP-3b: the landing parts are computed BEFORE the attention guard, because a session on a clean
+  // branch can still be #1 in the queue and must show its position (design §8 WP-3, the guard gotcha).
+  const landing = tracking && tracking.landing && typeof tracking.landing === 'object'
+    ? landingBadgeParts(tracking.landing)
+    : { parts: [], titles: [] };
   const wt = tracking ? workspaceTrackingAttentionStatus(tracking) : s?.meta?.worktreeStatus;
-  if (!wt || !wt.needsAttention) return '';
+  if (!wt || !wt.needsAttention) return landingBadgeHtml(s, landing.parts, landing.titles);
   const branch = wt.branch || activeSessionBranchName(s);
-  if (!branch || branch === 'main' || branch === 'master') return '';
+  if (!branch || branch === 'main' || branch === 'master') return landingBadgeHtml(s, landing.parts, landing.titles);
   const dirtyFiles = Number(wt.dirtyFiles || 0);
   const trackedDirtyFiles = wt.trackedDirtyFiles != null
     ? Number(wt.trackedDirtyFiles || 0)
     : Math.max(0, dirtyFiles - Number(wt.untrackedFiles || 0));
   const unmergedCommits = Number(wt.unmergedCommits || 0);
-  if (trackedDirtyFiles <= 0 && unmergedCommits <= 0) return '';
+  if (trackedDirtyFiles <= 0 && unmergedCommits <= 0) return landingBadgeHtml(s, landing.parts, landing.titles);
 
   const parts = [];
   const titleParts = [];
@@ -25944,8 +26205,8 @@ function worktreeAttentionBadge(s) {
     parts.push('<span class="wt-part" aria-hidden="true">&#9670;</span>');
     titleParts.push('merge content differs relative to configured base');
   }
-  const title = `${branch}: ${titleParts.join(', ')}`;
-  return `<span class="worktree-attn-badge" title="${escHtml(title)}" aria-label="${escHtml(title)}">${parts.join('')}</span>`;
+  const title = `${branch}: ${titleParts.concat(landing.titles).join(', ')}`;
+  return `<span class="worktree-attn-badge" title="${escHtml(title)}" aria-label="${escHtml(title)}">${parts.join('')}${landing.parts.join('')}</span>`;
 }
 
 
@@ -26076,11 +26337,9 @@ function titleMatchesWorktreeLeaf(title, cwd) {
 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';
+  // S-11 (opencode-followups D-5): the ONE command-word detector, shared with the server.
+  const label = { dsh: 'DeepSeek Harness session', codex: 'Codex session', gemini: 'Gemini session', opencode: 'OpenCode session', claude: 'Claude Code session' }[window.CtmAgentCommand.detectAgentType(meta.cmd || '')];
+  if (label) return label;
   return id ? `Session ${String(id).slice(0, 8)}` : 'Session';
 }
 
@@ -26732,7 +26991,15 @@ function closeWorkerRow(id) {
 async function retireWorkers(body) {
   try {
     const res = await fetch('/api/sessions/workers/retire', { method: 'POST', headers: { 'Content-Type': 'application/json', 'Authorization': 'Bearer ' + state.token }, body: JSON.stringify(body) });
-    if (!res.ok) { showToast(`Could not clear workers (${res.status})`); return null; }
+    // WP-1b (§8): a box-owned lead's clear is forwarded by the hub to the box that owns the session, so
+    // a machine_unreachable refusal names that box; any other refusal (and a body that is absent or not
+    // JSON) keeps today's bare-status toast.
+    if (!res.ok) {
+      let refusal = null;
+      try { refusal = await res.json(); } catch { refusal = null; }
+      showToast(refusal?.code === 'machine_unreachable' ? `${refusal.machineName || 'The machine that owns this session'} is unreachable. Retry when ready.` : `Could not clear workers (${res.status})`);
+      return null;
+    }
     return await res.json();
   } catch (err) { showToast(`Could not clear workers: ${err && err.message}`); return null; }
 }
@@ -26751,7 +27018,16 @@ function clearFinishedWorkers(parentId) {
   // items are not CTM sessions, so they cannot ride retireWorkers' worker list; the sidecar
   // endpoint drops them from the lead's meta.native_subagents. Fire-and-forget: the next
   // sessions frame reconciles the rows.
-  if ((state.sessions.get(parentId)?.meta?.native_subagents?.items || []).some(i => i.status !== 'running' && i.status !== 'unknown')) fetch('/api/sessions/' + encodeURIComponent(parentId) + '/native-subagents/clear', { method: 'POST', headers: { 'Authorization': 'Bearer ' + state.token } }).then(res => { if (!res.ok) showToast(`Could not clear subagents (${res.status})`); }).catch(err => showToast('Could not clear subagents: ' + (err && err.message)));
+  if ((state.sessions.get(parentId)?.meta?.native_subagents?.items || []).some(i => i.status !== 'running' && i.status !== 'unknown')) {
+    // WP-1b (§8): same refusal copy as retireWorkers above — an unreachable box names itself, and a
+    // body that is absent or not JSON keeps today's bare-status toast.
+    fetch('/api/sessions/' + encodeURIComponent(parentId) + '/native-subagents/clear', { method: 'POST', headers: { 'Authorization': 'Bearer ' + state.token } }).then(async res => {
+      if (res.ok) return;
+      let refusal = null;
+      try { refusal = await res.json(); } catch { refusal = null; }
+      showToast(refusal?.code === 'machine_unreachable' ? `${refusal.machineName || 'The machine that owns this session'} is unreachable. Retry when ready.` : `Could not clear subagents (${res.status})`);
+    }).catch(err => showToast('Could not clear subagents: ' + (err && err.message)));
+  }
   retireWorkers({ lead: parentId });
 }
 
@@ -26884,7 +27160,9 @@ function renderSessionList(force) {
   // always shrink-wraps its actual rows and cannot leave a blank canyon.
   list.style.height = '';
   list.style.flexShrink = '';
+  syncActiveComputerMenu();
   let sessions = Array.from(state.sessions.entries()).filter(([id, s]) => s.meta);
+  if (currentActiveComputerFilter !== null) sessions = sessions.filter(([, s]) => activeComputerFilterPasses(s, currentActiveComputerFilter));
   const statusSnapshot = new Map();
   const statusFor = (id, s) => {
     if (!statusSnapshot.has(id)) statusSnapshot.set(id, getSessionStatus(s));
@@ -26937,39 +27215,16 @@ function renderSessionList(force) {
       });
     }
   }
-  let projectLabelByKey = null;
+  let groupInfo = null; // { keyOf, labels, unitPrefix } while a grouped sort mode is active
   if (currentActiveSort === 'tab_order') {
     sessions.sort(tabOrderSortCmp);
-  } else if (currentActiveSort === 'by_project') {
-    // Group by project directory. Groups are ordered so the project with the most
-    // urgent session floats up (best status rank, then most-recent activity);
-    // within a group, sessions follow the same status-then-activity order as the
-    // activity view.
-    const ranks = (typeof SessionActivityUtils !== 'undefined' && SessionActivityUtils.ACTIVE_STATUS_RANK)
-      ? SessionActivityUtils.ACTIVE_STATUS_RANK
-      : { running: 0, resuming: 1, waiting: 2, idle: 3, exited: 4 };
-    const projectAgg = new Map(); // key -> { rank, recent }
-    for (const [id, s] of sessions) {
-      const k = activeSessionProjectKey(s);
-      const rank = ranks[activeStatusBucket(statusFor(id, s).cls)] ?? 4;
-      const recent = activeSessionLastActivityMs(s);
-      const cur = projectAgg.get(k) || { rank: 99, recent: 0 };
-      if (rank < cur.rank) cur.rank = rank;
-      if (recent > cur.recent) cur.recent = recent;
-      projectAgg.set(k, cur);
-    }
-    projectLabelByKey = activeSessionProjectLabels(Array.from(projectAgg.keys()));
-    sessions.sort((a, b) => {
-      const ka = activeSessionProjectKey(a[1]);
-      const kb = activeSessionProjectKey(b[1]);
-      if (ka !== kb) {
-        const ga = projectAgg.get(ka);
-        const gb = projectAgg.get(kb);
-        if (ga.rank !== gb.rank) return ga.rank - gb.rank;
-        if (ga.recent !== gb.recent) return gb.recent - ga.recent;
-        return ka < kb ? -1 : 1;
-      }
-      return compareActiveByStatusThenDisplayOrder(a, b, (entry) => activeStatusBucket(statusFor(entry[0], entry[1]).cls));
+  } else if (activeSortIsGrouped(currentActiveSort)) {
+    groupInfo = sortActiveGroupedSessions(currentActiveSort, sessions, {
+      bucketOf: (id, s) => activeStatusBucket(statusFor(id, s).cls),
+      projectKey: activeSessionProjectKey,
+      projectLabels: activeSessionProjectLabels,
+      lastActivityMs: activeSessionLastActivityMs,
+      compareRows: (a, b) => compareActiveByStatusThenDisplayOrder(a, b, (entry) => activeStatusBucket(statusFor(entry[0], entry[1]).cls)),
     });
   } else {
     sessions.sort((a, b) => compareActiveByStatusThenDisplayOrder(
@@ -27031,27 +27286,15 @@ function renderSessionList(force) {
         return acc;
       }, {})
     : {};
-  const projectActiveKeys = currentActiveSort === 'by_project'
-    ? sessions.reduce((acc, [id, s]) => {
-        if (id === state.activeTab) acc.add(activeSessionProjectKey(s));
-        return acc;
-      }, new Set())
-    : new Set();
-  const renderProjectGroupSep = (key, count) => {
-    const label = (projectLabelByKey && projectLabelByKey.get(key)) || '(no project)';
-    const collapsed = isActiveProjectCollapsed(key);
-    const hasActive = projectActiveKeys.has(key);
-    const title = key || 'No project directory';
-    const verb = collapsed ? 'Expand' : 'Collapse';
-    return `<button type="button" class="session-group-sep project-sep${collapsed ? ' collapsed' : ''}${hasActive ? ' has-active' : ''}" data-project-key="${escHtml(key)}" title="${escHtml(title)}" aria-expanded="${collapsed ? 'false' : 'true'}" aria-label="${verb} ${escHtml(label)} project group, ${count} active session${count === 1 ? '' : 's'}" onclick="toggleActiveProjectGroup('${activeSessionJsArg(key)}', event)"><span class="project-sep-chevron" aria-hidden="true">▾</span>${projectGroupFolderIconSvg(13)}<span class="project-sep-label">${escHtml(label)}</span><span class="project-sep-count">${count}</span></button>`;
-  };
-  const projectCounts = currentActiveSort === 'by_project'
-    ? sessions.reduce((acc, [, s]) => {
-        const k = activeSessionProjectKey(s);
-        acc[k] = (acc[k] || 0) + 1;
-        return acc;
-      }, {})
-    : {};
+  const groupCountByKey = new Map();
+  const groupActiveKeys = new Set();
+  if (groupInfo) {
+    for (const [id, s] of sessions) {
+      const k = groupInfo.keyOf(s);
+      groupCountByKey.set(k, (groupCountByKey.get(k) || 0) + 1);
+      if (id === state.activeTab) groupActiveKeys.add(k);
+    }
+  }
 
   let lastGroup = null;
   const units = [];
@@ -27062,10 +27305,14 @@ function renderSessionList(force) {
         units.push({ key: 'sep:' + cls, html: renderGroupSep(cls, groupCounts[cls] || 0) });
         lastGroup = cls;
       }
-    } else if (currentActiveSort === 'by_project') {
-      const k = activeSessionProjectKey(s);
+    } else if (groupInfo) {
+      const k = groupInfo.keyOf(s);
       if (k !== lastGroup) {
-        units.push({ key: 'psep:' + k, html: renderProjectGroupSep(k, projectCounts[k] || 0) });
+        units.push({ key: groupInfo.unitPrefix + k, html: activeGroupHeaderHtml(currentActiveSort, {
+          key: k, label: groupInfo.labels.get(k), count: groupCountByKey.get(k) || 0,
+          collapsed: isActiveProjectCollapsed(k), hasActive: groupActiveKeys.has(k),
+          iconHtml: projectGroupFolderIconSvg(13), escHtml, jsArg: activeSessionJsArg,
+        }) });
         lastGroup = k;
       }
       if (!isActiveFiltering && isActiveProjectCollapsed(k)) return;
@@ -27220,7 +27467,13 @@ async function dismissSessionAttention(id, event) {
 // Switch the Active Sessions sort mode and persist. Defaults are set at
 // the top of this block; loadPrefs() hydrates from the server-side store.
 function setActiveSort(mode) {
-  if (mode !== 'by_activity' && mode !== 'tab_order' && mode !== 'by_project') mode = 'by_activity';
+  const computerFilter = parseActiveComputerOptionValue(mode);
+  if (computerFilter !== undefined) {
+    const csel = document.getElementById('active-sort');
+    if (csel) csel.value = currentActiveSort;
+    return setActiveComputerFilter(computerFilter);
+  }
+  mode = normalizeActiveSort(mode);
   currentActiveSort = mode;
   savePref('active_sort', mode);
   const sel = document.getElementById('active-sort');
@@ -28652,7 +28905,30 @@ function moveTabToStart(id) {
 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');
-  savePref('tab_order', sessionOrder);
+  savePref('tab_order', _withUndeliveredTabIds(sessionOrder));
+}
+
+// WP-5 (S-12): an undelivered id is written back where it was saved — right after its nearest
+// SAVED predecessor that is present now (or at the front) — so a user reorder of the present tabs
+// is honoured and the box tab still comes back in its place when the catalog lands.
+function _withUndeliveredTabIds(order) {
+  const pending = state._undeliveredTabIds;
+  if (!pending || pending.size === 0) return order;
+  const saved = state._undeliveredTabSaved || [];
+  const out = order.slice();
+  for (const id of saved) {
+    if (!pending.has(id) || out.includes(id)) continue;
+    out.splice(_undeliveredTabInsertIndex(id, saved, out), 0, id);
+  }
+  return out;
+}
+
+function _undeliveredTabInsertIndex(id, saved, out) {
+  for (let k = saved.indexOf(id) - 1; k >= 0; k -= 1) {
+    const at = out.indexOf(saved[k]);
+    if (at !== -1) return at + 1;
+  }
+  return 0;
 }
 
 // --- Actions ---
@@ -28697,7 +28973,7 @@ var _nsPathPickerState = {
   activeIndex: -1,
   items: [],
   projects: [],
-  projectsLoaded: false,
+  projectsLoaded: false, projectsError: false, // projectsError (D-6): the list FAILED to read — never an empty list
   projectsLoading: false,
   worktreeTimer: 0,
   expanded: {},        // { projectKey: true } — worktrees the user has revealed
@@ -28967,12 +29243,12 @@ function _nsPathLoadProjects() {
   // are the only place the same-repo prefill looks — plain gitRemoteKey equality inside
   // nsMachineAfterProjectsLoaded(), against the keys of the machine we are pointed at.
   fetch('/api/projects?token=' + encodeURIComponent(state.token || '') + machineQueryParam())
-    .then(function(r) { return r.ok ? r.json() : []; })
+    .then(function(r) { if (!r.ok) throw new Error('projects read failed'); return r.json(); })
     .then(function(projects) {
       _nsPathPickerState.projects = Array.isArray(projects)
         ? projects.filter(function(p) { return p && p.path; })
         : [];
-      _nsPathPickerState.projectsLoaded = true;
+      _nsPathPickerState.projectsLoaded = true; _nsPathPickerState.projectsError = false;
       _nsPathPickerState.projectsLoading = false;
       _nsPathRefreshHostStatus();
       if (typeof nsMachineAfterProjectsLoaded === 'function') nsMachineAfterProjectsLoaded(_nsPathPickerState);
@@ -28981,7 +29257,8 @@ function _nsPathLoadProjects() {
       if (typeof _storagePathRepaintOpen === 'function') _storagePathRepaintOpen();
     })
     .catch(function() {
-      _nsPathPickerState.projectsLoading = false;
+      _nsPathPickerState.projectsLoading = false; _nsPathPickerState.projectsError = true; // D-6: UNKNOWN, not "no projects"; not latched
+      if (typeof nsMachineAfterProjectsLoaded === 'function') nsMachineAfterProjectsLoaded(_nsPathPickerState);
     });
 }
 
@@ -29831,7 +30108,7 @@ function _nsWorktreeNamespaceForAgent(agentType) {
 function _nsAgentUsesCodeWorkspace() {
   var val = document.getElementById('ns-agent').value || 'claude:';
   var agent = val.replace(/:$/, '');
-  return ['claude', 'codex', 'gemini', 'walle'].indexOf(agent) !== -1;
+  return ['claude', 'codex', 'gemini', 'walle', 'dsh'].indexOf(agent) !== -1;
 }
 
 function _nsHasActiveSessionInCwd(cwd) {
@@ -29949,73 +30226,13 @@ function showNewSessionModal() {
   var createBtn = document.querySelector('#new-session-modal .btn.primary');
   if (createBtn) { createBtn.disabled = false; createBtn.textContent = 'Create'; }
 
-  var grid = document.getElementById('ns-agent-grid');
   document.getElementById('ns-agent').value = 'claude:';
 
-  // Agent card definitions. The `agent` key drives providerIconSvg() so the
-  // card icon renders the SAME brand mark that appears in the session-list
-  // sidebar and tab header — agent identity is one visual vocabulary across
-  // the whole UI. Single-letter fallbacks ('$', '>') stay for `shell` and
-  // `custom`, which aren't LLM-branded surfaces.
-  var agentDefs = [
-    { id: 'claude:', name: 'Claude Code', sub: 'Anthropic', color: '#D97757', agent: 'claude', detect: 'claude' },
-    { id: 'codex:',  name: 'Codex', sub: 'OpenAI', color: '#22c55e', agent: 'codex', detect: 'codex' },
-    { id: 'opencode:', name: 'OpenCode', sub: 'GLM 5.2', color: '#e0af68', agent: 'opencode', detect: 'opencode' },
-    { id: 'walle:',  name: 'Wall-E', sub: 'Smart routing', color: '#f59e0b', agent: 'walle', detect: null },
-    { id: 'cursor:', name: 'Cursor', sub: 'Anysphere', color: '#111827', accent: '#7aa2f7', agent: 'cursor', detect: 'cursor-agent' },
-    { id: 'gemini:', name: 'Gemini CLI', sub: 'Google', color: '#3b82f6', agent: 'gemini', detect: 'gemini' },
-    { id: 'shell:',  name: 'Shell', sub: 'Terminal', color: '#6b7280', icon: '$', detect: null },
-  ];
-
-  function agentAvailability(agents, detectKey) {
-    if (!detectKey) return { known: true, available: true, path: null };
-    if (!agents) return { known: false, available: true, path: null };
-    var detail = agents.agents && agents.agents[detectKey] ? agents.agents[detectKey] : agents[detectKey];
-    if (detail && typeof detail === 'object') {
-      return { known: true, available: detail.available !== false, path: detail.path || detail.realpath || null };
-    }
-    if (typeof detail === 'boolean') return { known: true, available: detail, path: null };
-    return { known: false, available: true, path: null };
-  }
-
-  function renderAgentCards(agents) {
-    var selected = document.getElementById('ns-agent').value || 'claude:';
-    grid.innerHTML = '';
-    agentDefs.forEach(function(def) {
-        var availability = agentAvailability(agents, def.detect);
-        var available = availability.available;
-        var card = document.createElement('div');
-        card.className = 'ns-agent-card' + (available ? '' : ' not-detected');
-        card.style.setProperty('--ns-card-accent', def.accent || def.color);
-        card.dataset.value = def.id;
-        if (availability.path) card.title = def.name + ': ' + availability.path;
-        else if (availability.known && available === false) card.title = def.name + ' CLI not detected on PATH. You can still select it; launch will show the real terminal error if the command is unavailable.';
-        // Render a real brand icon when the agent maps to one (claude/codex/
-        // gemini/opencode/walle); otherwise the textual fallback ($, >) stays.
-        // Inline color forces the brand tint regardless of theme — these
-        // tiles always show on the dark agent-picker background, never on
-        // an active highlight, so we don't need the dark-on-light invert
-        // that the session-list .active rule applies via currentColor.
-        var iconHtml = def.agent
-          ? '<div class="ns-card-icon" style="background:' + def.color + ';color:#fff;">'
-              + providerIconSvg(def.agent, 22) + '</div>'
-          : '<div class="ns-card-icon" style="background:' + def.color + '">' + def.icon + '</div>';
-        card.innerHTML =
-          iconHtml +
-          '<div class="ns-card-name">' + def.name + '</div>' +
-          '<div class="ns-card-sub">' + def.sub + (available === false ? ' (not found)' : '') + '</div>';
-        card.onclick = function() { _selectAgentCard(def.id); };
-        grid.appendChild(card);
-      });
-    _selectAgentCard(selected);
-  }
-
-  renderAgentCards(null);
-
-  fetch('/api/models/available-agents?token=' + encodeURIComponent(state.token))
-    .then(function(r) { return r.json(); })
-    .then(function(agents) { renderAgentCards(agents); })
-    .catch(function() { renderAgentCards(null); });
+  // S-43 (WP-7, docs/deepseek-harness-acp-agent-2026-10-28.html §9): the agent grid — the card
+  // table (with the dsh card between gemini: and shell:), PATH availability, the OQ-4 Model select,
+  // the D-15 remote-machine disable and the D-16 MCP disable — now lives in
+  // public/js/new-session-agent-grid.js; index.html is at its file-size ceiling.
+  NewSessionAgentGrid.open();
 
   document.getElementById('ns-label').focus();
   _maybeRecommendWorktreeForNewSession(true);
@@ -31602,8 +31819,9 @@ async function loadPrefs(opts = {}) {
       }
 
       // Restore Active Sessions sort + expand prefs.
-      if (prefs.active_sort === 'tab_order' || prefs.active_sort === 'by_activity' || prefs.active_sort === 'by_project') {
-        currentActiveSort = prefs.active_sort;
+      const restoredSort = normalizeActiveSort(prefs.active_sort);
+      if (prefs.active_sort === restoredSort) {
+        currentActiveSort = restoredSort;
         const sel = document.getElementById('active-sort');
         if (sel) sel.value = currentActiveSort;
       }
@@ -31616,6 +31834,7 @@ async function loadPrefs(opts = {}) {
       if (Array.isArray(prefs.active_project_collapsed_keys)) {
         activeProjectCollapsedKeys = new Set(normalizeActiveProjectCollapsedKeys(prefs.active_project_collapsed_keys));
       }
+      currentActiveComputerFilter = typeof prefs.active_computer_filter === 'string' ? prefs.active_computer_filter : null;
       // Lifecycle WP-6 (§5 D-3, §9 S-25): hydrate the per-parent worker-group toggle state.
       // Pruning against state.sessions happens lazily in toggleWorkerGroup (loadPrefs can
       // race the session-list fetch at boot, so pruning here risks discarding a real toggle
@@ -31985,34 +32204,35 @@ async function loadRecentSessions(options = {}) {
   // Keep the Claude Desktop fork map fresh so review actions show Convert vs Resume-fork.
   refreshDesktopForkMap();
   if (!_isRootPrivateLeaseCurrent(lease)) return;
+  const _recent = beginRecentLoad(currentActiveComputerFilter), _live = () => _isRootPrivateLeaseCurrent(lease) && _recent.token === recentMachineLoad.token;
   let res;
   let data;
   try {
-    res = await fetch(`/api/recent-sessions?token=${state.token}&limit=200`);
-    if (!_isRootPrivateLeaseCurrent(lease)) return;
-    data = await res.json();
-    if (!_isRootPrivateLeaseCurrent(lease)) return;
-    if (!res.ok && res.status !== 202) {
+    res = _recent.source.kind === 'machine' ? null : await fetch(recentRequestUrl(`/api/recent-sessions?token=${state.token}&limit=200`, _recent.source));
+    if (!_live()) return;
+    data = res ? recentNoteFleetBody(await res.json()) : recentNoteFleetBody(await fetchMachineRecentRows(fetch, `/api/recent-sessions?token=${state.token}&limit=200`, _recent, activeComputerSeenLabels));
+    if (!_live()) return;
+    if (res && !res.ok && res.status !== 202) {
       throw new Error(`Recent sessions request failed (${res.status})`);
     }
   } catch (error) {
-    if (!_isRootPrivateLeaseCurrent(lease)) return;
+    if (!_live()) return;
     const lastGood = allRecentSessions.length > 0 ? allRecentSessions : _readRecentSessionsLastGood(lease);
-    if (!_isRootPrivateLeaseCurrent(lease)) return;
+    if (!_live()) return;
     if (lastGood.length === 0) throw error;
     data = { sessions: lastGood, stale: true, catalogDegraded: true };
   }
-  if (!_isRootPrivateLeaseCurrent(lease)) return;
+  if (!_live()) return;
   const degraded = res?.status === 202
     || (!Array.isArray(data) && (data?.stale === true || data?.catalogDegraded === true));
   // Support both old (array) and new (object with sessions + lastActiveProject) response formats
   const incoming = Array.isArray(data) ? data : (Array.isArray(data?.sessions) ? data.sessions : []);
   if (incoming.length > 0) {
     allRecentSessions = incoming;
-    if (!degraded) _writeRecentSessionsLastGood(incoming, lease);
+    if (!degraded && res) _writeRecentSessionsLastGood(incoming, lease);
   } else if (degraded) {
     const lastGood = allRecentSessions.length > 0 ? allRecentSessions : _readRecentSessionsLastGood(lease);
-    if (!_isRootPrivateLeaseCurrent(lease)) return;
+    if (!_live()) return;
     if (lastGood.length > 0) allRecentSessions = lastGood;
   } else {
     allRecentSessions = incoming;
@@ -32161,6 +32381,7 @@ function _recentSidebarFilterState() {
     emptyMode: showEmptyOnly ? 'only' : 'exclude',
     project: currentProjectFilter,
     agent: currentAgentFilter,
+    machine: currentActiveComputerFilter,
   };
 }
 
@@ -32466,6 +32687,8 @@ function recentSessionAgentProviderFallback(s) {
   if (agentTypes.includes('gemini')) return 'google';
   if (agentTypes.includes('claude') || agentTypes.includes('claude-desktop')) return 'anthropic';
   if (agentTypes.includes('cursor')) return 'cursor';
+  // WP-7 (S-50): dsh chips use the DeepSeek brand colour (recent-model-provider-deepseek).
+  if (agentTypes.includes('dsh')) return 'deepseek';
   return '';
 }
 
@@ -32511,6 +32734,7 @@ function recentSessionAgentBadgeColorKey(agentType) {
     case 'walle': return 'walle';
     case 'cursor': return 'cursor';
     case 'opencode': return 'opencode';
+    case 'dsh': return 'deepseek';
     default: return '';
   }
 }
@@ -32701,9 +32925,10 @@ function recentSearchEmptyHtml(label) {
   }
   if (currentAgentFilter) details.push('agent ' + escHtml(SessionSearchUtils.recentAgentFilterLabel(currentAgentFilter)));
   if (currentProjectFilter) details.push('project ' + escHtml(currentProjectFilter.replace(/^\/Users\/[^/]+/, '~')));
+  if (currentActiveComputerFilter !== null) details.push('computer ' + escHtml(activeComputerSeenLabels.get(currentActiveComputerFilter) || (currentActiveComputerFilter === '' ? 'Local' : currentActiveComputerFilter)));
   details.push(showEmptyOnly ? 'empty only' : 'non-empty');
   if (document.getElementById('this-device')?.checked !== false) details.push('this device');
-  const detailHtml = rawQuery && details.length
+  const detailHtml = (rawQuery || currentActiveComputerFilter !== null) && 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>';
@@ -32713,7 +32938,7 @@ function renderRecentSessions(sessions) {
   const list = document.getElementById('recent-session-list');
 
   if (sessions.length === 0) {
-    list.innerHTML = recentSearchEmptyHtml('No sessions found');
+    list.innerHTML = recentSearchEmptyHtml(recentMachineLoad.unavailable || 'No sessions found');
     return;
   }
 
@@ -33115,7 +33340,7 @@ function _reviewMessagesUrl(sessionId, projectEntry, opts) {
   let url = `/api/session/messages?id=${encodeURIComponent(sessionId)}`
     + `&project=${encodeURIComponent(projectEntry || '')}`
     + `&token=${state.token}`
-    + '&conversationContract=4';
+    + '&conversationContract=4' + recentRequestUrl('', recentSourceForFilter(state.reviewMachine));
   if (opts.entries) return url + `&entries=${encodeURIComponent(opts.entries)}`;
   url += `&limitTurns=${REVIEW_TURN_PAGE_SIZE}`;
   if (opts.before) url += `&before=${encodeURIComponent(opts.before)}`;
@@ -34324,7 +34549,7 @@ function toggleEmptyFilter() {
 // 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', opencode: 'OpenCode', cursor: 'Cursor', claude: 'Claude Code', 'claude-desktop': 'Claude Desktop', shell: 'Shell' };
+const AGENT_LABELS = { walle: 'Wall-E', codex: 'Codex', gemini: 'Gemini', opencode: 'OpenCode', cursor: 'Cursor', claude: 'Claude Code', 'claude-desktop': 'Claude Desktop', dsh: 'DeepSeek Harness', shell: 'Shell' };
 function getAgentType(s) {
   return _clientAgentTypeForSession(s);
 }
@@ -34385,6 +34610,11 @@ function providerIconSvg(agentType, sizePx) {
             + '<path fill="currentColor" fill-opacity="0.55" d="M2.2 4.75 L8 8 L8 14.5 L2.2 11.25 Z"/>'
             + '<path fill="currentColor" fill-opacity="0.3" d="M8 8 L13.8 4.75 L13.8 11.25 L8 14.5 Z"/>';
       break;
+    case 'dsh':
+      // WP-7 (S-48): the DeepSeek Harness mark is the DeepSeek brand whale — the same
+      // simple-icons path the model-provider rows use (brand colour #4D6BFE, currentColor here so
+      // the sidebar/tab .session-item[data-agent="dsh"] rules keep theming control).
+      return brandIconSvg('deepseek', size);
     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"/>';
@@ -34765,7 +34995,7 @@ function _buildSessionPaletteRow(item, idx) {
   const badge = document.createElement('span');
   badge.style.cssText = 'font-size:9px;padding:1px 6px;border-radius:4px;flex-shrink:0;' + (isActive ? 'background:rgba(0,0,0,0.2);' : 'background:var(--bg);color:var(--fg-dim);');
   badge.textContent = item.kind === 'active' ? 'Tab' : 'View';
-  row.appendChild(badge);
+  row.appendChild(badge); const machineChip = typeof machineSessionChipNode === 'function' && machineSessionChipNode(item.kind === 'active' ? (state.sessions.get(item.sessionId) || item) : item, item.sessionId); if (machineChip) row.insertBefore(machineChip, badge); // fleet WP-5
 
   return row;
 }
@@ -34815,12 +35045,12 @@ async function performServerSearch(query) {
     const grammarQuery = (typeof SessionSearchGrammar !== 'undefined')
       ? (SessionSearchGrammar.parseSearchQuery(query).core || query)
       : query;
-    const res = await fetch(`/api/sessions/search?q=${encodeURIComponent(grammarQuery)}&limit=50&token=${state.token}`);
-    const data = await res.json().catch(() => ({}));
+    const _searchSource = recentSourceForFilter(currentActiveComputerFilter), res = await fetch(recentRequestUrl(`/api/sessions/search?q=${encodeURIComponent(grammarQuery)}&limit=50&token=${state.token}`, _searchSource));
+    const data = stampRecentBodyFromSource(await res.json().catch(() => ({})), _searchSource, activeComputerSeenLabels);
 
-    // Check if query is still current (user may have typed more)
+    // Check if query is still current (user may have typed more, or switched the computer filter below)
     const currentQ = document.getElementById('recent-search').value.trim();
-    if (currentQ.toLowerCase() !== query.toLowerCase()) return;
+    if (currentQ.toLowerCase() !== query.toLowerCase() || (data._sourceKey || '') !== recentSourceKey(recentSourceForFilter(currentActiveComputerFilter))) return;
     if (!res.ok || data.error || !Array.isArray(data.results)) {
       showSearchDegradedFallback(
         query,
@@ -34993,7 +35223,7 @@ function renderServerSearchResults(results, total, query, degraded) {
 
   // 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 || recentSearchEmptyHtml('No results found');
+  list.innerHTML = html || recentSearchEmptyHtml(recentMachineLoad.unavailable || 'No results found');
 }
 
 function updateSearchCount(count, degraded) {