@adhdev/daemon-core 0.8.56 → 0.8.58

package/dist/index.js

@@ -40,9 +40,16 @@ __export(config_exports, {
   loadConfig: () => loadConfig,
   markSetupComplete: () => markSetupComplete,
   resetConfig: () => resetConfig,
+  resolveProviderSourceMode: () => resolveProviderSourceMode,
   saveConfig: () => saveConfig,
   updateConfig: () => updateConfig
 });
+function resolveProviderSourceMode(providerSourceMode, legacyDisableUpstream) {
+  if (providerSourceMode === "normal" || providerSourceMode === "no-upstream") {
+    return providerSourceMode;
+  }
+  return legacyDisableUpstream === true ? "no-upstream" : "normal";
+}
 function isPlainObject(value) {
   return !!value && typeof value === "object" && !Array.isArray(value);
 }
@@ -80,7 +87,7 @@ function normalizeConfig(raw) {
     registeredMachineId: asOptionalString(parsed.registeredMachineId),
     providerSettings: isPlainObject(parsed.providerSettings) ? parsed.providerSettings : {},
     ideSettings: isPlainObject(parsed.ideSettings) ? parsed.ideSettings : {},
-    disableUpstream: asBoolean(parsed.disableUpstream, DEFAULT_CONFIG.disableUpstream ?? false),
+    providerSourceMode: resolveProviderSourceMode(parsed.providerSourceMode, parsed.disableUpstream),
     providerDir: asOptionalString(parsed.providerDir),
     terminalSizingMode: parsed.terminalSizingMode === "fit" ? "fit" : "measured"
   };
@@ -229,7 +236,7 @@ var init_config = __esm({
       registeredMachineId: void 0,
       providerSettings: {},
       ideSettings: {},
-      disableUpstream: false,
+      providerSourceMode: "normal",
       terminalSizingMode: "measured"
     };
     MACHINE_ID_PREFIX = "mach_";
@@ -1897,7 +1904,7 @@ var init_provider_cli_adapter = __esm({
               `[${this.cliType}] Waiting for interactive prompt: hasPrompt=${hasPrompt} stableMs=${stableMs} recentOutputMs=${recentlyOutput} status=${status} startup=${startupLikelyActive} screen=${JSON.stringify(summarizeCliTraceText(screenText, 220)).slice(0, 260)}`
             );
           }
-          await new Promise((resolve12) => setTimeout(resolve12, 50));
+          await new Promise((resolve11) => setTimeout(resolve11, 50));
         }
         const finalScreenText = this.terminalScreen.getText() || "";
         LOG.warn(
@@ -2470,7 +2477,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();
@@ -2540,12 +2547,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) {
@@ -2719,17 +2726,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);
         });
