@adhdev/daemon-core 0.8.58 → 0.8.60

package/dist/index.mjs

@@ -1417,6 +1417,7 @@ var init_provider_cli_adapter = __esm({
       static MAX_TRACE_ENTRIES = 250;
       providerResolutionMeta;
       static IDLE_FINISH_CONFIRM_MS = 2e3;
+      static HERMES_IDLE_FINISH_CONFIRM_MS = 5e3;
       static STATUS_ACTIVITY_HOLD_MS = 2e3;
       static FINISH_RETRY_DELAY_MS = 300;
       static MAX_FINISH_RETRIES = 2;
@@ -1424,6 +1425,12 @@ var init_provider_cli_adapter = __esm({
         this.messages = [...this.committedMessages];
         this.structuredMessages = [...this.committedMessages];
       }
+      getIdleFinishConfirmMs() {
+        return this.cliType === "hermes-cli" ? _ProviderCliAdapter.HERMES_IDLE_FINISH_CONFIRM_MS : _ProviderCliAdapter.IDLE_FINISH_CONFIRM_MS;
+      }
+      getStatusActivityHoldMs() {
+        return this.cliType === "hermes-cli" ? _ProviderCliAdapter.HERMES_IDLE_FINISH_CONFIRM_MS : _ProviderCliAdapter.STATUS_ACTIVITY_HOLD_MS;
+      }
       setStatus(status, trigger) {
         const prev = this.currentStatus;
         if (prev === status) return;
@@ -1446,6 +1453,7 @@ var init_provider_cli_adapter = __esm({
       }
       armIdleFinishCandidate(assistantLength) {
         const now = Date.now();
+        const idleFinishConfirmMs = this.getIdleFinishConfirmMs();
         this.idleFinishCandidate = {
           armedAt: now,
           lastOutputAt: this.lastOutputAt,
@@ -1454,7 +1462,7 @@ var init_provider_cli_adapter = __esm({
           assistantLength
         };
         this.recordTrace("idle_candidate_armed", {
-          confirmMs: _ProviderCliAdapter.IDLE_FINISH_CONFIRM_MS,
+          confirmMs: idleFinishConfirmMs,
           candidate: this.idleFinishCandidate,
           ...buildCliTraceParseSnapshot({
             accumulatedBuffer: this.accumulatedBuffer,
@@ -1469,7 +1477,7 @@ var init_provider_cli_adapter = __esm({
           this.settleTimer = null;
           this.settledBuffer = this.recentOutputBuffer;
           this.evaluateSettled();
-        }, _ProviderCliAdapter.IDLE_FINISH_CONFIRM_MS);
+        }, idleFinishConfirmMs);
       }
       recordTrace(type, payload = {}) {
         const entry = {
@@ -1848,7 +1856,8 @@ var init_provider_cli_adapter = __esm({
       hasRecentInteractiveActivity(now) {
         const quietForMs = this.lastNonEmptyOutputAt ? now - this.lastNonEmptyOutputAt : Number.MAX_SAFE_INTEGER;
         const screenStableMs = this.lastScreenChangeAt ? now - this.lastScreenChangeAt : Number.MAX_SAFE_INTEGER;
-        return quietForMs < _ProviderCliAdapter.STATUS_ACTIVITY_HOLD_MS || screenStableMs < _ProviderCliAdapter.STATUS_ACTIVITY_HOLD_MS;
+        const holdMs = this.getStatusActivityHoldMs();
+        return quietForMs < holdMs || screenStableMs < holdMs;
       }
       getStartupConfirmationModal(screenText) {
         const text = sanitizeTerminalText(String(screenText || ""));
@@ -2000,6 +2009,7 @@ var init_provider_cli_adapter = __esm({
           clearPendingScriptStatus();
         }
         const recentInteractiveActivity = this.hasRecentInteractiveActivity(now);
+        const statusActivityHoldMs = this.getStatusActivityHoldMs();
         const shouldHoldGenerating = scriptStatus === "idle" && this.isWaitingForResponse && !modal && recentInteractiveActivity;
         if (shouldHoldGenerating) {
           this.clearIdleFinishCandidate("hold_generating_recent_activity");
@@ -2015,7 +2025,7 @@ var init_provider_cli_adapter = __esm({
             recentInteractiveActivity,
             lastNonEmptyOutputAt: this.lastNonEmptyOutputAt,
             lastScreenChangeAt: this.lastScreenChangeAt,
-            holdMs: _ProviderCliAdapter.STATUS_ACTIVITY_HOLD_MS,
+            holdMs: statusActivityHoldMs,
             ...buildCliTraceParseSnapshot({
               accumulatedBuffer: this.accumulatedBuffer,
               accumulatedRawBuffer: this.accumulatedRawBuffer,
@@ -2104,11 +2114,12 @@ var init_provider_cli_adapter = __esm({
             const screenStableMs = this.lastScreenChangeAt ? now - this.lastScreenChangeAt : 0;
             const hasAssistantTurn = !!lastParsedAssistant;
             const assistantLength = lastParsedAssistant?.content?.length || 0;
-            const idleQuietThresholdMs = Math.max(2e3, this.timeouts.outputSettle);
-            const idleStableThresholdMs = 2e3;
+            const idleFinishConfirmMs = this.getIdleFinishConfirmMs();
+            const idleQuietThresholdMs = Math.max(idleFinishConfirmMs, this.timeouts.outputSettle);
+            const idleStableThresholdMs = idleFinishConfirmMs;
             const idleReady = visibleIdlePrompt && !modal && hasAssistantTurn && quietForMs >= idleQuietThresholdMs && screenStableMs >= idleStableThresholdMs;
             const candidate = this.idleFinishCandidate;
-            const candidateQuiet = !!candidate && candidate.responseEpoch === this.responseEpoch && candidate.lastOutputAt === this.lastOutputAt && candidate.lastScreenChangeAt === this.lastScreenChangeAt && assistantLength >= candidate.assistantLength && now - candidate.armedAt >= _ProviderCliAdapter.IDLE_FINISH_CONFIRM_MS;
+            const candidateQuiet = !!candidate && candidate.responseEpoch === this.responseEpoch && candidate.lastOutputAt === this.lastOutputAt && candidate.lastScreenChangeAt === this.lastScreenChangeAt && assistantLength >= candidate.assistantLength && now - candidate.armedAt >= idleFinishConfirmMs;
             const canFinishImmediately = idleReady && candidateQuiet;
             this.recordTrace("idle_decision", {
               visibleIdlePrompt,
@@ -2120,7 +2131,7 @@ var init_provider_cli_adapter = __esm({
               idleQuietThresholdMs,
               idleStableThresholdMs,
               idleReady,
-              idleFinishConfirmMs: _ProviderCliAdapter.IDLE_FINISH_CONFIRM_MS,
+              idleFinishConfirmMs,
               idleFinishCandidate: candidate,
               candidateQuiet,
               canFinishImmediately,
@@ -3175,6 +3186,70 @@ function setDefaultWorkspaceId(config, id) {
 
 // src/config/recent-activity.ts
 import * as path2 from "path";
+
+// src/providers/summary-metadata.ts
+function normalizeSummaryItem(item) {
+  if (!item || typeof item !== "object") return null;
+  const id = String(item.id || "").trim();
+  const value = String(item.value || "").trim();
+  if (!id || !value) return null;
+  const normalized = {
+    id,
+    value
+  };
+  if (typeof item.label === "string" && item.label.trim()) normalized.label = item.label.trim();
+  if (typeof item.shortValue === "string" && item.shortValue.trim()) normalized.shortValue = item.shortValue.trim();
+  if (typeof item.icon === "string" && item.icon.trim()) normalized.icon = item.icon.trim();
+  if (typeof item.order === "number" && Number.isFinite(item.order)) normalized.order = item.order;
+  return normalized;
+}
+function normalizeProviderSummaryMetadata(summary) {
+  if (!summary || !Array.isArray(summary.items)) return void 0;
+  const items = summary.items.map((item) => normalizeSummaryItem(item)).filter((item) => !!item).sort((left, right) => {
+    const orderDiff = (left.order ?? Number.MAX_SAFE_INTEGER) - (right.order ?? Number.MAX_SAFE_INTEGER);
+    if (orderDiff !== 0) return orderDiff;
+    return left.id.localeCompare(right.id);
+  });
+  return items.length > 0 ? { items } : void 0;
+}
+function buildProviderSummaryMetadata(items) {
+  return normalizeProviderSummaryMetadata({ items: items.filter(Boolean) });
+}
+function buildLegacyModelModeSummaryMetadata(params) {
+  return buildProviderSummaryMetadata([
+    params.model ? {
+      id: "model",
+      label: "Model",
+      value: String(params.modelLabel || params.model).trim(),
+      shortValue: String(params.model).trim(),
+      order: 10
+    } : null,
+    params.mode ? {
+      id: "mode",
+      label: "Mode",
+      value: String(params.modeLabel || params.mode).trim(),
+      shortValue: String(params.mode).trim(),
+      order: 20
+    } : null
+  ]);
+}
+function resolveProviderStateSummaryMetadata(params) {
+  const explicit = normalizeProviderSummaryMetadata(params.summaryMetadata);
+  if (explicit) return explicit;
+  const model = typeof params.controlValues?.model === "string" ? params.controlValues.model : void 0;
+  const mode = typeof params.controlValues?.mode === "string" ? params.controlValues.mode : void 0;
+  return buildLegacyModelModeSummaryMetadata({
+    model,
+    mode,
+    modelLabel: params.modelLabel,
+    modeLabel: params.modeLabel
+  });
+}
+function normalizePersistedSummaryMetadata(params) {
+  return normalizeProviderSummaryMetadata(params.summaryMetadata);
+}
+
+// src/config/recent-activity.ts
 var MAX_ACTIVITY = 30;
 function normalizeWorkspace(workspace) {
   if (!workspace) return "";
@@ -3198,6 +3273,9 @@ function appendRecentActivity(state, entry) {
   const nextEntry = {
     ...entry,
     workspace: entry.workspace ? normalizeWorkspace(entry.workspace) : void 0,
+    summaryMetadata: normalizePersistedSummaryMetadata({
+      summaryMetadata: entry.summaryMetadata
+    }),
     id: buildRecentActivityKeyForEntry(entry),
     lastUsedAt: entry.lastUsedAt || Date.now()
   };
@@ -3208,7 +3286,12 @@ function appendRecentActivity(state, entry) {
   };
 }
 function getRecentActivity(state, limit = 20) {
-  return [...state.recentActivity || []].sort((a, b) => b.lastUsedAt - a.lastUsedAt).slice(0, limit);
+  return [...state.recentActivity || []].map((entry) => ({
+    ...entry,
+    summaryMetadata: normalizePersistedSummaryMetadata({
+      summaryMetadata: entry.summaryMetadata
+    })
+  })).sort((a, b) => b.lastUsedAt - a.lastUsedAt).slice(0, limit);
 }
 function getSessionSeenAt(state, sessionId) {
   return state.sessionReads?.[sessionId] || 0;
@@ -3260,7 +3343,9 @@ function upsertSavedProviderSession(state, entry) {
     providerName: entry.providerName,
     providerSessionId,
     workspace: entry.workspace ? normalizeWorkspace2(entry.workspace) : void 0,
-    currentModel: entry.currentModel,
+    summaryMetadata: normalizePersistedSummaryMetadata({
+      summaryMetadata: entry.summaryMetadata
+    }),
     title: entry.title,
     createdAt: existing?.createdAt || entry.createdAt || Date.now(),
     lastUsedAt: entry.lastUsedAt || Date.now()
@@ -3276,7 +3361,12 @@ function getSavedProviderSessions(state, filters) {
     if (filters?.providerType && entry.providerType !== filters.providerType) return false;
     if (filters?.kind && entry.kind !== filters.kind) return false;
     return true;
-  }).sort((a, b) => b.lastUsedAt - a.lastUsedAt);
+  }).map((entry) => ({
+    ...entry,
+    summaryMetadata: normalizePersistedSummaryMetadata({
+      summaryMetadata: entry.summaryMetadata
+    })
+  })).sort((a, b) => b.lastUsedAt - a.lastUsedAt);
 }
 
 // src/config/state-store.ts
@@ -5033,8 +5123,6 @@ function extractProviderControlValues(controls, data) {
     if (rawValue === void 0 || rawValue === null) continue;
     values[ctrl.id] = normalizeControlValue(rawValue);
   }
-  if (data.model !== void 0 && values.model === void 0) values.model = normalizeControlValue(data.model);
-  if (data.mode !== void 0 && values.mode === void 0) values.mode = normalizeControlValue(data.mode);
   return Object.keys(values).length > 0 ? values : void 0;
 }
 function normalizeProviderEffects(data) {
@@ -5136,7 +5224,7 @@ function normalizeControlOption(option) {
   }
   if (!option || typeof option !== "object") return null;
   const record = option;
-  const value = typeof record.value === "string" ? record.value : typeof record.id === "string" ? record.id : null;
+  const value = typeof record.value === "string" ? record.value : typeof record.id === "string" ? record.id : typeof record.name === "string" ? record.name : null;
   if (!value) return null;
   const label = typeof record.label === "string" ? record.label : typeof record.name === "string" ? record.name : value;
   const normalized = { value, label };
@@ -5671,6 +5759,61 @@ function listSavedHistorySessions(agentType, options = {}) {
   }
 }
 
+// src/providers/provider-patch-state.ts
+function isControlValue(value) {
+  return typeof value === "string" || typeof value === "number" || typeof value === "boolean";
+}
+function asControlValueMap(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return void 0;
+  const result = {};
+  for (const [entryKey, entryValue] of Object.entries(value)) {
+    if (isControlValue(entryValue)) result[entryKey] = entryValue;
+  }
+  return Object.keys(result).length > 0 ? result : void 0;
+}
+function getLegacyModelModeValues(data) {
+  if (!data || typeof data !== "object") return void 0;
+  const legacy = {};
+  if (typeof data.model === "string" && data.model.trim()) legacy.model = data.model.trim();
+  if (typeof data.mode === "string" && data.mode.trim()) legacy.mode = data.mode.trim();
+  return Object.keys(legacy).length > 0 ? legacy : void 0;
+}
+function mergeProviderPatchState(params) {
+  const {
+    providerControls,
+    data,
+    currentControlValues,
+    currentSummaryMetadata,
+    mergeWithCurrent = true
+  } = params;
+  const sources = [
+    mergeWithCurrent ? asControlValueMap(currentControlValues) : void 0,
+    asControlValueMap(data?.controlValues),
+    asControlValueMap(extractProviderControlValues(providerControls, data)),
+    getLegacyModelModeValues(data)
+  ];
+  const controlValues = Object.assign({}, ...sources.filter(Boolean));
+  return {
+    controlValues,
+    summaryMetadata: data?.summaryMetadata !== void 0 ? data.summaryMetadata : currentSummaryMetadata
+  };
+}
+function normalizeProviderStateControlValues(controlValues) {
+  return controlValues && Object.keys(controlValues).length > 0 ? controlValues : void 0;
+}
+function resolveProviderStateSurface(params) {
+  const controlValues = normalizeProviderStateControlValues(params.controlValues);
+  return {
+    controlValues,
+    summaryMetadata: resolveProviderStateSummaryMetadata({
+      summaryMetadata: params.summaryMetadata,
+      controlValues,
+      modelLabel: params.modelLabel,
+      modeLabel: params.modeLabel
+    })
+  };
+}
+
 // src/providers/extension-provider-instance.ts
 var ExtensionProviderInstance = class {
   type;
@@ -5685,9 +5828,8 @@ var ExtensionProviderInstance = class {
   messages = [];
   prevMessageHashes = /* @__PURE__ */ new Map();
   activeModal = null;
-  currentModel = "";
-  currentMode = "";
   controlValues = {};
+  summaryMetadata = void 0;
   appliedEffectKeys = /* @__PURE__ */ new Set();
   runtimeMessages = [];
   lastAgentStatus = "idle";
@@ -5722,6 +5864,10 @@ var ExtensionProviderInstance = class {
     if (!this.context?.cdp?.isConnected) return;
   }
   getState() {
+    const surface = resolveProviderStateSurface({
+      summaryMetadata: this.summaryMetadata,
+      controlValues: this.controlValues
+    });
     return {
       type: this.type,
       name: this.provider.name,
@@ -5735,10 +5881,9 @@ var ExtensionProviderInstance = class {
         activeModal: this.activeModal,
         inputContent: ""
       } : null,
-      currentModel: this.currentModel || void 0,
-      currentPlan: this.currentMode || void 0,
-      controlValues: this.controlValues,
+      controlValues: surface.controlValues,
       providerControls: this.provider.controls,
+      summaryMetadata: surface.summaryMetadata,
       agentStreams: this.agentStreams,
       instanceId: this.instanceId,
       lastUpdated: Date.now(),
@@ -5751,10 +5896,14 @@ var ExtensionProviderInstance = class {
       if (data?.streams) this.agentStreams = data.streams;
       if (data?.messages) this.messages = this.assignReceivedAt(data.messages);
       if (data?.activeModal !== void 0) this.activeModal = data.activeModal;
-      if (data?.model) this.currentModel = data.model;
-      if (data?.mode) this.currentMode = data.mode;
-      const controlValues = extractProviderControlValues(this.provider.controls, data) || data?.controlValues;
-      if (controlValues) this.controlValues = controlValues;
+      const patchedState = mergeProviderPatchState({
+        providerControls: this.provider.controls,
+        data,
+        currentControlValues: this.controlValues,
+        currentSummaryMetadata: this.summaryMetadata
+      });
+      this.controlValues = patchedState.controlValues;
+      this.summaryMetadata = patchedState.summaryMetadata;
       if (typeof data?.sessionId === "string" && data.sessionId.trim()) this.chatId = data.sessionId;
       if (typeof data?.title === "string" && data.title.trim()) this.chatTitle = data.title;
       if (typeof data?.agentName === "string" && data.agentName.trim()) this.agentName = data.agentName;
@@ -5855,8 +6004,14 @@ var ExtensionProviderInstance = class {
   }
   applyProviderResponse(data, options) {
     if (!data || typeof data !== "object") return;
-    const controlValues = extractProviderControlValues(this.provider.controls, data);
-    if (controlValues) this.controlValues = { ...this.controlValues, ...controlValues };
+    const patchedState = mergeProviderPatchState({
+      providerControls: this.provider.controls,
+      data,
+      currentControlValues: this.controlValues,
+      currentSummaryMetadata: this.summaryMetadata
+    });
+    this.controlValues = patchedState.controlValues;
+    this.summaryMetadata = patchedState.summaryMetadata;
     const effects = normalizeProviderEffects(data);
     for (const effect of effects) {
       const effectWhen = effect.when || "immediate";
@@ -6006,8 +6161,6 @@ ${effect.notification.body || ""}`.trim();
     this.messages = [];
     this.prevMessageHashes.clear();
     this.activeModal = null;
-    this.currentModel = "";
-    this.currentMode = "";
     this.controlValues = {};
     this.currentStatus = "idle";
     this.chatId = null;
@@ -6143,6 +6296,10 @@ var IdeProviderInstance = class {
     for (const ext of this.extensions.values()) {
       extensionStates.push(ext.getState());
     }
+    const surface = resolveProviderStateSurface({
+      summaryMetadata: this.cachedChat?.summaryMetadata,
+      controlValues: this.cachedChat?.controlValues
+    });
     return {
       type: this.type,
       name: this.provider.name,
@@ -6159,11 +6316,9 @@ var IdeProviderInstance = class {
       workspace: this.workspace || null,
       extensions: extensionStates,
       cdpConnected: cdp?.isConnected || false,
-      currentModel: this.cachedChat?.model || void 0,
-      currentPlan: this.cachedChat?.mode || void 0,
-      currentAutoApprove: this.cachedChat?.autoApprove || void 0,
-      controlValues: this.cachedChat?.controlValues || void 0,
+      controlValues: surface.controlValues,
       providerControls: this.provider.controls,
+      summaryMetadata: surface.summaryMetadata,
       instanceId: this.instanceId,
       lastUpdated: Date.now(),
       settings: this.settings,
@@ -6335,8 +6490,13 @@ var IdeProviderInstance = class {
           chat.messages = messages.filter((m) => !hiddenKinds.has(m.kind || ""));
         }
       }
-      const controlValues = extractProviderControlValues(this.provider.controls, chat);
-      if (controlValues) chat.controlValues = controlValues;
+      const patchedState = mergeProviderPatchState({
+        providerControls: this.provider.controls,
+        data: chat,
+        mergeWithCurrent: false
+      });
+      chat.controlValues = Object.keys(patchedState.controlValues).length > 0 ? patchedState.controlValues : void 0;
+      chat.summaryMetadata = patchedState.summaryMetadata;
       this.cachedChat = { ...chat, activeModal };
       this.detectAgentTransitions(chat, now);
       const persistedMessages = chat.messages || messages;
@@ -6423,14 +6583,18 @@ var IdeProviderInstance = class {
   }
   applyProviderResponse(data, options) {
     if (!data || typeof data !== "object") return;
-    const controlValues = extractProviderControlValues(this.provider.controls, data);
-    if (controlValues) {
-      this.cachedChat = {
-        ...this.cachedChat || {},
-        ...data,
-        controlValues: { ...this.cachedChat?.controlValues || {}, ...controlValues }
-      };
-    }
+    const patchedState = mergeProviderPatchState({
+      providerControls: this.provider.controls,
+      data,
+      currentControlValues: this.cachedChat?.controlValues,
+      currentSummaryMetadata: this.cachedChat?.summaryMetadata
+    });
+    this.cachedChat = {
+      ...this.cachedChat || {},
+      ...data,
+      controlValues: Object.keys(patchedState.controlValues).length > 0 ? patchedState.controlValues : void 0,
+      summaryMetadata: patchedState.summaryMetadata
+    };
     const effects = normalizeProviderEffects(data);
     for (const effect of effects) {
       const effectWhen = effect.when || "immediate";
@@ -7213,6 +7377,8 @@ var ACP_SESSION_CAPABILITIES = [
 function buildIdeWorkspaceSession(state, cdpManagers, options) {
   const profile = options.profile || "full";
   const activeChat = normalizeActiveChatData(state.activeChat, getActiveChatOptions(profile));
+  const summaryMetadata = normalizeProviderSummaryMetadata(state.summaryMetadata);
+  const controlValues = normalizeProviderStateControlValues(state.controlValues);
   const includeSessionMetadata = shouldIncludeSessionMetadata(profile);
   const includeSessionControls = shouldIncludeSessionControls(profile);
   const title = activeChat?.title || state.name;
@@ -7229,13 +7395,11 @@ function buildIdeWorkspaceSession(state, cdpManagers, options) {
     title,
     ...includeSessionMetadata && { workspace: state.workspace || null },
     activeChat,
+    ...summaryMetadata && { summaryMetadata },
     ...includeSessionMetadata && { capabilities: IDE_SESSION_CAPABILITIES },
     cdpConnected: state.cdpConnected ?? isCdpConnected(cdpManagers, state.type),
-    currentModel: state.currentModel,
-    currentPlan: state.currentPlan,
-    currentAutoApprove: state.currentAutoApprove,
     ...includeSessionControls && {
-      controlValues: state.controlValues,
+      ...controlValues && { controlValues },
       providerControls: state.providerControls
     },
     errorMessage: state.errorMessage,
@@ -7246,6 +7410,8 @@ function buildIdeWorkspaceSession(state, cdpManagers, options) {
 function buildExtensionAgentSession(parent, ext, options) {
   const profile = options.profile || "full";
   const activeChat = normalizeActiveChatData(ext.activeChat, getActiveChatOptions(profile));
+  const summaryMetadata = normalizeProviderSummaryMetadata(ext.summaryMetadata);
+  const controlValues = normalizeProviderStateControlValues(ext.controlValues);
   const includeSessionMetadata = shouldIncludeSessionMetadata(profile);
   const includeSessionControls = shouldIncludeSessionControls(profile);
   return {
@@ -7261,11 +7427,10 @@ function buildExtensionAgentSession(parent, ext, options) {
     title: activeChat?.title || ext.name,
     ...includeSessionMetadata && { workspace: parent.workspace || null },
     activeChat,
+    ...summaryMetadata && { summaryMetadata },
     ...includeSessionMetadata && { capabilities: EXTENSION_SESSION_CAPABILITIES },
-    currentModel: ext.currentModel,
-    currentPlan: ext.currentPlan,
     ...includeSessionControls && {
-      controlValues: ext.controlValues,
+      ...controlValues && { controlValues },
       providerControls: ext.providerControls
     },
     errorMessage: ext.errorMessage,
@@ -7276,6 +7441,8 @@ function buildExtensionAgentSession(parent, ext, options) {
 function buildCliSession(state, options) {
   const profile = options.profile || "full";
   const activeChat = normalizeActiveChatData(state.activeChat, getActiveChatOptions(profile));
+  const summaryMetadata = normalizeProviderSummaryMetadata(state.summaryMetadata);
+  const controlValues = normalizeProviderStateControlValues(state.controlValues);
   const includeSessionMetadata = shouldIncludeSessionMetadata(profile);
   const includeRuntimeMetadata = shouldIncludeRuntimeMetadata(profile);
   const includeSessionControls = shouldIncludeSessionControls(profile);
@@ -7302,11 +7469,12 @@ function buildCliSession(state, options) {
     mode: state.mode,
     resume: state.resume,
     activeChat,
+    ...summaryMetadata && { summaryMetadata },
     ...includeSessionMetadata && {
       capabilities: state.mode === "terminal" ? PTY_SESSION_CAPABILITIES : CLI_CHAT_SESSION_CAPABILITIES
     },
     ...includeSessionControls && {
-      controlValues: state.controlValues,
+      ...controlValues && { controlValues },
       providerControls: state.providerControls
     },
     errorMessage: state.errorMessage,
@@ -7317,6 +7485,8 @@ function buildCliSession(state, options) {
 function buildAcpSession(state, options) {
   const profile = options.profile || "full";
   const activeChat = normalizeActiveChatData(state.activeChat, getActiveChatOptions(profile));
+  const summaryMetadata = normalizeProviderSummaryMetadata(state.summaryMetadata);
+  const controlValues = normalizeProviderStateControlValues(state.controlValues);
   const includeSessionMetadata = shouldIncludeSessionMetadata(profile);
   const includeSessionControls = shouldIncludeSessionControls(profile);
   return {
@@ -7332,13 +7502,10 @@ function buildAcpSession(state, options) {
     title: activeChat?.title || state.name,
     ...includeSessionMetadata && { workspace: state.workspace || null },
     activeChat,
+    ...summaryMetadata && { summaryMetadata },
     ...includeSessionMetadata && { capabilities: ACP_SESSION_CAPABILITIES },
-    currentModel: state.currentModel,
-    currentPlan: state.currentPlan,
     ...includeSessionControls && {
-      acpConfigOptions: state.acpConfigOptions,
-      acpModes: state.acpModes,
-      controlValues: state.controlValues,
+      ...controlValues && { controlValues },
       providerControls: state.providerControls
     },
     errorMessage: state.errorMessage,
@@ -9398,8 +9565,17 @@ async function handleSetProviderSourceConfig(h, args) {
   );
   return { success: true, reloaded: true, ...sourceConfig };
 }
-function normalizeProviderScriptArgs(args) {
+function normalizeProviderScriptArgs(args, scriptName) {
   const normalizedArgs = { ...args || {} };
+  const normalizedScriptName = String(scriptName || "").toLowerCase();
+  if (Object.prototype.hasOwnProperty.call(normalizedArgs, "value")) {
+    if (normalizedArgs.model === void 0 && (normalizedScriptName === "setmodel" || normalizedScriptName === "setmodelgui" || normalizedScriptName === "webviewsetmodel")) {
+      normalizedArgs.model = normalizedArgs.value;
+    }
+    if (normalizedArgs.mode === void 0 && (normalizedScriptName === "setmode" || normalizedScriptName === "webviewsetmode")) {
+      normalizedArgs.mode = normalizedArgs.value;
+    }
+  }
   for (const key of ["mode", "model", "message", "action", "button", "text", "sessionId", "value"]) {
     if (key in normalizedArgs && !(key.toUpperCase() in normalizedArgs)) {
       normalizedArgs[key.toUpperCase()] = normalizedArgs[key];
@@ -9445,7 +9621,7 @@ async function executeProviderScript(h, args, scriptName) {
   if (!provider.scripts?.[actualScriptName]) {
     return { success: false, error: `Script '${actualScriptName}' not available for ${resolvedProviderType}` };
   }
-  const normalizedArgs = normalizeProviderScriptArgs(args);
+  const normalizedArgs = normalizeProviderScriptArgs(args, actualScriptName);
   if (provider.category === "cli") {
     const adapter = h.getCliAdapter(args?.targetSessionId || resolvedProviderType);
     if (!adapter?.invokeScript) {
@@ -10306,6 +10482,7 @@ var CliProviderInstance = class {
   generatingDebouncePending = null;
   lastApprovalEventAt = 0;
   controlValues = {};
+  summaryMetadata = void 0;
   appliedEffectKeys = /* @__PURE__ */ new Set();
   historyWriter;
   runtimeMessages = [];
@@ -10448,13 +10625,7 @@ var CliProviderInstance = class {
     if (historyMessageCount !== null) {
       parsedMessages = historyMessageCount > 0 ? parsedMessages.slice(-historyMessageCount) : [];
     }
-    const controlValues = extractProviderControlValues(this.provider.controls, parsedStatus);
-    if (controlValues) {
-      this.controlValues = { ...this.controlValues, ...controlValues };
-    }
     const mergedMessages = this.mergeConversationMessages(parsedMessages);
-    const currentModel = typeof parsedStatus?.model === "string" && parsedStatus.model.trim() ? parsedStatus.model.trim() : typeof this.controlValues.model === "string" && this.controlValues.model.trim() ? this.controlValues.model.trim() : void 0;
-    const currentPlan = typeof parsedStatus?.mode === "string" && parsedStatus.mode.trim() ? parsedStatus.mode.trim() : typeof this.controlValues.mode === "string" && this.controlValues.mode.trim() ? this.controlValues.mode.trim() : void 0;
     const dirName = this.workingDir.split("/").filter(Boolean).pop() || "session";
     if (parsedMessages.length > 0) {
       const shouldSkipReplayPersist = this.suppressIdleHistoryReplay && adapterStatus.status === "idle" && parsedStatus?.status === "idle";
@@ -10476,6 +10647,10 @@ var CliProviderInstance = class {
       }
     }
     this.applyProviderResponse(parsedStatus, { phase: "immediate" });
+    const surface = resolveProviderStateSurface({
+      summaryMetadata: this.summaryMetadata,
+      controlValues: this.controlValues
+    });
     return {
       type: this.type,
       name: this.provider.name,
@@ -10491,8 +10666,6 @@ var CliProviderInstance = class {
         inputContent: ""
       },
       workspace: this.workingDir,
-      currentModel,
-      currentPlan,
       instanceId: this.instanceId,
       providerSessionId: this.providerSessionId,
       lastUpdated: Date.now(),
@@ -10507,8 +10680,9 @@ var CliProviderInstance = class {
         attachedClients: runtime.attachedClients || []
       } : void 0,
       resume: this.provider.resume,
-      controlValues: this.controlValues,
-      providerControls: this.provider.controls
+      controlValues: surface.controlValues,
+      providerControls: this.provider.controls,
+      summaryMetadata: surface.summaryMetadata
     };
   }
   setPresentationMode(mode) {
@@ -10712,10 +10886,14 @@ var CliProviderInstance = class {
       this.suppressIdleHistoryReplay = false;
       this.adapter.clearHistory();
     }
-    const controlValues = extractProviderControlValues(this.provider.controls, data);
-    if (controlValues) {
-      this.controlValues = { ...this.controlValues, ...controlValues };
-    }
+    const patchedState = mergeProviderPatchState({
+      providerControls: this.provider.controls,
+      data,
+      currentControlValues: this.controlValues,
+      currentSummaryMetadata: this.summaryMetadata
+    });
+    this.controlValues = patchedState.controlValues;
+    this.summaryMetadata = patchedState.summaryMetadata;
     const effects = normalizeProviderEffects(data);
     for (const effect of effects) {
       const effectWhen = effect.when || "immediate";
@@ -11086,8 +11264,7 @@ var AcpProviderInstance = class {
   lastStatus = "starting";
   generatingStartedAt = 0;
   agentCapabilities = {};
-  currentModel;
-  currentMode;
+  currentSelections = {};
   activeToolCalls = [];
   stopReason = null;
   partialContent = "";
@@ -11167,8 +11344,6 @@ var AcpProviderInstance = class {
         inputContent: ""
       },
       workspace: this.workingDir,
-      currentModel: this.currentModel,
-      currentPlan: this.currentMode,
       instanceId: this.instanceId,
       lastUpdated: Date.now(),
       settings: this.settings,
@@ -11179,11 +11354,9 @@ var AcpProviderInstance = class {
       // Error details for dashboard display
       errorMessage: this.errorMessage || void 0,
       errorReason: this.errorReason || void 0,
-      controlValues: {
-        ...this.currentModel ? { model: this.currentModel } : {},
-        ...this.currentMode ? { mode: this.currentMode } : {}
-      },
-      providerControls: this.provider.controls
+      controlValues: this.getSelectionControlValues(),
+      providerControls: this.provider.controls,
+      summaryMetadata: this.buildSelectionSummaryMetadata()
     };
   }
   onEvent(event, data) {
@@ -11217,6 +11390,54 @@ var AcpProviderInstance = class {
   getInstanceId() {
     return this.instanceId;
   }
+  resolveConfigOptionLabel(category, value) {
+    if (!value) return void 0;
+    const option = this.configOptions.find((entry) => entry.category === category);
+    return option?.options.find((candidate) => candidate.value === value)?.name || value;
+  }
+  resolveModeLabel(modeId) {
+    if (!modeId) return void 0;
+    return this.availableModes.find((mode) => mode.id === modeId)?.name || modeId;
+  }
+  getCurrentSelection(category) {
+    return this.currentSelections[category];
+  }
+  setCurrentSelection(category, value) {
+    const normalized = typeof value === "string" ? value.trim() : "";
+    if (normalized) {
+      this.currentSelections[category] = normalized;
+      return;
+    }
+    delete this.currentSelections[category];
+  }
+  getSelectionControlValues() {
+    const model = this.getCurrentSelection("model");
+    const mode = this.getCurrentSelection("mode");
+    return {
+      ...model ? { model } : {},
+      ...mode ? { mode } : {}
+    };
+  }
+  resolveSelectionLabel(category, value) {
+    if (!value) return void 0;
+    const configLabel = this.resolveConfigOptionLabel(category, value);
+    if (configLabel && configLabel !== value) return configLabel;
+    if (category === "mode") {
+      const modeLabel = this.resolveModeLabel(value);
+      if (modeLabel) return modeLabel;
+    }
+    return configLabel || value;
+  }
+  buildSelectionSummaryMetadata() {
+    const model = this.getCurrentSelection("model");
+    const mode = this.getCurrentSelection("mode");
+    return buildLegacyModelModeSummaryMetadata({
+      model,
+      mode,
+      modelLabel: this.resolveSelectionLabel("model", model),
+      modeLabel: this.resolveSelectionLabel("mode", mode)
+    });
+  }
   // ─── ACP Config Options & Modes ─────────────────────
   parseConfigOptions(raw) {
     if (!Array.isArray(raw)) return;
@@ -11248,12 +11469,14 @@ var AcpProviderInstance = class {
         }
       }
       this.configOptions.push({ category, configId, currentValue, options: flatOptions });
-      if (category === "model" && currentValue) this.currentModel = currentValue;
+      if (category === "model" || category === "mode") {
+        this.setCurrentSelection(category, currentValue);
+      }
     }
   }
   parseModes(raw) {
     if (!raw) return;
-    if (raw.currentModeId) this.currentMode = raw.currentModeId;
+    this.setCurrentSelection("mode", raw.currentModeId);
     if (Array.isArray(raw.availableModes)) {
       this.availableModes = raw.availableModes.map((m) => ({
         id: m.id,
@@ -11272,8 +11495,7 @@ var AcpProviderInstance = class {
     if (this.useStaticConfig) {
       opt.currentValue = value;
       this.selectedConfig[opt.configId] = value;
-      if (category === "model") this.currentModel = value;
-      if (category === "mode") this.currentMode = value;
+      if (category === "model" || category === "mode") this.setCurrentSelection(category, value);
       this.log.info(`[${this.type}] Static config ${category} set to: ${value} \u2014 restarting agent`);
       await this.restartWithNewConfig();
       return;
@@ -11291,7 +11513,7 @@ var AcpProviderInstance = class {
         value
       });
       opt.currentValue = value;
-      if (category === "model") this.currentModel = value;
+      if (category === "model" || category === "mode") this.setCurrentSelection(category, value);
       if (result?.configOptions) this.parseConfigOptions(result.configOptions);
       this.log.info(`[${this.type}] Config ${category} set to: ${value} | response: ${JSON.stringify(result)?.slice(0, 300)}`);
     } catch (e) {
@@ -11307,7 +11529,7 @@ var AcpProviderInstance = class {
         opt.currentValue = modeId;
         this.selectedConfig[opt.configId] = modeId;
       }
-      this.currentMode = modeId;
+      this.setCurrentSelection("mode", modeId);
       this.log.info(`[${this.type}] Static mode set to: ${modeId} \u2014 restarting agent`);
       await this.restartWithNewConfig();
       return;
@@ -11322,7 +11544,7 @@ var AcpProviderInstance = class {
         sessionId: this.sessionId,
         modeId
       });
-      this.currentMode = modeId;
+      this.setCurrentSelection("mode", modeId);
       this.log.info(`[${this.type}] Mode set to: ${modeId}`);
     } catch (e) {
       const message = e?.message || "Unknown ACP mode error";
@@ -11580,8 +11802,8 @@ var AcpProviderInstance = class {
       if (result?.modes) this.log.debug(`[${this.type}] modes: ${JSON.stringify(result.modes).slice(0, 300)}`);
       this.parseConfigOptions(result?.configOptions);
       this.parseModes(result?.modes);
-      if (!this.currentModel && result?.models?.currentModelId) {
-        this.currentModel = result.models.currentModelId;
+      if (!this.getCurrentSelection("model") && result?.models?.currentModelId) {
+        this.setCurrentSelection("model", result.models.currentModelId);
       }
       if (this.configOptions.length === 0 && this.provider.staticConfigOptions?.length) {
         this.useStaticConfig = true;
@@ -11595,13 +11817,16 @@ var AcpProviderInstance = class {
           });
           if (defaultVal) {
             this.selectedConfig[sc.configId] = defaultVal;
-            if (sc.category === "model") this.currentModel = defaultVal;
-            if (sc.category === "mode") this.currentMode = defaultVal;
+            if (sc.category === "model" || sc.category === "mode") {
+              this.setCurrentSelection(sc.category, defaultVal);
+            }
           }
         }
         this.log.info(`[${this.type}] Using static configOptions (${this.configOptions.length} options)`);
       }
-      this.log.info(`[${this.type}] Session created: ${this.sessionId}${this.currentModel ? ` (model: ${this.currentModel})` : ""}${this.currentMode ? ` (mode: ${this.currentMode})` : ""}`);
+      const currentModel = this.getCurrentSelection("model");
+      const currentMode = this.getCurrentSelection("mode");
+      this.log.info(`[${this.type}] Session created: ${this.sessionId}${currentModel ? ` (model: ${currentModel})` : ""}${currentMode ? ` (mode: ${currentMode})` : ""}`);
       if (this.configOptions.length > 0) {
         this.log.info(`[${this.type}] Config options: ${this.configOptions.map((c) => `${c.category}(${c.options.length})`).join(", ")}`);
       }
@@ -11776,7 +12001,7 @@ var AcpProviderInstance = class {
         break;
       }
       case "current_mode_update": {
-        this.currentMode = update.currentModeId;
+        this.setCurrentSelection("mode", update.currentModeId);
         break;
       }
       case "config_option_update": {
@@ -11849,7 +12074,7 @@ var AcpProviderInstance = class {
       this.detectStatusTransition();
     }
     if (params.model) {
-      this.currentModel = params.model;
+      this.setCurrentSelection("model", params.model);
     }
   }
   /** Map SDK ToolCallStatus to internal status */
@@ -12138,7 +12363,11 @@ var DaemonCliManager = class {
   }
   persistRecentActivity(entry) {
     try {
-      let nextState = appendRecentActivity(loadState(), entry);
+      const summaryMetadata = normalizeProviderSummaryMetadata(entry.summaryMetadata);
+      let nextState = appendRecentActivity(loadState(), {
+        ...entry,
+        summaryMetadata
+      });
       if (entry.providerSessionId && (entry.kind === "cli" || entry.kind === "acp")) {
         nextState = upsertSavedProviderSession(nextState, {
           kind: entry.kind,
@@ -12146,7 +12375,7 @@ var DaemonCliManager = class {
           providerName: entry.providerName,
           providerSessionId: entry.providerSessionId,
           workspace: entry.workspace,
-          currentModel: entry.currentModel,
+          summaryMetadata,
           title: entry.title
         });
       }
@@ -12336,7 +12565,7 @@ ${installInfo}`
         providerType: normalizedType,
         providerName: provider.displayName || provider.name || normalizedType,
         workspace: resolvedDir,
-        currentModel: initialModel,
+        summaryMetadata: buildLegacyModelModeSummaryMetadata({ model: initialModel }),
         sessionId,
         title: provider.displayName || provider.name || normalizedType
       });
@@ -12438,7 +12667,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
       providerName: provider?.displayName || provider?.name || normalizedType,
       providerSessionId: sessionBinding.providerSessionId,
       workspace: resolvedDir,
-      currentModel: initialModel,
+      summaryMetadata: buildLegacyModelModeSummaryMetadata({ model: initialModel }),
       sessionId: key,
       title: provider?.displayName || provider?.name || normalizedType
     });
@@ -14603,12 +14832,90 @@ cleanOldFiles();
 // src/commands/router.ts
 init_logger();
 
+// src/session-host/runtime-surface.ts
+var LIVE_LIFECYCLES = /* @__PURE__ */ new Set(["starting", "running", "stopping", "interrupted"]);
+function isSessionHostLiveRuntime(record) {
+  const lifecycle = String(record?.lifecycle || "").trim();
+  return LIVE_LIFECYCLES.has(lifecycle);
+}
+function getSessionHostRecoveryLabel(meta) {
+  const recoveryState = typeof meta?.runtimeRecoveryState === "string" ? String(meta.runtimeRecoveryState).trim() : "";
+  if (!recoveryState) return null;
+  if (recoveryState === "auto_resumed") return "restored after restart";
+  if (recoveryState === "resume_failed") return "restore failed";
+  if (recoveryState === "host_restart_interrupted") return "host restart interrupted";
+  if (recoveryState === "orphan_snapshot") return "snapshot recovered";
+  return recoveryState.replace(/_/g, " ");
+}
+function isSessionHostRecoverySnapshot(record) {
+  if (!record) return false;
+  if (isSessionHostLiveRuntime(record)) return false;
+  const lifecycle = String(record.lifecycle || "").trim();
+  if (lifecycle && lifecycle !== "stopped" && lifecycle !== "failed") {
+    return false;
+  }
+  const meta = record.meta || void 0;
+  if (meta?.restoredFromStorage === true) return true;
+  return getSessionHostRecoveryLabel(meta) !== null;
+}
+function getSessionHostSurfaceKind(record) {
+  if (isSessionHostLiveRuntime(record)) return "live_runtime";
+  if (isSessionHostRecoverySnapshot(record)) return "recovery_snapshot";
+  return "inactive_record";
+}
+function partitionSessionHostRecords(records) {
+  const liveRuntimes = [];
+  const recoverySnapshots = [];
+  const inactiveRecords = [];
+  for (const record of records) {
+    const kind = getSessionHostSurfaceKind(record);
+    if (kind === "live_runtime") {
+      liveRuntimes.push(record);
+    } else if (kind === "recovery_snapshot") {
+      recoverySnapshots.push(record);
+    } else {
+      inactiveRecords.push(record);
+    }
+  }
+  return {
+    liveRuntimes,
+    recoverySnapshots,
+    inactiveRecords
+  };
+}
+function partitionSessionHostDiagnosticsSessions(records) {
+  return partitionSessionHostRecords(records || []);
+}
+
 // src/status/snapshot.ts
 init_config();
 import * as os16 from "os";
 init_terminal_screen();
 init_logger();
 var READ_DEBUG_ENABLED = process.argv.includes("--dev") || process.env.ADHDEV_READ_DEBUG === "1";
+var recentReadDebugSignatureBySession = /* @__PURE__ */ new Map();
+function buildRecentReadDebugSignature(snapshot) {
+  return [
+    snapshot.providerType,
+    snapshot.status,
+    snapshot.inboxBucket,
+    snapshot.unread ? "1" : "0",
+    String(snapshot.lastSeenAt),
+    snapshot.completionMarker,
+    snapshot.seenCompletionMarker,
+    String(snapshot.lastUpdated),
+    String(snapshot.lastUsedAt),
+    snapshot.lastRole,
+    String(snapshot.messageUpdatedAt)
+  ].join("|");
+}
+function shouldEmitRecentReadDebugLog(cache, snapshot) {
+  const nextSignature = buildRecentReadDebugSignature(snapshot);
+  const previousSignature = cache.get(snapshot.sessionId);
+  if (previousSignature === nextSignature) return false;
+  cache.set(snapshot.sessionId, nextSignature);
+  return true;
+}
 function buildDetectedIdeInfos(detectedIdes, cdpManagers) {
   return detectedIdes.filter((ide) => ide.installed !== false).map((ide) => ({
     id: ide.id,
@@ -14760,7 +15067,7 @@ function buildRecentLaunches(recentActivity) {
     providerSessionId: item.providerSessionId,
     title: item.title || item.providerName,
     workspace: item.workspace,
-    currentModel: item.currentModel,
+    summaryMetadata: item.summaryMetadata,
     lastLaunchedAt: item.lastUsedAt
   })).sort((a, b) => b.lastLaunchedAt - a.lastLaunchedAt).slice(0, 12);
 }
@@ -14801,9 +15108,24 @@ function buildStatusSnapshot(options) {
     session.unread = unread;
     session.inboxBucket = inboxBucket;
     if (READ_DEBUG_ENABLED && (session.unread || session.inboxBucket !== "idle" || session.providerType.includes("codex"))) {
+      const recentReadSnapshot = {
+        sessionId: session.id,
+        providerType: session.providerType,
+        status: String(session.status || ""),
+        inboxBucket,
+        unread,
+        lastSeenAt,
+        completionMarker: completionMarker || "-",
+        seenCompletionMarker: seenCompletionMarker || "-",
+        lastUpdated: Number(session.lastUpdated || 0),
+        lastUsedAt,
+        lastRole: getLastMessageRole(sourceSession),
+        messageUpdatedAt: getSessionMessageUpdatedAt(sourceSession)
+      };
+      if (!shouldEmitRecentReadDebugLog(recentReadDebugSignatureBySession, recentReadSnapshot)) continue;
       LOG.info(
         "RecentRead",
-        `snapshot session id=${session.id} provider=${session.providerType} status=${String(session.status || "")} bucket=${inboxBucket} unread=${String(unread)} lastSeenAt=${lastSeenAt} completionMarker=${completionMarker || "-"} seenMarker=${seenCompletionMarker || "-"} lastUpdated=${String(session.lastUpdated || 0)} lastUsedAt=${lastUsedAt} lastRole=${getLastMessageRole(sourceSession)} msgUpdatedAt=${getSessionMessageUpdatedAt(sourceSession)}`
+        `snapshot session id=${recentReadSnapshot.sessionId} provider=${recentReadSnapshot.providerType} status=${recentReadSnapshot.status} bucket=${recentReadSnapshot.inboxBucket} unread=${String(recentReadSnapshot.unread)} lastSeenAt=${recentReadSnapshot.lastSeenAt} completionMarker=${recentReadSnapshot.completionMarker} seenMarker=${recentReadSnapshot.seenCompletionMarker} lastUpdated=${String(recentReadSnapshot.lastUpdated)} lastUsedAt=${recentReadSnapshot.lastUsedAt} lastRole=${recentReadSnapshot.lastRole} msgUpdatedAt=${recentReadSnapshot.messageUpdatedAt}`
       );
     }
     const lastDisplayMessage = getLastDisplayMessage(sourceSession);
@@ -15078,11 +15400,104 @@ function toHostedCliRuntimeDescriptor(record) {
     providerSessionId: typeof record.meta?.providerSessionId === "string" ? String(record.meta.providerSessionId) : void 0
   };
 }
+function getWriteConflictOwnerClientId(error) {
+  const message = typeof error === "string" ? error : error instanceof Error ? error.message : "";
+  const match = /^Write owned by\s+(.+)$/.exec(message.trim());
+  return match?.[1]?.trim() || void 0;
+}
+function summarizeSessionHostRecord(result) {
+  if (!result || typeof result !== "object") return {};
+  const record = result;
+  return {
+    runtimeKey: typeof record.runtimeKey === "string" ? record.runtimeKey : void 0,
+    lifecycle: typeof record.lifecycle === "string" ? record.lifecycle : void 0,
+    surfaceKind: getSessionHostSurfaceKind(record),
+    attachedClientCount: Array.isArray(record.attachedClients) ? record.attachedClients.length : void 0,
+    hasWriteOwner: !!record.writeOwner,
+    writeOwnerClientId: typeof record.writeOwner?.clientId === "string" ? record.writeOwner.clientId : void 0
+  };
+}
+function summarizeSessionHostRecords(result) {
+  const records = Array.isArray(result) ? result : [];
+  const groups = partitionSessionHostRecords(records);
+  return {
+    sessionCount: records.length,
+    liveRuntimeCount: groups.liveRuntimes.length,
+    recoverySnapshotCount: groups.recoverySnapshots.length,
+    inactiveRecordCount: groups.inactiveRecords.length
+  };
+}
+function summarizeSessionHostDiagnostics(result) {
+  const diagnostics = result && typeof result === "object" ? result : {};
+  const sessions = Array.isArray(diagnostics.sessions) ? diagnostics.sessions : [];
+  return {
+    runtimeCount: typeof diagnostics.runtimeCount === "number" ? diagnostics.runtimeCount : void 0,
+    ...summarizeSessionHostRecords(sessions)
+  };
+}
+function summarizeSessionHostPruneResult(result) {
+  const value = result && typeof result === "object" ? result : {};
+  return {
+    duplicateGroupCount: typeof value.duplicateGroupCount === "number" ? value.duplicateGroupCount : void 0,
+    prunedCount: Array.isArray(value.prunedSessionIds) ? value.prunedSessionIds.length : void 0,
+    keptCount: Array.isArray(value.keptSessionIds) ? value.keptSessionIds.length : void 0
+  };
+}
 var DaemonCommandRouter = class {
   deps;
   constructor(deps) {
     this.deps = deps;
   }
+  async traceSessionHostAction(action, args, run, summarizeResult) {
+    const interactionId = typeof args?._interactionId === "string" ? args._interactionId : void 0;
+    const sessionId = typeof args?.sessionId === "string" ? args.sessionId : void 0;
+    const requestedPayload = { action };
+    if (sessionId) requestedPayload.sessionId = sessionId;
+    if (typeof args?.clientId === "string") requestedPayload.clientId = args.clientId;
+    if (typeof args?.signal === "string") requestedPayload.signal = args.signal;
+    if (typeof args?.providerType === "string") requestedPayload.providerType = args.providerType;
+    if (typeof args?.workspace === "string") requestedPayload.workspace = args.workspace;
+    if (typeof args?.dryRun === "boolean") requestedPayload.dryRun = args.dryRun;
+    recordDebugTrace({
+      interactionId,
+      category: "session_host",
+      stage: "action_requested",
+      level: "info",
+      sessionId,
+      payload: requestedPayload
+    });
+    try {
+      const result = await run();
+      recordDebugTrace({
+        interactionId,
+        category: "session_host",
+        stage: "action_result",
+        level: "info",
+        sessionId,
+        payload: {
+          ...requestedPayload,
+          success: true,
+          ...summarizeResult ? summarizeResult(result) : {}
+        }
+      });
+      return result;
+    } catch (error) {
+      recordDebugTrace({
+        interactionId,
+        category: "session_host",
+        stage: "action_failed",
+        level: "error",
+        sessionId,
+        payload: {
+          ...requestedPayload,
+          error: error?.message || String(error),
+          failureKind: getWriteConflictOwnerClientId(error) ? "write_conflict" : "request_failed",
+          conflictOwnerClientId: getWriteConflictOwnerClientId(error)
+        }
+      });
+      throw error;
+    }
+  }
   /**
    * Unified command routing.
    * Returns result for all commands:
@@ -15192,44 +15607,60 @@ var DaemonCommandRouter = class {
       }
       case "session_host_get_diagnostics": {
         if (!this.deps.sessionHostControl) return { success: false, error: "Session host control unavailable" };
-        const diagnostics = await this.deps.sessionHostControl.getDiagnostics({
+        const diagnostics = await this.traceSessionHostAction("session_host_get_diagnostics", args, () => this.deps.sessionHostControl.getDiagnostics({
           includeSessions: args?.includeSessions !== false,
           limit: Number(args?.limit) || void 0
-        });
+        }), (result) => ({
+          includeSessions: args?.includeSessions !== false,
+          limit: Number(args?.limit) || void 0,
+          ...summarizeSessionHostDiagnostics(result)
+        }));
         return { success: true, diagnostics };
       }
       case "session_host_list_sessions": {
         if (!this.deps.sessionHostControl) return { success: false, error: "Session host control unavailable" };
-        const sessions = await this.deps.sessionHostControl.listSessions();
+        const sessions = await this.traceSessionHostAction("session_host_list_sessions", args, () => this.deps.sessionHostControl.listSessions(), (records) => summarizeSessionHostRecords(records));
         return { success: true, sessions };
       }
       case "session_host_stop_session": {
         if (!this.deps.sessionHostControl) return { success: false, error: "Session host control unavailable" };
         const sessionId = typeof args?.sessionId === "string" ? args.sessionId : "";
         if (!sessionId) return { success: false, error: "sessionId required" };
-        const record = await this.deps.sessionHostControl.stopSession(sessionId);
+        const record = await this.traceSessionHostAction("session_host_stop_session", args, () => this.deps.sessionHostControl.stopSession(sessionId), (result) => summarizeSessionHostRecord(result));
         return { success: true, record };
       }
       case "session_host_resume_session": {
         if (!this.deps.sessionHostControl) return { success: false, error: "Session host control unavailable" };
         const sessionId = typeof args?.sessionId === "string" ? args.sessionId : "";
         if (!sessionId) return { success: false, error: "sessionId required" };
-        const record = await this.deps.sessionHostControl.resumeSession(sessionId);
-        const hosted = toHostedCliRuntimeDescriptor(record);
-        if (hosted) {
-          await this.deps.cliManager.restoreHostedSessions([hosted]);
-        }
+        const record = await this.traceSessionHostAction("session_host_resume_session", args, async () => {
+          const nextRecord = await this.deps.sessionHostControl.resumeSession(sessionId);
+          const hosted = toHostedCliRuntimeDescriptor(nextRecord);
+          if (hosted) {
+            await this.deps.cliManager.restoreHostedSessions([hosted]);
+          }
+          return nextRecord;
+        }, (result) => ({
+          ...summarizeSessionHostRecord(result),
+          restoredHostedSession: !!toHostedCliRuntimeDescriptor(result)
+        }));
         return { success: true, record };
       }
       case "session_host_restart_session": {
         if (!this.deps.sessionHostControl) return { success: false, error: "Session host control unavailable" };
         const sessionId = typeof args?.sessionId === "string" ? args.sessionId : "";
         if (!sessionId) return { success: false, error: "sessionId required" };
-        const record = await this.deps.sessionHostControl.restartSession(sessionId);
-        const hosted = toHostedCliRuntimeDescriptor(record);
-        if (hosted) {
-          await this.deps.cliManager.restoreHostedSessions([hosted]);
-        }
+        const record = await this.traceSessionHostAction("session_host_restart_session", args, async () => {
+          const nextRecord = await this.deps.sessionHostControl.restartSession(sessionId);
+          const hosted = toHostedCliRuntimeDescriptor(nextRecord);
+          if (hosted) {
+            await this.deps.cliManager.restoreHostedSessions([hosted]);
+          }
+          return nextRecord;
+        }, (result) => ({
+          ...summarizeSessionHostRecord(result),
+          restoredHostedSession: !!toHostedCliRuntimeDescriptor(result)
+        }));
         return { success: true, record };
       }
       case "session_host_send_signal": {
@@ -15238,7 +15669,7 @@ var DaemonCommandRouter = class {
         const signal = typeof args?.signal === "string" ? args.signal : "";
         if (!sessionId) return { success: false, error: "sessionId required" };
         if (!signal) return { success: false, error: "signal required" };
-        const record = await this.deps.sessionHostControl.sendSignal(sessionId, signal);
+        const record = await this.traceSessionHostAction("session_host_send_signal", args, () => this.deps.sessionHostControl.sendSignal(sessionId, signal), (result) => summarizeSessionHostRecord(result));
         return { success: true, record };
       }
       case "session_host_force_detach_client": {
@@ -15247,16 +15678,16 @@ var DaemonCommandRouter = class {
         const clientId = typeof args?.clientId === "string" ? args.clientId : "";
         if (!sessionId) return { success: false, error: "sessionId required" };
         if (!clientId) return { success: false, error: "clientId required" };
-        const record = await this.deps.sessionHostControl.forceDetachClient(sessionId, clientId);
+        const record = await this.traceSessionHostAction("session_host_force_detach_client", args, () => this.deps.sessionHostControl.forceDetachClient(sessionId, clientId), (result) => summarizeSessionHostRecord(result));
         return { success: true, record };
       }
       case "session_host_prune_duplicate_sessions": {
         if (!this.deps.sessionHostControl) return { success: false, error: "Session host control unavailable" };
-        const result = await this.deps.sessionHostControl.pruneDuplicateSessions({
+        const result = await this.traceSessionHostAction("session_host_prune_duplicate_sessions", args, () => this.deps.sessionHostControl.pruneDuplicateSessions({
           providerType: typeof args?.providerType === "string" ? args.providerType : void 0,
           workspace: typeof args?.workspace === "string" ? args.workspace : void 0,
           dryRun: args?.dryRun === true
-        });
+        }), (value) => summarizeSessionHostPruneResult(value));
         return { success: true, result };
       }
       case "session_host_acquire_write": {
@@ -15266,12 +15697,15 @@ var DaemonCommandRouter = class {
         const ownerType = args?.ownerType === "agent" ? "agent" : "user";
         if (!sessionId) return { success: false, error: "sessionId required" };
         if (!clientId) return { success: false, error: "clientId required" };
-        const record = await this.deps.sessionHostControl.acquireWrite({
+        const record = await this.traceSessionHostAction("session_host_acquire_write", args, () => this.deps.sessionHostControl.acquireWrite({
           sessionId,
           clientId,
           ownerType,
           force: args?.force !== false
-        });
+        }), (result) => ({
+          ...summarizeSessionHostRecord(result),
+          ownerType
+        }));
         return { success: true, record };
       }
       case "session_host_release_write": {
@@ -15280,7 +15714,10 @@ var DaemonCommandRouter = class {
         const clientId = typeof args?.clientId === "string" ? args.clientId : "";
         if (!sessionId) return { success: false, error: "sessionId required" };
         if (!clientId) return { success: false, error: "clientId required" };
-        const record = await this.deps.sessionHostControl.releaseWrite({ sessionId, clientId });
+        const record = await this.traceSessionHostAction("session_host_release_write", args, () => this.deps.sessionHostControl.releaseWrite({
+          sessionId,
+          clientId
+        }), (result) => summarizeSessionHostRecord(result));
         return { success: true, record };
       }
       case "list_saved_sessions": {
@@ -15313,7 +15750,7 @@ var DaemonCommandRouter = class {
               kind: saved?.kind || recent?.kind || kind,
               title: saved?.title || recent?.title || session.sessionTitle || session.preview || providerType,
               workspace: saved?.workspace || recent?.workspace || session.workspace,
-              currentModel: saved?.currentModel || recent?.currentModel,
+              summaryMetadata: saved?.summaryMetadata || recent?.summaryMetadata,
               preview: session.preview,
               messageCount: session.messageCount,
               firstMessageAt: session.firstMessageAt,
@@ -15752,7 +16189,7 @@ var DaemonStatusReporter = class {
     const ideSummary = ideStates.map((s) => {
       const msgs = s.activeChat?.messages?.length || 0;
       const exts = s.extensions.length;
-      return `${s.type}(${s.status},${msgs}msg,${exts}ext${s.currentModel ? ",model=" + s.currentModel : ""})`;
+      return `${s.type}(${s.status},${msgs}msg,${exts}ext)`;
     }).join(", ");
     const cliSummary = cliStates.map((s) => `${s.type}(${s.status})`).join(", ");
     const acpSummary = acpStates.map((s) => `${s.type}(${s.status})`).join(", ");
@@ -15814,9 +16251,7 @@ var DaemonStatusReporter = class {
         workspace: session.workspace ?? null,
         title: session.title,
         cdpConnected: session.cdpConnected,
-        currentModel: session.currentModel,
-        currentPlan: session.currentPlan,
-        currentAutoApprove: session.currentAutoApprove
+        summaryMetadata: session.summaryMetadata
       })),
       p2p: payload.p2p,
       timestamp: now
@@ -15982,15 +16417,18 @@ var ProviderStreamAdapter = class {
         status: data.status || "idle",
         messages: data.messages || [],
         inputContent: data.inputContent || "",
-        model: data.model,
-        mode: data.mode,
         activeModal: data.activeModal
       };
       if (typeof data.title === "string" && data.title.trim()) {
         state.title = data.title.trim();
       }
       const controlValues = extractProviderControlValues(this.provider.controls, data);
-      if (controlValues) state.controlValues = controlValues;
+      const surface = resolveProviderStateSurface({
+        controlValues,
+        summaryMetadata: data.summaryMetadata
+      });
+      if (surface.controlValues) state.controlValues = surface.controlValues;
+      if (surface.summaryMetadata) state.summaryMetadata = surface.summaryMetadata;
       const effects = normalizeProviderEffects(data);
       if (effects.length > 0) state.effects = effects;
       if (state.messages.length > 0) {
@@ -16264,7 +16702,8 @@ var DaemonAgentStreamManager = class {
       const evaluate = (expr, timeout) => cdp.evaluateInSessionFrame(agent.cdpSessionId, expr, timeout);
       const state = await agent.adapter.readChat(evaluate);
       const stateError = this.getStateError(state);
-      LOG.debug("AgentStream", `[AgentStream] readChat(${type}) result: status=${state.status} msgs=${state.messages?.length || 0} model=${state.model || ""}${state.status === "error" ? " error=" + JSON.stringify(stateError) : ""}`);
+      const selectedModelValue = typeof state.controlValues?.model === "string" ? state.controlValues.model : "";
+      LOG.debug("AgentStream", `[AgentStream] readChat(${type}) result: status=${state.status} msgs=${state.messages?.length || 0} model=${selectedModelValue}${state.status === "error" ? " error=" + JSON.stringify(stateError) : ""}`);
       if (state.status === "error" && this.isRecoverableSessionError(stateError)) {
         throw new Error(stateError);
       }
@@ -16612,9 +17051,8 @@ function forwardAgentStreamsToIdeInstance(instanceManager, ideType, streams) {
       messages: stream.messages || [],
       status: stream.status || "idle",
       activeModal: stream.activeModal || null,
-      model: stream.model || void 0,
-      mode: stream.mode || void 0,
       controlValues: stream.controlValues || void 0,
+      summaryMetadata: stream.summaryMetadata || void 0,
       effects: stream.effects || void 0,
       sessionId: stream.sessionId || stream.instanceId || void 0,
       title: stream.title || stream.agentName || void 0,
@@ -17150,7 +17588,11 @@ module.exports.setMode = (params) => {
  *   5. Approval dialog detection (buttons, modal)
  *   6. Input field selector
  *
- * \u2192 { id, status, title, messages[], inputContent, activeModal }
+ * Preferred live-state surface:
+ *   - controlValues: explicit current control selections (model/mode/etc.)
+ *   - summaryMetadata: compact always-visible metadata for dashboard/recent views
+ * Legacy top-level model/mode output is no longer the preferred shape.
+ * \u2192 { id, status, title, messages[], inputContent, activeModal, controlValues?, summaryMetadata? }
  */
 (() => {
   try {
@@ -17178,6 +17620,9 @@ module.exports.setMode = (params) => {
       messages,
       inputContent,
       activeModal,
+      // TODO: Return explicit selections when available, e.g.
+      // controlValues: { model: selectedModel, mode: selectedMode },
+      // summaryMetadata: { items: [{ id: 'model', value: selectedModelLabel || selectedModel, shortValue: selectedModel, order: 10 }] },
     });
   } catch(e) {
     return JSON.stringify({ id: '', status: 'error', messages: [], error: e.message });
@@ -18918,7 +19363,6 @@ async function handleCliStatus(ctx, _req, res) {
     lastMessage: s.activeChat?.messages?.slice(-1)[0] || null,
     activeModal: s.activeChat?.activeModal || null,
     pendingEvents: s.pendingEvents || [],
-    currentModel: s.currentModel,
     settings: s.settings
   }));
   ctx.json(res, 200, { instances: result, count: result.length });
@@ -20075,7 +20519,7 @@ function buildAutoImplPrompt(ctx, type, provider, providerDir, functions, domCon
   lines.push("## Required Return Format");
   lines.push("| Function | Return JSON |");
   lines.push("|---|---|");
-  lines.push("| readChat | `{ id, status, title, messages: [{role, content, index, kind?, meta?}], inputContent, activeModal }` \u2014 optional `kind`: standard, thought, tool, terminal; optional `meta`: e.g. `{ label, isRunning }` for dashboard |");
+  lines.push("| readChat | `{ id, status, title, messages: [{role, content, index, kind?, meta?}], inputContent, activeModal, controlValues?, summaryMetadata? }` \u2014 optional `kind`: standard, thought, tool, terminal; prefer explicit `controlValues` for current selections and `summaryMetadata` for compact always-visible UI metadata |");
   lines.push("| sendMessage | `{ sent: false, needsTypeAndSend: true, selector }` |");
   lines.push("| resolveAction | `{ resolved: true/false, clicked? }` |");
   lines.push("| listSessions | `{ sessions: [{ id, title, active, index }] }` |");
@@ -21710,7 +22154,7 @@ var DevServer = class _DevServer {
     lines.push("## Required Return Format");
     lines.push("| Function | Return JSON |");
     lines.push("|---|---|");
-    lines.push("| readChat | `{ id, status, title, messages: [{role, content, index, kind?, meta?}], inputContent, activeModal }` \u2014 optional `kind`: standard, thought, tool, terminal; optional `meta`: e.g. `{ label, isRunning }` for dashboard |");
+    lines.push("| readChat | `{ id, status, title, messages: [{role, content, index, kind?, meta?}], inputContent, activeModal, controlValues?, summaryMetadata? }` \u2014 optional `kind`: standard, thought, tool, terminal; prefer explicit `controlValues` for current selections and `summaryMetadata` for compact always-visible UI metadata |");
     lines.push("| sendMessage | `{ sent: false, needsTypeAndSend: true, selector }` |");
     lines.push("| resolveAction | `{ resolved: true/false, clicked? }` |");
     lines.push("| listSessions | `{ sessions: [{ id, title, active, index }] }` |");
@@ -22621,61 +23065,6 @@ async function listHostedCliRuntimes(endpoint) {
   }
 }
 
-// src/session-host/runtime-surface.ts
-var LIVE_LIFECYCLES = /* @__PURE__ */ new Set(["starting", "running", "stopping", "interrupted"]);
-function isSessionHostLiveRuntime(record) {
-  const lifecycle = String(record?.lifecycle || "").trim();
-  return LIVE_LIFECYCLES.has(lifecycle);
-}
-function getSessionHostRecoveryLabel(meta) {
-  const recoveryState = typeof meta?.runtimeRecoveryState === "string" ? String(meta.runtimeRecoveryState).trim() : "";
-  if (!recoveryState) return null;
-  if (recoveryState === "auto_resumed") return "restored after restart";
-  if (recoveryState === "resume_failed") return "restore failed";
-  if (recoveryState === "host_restart_interrupted") return "host restart interrupted";
-  if (recoveryState === "orphan_snapshot") return "snapshot recovered";
-  return recoveryState.replace(/_/g, " ");
-}
-function isSessionHostRecoverySnapshot(record) {
-  if (!record) return false;
-  if (isSessionHostLiveRuntime(record)) return false;
-  const lifecycle = String(record.lifecycle || "").trim();
-  if (lifecycle && lifecycle !== "stopped" && lifecycle !== "failed") {
-    return false;
-  }
-  const meta = record.meta || void 0;
-  if (meta?.restoredFromStorage === true) return true;
-  return getSessionHostRecoveryLabel(meta) !== null;
-}
-function getSessionHostSurfaceKind(record) {
-  if (isSessionHostLiveRuntime(record)) return "live_runtime";
-  if (isSessionHostRecoverySnapshot(record)) return "recovery_snapshot";
-  return "inactive_record";
-}
-function partitionSessionHostRecords(records) {
-  const liveRuntimes = [];
-  const recoverySnapshots = [];
-  const inactiveRecords = [];
-  for (const record of records) {
-    const kind = getSessionHostSurfaceKind(record);
-    if (kind === "live_runtime") {
-      liveRuntimes.push(record);
-    } else if (kind === "recovery_snapshot") {
-      recoverySnapshots.push(record);
-    } else {
-      inactiveRecords.push(record);
-    }
-  }
-  return {
-    liveRuntimes,
-    recoverySnapshots,
-    inactiveRecords
-  };
-}
-function partitionSessionHostDiagnosticsSessions(records) {
-  return partitionSessionHostRecords(records || []);
-}
-
 // src/session-host/startup-restore-policy.js
 function shouldAutoRestoreHostedSessionsOnStartup(env = process.env) {
   const raw = typeof env.ADHDEV_RESTORE_HOSTED_SESSIONS_ON_STARTUP === "string" ? env.ADHDEV_RESTORE_HOSTED_SESSIONS_ON_STARTUP.trim().toLowerCase() : "";