adhdev 0.8.57 → 0.8.59

package/dist/index.js

@@ -44,9 +44,16 @@ __export(config_exports, {
   loadConfig: () => loadConfig,
   markSetupComplete: () => markSetupComplete,
   resetConfig: () => resetConfig,
+  resolveProviderSourceMode: () => resolveProviderSourceMode,
   saveConfig: () => saveConfig,
   updateConfig: () => updateConfig
 });
+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);
 }
@@ -84,7 +91,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"
   };
@@ -233,7 +240,7 @@ var init_config = __esm({
       registeredMachineId: void 0,
       providerSettings: {},
       ideSettings: {},
-      disableUpstream: false,
+      providerSourceMode: "normal",
       terminalSizingMode: "measured"
     };
     MACHINE_ID_PREFIX = "mach_";
@@ -412,6 +419,73 @@ var init_workspaces = __esm({
   }
 });
 
+// ../../oss/packages/daemon-core/src/providers/summary-metadata.ts
+function normalizeSummaryItem(item) {
+  if (!item || typeof item !== "object") return null;
+  const id = String(item.id || "").trim();
+  const value = String(item.value || "").trim();
+  if (!id || !value) return null;
+  const normalized = {
+    id,
+    value
+  };
+  if (typeof item.label === "string" && item.label.trim()) normalized.label = item.label.trim();
+  if (typeof item.shortValue === "string" && item.shortValue.trim()) normalized.shortValue = item.shortValue.trim();
+  if (typeof item.icon === "string" && item.icon.trim()) normalized.icon = item.icon.trim();
+  if (typeof item.order === "number" && Number.isFinite(item.order)) normalized.order = item.order;
+  return normalized;
+}
+function normalizeProviderSummaryMetadata(summary) {
+  if (!summary || !Array.isArray(summary.items)) return void 0;
+  const items = summary.items.map((item) => normalizeSummaryItem(item)).filter((item) => !!item).sort((left2, right2) => {
+    const orderDiff = (left2.order ?? Number.MAX_SAFE_INTEGER) - (right2.order ?? Number.MAX_SAFE_INTEGER);
+    if (orderDiff !== 0) return orderDiff;
+    return left2.id.localeCompare(right2.id);
+  });
+  return items.length > 0 ? { items } : void 0;
+}
+function buildProviderSummaryMetadata(items) {
+  return normalizeProviderSummaryMetadata({ items: items.filter(Boolean) });
+}
+function buildLegacyModelModeSummaryMetadata(params) {
+  return buildProviderSummaryMetadata([
+    params.model ? {
+      id: "model",
+      label: "Model",
+      value: String(params.modelLabel || params.model).trim(),
+      shortValue: String(params.model).trim(),
+      order: 10
+    } : null,
+    params.mode ? {
+      id: "mode",
+      label: "Mode",
+      value: String(params.modeLabel || params.mode).trim(),
+      shortValue: String(params.mode).trim(),
+      order: 20
+    } : null
+  ]);
+}
+function resolveProviderStateSummaryMetadata(params) {
+  const explicit = normalizeProviderSummaryMetadata(params.summaryMetadata);
+  if (explicit) return explicit;
+  const model = typeof params.controlValues?.model === "string" ? params.controlValues.model : void 0;
+  const mode = typeof params.controlValues?.mode === "string" ? params.controlValues.mode : void 0;
+  return buildLegacyModelModeSummaryMetadata({
+    model,
+    mode,
+    modelLabel: params.modelLabel,
+    modeLabel: params.modeLabel
+  });
+}
+function normalizePersistedSummaryMetadata(params) {
+  return normalizeProviderSummaryMetadata(params.summaryMetadata);
+}
+var init_summary_metadata = __esm({
+  "../../oss/packages/daemon-core/src/providers/summary-metadata.ts"() {
+    "use strict";
+  }
+});
+
 // ../../oss/packages/daemon-core/src/config/recent-activity.ts
 function normalizeWorkspace(workspace) {
   if (!workspace) return "";
@@ -435,6 +509,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()
   };
@@ -445,7 +522,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;
@@ -476,6 +558,7 @@ var init_recent_activity = __esm({
     "use strict";
     path2 = __toESM(require("path"));
     init_workspaces();
+    init_summary_metadata();
     MAX_ACTIVITY = 30;
   }
 });
