adhdev 0.8.58 → 0.8.59

package/dist/cli/index.js

@@ -939,6 +939,73 @@ var init_workspaces = __esm({
   }
 });
 
+// ../../oss/packages/daemon-core/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((left2, right2) => {
+    const orderDiff = (left2.order ?? Number.MAX_SAFE_INTEGER) - (right2.order ?? Number.MAX_SAFE_INTEGER);
+    if (orderDiff !== 0) return orderDiff;
+    return left2.id.localeCompare(right2.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);
+}
+var init_summary_metadata = __esm({
+  "../../oss/packages/daemon-core/src/providers/summary-metadata.ts"() {
+    "use strict";
+  }
+});
+
 // ../../oss/packages/daemon-core/src/config/recent-activity.ts
 function normalizeWorkspace(workspace) {
   if (!workspace) return "";
@@ -962,6 +1029,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()
   };
@@ -972,7 +1042,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;
@@ -1003,6 +1078,7 @@ var init_recent_activity = __esm({
     "use strict";
     path2 = __toESM(require("path"));
     init_workspaces();
+    init_summary_metadata();
     MAX_ACTIVITY = 30;
   }
 });
@@ -1031,7 +1107,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()
@@ -1047,7 +1125,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);
 }
 var path3, MAX_SAVED_SESSIONS;
 var init_saved_sessions = __esm({
@@ -1055,6 +1138,7 @@ var init_saved_sessions = __esm({
     "use strict";
     path3 = __toESM(require("path"));
     init_workspaces();
+    init_summary_metadata();
     MAX_SAVED_SESSIONS = 500;
   }
 });
@@ -3067,8 +3151,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) {
@@ -3170,7 +3252,7 @@ function normalizeControlOption(option) {
   }
   if (!option || typeof option !== "object") return null;
   const record2 = option;
-  const value = typeof record2.value === "string" ? record2.value : typeof record2.id === "string" ? record2.id : null;
+  const value = typeof record2.value === "string" ? record2.value : typeof record2.id === "string" ? record2.id : typeof record2.name === "string" ? record2.name : null;
   if (!value) return null;
   const label = typeof record2.label === "string" ? record2.label : typeof record2.name === "string" ? record2.name : value;
   const normalized = { value, label };
@@ -3716,6 +3798,68 @@ var init_chat_history = __esm({
   }
 });
 
