@adhdev/daemon-core 0.8.57 → 0.8.59

package/dist/index.mjs

@@ -35,6 +35,7 @@ __export(config_exports, {
   loadConfig: () => loadConfig,
   markSetupComplete: () => markSetupComplete,
   resetConfig: () => resetConfig,
+  resolveProviderSourceMode: () => resolveProviderSourceMode,
   saveConfig: () => saveConfig,
   updateConfig: () => updateConfig
 });
@@ -42,6 +43,12 @@ import { homedir } from "os";
 import { join } from "path";
 import { existsSync, mkdirSync, readFileSync, writeFileSync, chmodSync } from "fs";
 import { randomUUID } from "crypto";
+function resolveProviderSourceMode(providerSourceMode, legacyDisableUpstream) {
+  if (providerSourceMode === "normal" || providerSourceMode === "no-upstream") {
+    return providerSourceMode;
+  }
+  return legacyDisableUpstream === true ? "no-upstream" : "normal";
+}
 function isPlainObject(value) {
   return !!value && typeof value === "object" && !Array.isArray(value);
 }
@@ -79,7 +86,7 @@ function normalizeConfig(raw) {
     registeredMachineId: asOptionalString(parsed.registeredMachineId),
     providerSettings: isPlainObject(parsed.providerSettings) ? parsed.providerSettings : {},
     ideSettings: isPlainObject(parsed.ideSettings) ? parsed.ideSettings : {},
-    disableUpstream: asBoolean(parsed.disableUpstream, DEFAULT_CONFIG.disableUpstream ?? false),
+    providerSourceMode: resolveProviderSourceMode(parsed.providerSourceMode, parsed.disableUpstream),
     providerDir: asOptionalString(parsed.providerDir),
     terminalSizingMode: parsed.terminalSizingMode === "fit" ? "fit" : "measured"
   };
@@ -224,7 +231,7 @@ var init_config = __esm({
       registeredMachineId: void 0,
       providerSettings: {},
       ideSettings: {},
-      disableUpstream: false,
+      providerSourceMode: "normal",
       terminalSizingMode: "measured"
     };
     MACHINE_ID_PREFIX = "mach_";
@@ -1894,7 +1901,7 @@ var init_provider_cli_adapter = __esm({
               `[${this.cliType}] Waiting for interactive prompt: hasPrompt=${hasPrompt} stableMs=${stableMs} recentOutputMs=${recentlyOutput} status=${status} startup=${startupLikelyActive} screen=${JSON.stringify(summarizeCliTraceText(screenText, 220)).slice(0, 260)}`
             );
           }
-          await new Promise((resolve12) => setTimeout(resolve12, 50));
+          await new Promise((resolve11) => setTimeout(resolve11, 50));
         }
         const finalScreenText = this.terminalScreen.getText() || "";
         LOG.warn(
@@ -2467,7 +2474,7 @@ ${data.message || ""}`.trim();
           const deadline = Date.now() + 1e4;
           while (this.startupParseGate && Date.now() < deadline) {
             this.resolveStartupState("send_wait");
-            await new Promise((resolve12) => setTimeout(resolve12, 50));
+            await new Promise((resolve11) => setTimeout(resolve11, 50));
           }
         }
         await this.waitForInteractivePrompt();
@@ -2537,12 +2544,12 @@ ${data.message || ""}`.trim();
             if (this.isWaitingForResponse) this.finishResponse();
           }, this.timeouts.maxResponse);
         };
-        await new Promise((resolve12) => {
+        await new Promise((resolve11) => {
           let resolved = false;
           const resolveOnce = () => {
             if (resolved) return;
             resolved = true;
-            resolve12();
+            resolve11();
           };
           const submit = () => {
             if (!this.ptyProcess) {
@@ -2716,17 +2723,17 @@ ${data.message || ""}`.trim();
         }
       }
       waitForStopped(timeoutMs) {
-        return new Promise((resolve12) => {
+        return new Promise((resolve11) => {
           const startedAt = Date.now();
           const timer = setInterval(() => {
             if (!this.ptyProcess || this.currentStatus === "stopped") {
               clearInterval(timer);
-              resolve12(true);
+              resolve11(true);
               return;
             }
             if (Date.now() - startedAt >= timeoutMs) {
               clearInterval(timer);
-              resolve12(false);
+              resolve11(false);
             }
           }, 100);
         });
@@ -3168,6 +3175,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 "";
@@ -3191,6 +3262,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()
   };
@@ -3201,7 +3275,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;
@@ -3253,7 +3332,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()
@@ -3269,7 +3350,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
@@ -3465,15 +3551,15 @@ function resolveCommandPath(command) {
   return null;
 }
 function execAsync(cmd, timeoutMs = 5e3) {
-  return new Promise((resolve12) => {
+  return new Promise((resolve11) => {
     const child = exec(cmd, { encoding: "utf-8", timeout: timeoutMs }, (err, stdout) => {
       if (err || !stdout?.trim()) {
-        resolve12(null);
+        resolve11(null);
       } else {
-        resolve12(stdout.trim());
+        resolve11(stdout.trim());
       }
     });
-    child.on("error", () => resolve12(null));
+    child.on("error", () => resolve11(null));
   });
 }
 async function detectCLIs(providerLoader, options) {
@@ -3684,7 +3770,7 @@ var DaemonCdpManager = class {
   * Returns multiple entries if multiple IDE windows are open on same port
   */
   static listAllTargets(port) {
-    return new Promise((resolve12) => {
+    return new Promise((resolve11) => {
       const req = http.get(`http://127.0.0.1:${port}/json`, (res) => {
         let data = "";
         res.on("data", (chunk) => data += chunk.toString());
@@ -3700,16 +3786,16 @@ var DaemonCdpManager = class {
               (t) => !isNonMain(t.title || "") && t.url?.includes("workbench.html") && !t.url?.includes("agent")
             );
             const fallbackPages = pages.filter((t) => !isNonMain(t.title || ""));
-            resolve12(mainPages.length > 0 ? mainPages : fallbackPages);
+            resolve11(mainPages.length > 0 ? mainPages : fallbackPages);
           } catch {
-            resolve12([]);
+            resolve11([]);
           }
         });
       });
-      req.on("error", () => resolve12([]));
+      req.on("error", () => resolve11([]));
       req.setTimeout(2e3, () => {
         req.destroy();
-        resolve12([]);
+        resolve11([]);
       });
     });
   }