@@ -3084,6 +3091,7 @@ __export(index_exports, {
   normalizeInputEnvelope: () => normalizeInputEnvelope,
   normalizeManagedStatus: () => normalizeManagedStatus,
   normalizeMessageParts: () => normalizeMessageParts,
+  parseProviderSourceConfigUpdate: () => parseProviderSourceConfigUpdate,
   partitionSessionHostDiagnosticsSessions: () => partitionSessionHostDiagnosticsSessions,
   partitionSessionHostRecords: () => partitionSessionHostRecords,
   probeCdpPort: () => probeCdpPort,
@@ -3576,15 +3584,15 @@ function resolveCommandPath(command) {
   return null;
 }
 function execAsync(cmd, timeoutMs = 5e3) {
-  return new Promise((resolve12) => {
+  return new Promise((resolve11) => {
     const child = (0, import_child_process2.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) {
@@ -3795,7 +3803,7 @@ var DaemonCdpManager = class {
   * Returns multiple entries if multiple IDE windows are open on same port
   */
   static listAllTargets(port) {
-    return new Promise((resolve12) => {
+    return new Promise((resolve11) => {
       const req = http.get(`http://127.0.0.1:${port}/json`, (res) => {
         let data = "";
         res.on("data", (chunk) => data += chunk.toString());
@@ -3811,16 +3819,16 @@ var DaemonCdpManager = class {
               (t) => !isNonMain(t.title || "") && t.url?.includes("workbench.html") && !t.url?.includes("agent")
             );
             const fallbackPages = pages.filter((t) => !isNonMain(t.title || ""));
-            resolve12(mainPages.length > 0 ? mainPages : fallbackPages);
+            resolve11(mainPages.length > 0 ? mainPages : fallbackPages);
           } catch {
-            resolve12([]);
+            resolve11([]);
           }
         });
       });
-      req.on("error", () => resolve12([]));
+      req.on("error", () => resolve11([]));
       req.setTimeout(2e3, () => {
         req.destroy();
-        resolve12([]);
+        resolve11([]);
       });
     });
   }
@@ -3860,7 +3868,7 @@ var DaemonCdpManager = class {
     }
   }
   findTargetOnPort(port) {
-    return new Promise((resolve12) => {
+    return new Promise((resolve11) => {
       const req = http.get(`http://127.0.0.1:${port}/json`, (res) => {
         let data = "";
         res.on("data", (chunk) => data += chunk.toString());
@@ -3871,7 +3879,7 @@ var DaemonCdpManager = class {
               (t) => (t.type === "page" || t.type === "browser" || t.type === "Page") && t.webSocketDebuggerUrl
             );
             if (pages.length === 0) {
-              resolve12(targets.find((t) => t.webSocketDebuggerUrl) || null);
+              resolve11(targets.find((t) => t.webSocketDebuggerUrl) || null);
               return;
             }
             const mainPages = pages.filter((t) => !this.isNonMainTitle(t.title || ""));
@@ -3881,24 +3889,24 @@ var DaemonCdpManager = class {
               const specific = list.find((t) => t.id === this._targetId);
               if (specific) {
                 this._pageTitle = specific.title || "";
-                resolve12(specific);
+                resolve11(specific);
               } else {
                 this.log(`[CDP] Target ${this._targetId} not found in page list`);
-                resolve12(null);
+                resolve11(null);
               }
               return;
             }
             this._pageTitle = list[0]?.title || "";
-            resolve12(list[0]);
+            resolve11(list[0]);
           } catch {
-            resolve12(null);
+            resolve11(null);
           }
         });
       });
-      req.on("error", () => resolve12(null));
+      req.on("error", () => resolve11(null));
       req.setTimeout(2e3, () => {
         req.destroy();
-        resolve12(null);
+        resolve11(null);
       });
     });
   }
@@ -3909,7 +3917,7 @@ var DaemonCdpManager = class {
     this.extensionProviders = providers;
   }
   connectToTarget(wsUrl) {
-    return new Promise((resolve12) => {
+    return new Promise((resolve11) => {
       this.ws = new import_ws.default(wsUrl);
       this.ws.on("open", async () => {
         this._connected = true;
@@ -3919,17 +3927,17 @@ var DaemonCdpManager = class {
         }
         this.connectBrowserWs().catch(() => {
         });
-        resolve12(true);
+        resolve11(true);
       });
       this.ws.on("message", (data) => {
         try {
           const msg = JSON.parse(data.toString());
           if (msg.id && this.pending.has(msg.id)) {
-            const { resolve: resolve13, reject } = this.pending.get(msg.id);
+            const { resolve: resolve12, reject } = this.pending.get(msg.id);
             this.pending.delete(msg.id);
             this.failureCount = 0;
             if (msg.error) reject(new Error(msg.error.message));
-            else resolve13(msg.result);
+            else resolve12(msg.result);
           } else if (msg.method === "Runtime.executionContextCreated") {
             this.contexts.add(msg.params.context.id);
           } else if (msg.method === "Runtime.executionContextDestroyed") {
@@ -3952,7 +3960,7 @@ var DaemonCdpManager = class {
       this.ws.on("error", (err) => {
         this.log(`[CDP] WebSocket error: ${err.message}`);
         this._connected = false;
-        resolve12(false);
+        resolve11(false);
       });
     });
   }
@@ -3966,7 +3974,7 @@ var DaemonCdpManager = class {
         return;
       }
       this.log(`[CDP] Connecting browser WS for target discovery...`);
-      await new Promise((resolve12, reject) => {
+      await new Promise((resolve11, reject) => {
         this.browserWs = new import_ws.default(browserWsUrl);
         this.browserWs.on("open", async () => {
           this._browserConnected = true;
@@ -3976,16 +3984,16 @@ var DaemonCdpManager = class {
           } catch (e) {
             this.log(`[CDP] setDiscoverTargets failed: ${e.message}`);
           }
-          resolve12();
+          resolve11();
         });
         this.browserWs.on("message", (data) => {
           try {
             const msg = JSON.parse(data.toString());
             if (msg.id && this.browserPending.has(msg.id)) {
-              const { resolve: resolve13, reject: reject2 } = this.browserPending.get(msg.id);
+              const { resolve: resolve12, reject: reject2 } = this.browserPending.get(msg.id);
               this.browserPending.delete(msg.id);
               if (msg.error) reject2(new Error(msg.error.message));
-              else resolve13(msg.result);
+              else resolve12(msg.result);
             }
           } catch {
           }
@@ -4005,31 +4013,31 @@ var DaemonCdpManager = class {
     }
   }
   getBrowserWsUrl() {
-    return new Promise((resolve12) => {
+    return new Promise((resolve11) => {
       const req = http.get(`http://127.0.0.1:${this.port}/json/version`, (res) => {
         let data = "";
         res.on("data", (chunk) => data += chunk.toString());
         res.on("end", () => {
           try {
             const info = JSON.parse(data);
-            resolve12(info.webSocketDebuggerUrl || null);
+            resolve11(info.webSocketDebuggerUrl || null);
           } catch {
-            resolve12(null);
+            resolve11(null);
           }
         });
       });
-      req.on("error", () => resolve12(null));
+      req.on("error", () => resolve11(null));
       req.setTimeout(3e3, () => {
         req.destroy();
-        resolve12(null);
+        resolve11(null);
       });
     });
   }
   sendBrowser(method, params = {}, timeoutMs = 15e3) {
-    return new Promise((resolve12, reject) => {
+    return new Promise((resolve11, reject) => {
       if (!this.browserWs || !this._browserConnected) return reject(new Error("Browser WS not connected"));
       const id = this.browserMsgId++;
-      this.browserPending.set(id, { resolve: resolve12, reject });
+      this.browserPending.set(id, { resolve: resolve11, reject });
       this.browserWs.send(JSON.stringify({ id, method, params }));
       setTimeout(() => {
         if (this.browserPending.has(id)) {
@@ -4069,11 +4077,11 @@ var DaemonCdpManager = class {
   }
   // ─── CDP Protocol ────────────────────────────────────────
   sendInternal(method, params = {}, timeoutMs = 15e3) {
-    return new Promise((resolve12, reject) => {
+    return new Promise((resolve11, reject) => {
       if (!this.ws || !this._connected) return reject(new Error("CDP not connected"));
       if (this.ws.readyState !== import_ws.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)) {
@@ -4322,7 +4330,7 @@ var DaemonCdpManager = class {
     const browserWs = this.browserWs;
     let msgId = this.browserMsgId;
     const sendWs = (method, params = {}, sessionId) => {
-      return new Promise((resolve12, reject) => {
+      return new Promise((resolve11, reject) => {
         const mid = msgId++;
         this.browserMsgId = msgId;
         const handler = (raw) => {
@@ -4331,7 +4339,7 @@ var DaemonCdpManager = class {
             if (msg.id === mid) {
               browserWs.removeListener("message", handler);
               if (msg.error) reject(new Error(msg.error.message || JSON.stringify(msg.error)));
-              else resolve12(msg.result);
+              else resolve11(msg.result);
             }
           } catch {
           }
@@ -4532,14 +4540,14 @@ var DaemonCdpManager = class {
     if (!ws || ws.readyState !== import_ws.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
@@ -4571,10 +4579,10 @@ var DaemonCdpManager = class {
       throw new Error("CDP not connected");
     }
     const sendViaSession = (method, params = {}) => {
-      return new Promise((resolve12, reject) => {
+      return new Promise((resolve11, reject) => {
         const pendingMap = this._browserConnected ? this.browserPending : this.pending;
         const id = this._browserConnected ? this.browserMsgId++ : this.msgId++;
-        pendingMap.set(id, { resolve: resolve12, reject });
+        pendingMap.set(id, { resolve: resolve11, reject });
         ws.send(JSON.stringify({ id, sessionId, method, params }));
         setTimeout(() => {
           if (pendingMap.has(id)) {
@@ -5484,6 +5492,30 @@ var ChatHistoryWriter = class {
       options.historySessionId
     );
   }
+  writeSessionStart(agentType, historySessionId, workspace, instanceId) {
+    const id = String(historySessionId || "").trim();
+    const ws = String(workspace || "").trim();
+    if (!id || !ws) return;
+    try {
+      const dir = path7.join(HISTORY_DIR, this.sanitize(agentType));
+      fs3.mkdirSync(dir, { recursive: true });
+      const date = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
+      const filePath = path7.join(dir, `${this.sanitize(id)}_${date}.jsonl`);
+      const record = {
+        ts: (/* @__PURE__ */ new Date()).toISOString(),
+        receivedAt: Date.now(),
+        role: "system",
+        kind: "session_start",
+        content: ws,
+        agent: agentType,
+        instanceId,
+        historySessionId: id,
+        workspace: ws
+      };
+      fs3.appendFileSync(filePath, JSON.stringify(record) + "\n", "utf-8");
+    } catch {
+    }
+  }
   promoteHistorySession(agentType, previousHistorySessionId, nextHistorySessionId) {
     const fromId = String(previousHistorySessionId || "").trim();
     const toId = String(nextHistorySessionId || "").trim();
@@ -5703,6 +5735,7 @@ function listSavedHistorySessions(agentType, options = {}) {
       let lastMessageAt = 0;
       let sessionTitle = "";
       let preview = "";
+      let workspace = "";
       for (const file of files.sort()) {
         const filePath = path7.join(dir, file);
         const content = fs3.readFileSync(filePath, "utf-8");
@@ -5715,6 +5748,10 @@ function listSavedHistorySessions(agentType, options = {}) {
             parsed = null;
           }
           if (!parsed || parsed.historySessionId !== historySessionId) continue;
+          if (parsed.kind === "session_start") {
+            if (!workspace && parsed.workspace) workspace = parsed.workspace;
+            continue;
+          }
           messageCount += 1;
           if (!firstMessageAt || parsed.receivedAt < firstMessageAt) firstMessageAt = parsed.receivedAt;
           if (!lastMessageAt || parsed.receivedAt > lastMessageAt) lastMessageAt = parsed.receivedAt;
@@ -5729,7 +5766,8 @@ function listSavedHistorySessions(agentType, options = {}) {
         messageCount,
         firstMessageAt,
         lastMessageAt,
-        preview: preview || void 0
+        preview: preview || void 0,
+        workspace: workspace || void 0
       });
     }
     summaries.sort((a, b) => b.lastMessageAt - a.lastMessageAt);
@@ -8104,7 +8142,7 @@ function getStateLastSignature(state) {
 async function getStableExtensionBaseline(h) {
   const first = await readExtensionChatState(h);
   if (getStateMessageCount(first) > 0 || getStateLastSignature(first)) return first;
-  await new Promise((resolve12) => setTimeout(resolve12, 150));
+  await new Promise((resolve11) => setTimeout(resolve11, 150));
   const second = await readExtensionChatState(h);
   return getStateMessageCount(second) >= getStateMessageCount(first) ? second : first;
 }
@@ -8112,7 +8150,7 @@ async function verifyExtensionSendObserved(h, before) {
   const beforeCount = getStateMessageCount(before);
   const beforeSignature = getStateLastSignature(before);
   for (let attempt = 0; attempt < 12; attempt += 1) {
-    await new Promise((resolve12) => setTimeout(resolve12, 250));
+    await new Promise((resolve11) => setTimeout(resolve11, 250));
     const state = await readExtensionChatState(h);
     if (state?.status === "waiting_approval") return true;
     const afterCount = getStateMessageCount(state);
@@ -9304,6 +9342,30 @@ async function handleFileListBrowse(h, args) {
   }
 }
 
+// src/commands/stream-commands.ts
+init_config();
+
+// src/config/provider-source-config.ts
+function normalizeProviderDir(value) {
+  if (typeof value !== "string") return void 0;
+  const trimmed = value.trim();
+  return trimmed ? trimmed : void 0;
+}
+function parseProviderSourceConfigUpdate(input) {
+  const updates = {};
+  if (Object.prototype.hasOwnProperty.call(input, "providerSourceMode")) {
+    const { providerSourceMode } = input;
+    if (providerSourceMode !== "normal" && providerSourceMode !== "no-upstream") {
+      return { ok: false, error: "providerSourceMode must be 'normal' or 'no-upstream'" };
+    }
+    updates.providerSourceMode = providerSourceMode;
+  }
+  if (Object.prototype.hasOwnProperty.call(input, "providerDir")) {
+    updates.providerDir = normalizeProviderDir(input.providerDir);
+  }
+  return { ok: true, updates };
+}
+
 // src/providers/cli-script-results.ts
 function parseCliScriptResult(result) {
   if (typeof result === "string") {
@@ -9416,6 +9478,38 @@ async function handleSetProviderSetting(h, args) {
   }
   return { success: false, error: `Failed to set ${providerType}.${key} \u2014 invalid key, value, or not a public setting` };
 }
+function handleGetProviderSourceConfig(h, _args) {
+  const loader = h.ctx.providerLoader;
+  if (!loader) return { success: false, error: "providerLoader not available" };
+  return { success: true, ...loader.getSourceConfig() };
+}
+async function handleSetProviderSourceConfig(h, args) {
+  const loader = h.ctx.providerLoader;
+  if (!loader) return { success: false, error: "providerLoader not available" };
+  const parsed = parseProviderSourceConfigUpdate(args || {});
+  if ("error" in parsed) {
+    return { success: false, error: parsed.error };
+  }
+  const currentConfig2 = loadConfig();
+  const nextConfig = {
+    ...currentConfig2,
+    ...parsed.updates.providerSourceMode ? { providerSourceMode: parsed.updates.providerSourceMode } : {},
+    ...Object.prototype.hasOwnProperty.call(parsed.updates, "providerDir") ? { providerDir: parsed.updates.providerDir } : {}
+  };
+  saveConfig(nextConfig);
+  const sourceConfig = loader.applySourceConfig({
+    sourceMode: nextConfig.providerSourceMode,
+    userDir: Object.prototype.hasOwnProperty.call(parsed.updates, "providerDir") ? parsed.updates.providerDir : loader.getSourceConfig().explicitProviderDir || void 0
+  });
+  loader.reload();
+  loader.registerToDetector();
+  await h.ctx.onProviderSourceConfigChanged?.();
+  LOG.info(
+    "Command",
+    `[set_provider_source_config] mode=${sourceConfig.sourceMode} explicitProviderDir=${sourceConfig.explicitProviderDir || "-"} userDir=${sourceConfig.userDir}`
+  );
+  return { success: true, reloaded: true, ...sourceConfig };
+}
 function normalizeProviderScriptArgs(args) {
   const normalizedArgs = { ...args || {} };
   for (const key of ["mode", "model", "message", "action", "button", "text", "sessionId", "value"]) {
@@ -10109,6 +10203,10 @@ var DaemonCommandHandler = class {
         return handleGetProviderSettings(this, args);
       case "set_provider_setting":
         return handleSetProviderSetting(this, args);
+      case "get_provider_source_config":
+        return handleGetProviderSourceConfig(this, args);
+      case "set_provider_source_config":
+        return handleSetProviderSourceConfig(this, args);
       // ─── IDE Extension Settings (stream-commands.ts) ──────────
       case "get_ide_extensions":
         return handleGetIdeExtensions(this, args);
@@ -10148,7 +10246,7 @@ var DaemonCommandHandler = class {
     try {
       const http3 = await import("http");
       const postData = JSON.stringify(body);
-      const result = await new Promise((resolve12, reject) => {
+      const result = await new Promise((resolve11, reject) => {
         const req = http3.request({
           hostname: "127.0.0.1",
           port: 19280,
@@ -10160,9 +10258,9 @@ var DaemonCommandHandler = class {
           res.on("data", (chunk) => data += chunk);
           res.on("end", () => {
             try {
-              resolve12(JSON.parse(data));
+              resolve11(JSON.parse(data));
             } catch {
-              resolve12({ raw: data });
+              resolve11({ raw: data });
             }
           });
         });
@@ -10180,15 +10278,15 @@ var DaemonCommandHandler = class {
     if (!providerType) return { success: false, error: "providerType required" };
     try {
       const http3 = await import("http");
-      const result = await new Promise((resolve12, reject) => {
+      const result = await new Promise((resolve11, reject) => {
         http3.get(`http://127.0.0.1:19280/api/providers/${providerType}/${endpoint}`, (res) => {
           let data = "";
           res.on("data", (chunk) => data += chunk);
           res.on("end", () => {
             try {
-              resolve12(JSON.parse(data));
+              resolve11(JSON.parse(data));
             } catch {
-              resolve12({ raw: data });
+              resolve11({ raw: data });
             }
           });
         }).on("error", reject);
@@ -10202,7 +10300,7 @@ var DaemonCommandHandler = class {
     try {
       const http3 = await import("http");
       const postData = JSON.stringify(args || {});
-      const result = await new Promise((resolve12, reject) => {
+      const result = await new Promise((resolve11, reject) => {
         const req = http3.request({
           hostname: "127.0.0.1",
           port: 19280,
@@ -10214,9 +10312,9 @@ var DaemonCommandHandler = class {
           res.on("data", (chunk) => data += chunk);
           res.on("end", () => {
             try {
-              resolve12(JSON.parse(data));
+              resolve11(JSON.parse(data));
             } catch {
-              resolve12({ raw: data });
+              resolve11({ raw: data });
             }
           });
         });
@@ -10266,6 +10364,9 @@ function getForcedNewSessionScriptName(provider, launchMode) {
   const controls = Array.isArray(provider.controls) ? provider.controls : [];
   for (const control of controls) {
     if (control?.type !== "action") continue;
+    if (typeof control?.confirmTitle === "string" && control.confirmTitle.trim()) continue;
+    if (typeof control?.confirmMessage === "string" && control.confirmMessage.trim()) continue;
+    if (typeof control?.confirmLabel === "string" && control.confirmLabel.trim()) continue;
     const invokeScript = typeof control?.invokeScript === "string" ? control.invokeScript.trim() : "";
     if (!invokeScript) continue;
     const controlId = typeof control?.id === "string" ? control.id.trim() : "";
@@ -10275,6 +10376,20 @@ function getForcedNewSessionScriptName(provider, launchMode) {
   }
   return null;
 }
+async function waitForCliAdapterReady(adapter, options) {
+  const timeoutMs = Math.max(100, options?.timeoutMs ?? 15e3);
+  const pollMs = Math.max(10, options?.pollMs ?? 50);
+  const deadline = Date.now() + timeoutMs;
+  while (Date.now() < deadline) {
+    if (adapter?.isReady?.()) return;
+    const status = adapter?.getStatus?.()?.status;
+    if (status === "stopped") {
+      throw new Error("CLI runtime stopped before it became ready");
+    }
+    await new Promise((resolve11) => setTimeout(resolve11, pollMs));
+  }
+  throw new Error(`CLI runtime did not become ready within ${timeoutMs}ms`);
+}
 var CliProviderInstance = class {
   constructor(provider, workingDir, cliArgs = [], instanceId, transportFactory, options) {
     this.provider = provider;
@@ -10553,6 +10668,7 @@ var CliProviderInstance = class {
     const scriptName = getForcedNewSessionScriptName(this.provider, this.launchMode);
     if (!scriptName) return;
     LOG.info("CLI", `[${this.type}] forcing fresh session launch via script: ${scriptName}`);
+    await waitForCliAdapterReady(this.adapter);
     const raw = await this.adapter.invokeScript(scriptName, {});
     const parsed = parseCliScriptResult(raw);
     if (!parsed.success) {
@@ -10902,6 +11018,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,
@@ -11483,13 +11600,13 @@ var AcpProviderInstance = class {
         }
         this.currentStatus = "waiting_approval";
         this.detectStatusTransition();
-        const approved = await new Promise((resolve12) => {
-          this.permissionResolvers.push(resolve12);
+        const approved = await new Promise((resolve11) => {
+          this.permissionResolvers.push(resolve11);
           setTimeout(() => {
-            const idx = this.permissionResolvers.indexOf(resolve12);
+            const idx = this.permissionResolvers.indexOf(resolve11);
             if (idx >= 0) {
               this.permissionResolvers.splice(idx, 1);
-              resolve12(false);
+              resolve11(false);
             }
           }, 3e5);
         });
@@ -12805,6 +12922,9 @@ function validateProviderDefinition(raw) {
       warnings.push(`Unknown provider field: ${key}`);
     }
   }
+  if (provider.disableUpstream !== void 0) {
+    warnings.push("disableUpstream is deprecated in provider definitions; use machine-level provider source policy instead");
+  }
   const category = provider.category;
   if (category === "cli" || category === "acp") {
     const spawn4 = provider.spawn;
@@ -12864,8 +12984,11 @@ function validateControl(control, errors) {
 var ProviderLoader = class _ProviderLoader {
   providers = /* @__PURE__ */ new Map();
   providerAvailability = /* @__PURE__ */ new Map();
+  defaultProvidersDir;
+  explicitProviderDir = null;
   userDir;
   upstreamDir;
+  sourceMode = "normal";
   disableUpstream;
   watchers = [];
   logFn;
@@ -12879,22 +13002,15 @@ var ProviderLoader = class _ProviderLoader {
   static META_FILE = ".meta.json";
   constructor(options) {
     this.logFn = options?.logFn || LOG.forComponent("Provider").asLogFn();
-    const defaultProvidersDir = path14.join(os13.homedir(), ".adhdev", "providers");
-    if (options?.userDir) {
-      this.userDir = options.userDir;
-      this.log(`Config 'providerDir' applied: ${this.userDir}`);
-    } else {
-      const localRepoPath = path14.resolve(__dirname, "../../../../../adhdev-providers");
-      if (fs6.existsSync(localRepoPath)) {
-        this.userDir = localRepoPath;
-        this.log(`Auto-detected local public repository: ${this.userDir} (Dev workspace speedup)`);
-      } else {
-        this.userDir = defaultProvidersDir;
-        this.log(`Using default user providers directory: ${this.userDir}`);
-      }
-    }
-    this.upstreamDir = path14.join(defaultProvidersDir, ".upstream");
-    this.disableUpstream = options?.disableUpstream ?? false;
+    this.defaultProvidersDir = path14.join(os13.homedir(), ".adhdev", "providers");
+    this.userDir = this.defaultProvidersDir;
+    this.upstreamDir = path14.join(this.defaultProvidersDir, ".upstream");
+    this.disableUpstream = false;
+    this.applySourceConfig({
+      userDir: options?.userDir,
+      sourceMode: options?.sourceMode,
+      disableUpstream: options?.disableUpstream
+    });
   }
   log(msg) {
     this.logFn(`[ProviderLoader] ${msg}`);
@@ -12919,6 +13035,33 @@ var ProviderLoader = class _ProviderLoader {
   getProviderRoots() {
     return [this.userDir, this.upstreamDir];
   }
+  getSourceConfig() {
+    return {
+      sourceMode: this.sourceMode,
+      disableUpstream: this.disableUpstream,
+      explicitProviderDir: this.explicitProviderDir,
+      userDir: this.userDir,
+      upstreamDir: this.upstreamDir,
+      providerRoots: this.getProviderRoots()
+    };
+  }
+  applySourceConfig(options) {
+    const nextSourceMode = options?.sourceMode === "no-upstream" ? "no-upstream" : options?.sourceMode === "normal" ? "normal" : options?.disableUpstream ? "no-upstream" : this.sourceMode || "normal";
+    if (options && Object.prototype.hasOwnProperty.call(options, "userDir")) {
+      this.explicitProviderDir = options.userDir?.trim() ? options.userDir : null;
+    }
+    this.sourceMode = nextSourceMode;
+    this.userDir = this.explicitProviderDir || this.defaultProvidersDir;
+    this.upstreamDir = path14.join(this.defaultProvidersDir, ".upstream");
+    this.disableUpstream = this.sourceMode === "no-upstream";
+    if (this.explicitProviderDir) {
+      this.log(`Config 'providerDir' applied: ${this.userDir}`);
+    } else {
+      this.log(`Using default user providers directory: ${this.userDir}`);
+    }
+    this.log(`Provider source config: mode=${this.sourceMode} explicitProviderDir=${this.explicitProviderDir || "-"} userDir=${this.userDir} upstreamDir=${this.upstreamDir}`);
+    return this.getSourceConfig();
+  }
   /**
   * Canonical provider directory shape for a given root.
   */
@@ -12969,7 +13112,7 @@ var ProviderLoader = class _ProviderLoader {
         this.log(`Loaded ${upstreamCount} upstream providers (auto-updated)`);
       }
     } else if (this.disableUpstream) {
-      this.log("Upstream loading disabled (disableUpstream=true)");
+      this.log("Upstream loading disabled (sourceMode=no-upstream)");
     }
     if (fs6.existsSync(this.userDir)) {
       const userCount = this.loadDir(this.userDir, [".upstream"]);
@@ -13480,7 +13623,7 @@ var ProviderLoader = class _ProviderLoader {
   */
   async fetchLatest() {
     if (this.disableUpstream) {
-      this.log("Upstream fetch skipped (disableUpstream=true)");
+      this.log("Upstream fetch skipped (sourceMode=no-upstream)");
       return { updated: false };
     }
     const https = require("https");
@@ -13502,7 +13645,7 @@ var ProviderLoader = class _ProviderLoader {
       return { updated: false };
     }
     try {
-      const etag = await new Promise((resolve12, reject) => {
+      const etag = await new Promise((resolve11, reject) => {
         const options = {
           method: "HEAD",
           hostname: "github.com",
@@ -13520,7 +13663,7 @@ var ProviderLoader = class _ProviderLoader {
               headers: { "User-Agent": "adhdev-launcher" },
               timeout: 1e4
             }, (res2) => {
-              resolve12(res2.headers.etag || res2.headers["last-modified"] || "");
+              resolve11(res2.headers.etag || res2.headers["last-modified"] || "");
             });
             req2.on("error", reject);
             req2.on("timeout", () => {
@@ -13529,7 +13672,7 @@ var ProviderLoader = class _ProviderLoader {
             });
             req2.end();
           } else {
-            resolve12(res.headers.etag || res.headers["last-modified"] || "");
+            resolve11(res.headers.etag || res.headers["last-modified"] || "");
           }
         });
         req.on("error", reject);
@@ -13593,7 +13736,7 @@ var ProviderLoader = class _ProviderLoader {
   downloadFile(url, destPath) {
     const https = require("https");
     const http3 = require("http");
-    return new Promise((resolve12, reject) => {
+    return new Promise((resolve11, reject) => {
       const doRequest = (reqUrl, redirectCount = 0) => {
         if (redirectCount > 5) {
           reject(new Error("Too many redirects"));
@@ -13613,7 +13756,7 @@ var ProviderLoader = class _ProviderLoader {
           res.pipe(ws);
           ws.on("finish", () => {
             ws.close();
-            resolve12();
+            resolve11();
           });
           ws.on("error", reject);
         });
@@ -14088,17 +14231,17 @@ async function findFreePort(ports) {
   throw new Error("No free port found");
 }
 function checkPortFree(port) {
-  return new Promise((resolve12) => {
+  return new Promise((resolve11) => {
     const server = net.createServer();
     server.unref();
-    server.on("error", () => resolve12(false));
+    server.on("error", () => resolve11(false));
     server.listen(port, "127.0.0.1", () => {
-      server.close(() => resolve12(true));
+      server.close(() => resolve11(true));
     });
   });
 }
 async function isCdpActive(port) {
-  return new Promise((resolve12) => {
+  return new Promise((resolve11) => {
     const req = require("http").get(`http://127.0.0.1:${port}/json/version`, {
       timeout: 2e3
     }, (res) => {
@@ -14107,16 +14250,16 @@ async function isCdpActive(port) {
       res.on("end", () => {
         try {
           const info = JSON.parse(data);
-          resolve12(!!info["WebKit-Version"] || !!info["Browser"]);
+          resolve11(!!info["WebKit-Version"] || !!info["Browser"]);
         } catch {
-          resolve12(false);
+          resolve11(false);
         }
       });
     });
-    req.on("error", () => resolve12(false));
+    req.on("error", () => resolve11(false));
     req.on("timeout", () => {
       req.destroy();
-      resolve12(false);
+      resolve11(false);
     });
   });
 }
@@ -14845,7 +14988,7 @@ async function waitForPidExit(pid, timeoutMs) {
   while (Date.now() - start < timeoutMs) {
     try {
       process.kill(pid, 0);
-      await new Promise((resolve12) => setTimeout(resolve12, 250));
+      await new Promise((resolve11) => setTimeout(resolve11, 250));
     } catch {
       return;
     }
@@ -14960,7 +15103,7 @@ async function runDaemonUpgradeHelper(payload) {
     appendUpgradeLog(installOutput.trim());
   }
   if (process.platform === "win32") {
-    await new Promise((resolve12) => setTimeout(resolve12, 500));
+    await new Promise((resolve11) => setTimeout(resolve11, 500));
     cleanupStaleGlobalInstallDirs(payload.packageName);
     appendUpgradeLog("Post-install staging cleanup complete");
   }
@@ -15253,8 +15396,9 @@ var DaemonCommandRouter = class {
         if (!providerType) {
           return { success: false, error: "providerType required" };
         }
-        const offset = Math.max(0, Number(args?.offset) || 0);
-        const limit = Math.max(1, Math.min(100, Number(args?.limit) || 30));
+        const wantsAll = args?.all === true;
+        const offset = wantsAll ? 0 : Math.max(0, Number(args?.offset) || 0);
+        const limit = wantsAll ? Number.MAX_SAFE_INTEGER : Math.max(1, Math.min(100, Number(args?.limit) || 30));
         const { sessions: historySessions, hasMore } = listSavedHistorySessions(providerType, { offset, limit });
         const state = loadState();
         const savedSessions = getSavedProviderSessions(state, { providerType, kind });
@@ -15275,13 +15419,13 @@ var DaemonCommandRouter = class {
               providerName: saved?.providerName || recent?.providerName || providerType,
               kind: saved?.kind || recent?.kind || kind,
               title: saved?.title || recent?.title || session.sessionTitle || session.preview || providerType,
-              workspace: saved?.workspace || recent?.workspace,
+              workspace: saved?.workspace || recent?.workspace || session.workspace,
               currentModel: saved?.currentModel || recent?.currentModel,
               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
@@ -15898,7 +16042,7 @@ var ProviderStreamAdapter = class {
     const beforeCount = this.messageCount(before);
     const beforeSignature = this.lastMessageSignature(before);
     for (let attempt = 0; attempt < 12; attempt += 1) {
-      await new Promise((resolve12) => setTimeout(resolve12, 250));
+      await new Promise((resolve11) => setTimeout(resolve11, 250));
       let state;
       try {
         state = await this.readChat(evaluate);
@@ -15920,7 +16064,7 @@ var ProviderStreamAdapter = class {
     if (this.messageCount(first) > 0 || this.lastMessageSignature(first)) {
       return first;
     }
-    await new Promise((resolve12) => setTimeout(resolve12, 150));
+    await new Promise((resolve11) => setTimeout(resolve11, 150));
     const second = await this.readChat(evaluate);
     return this.messageCount(second) >= this.messageCount(first) ? second : first;
   }
@@ -16060,7 +16204,7 @@ var ProviderStreamAdapter = class {
       if (typeof data.error === "string" && data.error.trim()) return false;
     }
     for (let attempt = 0; attempt < 6; attempt += 1) {
-      await new Promise((resolve12) => setTimeout(resolve12, 250));
+      await new Promise((resolve11) => setTimeout(resolve11, 250));
       const state = await this.readChat(evaluate);
       const title = this.getStateTitle(state);
       if (this.titlesMatch(title, sessionId)) return true;
@@ -16982,6 +17126,7 @@ async function detectAllVersions(loader, archive) {
 var http2 = __toESM(require("http"));
 var fs14 = __toESM(require("fs"));
 var path22 = __toESM(require("path"));
+init_config();
 
 // src/daemon/scaffold-template.ts
 function generateFiles(type, name, category, opts = {}) {
@@ -18518,7 +18663,7 @@ function getCliTargetBundle(ctx, type, instanceId) {
   return { target, instance, adapter };
 }
 function sleep(ms) {
-  return new Promise((resolve12) => setTimeout(resolve12, ms));
+  return new Promise((resolve11) => setTimeout(resolve11, ms));
 }
 async function waitForCliReady(ctx, type, instanceId, timeoutMs) {
   const startedAt = Date.now();
@@ -19365,18 +19510,6 @@ function resolveAutoImplWritableProviderDir(ctx, category, type, requestedDir) {
   if (!fs13.existsSync(providerJson)) {
     return { dir: null, reason: `provider.json not found in writable provider directory: ${desiredDir}` };
   }
-  try {
-    const providerData = JSON.parse(fs13.readFileSync(providerJson, "utf-8"));
-    if (providerData.disableUpstream !== true) {
-      providerData.disableUpstream = true;
-      fs13.writeFileSync(providerJson, JSON.stringify(providerData, null, 2));
-    }
-  } catch (error) {
-    return {
-      dir: null,
-      reason: `Failed to update provider.json in writable provider directory: ${error.message}`
-    };
-  }
   return { dir: desiredDir };
 }
 function loadAutoImplReferenceScripts(ctx, referenceType) {
@@ -20663,6 +20796,7 @@ var DevServer = class _DevServer {
   cdpManagers;
   instanceManager;
   cliManager;
+  onProviderSourceConfigChanged;
   logFn;
   sseClients = [];
   watchScriptPath = null;
@@ -20679,6 +20813,7 @@ var DevServer = class _DevServer {
     this.cdpManagers = options.cdpManagers;
     this.instanceManager = options.instanceManager || null;
     this.cliManager = options.cliManager || null;
+    this.onProviderSourceConfigChanged = options.onProviderSourceConfigChanged || null;
     this.logFn = options.logFn || LOG.forComponent("DevServer").asLogFn();
   }
   log(msg) {
@@ -20688,6 +20823,8 @@ var DevServer = class _DevServer {
   routes = [
     // Static routes
     { method: "GET", pattern: "/api/providers", handler: (q, s) => this.handleListProviders(q, s) },
+    { method: "GET", pattern: "/api/providers/source-config", handler: (q, s) => this.handleGetProviderSourceConfig(q, s) },
+    { method: "POST", pattern: "/api/providers/source-config", handler: (q, s) => this.handleSetProviderSourceConfig(q, s) },
     { method: "GET", pattern: "/api/providers/versions", handler: (q, s) => this.handleDetectVersions(q, s) },
     { method: "POST", pattern: "/api/providers/reload", handler: (q, s) => this.handleReload(q, s) },
     { method: "POST", pattern: "/api/cdp/evaluate", handler: (q, s) => this.handleCdpEvaluate(q, s) },
@@ -20785,15 +20922,15 @@ var DevServer = class _DevServer {
         this.json(res, 500, { error: e.message });
       }
     });
-    return new Promise((resolve12, reject) => {
+    return new Promise((resolve11, reject) => {
       this.server.listen(port, "127.0.0.1", () => {
         this.log(`Dev server listening on http://127.0.0.1:${port}`);
-        resolve12();
+        resolve11();
       });
       this.server.on("error", (e) => {
         if (e.code === "EADDRINUSE") {
           this.log(`Port ${port} in use, skipping dev server`);
-          resolve12();
+          resolve11();
         } else {
           reject(e);
         }
@@ -20807,7 +20944,33 @@ var DevServer = class _DevServer {
   // ─── Handlers ───
   async handleListProviders(_req, res) {
     const providers = this.providerLoader.getAll().map(toProviderListEntry);
-    this.json(res, 200, { providers, count: providers.length });
+    this.json(res, 200, { providers, count: providers.length, sourceConfig: this.providerLoader.getSourceConfig() });
+  }
+  async handleGetProviderSourceConfig(_req, res) {
+    this.json(res, 200, { success: true, sourceConfig: this.providerLoader.getSourceConfig() });
+  }
+  async handleSetProviderSourceConfig(req, res) {
+    const body = await this.readBody(req);
+    const parsed = parseProviderSourceConfigUpdate(body || {});
+    if (!parsed.ok) {
+      this.json(res, 400, { success: false, error: parsed.error });
+      return;
+    }
+    const currentConfig2 = loadConfig();
+    const nextConfig = {
+      ...currentConfig2,
+      ...parsed.updates.providerSourceMode ? { providerSourceMode: parsed.updates.providerSourceMode } : {},
+      ...Object.prototype.hasOwnProperty.call(parsed.updates, "providerDir") ? { providerDir: parsed.updates.providerDir } : {}
+    };
+    saveConfig(nextConfig);
+    const sourceConfig = this.providerLoader.applySourceConfig({
+      sourceMode: nextConfig.providerSourceMode,
+      userDir: Object.prototype.hasOwnProperty.call(parsed.updates, "providerDir") ? parsed.updates.providerDir : this.providerLoader.getSourceConfig().explicitProviderDir || void 0
+    });
+    this.providerLoader.reload();
+    this.providerLoader.registerToDetector();
+    await this.onProviderSourceConfigChanged?.();
+    this.json(res, 200, { success: true, reloaded: true, sourceConfig });
   }
   async handleProviderConfig(type, _req, res) {
     const provider = this.providerLoader.resolve(type);
@@ -20849,20 +21012,20 @@ var DevServer = class _DevServer {
       child.stderr?.on("data", (d) => {
         stderr += d.toString().slice(0, 2e3);
       });
-      await new Promise((resolve12) => {
+      await new Promise((resolve11) => {
         const timer = setTimeout(() => {
           child.kill();
-          resolve12();
+          resolve11();
         }, 3e3);
         child.on("exit", () => {
           clearTimeout(timer);
-          resolve12();
+          resolve11();
         });
         child.stdout?.once("data", () => {
           setTimeout(() => {
             child.kill();
             clearTimeout(timer);
-            resolve12();
+            resolve11();
           }, 500);
         });
       });
@@ -21358,14 +21521,14 @@ var DevServer = class _DevServer {
       child.stderr?.on("data", (d) => {
         stderr += d.toString();
       });
-      await new Promise((resolve12) => {
+      await new Promise((resolve11) => {
         const timer = setTimeout(() => {
           child.kill();
-          resolve12();
+          resolve11();
         }, timeout);
         child.on("exit", () => {
           clearTimeout(timer);
-          resolve12();
+          resolve11();
         });
       });
       const elapsed = Date.now() - start;
@@ -21510,18 +21673,6 @@ var DevServer = class _DevServer {
     if (!fs14.existsSync(providerJson)) {
       return { dir: null, reason: `provider.json not found in writable provider directory: ${desiredDir}` };
     }
-    try {
-      const providerData = JSON.parse(fs14.readFileSync(providerJson, "utf-8"));
-      if (providerData.disableUpstream !== true) {
-        providerData.disableUpstream = true;
-        fs14.writeFileSync(providerJson, JSON.stringify(providerData, null, 2));
-      }
-    } catch (error) {
-      return {
-        dir: null,
-        reason: `Failed to update provider.json in writable provider directory: ${error.message}`
-      };
-    }
     return { dir: desiredDir };
   }
   async handleAutoImplement(type, req, res) {
@@ -22047,14 +22198,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({});
         }
       });
     });
@@ -22532,7 +22683,7 @@ async function waitForReady(endpoint, timeoutMs = STARTUP_TIMEOUT_MS) {
   const deadline = Date.now() + timeoutMs;
   while (Date.now() < deadline) {
     if (await canConnect(endpoint)) return;
-    await new Promise((resolve12) => setTimeout(resolve12, STARTUP_POLL_MS));
+    await new Promise((resolve11) => setTimeout(resolve11, STARTUP_POLL_MS));
   }
   throw new Error(`Session host did not become ready within ${timeoutMs}ms`);
 }
@@ -22763,10 +22914,10 @@ async function installExtension(ide, extension) {
         const buffer = Buffer.from(await res.arrayBuffer());
         const fs15 = await import("fs");
         fs15.writeFileSync(vsixPath, buffer);
-        return new Promise((resolve12) => {
+        return new Promise((resolve11) => {
           const cmd = `"${ide.cliCommand}" --install-extension "${vsixPath}" --force`;
           (0, import_child_process10.exec)(cmd, { timeout: 6e4 }, (error, _stdout, stderr) => {
-            resolve12({
+            resolve11({
               extensionId: extension.id,
               marketplaceId: extension.marketplaceId,
               success: !error,
@@ -22779,11 +22930,11 @@ async function installExtension(ide, extension) {
     } catch (e) {
     }
   }
-  return new Promise((resolve12) => {
+  return new Promise((resolve11) => {
     const cmd = `"${ide.cliCommand}" --install-extension ${extension.marketplaceId} --force`;
     (0, import_child_process10.exec)(cmd, { timeout: 6e4 }, (error, stdout, stderr) => {
       if (error) {
-        resolve12({
+        resolve11({
           extensionId: extension.id,
           marketplaceId: extension.marketplaceId,
           success: false,
@@ -22791,7 +22942,7 @@ async function installExtension(ide, extension) {
           error: stderr || error.message
         });
       } else {
-        resolve12({
+        resolve11({
           extensionId: extension.id,
           marketplaceId: extension.marketplaceId,
           success: true,
@@ -22888,10 +23039,11 @@ init_config();
 async function initDaemonComponents(config) {
   installGlobalInterceptor();
   const appConfig = loadConfig();
-  const disableUpstream = appConfig.disableUpstream ?? false;
+  const providerSourceMode = appConfig.providerSourceMode || "normal";
+  const disableUpstream = providerSourceMode === "no-upstream";
   const providerLoader = new ProviderLoader({
     logFn: config.providerLogFn,
-    disableUpstream,
+    sourceMode: providerSourceMode,
     userDir: appConfig.providerDir
   });
   if (!disableUpstream && !providerLoader.hasUpstream()) {
@@ -22996,6 +23148,10 @@ async function initDaemonComponents(config) {
     onProviderSettingChanged: async (providerType) => {
       await refreshProviderAvailability(providerType);
       config.onStatusChange?.();
+    },
+    onProviderSourceConfigChanged: async () => {
+      await refreshProviderAvailability();
+      config.onStatusChange?.();
     }
   });
   agentStreamManager = new DaemonAgentStreamManager(
@@ -23045,7 +23201,8 @@ async function initDaemonComponents(config) {
     cdpInitializer,
     cdpManagers,
     sessionRegistry,
-    detectedIdes: detectedIdesRef
+    detectedIdes: detectedIdesRef,
+    refreshProviderAvailability
   };
 }
 async function startDaemonDevSupport(options) {
@@ -23054,7 +23211,10 @@ async function startDaemonDevSupport(options) {
     cdpManagers: options.components.cdpManagers,
     instanceManager: options.components.instanceManager,
     cliManager: options.components.cliManager,
-    logFn: options.logFn
+    logFn: options.logFn,
+    onProviderSourceConfigChanged: async () => {
+      await options.components.refreshProviderAvailability();
+    }
   });
   await devServer.start();
   options.components.providerLoader.watch();
@@ -23181,6 +23341,7 @@ async function shutdownDaemonComponents(components) {
   normalizeInputEnvelope,
   normalizeManagedStatus,
   normalizeMessageParts,
+  parseProviderSourceConfigUpdate,
   partitionSessionHostDiagnosticsSessions,
   partitionSessionHostRecords,
   probeCdpPort,