@@ -504,7 +587,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()
@@ -520,7 +605,12 @@ function getSavedProviderSessions(state, filters) {
     if (filters?.providerType && entry.providerType !== filters.providerType) return false;
     if (filters?.kind && entry.kind !== filters.kind) return false;
     return true;
-  }).sort((a, b) => b.lastUsedAt - a.lastUsedAt);
+  }).map((entry) => ({
+    ...entry,
+    summaryMetadata: normalizePersistedSummaryMetadata({
+      summaryMetadata: entry.summaryMetadata
+    })
+  })).sort((a, b) => b.lastUsedAt - a.lastUsedAt);
 }
 var path3, MAX_SAVED_SESSIONS;
 var init_saved_sessions = __esm({
@@ -528,6 +618,7 @@ var init_saved_sessions = __esm({
     "use strict";
     path3 = __toESM(require("path"));
     init_workspaces();
+    init_summary_metadata();
     MAX_SAVED_SESSIONS = 500;
   }
 });
@@ -733,15 +824,15 @@ function resolveCommandPath(command) {
   return null;
 }
 function execAsync(cmd, timeoutMs = 5e3) {
-  return new Promise((resolve16) => {
+  return new Promise((resolve15) => {
     const child = (0, import_child_process2.exec)(cmd, { encoding: "utf-8", timeout: timeoutMs }, (err, stdout) => {
       if (err || !stdout?.trim()) {
-        resolve16(null);
+        resolve15(null);
       } else {
-        resolve16(stdout.trim());
+        resolve15(stdout.trim());
       }
     });
-    child.on("error", () => resolve16(null));
+    child.on("error", () => resolve15(null));
   });
 }
 async function detectCLIs(providerLoader, options) {
@@ -1187,7 +1278,7 @@ var init_manager = __esm({
       * Returns multiple entries if multiple IDE windows are open on same port
       */
       static listAllTargets(port) {
-        return new Promise((resolve16) => {
+        return new Promise((resolve15) => {
           const req = http.get(`http://127.0.0.1:${port}/json`, (res) => {
             let data = "";
             res.on("data", (chunk) => data += chunk.toString());
@@ -1203,16 +1294,16 @@ var init_manager = __esm({
                   (t) => !isNonMain(t.title || "") && t.url?.includes("workbench.html") && !t.url?.includes("agent")
                 );
                 const fallbackPages = pages.filter((t) => !isNonMain(t.title || ""));
-                resolve16(mainPages.length > 0 ? mainPages : fallbackPages);
+                resolve15(mainPages.length > 0 ? mainPages : fallbackPages);
               } catch {
-                resolve16([]);
+                resolve15([]);
               }
             });
           });
-          req.on("error", () => resolve16([]));
+          req.on("error", () => resolve15([]));
           req.setTimeout(2e3, () => {
             req.destroy();
-            resolve16([]);
+            resolve15([]);
           });
         });
       }
@@ -1252,7 +1343,7 @@ var init_manager = __esm({
         }
       }
       findTargetOnPort(port) {
-        return new Promise((resolve16) => {
+        return new Promise((resolve15) => {
           const req = http.get(`http://127.0.0.1:${port}/json`, (res) => {
             let data = "";
             res.on("data", (chunk) => data += chunk.toString());
@@ -1263,7 +1354,7 @@ var init_manager = __esm({
                   (t) => (t.type === "page" || t.type === "browser" || t.type === "Page") && t.webSocketDebuggerUrl
                 );
                 if (pages.length === 0) {
-                  resolve16(targets.find((t) => t.webSocketDebuggerUrl) || null);
+                  resolve15(targets.find((t) => t.webSocketDebuggerUrl) || null);
                   return;
                 }
                 const mainPages = pages.filter((t) => !this.isNonMainTitle(t.title || ""));
@@ -1273,24 +1364,24 @@ var init_manager = __esm({
                   const specific = list.find((t) => t.id === this._targetId);
                   if (specific) {
                     this._pageTitle = specific.title || "";
-                    resolve16(specific);
+                    resolve15(specific);
                   } else {
                     this.log(`[CDP] Target ${this._targetId} not found in page list`);
-                    resolve16(null);
+                    resolve15(null);
                   }
                   return;
                 }
                 this._pageTitle = list[0]?.title || "";
-                resolve16(list[0]);
+                resolve15(list[0]);
               } catch {
-                resolve16(null);
+                resolve15(null);
               }
             });
           });
-          req.on("error", () => resolve16(null));
+          req.on("error", () => resolve15(null));
           req.setTimeout(2e3, () => {
             req.destroy();
-            resolve16(null);
+            resolve15(null);
           });
         });
       }
@@ -1301,7 +1392,7 @@ var init_manager = __esm({
         this.extensionProviders = providers;
       }
       connectToTarget(wsUrl) {
-        return new Promise((resolve16) => {
+        return new Promise((resolve15) => {
           this.ws = new import_ws.default(wsUrl);
           this.ws.on("open", async () => {
             this._connected = true;
@@ -1311,17 +1402,17 @@ var init_manager = __esm({
             }
             this.connectBrowserWs().catch(() => {
             });
-            resolve16(true);
+            resolve15(true);
           });
           this.ws.on("message", (data) => {
             try {
               const msg = JSON.parse(data.toString());
               if (msg.id && this.pending.has(msg.id)) {
-                const { resolve: resolve17, reject } = this.pending.get(msg.id);
+                const { resolve: resolve16, reject } = this.pending.get(msg.id);
                 this.pending.delete(msg.id);
                 this.failureCount = 0;
                 if (msg.error) reject(new Error(msg.error.message));
-                else resolve17(msg.result);
+                else resolve16(msg.result);
               } else if (msg.method === "Runtime.executionContextCreated") {
                 this.contexts.add(msg.params.context.id);
               } else if (msg.method === "Runtime.executionContextDestroyed") {
@@ -1344,7 +1435,7 @@ var init_manager = __esm({
           this.ws.on("error", (err) => {
             this.log(`[CDP] WebSocket error: ${err.message}`);
             this._connected = false;
-            resolve16(false);
+            resolve15(false);
           });
         });
       }
@@ -1358,7 +1449,7 @@ var init_manager = __esm({
             return;
           }
           this.log(`[CDP] Connecting browser WS for target discovery...`);
-          await new Promise((resolve16, reject) => {
+          await new Promise((resolve15, reject) => {
             this.browserWs = new import_ws.default(browserWsUrl);
             this.browserWs.on("open", async () => {
               this._browserConnected = true;
@@ -1368,16 +1459,16 @@ var init_manager = __esm({
               } catch (e) {
                 this.log(`[CDP] setDiscoverTargets failed: ${e.message}`);
               }
-              resolve16();
+              resolve15();
             });
             this.browserWs.on("message", (data) => {
               try {
                 const msg = JSON.parse(data.toString());
                 if (msg.id && this.browserPending.has(msg.id)) {
-                  const { resolve: resolve17, reject: reject2 } = this.browserPending.get(msg.id);
+                  const { resolve: resolve16, reject: reject2 } = this.browserPending.get(msg.id);
                   this.browserPending.delete(msg.id);
                   if (msg.error) reject2(new Error(msg.error.message));
-                  else resolve17(msg.result);
+                  else resolve16(msg.result);
                 }
               } catch {
               }
@@ -1397,31 +1488,31 @@ var init_manager = __esm({
         }
       }
       getBrowserWsUrl() {
-        return new Promise((resolve16) => {
+        return new Promise((resolve15) => {
           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);
-                resolve16(info.webSocketDebuggerUrl || null);
+                resolve15(info.webSocketDebuggerUrl || null);
               } catch {
-                resolve16(null);
+                resolve15(null);
               }
             });
           });
-          req.on("error", () => resolve16(null));
+          req.on("error", () => resolve15(null));
           req.setTimeout(3e3, () => {
             req.destroy();
-            resolve16(null);
+            resolve15(null);
           });
         });
       }
       sendBrowser(method, params = {}, timeoutMs = 15e3) {
-        return new Promise((resolve16, reject) => {
+        return new Promise((resolve15, reject) => {
           if (!this.browserWs || !this._browserConnected) return reject(new Error("Browser WS not connected"));
           const id = this.browserMsgId++;
-          this.browserPending.set(id, { resolve: resolve16, reject });
+          this.browserPending.set(id, { resolve: resolve15, reject });
           this.browserWs.send(JSON.stringify({ id, method, params }));
           setTimeout(() => {
             if (this.browserPending.has(id)) {
@@ -1461,11 +1552,11 @@ var init_manager = __esm({
       }
       // ─── CDP Protocol ────────────────────────────────────────
       sendInternal(method, params = {}, timeoutMs = 15e3) {
-        return new Promise((resolve16, reject) => {
+        return new Promise((resolve15, reject) => {
           if (!this.ws || !this._connected) return reject(new Error("CDP not connected"));
           if (this.ws.readyState !== import_ws.default.OPEN) return reject(new Error("WebSocket not open"));
           const id = this.msgId++;
-          this.pending.set(id, { resolve: resolve16, reject });
+          this.pending.set(id, { resolve: resolve15, reject });
           this.ws.send(JSON.stringify({ id, method, params }));
           setTimeout(() => {
             if (this.pending.has(id)) {
@@ -1714,7 +1805,7 @@ var init_manager = __esm({
         const browserWs = this.browserWs;
         let msgId = this.browserMsgId;
         const sendWs = (method, params = {}, sessionId) => {
-          return new Promise((resolve16, reject) => {
+          return new Promise((resolve15, reject) => {
             const mid = msgId++;
             this.browserMsgId = msgId;
             const handler = (raw) => {
@@ -1723,7 +1814,7 @@ var init_manager = __esm({
                 if (msg.id === mid) {
                   browserWs.removeListener("message", handler);
                   if (msg.error) reject(new Error(msg.error.message || JSON.stringify(msg.error)));
-                  else resolve16(msg.result);
+                  else resolve15(msg.result);
                 }
               } catch {
               }
@@ -1924,14 +2015,14 @@ var init_manager = __esm({
         if (!ws || ws.readyState !== import_ws.default.OPEN) {
           throw new Error("CDP not connected");
         }
-        return new Promise((resolve16, reject) => {
+        return new Promise((resolve15, reject) => {
           const id = getNextId();
           pendingMap.set(id, {
             resolve: (result) => {
               if (result?.result?.subtype === "error") {
                 reject(new Error(result.result.description));
               } else {
-                resolve16(result?.result?.value);
+                resolve15(result?.result?.value);
               }
             },
             reject
@@ -1963,10 +2054,10 @@ var init_manager = __esm({
           throw new Error("CDP not connected");
         }
         const sendViaSession = (method, params = {}) => {
-          return new Promise((resolve16, reject) => {
+          return new Promise((resolve15, reject) => {
             const pendingMap = this._browserConnected ? this.browserPending : this.pending;
             const id = this._browserConnected ? this.browserMsgId++ : this.msgId++;
-            pendingMap.set(id, { resolve: resolve16, reject });
+            pendingMap.set(id, { resolve: resolve15, reject });
             ws.send(JSON.stringify({ id, sessionId, method, params }));
             setTimeout(() => {
               if (pendingMap.has(id)) {
@@ -2540,8 +2631,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) {
@@ -2643,7 +2732,7 @@ function normalizeControlOption(option) {
   }
   if (!option || typeof option !== "object") return null;
   const record2 = option;
-  const value = typeof record2.value === "string" ? record2.value : typeof record2.id === "string" ? record2.id : null;
+  const value = typeof record2.value === "string" ? record2.value : typeof record2.id === "string" ? record2.id : typeof record2.name === "string" ? record2.name : null;
   if (!value) return null;
   const label = typeof record2.label === "string" ? record2.label : typeof record2.name === "string" ? record2.name : value;
   const normalized = { value, label };
@@ -2801,6 +2890,7 @@ function listSavedHistorySessions(agentType, options = {}) {
       let lastMessageAt = 0;
       let sessionTitle = "";
       let preview = "";
+      let workspace = "";
       for (const file2 of files.sort()) {
         const filePath = path7.join(dir, file2);
         const content = fs3.readFileSync(filePath, "utf-8");
@@ -2813,6 +2903,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;
@@ -2827,7 +2921,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);
@@ -3010,6 +3105,30 @@ var init_chat_history = __esm({
           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 date5 = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
+          const filePath = path7.join(dir, `${this.sanitize(id)}_${date5}.jsonl`);
+          const record2 = {
+            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(record2) + "\n", "utf-8");
+        } catch {
+        }
+      }
       promoteHistorySession(agentType, previousHistorySessionId, nextHistorySessionId) {
         const fromId = String(previousHistorySessionId || "").trim();
         const toId = String(nextHistorySessionId || "").trim();
@@ -3159,6 +3278,68 @@ var init_chat_history = __esm({
   }
 });
 
+// ../../oss/packages/daemon-core/src/providers/provider-patch-state.ts
+function isControlValue(value) {
+  return typeof value === "string" || typeof value === "number" || typeof value === "boolean";
+}
+function asControlValueMap(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return void 0;
+  const result = {};
+  for (const [entryKey, entryValue] of Object.entries(value)) {
+    if (isControlValue(entryValue)) result[entryKey] = entryValue;
+  }
+  return Object.keys(result).length > 0 ? result : void 0;
+}
+function getLegacyModelModeValues(data) {
+  if (!data || typeof data !== "object") return void 0;
+  const legacy = {};
+  if (typeof data.model === "string" && data.model.trim()) legacy.model = data.model.trim();
+  if (typeof data.mode === "string" && data.mode.trim()) legacy.mode = data.mode.trim();
+  return Object.keys(legacy).length > 0 ? legacy : void 0;
+}
+function mergeProviderPatchState(params) {
+  const {
+    providerControls,
+    data,
+    currentControlValues,
+    currentSummaryMetadata,
+    mergeWithCurrent = true
+  } = params;
+  const sources = [
+    mergeWithCurrent ? asControlValueMap(currentControlValues) : void 0,
+    asControlValueMap(data?.controlValues),
+    asControlValueMap(extractProviderControlValues(providerControls, data)),
+    getLegacyModelModeValues(data)
+  ];
+  const controlValues = Object.assign({}, ...sources.filter(Boolean));
+  return {
+    controlValues,
+    summaryMetadata: data?.summaryMetadata !== void 0 ? data.summaryMetadata : currentSummaryMetadata
+  };
+}
+function normalizeProviderStateControlValues(controlValues) {
+  return controlValues && Object.keys(controlValues).length > 0 ? controlValues : void 0;
+}
+function resolveProviderStateSurface(params) {
+  const controlValues = normalizeProviderStateControlValues(params.controlValues);
+  return {
+    controlValues,
+    summaryMetadata: resolveProviderStateSummaryMetadata({
+      summaryMetadata: params.summaryMetadata,
+      controlValues,
+      modelLabel: params.modelLabel,
+      modeLabel: params.modeLabel
+    })
+  };
+}
+var init_provider_patch_state = __esm({
+  "../../oss/packages/daemon-core/src/providers/provider-patch-state.ts"() {
+    "use strict";
+    init_control_effects();
+    init_summary_metadata();
+  }
+});
+
 // ../../oss/packages/daemon-core/src/providers/extension-provider-instance.ts
 var ExtensionProviderInstance;
 var init_extension_provider_instance = __esm({
@@ -3167,6 +3348,7 @@ var init_extension_provider_instance = __esm({
     init_status_monitor();
     init_control_effects();
     init_chat_history();
+    init_provider_patch_state();
     ExtensionProviderInstance = class {
       type;
       category = "extension";
@@ -3180,9 +3362,8 @@ var init_extension_provider_instance = __esm({
       messages = [];
       prevMessageHashes = /* @__PURE__ */ new Map();
       activeModal = null;
-      currentModel = "";
-      currentMode = "";
       controlValues = {};
+      summaryMetadata = void 0;
       appliedEffectKeys = /* @__PURE__ */ new Set();
       runtimeMessages = [];
       lastAgentStatus = "idle";
@@ -3217,6 +3398,10 @@ var init_extension_provider_instance = __esm({
         if (!this.context?.cdp?.isConnected) return;
       }
       getState() {
+        const surface = resolveProviderStateSurface({
+          summaryMetadata: this.summaryMetadata,
+          controlValues: this.controlValues
+        });
         return {
           type: this.type,
           name: this.provider.name,
@@ -3230,10 +3415,9 @@ var init_extension_provider_instance = __esm({
             activeModal: this.activeModal,
             inputContent: ""
           } : null,
-          currentModel: this.currentModel || void 0,
-          currentPlan: this.currentMode || void 0,
-          controlValues: this.controlValues,
+          controlValues: surface.controlValues,
           providerControls: this.provider.controls,
+          summaryMetadata: surface.summaryMetadata,
           agentStreams: this.agentStreams,
           instanceId: this.instanceId,
           lastUpdated: Date.now(),
@@ -3246,10 +3430,14 @@ var init_extension_provider_instance = __esm({
           if (data?.streams) this.agentStreams = data.streams;
           if (data?.messages) this.messages = this.assignReceivedAt(data.messages);
           if (data?.activeModal !== void 0) this.activeModal = data.activeModal;
-          if (data?.model) this.currentModel = data.model;
-          if (data?.mode) this.currentMode = data.mode;
-          const controlValues = extractProviderControlValues(this.provider.controls, data) || data?.controlValues;
-          if (controlValues) this.controlValues = controlValues;
+          const patchedState = mergeProviderPatchState({
+            providerControls: this.provider.controls,
+            data,
+            currentControlValues: this.controlValues,
+            currentSummaryMetadata: this.summaryMetadata
+          });
+          this.controlValues = patchedState.controlValues;
+          this.summaryMetadata = patchedState.summaryMetadata;
           if (typeof data?.sessionId === "string" && data.sessionId.trim()) this.chatId = data.sessionId;
           if (typeof data?.title === "string" && data.title.trim()) this.chatTitle = data.title;
           if (typeof data?.agentName === "string" && data.agentName.trim()) this.agentName = data.agentName;
@@ -3350,8 +3538,14 @@ var init_extension_provider_instance = __esm({
       }
       applyProviderResponse(data, options) {
         if (!data || typeof data !== "object") return;
-        const controlValues = extractProviderControlValues(this.provider.controls, data);
-        if (controlValues) this.controlValues = { ...this.controlValues, ...controlValues };
+        const patchedState = mergeProviderPatchState({
+          providerControls: this.provider.controls,
+          data,
+          currentControlValues: this.controlValues,
+          currentSummaryMetadata: this.summaryMetadata
+        });
+        this.controlValues = patchedState.controlValues;
+        this.summaryMetadata = patchedState.summaryMetadata;
         const effects = normalizeProviderEffects(data);
         for (const effect of effects) {
           const effectWhen = effect.when || "immediate";
@@ -3501,8 +3695,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;
@@ -3582,6 +3774,7 @@ var init_ide_provider_instance = __esm({
     init_logger();
     init_control_effects();
     init_approval_utils();
+    init_provider_patch_state();
     IdeProviderInstance = class {
       type;
       category = "ide";
@@ -3654,6 +3847,10 @@ var init_ide_provider_instance = __esm({
         for (const ext of this.extensions.values()) {
           extensionStates.push(ext.getState());
         }
+        const surface = resolveProviderStateSurface({
+          summaryMetadata: this.cachedChat?.summaryMetadata,
+          controlValues: this.cachedChat?.controlValues
+        });
         return {
           type: this.type,
           name: this.provider.name,
@@ -3670,11 +3867,9 @@ var init_ide_provider_instance = __esm({
           workspace: this.workspace || null,
           extensions: extensionStates,
           cdpConnected: cdp?.isConnected || false,
-          currentModel: this.cachedChat?.model || void 0,
-          currentPlan: this.cachedChat?.mode || void 0,
-          currentAutoApprove: this.cachedChat?.autoApprove || void 0,
-          controlValues: this.cachedChat?.controlValues || void 0,
+          controlValues: surface.controlValues,
           providerControls: this.provider.controls,
+          summaryMetadata: surface.summaryMetadata,
           instanceId: this.instanceId,
           lastUpdated: Date.now(),
           settings: this.settings,
@@ -3846,8 +4041,13 @@ var init_ide_provider_instance = __esm({
               chat.messages = messages.filter((m) => !hiddenKinds.has(m.kind || ""));
             }
           }
-          const controlValues = extractProviderControlValues(this.provider.controls, chat);
-          if (controlValues) chat.controlValues = controlValues;
+          const patchedState = mergeProviderPatchState({
+            providerControls: this.provider.controls,
+            data: chat,
+            mergeWithCurrent: false
+          });
+          chat.controlValues = Object.keys(patchedState.controlValues).length > 0 ? patchedState.controlValues : void 0;
+          chat.summaryMetadata = patchedState.summaryMetadata;
           this.cachedChat = { ...chat, activeModal };
           this.detectAgentTransitions(chat, now);
           const persistedMessages = chat.messages || messages;
@@ -3934,14 +4134,18 @@ var init_ide_provider_instance = __esm({
       }
       applyProviderResponse(data, options) {
         if (!data || typeof data !== "object") return;
-        const controlValues = extractProviderControlValues(this.provider.controls, data);
-        if (controlValues) {
-          this.cachedChat = {
-            ...this.cachedChat || {},
-            ...data,
-            controlValues: { ...this.cachedChat?.controlValues || {}, ...controlValues }
-          };
-        }
+        const patchedState = mergeProviderPatchState({
+          providerControls: this.provider.controls,
+          data,
+          currentControlValues: this.cachedChat?.controlValues,
+          currentSummaryMetadata: this.cachedChat?.summaryMetadata
+        });
+        this.cachedChat = {
+          ...this.cachedChat || {},
+          ...data,
+          controlValues: Object.keys(patchedState.controlValues).length > 0 ? patchedState.controlValues : void 0,
+          summaryMetadata: patchedState.summaryMetadata
+        };
         const effects = normalizeProviderEffects(data);
         for (const effect of effects) {
           const effectWhen = effect.when || "immediate";
@@ -4714,6 +4918,8 @@ function isCdpConnected(cdpManagers, key) {
 function buildIdeWorkspaceSession(state, cdpManagers, options) {
   const profile = options.profile || "full";
   const activeChat = normalizeActiveChatData(state.activeChat, getActiveChatOptions(profile));
+  const summaryMetadata = normalizeProviderSummaryMetadata(state.summaryMetadata);
+  const controlValues = normalizeProviderStateControlValues(state.controlValues);
   const includeSessionMetadata = shouldIncludeSessionMetadata(profile);
   const includeSessionControls = shouldIncludeSessionControls(profile);
   const title = activeChat?.title || state.name;
@@ -4730,13 +4936,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,
@@ -4747,6 +4951,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 {
@@ -4762,11 +4968,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,
@@ -4777,6 +4982,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);
@@ -4803,11 +5010,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,
@@ -4818,6 +5026,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 {
@@ -4833,13 +5043,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,
@@ -4879,6 +5086,8 @@ var init_builders = __esm({
   "../../oss/packages/daemon-core/src/status/builders.ts"() {
     "use strict";
     init_normalize();
+    init_provider_patch_state();
+    init_summary_metadata();
     IDE_SESSION_CAPABILITIES = [
       "read_chat",
       "send_message",
@@ -5602,7 +5811,7 @@ function getStateLastSignature(state) {
 async function getStableExtensionBaseline(h) {
   const first = await readExtensionChatState(h);
   if (getStateMessageCount(first) > 0 || getStateLastSignature(first)) return first;
-  await new Promise((resolve16) => setTimeout(resolve16, 150));
+  await new Promise((resolve15) => setTimeout(resolve15, 150));
   const second = await readExtensionChatState(h);
   return getStateMessageCount(second) >= getStateMessageCount(first) ? second : first;
 }
@@ -5610,7 +5819,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((resolve16) => setTimeout(resolve16, 250));
+    await new Promise((resolve15) => setTimeout(resolve15, 250));
     const state = await readExtensionChatState(h);
     if (state?.status === "waiting_approval") return true;
     const afterCount = getStateMessageCount(state);
@@ -6820,6 +7029,32 @@ var init_cdp_commands = __esm({
   }
 });
 
+// ../../oss/packages/daemon-core/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 };
+}
+var init_provider_source_config = __esm({
+  "../../oss/packages/daemon-core/src/config/provider-source-config.ts"() {
+    "use strict";
+  }
+});
+
 // ../../oss/packages/daemon-core/src/providers/cli-script-results.ts
 function parseCliScriptResult(result) {
   if (typeof result === "string") {
@@ -6936,8 +7171,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];
@@ -6983,7 +7259,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) {
@@ -7129,6 +7405,8 @@ function handleSetIdeExtension(h, args) {
 var init_stream_commands = __esm({
   "../../oss/packages/daemon-core/src/commands/stream-commands.ts"() {
     "use strict";
+    init_config();
+    init_provider_source_config();
     init_cli_script_results();
     init_control_effects();
     init_logger();
@@ -7656,6 +7934,10 @@ var init_handler = __esm({
             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);
@@ -7695,7 +7977,7 @@ var init_handler = __esm({
         try {
           const http3 = await import("http");
           const postData = JSON.stringify(body);
-          const result = await new Promise((resolve16, reject) => {
+          const result = await new Promise((resolve15, reject) => {
             const req = http3.request({
               hostname: "127.0.0.1",
               port: 19280,
@@ -7707,9 +7989,9 @@ var init_handler = __esm({
               res.on("data", (chunk) => data += chunk);
               res.on("end", () => {
                 try {
-                  resolve16(JSON.parse(data));
+                  resolve15(JSON.parse(data));
                 } catch {
-                  resolve16({ raw: data });
+                  resolve15({ raw: data });
                 }
               });
             });
@@ -7727,15 +8009,15 @@ var init_handler = __esm({
         if (!providerType) return { success: false, error: "providerType required" };
         try {
           const http3 = await import("http");
-          const result = await new Promise((resolve16, reject) => {
+          const result = await new Promise((resolve15, 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 {
-                  resolve16(JSON.parse(data));
+                  resolve15(JSON.parse(data));
                 } catch {
-                  resolve16({ raw: data });
+                  resolve15({ raw: data });
                 }
               });
             }).on("error", reject);
@@ -7749,7 +8031,7 @@ var init_handler = __esm({
         try {
           const http3 = await import("http");
           const postData = JSON.stringify(args || {});
-          const result = await new Promise((resolve16, reject) => {
+          const result = await new Promise((resolve15, reject) => {
             const req = http3.request({
               hostname: "127.0.0.1",
               port: 19280,
@@ -7761,9 +8043,9 @@ var init_handler = __esm({
               res.on("data", (chunk) => data += chunk);
               res.on("end", () => {
                 try {
-                  resolve16(JSON.parse(data));
+                  resolve15(JSON.parse(data));
                 } catch {
-                  resolve16({ raw: data });
+                  resolve15({ raw: data });
                 }
               });
             });
@@ -9947,7 +10229,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((resolve16) => setTimeout(resolve16, 50));
+          await new Promise((resolve15) => setTimeout(resolve15, 50));
         }
         const finalScreenText = this.terminalScreen.getText() || "";
         LOG.warn(
@@ -10520,7 +10802,7 @@ ${data.message || ""}`.trim();
           const deadline = Date.now() + 1e4;
           while (this.startupParseGate && Date.now() < deadline) {
             this.resolveStartupState("send_wait");
-            await new Promise((resolve16) => setTimeout(resolve16, 50));
+            await new Promise((resolve15) => setTimeout(resolve15, 50));
           }
         }
         await this.waitForInteractivePrompt();
@@ -10590,12 +10872,12 @@ ${data.message || ""}`.trim();
             if (this.isWaitingForResponse) this.finishResponse();
           }, this.timeouts.maxResponse);
         };
-        await new Promise((resolve16) => {
+        await new Promise((resolve15) => {
           let resolved = false;
           const resolveOnce = () => {
             if (resolved) return;
             resolved = true;
-            resolve16();
+            resolve15();
           };
           const submit = () => {
             if (!this.ptyProcess) {
@@ -10769,17 +11051,17 @@ ${data.message || ""}`.trim();
         }
       }
       waitForStopped(timeoutMs) {
-        return new Promise((resolve16) => {
+        return new Promise((resolve15) => {
           const startedAt = Date.now();
           const timer = setInterval(() => {
             if (!this.ptyProcess || this.currentStatus === "stopped") {
               clearInterval(timer);
-              resolve16(true);
+              resolve15(true);
               return;
             }
             if (Date.now() - startedAt >= timeoutMs) {
               clearInterval(timer);
-              resolve16(false);
+              resolve15(false);
             }
           }, 100);
         });
@@ -11069,6 +11351,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() : "";
@@ -11078,6 +11363,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((resolve15) => setTimeout(resolve15, pollMs));
+  }
+  throw new Error(`CLI runtime did not become ready within ${timeoutMs}ms`);
+}
 var os13, path11, crypto3, fs5, import_node_module, CachedDatabaseSync, CliProviderInstance;
 var init_cli_provider_instance = __esm({
   "../../oss/packages/daemon-core/src/providers/cli-provider-instance.ts"() {
@@ -11095,6 +11394,7 @@ var init_cli_provider_instance = __esm({
     init_control_effects();
     init_approval_utils();
     init_cli_script_results();
+    init_provider_patch_state();
     CachedDatabaseSync = null;
     CliProviderInstance = class {
       constructor(provider, workingDir, cliArgs = [], instanceId, transportFactory, options) {
@@ -11124,6 +11424,7 @@ var init_cli_provider_instance = __esm({
       generatingDebouncePending = null;
       lastApprovalEventAt = 0;
       controlValues = {};
+      summaryMetadata = void 0;
       appliedEffectKeys = /* @__PURE__ */ new Set();
       historyWriter;
       runtimeMessages = [];
@@ -11266,13 +11567,7 @@ var init_cli_provider_instance = __esm({
         if (historyMessageCount !== null) {
           parsedMessages = historyMessageCount > 0 ? parsedMessages.slice(-historyMessageCount) : [];
         }
-        const controlValues = extractProviderControlValues(this.provider.controls, parsedStatus);
-        if (controlValues) {
-          this.controlValues = { ...this.controlValues, ...controlValues };
-        }
         const mergedMessages = this.mergeConversationMessages(parsedMessages);
-        const currentModel = typeof parsedStatus?.model === "string" && parsedStatus.model.trim() ? parsedStatus.model.trim() : typeof this.controlValues.model === "string" && this.controlValues.model.trim() ? this.controlValues.model.trim() : void 0;
-        const currentPlan = typeof parsedStatus?.mode === "string" && parsedStatus.mode.trim() ? parsedStatus.mode.trim() : typeof this.controlValues.mode === "string" && this.controlValues.mode.trim() ? this.controlValues.mode.trim() : void 0;
         const dirName = this.workingDir.split("/").filter(Boolean).pop() || "session";
         if (parsedMessages.length > 0) {
           const shouldSkipReplayPersist = this.suppressIdleHistoryReplay && adapterStatus.status === "idle" && parsedStatus?.status === "idle";
@@ -11294,6 +11589,10 @@ var init_cli_provider_instance = __esm({
           }
         }
         this.applyProviderResponse(parsedStatus, { phase: "immediate" });
+        const surface = resolveProviderStateSurface({
+          summaryMetadata: this.summaryMetadata,
+          controlValues: this.controlValues
+        });
         return {
           type: this.type,
           name: this.provider.name,
@@ -11309,8 +11608,6 @@ var init_cli_provider_instance = __esm({
             inputContent: ""
           },
           workspace: this.workingDir,
-          currentModel,
-          currentPlan,
           instanceId: this.instanceId,
           providerSessionId: this.providerSessionId,
           lastUpdated: Date.now(),
@@ -11325,8 +11622,9 @@ var init_cli_provider_instance = __esm({
             attachedClients: runtime.attachedClients || []
           } : void 0,
           resume: this.provider.resume,
-          controlValues: this.controlValues,
-          providerControls: this.provider.controls
+          controlValues: surface.controlValues,
+          providerControls: this.provider.controls,
+          summaryMetadata: surface.summaryMetadata
         };
       }
       setPresentationMode(mode) {
@@ -11374,6 +11672,7 @@ var init_cli_provider_instance = __esm({
         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) {
@@ -11529,10 +11828,14 @@ var init_cli_provider_instance = __esm({
           this.suppressIdleHistoryReplay = false;
           this.adapter.clearHistory();
         }
-        const controlValues = extractProviderControlValues(this.provider.controls, data);
-        if (controlValues) {
-          this.controlValues = { ...this.controlValues, ...controlValues };
-        }
+        const patchedState = mergeProviderPatchState({
+          providerControls: this.provider.controls,
+          data,
+          currentControlValues: this.controlValues,
+          currentSummaryMetadata: this.summaryMetadata
+        });
+        this.controlValues = patchedState.controlValues;
+        this.summaryMetadata = patchedState.summaryMetadata;
         const effects = normalizeProviderEffects(data);
         for (const effect of effects) {
           const effectWhen = effect.when || "immediate";
@@ -11723,6 +12026,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,
@@ -27826,8 +28130,8 @@ var init_acp = __esm({
         this.#requestHandler = requestHandler;
         this.#notificationHandler = notificationHandler;
         this.#stream = stream;
-        this.#closedPromise = new Promise((resolve16) => {
-          this.#abortController.signal.addEventListener("abort", () => resolve16());
+        this.#closedPromise = new Promise((resolve15) => {
+          this.#abortController.signal.addEventListener("abort", () => resolve15());
         });
         this.#receive();
       }
@@ -27976,8 +28280,8 @@ var init_acp = __esm({
       }
       async sendRequest(method, params) {
         const id = this.#nextRequestId++;
-        const responsePromise = new Promise((resolve16, reject) => {
-          this.#pendingResponses.set(id, { resolve: resolve16, reject });
+        const responsePromise = new Promise((resolve15, reject) => {
+          this.#pendingResponses.set(id, { resolve: resolve15, reject });
         });
         await this.#sendMessage({ jsonrpc: "2.0", id, method, params });
         return responsePromise;
@@ -28178,6 +28482,7 @@ var init_acp_provider_instance = __esm({
     init_acp();
     init_contracts();
     init_status_monitor();
+    init_summary_metadata();
     init_logger();
     AcpProviderInstance = class {
       constructor(provider, workingDir, cliArgs = []) {
@@ -28206,8 +28511,7 @@ var init_acp_provider_instance = __esm({
       lastStatus = "starting";
       generatingStartedAt = 0;
       agentCapabilities = {};
-      currentModel;
-      currentMode;
+      currentSelections = {};
       activeToolCalls = [];
       stopReason = null;
       partialContent = "";
@@ -28287,8 +28591,6 @@ var init_acp_provider_instance = __esm({
             inputContent: ""
           },
           workspace: this.workingDir,
-          currentModel: this.currentModel,
-          currentPlan: this.currentMode,
           instanceId: this.instanceId,
           lastUpdated: Date.now(),
           settings: this.settings,
@@ -28299,11 +28601,9 @@ var init_acp_provider_instance = __esm({
           // Error details for dashboard display
           errorMessage: this.errorMessage || void 0,
           errorReason: this.errorReason || void 0,
-          controlValues: {
-            ...this.currentModel ? { model: this.currentModel } : {},
-            ...this.currentMode ? { mode: this.currentMode } : {}
-          },
-          providerControls: this.provider.controls
+          controlValues: this.getSelectionControlValues(),
+          providerControls: this.provider.controls,
+          summaryMetadata: this.buildSelectionSummaryMetadata()
         };
       }
       onEvent(event, data) {
@@ -28337,6 +28637,54 @@ var init_acp_provider_instance = __esm({
       getInstanceId() {
         return this.instanceId;
       }
+      resolveConfigOptionLabel(category, value) {
+        if (!value) return void 0;
+        const option = this.configOptions.find((entry) => entry.category === category);
+        return option?.options.find((candidate) => candidate.value === value)?.name || value;
+      }
+      resolveModeLabel(modeId) {
+        if (!modeId) return void 0;
+        return this.availableModes.find((mode) => mode.id === modeId)?.name || modeId;
+      }
+      getCurrentSelection(category) {
+        return this.currentSelections[category];
+      }
+      setCurrentSelection(category, value) {
+        const normalized = typeof value === "string" ? value.trim() : "";
+        if (normalized) {
+          this.currentSelections[category] = normalized;
+          return;
+        }
+        delete this.currentSelections[category];
+      }
+      getSelectionControlValues() {
+        const model = this.getCurrentSelection("model");
+        const mode = this.getCurrentSelection("mode");
+        return {
+          ...model ? { model } : {},
+          ...mode ? { mode } : {}
+        };
+      }
+      resolveSelectionLabel(category, value) {
+        if (!value) return void 0;
+        const configLabel = this.resolveConfigOptionLabel(category, value);
+        if (configLabel && configLabel !== value) return configLabel;
+        if (category === "mode") {
+          const modeLabel = this.resolveModeLabel(value);
+          if (modeLabel) return modeLabel;
+        }
+        return configLabel || value;
+      }
+      buildSelectionSummaryMetadata() {
+        const model = this.getCurrentSelection("model");
+        const mode = this.getCurrentSelection("mode");
+        return buildLegacyModelModeSummaryMetadata({
+          model,
+          mode,
+          modelLabel: this.resolveSelectionLabel("model", model),
+          modeLabel: this.resolveSelectionLabel("mode", mode)
+        });
+      }
       // ─── ACP Config Options & Modes ─────────────────────
       parseConfigOptions(raw) {
         if (!Array.isArray(raw)) return;
@@ -28368,12 +28716,14 @@ var init_acp_provider_instance = __esm({
             }
           }
           this.configOptions.push({ category, configId, currentValue, options: flatOptions });
-          if (category === "model" && currentValue) this.currentModel = currentValue;
+          if (category === "model" || category === "mode") {
+            this.setCurrentSelection(category, currentValue);
+          }
         }
       }
       parseModes(raw) {
         if (!raw) return;
-        if (raw.currentModeId) this.currentMode = raw.currentModeId;
+        this.setCurrentSelection("mode", raw.currentModeId);
         if (Array.isArray(raw.availableModes)) {
           this.availableModes = raw.availableModes.map((m) => ({
             id: m.id,
@@ -28392,8 +28742,7 @@ var init_acp_provider_instance = __esm({
         if (this.useStaticConfig) {
           opt.currentValue = value;
           this.selectedConfig[opt.configId] = value;
-          if (category === "model") this.currentModel = value;
-          if (category === "mode") this.currentMode = value;
+          if (category === "model" || category === "mode") this.setCurrentSelection(category, value);
           this.log.info(`[${this.type}] Static config ${category} set to: ${value} \u2014 restarting agent`);
           await this.restartWithNewConfig();
           return;
@@ -28411,7 +28760,7 @@ var init_acp_provider_instance = __esm({
             value
           });
           opt.currentValue = value;
-          if (category === "model") this.currentModel = value;
+          if (category === "model" || category === "mode") this.setCurrentSelection(category, value);
           if (result?.configOptions) this.parseConfigOptions(result.configOptions);
           this.log.info(`[${this.type}] Config ${category} set to: ${value} | response: ${JSON.stringify(result)?.slice(0, 300)}`);
         } catch (e) {
@@ -28427,7 +28776,7 @@ var init_acp_provider_instance = __esm({
             opt.currentValue = modeId;
             this.selectedConfig[opt.configId] = modeId;
           }
-          this.currentMode = modeId;
+          this.setCurrentSelection("mode", modeId);
           this.log.info(`[${this.type}] Static mode set to: ${modeId} \u2014 restarting agent`);
           await this.restartWithNewConfig();
           return;
@@ -28442,7 +28791,7 @@ var init_acp_provider_instance = __esm({
             sessionId: this.sessionId,
             modeId
           });
-          this.currentMode = modeId;
+          this.setCurrentSelection("mode", modeId);
           this.log.info(`[${this.type}] Mode set to: ${modeId}`);
         } catch (e) {
           const message = e?.message || "Unknown ACP mode error";
@@ -28613,13 +28962,13 @@ var init_acp_provider_instance = __esm({
             }
             this.currentStatus = "waiting_approval";
             this.detectStatusTransition();
-            const approved = await new Promise((resolve16) => {
-              this.permissionResolvers.push(resolve16);
+            const approved = await new Promise((resolve15) => {
+              this.permissionResolvers.push(resolve15);
               setTimeout(() => {
-                const idx = this.permissionResolvers.indexOf(resolve16);
+                const idx = this.permissionResolvers.indexOf(resolve15);
                 if (idx >= 0) {
                   this.permissionResolvers.splice(idx, 1);
-                  resolve16(false);
+                  resolve15(false);
                 }
               }, 3e5);
             });
@@ -28700,8 +29049,8 @@ var init_acp_provider_instance = __esm({
           if (result?.modes) this.log.debug(`[${this.type}] modes: ${JSON.stringify(result.modes).slice(0, 300)}`);
           this.parseConfigOptions(result?.configOptions);
           this.parseModes(result?.modes);
-          if (!this.currentModel && result?.models?.currentModelId) {
-            this.currentModel = result.models.currentModelId;
+          if (!this.getCurrentSelection("model") && result?.models?.currentModelId) {
+            this.setCurrentSelection("model", result.models.currentModelId);
           }
           if (this.configOptions.length === 0 && this.provider.staticConfigOptions?.length) {
             this.useStaticConfig = true;
@@ -28715,13 +29064,16 @@ var init_acp_provider_instance = __esm({
               });
               if (defaultVal) {
                 this.selectedConfig[sc.configId] = defaultVal;
-                if (sc.category === "model") this.currentModel = defaultVal;
-                if (sc.category === "mode") this.currentMode = defaultVal;
+                if (sc.category === "model" || sc.category === "mode") {
+                  this.setCurrentSelection(sc.category, defaultVal);
+                }
               }
             }
             this.log.info(`[${this.type}] Using static configOptions (${this.configOptions.length} options)`);
           }
-          this.log.info(`[${this.type}] Session created: ${this.sessionId}${this.currentModel ? ` (model: ${this.currentModel})` : ""}${this.currentMode ? ` (mode: ${this.currentMode})` : ""}`);
+          const currentModel = this.getCurrentSelection("model");
+          const currentMode = this.getCurrentSelection("mode");
+          this.log.info(`[${this.type}] Session created: ${this.sessionId}${currentModel ? ` (model: ${currentModel})` : ""}${currentMode ? ` (mode: ${currentMode})` : ""}`);
           if (this.configOptions.length > 0) {
             this.log.info(`[${this.type}] Config options: ${this.configOptions.map((c) => `${c.category}(${c.options.length})`).join(", ")}`);
           }
@@ -28896,7 +29248,7 @@ var init_acp_provider_instance = __esm({
             break;
           }
           case "current_mode_update": {
-            this.currentMode = update.currentModeId;
+            this.setCurrentSelection("mode", update.currentModeId);
             break;
           }
           case "config_option_update": {
@@ -28969,7 +29321,7 @@ var init_acp_provider_instance = __esm({
           this.detectStatusTransition();
         }
         if (params.model) {
-          this.currentModel = params.model;
+          this.setCurrentSelection("model", params.model);
         }
       }
       /** Map SDK ToolCallStatus to internal status */
@@ -29251,6 +29603,7 @@ var init_cli_manager = __esm({
     init_workspaces();
     init_recent_activity();
     init_saved_sessions();
+    init_summary_metadata();
     init_cli_provider_instance();
     init_acp_provider_instance();
     init_contracts();
@@ -29282,7 +29635,11 @@ var init_cli_manager = __esm({
       }
       persistRecentActivity(entry) {
         try {
-          let nextState = appendRecentActivity(loadState(), entry);
+          const summaryMetadata = normalizeProviderSummaryMetadata(entry.summaryMetadata);
+          let nextState = appendRecentActivity(loadState(), {
+            ...entry,
+            summaryMetadata
+          });
           if (entry.providerSessionId && (entry.kind === "cli" || entry.kind === "acp")) {
             nextState = upsertSavedProviderSession(nextState, {
               kind: entry.kind,
@@ -29290,7 +29647,7 @@ var init_cli_manager = __esm({
               providerName: entry.providerName,
               providerSessionId: entry.providerSessionId,
               workspace: entry.workspace,
-              currentModel: entry.currentModel,
+              summaryMetadata,
               title: entry.title
             });
           }
@@ -29480,7 +29837,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
           });
@@ -29582,7 +29939,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
         });
@@ -30750,7 +31107,7 @@ var init_handler2 = __esm({
             this._addToNodeFs(path30, initialAdd, wh, depth + 1);
           }
         }).on(EV.ERROR, this._boundHandleError);
-        return new Promise((resolve16, reject) => {
+        return new Promise((resolve15, reject) => {
           if (!stream)
             return reject();
           stream.once(STR_END, () => {
@@ -30759,7 +31116,7 @@ var init_handler2 = __esm({
               return;
             }
             const wasThrottled = throttler ? throttler.clear() : false;
-            resolve16(void 0);
+            resolve15(void 0);
             previous.getChildren().filter((item) => {
               return item !== directory && !current.has(item);
             }).forEach((item) => {
@@ -31644,6 +32001,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 spawn6 = provider.spawn;
@@ -31773,8 +32133,11 @@ var init_provider_loader = __esm({
     ProviderLoader = class _ProviderLoader {
       providers = /* @__PURE__ */ new Map();
       providerAvailability = /* @__PURE__ */ new Map();
+      defaultProvidersDir;
+      explicitProviderDir = null;
       userDir;
       upstreamDir;
+      sourceMode = "normal";
       disableUpstream;
       watchers = [];
       logFn;
@@ -31788,22 +32151,15 @@ var init_provider_loader = __esm({
       static META_FILE = ".meta.json";
       constructor(options) {
         this.logFn = options?.logFn || LOG.forComponent("Provider").asLogFn();
-        const defaultProvidersDir = path14.join(os15.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(os15.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}`);
@@ -31828,6 +32184,33 @@ var init_provider_loader = __esm({
       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.
       */
@@ -31878,7 +32261,7 @@ var init_provider_loader = __esm({
             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"]);
@@ -32389,7 +32772,7 @@ var init_provider_loader = __esm({
       */
       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");
@@ -32411,7 +32794,7 @@ var init_provider_loader = __esm({
           return { updated: false };
         }
         try {
-          const etag = await new Promise((resolve16, reject) => {
+          const etag = await new Promise((resolve15, reject) => {
             const options = {
               method: "HEAD",
               hostname: "github.com",
@@ -32429,7 +32812,7 @@ var init_provider_loader = __esm({
                   headers: { "User-Agent": "adhdev-launcher" },
                   timeout: 1e4
                 }, (res2) => {
-                  resolve16(res2.headers.etag || res2.headers["last-modified"] || "");
+                  resolve15(res2.headers.etag || res2.headers["last-modified"] || "");
                 });
                 req2.on("error", reject);
                 req2.on("timeout", () => {
@@ -32438,7 +32821,7 @@ var init_provider_loader = __esm({
                 });
                 req2.end();
               } else {
-                resolve16(res.headers.etag || res.headers["last-modified"] || "");
+                resolve15(res.headers.etag || res.headers["last-modified"] || "");
               }
             });
             req.on("error", reject);
@@ -32502,7 +32885,7 @@ var init_provider_loader = __esm({
       downloadFile(url2, destPath) {
         const https = require("https");
         const http3 = require("http");
-        return new Promise((resolve16, reject) => {
+        return new Promise((resolve15, reject) => {
           const doRequest = (reqUrl, redirectCount = 0) => {
             if (redirectCount > 5) {
               reject(new Error("Too many redirects"));
@@ -32522,7 +32905,7 @@ var init_provider_loader = __esm({
               res.pipe(ws);
               ws.on("finish", () => {
                 ws.close();
-                resolve16();
+                resolve15();
               });
               ws.on("error", reject);
             });
@@ -32998,17 +33381,17 @@ async function findFreePort(ports) {
   throw new Error("No free port found");
 }
 function checkPortFree(port) {
-  return new Promise((resolve16) => {
+  return new Promise((resolve15) => {
     const server = net2.createServer();
     server.unref();
-    server.on("error", () => resolve16(false));
+    server.on("error", () => resolve15(false));
     server.listen(port, "127.0.0.1", () => {
-      server.close(() => resolve16(true));
+      server.close(() => resolve15(true));
     });
   });
 }
 async function isCdpActive(port) {
-  return new Promise((resolve16) => {
+  return new Promise((resolve15) => {
     const req = require("http").get(`http://127.0.0.1:${port}/json/version`, {
       timeout: 2e3
     }, (res) => {
@@ -33017,16 +33400,16 @@ async function isCdpActive(port) {
       res.on("end", () => {
         try {
           const info = JSON.parse(data);
-          resolve16(!!info["WebKit-Version"] || !!info["Browser"]);
+          resolve15(!!info["WebKit-Version"] || !!info["Browser"]);
         } catch {
-          resolve16(false);
+          resolve15(false);
         }
       });
     });
-    req.on("error", () => resolve16(false));
+    req.on("error", () => resolve15(false));
     req.on("timeout", () => {
       req.destroy();
-      resolve16(false);
+      resolve15(false);
     });
   });
 }
@@ -33489,7 +33872,90 @@ var init_command_log = __esm({
   }
 });
 
+// ../../oss/packages/daemon-core/src/session-host/runtime-surface.ts
+function isSessionHostLiveRuntime(record2) {
+  const lifecycle = String(record2?.lifecycle || "").trim();
+  return LIVE_LIFECYCLES.has(lifecycle);
+}
+function getSessionHostRecoveryLabel(meta3) {
+  const recoveryState = typeof meta3?.runtimeRecoveryState === "string" ? String(meta3.runtimeRecoveryState).trim() : "";
+  if (!recoveryState) return null;
+  if (recoveryState === "auto_resumed") return "restored after restart";
+  if (recoveryState === "resume_failed") return "restore failed";
+  if (recoveryState === "host_restart_interrupted") return "host restart interrupted";
+  if (recoveryState === "orphan_snapshot") return "snapshot recovered";
+  return recoveryState.replace(/_/g, " ");
+}
+function isSessionHostRecoverySnapshot(record2) {
+  if (!record2) return false;
+  if (isSessionHostLiveRuntime(record2)) return false;
+  const lifecycle = String(record2.lifecycle || "").trim();
+  if (lifecycle && lifecycle !== "stopped" && lifecycle !== "failed") {
+    return false;
+  }
+  const meta3 = record2.meta || void 0;
+  if (meta3?.restoredFromStorage === true) return true;
+  return getSessionHostRecoveryLabel(meta3) !== null;
+}
+function getSessionHostSurfaceKind(record2) {
+  if (isSessionHostLiveRuntime(record2)) return "live_runtime";
+  if (isSessionHostRecoverySnapshot(record2)) return "recovery_snapshot";
+  return "inactive_record";
+}
+function partitionSessionHostRecords(records) {
+  const liveRuntimes = [];
+  const recoverySnapshots = [];
+  const inactiveRecords = [];
+  for (const record2 of records) {
+    const kind = getSessionHostSurfaceKind(record2);
+    if (kind === "live_runtime") {
+      liveRuntimes.push(record2);
+    } else if (kind === "recovery_snapshot") {
+      recoverySnapshots.push(record2);
+    } else {
+      inactiveRecords.push(record2);
+    }
+  }
+  return {
+    liveRuntimes,
+    recoverySnapshots,
+    inactiveRecords
+  };
+}
+function partitionSessionHostDiagnosticsSessions(records) {
+  return partitionSessionHostRecords(records || []);
+}
+var LIVE_LIFECYCLES;
+var init_runtime_surface = __esm({
+  "../../oss/packages/daemon-core/src/session-host/runtime-surface.ts"() {
+    "use strict";
+    LIVE_LIFECYCLES = /* @__PURE__ */ new Set(["starting", "running", "stopping", "interrupted"]);
+  }
+});
+
 // ../../oss/packages/daemon-core/src/status/snapshot.ts
+function buildRecentReadDebugSignature(snapshot) {
+  return [
+    snapshot.providerType,
+    snapshot.status,
+    snapshot.inboxBucket,
+    snapshot.unread ? "1" : "0",
+    String(snapshot.lastSeenAt),
+    snapshot.completionMarker,
+    snapshot.seenCompletionMarker,
+    String(snapshot.lastUpdated),
+    String(snapshot.lastUsedAt),
+    snapshot.lastRole,
+    String(snapshot.messageUpdatedAt)
+  ].join("|");
+}
+function shouldEmitRecentReadDebugLog(cache, snapshot) {
+  const nextSignature = buildRecentReadDebugSignature(snapshot);
+  const previousSignature = cache.get(snapshot.sessionId);
+  if (previousSignature === nextSignature) return false;
+  cache.set(snapshot.sessionId, nextSignature);
+  return true;
+}
 function buildDetectedIdeInfos(detectedIdes, cdpManagers) {
   return detectedIdes.filter((ide) => ide.installed !== false).map((ide) => ({
     id: ide.id,
@@ -33641,7 +34107,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);
 }
@@ -33682,9 +34148,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);
@@ -33717,7 +34198,7 @@ function buildStatusSnapshot(options) {
     }
   };
 }
-var os18, READ_DEBUG_ENABLED;
+var os18, READ_DEBUG_ENABLED, recentReadDebugSignatureBySession;
 var init_snapshot = __esm({
   "../../oss/packages/daemon-core/src/status/snapshot.ts"() {
     "use strict";
@@ -33731,6 +34212,7 @@ var init_snapshot = __esm({
     init_logger();
     init_builders();
     READ_DEBUG_ENABLED = process.argv.includes("--dev") || process.env.ADHDEV_READ_DEBUG === "1";
+    recentReadDebugSignatureBySession = /* @__PURE__ */ new Map();
   }
 });
 
@@ -33772,7 +34254,7 @@ async function waitForPidExit(pid, timeoutMs) {
   while (Date.now() - start < timeoutMs) {
     try {
       process.kill(pid, 0);
-      await new Promise((resolve16) => setTimeout(resolve16, 250));
+      await new Promise((resolve15) => setTimeout(resolve15, 250));
     } catch {
       return;
     }
@@ -33887,7 +34369,7 @@ async function runDaemonUpgradeHelper(payload) {
     appendUpgradeLog(installOutput.trim());
   }
   if (process.platform === "win32") {
-    await new Promise((resolve16) => setTimeout(resolve16, 500));
+    await new Promise((resolve15) => setTimeout(resolve15, 500));
     cleanupStaleGlobalInstallDirs(payload.packageName);
     appendUpgradeLog("Post-install staging cleanup complete");
   }
@@ -33972,6 +34454,49 @@ function toHostedCliRuntimeDescriptor(record2) {
     providerSessionId: typeof record2.meta?.providerSessionId === "string" ? String(record2.meta.providerSessionId) : void 0
   };
 }
+function getWriteConflictOwnerClientId(error48) {
+  const message = typeof error48 === "string" ? error48 : error48 instanceof Error ? error48.message : "";
+  const match = /^Write owned by\s+(.+)$/.exec(message.trim());
+  return match?.[1]?.trim() || void 0;
+}
+function summarizeSessionHostRecord(result) {
+  if (!result || typeof result !== "object") return {};
+  const record2 = result;
+  return {
+    runtimeKey: typeof record2.runtimeKey === "string" ? record2.runtimeKey : void 0,
+    lifecycle: typeof record2.lifecycle === "string" ? record2.lifecycle : void 0,
+    surfaceKind: getSessionHostSurfaceKind(record2),
+    attachedClientCount: Array.isArray(record2.attachedClients) ? record2.attachedClients.length : void 0,
+    hasWriteOwner: !!record2.writeOwner,
+    writeOwnerClientId: typeof record2.writeOwner?.clientId === "string" ? record2.writeOwner.clientId : void 0
+  };
+}
+function summarizeSessionHostRecords(result) {
+  const records = Array.isArray(result) ? result : [];
+  const groups = partitionSessionHostRecords(records);
+  return {
+    sessionCount: records.length,
+    liveRuntimeCount: groups.liveRuntimes.length,
+    recoverySnapshotCount: groups.recoverySnapshots.length,
+    inactiveRecordCount: groups.inactiveRecords.length
+  };
+}
+function summarizeSessionHostDiagnostics(result) {
+  const diagnostics = result && typeof result === "object" ? result : {};
+  const sessions = Array.isArray(diagnostics.sessions) ? diagnostics.sessions : [];
+  return {
+    runtimeCount: typeof diagnostics.runtimeCount === "number" ? diagnostics.runtimeCount : void 0,
+    ...summarizeSessionHostRecords(sessions)
+  };
+}
+function summarizeSessionHostPruneResult(result) {
+  const value = result && typeof result === "object" ? result : {};
+  return {
+    duplicateGroupCount: typeof value.duplicateGroupCount === "number" ? value.duplicateGroupCount : void 0,
+    prunedCount: Array.isArray(value.prunedSessionIds) ? value.prunedSessionIds.length : void 0,
+    keptCount: Array.isArray(value.keptSessionIds) ? value.keptSessionIds.length : void 0
+  };
+}
 var fs9, CHAT_COMMANDS, READ_DEBUG_ENABLED2, DaemonCommandRouter;
 var init_router = __esm({
   "../../oss/packages/daemon-core/src/commands/router.ts"() {
@@ -33991,6 +34516,7 @@ var init_router = __esm({
     init_command_log();
     init_logger();
     init_debug_trace();
+    init_runtime_surface();
     init_builders();
     init_snapshot();
     init_snapshot();
@@ -34009,6 +34535,56 @@ var init_router = __esm({
       constructor(deps) {
         this.deps = deps;
       }
+      async traceSessionHostAction(action, args, run, summarizeResult) {
+        const interactionId = typeof args?._interactionId === "string" ? args._interactionId : void 0;
+        const sessionId = typeof args?.sessionId === "string" ? args.sessionId : void 0;
+        const requestedPayload = { action };
+        if (sessionId) requestedPayload.sessionId = sessionId;
+        if (typeof args?.clientId === "string") requestedPayload.clientId = args.clientId;
+        if (typeof args?.signal === "string") requestedPayload.signal = args.signal;
+        if (typeof args?.providerType === "string") requestedPayload.providerType = args.providerType;
+        if (typeof args?.workspace === "string") requestedPayload.workspace = args.workspace;
+        if (typeof args?.dryRun === "boolean") requestedPayload.dryRun = args.dryRun;
+        recordDebugTrace({
+          interactionId,
+          category: "session_host",
+          stage: "action_requested",
+          level: "info",
+          sessionId,
+          payload: requestedPayload
+        });
+        try {
+          const result = await run();
+          recordDebugTrace({
+            interactionId,
+            category: "session_host",
+            stage: "action_result",
+            level: "info",
+            sessionId,
+            payload: {
+              ...requestedPayload,
+              success: true,
+              ...summarizeResult ? summarizeResult(result) : {}
+            }
+          });
+          return result;
+        } catch (error48) {
+          recordDebugTrace({
+            interactionId,
+            category: "session_host",
+            stage: "action_failed",
+            level: "error",
+            sessionId,
+            payload: {
+              ...requestedPayload,
+              error: error48?.message || String(error48),
+              failureKind: getWriteConflictOwnerClientId(error48) ? "write_conflict" : "request_failed",
+              conflictOwnerClientId: getWriteConflictOwnerClientId(error48)
+            }
+          });
+          throw error48;
+        }
+      }
       /**
        * Unified command routing.
        * Returns result for all commands:
@@ -34118,44 +34694,60 @@ var init_router = __esm({
           }
           case "session_host_get_diagnostics": {
             if (!this.deps.sessionHostControl) return { success: false, error: "Session host control unavailable" };
-            const diagnostics = await this.deps.sessionHostControl.getDiagnostics({
+            const diagnostics = await this.traceSessionHostAction("session_host_get_diagnostics", args, () => this.deps.sessionHostControl.getDiagnostics({
               includeSessions: args?.includeSessions !== false,
               limit: Number(args?.limit) || void 0
-            });
+            }), (result) => ({
+              includeSessions: args?.includeSessions !== false,
+              limit: Number(args?.limit) || void 0,
+              ...summarizeSessionHostDiagnostics(result)
+            }));
             return { success: true, diagnostics };
           }
           case "session_host_list_sessions": {
             if (!this.deps.sessionHostControl) return { success: false, error: "Session host control unavailable" };
-            const sessions = await this.deps.sessionHostControl.listSessions();
+            const sessions = await this.traceSessionHostAction("session_host_list_sessions", args, () => this.deps.sessionHostControl.listSessions(), (records) => summarizeSessionHostRecords(records));
             return { success: true, sessions };
           }
           case "session_host_stop_session": {
             if (!this.deps.sessionHostControl) return { success: false, error: "Session host control unavailable" };
             const sessionId = typeof args?.sessionId === "string" ? args.sessionId : "";
             if (!sessionId) return { success: false, error: "sessionId required" };
-            const record2 = await this.deps.sessionHostControl.stopSession(sessionId);
+            const record2 = await this.traceSessionHostAction("session_host_stop_session", args, () => this.deps.sessionHostControl.stopSession(sessionId), (result) => summarizeSessionHostRecord(result));
             return { success: true, record: record2 };
           }
           case "session_host_resume_session": {
             if (!this.deps.sessionHostControl) return { success: false, error: "Session host control unavailable" };
             const sessionId = typeof args?.sessionId === "string" ? args.sessionId : "";
             if (!sessionId) return { success: false, error: "sessionId required" };
-            const record2 = await this.deps.sessionHostControl.resumeSession(sessionId);
-            const hosted = toHostedCliRuntimeDescriptor(record2);
-            if (hosted) {
-              await this.deps.cliManager.restoreHostedSessions([hosted]);
-            }
+            const record2 = await this.traceSessionHostAction("session_host_resume_session", args, async () => {
+              const nextRecord = await this.deps.sessionHostControl.resumeSession(sessionId);
+              const hosted = toHostedCliRuntimeDescriptor(nextRecord);
+              if (hosted) {
+                await this.deps.cliManager.restoreHostedSessions([hosted]);
+              }
+              return nextRecord;
+            }, (result) => ({
+              ...summarizeSessionHostRecord(result),
+              restoredHostedSession: !!toHostedCliRuntimeDescriptor(result)
+            }));
             return { success: true, record: record2 };
           }
           case "session_host_restart_session": {
             if (!this.deps.sessionHostControl) return { success: false, error: "Session host control unavailable" };
             const sessionId = typeof args?.sessionId === "string" ? args.sessionId : "";
             if (!sessionId) return { success: false, error: "sessionId required" };
-            const record2 = await this.deps.sessionHostControl.restartSession(sessionId);
-            const hosted = toHostedCliRuntimeDescriptor(record2);
-            if (hosted) {
-              await this.deps.cliManager.restoreHostedSessions([hosted]);
-            }
+            const record2 = await this.traceSessionHostAction("session_host_restart_session", args, async () => {
+              const nextRecord = await this.deps.sessionHostControl.restartSession(sessionId);
+              const hosted = toHostedCliRuntimeDescriptor(nextRecord);
+              if (hosted) {
+                await this.deps.cliManager.restoreHostedSessions([hosted]);
+              }
+              return nextRecord;
+            }, (result) => ({
+              ...summarizeSessionHostRecord(result),
+              restoredHostedSession: !!toHostedCliRuntimeDescriptor(result)
+            }));
             return { success: true, record: record2 };
           }
           case "session_host_send_signal": {
@@ -34164,7 +34756,7 @@ var init_router = __esm({
             const signal = typeof args?.signal === "string" ? args.signal : "";
             if (!sessionId) return { success: false, error: "sessionId required" };
             if (!signal) return { success: false, error: "signal required" };
-            const record2 = await this.deps.sessionHostControl.sendSignal(sessionId, signal);
+            const record2 = await this.traceSessionHostAction("session_host_send_signal", args, () => this.deps.sessionHostControl.sendSignal(sessionId, signal), (result) => summarizeSessionHostRecord(result));
             return { success: true, record: record2 };
           }
           case "session_host_force_detach_client": {
@@ -34173,16 +34765,16 @@ var init_router = __esm({
             const clientId = typeof args?.clientId === "string" ? args.clientId : "";
             if (!sessionId) return { success: false, error: "sessionId required" };
             if (!clientId) return { success: false, error: "clientId required" };
-            const record2 = await this.deps.sessionHostControl.forceDetachClient(sessionId, clientId);
+            const record2 = await this.traceSessionHostAction("session_host_force_detach_client", args, () => this.deps.sessionHostControl.forceDetachClient(sessionId, clientId), (result) => summarizeSessionHostRecord(result));
             return { success: true, record: record2 };
           }
           case "session_host_prune_duplicate_sessions": {
             if (!this.deps.sessionHostControl) return { success: false, error: "Session host control unavailable" };
-            const result = await this.deps.sessionHostControl.pruneDuplicateSessions({
+            const result = await this.traceSessionHostAction("session_host_prune_duplicate_sessions", args, () => this.deps.sessionHostControl.pruneDuplicateSessions({
               providerType: typeof args?.providerType === "string" ? args.providerType : void 0,
               workspace: typeof args?.workspace === "string" ? args.workspace : void 0,
               dryRun: args?.dryRun === true
-            });
+            }), (value) => summarizeSessionHostPruneResult(value));
             return { success: true, result };
           }
           case "session_host_acquire_write": {
@@ -34192,12 +34784,15 @@ var init_router = __esm({
             const ownerType = args?.ownerType === "agent" ? "agent" : "user";
             if (!sessionId) return { success: false, error: "sessionId required" };
             if (!clientId) return { success: false, error: "clientId required" };
-            const record2 = await this.deps.sessionHostControl.acquireWrite({
+            const record2 = await this.traceSessionHostAction("session_host_acquire_write", args, () => this.deps.sessionHostControl.acquireWrite({
               sessionId,
               clientId,
               ownerType,
               force: args?.force !== false
-            });
+            }), (result) => ({
+              ...summarizeSessionHostRecord(result),
+              ownerType
+            }));
             return { success: true, record: record2 };
           }
           case "session_host_release_write": {
@@ -34206,7 +34801,10 @@ var init_router = __esm({
             const clientId = typeof args?.clientId === "string" ? args.clientId : "";
             if (!sessionId) return { success: false, error: "sessionId required" };
             if (!clientId) return { success: false, error: "clientId required" };
-            const record2 = await this.deps.sessionHostControl.releaseWrite({ sessionId, clientId });
+            const record2 = await this.traceSessionHostAction("session_host_release_write", args, () => this.deps.sessionHostControl.releaseWrite({
+              sessionId,
+              clientId
+            }), (result) => summarizeSessionHostRecord(result));
             return { success: true, record: record2 };
           }
           case "list_saved_sessions": {
@@ -34215,8 +34813,9 @@ var init_router = __esm({
             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 });
@@ -34237,13 +34836,13 @@ var init_router = __esm({
                   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
@@ -34685,7 +35284,7 @@ var init_reporter = __esm({
         const ideSummary = ideStates.map((s) => {
           const msgs = s.activeChat?.messages?.length || 0;
           const exts = s.extensions.length;
-          return `${s.type}(${s.status},${msgs}msg,${exts}ext${s.currentModel ? ",model=" + s.currentModel : ""})`;
+          return `${s.type}(${s.status},${msgs}msg,${exts}ext)`;
         }).join(", ");
         const cliSummary = cliStates.map((s) => `${s.type}(${s.status})`).join(", ");
         const acpSummary = acpStates.map((s) => `${s.type}(${s.status})`).join(", ");
@@ -34747,9 +35346,7 @@ var init_reporter = __esm({
             workspace: session.workspace ?? null,
             title: session.title,
             cdpConnected: session.cdpConnected,
-            currentModel: session.currentModel,
-            currentPlan: session.currentPlan,
-            currentAutoApprove: session.currentAutoApprove
+            summaryMetadata: session.summaryMetadata
           })),
           p2p: payload.p2p,
           timestamp: now
@@ -34814,6 +35411,7 @@ var init_provider_adapter = __esm({
   "../../oss/packages/daemon-core/src/agent-stream/provider-adapter.ts"() {
     "use strict";
     init_control_effects();
+    init_provider_patch_state();
     ProviderStreamAdapter = class {
       agentType;
       agentName;
@@ -34878,7 +35476,7 @@ var init_provider_adapter = __esm({
         const beforeCount = this.messageCount(before);
         const beforeSignature = this.lastMessageSignature(before);
         for (let attempt = 0; attempt < 12; attempt += 1) {
-          await new Promise((resolve16) => setTimeout(resolve16, 250));
+          await new Promise((resolve15) => setTimeout(resolve15, 250));
           let state;
           try {
             state = await this.readChat(evaluate);
@@ -34900,7 +35498,7 @@ var init_provider_adapter = __esm({
         if (this.messageCount(first) > 0 || this.lastMessageSignature(first)) {
           return first;
         }
-        await new Promise((resolve16) => setTimeout(resolve16, 150));
+        await new Promise((resolve15) => setTimeout(resolve15, 150));
         const second = await this.readChat(evaluate);
         return this.messageCount(second) >= this.messageCount(first) ? second : first;
       }
@@ -34925,15 +35523,18 @@ var init_provider_adapter = __esm({
             status: data.status || "idle",
             messages: data.messages || [],
             inputContent: data.inputContent || "",
-            model: data.model,
-            mode: data.mode,
             activeModal: data.activeModal
           };
           if (typeof data.title === "string" && data.title.trim()) {
             state.title = data.title.trim();
           }
           const controlValues = extractProviderControlValues(this.provider.controls, data);
-          if (controlValues) state.controlValues = controlValues;
+          const surface = resolveProviderStateSurface({
+            controlValues,
+            summaryMetadata: data.summaryMetadata
+          });
+          if (surface.controlValues) state.controlValues = surface.controlValues;
+          if (surface.summaryMetadata) state.summaryMetadata = surface.summaryMetadata;
           const effects = normalizeProviderEffects(data);
           if (effects.length > 0) state.effects = effects;
           if (state.messages.length > 0) {
@@ -35040,7 +35641,7 @@ var init_provider_adapter = __esm({
           if (typeof data.error === "string" && data.error.trim()) return false;
         }
         for (let attempt = 0; attempt < 6; attempt += 1) {
-          await new Promise((resolve16) => setTimeout(resolve16, 250));
+          await new Promise((resolve15) => setTimeout(resolve15, 250));
           const state = await this.readChat(evaluate);
           const title = this.getStateTitle(state);
           if (this.titlesMatch(title, sessionId)) return true;
@@ -35214,7 +35815,8 @@ var init_manager2 = __esm({
           const evaluate = (expr, timeout) => cdp.evaluateInSessionFrame(agent.cdpSessionId, expr, timeout);
           const state = await agent.adapter.readChat(evaluate);
           const stateError = this.getStateError(state);
-          LOG.debug("AgentStream", `[AgentStream] readChat(${type}) result: status=${state.status} msgs=${state.messages?.length || 0} model=${state.model || ""}${state.status === "error" ? " error=" + JSON.stringify(stateError) : ""}`);
+          const selectedModelValue = typeof state.controlValues?.model === "string" ? state.controlValues.model : "";
+          LOG.debug("AgentStream", `[AgentStream] readChat(${type}) result: status=${state.status} msgs=${state.messages?.length || 0} model=${selectedModelValue}${state.status === "error" ? " error=" + JSON.stringify(stateError) : ""}`);
           if (state.status === "error" && this.isRecoverableSessionError(stateError)) {
             throw new Error(stateError);
           }
@@ -35591,9 +36193,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,
@@ -36140,7 +36741,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 {
@@ -36168,6 +36773,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 });
@@ -37552,7 +38160,7 @@ function getCliTargetBundle(ctx, type, instanceId) {
   return { target, instance, adapter };
 }
 function sleep(ms) {
-  return new Promise((resolve16) => setTimeout(resolve16, ms));
+  return new Promise((resolve15) => setTimeout(resolve15, ms));
 }
 async function waitForCliReady(ctx, type, instanceId, timeoutMs) {
   const startedAt = Date.now();
@@ -37914,7 +38522,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 });
@@ -38404,18 +39011,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 (error48) {
-    return {
-      dir: null,
-      reason: `Failed to update provider.json in writable provider directory: ${error48.message}`
-    };
-  }
   return { dir: desiredDir };
 }
 function loadAutoImplReferenceScripts(ctx, referenceType) {
@@ -39088,7 +39683,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 }] }` |");
@@ -39714,6 +40309,8 @@ var init_dev_server = __esm({
     fs14 = __toESM(require("fs"));
     path23 = __toESM(require("path"));
     init_provider_schema();
+    init_config();
+    init_provider_source_config();
     init_scaffold_template();
     init_version_archive();
     init_logger();
@@ -39728,6 +40325,7 @@ var init_dev_server = __esm({
       cdpManagers;
       instanceManager;
       cliManager;
+      onProviderSourceConfigChanged;
       logFn;
       sseClients = [];
       watchScriptPath = null;
@@ -39744,6 +40342,7 @@ var init_dev_server = __esm({
         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) {
@@ -39753,6 +40352,8 @@ var init_dev_server = __esm({
       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) },
@@ -39850,15 +40451,15 @@ var init_dev_server = __esm({
             this.json(res, 500, { error: e.message });
           }
         });
-        return new Promise((resolve16, reject) => {
+        return new Promise((resolve15, reject) => {
           this.server.listen(port, "127.0.0.1", () => {
             this.log(`Dev server listening on http://127.0.0.1:${port}`);
-            resolve16();
+            resolve15();
           });
           this.server.on("error", (e) => {
             if (e.code === "EADDRINUSE") {
               this.log(`Port ${port} in use, skipping dev server`);
-              resolve16();
+              resolve15();
             } else {
               reject(e);
             }
@@ -39872,7 +40473,33 @@ var init_dev_server = __esm({
       // ─── 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);
@@ -39914,20 +40541,20 @@ var init_dev_server = __esm({
           child.stderr?.on("data", (d) => {
             stderr += d.toString().slice(0, 2e3);
           });
-          await new Promise((resolve16) => {
+          await new Promise((resolve15) => {
             const timer = setTimeout(() => {
               child.kill();
-              resolve16();
+              resolve15();
             }, 3e3);
             child.on("exit", () => {
               clearTimeout(timer);
-              resolve16();
+              resolve15();
             });
             child.stdout?.once("data", () => {
               setTimeout(() => {
                 child.kill();
                 clearTimeout(timer);
-                resolve16();
+                resolve15();
               }, 500);
             });
           });
@@ -40423,14 +41050,14 @@ var init_dev_server = __esm({
           child.stderr?.on("data", (d) => {
             stderr += d.toString();
           });
-          await new Promise((resolve16) => {
+          await new Promise((resolve15) => {
             const timer = setTimeout(() => {
               child.kill();
-              resolve16();
+              resolve15();
             }, timeout);
             child.on("exit", () => {
               clearTimeout(timer);
-              resolve16();
+              resolve15();
             });
           });
           const elapsed = Date.now() - start;
@@ -40575,18 +41202,6 @@ var init_dev_server = __esm({
         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 (error48) {
-          return {
-            dir: null,
-            reason: `Failed to update provider.json in writable provider directory: ${error48.message}`
-          };
-        }
         return { dir: desiredDir };
       }
       async handleAutoImplement(type, req, res) {
@@ -40731,7 +41346,7 @@ var init_dev_server = __esm({
         lines.push("## Required Return Format");
         lines.push("| Function | Return JSON |");
         lines.push("|---|---|");
-        lines.push("| readChat | `{ id, status, title, messages: [{role, content, index, kind?, meta?}], inputContent, activeModal }` \u2014 optional `kind`: standard, thought, tool, terminal; optional `meta`: e.g. `{ label, isRunning }` for dashboard |");
+        lines.push("| readChat | `{ id, status, title, messages: [{role, content, index, kind?, meta?}], inputContent, activeModal, controlValues?, summaryMetadata? }` \u2014 optional `kind`: standard, thought, tool, terminal; prefer explicit `controlValues` for current selections and `summaryMetadata` for compact always-visible UI metadata |");
         lines.push("| sendMessage | `{ sent: false, needsTypeAndSend: true, selector }` |");
         lines.push("| resolveAction | `{ resolved: true/false, clicked? }` |");
         lines.push("| listSessions | `{ sessions: [{ id, title, active, index }] }` |");
@@ -41112,14 +41727,14 @@ data: ${JSON.stringify(msg.data)}
         res.end(JSON.stringify(data, null, 2));
       }
       async readBody(req) {
-        return new Promise((resolve16) => {
+        return new Promise((resolve15) => {
           let body = "";
           req.on("data", (chunk) => body += chunk);
           req.on("end", () => {
             try {
-              resolve16(JSON.parse(body));
+              resolve15(JSON.parse(body));
             } catch {
-              resolve16({});
+              resolve15({});
             }
           });
         });
@@ -41604,7 +42219,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((resolve16) => setTimeout(resolve16, STARTUP_POLL_MS));
+    await new Promise((resolve15) => setTimeout(resolve15, STARTUP_POLL_MS));
   }
   throw new Error(`Session host did not become ready within ${timeoutMs}ms`);
 }
@@ -41653,67 +42268,6 @@ var init_runtime_support = __esm({
   }
 });
 
-// ../../oss/packages/daemon-core/src/session-host/runtime-surface.ts
-function isSessionHostLiveRuntime(record2) {
-  const lifecycle = String(record2?.lifecycle || "").trim();
-  return LIVE_LIFECYCLES.has(lifecycle);
-}
-function getSessionHostRecoveryLabel(meta3) {
-  const recoveryState = typeof meta3?.runtimeRecoveryState === "string" ? String(meta3.runtimeRecoveryState).trim() : "";
-  if (!recoveryState) return null;
-  if (recoveryState === "auto_resumed") return "restored after restart";
-  if (recoveryState === "resume_failed") return "restore failed";
-  if (recoveryState === "host_restart_interrupted") return "host restart interrupted";
-  if (recoveryState === "orphan_snapshot") return "snapshot recovered";
-  return recoveryState.replace(/_/g, " ");
-}
-function isSessionHostRecoverySnapshot(record2) {
-  if (!record2) return false;
-  if (isSessionHostLiveRuntime(record2)) return false;
-  const lifecycle = String(record2.lifecycle || "").trim();
-  if (lifecycle && lifecycle !== "stopped" && lifecycle !== "failed") {
-    return false;
-  }
-  const meta3 = record2.meta || void 0;
-  if (meta3?.restoredFromStorage === true) return true;
-  return getSessionHostRecoveryLabel(meta3) !== null;
-}
-function getSessionHostSurfaceKind(record2) {
-  if (isSessionHostLiveRuntime(record2)) return "live_runtime";
-  if (isSessionHostRecoverySnapshot(record2)) return "recovery_snapshot";
-  return "inactive_record";
-}
-function partitionSessionHostRecords(records) {
-  const liveRuntimes = [];
-  const recoverySnapshots = [];
-  const inactiveRecords = [];
-  for (const record2 of records) {
-    const kind = getSessionHostSurfaceKind(record2);
-    if (kind === "live_runtime") {
-      liveRuntimes.push(record2);
-    } else if (kind === "recovery_snapshot") {
-      recoverySnapshots.push(record2);
-    } else {
-      inactiveRecords.push(record2);
-    }
-  }
-  return {
-    liveRuntimes,
-    recoverySnapshots,
-    inactiveRecords
-  };
-}
-function partitionSessionHostDiagnosticsSessions(records) {
-  return partitionSessionHostRecords(records || []);
-}
-var LIVE_LIFECYCLES;
-var init_runtime_surface = __esm({
-  "../../oss/packages/daemon-core/src/session-host/runtime-surface.ts"() {
-    "use strict";
-    LIVE_LIFECYCLES = /* @__PURE__ */ new Set(["starting", "running", "stopping", "interrupted"]);
-  }
-});
-
 // ../../oss/packages/daemon-core/src/session-host/startup-restore-policy.js
 function shouldAutoRestoreHostedSessionsOnStartup(env3 = process.env) {
   const raw = typeof env3.ADHDEV_RESTORE_HOSTED_SESSIONS_ON_STARTUP === "string" ? env3.ADHDEV_RESTORE_HOSTED_SESSIONS_ON_STARTUP.trim().toLowerCase() : "";
@@ -41768,10 +42322,10 @@ async function installExtension(ide, extension) {
         const buffer = Buffer.from(await res.arrayBuffer());
         const fs24 = await import("fs");
         fs24.writeFileSync(vsixPath, buffer);
-        return new Promise((resolve16) => {
+        return new Promise((resolve15) => {
           const cmd = `"${ide.cliCommand}" --install-extension "${vsixPath}" --force`;
           (0, import_child_process10.exec)(cmd, { timeout: 6e4 }, (error48, _stdout, stderr) => {
-            resolve16({
+            resolve15({
               extensionId: extension.id,
               marketplaceId: extension.marketplaceId,
               success: !error48,
@@ -41784,11 +42338,11 @@ async function installExtension(ide, extension) {
     } catch (e) {
     }
   }
-  return new Promise((resolve16) => {
+  return new Promise((resolve15) => {
     const cmd = `"${ide.cliCommand}" --install-extension ${extension.marketplaceId} --force`;
     (0, import_child_process10.exec)(cmd, { timeout: 6e4 }, (error48, stdout, stderr) => {
       if (error48) {
-        resolve16({
+        resolve15({
           extensionId: extension.id,
           marketplaceId: extension.marketplaceId,
           success: false,
@@ -41796,7 +42350,7 @@ async function installExtension(ide, extension) {
           error: stderr || error48.message
         });
       } else {
-        resolve16({
+        resolve15({
           extensionId: extension.id,
           marketplaceId: extension.marketplaceId,
           success: true,
@@ -41990,10 +42544,11 @@ var init_registry = __esm({
 async function initDaemonComponents(config2) {
   installGlobalInterceptor();
   const appConfig = loadConfig();
-  const disableUpstream = appConfig.disableUpstream ?? false;
+  const providerSourceMode = appConfig.providerSourceMode || "normal";
+  const disableUpstream = providerSourceMode === "no-upstream";
   const providerLoader = new ProviderLoader({
     logFn: config2.providerLogFn,
-    disableUpstream,
+    sourceMode: providerSourceMode,
     userDir: appConfig.providerDir
   });
   if (!disableUpstream && !providerLoader.hasUpstream()) {
@@ -42098,6 +42653,10 @@ async function initDaemonComponents(config2) {
     onProviderSettingChanged: async (providerType) => {
       await refreshProviderAvailability(providerType);
       config2.onStatusChange?.();
+    },
+    onProviderSourceConfigChanged: async () => {
+      await refreshProviderAvailability();
+      config2.onStatusChange?.();
     }
   });
   agentStreamManager = new DaemonAgentStreamManager(
@@ -42147,7 +42706,8 @@ async function initDaemonComponents(config2) {
     cdpInitializer,
     cdpManagers,
     sessionRegistry,
-    detectedIdes: detectedIdesRef
+    detectedIdes: detectedIdesRef,
+    refreshProviderAvailability
   };
 }
 async function startDaemonDevSupport(options) {
@@ -42156,7 +42716,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();
@@ -42306,6 +42869,7 @@ __export(src_exports, {
   normalizeInputEnvelope: () => normalizeInputEnvelope,
   normalizeManagedStatus: () => normalizeManagedStatus,
   normalizeMessageParts: () => normalizeMessageParts,
+  parseProviderSourceConfigUpdate: () => parseProviderSourceConfigUpdate,
   partitionSessionHostDiagnosticsSessions: () => partitionSessionHostDiagnosticsSessions,
   partitionSessionHostRecords: () => partitionSessionHostRecords,
   probeCdpPort: () => probeCdpPort,
@@ -42369,6 +42933,7 @@ var init_src = __esm({
     init_ide_provider_instance();
     init_cli_provider_instance();
     init_acp_provider_instance();
+    init_provider_source_config();
     init_io_contracts();
     init_version_archive();
     init_dev_server();
@@ -42808,7 +43373,7 @@ function routeDataChannelMessage(peerId, msg, peers, handlers) {
         log(`pty_input: REJECTED \u2014 permission=${permission} peer=${peerId}`);
         return;
       }
-      const sessionId = parsed.sessionId || parsed.cliId || parsed.cliType || "";
+      const sessionId = parsed.sessionId || parsed.targetSessionId || parsed.cliId || parsed.cliType || "";
       if (handlers.ptyInputHandler && parsed.data && sessionId) {
         handlers.ptyInputHandler(sessionId, parsed.data);
       }
@@ -42820,7 +43385,7 @@ function routeDataChannelMessage(peerId, msg, peers, handlers) {
         log(`pty_resize: REJECTED \u2014 permission=${permission} peer=${peerId}`);
         return;
       }
-      const sessionId = parsed.sessionId || parsed.cliId || parsed.cliType || "";
+      const sessionId = parsed.sessionId || parsed.targetSessionId || parsed.cliId || parsed.cliType || "";
       if (handlers.ptyResizeHandler && parsed.cols && parsed.rows && sessionId) {
         handlers.ptyResizeHandler(sessionId, parsed.cols, parsed.rows);
       }
@@ -43838,14 +44403,14 @@ var require_filesystem = __commonJS({
       });
       return buffer.subarray(0, bytesRead);
     };
-    var readFile = (path30) => new Promise((resolve16, reject) => {
+    var readFile = (path30) => new Promise((resolve15, reject) => {
       fs24.open(path30, "r", (err, fd) => {
         if (err) {
           reject(err);
         } else {
           const buffer = Buffer.alloc(MAX_LENGTH);
           fs24.read(fd, buffer, 0, MAX_LENGTH, 0, (_2, bytesRead) => {
-            resolve16(buffer.subarray(0, bytesRead));
+            resolve15(buffer.subarray(0, bytesRead));
             fs24.close(fd, () => {
             });
           });
@@ -43913,10 +44478,10 @@ var require_detect_libc = __commonJS({
     var commandOut = "";
     var safeCommand = () => {
       if (!commandOut) {
-        return new Promise((resolve16) => {
+        return new Promise((resolve15) => {
           childProcess2.exec(command, (err, out) => {
             commandOut = err ? " " : out;
-            resolve16(commandOut);
+            resolve15(commandOut);
           });
         });
       }
@@ -46596,14 +47161,14 @@ var require_input = __commonJS({
         return this;
       } else {
         if (this._isStreamInput()) {
-          return new Promise((resolve16, reject) => {
+          return new Promise((resolve15, reject) => {
             const finished = () => {
               this._flattenBufferIn();
               sharp.metadata(this.options, (err, metadata2) => {
                 if (err) {
                   reject(is.nativeError(err, stack));
                 } else {
-                  resolve16(metadata2);
+                  resolve15(metadata2);
                 }
               });
             };
@@ -46614,12 +47179,12 @@ var require_input = __commonJS({
             }
           });
         } else {
-          return new Promise((resolve16, reject) => {
+          return new Promise((resolve15, reject) => {
             sharp.metadata(this.options, (err, metadata2) => {
               if (err) {
                 reject(is.nativeError(err, stack));
               } else {
-                resolve16(metadata2);
+                resolve15(metadata2);
               }
             });
           });
@@ -46652,25 +47217,25 @@ var require_input = __commonJS({
         return this;
       } else {
         if (this._isStreamInput()) {
-          return new Promise((resolve16, reject) => {
+          return new Promise((resolve15, reject) => {
             this.on("finish", function() {
               this._flattenBufferIn();
               sharp.stats(this.options, (err, stats2) => {
                 if (err) {
                   reject(is.nativeError(err, stack));
                 } else {
-                  resolve16(stats2);
+                  resolve15(stats2);
                 }
               });
             });
           });
         } else {
-          return new Promise((resolve16, reject) => {
+          return new Promise((resolve15, reject) => {
             sharp.stats(this.options, (err, stats2) => {
               if (err) {
                 reject(is.nativeError(err, stack));
               } else {
-                resolve16(stats2);
+                resolve15(stats2);
               }
             });
           });
@@ -50092,7 +50657,7 @@ var require_output = __commonJS({
         return this;
       } else {
         if (this._isStreamInput()) {
-          return new Promise((resolve16, reject) => {
+          return new Promise((resolve15, reject) => {
             this.once("finish", () => {
               this._flattenBufferIn();
               sharp.pipeline(this.options, (err, data, info) => {
@@ -50100,24 +50665,24 @@ var require_output = __commonJS({
                   reject(is.nativeError(err, stack));
                 } else {
                   if (this.options.resolveWithObject) {
-                    resolve16({ data, info });
+                    resolve15({ data, info });
                   } else {
-                    resolve16(data);
+                    resolve15(data);
                   }
                 }
               });
             });
           });
         } else {
-          return new Promise((resolve16, reject) => {
+          return new Promise((resolve15, reject) => {
             sharp.pipeline(this.options, (err, data, info) => {
               if (err) {
                 reject(is.nativeError(err, stack));
               } else {
                 if (this.options.resolveWithObject) {
-                  resolve16({ data, info });
+                  resolve15({ data, info });
                 } else {
-                  resolve16(data);
+                  resolve15(data);
                 }
               }
             });
@@ -51677,7 +52242,7 @@ var init_adhdev_daemon = __esm({
     import_ws3 = require("ws");
     init_source2();
     init_version();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.8.57" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.8.59" });
     ACTIVE_CHAT_POLL_STATUSES = /* @__PURE__ */ new Set([
       "generating",
       "waiting_approval",
@@ -52185,6 +52750,8 @@ ${err?.stack || ""}`);
               forwardAgentStreamsToIdeInstance(this.components.instanceManager, ideType, streams);
             }
           });
+          const providerSourceConfig = this.components.providerLoader.getSourceConfig();
+          LOG.info("Provider", `Source config: mode=${providerSourceConfig.sourceMode} explicitProviderDir=${providerSourceConfig.explicitProviderDir || "-"} userDir=${providerSourceConfig.userDir} upstreamDir=${providerSourceConfig.upstreamDir}`);
           if (shouldAutoRestoreHostedSessionsOnStartup(process.env)) {
             await this.components.cliManager.restoreHostedSessions();
           }
@@ -52346,7 +52913,11 @@ ${err?.stack || ""}`);
               providerLoader: this.components.providerLoader,
               cdpManagers: this.components.cdpManagers,
               instanceManager: this.components.instanceManager,
-              cliManager: this.components.cliManager
+              cliManager: this.components.cliManager,
+              onProviderSourceConfigChanged: async () => {
+                await this.components.refreshProviderAvailability();
+                this.statusReporter?.onStatusChange();
+              }
             });
             await devServer.start();
           }
@@ -52543,7 +53114,7 @@ ${err?.stack || ""}`);
             this.localWss.emit("connection", ws, req);
           });
         });
-        await new Promise((resolve16, reject) => {
+        await new Promise((resolve15, reject) => {
           const cleanup = () => {
             this.localHttpServer?.off("error", onError);
             this.localHttpServer?.off("listening", onListening);
@@ -52554,7 +53125,7 @@ ${err?.stack || ""}`);
           };
           const onListening = () => {
             cleanup();
-            resolve16();
+            resolve15();
           };
           this.localHttpServer.once("error", onError);
           this.localHttpServer.once("listening", onListening);
@@ -52714,12 +53285,12 @@ ${err?.stack || ""}`);
           this.localClients.clear();
           this.localWss?.close();
           this.localWss = null;
-          await new Promise((resolve16) => {
+          await new Promise((resolve15) => {
             if (!this.localHttpServer) {
-              resolve16();
+              resolve15();
               return;
             }
-            this.localHttpServer.close(() => resolve16());
+            this.localHttpServer.close(() => resolve15());
             this.localHttpServer = null;
           });
         } catch {
@@ -53267,14 +53838,14 @@ var require_run_async = __commonJS({
       return function() {
         var args = arguments;
         var originalThis = this;
-        var promise2 = new Promise(function(resolve16, reject) {
+        var promise2 = new Promise(function(resolve15, reject) {
           var resolved = false;
           const wrappedResolve = function(value) {
             if (resolved) {
               console.warn("Run-async promise already resolved.");
             }
             resolved = true;
-            resolve16(value);
+            resolve15(value);
           };
           var rejected = false;
           const wrappedReject = function(value) {
@@ -54065,7 +54636,7 @@ var require_Observable = __commonJS({
       Observable2.prototype.forEach = function(next, promiseCtor) {
         var _this = this;
         promiseCtor = getPromiseCtor(promiseCtor);
-        return new promiseCtor(function(resolve16, reject) {
+        return new promiseCtor(function(resolve15, reject) {
           var subscriber = new Subscriber_1.SafeSubscriber({
             next: function(value) {
               try {
@@ -54076,7 +54647,7 @@ var require_Observable = __commonJS({
               }
             },
             error: reject,
-            complete: resolve16
+            complete: resolve15
           });
           _this.subscribe(subscriber);
         });
@@ -54098,14 +54669,14 @@ var require_Observable = __commonJS({
       Observable2.prototype.toPromise = function(promiseCtor) {
         var _this = this;
         promiseCtor = getPromiseCtor(promiseCtor);
-        return new promiseCtor(function(resolve16, reject) {
+        return new promiseCtor(function(resolve15, reject) {
           var value;
           _this.subscribe(function(x) {
             return value = x;
           }, function(err) {
             return reject(err);
           }, function() {
-            return resolve16(value);
+            return resolve15(value);
           });
         });
       };
@@ -56201,11 +56772,11 @@ var require_innerFrom = __commonJS({
     "use strict";
     var __awaiter = exports2 && exports2.__awaiter || function(thisArg, _arguments, P, generator) {
       function adopt(value) {
-        return value instanceof P ? value : new P(function(resolve16) {
-          resolve16(value);
+        return value instanceof P ? value : new P(function(resolve15) {
+          resolve15(value);
         });
       }
-      return new (P || (P = Promise))(function(resolve16, reject) {
+      return new (P || (P = Promise))(function(resolve15, reject) {
         function fulfilled(value) {
           try {
             step(generator.next(value));
@@ -56221,7 +56792,7 @@ var require_innerFrom = __commonJS({
           }
         }
         function step(result) {
-          result.done ? resolve16(result.value) : adopt(result.value).then(fulfilled, rejected);
+          result.done ? resolve15(result.value) : adopt(result.value).then(fulfilled, rejected);
         }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
       });
@@ -56303,14 +56874,14 @@ var require_innerFrom = __commonJS({
       }, i);
       function verb(n) {
         i[n] = o[n] && function(v) {
-          return new Promise(function(resolve16, reject) {
-            v = o[n](v), settle(resolve16, reject, v.done, v.value);
+          return new Promise(function(resolve15, reject) {
+            v = o[n](v), settle(resolve15, reject, v.done, v.value);
           });
         };
       }
-      function settle(resolve16, reject, d, v) {
+      function settle(resolve15, reject, d, v) {
         Promise.resolve(v).then(function(v2) {
-          resolve16({ value: v2, done: d });
+          resolve15({ value: v2, done: d });
         }, reject);
       }
     };
@@ -56929,7 +57500,7 @@ var require_lastValueFrom = __commonJS({
     var EmptyError_1 = require_EmptyError();
     function lastValueFrom(source, config2) {
       var hasConfig = typeof config2 === "object";
-      return new Promise(function(resolve16, reject) {
+      return new Promise(function(resolve15, reject) {
         var _hasValue = false;
         var _value;
         source.subscribe({
@@ -56940,9 +57511,9 @@ var require_lastValueFrom = __commonJS({
           error: reject,
           complete: function() {
             if (_hasValue) {
-              resolve16(_value);
+              resolve15(_value);
             } else if (hasConfig) {
-              resolve16(config2.defaultValue);
+              resolve15(config2.defaultValue);
             } else {
               reject(new EmptyError_1.EmptyError());
             }
@@ -56964,16 +57535,16 @@ var require_firstValueFrom = __commonJS({
     var Subscriber_1 = require_Subscriber();
     function firstValueFrom(source, config2) {
       var hasConfig = typeof config2 === "object";
-      return new Promise(function(resolve16, reject) {
+      return new Promise(function(resolve15, reject) {
         var subscriber = new Subscriber_1.SafeSubscriber({
           next: function(value) {
-            resolve16(value);
+            resolve15(value);
             subscriber.unsubscribe();
           },
           error: reject,
           complete: function() {
             if (hasConfig) {
-              resolve16(config2.defaultValue);
+              resolve15(config2.defaultValue);
             } else {
               reject(new EmptyError_1.EmptyError());
             }
@@ -68779,14 +69350,14 @@ var require_async_iterator = __commonJS({
       };
     }
     function readAndResolve(iter) {
-      var resolve16 = iter[kLastResolve];
-      if (resolve16 !== null) {
+      var resolve15 = iter[kLastResolve];
+      if (resolve15 !== null) {
         var data = iter[kStream].read();
         if (data !== null) {
           iter[kLastPromise] = null;
           iter[kLastResolve] = null;
           iter[kLastReject] = null;
-          resolve16(createIterResult(data, false));
+          resolve15(createIterResult(data, false));
         }
       }
     }
@@ -68794,13 +69365,13 @@ var require_async_iterator = __commonJS({
       process.nextTick(readAndResolve, iter);
     }
     function wrapForNext(lastPromise, iter) {
-      return function(resolve16, reject) {
+      return function(resolve15, reject) {
         lastPromise.then(function() {
           if (iter[kEnded]) {
-            resolve16(createIterResult(void 0, true));
+            resolve15(createIterResult(void 0, true));
             return;
           }
-          iter[kHandlePromise](resolve16, reject);
+          iter[kHandlePromise](resolve15, reject);
         }, reject);
       };
     }
@@ -68820,12 +69391,12 @@ var require_async_iterator = __commonJS({
           return Promise.resolve(createIterResult(void 0, true));
         }
         if (this[kStream].destroyed) {
-          return new Promise(function(resolve16, reject) {
+          return new Promise(function(resolve15, reject) {
             process.nextTick(function() {
               if (_this[kError]) {
                 reject(_this[kError]);
               } else {
-                resolve16(createIterResult(void 0, true));
+                resolve15(createIterResult(void 0, true));
               }
             });
           });
@@ -68848,13 +69419,13 @@ var require_async_iterator = __commonJS({
       return this;
     }), _defineProperty(_Object$setPrototypeO, "return", function _return() {
       var _this2 = this;
-      return new Promise(function(resolve16, reject) {
+      return new Promise(function(resolve15, reject) {
         _this2[kStream].destroy(null, function(err) {
           if (err) {
             reject(err);
             return;
           }
-          resolve16(createIterResult(void 0, true));
+          resolve15(createIterResult(void 0, true));
         });
       });
     }), _Object$setPrototypeO), AsyncIteratorPrototype);
@@ -68876,15 +69447,15 @@ var require_async_iterator = __commonJS({
         value: stream._readableState.endEmitted,
         writable: true
       }), _defineProperty(_Object$create, kHandlePromise, {
-        value: function value(resolve16, reject) {
+        value: function value(resolve15, reject) {
           var data = iterator[kStream].read();
           if (data) {
             iterator[kLastPromise] = null;
             iterator[kLastResolve] = null;
             iterator[kLastReject] = null;
-            resolve16(createIterResult(data, false));
+            resolve15(createIterResult(data, false));
           } else {
-            iterator[kLastResolve] = resolve16;
+            iterator[kLastResolve] = resolve15;
             iterator[kLastReject] = reject;
           }
         },
@@ -68903,12 +69474,12 @@ var require_async_iterator = __commonJS({
           iterator[kError] = err;
           return;
         }
-        var resolve16 = iterator[kLastResolve];
-        if (resolve16 !== null) {
+        var resolve15 = iterator[kLastResolve];
+        if (resolve15 !== null) {
           iterator[kLastPromise] = null;
           iterator[kLastResolve] = null;
           iterator[kLastReject] = null;
-          resolve16(createIterResult(void 0, true));
+          resolve15(createIterResult(void 0, true));
         }
         iterator[kEnded] = true;
       });
@@ -68923,7 +69494,7 @@ var require_async_iterator = __commonJS({
 var require_from2 = __commonJS({
   "../../node_modules/readable-stream/lib/internal/streams/from.js"(exports2, module2) {
     "use strict";
-    function asyncGeneratorStep(gen, resolve16, reject, _next, _throw, key, arg) {
+    function asyncGeneratorStep(gen, resolve15, reject, _next, _throw, key, arg) {
       try {
         var info = gen[key](arg);
         var value = info.value;
@@ -68932,7 +69503,7 @@ var require_from2 = __commonJS({
         return;
       }
       if (info.done) {
-        resolve16(value);
+        resolve15(value);
       } else {
         Promise.resolve(value).then(_next, _throw);
       }
@@ -68940,13 +69511,13 @@ var require_from2 = __commonJS({
     function _asyncToGenerator(fn) {
       return function() {
         var self2 = this, args = arguments;
-        return new Promise(function(resolve16, reject) {
+        return new Promise(function(resolve15, reject) {
           var gen = fn.apply(self2, args);
           function _next(value) {
-            asyncGeneratorStep(gen, resolve16, reject, _next, _throw, "next", value);
+            asyncGeneratorStep(gen, resolve15, reject, _next, _throw, "next", value);
           }
           function _throw(err) {
-            asyncGeneratorStep(gen, resolve16, reject, _next, _throw, "throw", err);
+            asyncGeneratorStep(gen, resolve15, reject, _next, _throw, "throw", err);
           }
           _next(void 0);
         });
@@ -70885,9 +71456,9 @@ var init_base = __esm({
        * @return {Promise}
        */
       run() {
-        return new Promise((resolve16, reject) => {
+        return new Promise((resolve15, reject) => {
           this._run(
-            (value) => resolve16(value),
+            (value) => resolve15(value),
             (error48) => reject(error48)
           );
         });
@@ -77519,7 +78090,7 @@ var require_lib2 = __commonJS({
       return matches;
     };
     exports2.analyse = analyse;
-    var detectFile = (filepath, opts = {}) => new Promise((resolve16, reject) => {
+    var detectFile = (filepath, opts = {}) => new Promise((resolve15, reject) => {
       let fd;
       const fs24 = (0, node_1.default)();
       const handler = (err, buffer) => {
@@ -77529,7 +78100,7 @@ var require_lib2 = __commonJS({
         if (err) {
           reject(err);
         } else if (buffer) {
-          resolve16((0, exports2.detect)(buffer));
+          resolve15((0, exports2.detect)(buffer));
         } else {
           reject(new Error("No error and no buffer received"));
         }
@@ -83714,14 +84285,14 @@ var baseOpen = async (options) => {
   }
   const subprocess = import_node_child_process5.default.spawn(command, cliArguments, childProcessOptions);
   if (options.wait) {
-    return new Promise((resolve16, reject) => {
+    return new Promise((resolve15, reject) => {
       subprocess.once("error", reject);
       subprocess.once("close", (exitCode) => {
         if (!options.allowNonzeroExitCode && exitCode > 0) {
           reject(new Error(`Exited with code ${exitCode}`));
           return;
         }
-        resolve16(subprocess);
+        resolve15(subprocess);
       });
     });
   }