+// ../../oss/packages/daemon-core/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
+    })
+  };
+}
+var init_provider_patch_state = __esm({
+  "../../oss/packages/daemon-core/src/providers/provider-patch-state.ts"() {
+    "use strict";
+    init_control_effects();
+    init_summary_metadata();
+  }
+});
+
 // ../../oss/packages/daemon-core/src/providers/extension-provider-instance.ts
 var ExtensionProviderInstance;
 var init_extension_provider_instance = __esm({
@@ -3724,6 +3868,7 @@ var init_extension_provider_instance = __esm({
     init_status_monitor();
     init_control_effects();
     init_chat_history();
+    init_provider_patch_state();
     ExtensionProviderInstance = class {
       type;
       category = "extension";
@@ -3737,9 +3882,8 @@ var init_extension_provider_instance = __esm({
       messages = [];
       prevMessageHashes = /* @__PURE__ */ new Map();
       activeModal = null;
-      currentModel = "";
-      currentMode = "";
       controlValues = {};
+      summaryMetadata = void 0;
       appliedEffectKeys = /* @__PURE__ */ new Set();
       runtimeMessages = [];
       lastAgentStatus = "idle";
@@ -3774,6 +3918,10 @@ var init_extension_provider_instance = __esm({
         if (!this.context?.cdp?.isConnected) return;
       }
       getState() {
+        const surface = resolveProviderStateSurface({
+          summaryMetadata: this.summaryMetadata,
+          controlValues: this.controlValues
+        });
         return {
           type: this.type,
           name: this.provider.name,
@@ -3787,10 +3935,9 @@ var init_extension_provider_instance = __esm({
             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(),
@@ -3803,10 +3950,14 @@ var init_extension_provider_instance = __esm({
           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;
@@ -3907,8 +4058,14 @@ var init_extension_provider_instance = __esm({
       }
       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";
@@ -4058,8 +4215,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;
@@ -4139,6 +4294,7 @@ var init_ide_provider_instance = __esm({
     init_logger();
     init_control_effects();
     init_approval_utils();
+    init_provider_patch_state();
     IdeProviderInstance = class {
       type;
       category = "ide";
@@ -4211,6 +4367,10 @@ var init_ide_provider_instance = __esm({
         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,
@@ -4227,11 +4387,9 @@ var init_ide_provider_instance = __esm({
           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,
@@ -4403,8 +4561,13 @@ var init_ide_provider_instance = __esm({
               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;
@@ -4491,14 +4654,18 @@ var init_ide_provider_instance = __esm({
       }
       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";
@@ -5271,6 +5438,8 @@ function isCdpConnected(cdpManagers, key) {
 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;
@@ -5287,13 +5456,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,
@@ -5304,6 +5471,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 {
@@ -5319,11 +5488,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,
@@ -5334,6 +5502,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);
@@ -5360,11 +5530,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,
@@ -5375,6 +5546,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 {
@@ -5390,13 +5563,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,
@@ -5436,6 +5606,8 @@ var init_builders = __esm({
   "../../oss/packages/daemon-core/src/status/builders.ts"() {
     "use strict";
     init_normalize();
+    init_provider_patch_state();
+    init_summary_metadata();
     IDE_SESSION_CAPABILITIES = [
       "read_chat",
       "send_message",
@@ -7551,8 +7723,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];
@@ -7598,7 +7779,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) {
@@ -12154,6 +12335,7 @@ var init_cli_provider_instance = __esm({
     init_control_effects();
     init_approval_utils();
     init_cli_script_results();
+    init_provider_patch_state();
     CachedDatabaseSync = null;
     CliProviderInstance = class {
       constructor(provider, workingDir, cliArgs = [], instanceId, transportFactory, options) {
@@ -12183,6 +12365,7 @@ var init_cli_provider_instance = __esm({
       generatingDebouncePending = null;
       lastApprovalEventAt = 0;
       controlValues = {};
+      summaryMetadata = void 0;
       appliedEffectKeys = /* @__PURE__ */ new Set();
       historyWriter;
       runtimeMessages = [];
@@ -12325,13 +12508,7 @@ var init_cli_provider_instance = __esm({
         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";
@@ -12353,6 +12530,10 @@ var init_cli_provider_instance = __esm({
           }
         }
         this.applyProviderResponse(parsedStatus, { phase: "immediate" });
+        const surface = resolveProviderStateSurface({
+          summaryMetadata: this.summaryMetadata,
+          controlValues: this.controlValues
+        });
         return {
           type: this.type,
           name: this.provider.name,
@@ -12368,8 +12549,6 @@ var init_cli_provider_instance = __esm({
             inputContent: ""
           },
           workspace: this.workingDir,
-          currentModel,
-          currentPlan,
           instanceId: this.instanceId,
           providerSessionId: this.providerSessionId,
           lastUpdated: Date.now(),
@@ -12384,8 +12563,9 @@ var init_cli_provider_instance = __esm({
             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) {
@@ -12589,10 +12769,14 @@ var init_cli_provider_instance = __esm({
           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";
@@ -29239,6 +29423,7 @@ var init_acp_provider_instance = __esm({
     init_acp();
     init_contracts();
     init_status_monitor();
+    init_summary_metadata();
     init_logger();
     AcpProviderInstance = class {
       constructor(provider, workingDir, cliArgs = []) {
@@ -29267,8 +29452,7 @@ var init_acp_provider_instance = __esm({
       lastStatus = "starting";
       generatingStartedAt = 0;
       agentCapabilities = {};
-      currentModel;
-      currentMode;
+      currentSelections = {};
       activeToolCalls = [];
       stopReason = null;
       partialContent = "";
@@ -29348,8 +29532,6 @@ var init_acp_provider_instance = __esm({
             inputContent: ""
           },
           workspace: this.workingDir,
-          currentModel: this.currentModel,
-          currentPlan: this.currentMode,
           instanceId: this.instanceId,
           lastUpdated: Date.now(),
           settings: this.settings,
@@ -29360,11 +29542,9 @@ var init_acp_provider_instance = __esm({
           // 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) {
@@ -29398,6 +29578,54 @@ var init_acp_provider_instance = __esm({
       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;
@@ -29429,12 +29657,14 @@ var init_acp_provider_instance = __esm({
             }
           }
           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,
@@ -29453,8 +29683,7 @@ var init_acp_provider_instance = __esm({
         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;
@@ -29472,7 +29701,7 @@ var init_acp_provider_instance = __esm({
             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) {
@@ -29488,7 +29717,7 @@ var init_acp_provider_instance = __esm({
             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;
@@ -29503,7 +29732,7 @@ var init_acp_provider_instance = __esm({
             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";
@@ -29761,8 +29990,8 @@ var init_acp_provider_instance = __esm({
           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;
@@ -29776,13 +30005,16 @@ var init_acp_provider_instance = __esm({
               });
               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(", ")}`);
           }
@@ -29957,7 +30189,7 @@ var init_acp_provider_instance = __esm({
             break;
           }
           case "current_mode_update": {
-            this.currentMode = update.currentModeId;
+            this.setCurrentSelection("mode", update.currentModeId);
             break;
           }
           case "config_option_update": {
@@ -30030,7 +30262,7 @@ var init_acp_provider_instance = __esm({
           this.detectStatusTransition();
         }
         if (params.model) {
-          this.currentModel = params.model;
+          this.setCurrentSelection("model", params.model);
         }
       }
       /** Map SDK ToolCallStatus to internal status */
@@ -30312,6 +30544,7 @@ var init_cli_manager = __esm({
     init_workspaces();
     init_recent_activity();
     init_saved_sessions();
+    init_summary_metadata();
     init_cli_provider_instance();
     init_acp_provider_instance();
     init_contracts();
@@ -30343,7 +30576,11 @@ var init_cli_manager = __esm({
       }
       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,
@@ -30351,7 +30588,7 @@ var init_cli_manager = __esm({
               providerName: entry.providerName,
               providerSessionId: entry.providerSessionId,
               workspace: entry.workspace,
-              currentModel: entry.currentModel,
+              summaryMetadata,
               title: entry.title
             });
           }
@@ -30541,7 +30778,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
           });
@@ -30643,7 +30880,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
         });
@@ -34576,7 +34813,90 @@ var init_command_log = __esm({
   }
 });
 
+// ../../oss/packages/daemon-core/src/session-host/runtime-surface.ts
+function isSessionHostLiveRuntime2(record2) {
+  const lifecycle = String(record2?.lifecycle || "").trim();
+  return LIVE_LIFECYCLES2.has(lifecycle);
+}
+function getSessionHostRecoveryLabel2(meta3) {
+  const recoveryState = typeof meta3?.runtimeRecoveryState === "string" ? String(meta3.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 isSessionHostRecoverySnapshot2(record2) {
+  if (!record2) return false;
+  if (isSessionHostLiveRuntime2(record2)) return false;
+  const lifecycle = String(record2.lifecycle || "").trim();
+  if (lifecycle && lifecycle !== "stopped" && lifecycle !== "failed") {
+    return false;
+  }
+  const meta3 = record2.meta || void 0;
+  if (meta3?.restoredFromStorage === true) return true;
+  return getSessionHostRecoveryLabel2(meta3) !== null;
+}
+function getSessionHostSurfaceKind2(record2) {
+  if (isSessionHostLiveRuntime2(record2)) return "live_runtime";
+  if (isSessionHostRecoverySnapshot2(record2)) return "recovery_snapshot";
+  return "inactive_record";
+}
+function partitionSessionHostRecords(records) {
+  const liveRuntimes = [];
+  const recoverySnapshots = [];
+  const inactiveRecords = [];
+  for (const record2 of records) {
+    const kind = getSessionHostSurfaceKind2(record2);
+    if (kind === "live_runtime") {
+      liveRuntimes.push(record2);
+    } else if (kind === "recovery_snapshot") {
+      recoverySnapshots.push(record2);
+    } else {
+      inactiveRecords.push(record2);
+    }
+  }
+  return {
+    liveRuntimes,
+    recoverySnapshots,
+    inactiveRecords
+  };
+}
+function partitionSessionHostDiagnosticsSessions(records) {
+  return partitionSessionHostRecords(records || []);
+}
+var LIVE_LIFECYCLES2;
+var init_runtime_surface = __esm({
+  "../../oss/packages/daemon-core/src/session-host/runtime-surface.ts"() {
+    "use strict";
+    LIVE_LIFECYCLES2 = /* @__PURE__ */ new Set(["starting", "running", "stopping", "interrupted"]);
+  }
+});
+
 // ../../oss/packages/daemon-core/src/status/snapshot.ts
+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,
@@ -34728,7 +35048,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);
 }
@@ -34769,9 +35089,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);
@@ -34804,7 +35139,7 @@ function buildStatusSnapshot(options) {
     }
   };
 }
-var os19, READ_DEBUG_ENABLED;
+var os19, READ_DEBUG_ENABLED, recentReadDebugSignatureBySession;
 var init_snapshot = __esm({
   "../../oss/packages/daemon-core/src/status/snapshot.ts"() {
     "use strict";
@@ -34818,6 +35153,7 @@ var init_snapshot = __esm({
     init_logger();
     init_builders();
     READ_DEBUG_ENABLED = process.argv.includes("--dev") || process.env.ADHDEV_READ_DEBUG === "1";
+    recentReadDebugSignatureBySession = /* @__PURE__ */ new Map();
   }
 });
 
@@ -35059,6 +35395,49 @@ function toHostedCliRuntimeDescriptor(record2) {
     providerSessionId: typeof record2.meta?.providerSessionId === "string" ? String(record2.meta.providerSessionId) : void 0
   };
 }
+function getWriteConflictOwnerClientId(error48) {
+  const message = typeof error48 === "string" ? error48 : error48 instanceof Error ? error48.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 record2 = result;
+  return {
+    runtimeKey: typeof record2.runtimeKey === "string" ? record2.runtimeKey : void 0,
+    lifecycle: typeof record2.lifecycle === "string" ? record2.lifecycle : void 0,
+    surfaceKind: getSessionHostSurfaceKind2(record2),
+    attachedClientCount: Array.isArray(record2.attachedClients) ? record2.attachedClients.length : void 0,
+    hasWriteOwner: !!record2.writeOwner,
+    writeOwnerClientId: typeof record2.writeOwner?.clientId === "string" ? record2.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 fs9, CHAT_COMMANDS, READ_DEBUG_ENABLED2, DaemonCommandRouter;
 var init_router = __esm({
   "../../oss/packages/daemon-core/src/commands/router.ts"() {
@@ -35078,6 +35457,7 @@ var init_router = __esm({
     init_command_log();
     init_logger();
     init_debug_trace();
+    init_runtime_surface();
     init_builders();
     init_snapshot();
     init_snapshot();
@@ -35096,6 +35476,56 @@ var init_router = __esm({
       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 (error48) {
+          recordDebugTrace({
+            interactionId,
+            category: "session_host",
+            stage: "action_failed",
+            level: "error",
+            sessionId,
+            payload: {
+              ...requestedPayload,
+              error: error48?.message || String(error48),
+              failureKind: getWriteConflictOwnerClientId(error48) ? "write_conflict" : "request_failed",
+              conflictOwnerClientId: getWriteConflictOwnerClientId(error48)
+            }
+          });
+          throw error48;
+        }
+      }
       /**
        * Unified command routing.
        * Returns result for all commands:
@@ -35205,44 +35635,60 @@ var init_router = __esm({
           }
           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 record2 = await this.deps.sessionHostControl.stopSession(sessionId);
+            const record2 = await this.traceSessionHostAction("session_host_stop_session", args, () => this.deps.sessionHostControl.stopSession(sessionId), (result) => summarizeSessionHostRecord(result));
             return { success: true, record: record2 };
           }
           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 record2 = await this.deps.sessionHostControl.resumeSession(sessionId);
-            const hosted = toHostedCliRuntimeDescriptor(record2);
-            if (hosted) {
-              await this.deps.cliManager.restoreHostedSessions([hosted]);
-            }
+            const record2 = 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: record2 };
           }
           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 record2 = await this.deps.sessionHostControl.restartSession(sessionId);
-            const hosted = toHostedCliRuntimeDescriptor(record2);
-            if (hosted) {
-              await this.deps.cliManager.restoreHostedSessions([hosted]);
-            }
+            const record2 = 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: record2 };
           }
           case "session_host_send_signal": {
@@ -35251,7 +35697,7 @@ var init_router = __esm({
             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 record2 = await this.deps.sessionHostControl.sendSignal(sessionId, signal);
+            const record2 = await this.traceSessionHostAction("session_host_send_signal", args, () => this.deps.sessionHostControl.sendSignal(sessionId, signal), (result) => summarizeSessionHostRecord(result));
             return { success: true, record: record2 };
           }
           case "session_host_force_detach_client": {
@@ -35260,16 +35706,16 @@ var init_router = __esm({
             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 record2 = await this.deps.sessionHostControl.forceDetachClient(sessionId, clientId);
+            const record2 = await this.traceSessionHostAction("session_host_force_detach_client", args, () => this.deps.sessionHostControl.forceDetachClient(sessionId, clientId), (result) => summarizeSessionHostRecord(result));
             return { success: true, record: record2 };
           }
           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": {
@@ -35279,12 +35725,15 @@ var init_router = __esm({
             const ownerType = args?.ownerType === "agent" ? "agent" : "user";
             if (!sessionId) return { success: false, error: "sessionId required" };
             if (!clientId) return { success: false, error: "clientId required" };
-            const record2 = await this.deps.sessionHostControl.acquireWrite({
+            const record2 = 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: record2 };
           }
           case "session_host_release_write": {
@@ -35293,7 +35742,10 @@ var init_router = __esm({
             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 record2 = await this.deps.sessionHostControl.releaseWrite({ sessionId, clientId });
+            const record2 = await this.traceSessionHostAction("session_host_release_write", args, () => this.deps.sessionHostControl.releaseWrite({
+              sessionId,
+              clientId
+            }), (result) => summarizeSessionHostRecord(result));
             return { success: true, record: record2 };
           }
           case "list_saved_sessions": {
@@ -35326,7 +35778,7 @@ var init_router = __esm({
                   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,
@@ -35773,7 +36225,7 @@ var init_reporter = __esm({
         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(", ");
@@ -35835,9 +36287,7 @@ var init_reporter = __esm({
             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
@@ -35902,6 +36352,7 @@ var init_provider_adapter = __esm({
   "../../oss/packages/daemon-core/src/agent-stream/provider-adapter.ts"() {
     "use strict";
     init_control_effects();
+    init_provider_patch_state();
     ProviderStreamAdapter = class {
       agentType;
       agentName;
@@ -36013,15 +36464,18 @@ var init_provider_adapter = __esm({
             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) {
@@ -36302,7 +36756,8 @@ var init_manager2 = __esm({
           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);
           }
@@ -36679,9 +37134,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,
@@ -37228,7 +37682,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 {
@@ -37256,6 +37714,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 });
@@ -39002,7 +39463,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 });
@@ -40164,7 +40624,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 }] }` |");
@@ -41827,7 +42287,7 @@ var init_dev_server = __esm({
         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 }] }` |");
@@ -42749,67 +43209,6 @@ var init_runtime_support = __esm({
   }
 });
 
-// ../../oss/packages/daemon-core/src/session-host/runtime-surface.ts
-function isSessionHostLiveRuntime2(record2) {
-  const lifecycle = String(record2?.lifecycle || "").trim();
-  return LIVE_LIFECYCLES2.has(lifecycle);
-}
-function getSessionHostRecoveryLabel2(meta3) {
-  const recoveryState = typeof meta3?.runtimeRecoveryState === "string" ? String(meta3.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 isSessionHostRecoverySnapshot2(record2) {
-  if (!record2) return false;
-  if (isSessionHostLiveRuntime2(record2)) return false;
-  const lifecycle = String(record2.lifecycle || "").trim();
-  if (lifecycle && lifecycle !== "stopped" && lifecycle !== "failed") {
-    return false;
-  }
-  const meta3 = record2.meta || void 0;
-  if (meta3?.restoredFromStorage === true) return true;
-  return getSessionHostRecoveryLabel2(meta3) !== null;
-}
-function getSessionHostSurfaceKind2(record2) {
-  if (isSessionHostLiveRuntime2(record2)) return "live_runtime";
-  if (isSessionHostRecoverySnapshot2(record2)) return "recovery_snapshot";
-  return "inactive_record";
-}
-function partitionSessionHostRecords(records) {
-  const liveRuntimes = [];
-  const recoverySnapshots = [];
-  const inactiveRecords = [];
-  for (const record2 of records) {
-    const kind = getSessionHostSurfaceKind2(record2);
-    if (kind === "live_runtime") {
-      liveRuntimes.push(record2);
-    } else if (kind === "recovery_snapshot") {
-      recoverySnapshots.push(record2);
-    } else {
-      inactiveRecords.push(record2);
-    }
-  }
-  return {
-    liveRuntimes,
-    recoverySnapshots,
-    inactiveRecords
-  };
-}
-function partitionSessionHostDiagnosticsSessions(records) {
-  return partitionSessionHostRecords(records || []);
-}
-var LIVE_LIFECYCLES2;
-var init_runtime_surface = __esm({
-  "../../oss/packages/daemon-core/src/session-host/runtime-surface.ts"() {
-    "use strict";
-    LIVE_LIFECYCLES2 = /* @__PURE__ */ new Set(["starting", "running", "stopping", "interrupted"]);
-  }
-});
-
 // ../../oss/packages/daemon-core/src/session-host/startup-restore-policy.js
 function shouldAutoRestoreHostedSessionsOnStartup(env3 = process.env) {
   const raw = typeof env3.ADHDEV_RESTORE_HOSTED_SESSIONS_ON_STARTUP === "string" ? env3.ADHDEV_RESTORE_HOSTED_SESSIONS_ON_STARTUP.trim().toLowerCase() : "";
@@ -83547,7 +83946,7 @@ var init_adhdev_daemon = __esm({
     import_ws3 = require("ws");
     init_source();
     init_version();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.8.58" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.8.59" });
     ACTIVE_CHAT_POLL_STATUSES = /* @__PURE__ */ new Set([
       "generating",
       "waiting_approval",
@@ -85034,6 +85433,41 @@ ${source_default.cyan("\u255A\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2
   }
 });
 
+// src/cli/runtime-target-trace.ts
+var runtime_target_trace_exports = {};
+__export(runtime_target_trace_exports, {
+  buildRuntimeTargetResolutionTrace: () => buildRuntimeTargetResolutionTrace
+});
+async function buildRuntimeTargetResolutionTrace(records, target, options) {
+  const attachable = options?.attachable === true;
+  try {
+    const record2 = attachable ? resolveAttachableRuntimeRecord(records, target) : resolveRuntimeRecord(records, target);
+    return {
+      target,
+      attachable,
+      sessionId: record2.sessionId,
+      runtimeKey: record2.runtimeKey,
+      displayName: record2.displayName,
+      lifecycle: record2.lifecycle,
+      surfaceKind: getSessionHostSurfaceKind(record2),
+      attachedClientCount: Array.isArray(record2.attachedClients) ? record2.attachedClients.length : 0,
+      writeOwnerClientId: record2.writeOwner?.clientId
+    };
+  } catch (error48) {
+    return {
+      target,
+      attachable,
+      error: error48?.message || String(error48)
+    };
+  }
+}
+var init_runtime_target_trace = __esm({
+  "src/cli/runtime-target-trace.ts"() {
+    "use strict";
+    init_dist();
+  }
+});
+
 // ../../oss/packages/web-core/src/constants/supported.ts
 var supported_exports = {};
 __export(supported_exports, {
@@ -86045,12 +86479,24 @@ function formatSavedHistoryTimestamp(timestamp) {
 function getSavedHistoryStatusLabel(session) {
   return session.canResume ? "resume-ready" : "needs --dir";
 }
+function getSavedHistorySummaryValues(summaryMetadata) {
+  if (!summaryMetadata || !Array.isArray(summaryMetadata.items)) return [];
+  return summaryMetadata.items.map((item) => String(item?.value || item?.shortValue || "").trim()).filter(Boolean);
+}
+function getSavedHistorySummaryValue(session, id, options = {}) {
+  const targetId = String(id || "").trim();
+  if (!targetId || !session.summaryMetadata || !Array.isArray(session.summaryMetadata.items)) return "";
+  const item = session.summaryMetadata.items.find((entry) => String(entry?.id || "").trim() === targetId);
+  if (!item) return "";
+  return String(options.preferShortValue ? item.shortValue || item.value || "" : item.value || item.shortValue || "").trim();
+}
 function buildSavedHistorySessionLines(session) {
   const title = session.title || session.providerSessionId;
   const locationParts = [session.providerSessionId];
   if (session.workspace) locationParts.push(session.workspace);
   const summaryParts = [`${session.messageCount || 0} msgs`];
-  if (session.currentModel) summaryParts.push(session.currentModel);
+  const summaryValues = getSavedHistorySummaryValues(session.summaryMetadata);
+  if (summaryValues.length > 0) summaryParts.push(...summaryValues);
   const updated = formatSavedHistoryTimestamp(session.lastMessageAt);
   if (updated !== "-") summaryParts.push(`updated ${updated}`);
   summaryParts.push(getSavedHistoryStatusLabel(session));
@@ -86080,7 +86526,7 @@ function filterSavedHistorySessions(sessions, options = {}) {
       if (!workspace.includes(workspaceQuery)) return false;
     }
     if (modelQuery) {
-      const model = String(session.currentModel || "").toLowerCase();
+      const model = getSavedHistorySummaryValues(session.summaryMetadata).map((value) => value.toLowerCase()).join("\n");
       if (!model.includes(modelQuery)) return false;
     }
     return true;
@@ -86141,8 +86587,9 @@ function buildHistoryResumeLaunchPayload(cliType, session, overrideDir) {
     dir,
     resumeSessionId: session.providerSessionId
   };
-  if (typeof session.currentModel === "string" && session.currentModel.trim()) {
-    payload.initialModel = session.currentModel.trim();
+  const initialModel = getSavedHistorySummaryValue(session, "model", { preferShortValue: true });
+  if (initialModel) {
+    payload.initialModel = initialModel;
   }
   return payload;
 }
@@ -86859,6 +87306,74 @@ function buildRuntimeOpenLaunchSpec(options) {
   return spec;
 }
 
+// src/cli/debug-trace-cli.ts
+function normalizeOptionalFilter(value) {
+  if (typeof value !== "string") return void 0;
+  const trimmed = value.trim();
+  return trimmed ? trimmed : void 0;
+}
+function buildDebugTraceCommandArgs(options) {
+  const category = normalizeOptionalFilter(options.category);
+  const interactionId = normalizeOptionalFilter(options.interactionId);
+  return {
+    count: Math.max(1, Math.floor(options.count || 0) || 40),
+    ...category && category !== "all" ? { category } : {},
+    ...interactionId ? { interactionId } : {}
+  };
+}
+function buildDebugTraceFollowPollArgs(options, cursor) {
+  const base = buildDebugTraceCommandArgs(options);
+  if (!cursor || cursor.lastTs <= 0) {
+    return base;
+  }
+  return {
+    ...base,
+    since: Math.max(0, cursor.lastTs - 1)
+  };
+}
+function collectFreshDebugTraceEntries(entries, cursor) {
+  const previousTs = cursor?.lastTs ?? 0;
+  const seenIdsAtLastTs = new Set(cursor?.seenIdsAtLastTs ?? []);
+  const fresh = entries.filter((entry) => {
+    const ts2 = Number(entry.ts || 0);
+    if (ts2 > previousTs) return true;
+    if (ts2 < previousTs) return false;
+    return !seenIdsAtLastTs.has(entry.id);
+  });
+  if (entries.length === 0) {
+    return {
+      entries: fresh,
+      cursor: cursor ?? { lastTs: 0, seenIdsAtLastTs: [] }
+    };
+  }
+  const nextLastTs = entries.reduce((max, entry) => Math.max(max, Number(entry.ts || 0)), previousTs);
+  const nextSeenIdsAtLastTs = Array.from(new Set(
+    entries.filter((entry) => Number(entry.ts || 0) === nextLastTs).map((entry) => entry.id)
+  ));
+  return {
+    entries: fresh,
+    cursor: {
+      lastTs: nextLastTs,
+      seenIdsAtLastTs: nextSeenIdsAtLastTs
+    }
+  };
+}
+function formatPayload(payload) {
+  if (!payload || Object.keys(payload).length === 0) return "";
+  try {
+    const raw = JSON.stringify(payload);
+    return raw.length > 220 ? `${raw.slice(0, 220)}\u2026` : raw;
+  } catch {
+    return "[unserializable payload]";
+  }
+}
+function formatDebugTraceEntryLine(entry) {
+  const timestamp = new Date(entry.ts).toLocaleTimeString();
+  const interactionLabel = entry.interactionId ? ` ix=${entry.interactionId}` : "";
+  const payload = formatPayload(entry.payload);
+  return `${timestamp} ${entry.level.toUpperCase()} ${entry.category}.${entry.stage}${interactionLabel}${payload ? ` ${payload}` : ""}`;
+}
+
 // src/cli/daemon-commands.ts
 function hideCommand(command) {
   if (typeof command.hideHelp === "function") {
@@ -86914,6 +87429,12 @@ async function resolveRuntimeSessionId(target, options) {
   if (!envelope?.success || !Array.isArray(envelope?.result)) {
     throw new Error(envelope?.error || "Failed to list runtimes");
   }
+  if (process.env.ADHDEV_SESSION_HOST_TRACE === "1") {
+    const { buildRuntimeTargetResolutionTrace: buildRuntimeTargetResolutionTrace2 } = await Promise.resolve().then(() => (init_runtime_target_trace(), runtime_target_trace_exports));
+    const trace = await buildRuntimeTargetResolutionTrace2(envelope.result, target, { attachable: options?.attachable === true });
+    process.stderr.write(`[session-host-trace] runtime_target_resolution ${JSON.stringify(trace)}
+`);
+  }
   if (options?.attachable === true) {
     const { resolveAttachableRuntimeRecord: resolveAttachableRuntimeRecord2 } = await Promise.resolve().then(() => (init_dist(), dist_exports));
     return resolveAttachableRuntimeRecord2(envelope.result, target).sessionId;
@@ -87054,6 +87575,112 @@ async function printRuntimeGroups(records, options) {
     console.log();
   }
 }
+async function handleTraceCommand(options) {
+  const port = parseInt(String(options.port ?? "19222"), 10) || 19222;
+  const count = Math.max(1, Math.min(500, parseInt(String(options.count ?? "40"), 10) || 40));
+  const intervalMs = Math.max(250, Math.min(3e4, parseInt(String(options.interval ?? "1500"), 10) || 1500));
+  const baseArgs = {
+    count,
+    category: options.category,
+    interactionId: options.interaction
+  };
+  const fetchTrace = async (args) => {
+    const traceResult = await sendDaemonCommandSafe("get_debug_trace", args, port);
+    const payload = traceResult?.result || traceResult;
+    if (!payload?.success) {
+      throw new Error(payload?.error || "debug trace query failed");
+    }
+    return Array.isArray(payload?.trace) ? payload.trace : [];
+  };
+  if (!options.follow) {
+    const args = buildDebugTraceCommandArgs(baseArgs);
+    const trace = await fetchTrace(args);
+    if (options.json) {
+      console.log(JSON.stringify({
+        port,
+        count: trace.length,
+        query: args,
+        trace
+      }, null, 2));
+      return;
+    }
+    console.log(source_default.bold("\n  Structured Daemon Trace\n"));
+    console.log(source_default.gray(`  Port:        ${port}`));
+    console.log(source_default.gray(`  Category:    ${args.category || "all"}`));
+    console.log(source_default.gray(`  Interaction: ${args.interactionId || "-"}`));
+    console.log(source_default.gray(`  Entries:     ${trace.length}`));
+    console.log();
+    if (trace.length === 0) {
+      console.log(source_default.gray("  No trace entries found. Start the daemon with `adhdev daemon --dev` or `adhdev daemon --trace`."));
+      console.log();
+      return;
+    }
+    for (const entry of trace) {
+      console.log(source_default.gray(`  ${formatDebugTraceEntryLine(entry)}`));
+    }
+    console.log();
+    return;
+  }
+  let stopped = false;
+  const stopFollowing = () => {
+    stopped = true;
+  };
+  process.once("SIGINT", stopFollowing);
+  process.once("SIGTERM", stopFollowing);
+  try {
+    let cursor = void 0;
+    const initialTrace = await fetchTrace(buildDebugTraceFollowPollArgs(baseArgs));
+    const initialBatch = collectFreshDebugTraceEntries(initialTrace, cursor);
+    cursor = initialBatch.cursor;
+    if (options.json) {
+      for (const entry of initialBatch.entries) {
+        console.log(JSON.stringify(entry));
+      }
+    } else {
+      console.log(source_default.bold("\n  Structured Daemon Trace\n"));
+      console.log(source_default.gray(`  Port:        ${port}`));
+      console.log(source_default.gray(`  Category:    ${buildDebugTraceCommandArgs(baseArgs).category || "all"}`));
+      console.log(source_default.gray(`  Interaction: ${buildDebugTraceCommandArgs(baseArgs).interactionId || "-"}`));
+      console.log(source_default.gray(`  Initial:     ${initialBatch.entries.length}`));
+      console.log(source_default.gray(`  Follow:      every ${intervalMs}ms (Ctrl+C to stop)`));
+      console.log();
+      if (initialBatch.entries.length === 0) {
+        console.log(source_default.gray("  No trace entries yet. Waiting for new entries..."));
+        console.log();
+      } else {
+        for (const entry of initialBatch.entries) {
+          console.log(source_default.gray(`  ${formatDebugTraceEntryLine(entry)}`));
+        }
+        console.log();
+      }
+    }
+    while (!stopped) {
+      await new Promise((resolve17) => setTimeout(resolve17, intervalMs));
+      if (stopped) break;
+      const nextTrace = await fetchTrace(buildDebugTraceFollowPollArgs(baseArgs, cursor));
+      const nextBatch = collectFreshDebugTraceEntries(nextTrace, cursor);
+      cursor = nextBatch.cursor;
+      if (nextBatch.entries.length === 0) continue;
+      if (options.json) {
+        for (const entry of nextBatch.entries) {
+          console.log(JSON.stringify(entry));
+        }
+        continue;
+      }
+      for (const entry of nextBatch.entries) {
+        console.log(source_default.gray(`  ${formatDebugTraceEntryLine(entry)}`));
+      }
+    }
+  } finally {
+    process.off("SIGINT", stopFollowing);
+    process.off("SIGTERM", stopFollowing);
+  }
+  if (!options.json) {
+    console.log();
+    console.log(source_default.gray("  Trace follow stopped."));
+    console.log();
+  }
+}
 function registerDaemonCommands(program2, pkgVersion3) {
   program2.command("daemon").description("\u{1F680} Start ADHDev Daemon \u2014 unified hub for IDE monitoring, agent management, and remote control").option("-p, --port <port>", "Local WS server port", "19222").option("--server <url>", "Override server URL for testing").option("--dev", "Enable Dev Mode \u2014 HTTP API on :19280 for script debugging + structured trace collection").option("--log-level <level>", "Console log level (debug|info|warn|error)").option("--trace", "Enable structured debug trace collection").option("--trace-content", "Include richer content snapshots in debug traces").option("--trace-buffer-size <count>", "Structured trace ring buffer size").action(async (options) => {
     const { AdhdevDaemon: AdhdevDaemon2 } = await Promise.resolve().then(() => (init_adhdev_daemon(), adhdev_daemon_exports));
@@ -87069,6 +87696,16 @@ function registerDaemonCommands(program2, pkgVersion3) {
       traceBufferSize: options.traceBufferSize ? parseInt(options.traceBufferSize, 10) || void 0 : void 0
     });
   });
+  program2.command("trace").description("Inspect structured daemon trace from the running local daemon (for example: --category session_host)").option("-p, --port <port>", "Local daemon IPC port", "19222").option("--category <category>", "Filter by trace category (for example: session_host)").option("--interaction <id>", "Filter by interaction id").option("--count <count>", "Maximum number of trace entries to fetch", "40").option("--follow", "Keep polling and print new trace entries as they arrive").option("--interval <ms>", "Polling interval for --follow mode", "1500").option("--json", "Print raw trace JSON output").action(async (options) => {
+    try {
+      await handleTraceCommand(options);
+    } catch (error48) {
+      console.error(source_default.red(`
+  \u2717 ${error48?.message || String(error48)}
+`));
+      process.exit(1);
+    }
+  });
   program2.command("standalone").description("\u{1F5A5}\uFE0F  Start ADHDev Standalone Server (Local Dashboard & Embedded Daemon)").option("-p, --port <port>", "Local HTTP/WS server port", "3847").option("--host <host>", "Bind to specific host (use 0.0.0.0 for LAN access)").option("--no-open", "Prevent opening browser automatically").option("--token <token>", "Require token authentication").option("--dev", "Enable Dev Mode").action(async (options) => {
     const { spawn: spawn6, execSync: execSync8 } = await import("child_process");
     const { DEFAULT_STANDALONE_SESSION_HOST_APP_NAME: DEFAULT_STANDALONE_SESSION_HOST_APP_NAME2, resolveSessionHostAppName: resolveSessionHostAppName2 } = await Promise.resolve().then(() => (init_src(), src_exports));
@@ -89784,6 +90421,7 @@ void (async () => {
     console.log(source_default.gray("    adhdev update            \u2014 Upgrade to latest version"));
     console.log();
     console.log(source_default.gray("  Advanced tools:"));
+    console.log(source_default.gray("    adhdev trace --category session_host \u2014 Inspect structured daemon trace"));
     console.log(source_default.gray("    adhdev service           \u2014 Manage OS background auto-start service"));
     console.log(source_default.gray("    adhdev provider ...      \u2014 Provider development commands"));
     console.log(source_default.gray("    adhdev cdp ...           \u2014 CDP debugging tools"));