adhdev 0.8.56 → 0.8.58

package/dist/index.js

@@ -44,9 +44,16 @@ __export(config_exports, {
   loadConfig: () => loadConfig,
   markSetupComplete: () => markSetupComplete,
   resetConfig: () => resetConfig,
+  resolveProviderSourceMode: () => resolveProviderSourceMode,
   saveConfig: () => saveConfig,
   updateConfig: () => updateConfig
 });
+function resolveProviderSourceMode(providerSourceMode, legacyDisableUpstream) {
+  if (providerSourceMode === "normal" || providerSourceMode === "no-upstream") {
+    return providerSourceMode;
+  }
+  return legacyDisableUpstream === true ? "no-upstream" : "normal";
+}
 function isPlainObject(value) {
   return !!value && typeof value === "object" && !Array.isArray(value);
 }
@@ -84,7 +91,7 @@ function normalizeConfig(raw) {
     registeredMachineId: asOptionalString(parsed.registeredMachineId),
     providerSettings: isPlainObject(parsed.providerSettings) ? parsed.providerSettings : {},
     ideSettings: isPlainObject(parsed.ideSettings) ? parsed.ideSettings : {},
-    disableUpstream: asBoolean(parsed.disableUpstream, DEFAULT_CONFIG.disableUpstream ?? false),
+    providerSourceMode: resolveProviderSourceMode(parsed.providerSourceMode, parsed.disableUpstream),
     providerDir: asOptionalString(parsed.providerDir),
     terminalSizingMode: parsed.terminalSizingMode === "fit" ? "fit" : "measured"
   };
