@adhdev/daemon-standalone 0.8.57 → 0.8.59

package/dist/index.js

@@ -27874,9 +27874,16 @@ var require_dist2 = __commonJS({
       loadConfig: () => loadConfig2,
       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 isPlainObject2(value) {
       return !!value && typeof value === "object" && !Array.isArray(value);
     }
@@ -27914,7 +27921,7 @@ var require_dist2 = __commonJS({
         registeredMachineId: asOptionalString(parsed.registeredMachineId),
         providerSettings: isPlainObject2(parsed.providerSettings) ? parsed.providerSettings : {},
         ideSettings: isPlainObject2(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"
       };
@@ -28068,7 +28075,7 @@ var require_dist2 = __commonJS({
           registeredMachineId: void 0,
           providerSettings: {},
           ideSettings: {},
-          disableUpstream: false,
+          providerSourceMode: "normal",
           terminalSizingMode: "measured"
         };
         MACHINE_ID_PREFIX = "mach_";
@@ -29747,7 +29754,7 @@ var require_dist2 = __commonJS({
                   `[${this.cliType}] Waiting for interactive prompt: hasPrompt=${hasPrompt} stableMs=${stableMs} recentOutputMs=${recentlyOutput} status=${status} startup=${startupLikelyActive} screen=${JSON.stringify(summarizeCliTraceText(screenText, 220)).slice(0, 260)}`
                 );
               }
-              await new Promise((resolve12) => setTimeout(resolve12, 50));
+              await new Promise((resolve11) => setTimeout(resolve11, 50));
             }
             const finalScreenText = this.terminalScreen.getText() || "";
             LOG2.warn(
@@ -30320,7 +30327,7 @@ ${data.message || ""}`.trim();
               const deadline = Date.now() + 1e4;
               while (this.startupParseGate && Date.now() < deadline) {
                 this.resolveStartupState("send_wait");
-                await new Promise((resolve12) => setTimeout(resolve12, 50));
+                await new Promise((resolve11) => setTimeout(resolve11, 50));
               }
             }
             await this.waitForInteractivePrompt();
@@ -30390,12 +30397,12 @@ ${data.message || ""}`.trim();
                 if (this.isWaitingForResponse) this.finishResponse();
               }, this.timeouts.maxResponse);
             };
-            await new Promise((resolve12) => {
+            await new Promise((resolve11) => {
               let resolved = false;
               const resolveOnce = () => {
                 if (resolved) return;
                 resolved = true;
-                resolve12();
+                resolve11();
               };
               const submit = () => {
                 if (!this.ptyProcess) {
@@ -30569,17 +30576,17 @@ ${data.message || ""}`.trim();
             }
           }
           waitForStopped(timeoutMs) {
-            return new Promise((resolve12) => {
+            return new Promise((resolve11) => {
               const startedAt = Date.now();
               const timer = setInterval(() => {
                 if (!this.ptyProcess || this.currentStatus === "stopped") {
                   clearInterval(timer);
-                  resolve12(true);
+                  resolve11(true);
                   return;
                 }
                 if (Date.now() - startedAt >= timeoutMs) {
                   clearInterval(timer);
-                  resolve12(false);
+                  resolve11(false);
                 }
               }, 100);
             });
@@ -30932,6 +30939,7 @@ ${data.message || ""}`.trim();
       normalizeInputEnvelope: () => normalizeInputEnvelope,
       normalizeManagedStatus: () => normalizeManagedStatus,
       normalizeMessageParts: () => normalizeMessageParts,
+      parseProviderSourceConfigUpdate: () => parseProviderSourceConfigUpdate,
       partitionSessionHostDiagnosticsSessions: () => partitionSessionHostDiagnosticsSessions,
       partitionSessionHostRecords: () => partitionSessionHostRecords,
       probeCdpPort: () => probeCdpPort,
@@ -31123,6 +31131,66 @@ ${data.message || ""}`.trim();
       return { config: { ...config2, defaultWorkspaceId: id } };
     }
     var path22 = __toESM2(require("path"));
+    function normalizeSummaryItem(item) {
+      if (!item || typeof item !== "object") return null;
+      const id = String(item.id || "").trim();
+      const value = String(item.value || "").trim();
+      if (!id || !value) return null;
+      const normalized = {
+        id,
+        value
+      };
+      if (typeof item.label === "string" && item.label.trim()) normalized.label = item.label.trim();
+      if (typeof item.shortValue === "string" && item.shortValue.trim()) normalized.shortValue = item.shortValue.trim();
+      if (typeof item.icon === "string" && item.icon.trim()) normalized.icon = item.icon.trim();
+      if (typeof item.order === "number" && Number.isFinite(item.order)) normalized.order = item.order;
+      return normalized;
+    }
+    function normalizeProviderSummaryMetadata(summary) {
+      if (!summary || !Array.isArray(summary.items)) return void 0;
+      const items = summary.items.map((item) => normalizeSummaryItem(item)).filter((item) => !!item).sort((left, right) => {
+        const orderDiff = (left.order ?? Number.MAX_SAFE_INTEGER) - (right.order ?? Number.MAX_SAFE_INTEGER);
+        if (orderDiff !== 0) return orderDiff;
+        return left.id.localeCompare(right.id);
+      });
+      return items.length > 0 ? { items } : void 0;
+    }
+    function buildProviderSummaryMetadata(items) {
+      return normalizeProviderSummaryMetadata({ items: items.filter(Boolean) });
+    }
+    function buildLegacyModelModeSummaryMetadata(params) {
+      return buildProviderSummaryMetadata([
+        params.model ? {
+          id: "model",
+          label: "Model",
+          value: String(params.modelLabel || params.model).trim(),
+          shortValue: String(params.model).trim(),
+          order: 10
+        } : null,
+        params.mode ? {
+          id: "mode",
+          label: "Mode",
+          value: String(params.modeLabel || params.mode).trim(),
+          shortValue: String(params.mode).trim(),
+          order: 20
+        } : null
+      ]);
+    }
+    function resolveProviderStateSummaryMetadata(params) {
+      const explicit = normalizeProviderSummaryMetadata(params.summaryMetadata);
+      if (explicit) return explicit;
+      const model = typeof params.controlValues?.model === "string" ? params.controlValues.model : void 0;
+      const mode = typeof params.controlValues?.mode === "string" ? params.controlValues.mode : void 0;
+      return buildLegacyModelModeSummaryMetadata({
+        model,
+        mode,
+        modelLabel: params.modelLabel,
+        modeLabel: params.modeLabel
+      });
+    }
+    function normalizePersistedSummaryMetadata(params) {
+      return normalizeProviderSummaryMetadata(params.summaryMetadata);
+    }
     var MAX_ACTIVITY = 30;
     function normalizeWorkspace(workspace) {
       if (!workspace) return "";
@@ -31146,6 +31214,9 @@ ${data.message || ""}`.trim();
       const nextEntry = {
         ...entry,
         workspace: entry.workspace ? normalizeWorkspace(entry.workspace) : void 0,
+        summaryMetadata: normalizePersistedSummaryMetadata({
+          summaryMetadata: entry.summaryMetadata
+        }),
         id: buildRecentActivityKeyForEntry(entry),
         lastUsedAt: entry.lastUsedAt || Date.now()
       };
@@ -31156,7 +31227,12 @@ ${data.message || ""}`.trim();
       };
     }
     function getRecentActivity(state, limit = 20) {
-      return [...state.recentActivity || []].sort((a, b2) => b2.lastUsedAt - a.lastUsedAt).slice(0, limit);
+      return [...state.recentActivity || []].map((entry) => ({
+        ...entry,
+        summaryMetadata: normalizePersistedSummaryMetadata({
+          summaryMetadata: entry.summaryMetadata
+        })
+      })).sort((a, b2) => b2.lastUsedAt - a.lastUsedAt).slice(0, limit);
     }
     function getSessionSeenAt(state, sessionId) {
       return state.sessionReads?.[sessionId] || 0;
@@ -31206,7 +31282,9 @@ ${data.message || ""}`.trim();
         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()
@@ -31222,7 +31300,12 @@ ${data.message || ""}`.trim();
         if (filters?.providerType && entry.providerType !== filters.providerType) return false;
         if (filters?.kind && entry.kind !== filters.kind) return false;
         return true;
-      }).sort((a, b2) => b2.lastUsedAt - a.lastUsedAt);
+      }).map((entry) => ({
+        ...entry,
+        summaryMetadata: normalizePersistedSummaryMetadata({
+          summaryMetadata: entry.summaryMetadata
+        })
+      })).sort((a, b2) => b2.lastUsedAt - a.lastUsedAt);
     }
     var import_fs2 = require("fs");
     var import_path22 = require("path");
@@ -31412,15 +31495,15 @@ ${data.message || ""}`.trim();
       return null;
     }
     function execAsync(cmd, timeoutMs = 5e3) {
-      return new Promise((resolve12) => {
+      return new Promise((resolve11) => {
         const child = (0, import_child_process22.exec)(cmd, { encoding: "utf-8", timeout: timeoutMs }, (err, stdout) => {
           if (err || !stdout?.trim()) {
-            resolve12(null);
+            resolve11(null);
           } else {
-            resolve12(stdout.trim());
+            resolve11(stdout.trim());
           }
         });
-        child.on("error", () => resolve12(null));
+        child.on("error", () => resolve11(null));
       });
     }
     async function detectCLIs(providerLoader, options) {
@@ -31627,7 +31710,7 @@ ${data.message || ""}`.trim();
       * Returns multiple entries if multiple IDE windows are open on same port
       */
       static listAllTargets(port) {
-        return new Promise((resolve12) => {
+        return new Promise((resolve11) => {
           const req = http.get(`http://127.0.0.1:${port}/json`, (res) => {
             let data = "";
             res.on("data", (chunk) => data += chunk.toString());
@@ -31643,16 +31726,16 @@ ${data.message || ""}`.trim();
                   (t) => !isNonMain(t.title || "") && t.url?.includes("workbench.html") && !t.url?.includes("agent")
                 );
                 const fallbackPages = pages.filter((t) => !isNonMain(t.title || ""));
-                resolve12(mainPages.length > 0 ? mainPages : fallbackPages);
+                resolve11(mainPages.length > 0 ? mainPages : fallbackPages);
               } catch {
-                resolve12([]);
+                resolve11([]);
               }
             });
           });
-          req.on("error", () => resolve12([]));
+          req.on("error", () => resolve11([]));
           req.setTimeout(2e3, () => {
             req.destroy();
-            resolve12([]);
+            resolve11([]);
           });
         });
       }
@@ -31692,7 +31775,7 @@ ${data.message || ""}`.trim();
         }
       }
       findTargetOnPort(port) {
-        return new Promise((resolve12) => {
+        return new Promise((resolve11) => {
           const req = http.get(`http://127.0.0.1:${port}/json`, (res) => {
             let data = "";
             res.on("data", (chunk) => data += chunk.toString());
@@ -31703,7 +31786,7 @@ ${data.message || ""}`.trim();
                   (t) => (t.type === "page" || t.type === "browser" || t.type === "Page") && t.webSocketDebuggerUrl
                 );
                 if (pages.length === 0) {
-                  resolve12(targets.find((t) => t.webSocketDebuggerUrl) || null);
+                  resolve11(targets.find((t) => t.webSocketDebuggerUrl) || null);
                   return;
                 }
                 const mainPages = pages.filter((t) => !this.isNonMainTitle(t.title || ""));
@@ -31713,24 +31796,24 @@ ${data.message || ""}`.trim();
                   const specific = list.find((t) => t.id === this._targetId);
                   if (specific) {
                     this._pageTitle = specific.title || "";
-                    resolve12(specific);
+                    resolve11(specific);
                   } else {
                     this.log(`[CDP] Target ${this._targetId} not found in page list`);
-                    resolve12(null);
+                    resolve11(null);
                   }
                   return;
                 }
                 this._pageTitle = list[0]?.title || "";
-                resolve12(list[0]);
+                resolve11(list[0]);
               } catch {
-                resolve12(null);
+                resolve11(null);
               }
             });
           });
-          req.on("error", () => resolve12(null));
+          req.on("error", () => resolve11(null));
           req.setTimeout(2e3, () => {
             req.destroy();
-            resolve12(null);
+            resolve11(null);
           });
         });
       }
@@ -31741,7 +31824,7 @@ ${data.message || ""}`.trim();
         this.extensionProviders = providers;
       }
       connectToTarget(wsUrl) {
-        return new Promise((resolve12) => {
+        return new Promise((resolve11) => {
           this.ws = new import_ws2.default(wsUrl);
           this.ws.on("open", async () => {
             this._connected = true;
@@ -31751,17 +31834,17 @@ ${data.message || ""}`.trim();
             }
             this.connectBrowserWs().catch(() => {
             });
-            resolve12(true);
+            resolve11(true);
           });
           this.ws.on("message", (data) => {
             try {
               const msg = JSON.parse(data.toString());
               if (msg.id && this.pending.has(msg.id)) {
-                const { resolve: resolve13, reject } = this.pending.get(msg.id);
+                const { resolve: resolve12, reject } = this.pending.get(msg.id);
                 this.pending.delete(msg.id);
                 this.failureCount = 0;
                 if (msg.error) reject(new Error(msg.error.message));
-                else resolve13(msg.result);
+                else resolve12(msg.result);
               } else if (msg.method === "Runtime.executionContextCreated") {
                 this.contexts.add(msg.params.context.id);
               } else if (msg.method === "Runtime.executionContextDestroyed") {
@@ -31784,7 +31867,7 @@ ${data.message || ""}`.trim();
           this.ws.on("error", (err) => {
             this.log(`[CDP] WebSocket error: ${err.message}`);
             this._connected = false;
-            resolve12(false);
+            resolve11(false);
           });
         });
       }
@@ -31798,7 +31881,7 @@ ${data.message || ""}`.trim();
             return;
           }
           this.log(`[CDP] Connecting browser WS for target discovery...`);
-          await new Promise((resolve12, reject) => {
+          await new Promise((resolve11, reject) => {
             this.browserWs = new import_ws2.default(browserWsUrl);
             this.browserWs.on("open", async () => {
               this._browserConnected = true;
@@ -31808,16 +31891,16 @@ ${data.message || ""}`.trim();
               } catch (e) {
                 this.log(`[CDP] setDiscoverTargets failed: ${e.message}`);
               }
-              resolve12();
+              resolve11();
             });
             this.browserWs.on("message", (data) => {
               try {
                 const msg = JSON.parse(data.toString());
                 if (msg.id && this.browserPending.has(msg.id)) {
-                  const { resolve: resolve13, reject: reject2 } = this.browserPending.get(msg.id);
+                  const { resolve: resolve12, reject: reject2 } = this.browserPending.get(msg.id);
                   this.browserPending.delete(msg.id);
                   if (msg.error) reject2(new Error(msg.error.message));
-                  else resolve13(msg.result);
+                  else resolve12(msg.result);
                 }
               } catch {
               }
@@ -31837,31 +31920,31 @@ ${data.message || ""}`.trim();
         }
       }
       getBrowserWsUrl() {
-        return new Promise((resolve12) => {
+        return new Promise((resolve11) => {
           const req = http.get(`http://127.0.0.1:${this.port}/json/version`, (res) => {
             let data = "";
             res.on("data", (chunk) => data += chunk.toString());
             res.on("end", () => {
               try {
                 const info = JSON.parse(data);
-                resolve12(info.webSocketDebuggerUrl || null);
+                resolve11(info.webSocketDebuggerUrl || null);
               } catch {
-                resolve12(null);
+                resolve11(null);
               }
             });
           });
-          req.on("error", () => resolve12(null));
+          req.on("error", () => resolve11(null));
           req.setTimeout(3e3, () => {
             req.destroy();
-            resolve12(null);
+            resolve11(null);
           });
         });
       }
       sendBrowser(method, params = {}, timeoutMs = 15e3) {
-        return new Promise((resolve12, reject) => {
+        return new Promise((resolve11, reject) => {
           if (!this.browserWs || !this._browserConnected) return reject(new Error("Browser WS not connected"));
           const id = this.browserMsgId++;
-          this.browserPending.set(id, { resolve: resolve12, reject });
+          this.browserPending.set(id, { resolve: resolve11, reject });
           this.browserWs.send(JSON.stringify({ id, method, params }));
           setTimeout(() => {
             if (this.browserPending.has(id)) {
@@ -31901,11 +31984,11 @@ ${data.message || ""}`.trim();
       }
       // ─── CDP Protocol ────────────────────────────────────────
       sendInternal(method, params = {}, timeoutMs = 15e3) {
-        return new Promise((resolve12, reject) => {
+        return new Promise((resolve11, reject) => {
           if (!this.ws || !this._connected) return reject(new Error("CDP not connected"));
           if (this.ws.readyState !== import_ws2.default.OPEN) return reject(new Error("WebSocket not open"));
           const id = this.msgId++;
-          this.pending.set(id, { resolve: resolve12, reject });
+          this.pending.set(id, { resolve: resolve11, reject });
           this.ws.send(JSON.stringify({ id, method, params }));
           setTimeout(() => {
             if (this.pending.has(id)) {
@@ -32154,7 +32237,7 @@ ${data.message || ""}`.trim();
         const browserWs = this.browserWs;
         let msgId = this.browserMsgId;
         const sendWs = (method, params = {}, sessionId) => {
-          return new Promise((resolve12, reject) => {
+          return new Promise((resolve11, reject) => {
             const mid = msgId++;
             this.browserMsgId = msgId;
             const handler = (raw) => {
@@ -32163,7 +32246,7 @@ ${data.message || ""}`.trim();
                 if (msg.id === mid) {
                   browserWs.removeListener("message", handler);
                   if (msg.error) reject(new Error(msg.error.message || JSON.stringify(msg.error)));
-                  else resolve12(msg.result);
+                  else resolve11(msg.result);
                 }
               } catch {
               }
@@ -32364,14 +32447,14 @@ ${data.message || ""}`.trim();
         if (!ws2 || ws2.readyState !== import_ws2.default.OPEN) {
           throw new Error("CDP not connected");
         }
-        return new Promise((resolve12, reject) => {
+        return new Promise((resolve11, reject) => {
           const id = getNextId();
           pendingMap.set(id, {
             resolve: (result) => {
               if (result?.result?.subtype === "error") {
                 reject(new Error(result.result.description));
               } else {
-                resolve12(result?.result?.value);
+                resolve11(result?.result?.value);
               }
             },
             reject
@@ -32403,10 +32486,10 @@ ${data.message || ""}`.trim();
           throw new Error("CDP not connected");
         }
         const sendViaSession = (method, params = {}) => {
-          return new Promise((resolve12, reject) => {
+          return new Promise((resolve11, reject) => {
             const pendingMap = this._browserConnected ? this.browserPending : this.pending;
             const id = this._browserConnected ? this.browserMsgId++ : this.msgId++;
-            pendingMap.set(id, { resolve: resolve12, reject });
+            pendingMap.set(id, { resolve: resolve11, reject });
             ws2.send(JSON.stringify({ id, sessionId, method, params }));
             setTimeout(() => {
               if (pendingMap.has(id)) {
@@ -32961,8 +33044,6 @@ ${data.message || ""}`.trim();
         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) {
@@ -33064,7 +33145,7 @@ ${data.message || ""}`.trim();
       }
       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 };
@@ -33306,6 +33387,30 @@ ${data.message || ""}`.trim();
           options.historySessionId
         );
       }
+      writeSessionStart(agentType, historySessionId, workspace, instanceId) {
+        const id = String(historySessionId || "").trim();
+        const ws2 = String(workspace || "").trim();
+        if (!id || !ws2) return;
+        try {
+          const dir = path7.join(HISTORY_DIR, this.sanitize(agentType));
+          fs32.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: ws2,
+            agent: agentType,
+            instanceId,
+            historySessionId: id,
+            workspace: ws2
+          };
+          fs32.appendFileSync(filePath, JSON.stringify(record2) + "\n", "utf-8");
+        } catch {
+        }
+      }
       promoteHistorySession(agentType, previousHistorySessionId, nextHistorySessionId) {
         const fromId = String(previousHistorySessionId || "").trim();
         const toId = String(nextHistorySessionId || "").trim();
@@ -33525,6 +33630,7 @@ ${data.message || ""}`.trim();
           let lastMessageAt = 0;
           let sessionTitle = "";
           let preview = "";
+          let workspace = "";
           for (const file2 of files.sort()) {
             const filePath = path7.join(dir, file2);
             const content = fs32.readFileSync(filePath, "utf-8");
@@ -33537,6 +33643,10 @@ ${data.message || ""}`.trim();
                 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;
@@ -33551,7 +33661,8 @@ ${data.message || ""}`.trim();
             messageCount,
             firstMessageAt,
             lastMessageAt,
-            preview: preview || void 0
+            preview: preview || void 0,
+            workspace: workspace || void 0
           });
         }
         summaries.sort((a, b2) => b2.lastMessageAt - a.lastMessageAt);
@@ -33566,6 +33677,59 @@ ${data.message || ""}`.trim();
         return { sessions: [], hasMore: false };
       }
     }
+    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 ExtensionProviderInstance = class {
       type;
       category = "extension";
@@ -33579,9 +33743,8 @@ ${data.message || ""}`.trim();
       messages = [];
       prevMessageHashes = /* @__PURE__ */ new Map();
       activeModal = null;
-      currentModel = "";
-      currentMode = "";
       controlValues = {};
+      summaryMetadata = void 0;
       appliedEffectKeys = /* @__PURE__ */ new Set();
       runtimeMessages = [];
       lastAgentStatus = "idle";
@@ -33616,6 +33779,10 @@ ${data.message || ""}`.trim();
         if (!this.context?.cdp?.isConnected) return;
       }
       getState() {
+        const surface = resolveProviderStateSurface({
+          summaryMetadata: this.summaryMetadata,
+          controlValues: this.controlValues
+        });
         return {
           type: this.type,
           name: this.provider.name,
@@ -33629,10 +33796,9 @@ ${data.message || ""}`.trim();
             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(),
@@ -33645,10 +33811,14 @@ ${data.message || ""}`.trim();
           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;
@@ -33749,8 +33919,14 @@ ${data.message || ""}`.trim();
       }
       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";
@@ -33900,8 +34076,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;
@@ -34031,6 +34205,10 @@ ${effect.notification.body || ""}`.trim();
         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,
@@ -34047,11 +34225,9 @@ ${effect.notification.body || ""}`.trim();
           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,
@@ -34223,8 +34399,13 @@ ${effect.notification.body || ""}`.trim();
               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;
@@ -34311,14 +34492,18 @@ ${effect.notification.body || ""}`.trim();
       }
       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";
@@ -35091,6 +35276,8 @@ ${effect.notification.body || ""}`.trim();
     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;
@@ -35107,13 +35294,11 @@ ${effect.notification.body || ""}`.trim();
         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,
@@ -35124,6 +35309,8 @@ ${effect.notification.body || ""}`.trim();
     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 {
@@ -35139,11 +35326,10 @@ ${effect.notification.body || ""}`.trim();
         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,
@@ -35154,6 +35340,8 @@ ${effect.notification.body || ""}`.trim();
     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);
@@ -35180,11 +35368,12 @@ ${effect.notification.body || ""}`.trim();
         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,
@@ -35195,6 +35384,8 @@ ${effect.notification.body || ""}`.trim();
     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 {
@@ -35210,13 +35401,10 @@ ${effect.notification.body || ""}`.trim();
         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,
@@ -35892,7 +36080,7 @@ ${effect.notification.body || ""}`.trim();
     async function getStableExtensionBaseline(h) {
       const first = await readExtensionChatState(h);
       if (getStateMessageCount(first) > 0 || getStateLastSignature(first)) return first;
-      await new Promise((resolve12) => setTimeout(resolve12, 150));
+      await new Promise((resolve11) => setTimeout(resolve11, 150));
       const second = await readExtensionChatState(h);
       return getStateMessageCount(second) >= getStateMessageCount(first) ? second : first;
     }
@@ -35900,7 +36088,7 @@ ${effect.notification.body || ""}`.trim();
       const beforeCount = getStateMessageCount(before);
       const beforeSignature = getStateLastSignature(before);
       for (let attempt = 0; attempt < 12; attempt += 1) {
-        await new Promise((resolve12) => setTimeout(resolve12, 250));
+        await new Promise((resolve11) => setTimeout(resolve11, 250));
         const state = await readExtensionChatState(h);
         if (state?.status === "waiting_approval") return true;
         const afterCount = getStateMessageCount(state);
@@ -37089,6 +37277,26 @@ ${effect.notification.body || ""}`.trim();
         return { success: false, error: e.message };
       }
     }
+    init_config();
+    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 };
+    }
     function parseCliScriptResult(result) {
       if (typeof result === "string") {
         try {
@@ -37198,8 +37406,49 @@ ${effect.notification.body || ""}`.trim();
       }
       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 = loadConfig2();
+      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?.();
+      LOG2.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];
@@ -37245,7 +37494,7 @@ ${effect.notification.body || ""}`.trim();
       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) {
@@ -37887,6 +38136,10 @@ ${effect.notification.body || ""}`.trim();
             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);
@@ -37926,7 +38179,7 @@ ${effect.notification.body || ""}`.trim();
         try {
           const http3 = await import("http");
           const postData = JSON.stringify(body);
-          const result = await new Promise((resolve12, reject) => {
+          const result = await new Promise((resolve11, reject) => {
             const req = http3.request({
               hostname: "127.0.0.1",
               port: 19280,
@@ -37938,9 +38191,9 @@ ${effect.notification.body || ""}`.trim();
               res.on("data", (chunk) => data += chunk);
               res.on("end", () => {
                 try {
-                  resolve12(JSON.parse(data));
+                  resolve11(JSON.parse(data));
                 } catch {
-                  resolve12({ raw: data });
+                  resolve11({ raw: data });
                 }
               });
             });
@@ -37958,15 +38211,15 @@ ${effect.notification.body || ""}`.trim();
         if (!providerType) return { success: false, error: "providerType required" };
         try {
           const http3 = await import("http");
-          const result = await new Promise((resolve12, reject) => {
+          const result = await new Promise((resolve11, reject) => {
             http3.get(`http://127.0.0.1:19280/api/providers/${providerType}/${endpoint}`, (res) => {
               let data = "";
               res.on("data", (chunk) => data += chunk);
               res.on("end", () => {
                 try {
-                  resolve12(JSON.parse(data));
+                  resolve11(JSON.parse(data));
                 } catch {
-                  resolve12({ raw: data });
+                  resolve11({ raw: data });
                 }
               });
             }).on("error", reject);
@@ -37980,7 +38233,7 @@ ${effect.notification.body || ""}`.trim();
         try {
           const http3 = await import("http");
           const postData = JSON.stringify(args || {});
-          const result = await new Promise((resolve12, reject) => {
+          const result = await new Promise((resolve11, reject) => {
             const req = http3.request({
               hostname: "127.0.0.1",
               port: 19280,
@@ -37992,9 +38245,9 @@ ${effect.notification.body || ""}`.trim();
               res.on("data", (chunk) => data += chunk);
               res.on("end", () => {
                 try {
-                  resolve12(JSON.parse(data));
+                  resolve11(JSON.parse(data));
                 } catch {
-                  resolve12({ raw: data });
+                  resolve11({ raw: data });
                 }
               });
             });
@@ -38040,6 +38293,9 @@ ${effect.notification.body || ""}`.trim();
       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() : "";
@@ -38049,6 +38305,20 @@ ${effect.notification.body || ""}`.trim();
       }
       return null;
     }
+    async function waitForCliAdapterReady(adapter, options) {
+      const timeoutMs = Math.max(100, options?.timeoutMs ?? 15e3);
+      const pollMs = Math.max(10, options?.pollMs ?? 50);
+      const deadline = Date.now() + timeoutMs;
+      while (Date.now() < deadline) {
+        if (adapter?.isReady?.()) return;
+        const status = adapter?.getStatus?.()?.status;
+        if (status === "stopped") {
+          throw new Error("CLI runtime stopped before it became ready");
+        }
+        await new Promise((resolve11) => setTimeout(resolve11, pollMs));
+      }
+      throw new Error(`CLI runtime did not become ready within ${timeoutMs}ms`);
+    }
     var CliProviderInstance = class {
       constructor(provider, workingDir, cliArgs = [], instanceId, transportFactory, options) {
         this.provider = provider;
@@ -38077,6 +38347,7 @@ ${effect.notification.body || ""}`.trim();
       generatingDebouncePending = null;
       lastApprovalEventAt = 0;
       controlValues = {};
+      summaryMetadata = void 0;
       appliedEffectKeys = /* @__PURE__ */ new Set();
       historyWriter;
       runtimeMessages = [];
@@ -38219,13 +38490,7 @@ ${effect.notification.body || ""}`.trim();
         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";
@@ -38247,6 +38512,10 @@ ${effect.notification.body || ""}`.trim();
           }
         }
         this.applyProviderResponse(parsedStatus, { phase: "immediate" });
+        const surface = resolveProviderStateSurface({
+          summaryMetadata: this.summaryMetadata,
+          controlValues: this.controlValues
+        });
         return {
           type: this.type,
           name: this.provider.name,
@@ -38262,8 +38531,6 @@ ${effect.notification.body || ""}`.trim();
             inputContent: ""
           },
           workspace: this.workingDir,
-          currentModel,
-          currentPlan,
           instanceId: this.instanceId,
           providerSessionId: this.providerSessionId,
           lastUpdated: Date.now(),
@@ -38278,8 +38545,9 @@ ${effect.notification.body || ""}`.trim();
             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) {
@@ -38327,6 +38595,7 @@ ${effect.notification.body || ""}`.trim();
         const scriptName = getForcedNewSessionScriptName(this.provider, this.launchMode);
         if (!scriptName) return;
         LOG2.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) {
@@ -38482,10 +38751,14 @@ ${effect.notification.body || ""}`.trim();
           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";
@@ -38676,6 +38949,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,
@@ -38848,8 +39122,7 @@ ${effect.notification.body || ""}`.trim();
       lastStatus = "starting";
       generatingStartedAt = 0;
       agentCapabilities = {};
-      currentModel;
-      currentMode;
+      currentSelections = {};
       activeToolCalls = [];
       stopReason = null;
       partialContent = "";
@@ -38929,8 +39202,6 @@ ${effect.notification.body || ""}`.trim();
             inputContent: ""
           },
           workspace: this.workingDir,
-          currentModel: this.currentModel,
-          currentPlan: this.currentMode,
           instanceId: this.instanceId,
           lastUpdated: Date.now(),
           settings: this.settings,
@@ -38941,11 +39212,9 @@ ${effect.notification.body || ""}`.trim();
           // 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) {
@@ -38979,6 +39248,54 @@ ${effect.notification.body || ""}`.trim();
       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;
@@ -39010,12 +39327,14 @@ ${effect.notification.body || ""}`.trim();
             }
           }
           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,
@@ -39034,8 +39353,7 @@ ${effect.notification.body || ""}`.trim();
         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;
@@ -39053,7 +39371,7 @@ ${effect.notification.body || ""}`.trim();
             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) {
@@ -39069,7 +39387,7 @@ ${effect.notification.body || ""}`.trim();
             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;
@@ -39084,7 +39402,7 @@ ${effect.notification.body || ""}`.trim();
             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";
@@ -39255,13 +39573,13 @@ ${effect.notification.body || ""}`.trim();
             }
             this.currentStatus = "waiting_approval";
             this.detectStatusTransition();
-            const approved = await new Promise((resolve12) => {
-              this.permissionResolvers.push(resolve12);
+            const approved = await new Promise((resolve11) => {
+              this.permissionResolvers.push(resolve11);
               setTimeout(() => {
-                const idx = this.permissionResolvers.indexOf(resolve12);
+                const idx = this.permissionResolvers.indexOf(resolve11);
                 if (idx >= 0) {
                   this.permissionResolvers.splice(idx, 1);
-                  resolve12(false);
+                  resolve11(false);
                 }
               }, 3e5);
             });
@@ -39342,8 +39660,8 @@ ${effect.notification.body || ""}`.trim();
           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;
@@ -39357,13 +39675,16 @@ ${effect.notification.body || ""}`.trim();
               });
               if (defaultVal) {
                 this.selectedConfig[sc2.configId] = defaultVal;
-                if (sc2.category === "model") this.currentModel = defaultVal;
-                if (sc2.category === "mode") this.currentMode = defaultVal;
+                if (sc2.category === "model" || sc2.category === "mode") {
+                  this.setCurrentSelection(sc2.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(", ")}`);
           }
@@ -39538,7 +39859,7 @@ ${effect.notification.body || ""}`.trim();
             break;
           }
           case "current_mode_update": {
-            this.currentMode = update.currentModeId;
+            this.setCurrentSelection("mode", update.currentModeId);
             break;
           }
           case "config_option_update": {
@@ -39611,7 +39932,7 @@ ${effect.notification.body || ""}`.trim();
           this.detectStatusTransition();
         }
         if (params.model) {
-          this.currentModel = params.model;
+          this.setCurrentSelection("model", params.model);
         }
       }
       /** Map SDK ToolCallStatus to internal status */
@@ -39894,7 +40215,11 @@ ${effect.notification.body || ""}`.trim();
       }
       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,
@@ -39902,7 +40227,7 @@ ${effect.notification.body || ""}`.trim();
               providerName: entry.providerName,
               providerSessionId: entry.providerSessionId,
               workspace: entry.workspace,
-              currentModel: entry.currentModel,
+              summaryMetadata,
               title: entry.title
             });
           }
@@ -40092,7 +40417,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
           });
@@ -40194,7 +40519,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
         });
@@ -40565,6 +40890,9 @@ Run 'adhdev doctor' for detailed diagnostics.`
           warnings.push(`Unknown provider field: ${key}`);
         }
       }
+      if (provider.disableUpstream !== void 0) {
+        warnings.push("disableUpstream is deprecated in provider definitions; use machine-level provider source policy instead");
+      }
       const category = provider.category;
       if (category === "cli" || category === "acp") {
         const spawn4 = provider.spawn;
@@ -40622,8 +40950,11 @@ Run 'adhdev doctor' for detailed diagnostics.`
     var ProviderLoader = class _ProviderLoader {
       providers = /* @__PURE__ */ new Map();
       providerAvailability = /* @__PURE__ */ new Map();
+      defaultProvidersDir;
+      explicitProviderDir = null;
       userDir;
       upstreamDir;
+      sourceMode = "normal";
       disableUpstream;
       watchers = [];
       logFn;
@@ -40637,22 +40968,15 @@ Run 'adhdev doctor' for detailed diagnostics.`
       static META_FILE = ".meta.json";
       constructor(options) {
         this.logFn = options?.logFn || LOG2.forComponent("Provider").asLogFn();
-        const defaultProvidersDir = path14.join(os13.homedir(), ".adhdev", "providers");
-        if (options?.userDir) {
-          this.userDir = options.userDir;
-          this.log(`Config 'providerDir' applied: ${this.userDir}`);
-        } else {
-          const localRepoPath = path14.resolve(__dirname, "../../../../../adhdev-providers");
-          if (fs6.existsSync(localRepoPath)) {
-            this.userDir = localRepoPath;
-            this.log(`Auto-detected local public repository: ${this.userDir} (Dev workspace speedup)`);
-          } else {
-            this.userDir = defaultProvidersDir;
-            this.log(`Using default user providers directory: ${this.userDir}`);
-          }
-        }
-        this.upstreamDir = path14.join(defaultProvidersDir, ".upstream");
-        this.disableUpstream = options?.disableUpstream ?? false;
+        this.defaultProvidersDir = path14.join(os13.homedir(), ".adhdev", "providers");
+        this.userDir = this.defaultProvidersDir;
+        this.upstreamDir = path14.join(this.defaultProvidersDir, ".upstream");
+        this.disableUpstream = false;
+        this.applySourceConfig({
+          userDir: options?.userDir,
+          sourceMode: options?.sourceMode,
+          disableUpstream: options?.disableUpstream
+        });
       }
       log(msg) {
         this.logFn(`[ProviderLoader] ${msg}`);
@@ -40677,6 +41001,33 @@ Run 'adhdev doctor' for detailed diagnostics.`
       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.
       */
@@ -40727,7 +41078,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
             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"]);
@@ -41238,7 +41589,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
       */
       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");
@@ -41260,7 +41611,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
           return { updated: false };
         }
         try {
-          const etag = await new Promise((resolve12, reject) => {
+          const etag = await new Promise((resolve11, reject) => {
             const options = {
               method: "HEAD",
               hostname: "github.com",
@@ -41278,7 +41629,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
                   headers: { "User-Agent": "adhdev-launcher" },
                   timeout: 1e4
                 }, (res2) => {
-                  resolve12(res2.headers.etag || res2.headers["last-modified"] || "");
+                  resolve11(res2.headers.etag || res2.headers["last-modified"] || "");
                 });
                 req2.on("error", reject);
                 req2.on("timeout", () => {
@@ -41287,7 +41638,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
                 });
                 req2.end();
               } else {
-                resolve12(res.headers.etag || res.headers["last-modified"] || "");
+                resolve11(res.headers.etag || res.headers["last-modified"] || "");
               }
             });
             req.on("error", reject);
@@ -41351,7 +41702,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
       downloadFile(url2, destPath) {
         const https = require("https");
         const http3 = require("http");
-        return new Promise((resolve12, reject) => {
+        return new Promise((resolve11, reject) => {
           const doRequest = (reqUrl, redirectCount = 0) => {
             if (redirectCount > 5) {
               reject(new Error("Too many redirects"));
@@ -41371,7 +41722,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
               res.pipe(ws2);
               ws2.on("finish", () => {
                 ws2.close();
-                resolve12();
+                resolve11();
               });
               ws2.on("error", reject);
             });
@@ -41844,17 +42195,17 @@ Run 'adhdev doctor' for detailed diagnostics.`
       throw new Error("No free port found");
     }
     function checkPortFree(port) {
-      return new Promise((resolve12) => {
+      return new Promise((resolve11) => {
         const server = net3.createServer();
         server.unref();
-        server.on("error", () => resolve12(false));
+        server.on("error", () => resolve11(false));
         server.listen(port, "127.0.0.1", () => {
-          server.close(() => resolve12(true));
+          server.close(() => resolve11(true));
         });
       });
     }
     async function isCdpActive(port) {
-      return new Promise((resolve12) => {
+      return new Promise((resolve11) => {
         const req = require("http").get(`http://127.0.0.1:${port}/json/version`, {
           timeout: 2e3
         }, (res) => {
@@ -41863,16 +42214,16 @@ Run 'adhdev doctor' for detailed diagnostics.`
           res.on("end", () => {
             try {
               const info = JSON.parse(data);
-              resolve12(!!info["WebKit-Version"] || !!info["Browser"]);
+              resolve11(!!info["WebKit-Version"] || !!info["Browser"]);
             } catch {
-              resolve12(false);
+              resolve11(false);
             }
           });
         });
-        req.on("error", () => resolve12(false));
+        req.on("error", () => resolve11(false));
         req.on("timeout", () => {
           req.destroy();
-          resolve12(false);
+          resolve11(false);
         });
       });
     }
@@ -42316,11 +42667,87 @@ Run 'adhdev doctor' for detailed diagnostics.`
     }
     cleanOldFiles();
     init_logger();
+    var LIVE_LIFECYCLES = /* @__PURE__ */ new Set(["starting", "running", "stopping", "interrupted"]);
+    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 os16 = __toESM2(require("os"));
     init_config();
     init_terminal_screen();
     init_logger();
     var READ_DEBUG_ENABLED = process.argv.includes("--dev") || process.env.ADHDEV_READ_DEBUG === "1";
+    var recentReadDebugSignatureBySession = /* @__PURE__ */ new Map();
+    function buildRecentReadDebugSignature(snapshot) {
+      return [
+        snapshot.providerType,
+        snapshot.status,
+        snapshot.inboxBucket,
+        snapshot.unread ? "1" : "0",
+        String(snapshot.lastSeenAt),
+        snapshot.completionMarker,
+        snapshot.seenCompletionMarker,
+        String(snapshot.lastUpdated),
+        String(snapshot.lastUsedAt),
+        snapshot.lastRole,
+        String(snapshot.messageUpdatedAt)
+      ].join("|");
+    }
+    function shouldEmitRecentReadDebugLog(cache, snapshot) {
+      const nextSignature = buildRecentReadDebugSignature(snapshot);
+      const previousSignature = cache.get(snapshot.sessionId);
+      if (previousSignature === nextSignature) return false;
+      cache.set(snapshot.sessionId, nextSignature);
+      return true;
+    }
     function buildDetectedIdeInfos(detectedIdes, cdpManagers) {
       return detectedIdes.filter((ide) => ide.installed !== false).map((ide) => ({
         id: ide.id,
@@ -42472,7 +42899,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
         providerSessionId: item.providerSessionId,
         title: item.title || item.providerName,
         workspace: item.workspace,
-        currentModel: item.currentModel,
+        summaryMetadata: item.summaryMetadata,
         lastLaunchedAt: item.lastUsedAt
       })).sort((a, b2) => b2.lastLaunchedAt - a.lastLaunchedAt).slice(0, 12);
     }
@@ -42513,9 +42940,24 @@ Run 'adhdev doctor' for detailed diagnostics.`
         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;
           LOG2.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);
@@ -42591,7 +43033,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
       while (Date.now() - start < timeoutMs) {
         try {
           process.kill(pid, 0);
-          await new Promise((resolve12) => setTimeout(resolve12, 250));
+          await new Promise((resolve11) => setTimeout(resolve11, 250));
         } catch {
           return;
         }
@@ -42706,7 +43148,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
         appendUpgradeLog(installOutput.trim());
       }
       if (process.platform === "win32") {
-        await new Promise((resolve12) => setTimeout(resolve12, 500));
+        await new Promise((resolve11) => setTimeout(resolve11, 500));
         cleanupStaleGlobalInstallDirs(payload.packageName);
         appendUpgradeLog("Post-install staging cleanup complete");
       }
@@ -42786,11 +43228,104 @@ Run 'adhdev doctor' for detailed diagnostics.`
         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 DaemonCommandRouter = class {
       deps;
       constructor(deps) {
         this.deps = deps;
       }
+      async traceSessionHostAction(action, args, run, summarizeResult) {
+        const interactionId = typeof args?._interactionId === "string" ? args._interactionId : void 0;
+        const sessionId = typeof args?.sessionId === "string" ? args.sessionId : void 0;
+        const requestedPayload = { action };
+        if (sessionId) requestedPayload.sessionId = sessionId;
+        if (typeof args?.clientId === "string") requestedPayload.clientId = args.clientId;
+        if (typeof args?.signal === "string") requestedPayload.signal = args.signal;
+        if (typeof args?.providerType === "string") requestedPayload.providerType = args.providerType;
+        if (typeof args?.workspace === "string") requestedPayload.workspace = args.workspace;
+        if (typeof args?.dryRun === "boolean") requestedPayload.dryRun = args.dryRun;
+        recordDebugTrace({
+          interactionId,
+          category: "session_host",
+          stage: "action_requested",
+          level: "info",
+          sessionId,
+          payload: requestedPayload
+        });
+        try {
+          const result = await run();
+          recordDebugTrace({
+            interactionId,
+            category: "session_host",
+            stage: "action_result",
+            level: "info",
+            sessionId,
+            payload: {
+              ...requestedPayload,
+              success: true,
+              ...summarizeResult ? summarizeResult(result) : {}
+            }
+          });
+          return result;
+        } catch (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:
@@ -42900,44 +43435,60 @@ Run 'adhdev doctor' for detailed diagnostics.`
           }
           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": {
@@ -42946,7 +43497,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
             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": {
@@ -42955,16 +43506,16 @@ Run 'adhdev doctor' for detailed diagnostics.`
             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": {
@@ -42974,12 +43525,15 @@ Run 'adhdev doctor' for detailed diagnostics.`
             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": {
@@ -42988,7 +43542,10 @@ Run 'adhdev doctor' for detailed diagnostics.`
             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": {
@@ -42997,8 +43554,9 @@ Run 'adhdev doctor' for detailed diagnostics.`
             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 });
@@ -43019,13 +43577,13 @@ Run 'adhdev doctor' for detailed diagnostics.`
                   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
@@ -43457,7 +44015,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
         const ideSummary = ideStates.map((s15) => {
           const msgs = s15.activeChat?.messages?.length || 0;
           const exts = s15.extensions.length;
-          return `${s15.type}(${s15.status},${msgs}msg,${exts}ext${s15.currentModel ? ",model=" + s15.currentModel : ""})`;
+          return `${s15.type}(${s15.status},${msgs}msg,${exts}ext)`;
         }).join(", ");
         const cliSummary = cliStates.map((s15) => `${s15.type}(${s15.status})`).join(", ");
         const acpSummary = acpStates.map((s15) => `${s15.type}(${s15.status})`).join(", ");
@@ -43519,9 +44077,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
             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
@@ -43634,7 +44190,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
         const beforeCount = this.messageCount(before);
         const beforeSignature = this.lastMessageSignature(before);
         for (let attempt = 0; attempt < 12; attempt += 1) {
-          await new Promise((resolve12) => setTimeout(resolve12, 250));
+          await new Promise((resolve11) => setTimeout(resolve11, 250));
           let state;
           try {
             state = await this.readChat(evaluate);
@@ -43656,7 +44212,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
         if (this.messageCount(first) > 0 || this.lastMessageSignature(first)) {
           return first;
         }
-        await new Promise((resolve12) => setTimeout(resolve12, 150));
+        await new Promise((resolve11) => setTimeout(resolve11, 150));
         const second = await this.readChat(evaluate);
         return this.messageCount(second) >= this.messageCount(first) ? second : first;
       }
@@ -43681,15 +44237,18 @@ Run 'adhdev doctor' for detailed diagnostics.`
             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) {
@@ -43796,7 +44355,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
           if (typeof data.error === "string" && data.error.trim()) return false;
         }
         for (let attempt = 0; attempt < 6; attempt += 1) {
-          await new Promise((resolve12) => setTimeout(resolve12, 250));
+          await new Promise((resolve11) => setTimeout(resolve11, 250));
           const state = await this.readChat(evaluate);
           const title = this.getStateTitle(state);
           if (this.titlesMatch(title, sessionId)) return true;
@@ -43961,7 +44520,8 @@ Run 'adhdev doctor' for detailed diagnostics.`
           const evaluate = (expr, timeout) => cdp.evaluateInSessionFrame(agent.cdpSessionId, expr, timeout);
           const state = await agent.adapter.readChat(evaluate);
           const stateError = this.getStateError(state);
-          LOG2.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 : "";
+          LOG2.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);
           }
@@ -44305,9 +44865,8 @@ Run 'adhdev doctor' for detailed diagnostics.`
           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,
@@ -44706,6 +45265,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
     var http2 = __toESM2(require("http"));
     var fs14 = __toESM2(require("fs"));
     var path222 = __toESM2(require("path"));
+    init_config();
     function generateFiles(type, name, category, opts = {}) {
       const { cdpPorts, cli, processName, installPath, binary, extensionId, version: version2 = "0.1" } = opts;
       if (category === "cli" || category === "acp") {
@@ -44834,7 +45394,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 {
@@ -44862,6 +45426,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 });
@@ -46234,7 +46801,7 @@ async (params) => {
       return { target, instance, adapter };
     }
     function sleep(ms2) {
-      return new Promise((resolve12) => setTimeout(resolve12, ms2));
+      return new Promise((resolve11) => setTimeout(resolve11, ms2));
     }
     async function waitForCliReady(ctx, type, instanceId, timeoutMs) {
       const startedAt = Date.now();
@@ -46596,7 +47163,6 @@ async (params) => {
         lastMessage: s15.activeChat?.messages?.slice(-1)[0] || null,
         activeModal: s15.activeChat?.activeModal || null,
         pendingEvents: s15.pendingEvents || [],
-        currentModel: s15.currentModel,
         settings: s15.settings
       }));
       ctx.json(res, 200, { instances: result, count: result.length });
@@ -47079,18 +47645,6 @@ async (params) => {
       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) {
@@ -47763,7 +48317,7 @@ async (params) => {
       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 }] }` |");
@@ -48375,6 +48929,7 @@ data: ${JSON.stringify(msg.data)}
       cdpManagers;
       instanceManager;
       cliManager;
+      onProviderSourceConfigChanged;
       logFn;
       sseClients = [];
       watchScriptPath = null;
@@ -48391,6 +48946,7 @@ data: ${JSON.stringify(msg.data)}
         this.cdpManagers = options.cdpManagers;
         this.instanceManager = options.instanceManager || null;
         this.cliManager = options.cliManager || null;
+        this.onProviderSourceConfigChanged = options.onProviderSourceConfigChanged || null;
         this.logFn = options.logFn || LOG2.forComponent("DevServer").asLogFn();
       }
       log(msg) {
@@ -48400,6 +48956,8 @@ data: ${JSON.stringify(msg.data)}
       routes = [
         // Static routes
         { method: "GET", pattern: "/api/providers", handler: (q2, s15) => this.handleListProviders(q2, s15) },
+        { method: "GET", pattern: "/api/providers/source-config", handler: (q2, s15) => this.handleGetProviderSourceConfig(q2, s15) },
+        { method: "POST", pattern: "/api/providers/source-config", handler: (q2, s15) => this.handleSetProviderSourceConfig(q2, s15) },
         { method: "GET", pattern: "/api/providers/versions", handler: (q2, s15) => this.handleDetectVersions(q2, s15) },
         { method: "POST", pattern: "/api/providers/reload", handler: (q2, s15) => this.handleReload(q2, s15) },
         { method: "POST", pattern: "/api/cdp/evaluate", handler: (q2, s15) => this.handleCdpEvaluate(q2, s15) },
@@ -48497,15 +49055,15 @@ data: ${JSON.stringify(msg.data)}
             this.json(res, 500, { error: e.message });
           }
         });
-        return new Promise((resolve12, reject) => {
+        return new Promise((resolve11, reject) => {
           this.server.listen(port, "127.0.0.1", () => {
             this.log(`Dev server listening on http://127.0.0.1:${port}`);
-            resolve12();
+            resolve11();
           });
           this.server.on("error", (e) => {
             if (e.code === "EADDRINUSE") {
               this.log(`Port ${port} in use, skipping dev server`);
-              resolve12();
+              resolve11();
             } else {
               reject(e);
             }
@@ -48519,7 +49077,33 @@ data: ${JSON.stringify(msg.data)}
       // ─── 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 = loadConfig2();
+        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);
@@ -48561,20 +49145,20 @@ data: ${JSON.stringify(msg.data)}
           child.stderr?.on("data", (d) => {
             stderr += d.toString().slice(0, 2e3);
           });
-          await new Promise((resolve12) => {
+          await new Promise((resolve11) => {
             const timer = setTimeout(() => {
               child.kill();
-              resolve12();
+              resolve11();
             }, 3e3);
             child.on("exit", () => {
               clearTimeout(timer);
-              resolve12();
+              resolve11();
             });
             child.stdout?.once("data", () => {
               setTimeout(() => {
                 child.kill();
                 clearTimeout(timer);
-                resolve12();
+                resolve11();
               }, 500);
             });
           });
@@ -49070,14 +49654,14 @@ data: ${JSON.stringify(msg.data)}
           child.stderr?.on("data", (d) => {
             stderr += d.toString();
           });
-          await new Promise((resolve12) => {
+          await new Promise((resolve11) => {
             const timer = setTimeout(() => {
               child.kill();
-              resolve12();
+              resolve11();
             }, timeout);
             child.on("exit", () => {
               clearTimeout(timer);
-              resolve12();
+              resolve11();
             });
           });
           const elapsed = Date.now() - start;
@@ -49222,18 +49806,6 @@ data: ${JSON.stringify(msg.data)}
         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) {
@@ -49378,7 +49950,7 @@ data: ${JSON.stringify(msg.data)}
         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 }] }` |");
@@ -49759,14 +50331,14 @@ data: ${JSON.stringify(msg.data)}
         res.end(JSON.stringify(data, null, 2));
       }
       async readBody(req) {
-        return new Promise((resolve12) => {
+        return new Promise((resolve11) => {
           let body = "";
           req.on("data", (chunk) => body += chunk);
           req.on("end", () => {
             try {
-              resolve12(JSON.parse(body));
+              resolve11(JSON.parse(body));
             } catch {
-              resolve12({});
+              resolve11({});
             }
           });
         });
@@ -50236,7 +50808,7 @@ data: ${JSON.stringify(msg.data)}
       const deadline = Date.now() + timeoutMs;
       while (Date.now() < deadline) {
         if (await canConnect(endpoint)) return;
-        await new Promise((resolve12) => setTimeout(resolve12, STARTUP_POLL_MS));
+        await new Promise((resolve11) => setTimeout(resolve11, STARTUP_POLL_MS));
       }
       throw new Error(`Session host did not become ready within ${timeoutMs}ms`);
     }
@@ -50275,59 +50847,6 @@ data: ${JSON.stringify(msg.data)}
         });
       }
     }
-    var LIVE_LIFECYCLES = /* @__PURE__ */ new Set(["starting", "running", "stopping", "interrupted"]);
-    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 || []);
-    }
     function shouldAutoRestoreHostedSessionsOnStartup2(env = process.env) {
       const raw = typeof env.ADHDEV_RESTORE_HOSTED_SESSIONS_ON_STARTUP === "string" ? env.ADHDEV_RESTORE_HOSTED_SESSIONS_ON_STARTUP.trim().toLowerCase() : "";
       return raw === "1" || raw === "true" || raw === "yes";
@@ -50461,10 +50980,10 @@ data: ${JSON.stringify(msg.data)}
             const buffer = Buffer.from(await res.arrayBuffer());
             const fs15 = await import("fs");
             fs15.writeFileSync(vsixPath, buffer);
-            return new Promise((resolve12) => {
+            return new Promise((resolve11) => {
               const cmd = `"${ide.cliCommand}" --install-extension "${vsixPath}" --force`;
               (0, import_child_process10.exec)(cmd, { timeout: 6e4 }, (error48, _stdout, stderr) => {
-                resolve12({
+                resolve11({
                   extensionId: extension.id,
                   marketplaceId: extension.marketplaceId,
                   success: !error48,
@@ -50477,11 +50996,11 @@ data: ${JSON.stringify(msg.data)}
         } catch (e) {
         }
       }
-      return new Promise((resolve12) => {
+      return new Promise((resolve11) => {
         const cmd = `"${ide.cliCommand}" --install-extension ${extension.marketplaceId} --force`;
         (0, import_child_process10.exec)(cmd, { timeout: 6e4 }, (error48, stdout, stderr) => {
           if (error48) {
-            resolve12({
+            resolve11({
               extensionId: extension.id,
               marketplaceId: extension.marketplaceId,
               success: false,
@@ -50489,7 +51008,7 @@ data: ${JSON.stringify(msg.data)}
               error: stderr || error48.message
             });
           } else {
-            resolve12({
+            resolve11({
               extensionId: extension.id,
               marketplaceId: extension.marketplaceId,
               success: true,
@@ -50582,10 +51101,11 @@ data: ${JSON.stringify(msg.data)}
     async function initDaemonComponents2(config2) {
       installGlobalInterceptor();
       const appConfig = loadConfig2();
-      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()) {
@@ -50690,6 +51210,10 @@ data: ${JSON.stringify(msg.data)}
         onProviderSettingChanged: async (providerType) => {
           await refreshProviderAvailability(providerType);
           config2.onStatusChange?.();
+        },
+        onProviderSourceConfigChanged: async () => {
+          await refreshProviderAvailability();
+          config2.onStatusChange?.();
         }
       });
       agentStreamManager = new DaemonAgentStreamManager(
@@ -50739,7 +51263,8 @@ data: ${JSON.stringify(msg.data)}
         cdpInitializer,
         cdpManagers,
         sessionRegistry,
-        detectedIdes: detectedIdesRef
+        detectedIdes: detectedIdesRef,
+        refreshProviderAvailability
       };
     }
     async function startDaemonDevSupport2(options) {
@@ -50748,7 +51273,10 @@ data: ${JSON.stringify(msg.data)}
         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();
@@ -52419,9 +52947,6 @@ var StandaloneServer = class {
         status: session.status,
         title: session.title,
         cdpConnected: session.cdpConnected,
-        currentModel: session.currentModel,
-        currentPlan: session.currentPlan,
-        currentAutoApprove: session.currentAutoApprove,
         lastSeenAt: session.lastSeenAt,
         unread: session.unread,
         inboxBucket: session.inboxBucket,
@@ -52449,8 +52974,10 @@ var StandaloneServer = class {
       return { success: false, error: "command type required" };
     }
     const result = await this.components.router.execute(type, args, "standalone");
-    if (type.startsWith("workspace_") || type.startsWith("session_host_")) this.scheduleBroadcastStatus();
-    if (type === "get_status_metadata" || type === "set_user_name" || type === "set_machine_nickname" || type.startsWith("workspace_") || type.startsWith("session_host_")) {
+    if (type === "invoke_provider_script" || type.startsWith("workspace_") || type.startsWith("session_host_")) {
+      this.scheduleBroadcastStatus();
+    }
+    if (type === "invoke_provider_script" || type === "get_status_metadata" || type === "set_user_name" || type === "set_machine_nickname" || type.startsWith("workspace_") || type.startsWith("session_host_")) {
       void this.flushWsDaemonMetadataSubscriptions();
     }
     if (type.startsWith("session_host_")) void this.flushWsSessionHostDiagnosticsSubscriptions();