@adhdev/daemon-standalone 0.8.57 → 0.8.58

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,
@@ -31412,15 +31420,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 +31635,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 +31651,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 +31700,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 +31711,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 +31721,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 +31749,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 +31759,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 +31792,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 +31806,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 +31816,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 +31845,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 +31909,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 +32162,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 +32171,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 +32372,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 +32411,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)) {
@@ -33306,6 +33314,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 +33557,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 +33570,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 +33588,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);
@@ -35892,7 +35930,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 +35938,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 +37127,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,6 +37256,38 @@ ${effect.notification.body || ""}`.trim();
       }
       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 = 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) {
       const normalizedArgs = { ...args || {} };
       for (const key of ["mode", "model", "message", "action", "button", "text", "sessionId", "value"]) {
@@ -37887,6 +37977,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 +38020,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 +38032,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 +38052,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 +38074,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 +38086,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 +38134,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 +38146,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;
@@ -38327,6 +38438,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) {
@@ -38676,6 +38788,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,
@@ -39255,13 +39368,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);
             });
@@ -40565,6 +40678,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 +40738,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 +40756,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 +40789,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 +40866,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 +41377,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 +41399,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 +41417,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 +41426,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 +41490,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 +41510,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
               res.pipe(ws2);
               ws2.on("finish", () => {
                 ws2.close();
-                resolve12();
+                resolve11();
               });
               ws2.on("error", reject);
             });
@@ -41844,17 +41983,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 +42002,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);
         });
       });
     }
@@ -42591,7 +42730,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 +42845,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");
       }
@@ -42997,8 +43136,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 +43159,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,
+                  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
@@ -43634,7 +43774,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 +43796,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;
       }
@@ -43796,7 +43936,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;
@@ -44706,6 +44846,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") {
@@ -46234,7 +46375,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();
@@ -47079,18 +47220,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) {
@@ -48375,6 +48504,7 @@ data: ${JSON.stringify(msg.data)}
       cdpManagers;
       instanceManager;
       cliManager;
+      onProviderSourceConfigChanged;
       logFn;
       sseClients = [];
       watchScriptPath = null;
@@ -48391,6 +48521,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 +48531,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 +48630,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 +48652,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 +48720,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 +49229,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 +49381,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) {
@@ -49759,14 +49906,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 +50383,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`);
     }
@@ -50461,10 +50608,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 +50624,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 +50636,7 @@ data: ${JSON.stringify(msg.data)}
               error: stderr || error48.message
             });
           } else {
-            resolve12({
+            resolve11({
               extensionId: extension.id,
               marketplaceId: extension.marketplaceId,
               success: true,
@@ -50582,10 +50729,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 +50838,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 +50891,8 @@ data: ${JSON.stringify(msg.data)}
         cdpInitializer,
         cdpManagers,
         sessionRegistry,
-        detectedIdes: detectedIdesRef
+        detectedIdes: detectedIdesRef,
+        refreshProviderAvailability
       };
     }
     async function startDaemonDevSupport2(options) {
@@ -50748,7 +50901,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();