@@ -233,7 +240,7 @@ var init_config = __esm({
       registeredMachineId: void 0,
       providerSettings: {},
       ideSettings: {},
-      disableUpstream: false,
+      providerSourceMode: "normal",
       terminalSizingMode: "measured"
     };
     MACHINE_ID_PREFIX = "mach_";
@@ -733,15 +740,15 @@ function resolveCommandPath(command) {
   return null;
 }
 function execAsync(cmd, timeoutMs = 5e3) {
-  return new Promise((resolve16) => {
+  return new Promise((resolve15) => {
     const child = (0, import_child_process2.exec)(cmd, { encoding: "utf-8", timeout: timeoutMs }, (err, stdout) => {
       if (err || !stdout?.trim()) {
-        resolve16(null);
+        resolve15(null);
       } else {
-        resolve16(stdout.trim());
+        resolve15(stdout.trim());
       }
     });
-    child.on("error", () => resolve16(null));
+    child.on("error", () => resolve15(null));
   });
 }
 async function detectCLIs(providerLoader, options) {
@@ -1187,7 +1194,7 @@ var init_manager = __esm({
       * Returns multiple entries if multiple IDE windows are open on same port
       */
       static listAllTargets(port) {
-        return new Promise((resolve16) => {
+        return new Promise((resolve15) => {
           const req = http.get(`http://127.0.0.1:${port}/json`, (res) => {
             let data = "";
             res.on("data", (chunk) => data += chunk.toString());
@@ -1203,16 +1210,16 @@ var init_manager = __esm({
                   (t) => !isNonMain(t.title || "") && t.url?.includes("workbench.html") && !t.url?.includes("agent")
                 );
                 const fallbackPages = pages.filter((t) => !isNonMain(t.title || ""));
-                resolve16(mainPages.length > 0 ? mainPages : fallbackPages);
+                resolve15(mainPages.length > 0 ? mainPages : fallbackPages);
               } catch {
-                resolve16([]);
+                resolve15([]);
               }
             });
           });
-          req.on("error", () => resolve16([]));
+          req.on("error", () => resolve15([]));
           req.setTimeout(2e3, () => {
             req.destroy();
-            resolve16([]);
+            resolve15([]);
           });
         });
       }
@@ -1252,7 +1259,7 @@ var init_manager = __esm({
         }
       }
       findTargetOnPort(port) {
-        return new Promise((resolve16) => {
+        return new Promise((resolve15) => {
           const req = http.get(`http://127.0.0.1:${port}/json`, (res) => {
             let data = "";
             res.on("data", (chunk) => data += chunk.toString());
@@ -1263,7 +1270,7 @@ var init_manager = __esm({
                   (t) => (t.type === "page" || t.type === "browser" || t.type === "Page") && t.webSocketDebuggerUrl
                 );
                 if (pages.length === 0) {
-                  resolve16(targets.find((t) => t.webSocketDebuggerUrl) || null);
+                  resolve15(targets.find((t) => t.webSocketDebuggerUrl) || null);
                   return;
                 }
                 const mainPages = pages.filter((t) => !this.isNonMainTitle(t.title || ""));
@@ -1273,24 +1280,24 @@ var init_manager = __esm({
                   const specific = list.find((t) => t.id === this._targetId);
                   if (specific) {
                     this._pageTitle = specific.title || "";
-                    resolve16(specific);
+                    resolve15(specific);
                   } else {
                     this.log(`[CDP] Target ${this._targetId} not found in page list`);
-                    resolve16(null);
+                    resolve15(null);
                   }
                   return;
                 }
                 this._pageTitle = list[0]?.title || "";
-                resolve16(list[0]);
+                resolve15(list[0]);
               } catch {
-                resolve16(null);
+                resolve15(null);
               }
             });
           });
-          req.on("error", () => resolve16(null));
+          req.on("error", () => resolve15(null));
           req.setTimeout(2e3, () => {
             req.destroy();
-            resolve16(null);
+            resolve15(null);
           });
         });
       }
@@ -1301,7 +1308,7 @@ var init_manager = __esm({
         this.extensionProviders = providers;
       }
       connectToTarget(wsUrl) {
-        return new Promise((resolve16) => {
+        return new Promise((resolve15) => {
           this.ws = new import_ws.default(wsUrl);
           this.ws.on("open", async () => {
             this._connected = true;
@@ -1311,17 +1318,17 @@ var init_manager = __esm({
             }
             this.connectBrowserWs().catch(() => {
             });
-            resolve16(true);
+            resolve15(true);
           });
           this.ws.on("message", (data) => {
             try {
               const msg = JSON.parse(data.toString());
               if (msg.id && this.pending.has(msg.id)) {
-                const { resolve: resolve17, reject } = this.pending.get(msg.id);
+                const { resolve: resolve16, reject } = this.pending.get(msg.id);
                 this.pending.delete(msg.id);
                 this.failureCount = 0;
                 if (msg.error) reject(new Error(msg.error.message));
-                else resolve17(msg.result);
+                else resolve16(msg.result);
               } else if (msg.method === "Runtime.executionContextCreated") {
                 this.contexts.add(msg.params.context.id);
               } else if (msg.method === "Runtime.executionContextDestroyed") {
@@ -1344,7 +1351,7 @@ var init_manager = __esm({
           this.ws.on("error", (err) => {
             this.log(`[CDP] WebSocket error: ${err.message}`);
             this._connected = false;
-            resolve16(false);
+            resolve15(false);
           });
         });
       }
@@ -1358,7 +1365,7 @@ var init_manager = __esm({
             return;
           }
           this.log(`[CDP] Connecting browser WS for target discovery...`);
-          await new Promise((resolve16, reject) => {
+          await new Promise((resolve15, reject) => {
             this.browserWs = new import_ws.default(browserWsUrl);
             this.browserWs.on("open", async () => {
               this._browserConnected = true;
@@ -1368,16 +1375,16 @@ var init_manager = __esm({
               } catch (e) {
                 this.log(`[CDP] setDiscoverTargets failed: ${e.message}`);
               }
-              resolve16();
+              resolve15();
             });
             this.browserWs.on("message", (data) => {
               try {
                 const msg = JSON.parse(data.toString());
                 if (msg.id && this.browserPending.has(msg.id)) {
-                  const { resolve: resolve17, reject: reject2 } = this.browserPending.get(msg.id);
+                  const { resolve: resolve16, reject: reject2 } = this.browserPending.get(msg.id);
                   this.browserPending.delete(msg.id);
                   if (msg.error) reject2(new Error(msg.error.message));
-                  else resolve17(msg.result);
+                  else resolve16(msg.result);
                 }
               } catch {
               }
@@ -1397,31 +1404,31 @@ var init_manager = __esm({
         }
       }
       getBrowserWsUrl() {
-        return new Promise((resolve16) => {
+        return new Promise((resolve15) => {
           const req = http.get(`http://127.0.0.1:${this.port}/json/version`, (res) => {
             let data = "";
             res.on("data", (chunk) => data += chunk.toString());
             res.on("end", () => {
               try {
                 const info = JSON.parse(data);
-                resolve16(info.webSocketDebuggerUrl || null);
+                resolve15(info.webSocketDebuggerUrl || null);
               } catch {
-                resolve16(null);
+                resolve15(null);
               }
             });
           });
-          req.on("error", () => resolve16(null));
+          req.on("error", () => resolve15(null));
           req.setTimeout(3e3, () => {
             req.destroy();
-            resolve16(null);
+            resolve15(null);
           });
         });
       }
       sendBrowser(method, params = {}, timeoutMs = 15e3) {
-        return new Promise((resolve16, reject) => {
+        return new Promise((resolve15, reject) => {
           if (!this.browserWs || !this._browserConnected) return reject(new Error("Browser WS not connected"));
           const id = this.browserMsgId++;
-          this.browserPending.set(id, { resolve: resolve16, reject });
+          this.browserPending.set(id, { resolve: resolve15, reject });
           this.browserWs.send(JSON.stringify({ id, method, params }));
           setTimeout(() => {
             if (this.browserPending.has(id)) {
@@ -1461,11 +1468,11 @@ var init_manager = __esm({
       }
       // ─── CDP Protocol ────────────────────────────────────────
       sendInternal(method, params = {}, timeoutMs = 15e3) {
-        return new Promise((resolve16, reject) => {
+        return new Promise((resolve15, reject) => {
           if (!this.ws || !this._connected) return reject(new Error("CDP not connected"));
           if (this.ws.readyState !== import_ws.default.OPEN) return reject(new Error("WebSocket not open"));
           const id = this.msgId++;
-          this.pending.set(id, { resolve: resolve16, reject });
+          this.pending.set(id, { resolve: resolve15, reject });
           this.ws.send(JSON.stringify({ id, method, params }));
           setTimeout(() => {
             if (this.pending.has(id)) {
@@ -1714,7 +1721,7 @@ var init_manager = __esm({
         const browserWs = this.browserWs;
         let msgId = this.browserMsgId;
         const sendWs = (method, params = {}, sessionId) => {
-          return new Promise((resolve16, reject) => {
+          return new Promise((resolve15, reject) => {
             const mid = msgId++;
             this.browserMsgId = msgId;
             const handler = (raw) => {
@@ -1723,7 +1730,7 @@ var init_manager = __esm({
                 if (msg.id === mid) {
                   browserWs.removeListener("message", handler);
                   if (msg.error) reject(new Error(msg.error.message || JSON.stringify(msg.error)));
-                  else resolve16(msg.result);
+                  else resolve15(msg.result);
                 }
               } catch {
               }
@@ -1924,14 +1931,14 @@ var init_manager = __esm({
         if (!ws || ws.readyState !== import_ws.default.OPEN) {
           throw new Error("CDP not connected");
         }
-        return new Promise((resolve16, reject) => {
+        return new Promise((resolve15, reject) => {
           const id = getNextId();
           pendingMap.set(id, {
             resolve: (result) => {
               if (result?.result?.subtype === "error") {
                 reject(new Error(result.result.description));
               } else {
-                resolve16(result?.result?.value);
+                resolve15(result?.result?.value);
               }
             },
             reject
@@ -1963,10 +1970,10 @@ var init_manager = __esm({
           throw new Error("CDP not connected");
         }
         const sendViaSession = (method, params = {}) => {
-          return new Promise((resolve16, reject) => {
+          return new Promise((resolve15, reject) => {
             const pendingMap = this._browserConnected ? this.browserPending : this.pending;
             const id = this._browserConnected ? this.browserMsgId++ : this.msgId++;
-            pendingMap.set(id, { resolve: resolve16, reject });
+            pendingMap.set(id, { resolve: resolve15, reject });
             ws.send(JSON.stringify({ id, sessionId, method, params }));
             setTimeout(() => {
               if (pendingMap.has(id)) {
@@ -2801,6 +2808,7 @@ function listSavedHistorySessions(agentType, options = {}) {
       let lastMessageAt = 0;
       let sessionTitle = "";
       let preview = "";
+      let workspace = "";
       for (const file2 of files.sort()) {
         const filePath = path7.join(dir, file2);
         const content = fs3.readFileSync(filePath, "utf-8");
@@ -2813,6 +2821,10 @@ function listSavedHistorySessions(agentType, options = {}) {
             parsed = null;
           }
           if (!parsed || parsed.historySessionId !== historySessionId) continue;
+          if (parsed.kind === "session_start") {
+            if (!workspace && parsed.workspace) workspace = parsed.workspace;
+            continue;
+          }
           messageCount += 1;
           if (!firstMessageAt || parsed.receivedAt < firstMessageAt) firstMessageAt = parsed.receivedAt;
           if (!lastMessageAt || parsed.receivedAt > lastMessageAt) lastMessageAt = parsed.receivedAt;
@@ -2827,7 +2839,8 @@ function listSavedHistorySessions(agentType, options = {}) {
         messageCount,
         firstMessageAt,
         lastMessageAt,
-        preview: preview || void 0
+        preview: preview || void 0,
+        workspace: workspace || void 0
       });
     }
     summaries.sort((a, b) => b.lastMessageAt - a.lastMessageAt);
@@ -3010,6 +3023,30 @@ var init_chat_history = __esm({
           options.historySessionId
         );
       }
+      writeSessionStart(agentType, historySessionId, workspace, instanceId) {
+        const id = String(historySessionId || "").trim();
+        const ws = String(workspace || "").trim();
+        if (!id || !ws) return;
+        try {
+          const dir = path7.join(HISTORY_DIR, this.sanitize(agentType));
+          fs3.mkdirSync(dir, { recursive: true });
+          const date5 = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
+          const filePath = path7.join(dir, `${this.sanitize(id)}_${date5}.jsonl`);
+          const record2 = {
+            ts: (/* @__PURE__ */ new Date()).toISOString(),
+            receivedAt: Date.now(),
+            role: "system",
+            kind: "session_start",
+            content: ws,
+            agent: agentType,
+            instanceId,
+            historySessionId: id,
+            workspace: ws
+          };
+          fs3.appendFileSync(filePath, JSON.stringify(record2) + "\n", "utf-8");
+        } catch {
+        }
+      }
       promoteHistorySession(agentType, previousHistorySessionId, nextHistorySessionId) {
         const fromId = String(previousHistorySessionId || "").trim();
         const toId = String(nextHistorySessionId || "").trim();
@@ -5602,7 +5639,7 @@ function getStateLastSignature(state) {
 async function getStableExtensionBaseline(h) {
   const first = await readExtensionChatState(h);
   if (getStateMessageCount(first) > 0 || getStateLastSignature(first)) return first;
-  await new Promise((resolve16) => setTimeout(resolve16, 150));
+  await new Promise((resolve15) => setTimeout(resolve15, 150));
   const second = await readExtensionChatState(h);
   return getStateMessageCount(second) >= getStateMessageCount(first) ? second : first;
 }
@@ -5610,7 +5647,7 @@ async function verifyExtensionSendObserved(h, before) {
   const beforeCount = getStateMessageCount(before);
   const beforeSignature = getStateLastSignature(before);
   for (let attempt = 0; attempt < 12; attempt += 1) {
-    await new Promise((resolve16) => setTimeout(resolve16, 250));
+    await new Promise((resolve15) => setTimeout(resolve15, 250));
     const state = await readExtensionChatState(h);
     if (state?.status === "waiting_approval") return true;
     const afterCount = getStateMessageCount(state);
@@ -6820,6 +6857,32 @@ var init_cdp_commands = __esm({
   }
 });
 
+// ../../oss/packages/daemon-core/src/config/provider-source-config.ts
+function normalizeProviderDir(value) {
+  if (typeof value !== "string") return void 0;
+  const trimmed = value.trim();
+  return trimmed ? trimmed : void 0;
+}
+function parseProviderSourceConfigUpdate(input) {
+  const updates = {};
+  if (Object.prototype.hasOwnProperty.call(input, "providerSourceMode")) {
+    const { providerSourceMode } = input;
+    if (providerSourceMode !== "normal" && providerSourceMode !== "no-upstream") {
+      return { ok: false, error: "providerSourceMode must be 'normal' or 'no-upstream'" };
+    }
+    updates.providerSourceMode = providerSourceMode;
+  }
+  if (Object.prototype.hasOwnProperty.call(input, "providerDir")) {
+    updates.providerDir = normalizeProviderDir(input.providerDir);
+  }
+  return { ok: true, updates };
+}
+var init_provider_source_config = __esm({
+  "../../oss/packages/daemon-core/src/config/provider-source-config.ts"() {
+    "use strict";
+  }
+});
+
 // ../../oss/packages/daemon-core/src/providers/cli-script-results.ts
 function parseCliScriptResult(result) {
   if (typeof result === "string") {
@@ -6936,6 +6999,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"]) {
@@ -7129,6 +7224,8 @@ function handleSetIdeExtension(h, args) {
 var init_stream_commands = __esm({
   "../../oss/packages/daemon-core/src/commands/stream-commands.ts"() {
     "use strict";
+    init_config();
+    init_provider_source_config();
     init_cli_script_results();
     init_control_effects();
     init_logger();
@@ -7656,6 +7753,10 @@ var init_handler = __esm({
             return handleGetProviderSettings(this, args);
           case "set_provider_setting":
             return handleSetProviderSetting(this, args);
+          case "get_provider_source_config":
+            return handleGetProviderSourceConfig(this, args);
+          case "set_provider_source_config":
+            return handleSetProviderSourceConfig(this, args);
           // ─── IDE Extension Settings (stream-commands.ts) ──────────
           case "get_ide_extensions":
             return handleGetIdeExtensions(this, args);
@@ -7695,7 +7796,7 @@ var init_handler = __esm({
         try {
           const http3 = await import("http");
           const postData = JSON.stringify(body);
-          const result = await new Promise((resolve16, reject) => {
+          const result = await new Promise((resolve15, reject) => {
             const req = http3.request({
               hostname: "127.0.0.1",
               port: 19280,
@@ -7707,9 +7808,9 @@ var init_handler = __esm({
               res.on("data", (chunk) => data += chunk);
               res.on("end", () => {
                 try {
-                  resolve16(JSON.parse(data));
+                  resolve15(JSON.parse(data));
                 } catch {
-                  resolve16({ raw: data });
+                  resolve15({ raw: data });
                 }
               });
             });
@@ -7727,15 +7828,15 @@ var init_handler = __esm({
         if (!providerType) return { success: false, error: "providerType required" };
         try {
           const http3 = await import("http");
-          const result = await new Promise((resolve16, reject) => {
+          const result = await new Promise((resolve15, reject) => {
             http3.get(`http://127.0.0.1:19280/api/providers/${providerType}/${endpoint}`, (res) => {
               let data = "";
               res.on("data", (chunk) => data += chunk);
               res.on("end", () => {
                 try {
-                  resolve16(JSON.parse(data));
+                  resolve15(JSON.parse(data));
                 } catch {
-                  resolve16({ raw: data });
+                  resolve15({ raw: data });
                 }
               });
             }).on("error", reject);
@@ -7749,7 +7850,7 @@ var init_handler = __esm({
         try {
           const http3 = await import("http");
           const postData = JSON.stringify(args || {});
-          const result = await new Promise((resolve16, reject) => {
+          const result = await new Promise((resolve15, reject) => {
             const req = http3.request({
               hostname: "127.0.0.1",
               port: 19280,
@@ -7761,9 +7862,9 @@ var init_handler = __esm({
               res.on("data", (chunk) => data += chunk);
               res.on("end", () => {
                 try {
-                  resolve16(JSON.parse(data));
+                  resolve15(JSON.parse(data));
                 } catch {
-                  resolve16({ raw: data });
+                  resolve15({ raw: data });
                 }
               });
             });
@@ -9947,7 +10048,7 @@ var init_provider_cli_adapter = __esm({
               `[${this.cliType}] Waiting for interactive prompt: hasPrompt=${hasPrompt} stableMs=${stableMs} recentOutputMs=${recentlyOutput} status=${status} startup=${startupLikelyActive} screen=${JSON.stringify(summarizeCliTraceText(screenText, 220)).slice(0, 260)}`
             );
           }
-          await new Promise((resolve16) => setTimeout(resolve16, 50));
+          await new Promise((resolve15) => setTimeout(resolve15, 50));
         }
         const finalScreenText = this.terminalScreen.getText() || "";
         LOG.warn(
@@ -10520,7 +10621,7 @@ ${data.message || ""}`.trim();
           const deadline = Date.now() + 1e4;
           while (this.startupParseGate && Date.now() < deadline) {
             this.resolveStartupState("send_wait");
-            await new Promise((resolve16) => setTimeout(resolve16, 50));
+            await new Promise((resolve15) => setTimeout(resolve15, 50));
           }
         }
         await this.waitForInteractivePrompt();
@@ -10590,12 +10691,12 @@ ${data.message || ""}`.trim();
             if (this.isWaitingForResponse) this.finishResponse();
           }, this.timeouts.maxResponse);
         };
-        await new Promise((resolve16) => {
+        await new Promise((resolve15) => {
           let resolved = false;
           const resolveOnce = () => {
             if (resolved) return;
             resolved = true;
-            resolve16();
+            resolve15();
           };
           const submit = () => {
             if (!this.ptyProcess) {
@@ -10769,17 +10870,17 @@ ${data.message || ""}`.trim();
         }
       }
       waitForStopped(timeoutMs) {
-        return new Promise((resolve16) => {
+        return new Promise((resolve15) => {
           const startedAt = Date.now();
           const timer = setInterval(() => {
             if (!this.ptyProcess || this.currentStatus === "stopped") {
               clearInterval(timer);
-              resolve16(true);
+              resolve15(true);
               return;
             }
             if (Date.now() - startedAt >= timeoutMs) {
               clearInterval(timer);
-              resolve16(false);
+              resolve15(false);
             }
           }, 100);
         });
@@ -11069,6 +11170,9 @@ function getForcedNewSessionScriptName(provider, launchMode) {
   const controls = Array.isArray(provider.controls) ? provider.controls : [];
   for (const control of controls) {
     if (control?.type !== "action") continue;
+    if (typeof control?.confirmTitle === "string" && control.confirmTitle.trim()) continue;
+    if (typeof control?.confirmMessage === "string" && control.confirmMessage.trim()) continue;
+    if (typeof control?.confirmLabel === "string" && control.confirmLabel.trim()) continue;
     const invokeScript = typeof control?.invokeScript === "string" ? control.invokeScript.trim() : "";
     if (!invokeScript) continue;
     const controlId = typeof control?.id === "string" ? control.id.trim() : "";
@@ -11078,6 +11182,20 @@ function getForcedNewSessionScriptName(provider, launchMode) {
   }
   return null;
 }
+async function waitForCliAdapterReady(adapter, options) {
+  const timeoutMs = Math.max(100, options?.timeoutMs ?? 15e3);
+  const pollMs = Math.max(10, options?.pollMs ?? 50);
+  const deadline = Date.now() + timeoutMs;
+  while (Date.now() < deadline) {
+    if (adapter?.isReady?.()) return;
+    const status = adapter?.getStatus?.()?.status;
+    if (status === "stopped") {
+      throw new Error("CLI runtime stopped before it became ready");
+    }
+    await new Promise((resolve15) => setTimeout(resolve15, pollMs));
+  }
+  throw new Error(`CLI runtime did not become ready within ${timeoutMs}ms`);
+}
 var os13, path11, crypto3, fs5, import_node_module, CachedDatabaseSync, CliProviderInstance;
 var init_cli_provider_instance = __esm({
   "../../oss/packages/daemon-core/src/providers/cli-provider-instance.ts"() {
@@ -11374,6 +11492,7 @@ var init_cli_provider_instance = __esm({
         const scriptName = getForcedNewSessionScriptName(this.provider, this.launchMode);
         if (!scriptName) return;
         LOG.info("CLI", `[${this.type}] forcing fresh session launch via script: ${scriptName}`);
+        await waitForCliAdapterReady(this.adapter);
         const raw = await this.adapter.invokeScript(scriptName, {});
         const parsed = parseCliScriptResult(raw);
         if (!parsed.success) {
@@ -11723,6 +11842,7 @@ ${effect.notification.body || ""}`.trim();
         const previousProviderSessionId = this.providerSessionId;
         this.providerSessionId = nextSessionId;
         this.historyWriter.promoteHistorySession(this.type, previousHistorySessionId, nextSessionId);
+        this.historyWriter.writeSessionStart(this.type, nextSessionId, this.workingDir, this.instanceId);
         this.adapter.updateRuntimeMeta({ providerSessionId: nextSessionId });
         this.onProviderSessionResolved?.({
           instanceId: this.instanceId,
@@ -27826,8 +27946,8 @@ var init_acp = __esm({
         this.#requestHandler = requestHandler;
         this.#notificationHandler = notificationHandler;
         this.#stream = stream;
-        this.#closedPromise = new Promise((resolve16) => {
-          this.#abortController.signal.addEventListener("abort", () => resolve16());
+        this.#closedPromise = new Promise((resolve15) => {
+          this.#abortController.signal.addEventListener("abort", () => resolve15());
         });
         this.#receive();
       }
@@ -27976,8 +28096,8 @@ var init_acp = __esm({
       }
       async sendRequest(method, params) {
         const id = this.#nextRequestId++;
-        const responsePromise = new Promise((resolve16, reject) => {
-          this.#pendingResponses.set(id, { resolve: resolve16, reject });
+        const responsePromise = new Promise((resolve15, reject) => {
+          this.#pendingResponses.set(id, { resolve: resolve15, reject });
         });
         await this.#sendMessage({ jsonrpc: "2.0", id, method, params });
         return responsePromise;
@@ -28613,13 +28733,13 @@ var init_acp_provider_instance = __esm({
             }
             this.currentStatus = "waiting_approval";
             this.detectStatusTransition();
-            const approved = await new Promise((resolve16) => {
-              this.permissionResolvers.push(resolve16);
+            const approved = await new Promise((resolve15) => {
+              this.permissionResolvers.push(resolve15);
               setTimeout(() => {
-                const idx = this.permissionResolvers.indexOf(resolve16);
+                const idx = this.permissionResolvers.indexOf(resolve15);
                 if (idx >= 0) {
                   this.permissionResolvers.splice(idx, 1);
-                  resolve16(false);
+                  resolve15(false);
                 }
               }, 3e5);
             });
@@ -30750,7 +30870,7 @@ var init_handler2 = __esm({
             this._addToNodeFs(path30, initialAdd, wh, depth + 1);
           }
         }).on(EV.ERROR, this._boundHandleError);
-        return new Promise((resolve16, reject) => {
+        return new Promise((resolve15, reject) => {
           if (!stream)
             return reject();
           stream.once(STR_END, () => {
@@ -30759,7 +30879,7 @@ var init_handler2 = __esm({
               return;
             }
             const wasThrottled = throttler ? throttler.clear() : false;
-            resolve16(void 0);
+            resolve15(void 0);
             previous.getChildren().filter((item) => {
               return item !== directory && !current.has(item);
             }).forEach((item) => {
@@ -31644,6 +31764,9 @@ function validateProviderDefinition(raw) {
       warnings.push(`Unknown provider field: ${key}`);
     }
   }
+  if (provider.disableUpstream !== void 0) {
+    warnings.push("disableUpstream is deprecated in provider definitions; use machine-level provider source policy instead");
+  }
   const category = provider.category;
   if (category === "cli" || category === "acp") {
     const spawn6 = provider.spawn;
@@ -31773,8 +31896,11 @@ var init_provider_loader = __esm({
     ProviderLoader = class _ProviderLoader {
       providers = /* @__PURE__ */ new Map();
       providerAvailability = /* @__PURE__ */ new Map();
+      defaultProvidersDir;
+      explicitProviderDir = null;
       userDir;
       upstreamDir;
+      sourceMode = "normal";
       disableUpstream;
       watchers = [];
       logFn;
@@ -31788,22 +31914,15 @@ var init_provider_loader = __esm({
       static META_FILE = ".meta.json";
       constructor(options) {
         this.logFn = options?.logFn || LOG.forComponent("Provider").asLogFn();
-        const defaultProvidersDir = path14.join(os15.homedir(), ".adhdev", "providers");
-        if (options?.userDir) {
-          this.userDir = options.userDir;
-          this.log(`Config 'providerDir' applied: ${this.userDir}`);
-        } else {
-          const localRepoPath = path14.resolve(__dirname, "../../../../../adhdev-providers");
-          if (fs6.existsSync(localRepoPath)) {
-            this.userDir = localRepoPath;
-            this.log(`Auto-detected local public repository: ${this.userDir} (Dev workspace speedup)`);
-          } else {
-            this.userDir = defaultProvidersDir;
-            this.log(`Using default user providers directory: ${this.userDir}`);
-          }
-        }
-        this.upstreamDir = path14.join(defaultProvidersDir, ".upstream");
-        this.disableUpstream = options?.disableUpstream ?? false;
+        this.defaultProvidersDir = path14.join(os15.homedir(), ".adhdev", "providers");
+        this.userDir = this.defaultProvidersDir;
+        this.upstreamDir = path14.join(this.defaultProvidersDir, ".upstream");
+        this.disableUpstream = false;
+        this.applySourceConfig({
+          userDir: options?.userDir,
+          sourceMode: options?.sourceMode,
+          disableUpstream: options?.disableUpstream
+        });
       }
       log(msg) {
         this.logFn(`[ProviderLoader] ${msg}`);
@@ -31828,6 +31947,33 @@ var init_provider_loader = __esm({
       getProviderRoots() {
         return [this.userDir, this.upstreamDir];
       }
+      getSourceConfig() {
+        return {
+          sourceMode: this.sourceMode,
+          disableUpstream: this.disableUpstream,
+          explicitProviderDir: this.explicitProviderDir,
+          userDir: this.userDir,
+          upstreamDir: this.upstreamDir,
+          providerRoots: this.getProviderRoots()
+        };
+      }
+      applySourceConfig(options) {
+        const nextSourceMode = options?.sourceMode === "no-upstream" ? "no-upstream" : options?.sourceMode === "normal" ? "normal" : options?.disableUpstream ? "no-upstream" : this.sourceMode || "normal";
+        if (options && Object.prototype.hasOwnProperty.call(options, "userDir")) {
+          this.explicitProviderDir = options.userDir?.trim() ? options.userDir : null;
+        }
+        this.sourceMode = nextSourceMode;
+        this.userDir = this.explicitProviderDir || this.defaultProvidersDir;
+        this.upstreamDir = path14.join(this.defaultProvidersDir, ".upstream");
+        this.disableUpstream = this.sourceMode === "no-upstream";
+        if (this.explicitProviderDir) {
+          this.log(`Config 'providerDir' applied: ${this.userDir}`);
+        } else {
+          this.log(`Using default user providers directory: ${this.userDir}`);
+        }
+        this.log(`Provider source config: mode=${this.sourceMode} explicitProviderDir=${this.explicitProviderDir || "-"} userDir=${this.userDir} upstreamDir=${this.upstreamDir}`);
+        return this.getSourceConfig();
+      }
       /**
       * Canonical provider directory shape for a given root.
       */
@@ -31878,7 +32024,7 @@ var init_provider_loader = __esm({
             this.log(`Loaded ${upstreamCount} upstream providers (auto-updated)`);
           }
         } else if (this.disableUpstream) {
-          this.log("Upstream loading disabled (disableUpstream=true)");
+          this.log("Upstream loading disabled (sourceMode=no-upstream)");
         }
         if (fs6.existsSync(this.userDir)) {
           const userCount = this.loadDir(this.userDir, [".upstream"]);
@@ -32389,7 +32535,7 @@ var init_provider_loader = __esm({
       */
       async fetchLatest() {
         if (this.disableUpstream) {
-          this.log("Upstream fetch skipped (disableUpstream=true)");
+          this.log("Upstream fetch skipped (sourceMode=no-upstream)");
           return { updated: false };
         }
         const https = require("https");
@@ -32411,7 +32557,7 @@ var init_provider_loader = __esm({
           return { updated: false };
         }
         try {
-          const etag = await new Promise((resolve16, reject) => {
+          const etag = await new Promise((resolve15, reject) => {
             const options = {
               method: "HEAD",
               hostname: "github.com",
@@ -32429,7 +32575,7 @@ var init_provider_loader = __esm({
                   headers: { "User-Agent": "adhdev-launcher" },
                   timeout: 1e4
                 }, (res2) => {
-                  resolve16(res2.headers.etag || res2.headers["last-modified"] || "");
+                  resolve15(res2.headers.etag || res2.headers["last-modified"] || "");
                 });
                 req2.on("error", reject);
                 req2.on("timeout", () => {
@@ -32438,7 +32584,7 @@ var init_provider_loader = __esm({
                 });
                 req2.end();
               } else {
-                resolve16(res.headers.etag || res.headers["last-modified"] || "");
+                resolve15(res.headers.etag || res.headers["last-modified"] || "");
               }
             });
             req.on("error", reject);
@@ -32502,7 +32648,7 @@ var init_provider_loader = __esm({
       downloadFile(url2, destPath) {
         const https = require("https");
         const http3 = require("http");
-        return new Promise((resolve16, reject) => {
+        return new Promise((resolve15, reject) => {
           const doRequest = (reqUrl, redirectCount = 0) => {
             if (redirectCount > 5) {
               reject(new Error("Too many redirects"));
@@ -32522,7 +32668,7 @@ var init_provider_loader = __esm({
               res.pipe(ws);
               ws.on("finish", () => {
                 ws.close();
-                resolve16();
+                resolve15();
               });
               ws.on("error", reject);
             });
@@ -32998,17 +33144,17 @@ async function findFreePort(ports) {
   throw new Error("No free port found");
 }
 function checkPortFree(port) {
-  return new Promise((resolve16) => {
+  return new Promise((resolve15) => {
     const server = net2.createServer();
     server.unref();
-    server.on("error", () => resolve16(false));
+    server.on("error", () => resolve15(false));
     server.listen(port, "127.0.0.1", () => {
-      server.close(() => resolve16(true));
+      server.close(() => resolve15(true));
     });
   });
 }
 async function isCdpActive(port) {
-  return new Promise((resolve16) => {
+  return new Promise((resolve15) => {
     const req = require("http").get(`http://127.0.0.1:${port}/json/version`, {
       timeout: 2e3
     }, (res) => {
@@ -33017,16 +33163,16 @@ async function isCdpActive(port) {
       res.on("end", () => {
         try {
           const info = JSON.parse(data);
-          resolve16(!!info["WebKit-Version"] || !!info["Browser"]);
+          resolve15(!!info["WebKit-Version"] || !!info["Browser"]);
         } catch {
-          resolve16(false);
+          resolve15(false);
         }
       });
     });
-    req.on("error", () => resolve16(false));
+    req.on("error", () => resolve15(false));
     req.on("timeout", () => {
       req.destroy();
-      resolve16(false);
+      resolve15(false);
     });
   });
 }
@@ -33772,7 +33918,7 @@ async function waitForPidExit(pid, timeoutMs) {
   while (Date.now() - start < timeoutMs) {
     try {
       process.kill(pid, 0);
-      await new Promise((resolve16) => setTimeout(resolve16, 250));
+      await new Promise((resolve15) => setTimeout(resolve15, 250));
     } catch {
       return;
     }
@@ -33887,7 +34033,7 @@ async function runDaemonUpgradeHelper(payload) {
     appendUpgradeLog(installOutput.trim());
   }
   if (process.platform === "win32") {
-    await new Promise((resolve16) => setTimeout(resolve16, 500));
+    await new Promise((resolve15) => setTimeout(resolve15, 500));
     cleanupStaleGlobalInstallDirs(payload.packageName);
     appendUpgradeLog("Post-install staging cleanup complete");
   }
@@ -34215,8 +34361,9 @@ var init_router = __esm({
             if (!providerType) {
               return { success: false, error: "providerType required" };
             }
-            const offset = Math.max(0, Number(args?.offset) || 0);
-            const limit = Math.max(1, Math.min(100, Number(args?.limit) || 30));
+            const wantsAll = args?.all === true;
+            const offset = wantsAll ? 0 : Math.max(0, Number(args?.offset) || 0);
+            const limit = wantsAll ? Number.MAX_SAFE_INTEGER : Math.max(1, Math.min(100, Number(args?.limit) || 30));
             const { sessions: historySessions, hasMore } = listSavedHistorySessions(providerType, { offset, limit });
             const state = loadState();
             const savedSessions = getSavedProviderSessions(state, { providerType, kind });
@@ -34237,13 +34384,13 @@ var init_router = __esm({
                   providerName: saved?.providerName || recent?.providerName || providerType,
                   kind: saved?.kind || recent?.kind || kind,
                   title: saved?.title || recent?.title || session.sessionTitle || session.preview || providerType,
-                  workspace: saved?.workspace || recent?.workspace,
+                  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
@@ -34878,7 +35025,7 @@ var init_provider_adapter = __esm({
         const beforeCount = this.messageCount(before);
         const beforeSignature = this.lastMessageSignature(before);
         for (let attempt = 0; attempt < 12; attempt += 1) {
-          await new Promise((resolve16) => setTimeout(resolve16, 250));
+          await new Promise((resolve15) => setTimeout(resolve15, 250));
           let state;
           try {
             state = await this.readChat(evaluate);
@@ -34900,7 +35047,7 @@ var init_provider_adapter = __esm({
         if (this.messageCount(first) > 0 || this.lastMessageSignature(first)) {
           return first;
         }
-        await new Promise((resolve16) => setTimeout(resolve16, 150));
+        await new Promise((resolve15) => setTimeout(resolve15, 150));
         const second = await this.readChat(evaluate);
         return this.messageCount(second) >= this.messageCount(first) ? second : first;
       }
@@ -35040,7 +35187,7 @@ var init_provider_adapter = __esm({
           if (typeof data.error === "string" && data.error.trim()) return false;
         }
         for (let attempt = 0; attempt < 6; attempt += 1) {
-          await new Promise((resolve16) => setTimeout(resolve16, 250));
+          await new Promise((resolve15) => setTimeout(resolve15, 250));
           const state = await this.readChat(evaluate);
           const title = this.getStateTitle(state);
           if (this.titlesMatch(title, sessionId)) return true;
@@ -37552,7 +37699,7 @@ function getCliTargetBundle(ctx, type, instanceId) {
   return { target, instance, adapter };
 }
 function sleep(ms) {
-  return new Promise((resolve16) => setTimeout(resolve16, ms));
+  return new Promise((resolve15) => setTimeout(resolve15, ms));
 }
 async function waitForCliReady(ctx, type, instanceId, timeoutMs) {
   const startedAt = Date.now();
@@ -38404,18 +38551,6 @@ function resolveAutoImplWritableProviderDir(ctx, category, type, requestedDir) {
   if (!fs13.existsSync(providerJson)) {
     return { dir: null, reason: `provider.json not found in writable provider directory: ${desiredDir}` };
   }
-  try {
-    const providerData = JSON.parse(fs13.readFileSync(providerJson, "utf-8"));
-    if (providerData.disableUpstream !== true) {
-      providerData.disableUpstream = true;
-      fs13.writeFileSync(providerJson, JSON.stringify(providerData, null, 2));
-    }
-  } catch (error48) {
-    return {
-      dir: null,
-      reason: `Failed to update provider.json in writable provider directory: ${error48.message}`
-    };
-  }
   return { dir: desiredDir };
 }
 function loadAutoImplReferenceScripts(ctx, referenceType) {
@@ -39714,6 +39849,8 @@ var init_dev_server = __esm({
     fs14 = __toESM(require("fs"));
     path23 = __toESM(require("path"));
     init_provider_schema();
+    init_config();
+    init_provider_source_config();
     init_scaffold_template();
     init_version_archive();
     init_logger();
@@ -39728,6 +39865,7 @@ var init_dev_server = __esm({
       cdpManagers;
       instanceManager;
       cliManager;
+      onProviderSourceConfigChanged;
       logFn;
       sseClients = [];
       watchScriptPath = null;
@@ -39744,6 +39882,7 @@ var init_dev_server = __esm({
         this.cdpManagers = options.cdpManagers;
         this.instanceManager = options.instanceManager || null;
         this.cliManager = options.cliManager || null;
+        this.onProviderSourceConfigChanged = options.onProviderSourceConfigChanged || null;
         this.logFn = options.logFn || LOG.forComponent("DevServer").asLogFn();
       }
       log(msg) {
@@ -39753,6 +39892,8 @@ var init_dev_server = __esm({
       routes = [
         // Static routes
         { method: "GET", pattern: "/api/providers", handler: (q, s) => this.handleListProviders(q, s) },
+        { method: "GET", pattern: "/api/providers/source-config", handler: (q, s) => this.handleGetProviderSourceConfig(q, s) },
+        { method: "POST", pattern: "/api/providers/source-config", handler: (q, s) => this.handleSetProviderSourceConfig(q, s) },
         { method: "GET", pattern: "/api/providers/versions", handler: (q, s) => this.handleDetectVersions(q, s) },
         { method: "POST", pattern: "/api/providers/reload", handler: (q, s) => this.handleReload(q, s) },
         { method: "POST", pattern: "/api/cdp/evaluate", handler: (q, s) => this.handleCdpEvaluate(q, s) },
@@ -39850,15 +39991,15 @@ var init_dev_server = __esm({
             this.json(res, 500, { error: e.message });
           }
         });
-        return new Promise((resolve16, reject) => {
+        return new Promise((resolve15, reject) => {
           this.server.listen(port, "127.0.0.1", () => {
             this.log(`Dev server listening on http://127.0.0.1:${port}`);
-            resolve16();
+            resolve15();
           });
           this.server.on("error", (e) => {
             if (e.code === "EADDRINUSE") {
               this.log(`Port ${port} in use, skipping dev server`);
-              resolve16();
+              resolve15();
             } else {
               reject(e);
             }
@@ -39872,7 +40013,33 @@ var init_dev_server = __esm({
       // ─── Handlers ───
       async handleListProviders(_req, res) {
         const providers = this.providerLoader.getAll().map(toProviderListEntry);
-        this.json(res, 200, { providers, count: providers.length });
+        this.json(res, 200, { providers, count: providers.length, sourceConfig: this.providerLoader.getSourceConfig() });
+      }
+      async handleGetProviderSourceConfig(_req, res) {
+        this.json(res, 200, { success: true, sourceConfig: this.providerLoader.getSourceConfig() });
+      }
+      async handleSetProviderSourceConfig(req, res) {
+        const body = await this.readBody(req);
+        const parsed = parseProviderSourceConfigUpdate(body || {});
+        if (!parsed.ok) {
+          this.json(res, 400, { success: false, error: parsed.error });
+          return;
+        }
+        const currentConfig2 = loadConfig();
+        const nextConfig = {
+          ...currentConfig2,
+          ...parsed.updates.providerSourceMode ? { providerSourceMode: parsed.updates.providerSourceMode } : {},
+          ...Object.prototype.hasOwnProperty.call(parsed.updates, "providerDir") ? { providerDir: parsed.updates.providerDir } : {}
+        };
+        saveConfig(nextConfig);
+        const sourceConfig = this.providerLoader.applySourceConfig({
+          sourceMode: nextConfig.providerSourceMode,
+          userDir: Object.prototype.hasOwnProperty.call(parsed.updates, "providerDir") ? parsed.updates.providerDir : this.providerLoader.getSourceConfig().explicitProviderDir || void 0
+        });
+        this.providerLoader.reload();
+        this.providerLoader.registerToDetector();
+        await this.onProviderSourceConfigChanged?.();
+        this.json(res, 200, { success: true, reloaded: true, sourceConfig });
       }
       async handleProviderConfig(type, _req, res) {
         const provider = this.providerLoader.resolve(type);
@@ -39914,20 +40081,20 @@ var init_dev_server = __esm({
           child.stderr?.on("data", (d) => {
             stderr += d.toString().slice(0, 2e3);
           });
-          await new Promise((resolve16) => {
+          await new Promise((resolve15) => {
             const timer = setTimeout(() => {
               child.kill();
-              resolve16();
+              resolve15();
             }, 3e3);
             child.on("exit", () => {
               clearTimeout(timer);
-              resolve16();
+              resolve15();
             });
             child.stdout?.once("data", () => {
               setTimeout(() => {
                 child.kill();
                 clearTimeout(timer);
-                resolve16();
+                resolve15();
               }, 500);
             });
           });
@@ -40423,14 +40590,14 @@ var init_dev_server = __esm({
           child.stderr?.on("data", (d) => {
             stderr += d.toString();
           });
-          await new Promise((resolve16) => {
+          await new Promise((resolve15) => {
             const timer = setTimeout(() => {
               child.kill();
-              resolve16();
+              resolve15();
             }, timeout);
             child.on("exit", () => {
               clearTimeout(timer);
-              resolve16();
+              resolve15();
             });
           });
           const elapsed = Date.now() - start;
@@ -40575,18 +40742,6 @@ var init_dev_server = __esm({
         if (!fs14.existsSync(providerJson)) {
           return { dir: null, reason: `provider.json not found in writable provider directory: ${desiredDir}` };
         }
-        try {
-          const providerData = JSON.parse(fs14.readFileSync(providerJson, "utf-8"));
-          if (providerData.disableUpstream !== true) {
-            providerData.disableUpstream = true;
-            fs14.writeFileSync(providerJson, JSON.stringify(providerData, null, 2));
-          }
-        } catch (error48) {
-          return {
-            dir: null,
-            reason: `Failed to update provider.json in writable provider directory: ${error48.message}`
-          };
-        }
         return { dir: desiredDir };
       }
       async handleAutoImplement(type, req, res) {
@@ -41112,14 +41267,14 @@ data: ${JSON.stringify(msg.data)}
         res.end(JSON.stringify(data, null, 2));
       }
       async readBody(req) {
-        return new Promise((resolve16) => {
+        return new Promise((resolve15) => {
           let body = "";
           req.on("data", (chunk) => body += chunk);
           req.on("end", () => {
             try {
-              resolve16(JSON.parse(body));
+              resolve15(JSON.parse(body));
             } catch {
-              resolve16({});
+              resolve15({});
             }
           });
         });
@@ -41604,7 +41759,7 @@ async function waitForReady(endpoint, timeoutMs = STARTUP_TIMEOUT_MS) {
   const deadline = Date.now() + timeoutMs;
   while (Date.now() < deadline) {
     if (await canConnect(endpoint)) return;
-    await new Promise((resolve16) => setTimeout(resolve16, STARTUP_POLL_MS));
+    await new Promise((resolve15) => setTimeout(resolve15, STARTUP_POLL_MS));
   }
   throw new Error(`Session host did not become ready within ${timeoutMs}ms`);
 }
@@ -41768,10 +41923,10 @@ async function installExtension(ide, extension) {
         const buffer = Buffer.from(await res.arrayBuffer());
         const fs24 = await import("fs");
         fs24.writeFileSync(vsixPath, buffer);
-        return new Promise((resolve16) => {
+        return new Promise((resolve15) => {
           const cmd = `"${ide.cliCommand}" --install-extension "${vsixPath}" --force`;
           (0, import_child_process10.exec)(cmd, { timeout: 6e4 }, (error48, _stdout, stderr) => {
-            resolve16({
+            resolve15({
               extensionId: extension.id,
               marketplaceId: extension.marketplaceId,
               success: !error48,
@@ -41784,11 +41939,11 @@ async function installExtension(ide, extension) {
     } catch (e) {
     }
   }
-  return new Promise((resolve16) => {
+  return new Promise((resolve15) => {
     const cmd = `"${ide.cliCommand}" --install-extension ${extension.marketplaceId} --force`;
     (0, import_child_process10.exec)(cmd, { timeout: 6e4 }, (error48, stdout, stderr) => {
       if (error48) {
-        resolve16({
+        resolve15({
           extensionId: extension.id,
           marketplaceId: extension.marketplaceId,
           success: false,
@@ -41796,7 +41951,7 @@ async function installExtension(ide, extension) {
           error: stderr || error48.message
         });
       } else {
-        resolve16({
+        resolve15({
           extensionId: extension.id,
           marketplaceId: extension.marketplaceId,
           success: true,
@@ -41990,10 +42145,11 @@ var init_registry = __esm({
 async function initDaemonComponents(config2) {
   installGlobalInterceptor();
   const appConfig = loadConfig();
-  const disableUpstream = appConfig.disableUpstream ?? false;
+  const providerSourceMode = appConfig.providerSourceMode || "normal";
+  const disableUpstream = providerSourceMode === "no-upstream";
   const providerLoader = new ProviderLoader({
     logFn: config2.providerLogFn,
-    disableUpstream,
+    sourceMode: providerSourceMode,
     userDir: appConfig.providerDir
   });
   if (!disableUpstream && !providerLoader.hasUpstream()) {
@@ -42098,6 +42254,10 @@ async function initDaemonComponents(config2) {
     onProviderSettingChanged: async (providerType) => {
       await refreshProviderAvailability(providerType);
       config2.onStatusChange?.();
+    },
+    onProviderSourceConfigChanged: async () => {
+      await refreshProviderAvailability();
+      config2.onStatusChange?.();
     }
   });
   agentStreamManager = new DaemonAgentStreamManager(
@@ -42147,7 +42307,8 @@ async function initDaemonComponents(config2) {
     cdpInitializer,
     cdpManagers,
     sessionRegistry,
-    detectedIdes: detectedIdesRef
+    detectedIdes: detectedIdesRef,
+    refreshProviderAvailability
   };
 }
 async function startDaemonDevSupport(options) {
@@ -42156,7 +42317,10 @@ async function startDaemonDevSupport(options) {
     cdpManagers: options.components.cdpManagers,
     instanceManager: options.components.instanceManager,
     cliManager: options.components.cliManager,
-    logFn: options.logFn
+    logFn: options.logFn,
+    onProviderSourceConfigChanged: async () => {
+      await options.components.refreshProviderAvailability();
+    }
   });
   await devServer.start();
   options.components.providerLoader.watch();
@@ -42306,6 +42470,7 @@ __export(src_exports, {
   normalizeInputEnvelope: () => normalizeInputEnvelope,
   normalizeManagedStatus: () => normalizeManagedStatus,
   normalizeMessageParts: () => normalizeMessageParts,
+  parseProviderSourceConfigUpdate: () => parseProviderSourceConfigUpdate,
   partitionSessionHostDiagnosticsSessions: () => partitionSessionHostDiagnosticsSessions,
   partitionSessionHostRecords: () => partitionSessionHostRecords,
   probeCdpPort: () => probeCdpPort,
@@ -42369,6 +42534,7 @@ var init_src = __esm({
     init_ide_provider_instance();
     init_cli_provider_instance();
     init_acp_provider_instance();
+    init_provider_source_config();
     init_io_contracts();
     init_version_archive();
     init_dev_server();
@@ -42808,7 +42974,7 @@ function routeDataChannelMessage(peerId, msg, peers, handlers) {
         log(`pty_input: REJECTED \u2014 permission=${permission} peer=${peerId}`);
         return;
       }
-      const sessionId = parsed.sessionId || parsed.cliId || parsed.cliType || "";
+      const sessionId = parsed.sessionId || parsed.targetSessionId || parsed.cliId || parsed.cliType || "";
       if (handlers.ptyInputHandler && parsed.data && sessionId) {
         handlers.ptyInputHandler(sessionId, parsed.data);
       }
@@ -42820,7 +42986,7 @@ function routeDataChannelMessage(peerId, msg, peers, handlers) {
         log(`pty_resize: REJECTED \u2014 permission=${permission} peer=${peerId}`);
         return;
       }
-      const sessionId = parsed.sessionId || parsed.cliId || parsed.cliType || "";
+      const sessionId = parsed.sessionId || parsed.targetSessionId || parsed.cliId || parsed.cliType || "";
       if (handlers.ptyResizeHandler && parsed.cols && parsed.rows && sessionId) {
         handlers.ptyResizeHandler(sessionId, parsed.cols, parsed.rows);
       }
@@ -43838,14 +44004,14 @@ var require_filesystem = __commonJS({
       });
       return buffer.subarray(0, bytesRead);
     };
-    var readFile = (path30) => new Promise((resolve16, reject) => {
+    var readFile = (path30) => new Promise((resolve15, reject) => {
       fs24.open(path30, "r", (err, fd) => {
         if (err) {
           reject(err);
         } else {
           const buffer = Buffer.alloc(MAX_LENGTH);
           fs24.read(fd, buffer, 0, MAX_LENGTH, 0, (_2, bytesRead) => {
-            resolve16(buffer.subarray(0, bytesRead));
+            resolve15(buffer.subarray(0, bytesRead));
             fs24.close(fd, () => {
             });
           });
@@ -43913,10 +44079,10 @@ var require_detect_libc = __commonJS({
     var commandOut = "";
     var safeCommand = () => {
       if (!commandOut) {
-        return new Promise((resolve16) => {
+        return new Promise((resolve15) => {
           childProcess2.exec(command, (err, out) => {
             commandOut = err ? " " : out;
-            resolve16(commandOut);
+            resolve15(commandOut);
           });
         });
       }
@@ -46596,14 +46762,14 @@ var require_input = __commonJS({
         return this;
       } else {
         if (this._isStreamInput()) {
-          return new Promise((resolve16, reject) => {
+          return new Promise((resolve15, reject) => {
             const finished = () => {
               this._flattenBufferIn();
               sharp.metadata(this.options, (err, metadata2) => {
                 if (err) {
                   reject(is.nativeError(err, stack));
                 } else {
-                  resolve16(metadata2);
+                  resolve15(metadata2);
                 }
               });
             };
@@ -46614,12 +46780,12 @@ var require_input = __commonJS({
             }
           });
         } else {
-          return new Promise((resolve16, reject) => {
+          return new Promise((resolve15, reject) => {
             sharp.metadata(this.options, (err, metadata2) => {
               if (err) {
                 reject(is.nativeError(err, stack));
               } else {
-                resolve16(metadata2);
+                resolve15(metadata2);
               }
             });
           });
@@ -46652,25 +46818,25 @@ var require_input = __commonJS({
         return this;
       } else {
         if (this._isStreamInput()) {
-          return new Promise((resolve16, reject) => {
+          return new Promise((resolve15, reject) => {
             this.on("finish", function() {
               this._flattenBufferIn();
               sharp.stats(this.options, (err, stats2) => {
                 if (err) {
                   reject(is.nativeError(err, stack));
                 } else {
-                  resolve16(stats2);
+                  resolve15(stats2);
                 }
               });
             });
           });
         } else {
-          return new Promise((resolve16, reject) => {
+          return new Promise((resolve15, reject) => {
             sharp.stats(this.options, (err, stats2) => {
               if (err) {
                 reject(is.nativeError(err, stack));
               } else {
-                resolve16(stats2);
+                resolve15(stats2);
               }
             });
           });
@@ -50092,7 +50258,7 @@ var require_output = __commonJS({
         return this;
       } else {
         if (this._isStreamInput()) {
-          return new Promise((resolve16, reject) => {
+          return new Promise((resolve15, reject) => {
             this.once("finish", () => {
               this._flattenBufferIn();
               sharp.pipeline(this.options, (err, data, info) => {
@@ -50100,24 +50266,24 @@ var require_output = __commonJS({
                   reject(is.nativeError(err, stack));
                 } else {
                   if (this.options.resolveWithObject) {
-                    resolve16({ data, info });
+                    resolve15({ data, info });
                   } else {
-                    resolve16(data);
+                    resolve15(data);
                   }
                 }
               });
             });
           });
         } else {
-          return new Promise((resolve16, reject) => {
+          return new Promise((resolve15, reject) => {
             sharp.pipeline(this.options, (err, data, info) => {
               if (err) {
                 reject(is.nativeError(err, stack));
               } else {
                 if (this.options.resolveWithObject) {
-                  resolve16({ data, info });
+                  resolve15({ data, info });
                 } else {
-                  resolve16(data);
+                  resolve15(data);
                 }
               }
             });
@@ -51677,7 +51843,7 @@ var init_adhdev_daemon = __esm({
     import_ws3 = require("ws");
     init_source2();
     init_version();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.8.56" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.8.58" });
     ACTIVE_CHAT_POLL_STATUSES = /* @__PURE__ */ new Set([
       "generating",
       "waiting_approval",
@@ -52185,6 +52351,8 @@ ${err?.stack || ""}`);
               forwardAgentStreamsToIdeInstance(this.components.instanceManager, ideType, streams);
             }
           });
+          const providerSourceConfig = this.components.providerLoader.getSourceConfig();
+          LOG.info("Provider", `Source config: mode=${providerSourceConfig.sourceMode} explicitProviderDir=${providerSourceConfig.explicitProviderDir || "-"} userDir=${providerSourceConfig.userDir} upstreamDir=${providerSourceConfig.upstreamDir}`);
           if (shouldAutoRestoreHostedSessionsOnStartup(process.env)) {
             await this.components.cliManager.restoreHostedSessions();
           }
@@ -52346,7 +52514,11 @@ ${err?.stack || ""}`);
               providerLoader: this.components.providerLoader,
               cdpManagers: this.components.cdpManagers,
               instanceManager: this.components.instanceManager,
-              cliManager: this.components.cliManager
+              cliManager: this.components.cliManager,
+              onProviderSourceConfigChanged: async () => {
+                await this.components.refreshProviderAvailability();
+                this.statusReporter?.onStatusChange();
+              }
             });
             await devServer.start();
           }
@@ -52543,7 +52715,7 @@ ${err?.stack || ""}`);
             this.localWss.emit("connection", ws, req);
           });
         });
-        await new Promise((resolve16, reject) => {
+        await new Promise((resolve15, reject) => {
           const cleanup = () => {
             this.localHttpServer?.off("error", onError);
             this.localHttpServer?.off("listening", onListening);
@@ -52554,7 +52726,7 @@ ${err?.stack || ""}`);
           };
           const onListening = () => {
             cleanup();
-            resolve16();
+            resolve15();
           };
           this.localHttpServer.once("error", onError);
           this.localHttpServer.once("listening", onListening);
@@ -52714,12 +52886,12 @@ ${err?.stack || ""}`);
           this.localClients.clear();
           this.localWss?.close();
           this.localWss = null;
-          await new Promise((resolve16) => {
+          await new Promise((resolve15) => {
             if (!this.localHttpServer) {
-              resolve16();
+              resolve15();
               return;
             }
-            this.localHttpServer.close(() => resolve16());
+            this.localHttpServer.close(() => resolve15());
             this.localHttpServer = null;
           });
         } catch {
@@ -53267,14 +53439,14 @@ var require_run_async = __commonJS({
       return function() {
         var args = arguments;
         var originalThis = this;
-        var promise2 = new Promise(function(resolve16, reject) {
+        var promise2 = new Promise(function(resolve15, reject) {
           var resolved = false;
           const wrappedResolve = function(value) {
             if (resolved) {
               console.warn("Run-async promise already resolved.");
             }
             resolved = true;
-            resolve16(value);
+            resolve15(value);
           };
           var rejected = false;
           const wrappedReject = function(value) {
@@ -54065,7 +54237,7 @@ var require_Observable = __commonJS({
       Observable2.prototype.forEach = function(next, promiseCtor) {
         var _this = this;
         promiseCtor = getPromiseCtor(promiseCtor);
-        return new promiseCtor(function(resolve16, reject) {
+        return new promiseCtor(function(resolve15, reject) {
           var subscriber = new Subscriber_1.SafeSubscriber({
             next: function(value) {
               try {
@@ -54076,7 +54248,7 @@ var require_Observable = __commonJS({
               }
             },
             error: reject,
-            complete: resolve16
+            complete: resolve15
           });
           _this.subscribe(subscriber);
         });
@@ -54098,14 +54270,14 @@ var require_Observable = __commonJS({
       Observable2.prototype.toPromise = function(promiseCtor) {
         var _this = this;
         promiseCtor = getPromiseCtor(promiseCtor);
-        return new promiseCtor(function(resolve16, reject) {
+        return new promiseCtor(function(resolve15, reject) {
           var value;
           _this.subscribe(function(x) {
             return value = x;
           }, function(err) {
             return reject(err);
           }, function() {
-            return resolve16(value);
+            return resolve15(value);
           });
         });
       };
@@ -56201,11 +56373,11 @@ var require_innerFrom = __commonJS({
     "use strict";
     var __awaiter = exports2 && exports2.__awaiter || function(thisArg, _arguments, P, generator) {
       function adopt(value) {
-        return value instanceof P ? value : new P(function(resolve16) {
-          resolve16(value);
+        return value instanceof P ? value : new P(function(resolve15) {
+          resolve15(value);
         });
       }
-      return new (P || (P = Promise))(function(resolve16, reject) {
+      return new (P || (P = Promise))(function(resolve15, reject) {
         function fulfilled(value) {
           try {
             step(generator.next(value));
@@ -56221,7 +56393,7 @@ var require_innerFrom = __commonJS({
           }
         }
         function step(result) {
-          result.done ? resolve16(result.value) : adopt(result.value).then(fulfilled, rejected);
+          result.done ? resolve15(result.value) : adopt(result.value).then(fulfilled, rejected);
         }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
       });
@@ -56303,14 +56475,14 @@ var require_innerFrom = __commonJS({
       }, i);
       function verb(n) {
         i[n] = o[n] && function(v) {
-          return new Promise(function(resolve16, reject) {
-            v = o[n](v), settle(resolve16, reject, v.done, v.value);
+          return new Promise(function(resolve15, reject) {
+            v = o[n](v), settle(resolve15, reject, v.done, v.value);
           });
         };
       }
-      function settle(resolve16, reject, d, v) {
+      function settle(resolve15, reject, d, v) {
         Promise.resolve(v).then(function(v2) {
-          resolve16({ value: v2, done: d });
+          resolve15({ value: v2, done: d });
         }, reject);
       }
     };
@@ -56929,7 +57101,7 @@ var require_lastValueFrom = __commonJS({
     var EmptyError_1 = require_EmptyError();
     function lastValueFrom(source, config2) {
       var hasConfig = typeof config2 === "object";
-      return new Promise(function(resolve16, reject) {
+      return new Promise(function(resolve15, reject) {
         var _hasValue = false;
         var _value;
         source.subscribe({
@@ -56940,9 +57112,9 @@ var require_lastValueFrom = __commonJS({
           error: reject,
           complete: function() {
             if (_hasValue) {
-              resolve16(_value);
+              resolve15(_value);
             } else if (hasConfig) {
-              resolve16(config2.defaultValue);
+              resolve15(config2.defaultValue);
             } else {
               reject(new EmptyError_1.EmptyError());
             }
@@ -56964,16 +57136,16 @@ var require_firstValueFrom = __commonJS({
     var Subscriber_1 = require_Subscriber();
     function firstValueFrom(source, config2) {
       var hasConfig = typeof config2 === "object";
-      return new Promise(function(resolve16, reject) {
+      return new Promise(function(resolve15, reject) {
         var subscriber = new Subscriber_1.SafeSubscriber({
           next: function(value) {
-            resolve16(value);
+            resolve15(value);
             subscriber.unsubscribe();
           },
           error: reject,
           complete: function() {
             if (hasConfig) {
-              resolve16(config2.defaultValue);
+              resolve15(config2.defaultValue);
             } else {
               reject(new EmptyError_1.EmptyError());
             }
@@ -68779,14 +68951,14 @@ var require_async_iterator = __commonJS({
       };
     }
     function readAndResolve(iter) {
-      var resolve16 = iter[kLastResolve];
-      if (resolve16 !== null) {
+      var resolve15 = iter[kLastResolve];
+      if (resolve15 !== null) {
         var data = iter[kStream].read();
         if (data !== null) {
           iter[kLastPromise] = null;
           iter[kLastResolve] = null;
           iter[kLastReject] = null;
-          resolve16(createIterResult(data, false));
+          resolve15(createIterResult(data, false));
         }
       }
     }
@@ -68794,13 +68966,13 @@ var require_async_iterator = __commonJS({
       process.nextTick(readAndResolve, iter);
     }
     function wrapForNext(lastPromise, iter) {
-      return function(resolve16, reject) {
+      return function(resolve15, reject) {
         lastPromise.then(function() {
           if (iter[kEnded]) {
-            resolve16(createIterResult(void 0, true));
+            resolve15(createIterResult(void 0, true));
             return;
           }
-          iter[kHandlePromise](resolve16, reject);
+          iter[kHandlePromise](resolve15, reject);
         }, reject);
       };
     }
@@ -68820,12 +68992,12 @@ var require_async_iterator = __commonJS({
           return Promise.resolve(createIterResult(void 0, true));
         }
         if (this[kStream].destroyed) {
-          return new Promise(function(resolve16, reject) {
+          return new Promise(function(resolve15, reject) {
             process.nextTick(function() {
               if (_this[kError]) {
                 reject(_this[kError]);
               } else {
-                resolve16(createIterResult(void 0, true));
+                resolve15(createIterResult(void 0, true));
               }
             });
           });
@@ -68848,13 +69020,13 @@ var require_async_iterator = __commonJS({
       return this;
     }), _defineProperty(_Object$setPrototypeO, "return", function _return() {
       var _this2 = this;
-      return new Promise(function(resolve16, reject) {
+      return new Promise(function(resolve15, reject) {
         _this2[kStream].destroy(null, function(err) {
           if (err) {
             reject(err);
             return;
           }
-          resolve16(createIterResult(void 0, true));
+          resolve15(createIterResult(void 0, true));
         });
       });
     }), _Object$setPrototypeO), AsyncIteratorPrototype);
@@ -68876,15 +69048,15 @@ var require_async_iterator = __commonJS({
         value: stream._readableState.endEmitted,
         writable: true
       }), _defineProperty(_Object$create, kHandlePromise, {
-        value: function value(resolve16, reject) {
+        value: function value(resolve15, reject) {
           var data = iterator[kStream].read();
           if (data) {
             iterator[kLastPromise] = null;
             iterator[kLastResolve] = null;
             iterator[kLastReject] = null;
-            resolve16(createIterResult(data, false));
+            resolve15(createIterResult(data, false));
           } else {
-            iterator[kLastResolve] = resolve16;
+            iterator[kLastResolve] = resolve15;
             iterator[kLastReject] = reject;
           }
         },
@@ -68903,12 +69075,12 @@ var require_async_iterator = __commonJS({
           iterator[kError] = err;
           return;
         }
-        var resolve16 = iterator[kLastResolve];
-        if (resolve16 !== null) {
+        var resolve15 = iterator[kLastResolve];
+        if (resolve15 !== null) {
           iterator[kLastPromise] = null;
           iterator[kLastResolve] = null;
           iterator[kLastReject] = null;
-          resolve16(createIterResult(void 0, true));
+          resolve15(createIterResult(void 0, true));
         }
         iterator[kEnded] = true;
       });
@@ -68923,7 +69095,7 @@ var require_async_iterator = __commonJS({
 var require_from2 = __commonJS({
   "../../node_modules/readable-stream/lib/internal/streams/from.js"(exports2, module2) {
     "use strict";
-    function asyncGeneratorStep(gen, resolve16, reject, _next, _throw, key, arg) {
+    function asyncGeneratorStep(gen, resolve15, reject, _next, _throw, key, arg) {
       try {
         var info = gen[key](arg);
         var value = info.value;
@@ -68932,7 +69104,7 @@ var require_from2 = __commonJS({
         return;
       }
       if (info.done) {
-        resolve16(value);
+        resolve15(value);
       } else {
         Promise.resolve(value).then(_next, _throw);
       }
@@ -68940,13 +69112,13 @@ var require_from2 = __commonJS({
     function _asyncToGenerator(fn) {
       return function() {
         var self2 = this, args = arguments;
-        return new Promise(function(resolve16, reject) {
+        return new Promise(function(resolve15, reject) {
           var gen = fn.apply(self2, args);
           function _next(value) {
-            asyncGeneratorStep(gen, resolve16, reject, _next, _throw, "next", value);
+            asyncGeneratorStep(gen, resolve15, reject, _next, _throw, "next", value);
           }
           function _throw(err) {
-            asyncGeneratorStep(gen, resolve16, reject, _next, _throw, "throw", err);
+            asyncGeneratorStep(gen, resolve15, reject, _next, _throw, "throw", err);
           }
           _next(void 0);
         });
@@ -70885,9 +71057,9 @@ var init_base = __esm({
        * @return {Promise}
        */
       run() {
-        return new Promise((resolve16, reject) => {
+        return new Promise((resolve15, reject) => {
           this._run(
-            (value) => resolve16(value),
+            (value) => resolve15(value),
             (error48) => reject(error48)
           );
         });
@@ -77519,7 +77691,7 @@ var require_lib2 = __commonJS({
       return matches;
     };
     exports2.analyse = analyse;
-    var detectFile = (filepath, opts = {}) => new Promise((resolve16, reject) => {
+    var detectFile = (filepath, opts = {}) => new Promise((resolve15, reject) => {
       let fd;
       const fs24 = (0, node_1.default)();
       const handler = (err, buffer) => {
@@ -77529,7 +77701,7 @@ var require_lib2 = __commonJS({
         if (err) {
           reject(err);
         } else if (buffer) {
-          resolve16((0, exports2.detect)(buffer));
+          resolve15((0, exports2.detect)(buffer));
         } else {
           reject(new Error("No error and no buffer received"));
         }
@@ -83714,14 +83886,14 @@ var baseOpen = async (options) => {
   }
   const subprocess = import_node_child_process5.default.spawn(command, cliArguments, childProcessOptions);
   if (options.wait) {
-    return new Promise((resolve16, reject) => {
+    return new Promise((resolve15, reject) => {
       subprocess.once("error", reject);
       subprocess.once("close", (exitCode) => {
         if (!options.allowNonzeroExitCode && exitCode > 0) {
           reject(new Error(`Exited with code ${exitCode}`));
           return;
         }
-        resolve16(subprocess);
+        resolve15(subprocess);
       });
     });
   }