@@ -3749,7 +3835,7 @@ var DaemonCdpManager = class {
     }
   }
   findTargetOnPort(port) {
-    return new Promise((resolve12) => {
+    return new Promise((resolve11) => {
       const req = http.get(`http://127.0.0.1:${port}/json`, (res) => {
         let data = "";
         res.on("data", (chunk) => data += chunk.toString());
@@ -3760,7 +3846,7 @@ var DaemonCdpManager = class {
               (t) => (t.type === "page" || t.type === "browser" || t.type === "Page") && t.webSocketDebuggerUrl
             );
             if (pages.length === 0) {
-              resolve12(targets.find((t) => t.webSocketDebuggerUrl) || null);
+              resolve11(targets.find((t) => t.webSocketDebuggerUrl) || null);
               return;
             }
             const mainPages = pages.filter((t) => !this.isNonMainTitle(t.title || ""));
@@ -3770,24 +3856,24 @@ var DaemonCdpManager = class {
               const specific = list.find((t) => t.id === this._targetId);
               if (specific) {
                 this._pageTitle = specific.title || "";
-                resolve12(specific);
+                resolve11(specific);
               } else {
                 this.log(`[CDP] Target ${this._targetId} not found in page list`);
-                resolve12(null);
+                resolve11(null);
               }
               return;
             }
             this._pageTitle = list[0]?.title || "";
-            resolve12(list[0]);
+            resolve11(list[0]);
           } catch {
-            resolve12(null);
+            resolve11(null);
           }
         });
       });
-      req.on("error", () => resolve12(null));
+      req.on("error", () => resolve11(null));
       req.setTimeout(2e3, () => {
         req.destroy();
-        resolve12(null);
+        resolve11(null);
       });
     });
   }
@@ -3798,7 +3884,7 @@ var DaemonCdpManager = class {
     this.extensionProviders = providers;
   }
   connectToTarget(wsUrl) {
-    return new Promise((resolve12) => {
+    return new Promise((resolve11) => {
       this.ws = new WebSocket(wsUrl);
       this.ws.on("open", async () => {
         this._connected = true;
@@ -3808,17 +3894,17 @@ var DaemonCdpManager = class {
         }
         this.connectBrowserWs().catch(() => {
         });
-        resolve12(true);
+        resolve11(true);
       });
       this.ws.on("message", (data) => {
         try {
           const msg = JSON.parse(data.toString());
           if (msg.id && this.pending.has(msg.id)) {
-            const { resolve: resolve13, reject } = this.pending.get(msg.id);
+            const { resolve: resolve12, reject } = this.pending.get(msg.id);
             this.pending.delete(msg.id);
             this.failureCount = 0;
             if (msg.error) reject(new Error(msg.error.message));
-            else resolve13(msg.result);
+            else resolve12(msg.result);
           } else if (msg.method === "Runtime.executionContextCreated") {
             this.contexts.add(msg.params.context.id);
           } else if (msg.method === "Runtime.executionContextDestroyed") {
@@ -3841,7 +3927,7 @@ var DaemonCdpManager = class {
       this.ws.on("error", (err) => {
         this.log(`[CDP] WebSocket error: ${err.message}`);
         this._connected = false;
-        resolve12(false);
+        resolve11(false);
       });
     });
   }
@@ -3855,7 +3941,7 @@ var DaemonCdpManager = class {
         return;
       }
       this.log(`[CDP] Connecting browser WS for target discovery...`);
-      await new Promise((resolve12, reject) => {
+      await new Promise((resolve11, reject) => {
         this.browserWs = new WebSocket(browserWsUrl);
         this.browserWs.on("open", async () => {
           this._browserConnected = true;
@@ -3865,16 +3951,16 @@ var DaemonCdpManager = class {
           } catch (e) {
             this.log(`[CDP] setDiscoverTargets failed: ${e.message}`);
           }
-          resolve12();
+          resolve11();
         });
         this.browserWs.on("message", (data) => {
           try {
             const msg = JSON.parse(data.toString());
             if (msg.id && this.browserPending.has(msg.id)) {
-              const { resolve: resolve13, reject: reject2 } = this.browserPending.get(msg.id);
+              const { resolve: resolve12, reject: reject2 } = this.browserPending.get(msg.id);
               this.browserPending.delete(msg.id);
               if (msg.error) reject2(new Error(msg.error.message));
-              else resolve13(msg.result);
+              else resolve12(msg.result);
             }
           } catch {
           }
@@ -3894,31 +3980,31 @@ var DaemonCdpManager = class {
     }
   }
   getBrowserWsUrl() {
-    return new Promise((resolve12) => {
+    return new Promise((resolve11) => {
       const req = http.get(`http://127.0.0.1:${this.port}/json/version`, (res) => {
         let data = "";
         res.on("data", (chunk) => data += chunk.toString());
         res.on("end", () => {
           try {
             const info = JSON.parse(data);
-            resolve12(info.webSocketDebuggerUrl || null);
+            resolve11(info.webSocketDebuggerUrl || null);
           } catch {
-            resolve12(null);
+            resolve11(null);
           }
         });
       });
-      req.on("error", () => resolve12(null));
+      req.on("error", () => resolve11(null));
       req.setTimeout(3e3, () => {
         req.destroy();
-        resolve12(null);
+        resolve11(null);
       });
     });
   }
   sendBrowser(method, params = {}, timeoutMs = 15e3) {
-    return new Promise((resolve12, reject) => {
+    return new Promise((resolve11, reject) => {
       if (!this.browserWs || !this._browserConnected) return reject(new Error("Browser WS not connected"));
       const id = this.browserMsgId++;
-      this.browserPending.set(id, { resolve: resolve12, reject });
+      this.browserPending.set(id, { resolve: resolve11, reject });
       this.browserWs.send(JSON.stringify({ id, method, params }));
       setTimeout(() => {
         if (this.browserPending.has(id)) {
@@ -3958,11 +4044,11 @@ var DaemonCdpManager = class {
   }
   // ─── CDP Protocol ────────────────────────────────────────
   sendInternal(method, params = {}, timeoutMs = 15e3) {
-    return new Promise((resolve12, reject) => {
+    return new Promise((resolve11, reject) => {
       if (!this.ws || !this._connected) return reject(new Error("CDP not connected"));
       if (this.ws.readyState !== WebSocket.OPEN) return reject(new Error("WebSocket not open"));
       const id = this.msgId++;
-      this.pending.set(id, { resolve: resolve12, reject });
+      this.pending.set(id, { resolve: resolve11, reject });
       this.ws.send(JSON.stringify({ id, method, params }));
       setTimeout(() => {
         if (this.pending.has(id)) {
@@ -4211,7 +4297,7 @@ var DaemonCdpManager = class {
     const browserWs = this.browserWs;
     let msgId = this.browserMsgId;
     const sendWs = (method, params = {}, sessionId) => {
-      return new Promise((resolve12, reject) => {
+      return new Promise((resolve11, reject) => {
         const mid = msgId++;
         this.browserMsgId = msgId;
         const handler = (raw) => {
@@ -4220,7 +4306,7 @@ var DaemonCdpManager = class {
             if (msg.id === mid) {
               browserWs.removeListener("message", handler);
               if (msg.error) reject(new Error(msg.error.message || JSON.stringify(msg.error)));
-              else resolve12(msg.result);
+              else resolve11(msg.result);
             }
           } catch {
           }
@@ -4421,14 +4507,14 @@ var DaemonCdpManager = class {
     if (!ws || ws.readyState !== WebSocket.OPEN) {
       throw new Error("CDP not connected");
     }
-    return new Promise((resolve12, reject) => {
+    return new Promise((resolve11, reject) => {
       const id = getNextId();
       pendingMap.set(id, {
         resolve: (result) => {
           if (result?.result?.subtype === "error") {
             reject(new Error(result.result.description));
           } else {
-            resolve12(result?.result?.value);
+            resolve11(result?.result?.value);
           }
         },
         reject
@@ -4460,10 +4546,10 @@ var DaemonCdpManager = class {
       throw new Error("CDP not connected");
     }
     const sendViaSession = (method, params = {}) => {
-      return new Promise((resolve12, reject) => {
+      return new Promise((resolve11, reject) => {
         const pendingMap = this._browserConnected ? this.browserPending : this.pending;
         const id = this._browserConnected ? this.browserMsgId++ : this.msgId++;
-        pendingMap.set(id, { resolve: resolve12, reject });
+        pendingMap.set(id, { resolve: resolve11, reject });
         ws.send(JSON.stringify({ id, sessionId, method, params }));
         setTimeout(() => {
           if (pendingMap.has(id)) {
@@ -5026,8 +5112,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) {
@@ -5129,7 +5213,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 };
@@ -5373,6 +5457,30 @@ var ChatHistoryWriter = class {
       options.historySessionId
     );
   }
+  writeSessionStart(agentType, historySessionId, workspace, instanceId) {
+    const id = String(historySessionId || "").trim();
+    const ws = String(workspace || "").trim();
+    if (!id || !ws) return;
+    try {
+      const dir = path7.join(HISTORY_DIR, this.sanitize(agentType));
+      fs3.mkdirSync(dir, { recursive: true });
+      const date = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
+      const filePath = path7.join(dir, `${this.sanitize(id)}_${date}.jsonl`);
+      const record = {
+        ts: (/* @__PURE__ */ new Date()).toISOString(),
+        receivedAt: Date.now(),
+        role: "system",
+        kind: "session_start",
+        content: ws,
+        agent: agentType,
+        instanceId,
+        historySessionId: id,
+        workspace: ws
+      };
+      fs3.appendFileSync(filePath, JSON.stringify(record) + "\n", "utf-8");
+    } catch {
+    }
+  }
   promoteHistorySession(agentType, previousHistorySessionId, nextHistorySessionId) {
     const fromId = String(previousHistorySessionId || "").trim();
     const toId = String(nextHistorySessionId || "").trim();
@@ -5592,6 +5700,7 @@ function listSavedHistorySessions(agentType, options = {}) {
       let lastMessageAt = 0;
       let sessionTitle = "";
       let preview = "";
+      let workspace = "";
       for (const file of files.sort()) {
         const filePath = path7.join(dir, file);
         const content = fs3.readFileSync(filePath, "utf-8");
@@ -5604,6 +5713,10 @@ function listSavedHistorySessions(agentType, options = {}) {
             parsed = null;
           }
           if (!parsed || parsed.historySessionId !== historySessionId) continue;
+          if (parsed.kind === "session_start") {
+            if (!workspace && parsed.workspace) workspace = parsed.workspace;
+            continue;
+          }
           messageCount += 1;
           if (!firstMessageAt || parsed.receivedAt < firstMessageAt) firstMessageAt = parsed.receivedAt;
           if (!lastMessageAt || parsed.receivedAt > lastMessageAt) lastMessageAt = parsed.receivedAt;
@@ -5618,7 +5731,8 @@ function listSavedHistorySessions(agentType, options = {}) {
         messageCount,
         firstMessageAt,
         lastMessageAt,
-        preview: preview || void 0
+        preview: preview || void 0,
+        workspace: workspace || void 0
       });
     }
     summaries.sort((a, b) => b.lastMessageAt - a.lastMessageAt);
@@ -5634,6 +5748,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;
@@ -5648,9 +5817,8 @@ var ExtensionProviderInstance = class {
   messages = [];
   prevMessageHashes = /* @__PURE__ */ new Map();
   activeModal = null;
-  currentModel = "";
-  currentMode = "";
   controlValues = {};
+  summaryMetadata = void 0;
   appliedEffectKeys = /* @__PURE__ */ new Set();
   runtimeMessages = [];
   lastAgentStatus = "idle";
@@ -5685,6 +5853,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,
@@ -5698,10 +5870,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(),
@@ -5714,10 +5885,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;
@@ -5818,8 +5993,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";
@@ -5969,8 +6150,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;
@@ -6106,6 +6285,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,
@@ -6122,11 +6305,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,
@@ -6298,8 +6479,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;
@@ -6386,14 +6572,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";
@@ -7176,6 +7366,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;
@@ -7192,13 +7384,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,
@@ -7209,6 +7399,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 {
@@ -7224,11 +7416,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,
@@ -7239,6 +7430,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);
@@ -7265,11 +7458,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,
@@ -7280,6 +7474,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 {
@@ -7295,13 +7491,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,
@@ -7993,7 +8186,7 @@ function getStateLastSignature(state) {
 async function getStableExtensionBaseline(h) {
   const first = await readExtensionChatState(h);
   if (getStateMessageCount(first) > 0 || getStateLastSignature(first)) return first;
-  await new Promise((resolve12) => setTimeout(resolve12, 150));
+  await new Promise((resolve11) => setTimeout(resolve11, 150));
   const second = await readExtensionChatState(h);
   return getStateMessageCount(second) >= getStateMessageCount(first) ? second : first;
 }
@@ -8001,7 +8194,7 @@ async function verifyExtensionSendObserved(h, before) {
   const beforeCount = getStateMessageCount(before);
   const beforeSignature = getStateLastSignature(before);
   for (let attempt = 0; attempt < 12; attempt += 1) {
-    await new Promise((resolve12) => setTimeout(resolve12, 250));
+    await new Promise((resolve11) => setTimeout(resolve11, 250));
     const state = await readExtensionChatState(h);
     if (state?.status === "waiting_approval") return true;
     const afterCount = getStateMessageCount(state);
@@ -9193,6 +9386,30 @@ async function handleFileListBrowse(h, args) {
   }
 }
 
+// src/commands/stream-commands.ts
+init_config();
+
+// src/config/provider-source-config.ts
+function normalizeProviderDir(value) {
+  if (typeof value !== "string") return void 0;
+  const trimmed = value.trim();
+  return trimmed ? trimmed : void 0;
+}
+function parseProviderSourceConfigUpdate(input) {
+  const updates = {};
+  if (Object.prototype.hasOwnProperty.call(input, "providerSourceMode")) {
+    const { providerSourceMode } = input;
+    if (providerSourceMode !== "normal" && providerSourceMode !== "no-upstream") {
+      return { ok: false, error: "providerSourceMode must be 'normal' or 'no-upstream'" };
+    }
+    updates.providerSourceMode = providerSourceMode;
+  }
+  if (Object.prototype.hasOwnProperty.call(input, "providerDir")) {
+    updates.providerDir = normalizeProviderDir(input.providerDir);
+  }
+  return { ok: true, updates };
+}
+
 // src/providers/cli-script-results.ts
 function parseCliScriptResult(result) {
   if (typeof result === "string") {
@@ -9305,8 +9522,49 @@ async function handleSetProviderSetting(h, args) {
   }
   return { success: false, error: `Failed to set ${providerType}.${key} \u2014 invalid key, value, or not a public setting` };
 }
-function normalizeProviderScriptArgs(args) {
+function handleGetProviderSourceConfig(h, _args) {
+  const loader = h.ctx.providerLoader;
+  if (!loader) return { success: false, error: "providerLoader not available" };
+  return { success: true, ...loader.getSourceConfig() };
+}
+async function handleSetProviderSourceConfig(h, args) {
+  const loader = h.ctx.providerLoader;
+  if (!loader) return { success: false, error: "providerLoader not available" };
+  const parsed = parseProviderSourceConfigUpdate(args || {});
+  if ("error" in parsed) {
+    return { success: false, error: parsed.error };
+  }
+  const currentConfig2 = loadConfig();
+  const nextConfig = {
+    ...currentConfig2,
+    ...parsed.updates.providerSourceMode ? { providerSourceMode: parsed.updates.providerSourceMode } : {},
+    ...Object.prototype.hasOwnProperty.call(parsed.updates, "providerDir") ? { providerDir: parsed.updates.providerDir } : {}
+  };
+  saveConfig(nextConfig);
+  const sourceConfig = loader.applySourceConfig({
+    sourceMode: nextConfig.providerSourceMode,
+    userDir: Object.prototype.hasOwnProperty.call(parsed.updates, "providerDir") ? parsed.updates.providerDir : loader.getSourceConfig().explicitProviderDir || void 0
+  });
+  loader.reload();
+  loader.registerToDetector();
+  await h.ctx.onProviderSourceConfigChanged?.();
+  LOG.info(
+    "Command",
+    `[set_provider_source_config] mode=${sourceConfig.sourceMode} explicitProviderDir=${sourceConfig.explicitProviderDir || "-"} userDir=${sourceConfig.userDir}`
+  );
+  return { success: true, reloaded: true, ...sourceConfig };
+}
+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];
@@ -9352,7 +9610,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) {
@@ -9998,6 +10256,10 @@ var DaemonCommandHandler = class {
         return handleGetProviderSettings(this, args);
       case "set_provider_setting":
         return handleSetProviderSetting(this, args);
+      case "get_provider_source_config":
+        return handleGetProviderSourceConfig(this, args);
+      case "set_provider_source_config":
+        return handleSetProviderSourceConfig(this, args);
       // ─── IDE Extension Settings (stream-commands.ts) ──────────
       case "get_ide_extensions":
         return handleGetIdeExtensions(this, args);
@@ -10037,7 +10299,7 @@ var DaemonCommandHandler = class {
     try {
       const http3 = await import("http");
       const postData = JSON.stringify(body);
-      const result = await new Promise((resolve12, reject) => {
+      const result = await new Promise((resolve11, reject) => {
         const req = http3.request({
           hostname: "127.0.0.1",
           port: 19280,
@@ -10049,9 +10311,9 @@ var DaemonCommandHandler = class {
           res.on("data", (chunk) => data += chunk);
           res.on("end", () => {
             try {
-              resolve12(JSON.parse(data));
+              resolve11(JSON.parse(data));
             } catch {
-              resolve12({ raw: data });
+              resolve11({ raw: data });
             }
           });
         });
@@ -10069,15 +10331,15 @@ var DaemonCommandHandler = class {
     if (!providerType) return { success: false, error: "providerType required" };
     try {
       const http3 = await import("http");
-      const result = await new Promise((resolve12, reject) => {
+      const result = await new Promise((resolve11, reject) => {
         http3.get(`http://127.0.0.1:19280/api/providers/${providerType}/${endpoint}`, (res) => {
           let data = "";
           res.on("data", (chunk) => data += chunk);
           res.on("end", () => {
             try {
-              resolve12(JSON.parse(data));
+              resolve11(JSON.parse(data));
             } catch {
-              resolve12({ raw: data });
+              resolve11({ raw: data });
             }
           });
         }).on("error", reject);
@@ -10091,7 +10353,7 @@ var DaemonCommandHandler = class {
     try {
       const http3 = await import("http");
       const postData = JSON.stringify(args || {});
-      const result = await new Promise((resolve12, reject) => {
+      const result = await new Promise((resolve11, reject) => {
         const req = http3.request({
           hostname: "127.0.0.1",
           port: 19280,
@@ -10103,9 +10365,9 @@ var DaemonCommandHandler = class {
           res.on("data", (chunk) => data += chunk);
           res.on("end", () => {
             try {
-              resolve12(JSON.parse(data));
+              resolve11(JSON.parse(data));
             } catch {
-              resolve12({ raw: data });
+              resolve11({ raw: data });
             }
           });
         });
@@ -10155,6 +10417,9 @@ function getForcedNewSessionScriptName(provider, launchMode) {
   const controls = Array.isArray(provider.controls) ? provider.controls : [];
   for (const control of controls) {
     if (control?.type !== "action") continue;
+    if (typeof control?.confirmTitle === "string" && control.confirmTitle.trim()) continue;
+    if (typeof control?.confirmMessage === "string" && control.confirmMessage.trim()) continue;
+    if (typeof control?.confirmLabel === "string" && control.confirmLabel.trim()) continue;
     const invokeScript = typeof control?.invokeScript === "string" ? control.invokeScript.trim() : "";
     if (!invokeScript) continue;
     const controlId = typeof control?.id === "string" ? control.id.trim() : "";
@@ -10164,6 +10429,20 @@ function getForcedNewSessionScriptName(provider, launchMode) {
   }
   return null;
 }
+async function waitForCliAdapterReady(adapter, options) {
+  const timeoutMs = Math.max(100, options?.timeoutMs ?? 15e3);
+  const pollMs = Math.max(10, options?.pollMs ?? 50);
+  const deadline = Date.now() + timeoutMs;
+  while (Date.now() < deadline) {
+    if (adapter?.isReady?.()) return;
+    const status = adapter?.getStatus?.()?.status;
+    if (status === "stopped") {
+      throw new Error("CLI runtime stopped before it became ready");
+    }
+    await new Promise((resolve11) => setTimeout(resolve11, pollMs));
+  }
+  throw new Error(`CLI runtime did not become ready within ${timeoutMs}ms`);
+}
 var CliProviderInstance = class {
   constructor(provider, workingDir, cliArgs = [], instanceId, transportFactory, options) {
     this.provider = provider;
@@ -10192,6 +10471,7 @@ var CliProviderInstance = class {
   generatingDebouncePending = null;
   lastApprovalEventAt = 0;
   controlValues = {};
+  summaryMetadata = void 0;
   appliedEffectKeys = /* @__PURE__ */ new Set();
   historyWriter;
   runtimeMessages = [];
@@ -10334,13 +10614,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";
@@ -10362,6 +10636,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,
@@ -10377,8 +10655,6 @@ var CliProviderInstance = class {
         inputContent: ""
       },
       workspace: this.workingDir,
-      currentModel,
-      currentPlan,
       instanceId: this.instanceId,
       providerSessionId: this.providerSessionId,
       lastUpdated: Date.now(),
@@ -10393,8 +10669,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) {
@@ -10442,6 +10719,7 @@ var CliProviderInstance = class {
     const scriptName = getForcedNewSessionScriptName(this.provider, this.launchMode);
     if (!scriptName) return;
     LOG.info("CLI", `[${this.type}] forcing fresh session launch via script: ${scriptName}`);
+    await waitForCliAdapterReady(this.adapter);
     const raw = await this.adapter.invokeScript(scriptName, {});
     const parsed = parseCliScriptResult(raw);
     if (!parsed.success) {
@@ -10597,10 +10875,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";
@@ -10791,6 +11073,7 @@ ${effect.notification.body || ""}`.trim();
     const previousProviderSessionId = this.providerSessionId;
     this.providerSessionId = nextSessionId;
     this.historyWriter.promoteHistorySession(this.type, previousHistorySessionId, nextSessionId);
+    this.historyWriter.writeSessionStart(this.type, nextSessionId, this.workingDir, this.instanceId);
     this.adapter.updateRuntimeMeta({ providerSessionId: nextSessionId });
     this.onProviderSessionResolved?.({
       instanceId: this.instanceId,
@@ -10970,8 +11253,7 @@ var AcpProviderInstance = class {
   lastStatus = "starting";
   generatingStartedAt = 0;
   agentCapabilities = {};
-  currentModel;
-  currentMode;
+  currentSelections = {};
   activeToolCalls = [];
   stopReason = null;
   partialContent = "";
@@ -11051,8 +11333,6 @@ var AcpProviderInstance = class {
         inputContent: ""
       },
       workspace: this.workingDir,
-      currentModel: this.currentModel,
-      currentPlan: this.currentMode,
       instanceId: this.instanceId,
       lastUpdated: Date.now(),
       settings: this.settings,
@@ -11063,11 +11343,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) {
@@ -11101,6 +11379,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;
@@ -11132,12 +11458,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,
@@ -11156,8 +11484,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;
@@ -11175,7 +11502,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) {
@@ -11191,7 +11518,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;
@@ -11206,7 +11533,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";
@@ -11377,13 +11704,13 @@ var AcpProviderInstance = class {
         }
         this.currentStatus = "waiting_approval";
         this.detectStatusTransition();
-        const approved = await new Promise((resolve12) => {
-          this.permissionResolvers.push(resolve12);
+        const approved = await new Promise((resolve11) => {
+          this.permissionResolvers.push(resolve11);
           setTimeout(() => {
-            const idx = this.permissionResolvers.indexOf(resolve12);
+            const idx = this.permissionResolvers.indexOf(resolve11);
             if (idx >= 0) {
               this.permissionResolvers.splice(idx, 1);
-              resolve12(false);
+              resolve11(false);
             }
           }, 3e5);
         });
@@ -11464,8 +11791,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;
@@ -11479,13 +11806,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(", ")}`);
       }
@@ -11660,7 +11990,7 @@ var AcpProviderInstance = class {
         break;
       }
       case "current_mode_update": {
-        this.currentMode = update.currentModeId;
+        this.setCurrentSelection("mode", update.currentModeId);
         break;
       }
       case "config_option_update": {
@@ -11733,7 +12063,7 @@ var AcpProviderInstance = class {
       this.detectStatusTransition();
     }
     if (params.model) {
-      this.currentModel = params.model;
+      this.setCurrentSelection("model", params.model);
     }
   }
   /** Map SDK ToolCallStatus to internal status */
@@ -12022,7 +12352,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,
@@ -12030,7 +12364,7 @@ var DaemonCliManager = class {
           providerName: entry.providerName,
           providerSessionId: entry.providerSessionId,
           workspace: entry.workspace,
-          currentModel: entry.currentModel,
+          summaryMetadata,
           title: entry.title
         });
       }
@@ -12220,7 +12554,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
       });
@@ -12322,7 +12656,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
     });
@@ -12699,6 +13033,9 @@ function validateProviderDefinition(raw) {
       warnings.push(`Unknown provider field: ${key}`);
     }
   }
+  if (provider.disableUpstream !== void 0) {
+    warnings.push("disableUpstream is deprecated in provider definitions; use machine-level provider source policy instead");
+  }
   const category = provider.category;
   if (category === "cli" || category === "acp") {
     const spawn4 = provider.spawn;
@@ -12758,8 +13095,11 @@ function validateControl(control, errors) {
 var ProviderLoader = class _ProviderLoader {
   providers = /* @__PURE__ */ new Map();
   providerAvailability = /* @__PURE__ */ new Map();
+  defaultProvidersDir;
+  explicitProviderDir = null;
   userDir;
   upstreamDir;
+  sourceMode = "normal";
   disableUpstream;
   watchers = [];
   logFn;
@@ -12773,22 +13113,15 @@ var ProviderLoader = class _ProviderLoader {
   static META_FILE = ".meta.json";
   constructor(options) {
     this.logFn = options?.logFn || LOG.forComponent("Provider").asLogFn();
-    const defaultProvidersDir = path14.join(os13.homedir(), ".adhdev", "providers");
-    if (options?.userDir) {
-      this.userDir = options.userDir;
-      this.log(`Config 'providerDir' applied: ${this.userDir}`);
-    } else {
-      const localRepoPath = path14.resolve(__dirname, "../../../../../adhdev-providers");
-      if (fs6.existsSync(localRepoPath)) {
-        this.userDir = localRepoPath;
-        this.log(`Auto-detected local public repository: ${this.userDir} (Dev workspace speedup)`);
-      } else {
-        this.userDir = defaultProvidersDir;
-        this.log(`Using default user providers directory: ${this.userDir}`);
-      }
-    }
-    this.upstreamDir = path14.join(defaultProvidersDir, ".upstream");
-    this.disableUpstream = options?.disableUpstream ?? false;
+    this.defaultProvidersDir = path14.join(os13.homedir(), ".adhdev", "providers");
+    this.userDir = this.defaultProvidersDir;
+    this.upstreamDir = path14.join(this.defaultProvidersDir, ".upstream");
+    this.disableUpstream = false;
+    this.applySourceConfig({
+      userDir: options?.userDir,
+      sourceMode: options?.sourceMode,
+      disableUpstream: options?.disableUpstream
+    });
   }
   log(msg) {
     this.logFn(`[ProviderLoader] ${msg}`);
@@ -12813,6 +13146,33 @@ var ProviderLoader = class _ProviderLoader {
   getProviderRoots() {
     return [this.userDir, this.upstreamDir];
   }
+  getSourceConfig() {
+    return {
+      sourceMode: this.sourceMode,
+      disableUpstream: this.disableUpstream,
+      explicitProviderDir: this.explicitProviderDir,
+      userDir: this.userDir,
+      upstreamDir: this.upstreamDir,
+      providerRoots: this.getProviderRoots()
+    };
+  }
+  applySourceConfig(options) {
+    const nextSourceMode = options?.sourceMode === "no-upstream" ? "no-upstream" : options?.sourceMode === "normal" ? "normal" : options?.disableUpstream ? "no-upstream" : this.sourceMode || "normal";
+    if (options && Object.prototype.hasOwnProperty.call(options, "userDir")) {
+      this.explicitProviderDir = options.userDir?.trim() ? options.userDir : null;
+    }
+    this.sourceMode = nextSourceMode;
+    this.userDir = this.explicitProviderDir || this.defaultProvidersDir;
+    this.upstreamDir = path14.join(this.defaultProvidersDir, ".upstream");
+    this.disableUpstream = this.sourceMode === "no-upstream";
+    if (this.explicitProviderDir) {
+      this.log(`Config 'providerDir' applied: ${this.userDir}`);
+    } else {
+      this.log(`Using default user providers directory: ${this.userDir}`);
+    }
+    this.log(`Provider source config: mode=${this.sourceMode} explicitProviderDir=${this.explicitProviderDir || "-"} userDir=${this.userDir} upstreamDir=${this.upstreamDir}`);
+    return this.getSourceConfig();
+  }
   /**
   * Canonical provider directory shape for a given root.
   */
@@ -12863,7 +13223,7 @@ var ProviderLoader = class _ProviderLoader {
         this.log(`Loaded ${upstreamCount} upstream providers (auto-updated)`);
       }
     } else if (this.disableUpstream) {
-      this.log("Upstream loading disabled (disableUpstream=true)");
+      this.log("Upstream loading disabled (sourceMode=no-upstream)");
     }
     if (fs6.existsSync(this.userDir)) {
       const userCount = this.loadDir(this.userDir, [".upstream"]);
@@ -13374,7 +13734,7 @@ var ProviderLoader = class _ProviderLoader {
   */
   async fetchLatest() {
     if (this.disableUpstream) {
-      this.log("Upstream fetch skipped (disableUpstream=true)");
+      this.log("Upstream fetch skipped (sourceMode=no-upstream)");
       return { updated: false };
     }
     const https = __require("https");
@@ -13396,7 +13756,7 @@ var ProviderLoader = class _ProviderLoader {
       return { updated: false };
     }
     try {
-      const etag = await new Promise((resolve12, reject) => {
+      const etag = await new Promise((resolve11, reject) => {
         const options = {
           method: "HEAD",
           hostname: "github.com",
@@ -13414,7 +13774,7 @@ var ProviderLoader = class _ProviderLoader {
               headers: { "User-Agent": "adhdev-launcher" },
               timeout: 1e4
             }, (res2) => {
-              resolve12(res2.headers.etag || res2.headers["last-modified"] || "");
+              resolve11(res2.headers.etag || res2.headers["last-modified"] || "");
             });
             req2.on("error", reject);
             req2.on("timeout", () => {
@@ -13423,7 +13783,7 @@ var ProviderLoader = class _ProviderLoader {
             });
             req2.end();
           } else {
-            resolve12(res.headers.etag || res.headers["last-modified"] || "");
+            resolve11(res.headers.etag || res.headers["last-modified"] || "");
           }
         });
         req.on("error", reject);
@@ -13487,7 +13847,7 @@ var ProviderLoader = class _ProviderLoader {
   downloadFile(url, destPath) {
     const https = __require("https");
     const http3 = __require("http");
-    return new Promise((resolve12, reject) => {
+    return new Promise((resolve11, reject) => {
       const doRequest = (reqUrl, redirectCount = 0) => {
         if (redirectCount > 5) {
           reject(new Error("Too many redirects"));
@@ -13507,7 +13867,7 @@ var ProviderLoader = class _ProviderLoader {
           res.pipe(ws);
           ws.on("finish", () => {
             ws.close();
-            resolve12();
+            resolve11();
           });
           ws.on("error", reject);
         });
@@ -13982,17 +14342,17 @@ async function findFreePort(ports) {
   throw new Error("No free port found");
 }
 function checkPortFree(port) {
-  return new Promise((resolve12) => {
+  return new Promise((resolve11) => {
     const server = net.createServer();
     server.unref();
-    server.on("error", () => resolve12(false));
+    server.on("error", () => resolve11(false));
     server.listen(port, "127.0.0.1", () => {
-      server.close(() => resolve12(true));
+      server.close(() => resolve11(true));
     });
   });
 }
 async function isCdpActive(port) {
-  return new Promise((resolve12) => {
+  return new Promise((resolve11) => {
     const req = __require("http").get(`http://127.0.0.1:${port}/json/version`, {
       timeout: 2e3
     }, (res) => {
@@ -14001,16 +14361,16 @@ async function isCdpActive(port) {
       res.on("end", () => {
         try {
           const info = JSON.parse(data);
-          resolve12(!!info["WebKit-Version"] || !!info["Browser"]);
+          resolve11(!!info["WebKit-Version"] || !!info["Browser"]);
         } catch {
-          resolve12(false);
+          resolve11(false);
         }
       });
     });
-    req.on("error", () => resolve12(false));
+    req.on("error", () => resolve11(false));
     req.on("timeout", () => {
       req.destroy();
-      resolve12(false);
+      resolve11(false);
     });
   });
 }
@@ -14461,12 +14821,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,
@@ -14618,7 +15056,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);
 }
@@ -14659,9 +15097,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);
@@ -14739,7 +15192,7 @@ async function waitForPidExit(pid, timeoutMs) {
   while (Date.now() - start < timeoutMs) {
     try {
       process.kill(pid, 0);
-      await new Promise((resolve12) => setTimeout(resolve12, 250));
+      await new Promise((resolve11) => setTimeout(resolve11, 250));
     } catch {
       return;
     }
@@ -14854,7 +15307,7 @@ async function runDaemonUpgradeHelper(payload) {
     appendUpgradeLog(installOutput.trim());
   }
   if (process.platform === "win32") {
-    await new Promise((resolve12) => setTimeout(resolve12, 500));
+    await new Promise((resolve11) => setTimeout(resolve11, 500));
     cleanupStaleGlobalInstallDirs(payload.packageName);
     appendUpgradeLog("Post-install staging cleanup complete");
   }
@@ -14936,11 +15389,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:
@@ -15050,44 +15596,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": {
@@ -15096,7 +15658,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": {
@@ -15105,16 +15667,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": {
@@ -15124,12 +15686,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": {
@@ -15138,7 +15703,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": {
@@ -15147,8 +15715,9 @@ var DaemonCommandRouter = class {
         if (!providerType) {
           return { success: false, error: "providerType required" };
         }
-        const offset = Math.max(0, Number(args?.offset) || 0);
-        const limit = Math.max(1, Math.min(100, Number(args?.limit) || 30));
+        const wantsAll = args?.all === true;
+        const offset = wantsAll ? 0 : Math.max(0, Number(args?.offset) || 0);
+        const limit = wantsAll ? Number.MAX_SAFE_INTEGER : Math.max(1, Math.min(100, Number(args?.limit) || 30));
         const { sessions: historySessions, hasMore } = listSavedHistorySessions(providerType, { offset, limit });
         const state = loadState();
         const savedSessions = getSavedProviderSessions(state, { providerType, kind });
@@ -15169,13 +15738,13 @@ var DaemonCommandRouter = class {
               providerName: saved?.providerName || recent?.providerName || providerType,
               kind: saved?.kind || recent?.kind || kind,
               title: saved?.title || recent?.title || session.sessionTitle || session.preview || providerType,
-              workspace: saved?.workspace || recent?.workspace,
-              currentModel: saved?.currentModel || recent?.currentModel,
+              workspace: saved?.workspace || recent?.workspace || session.workspace,
+              summaryMetadata: saved?.summaryMetadata || recent?.summaryMetadata,
               preview: session.preview,
               messageCount: session.messageCount,
               firstMessageAt: session.firstMessageAt,
               lastMessageAt: session.lastMessageAt,
-              canResume: !!(saved?.workspace || recent?.workspace) && canResumeById
+              canResume: !!(saved?.workspace || recent?.workspace || session.workspace) && canResumeById
             };
           }),
           hasMore
@@ -15609,7 +16178,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(", ");
@@ -15671,9 +16240,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
@@ -15792,7 +16359,7 @@ var ProviderStreamAdapter = class {
     const beforeCount = this.messageCount(before);
     const beforeSignature = this.lastMessageSignature(before);
     for (let attempt = 0; attempt < 12; attempt += 1) {
-      await new Promise((resolve12) => setTimeout(resolve12, 250));
+      await new Promise((resolve11) => setTimeout(resolve11, 250));
       let state;
       try {
         state = await this.readChat(evaluate);
@@ -15814,7 +16381,7 @@ var ProviderStreamAdapter = class {
     if (this.messageCount(first) > 0 || this.lastMessageSignature(first)) {
       return first;
     }
-    await new Promise((resolve12) => setTimeout(resolve12, 150));
+    await new Promise((resolve11) => setTimeout(resolve11, 150));
     const second = await this.readChat(evaluate);
     return this.messageCount(second) >= this.messageCount(first) ? second : first;
   }
@@ -15839,15 +16406,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) {
@@ -15954,7 +16524,7 @@ var ProviderStreamAdapter = class {
       if (typeof data.error === "string" && data.error.trim()) return false;
     }
     for (let attempt = 0; attempt < 6; attempt += 1) {
-      await new Promise((resolve12) => setTimeout(resolve12, 250));
+      await new Promise((resolve11) => setTimeout(resolve11, 250));
       const state = await this.readChat(evaluate);
       const title = this.getStateTitle(state);
       if (this.titlesMatch(title, sessionId)) return true;
@@ -16121,7 +16691,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);
       }
@@ -16469,9 +17040,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,
@@ -16876,6 +17446,7 @@ async function detectAllVersions(loader, archive) {
 import * as http2 from "http";
 import * as fs14 from "fs";
 import * as path22 from "path";
+init_config();
 
 // src/daemon/scaffold-template.ts
 function generateFiles(type, name, category, opts = {}) {
@@ -17006,7 +17577,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 {
@@ -17034,6 +17609,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 });
@@ -18412,7 +18990,7 @@ function getCliTargetBundle(ctx, type, instanceId) {
   return { target, instance, adapter };
 }
 function sleep(ms) {
-  return new Promise((resolve12) => setTimeout(resolve12, ms));
+  return new Promise((resolve11) => setTimeout(resolve11, ms));
 }
 async function waitForCliReady(ctx, type, instanceId, timeoutMs) {
   const startedAt = Date.now();
@@ -18774,7 +19352,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 });
@@ -19259,18 +19836,6 @@ function resolveAutoImplWritableProviderDir(ctx, category, type, requestedDir) {
   if (!fs13.existsSync(providerJson)) {
     return { dir: null, reason: `provider.json not found in writable provider directory: ${desiredDir}` };
   }
-  try {
-    const providerData = JSON.parse(fs13.readFileSync(providerJson, "utf-8"));
-    if (providerData.disableUpstream !== true) {
-      providerData.disableUpstream = true;
-      fs13.writeFileSync(providerJson, JSON.stringify(providerData, null, 2));
-    }
-  } catch (error) {
-    return {
-      dir: null,
-      reason: `Failed to update provider.json in writable provider directory: ${error.message}`
-    };
-  }
   return { dir: desiredDir };
 }
 function loadAutoImplReferenceScripts(ctx, referenceType) {
@@ -19943,7 +20508,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 }] }` |");
@@ -20557,6 +21122,7 @@ var DevServer = class _DevServer {
   cdpManagers;
   instanceManager;
   cliManager;
+  onProviderSourceConfigChanged;
   logFn;
   sseClients = [];
   watchScriptPath = null;
@@ -20573,6 +21139,7 @@ var DevServer = class _DevServer {
     this.cdpManagers = options.cdpManagers;
     this.instanceManager = options.instanceManager || null;
     this.cliManager = options.cliManager || null;
+    this.onProviderSourceConfigChanged = options.onProviderSourceConfigChanged || null;
     this.logFn = options.logFn || LOG.forComponent("DevServer").asLogFn();
   }
   log(msg) {
@@ -20582,6 +21149,8 @@ var DevServer = class _DevServer {
   routes = [
     // Static routes
     { method: "GET", pattern: "/api/providers", handler: (q, s) => this.handleListProviders(q, s) },
+    { method: "GET", pattern: "/api/providers/source-config", handler: (q, s) => this.handleGetProviderSourceConfig(q, s) },
+    { method: "POST", pattern: "/api/providers/source-config", handler: (q, s) => this.handleSetProviderSourceConfig(q, s) },
     { method: "GET", pattern: "/api/providers/versions", handler: (q, s) => this.handleDetectVersions(q, s) },
     { method: "POST", pattern: "/api/providers/reload", handler: (q, s) => this.handleReload(q, s) },
     { method: "POST", pattern: "/api/cdp/evaluate", handler: (q, s) => this.handleCdpEvaluate(q, s) },
@@ -20679,15 +21248,15 @@ var DevServer = class _DevServer {
         this.json(res, 500, { error: e.message });
       }
     });
-    return new Promise((resolve12, reject) => {
+    return new Promise((resolve11, reject) => {
       this.server.listen(port, "127.0.0.1", () => {
         this.log(`Dev server listening on http://127.0.0.1:${port}`);
-        resolve12();
+        resolve11();
       });
       this.server.on("error", (e) => {
         if (e.code === "EADDRINUSE") {
           this.log(`Port ${port} in use, skipping dev server`);
-          resolve12();
+          resolve11();
         } else {
           reject(e);
         }
@@ -20701,7 +21270,33 @@ var DevServer = class _DevServer {
   // ─── Handlers ───
   async handleListProviders(_req, res) {
     const providers = this.providerLoader.getAll().map(toProviderListEntry);
-    this.json(res, 200, { providers, count: providers.length });
+    this.json(res, 200, { providers, count: providers.length, sourceConfig: this.providerLoader.getSourceConfig() });
+  }
+  async handleGetProviderSourceConfig(_req, res) {
+    this.json(res, 200, { success: true, sourceConfig: this.providerLoader.getSourceConfig() });
+  }
+  async handleSetProviderSourceConfig(req, res) {
+    const body = await this.readBody(req);
+    const parsed = parseProviderSourceConfigUpdate(body || {});
+    if (!parsed.ok) {
+      this.json(res, 400, { success: false, error: parsed.error });
+      return;
+    }
+    const currentConfig2 = loadConfig();
+    const nextConfig = {
+      ...currentConfig2,
+      ...parsed.updates.providerSourceMode ? { providerSourceMode: parsed.updates.providerSourceMode } : {},
+      ...Object.prototype.hasOwnProperty.call(parsed.updates, "providerDir") ? { providerDir: parsed.updates.providerDir } : {}
+    };
+    saveConfig(nextConfig);
+    const sourceConfig = this.providerLoader.applySourceConfig({
+      sourceMode: nextConfig.providerSourceMode,
+      userDir: Object.prototype.hasOwnProperty.call(parsed.updates, "providerDir") ? parsed.updates.providerDir : this.providerLoader.getSourceConfig().explicitProviderDir || void 0
+    });
+    this.providerLoader.reload();
+    this.providerLoader.registerToDetector();
+    await this.onProviderSourceConfigChanged?.();
+    this.json(res, 200, { success: true, reloaded: true, sourceConfig });
   }
   async handleProviderConfig(type, _req, res) {
     const provider = this.providerLoader.resolve(type);
@@ -20743,20 +21338,20 @@ var DevServer = class _DevServer {
       child.stderr?.on("data", (d) => {
         stderr += d.toString().slice(0, 2e3);
       });
-      await new Promise((resolve12) => {
+      await new Promise((resolve11) => {
         const timer = setTimeout(() => {
           child.kill();
-          resolve12();
+          resolve11();
         }, 3e3);
         child.on("exit", () => {
           clearTimeout(timer);
-          resolve12();
+          resolve11();
         });
         child.stdout?.once("data", () => {
           setTimeout(() => {
             child.kill();
             clearTimeout(timer);
-            resolve12();
+            resolve11();
           }, 500);
         });
       });
@@ -21252,14 +21847,14 @@ var DevServer = class _DevServer {
       child.stderr?.on("data", (d) => {
         stderr += d.toString();
       });
-      await new Promise((resolve12) => {
+      await new Promise((resolve11) => {
         const timer = setTimeout(() => {
           child.kill();
-          resolve12();
+          resolve11();
         }, timeout);
         child.on("exit", () => {
           clearTimeout(timer);
-          resolve12();
+          resolve11();
         });
       });
       const elapsed = Date.now() - start;
@@ -21404,18 +21999,6 @@ var DevServer = class _DevServer {
     if (!fs14.existsSync(providerJson)) {
       return { dir: null, reason: `provider.json not found in writable provider directory: ${desiredDir}` };
     }
-    try {
-      const providerData = JSON.parse(fs14.readFileSync(providerJson, "utf-8"));
-      if (providerData.disableUpstream !== true) {
-        providerData.disableUpstream = true;
-        fs14.writeFileSync(providerJson, JSON.stringify(providerData, null, 2));
-      }
-    } catch (error) {
-      return {
-        dir: null,
-        reason: `Failed to update provider.json in writable provider directory: ${error.message}`
-      };
-    }
     return { dir: desiredDir };
   }
   async handleAutoImplement(type, req, res) {
@@ -21560,7 +22143,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 }] }` |");
@@ -21941,14 +22524,14 @@ data: ${JSON.stringify(msg.data)}
     res.end(JSON.stringify(data, null, 2));
   }
   async readBody(req) {
-    return new Promise((resolve12) => {
+    return new Promise((resolve11) => {
       let body = "";
       req.on("data", (chunk) => body += chunk);
       req.on("end", () => {
         try {
-          resolve12(JSON.parse(body));
+          resolve11(JSON.parse(body));
         } catch {
-          resolve12({});
+          resolve11({});
         }
       });
     });
@@ -22431,7 +23014,7 @@ async function waitForReady(endpoint, timeoutMs = STARTUP_TIMEOUT_MS) {
   const deadline = Date.now() + timeoutMs;
   while (Date.now() < deadline) {
     if (await canConnect(endpoint)) return;
-    await new Promise((resolve12) => setTimeout(resolve12, STARTUP_POLL_MS));
+    await new Promise((resolve11) => setTimeout(resolve11, STARTUP_POLL_MS));
   }
   throw new Error(`Session host did not become ready within ${timeoutMs}ms`);
 }
@@ -22471,61 +23054,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() : "";
@@ -22662,10 +23190,10 @@ async function installExtension(ide, extension) {
         const buffer = Buffer.from(await res.arrayBuffer());
         const fs15 = await import("fs");
         fs15.writeFileSync(vsixPath, buffer);
-        return new Promise((resolve12) => {
+        return new Promise((resolve11) => {
           const cmd = `"${ide.cliCommand}" --install-extension "${vsixPath}" --force`;
           exec2(cmd, { timeout: 6e4 }, (error, _stdout, stderr) => {
-            resolve12({
+            resolve11({
               extensionId: extension.id,
               marketplaceId: extension.marketplaceId,
               success: !error,
@@ -22678,11 +23206,11 @@ async function installExtension(ide, extension) {
     } catch (e) {
     }
   }
-  return new Promise((resolve12) => {
+  return new Promise((resolve11) => {
     const cmd = `"${ide.cliCommand}" --install-extension ${extension.marketplaceId} --force`;
     exec2(cmd, { timeout: 6e4 }, (error, stdout, stderr) => {
       if (error) {
-        resolve12({
+        resolve11({
           extensionId: extension.id,
           marketplaceId: extension.marketplaceId,
           success: false,
@@ -22690,7 +23218,7 @@ async function installExtension(ide, extension) {
           error: stderr || error.message
         });
       } else {
-        resolve12({
+        resolve11({
           extensionId: extension.id,
           marketplaceId: extension.marketplaceId,
           success: true,
@@ -22787,10 +23315,11 @@ init_config();
 async function initDaemonComponents(config) {
   installGlobalInterceptor();
   const appConfig = loadConfig();
-  const disableUpstream = appConfig.disableUpstream ?? false;
+  const providerSourceMode = appConfig.providerSourceMode || "normal";
+  const disableUpstream = providerSourceMode === "no-upstream";
   const providerLoader = new ProviderLoader({
     logFn: config.providerLogFn,
-    disableUpstream,
+    sourceMode: providerSourceMode,
     userDir: appConfig.providerDir
   });
   if (!disableUpstream && !providerLoader.hasUpstream()) {
@@ -22895,6 +23424,10 @@ async function initDaemonComponents(config) {
     onProviderSettingChanged: async (providerType) => {
       await refreshProviderAvailability(providerType);
       config.onStatusChange?.();
+    },
+    onProviderSourceConfigChanged: async () => {
+      await refreshProviderAvailability();
+      config.onStatusChange?.();
     }
   });
   agentStreamManager = new DaemonAgentStreamManager(
@@ -22944,7 +23477,8 @@ async function initDaemonComponents(config) {
     cdpInitializer,
     cdpManagers,
     sessionRegistry,
-    detectedIdes: detectedIdesRef
+    detectedIdes: detectedIdesRef,
+    refreshProviderAvailability
   };
 }
 async function startDaemonDevSupport(options) {
@@ -22953,7 +23487,10 @@ async function startDaemonDevSupport(options) {
     cdpManagers: options.components.cdpManagers,
     instanceManager: options.components.instanceManager,
     cliManager: options.components.cliManager,
-    logFn: options.logFn
+    logFn: options.logFn,
+    onProviderSourceConfigChanged: async () => {
+      await options.components.refreshProviderAvailability();
+    }
   });
   await devServer.start();
   options.components.providerLoader.watch();
@@ -23079,6 +23616,7 @@ export {
   normalizeInputEnvelope,
   normalizeManagedStatus,
   normalizeMessageParts,
+  parseProviderSourceConfigUpdate,
   partitionSessionHostDiagnosticsSessions,
   partitionSessionHostRecords,
   probeCdpPort,