adhdev 0.8.57 → 0.8.58

package/dist/cli/index.js

@@ -564,9 +564,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);
 }
@@ -604,7 +611,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"
   };
@@ -753,7 +760,7 @@ var init_config = __esm({
       registeredMachineId: void 0,
       providerSettings: {},
       ideSettings: {},
-      disableUpstream: false,
+      providerSourceMode: "normal",
       terminalSizingMode: "measured"
     };
     MACHINE_ID_PREFIX = "mach_";
@@ -1253,15 +1260,15 @@ function resolveCommandPath(command) {
   return null;
 }
 function execAsync(cmd, timeoutMs = 5e3) {
-  return new Promise((resolve18) => {
+  return new Promise((resolve17) => {
     const child = (0, import_child_process2.exec)(cmd, { encoding: "utf-8", timeout: timeoutMs }, (err, stdout) => {
       if (err || !stdout?.trim()) {
-        resolve18(null);
+        resolve17(null);
       } else {
-        resolve18(stdout.trim());
+        resolve17(stdout.trim());
       }
     });
-    child.on("error", () => resolve18(null));
+    child.on("error", () => resolve17(null));
   });
 }
 async function detectCLIs(providerLoader, options) {
@@ -1707,7 +1714,7 @@ var init_manager = __esm({
       * Returns multiple entries if multiple IDE windows are open on same port
       */
       static listAllTargets(port) {
-        return new Promise((resolve18) => {
+        return new Promise((resolve17) => {
           const req = http.get(`http://127.0.0.1:${port}/json`, (res) => {
             let data = "";
             res.on("data", (chunk) => data += chunk.toString());
@@ -1723,16 +1730,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 || ""));
-                resolve18(mainPages.length > 0 ? mainPages : fallbackPages);
+                resolve17(mainPages.length > 0 ? mainPages : fallbackPages);
               } catch {
-                resolve18([]);
+                resolve17([]);
               }
             });
           });
-          req.on("error", () => resolve18([]));
+          req.on("error", () => resolve17([]));
           req.setTimeout(2e3, () => {
             req.destroy();
-            resolve18([]);
+            resolve17([]);
           });
         });
       }
@@ -1772,7 +1779,7 @@ var init_manager = __esm({
         }
       }
       findTargetOnPort(port) {
-        return new Promise((resolve18) => {
+        return new Promise((resolve17) => {
           const req = http.get(`http://127.0.0.1:${port}/json`, (res) => {
             let data = "";
             res.on("data", (chunk) => data += chunk.toString());
@@ -1783,7 +1790,7 @@ var init_manager = __esm({
                   (t) => (t.type === "page" || t.type === "browser" || t.type === "Page") && t.webSocketDebuggerUrl
                 );
                 if (pages.length === 0) {
-                  resolve18(targets.find((t) => t.webSocketDebuggerUrl) || null);
+                  resolve17(targets.find((t) => t.webSocketDebuggerUrl) || null);
                   return;
                 }
                 const mainPages = pages.filter((t) => !this.isNonMainTitle(t.title || ""));
@@ -1793,24 +1800,24 @@ var init_manager = __esm({
                   const specific = list.find((t) => t.id === this._targetId);
                   if (specific) {
                     this._pageTitle = specific.title || "";
-                    resolve18(specific);
+                    resolve17(specific);
                   } else {
                     this.log(`[CDP] Target ${this._targetId} not found in page list`);
-                    resolve18(null);
+                    resolve17(null);
                   }
                   return;
                 }
                 this._pageTitle = list[0]?.title || "";
-                resolve18(list[0]);
+                resolve17(list[0]);
               } catch {
-                resolve18(null);
+                resolve17(null);
               }
             });
           });
-          req.on("error", () => resolve18(null));
+          req.on("error", () => resolve17(null));
           req.setTimeout(2e3, () => {
             req.destroy();
-            resolve18(null);
+            resolve17(null);
           });
         });
       }
@@ -1821,7 +1828,7 @@ var init_manager = __esm({
         this.extensionProviders = providers;
       }
       connectToTarget(wsUrl) {
-        return new Promise((resolve18) => {
+        return new Promise((resolve17) => {
           this.ws = new import_ws.default(wsUrl);
           this.ws.on("open", async () => {
             this._connected = true;
@@ -1831,17 +1838,17 @@ var init_manager = __esm({
             }
             this.connectBrowserWs().catch(() => {
             });
-            resolve18(true);
+            resolve17(true);
           });
           this.ws.on("message", (data) => {
             try {
               const msg = JSON.parse(data.toString());
               if (msg.id && this.pending.has(msg.id)) {
-                const { resolve: resolve19, reject } = this.pending.get(msg.id);
+                const { resolve: resolve18, reject } = this.pending.get(msg.id);
                 this.pending.delete(msg.id);
                 this.failureCount = 0;
                 if (msg.error) reject(new Error(msg.error.message));
-                else resolve19(msg.result);
+                else resolve18(msg.result);
               } else if (msg.method === "Runtime.executionContextCreated") {
                 this.contexts.add(msg.params.context.id);
               } else if (msg.method === "Runtime.executionContextDestroyed") {
@@ -1864,7 +1871,7 @@ var init_manager = __esm({
           this.ws.on("error", (err) => {
             this.log(`[CDP] WebSocket error: ${err.message}`);
             this._connected = false;
-            resolve18(false);
+            resolve17(false);
           });
         });
       }
@@ -1878,7 +1885,7 @@ var init_manager = __esm({
             return;
           }
           this.log(`[CDP] Connecting browser WS for target discovery...`);
-          await new Promise((resolve18, reject) => {
+          await new Promise((resolve17, reject) => {
             this.browserWs = new import_ws.default(browserWsUrl);
             this.browserWs.on("open", async () => {
               this._browserConnected = true;
@@ -1888,16 +1895,16 @@ var init_manager = __esm({
               } catch (e) {
                 this.log(`[CDP] setDiscoverTargets failed: ${e.message}`);
               }
-              resolve18();
+              resolve17();
             });
             this.browserWs.on("message", (data) => {
               try {
                 const msg = JSON.parse(data.toString());
                 if (msg.id && this.browserPending.has(msg.id)) {
-                  const { resolve: resolve19, reject: reject2 } = this.browserPending.get(msg.id);
+                  const { resolve: resolve18, reject: reject2 } = this.browserPending.get(msg.id);
                   this.browserPending.delete(msg.id);
                   if (msg.error) reject2(new Error(msg.error.message));
-                  else resolve19(msg.result);
+                  else resolve18(msg.result);
                 }
               } catch {
               }
@@ -1917,31 +1924,31 @@ var init_manager = __esm({
         }
       }
       getBrowserWsUrl() {
-        return new Promise((resolve18) => {
+        return new Promise((resolve17) => {
           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);
-                resolve18(info.webSocketDebuggerUrl || null);
+                resolve17(info.webSocketDebuggerUrl || null);
               } catch {
-                resolve18(null);
+                resolve17(null);
               }
             });
           });
-          req.on("error", () => resolve18(null));
+          req.on("error", () => resolve17(null));
           req.setTimeout(3e3, () => {
             req.destroy();
-            resolve18(null);
+            resolve17(null);
           });
         });
       }
       sendBrowser(method, params = {}, timeoutMs = 15e3) {
-        return new Promise((resolve18, reject) => {
+        return new Promise((resolve17, reject) => {
           if (!this.browserWs || !this._browserConnected) return reject(new Error("Browser WS not connected"));
           const id = this.browserMsgId++;
-          this.browserPending.set(id, { resolve: resolve18, reject });
+          this.browserPending.set(id, { resolve: resolve17, reject });
           this.browserWs.send(JSON.stringify({ id, method, params }));
           setTimeout(() => {
             if (this.browserPending.has(id)) {
@@ -1981,11 +1988,11 @@ var init_manager = __esm({
       }
       // ─── CDP Protocol ────────────────────────────────────────
       sendInternal(method, params = {}, timeoutMs = 15e3) {
-        return new Promise((resolve18, reject) => {
+        return new Promise((resolve17, 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: resolve18, reject });
+          this.pending.set(id, { resolve: resolve17, reject });
           this.ws.send(JSON.stringify({ id, method, params }));
           setTimeout(() => {
             if (this.pending.has(id)) {
@@ -2234,7 +2241,7 @@ var init_manager = __esm({
         const browserWs = this.browserWs;
         let msgId = this.browserMsgId;
         const sendWs = (method, params = {}, sessionId) => {
-          return new Promise((resolve18, reject) => {
+          return new Promise((resolve17, reject) => {
             const mid = msgId++;
             this.browserMsgId = msgId;
             const handler = (raw) => {
@@ -2243,7 +2250,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 resolve18(msg.result);
+                  else resolve17(msg.result);
                 }
               } catch {
               }
@@ -2444,14 +2451,14 @@ var init_manager = __esm({
         if (!ws || ws.readyState !== import_ws.default.OPEN) {
           throw new Error("CDP not connected");
         }
-        return new Promise((resolve18, reject) => {
+        return new Promise((resolve17, reject) => {
           const id = getNextId();
           pendingMap.set(id, {
             resolve: (result) => {
               if (result?.result?.subtype === "error") {
                 reject(new Error(result.result.description));
               } else {
-                resolve18(result?.result?.value);
+                resolve17(result?.result?.value);
               }
             },
             reject
@@ -2483,10 +2490,10 @@ var init_manager = __esm({
           throw new Error("CDP not connected");
         }
         const sendViaSession = (method, params = {}) => {
-          return new Promise((resolve18, reject) => {
+          return new Promise((resolve17, reject) => {
             const pendingMap = this._browserConnected ? this.browserPending : this.pending;
             const id = this._browserConnected ? this.browserMsgId++ : this.msgId++;
-            pendingMap.set(id, { resolve: resolve18, reject });
+            pendingMap.set(id, { resolve: resolve17, reject });
             ws.send(JSON.stringify({ id, sessionId, method, params }));
             setTimeout(() => {
               if (pendingMap.has(id)) {
@@ -3321,6 +3328,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");
@@ -3333,6 +3341,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;
@@ -3347,7 +3359,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);
@@ -3530,6 +3543,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();
@@ -6122,7 +6159,7 @@ function getStateLastSignature(state) {
 async function getStableExtensionBaseline(h) {
   const first = await readExtensionChatState(h);
   if (getStateMessageCount(first) > 0 || getStateLastSignature(first)) return first;
-  await new Promise((resolve18) => setTimeout(resolve18, 150));
+  await new Promise((resolve17) => setTimeout(resolve17, 150));
   const second = await readExtensionChatState(h);
   return getStateMessageCount(second) >= getStateMessageCount(first) ? second : first;
 }
@@ -6130,7 +6167,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((resolve18) => setTimeout(resolve18, 250));
+    await new Promise((resolve17) => setTimeout(resolve17, 250));
     const state = await readExtensionChatState(h);
     if (state?.status === "waiting_approval") return true;
     const afterCount = getStateMessageCount(state);
@@ -7340,6 +7377,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") {
@@ -7456,6 +7519,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"]) {
@@ -7649,6 +7744,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();
@@ -8176,6 +8273,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);
@@ -8215,7 +8316,7 @@ var init_handler = __esm({
         try {
           const http3 = await import("http");
           const postData = JSON.stringify(body);
-          const result = await new Promise((resolve18, reject) => {
+          const result = await new Promise((resolve17, reject) => {
             const req = http3.request({
               hostname: "127.0.0.1",
               port: 19280,
@@ -8227,9 +8328,9 @@ var init_handler = __esm({
               res.on("data", (chunk) => data += chunk);
               res.on("end", () => {
                 try {
-                  resolve18(JSON.parse(data));
+                  resolve17(JSON.parse(data));
                 } catch {
-                  resolve18({ raw: data });
+                  resolve17({ raw: data });
                 }
               });
             });
@@ -8247,15 +8348,15 @@ var init_handler = __esm({
         if (!providerType) return { success: false, error: "providerType required" };
         try {
           const http3 = await import("http");
-          const result = await new Promise((resolve18, reject) => {
+          const result = await new Promise((resolve17, 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 {
-                  resolve18(JSON.parse(data));
+                  resolve17(JSON.parse(data));
                 } catch {
-                  resolve18({ raw: data });
+                  resolve17({ raw: data });
                 }
               });
             }).on("error", reject);
@@ -8269,7 +8370,7 @@ var init_handler = __esm({
         try {
           const http3 = await import("http");
           const postData = JSON.stringify(args || {});
-          const result = await new Promise((resolve18, reject) => {
+          const result = await new Promise((resolve17, reject) => {
             const req = http3.request({
               hostname: "127.0.0.1",
               port: 19280,
@@ -8281,9 +8382,9 @@ var init_handler = __esm({
               res.on("data", (chunk) => data += chunk);
               res.on("end", () => {
                 try {
-                  resolve18(JSON.parse(data));
+                  resolve17(JSON.parse(data));
                 } catch {
-                  resolve18({ raw: data });
+                  resolve17({ raw: data });
                 }
               });
             });
@@ -10888,7 +10989,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((resolve18) => setTimeout(resolve18, 50));
+          await new Promise((resolve17) => setTimeout(resolve17, 50));
         }
         const finalScreenText = this.terminalScreen.getText() || "";
         LOG.warn(
@@ -11461,7 +11562,7 @@ ${data.message || ""}`.trim();
           const deadline = Date.now() + 1e4;
           while (this.startupParseGate && Date.now() < deadline) {
             this.resolveStartupState("send_wait");
-            await new Promise((resolve18) => setTimeout(resolve18, 50));
+            await new Promise((resolve17) => setTimeout(resolve17, 50));
           }
         }
         await this.waitForInteractivePrompt();
@@ -11531,12 +11632,12 @@ ${data.message || ""}`.trim();
             if (this.isWaitingForResponse) this.finishResponse();
           }, this.timeouts.maxResponse);
         };
-        await new Promise((resolve18) => {
+        await new Promise((resolve17) => {
           let resolved = false;
           const resolveOnce = () => {
             if (resolved) return;
             resolved = true;
-            resolve18();
+            resolve17();
           };
           const submit = () => {
             if (!this.ptyProcess) {
@@ -11710,17 +11811,17 @@ ${data.message || ""}`.trim();
         }
       }
       waitForStopped(timeoutMs) {
-        return new Promise((resolve18) => {
+        return new Promise((resolve17) => {
           const startedAt = Date.now();
           const timer = setInterval(() => {
             if (!this.ptyProcess || this.currentStatus === "stopped") {
               clearInterval(timer);
-              resolve18(true);
+              resolve17(true);
               return;
             }
             if (Date.now() - startedAt >= timeoutMs) {
               clearInterval(timer);
-              resolve18(false);
+              resolve17(false);
             }
           }, 100);
         });
@@ -12010,6 +12111,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() : "";
@@ -12019,6 +12123,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((resolve17) => setTimeout(resolve17, pollMs));
+  }
+  throw new Error(`CLI runtime did not become ready within ${timeoutMs}ms`);
+}
 var os14, path12, crypto3, fs5, import_node_module, CachedDatabaseSync, CliProviderInstance;
 var init_cli_provider_instance = __esm({
   "../../oss/packages/daemon-core/src/providers/cli-provider-instance.ts"() {
@@ -12315,6 +12433,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) {
@@ -12664,6 +12783,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,
@@ -12965,10 +13085,10 @@ function mergeDefs(...defs) {
 function cloneDef(schema) {
   return mergeDefs(schema._zod.def);
 }
-function getElementAtPath(obj, path35) {
-  if (!path35)
+function getElementAtPath(obj, path36) {
+  if (!path36)
     return obj;
-  return path35.reduce((acc, key) => acc?.[key], obj);
+  return path36.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -13280,11 +13400,11 @@ function aborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path35, issues) {
+function prefixIssues(path36, issues) {
   return issues.map((iss) => {
     var _a2;
     (_a2 = iss).path ?? (_a2.path = []);
-    iss.path.unshift(path35);
+    iss.path.unshift(path36);
     return iss;
   });
 }
@@ -13527,7 +13647,7 @@ function formatError(error48, mapper = (issue2) => issue2.message) {
 }
 function treeifyError(error48, mapper = (issue2) => issue2.message) {
   const result = { errors: [] };
-  const processError = (error49, path35 = []) => {
+  const processError = (error49, path36 = []) => {
     var _a2, _b;
     for (const issue2 of error49.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
@@ -13537,7 +13657,7 @@ function treeifyError(error48, mapper = (issue2) => issue2.message) {
       } else if (issue2.code === "invalid_element") {
         processError({ issues: issue2.issues }, issue2.path);
       } else {
-        const fullpath = [...path35, ...issue2.path];
+        const fullpath = [...path36, ...issue2.path];
         if (fullpath.length === 0) {
           result.errors.push(mapper(issue2));
           continue;
@@ -13569,8 +13689,8 @@ function treeifyError(error48, mapper = (issue2) => issue2.message) {
 }
 function toDotPath(_path) {
   const segs = [];
-  const path35 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
-  for (const seg of path35) {
+  const path36 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
+  for (const seg of path36) {
     if (typeof seg === "number")
       segs.push(`[${seg}]`);
     else if (typeof seg === "symbol")
@@ -26334,13 +26454,13 @@ function resolveRef(ref, ctx) {
   if (!ref.startsWith("#")) {
     throw new Error("External $ref is not supported, only local refs (#/...) are allowed");
   }
-  const path35 = ref.slice(1).split("/").filter(Boolean);
-  if (path35.length === 0) {
+  const path36 = ref.slice(1).split("/").filter(Boolean);
+  if (path36.length === 0) {
     return ctx.rootSchema;
   }
   const defsKey = ctx.version === "draft-2020-12" ? "$defs" : "definitions";
-  if (path35[0] === defsKey) {
-    const key = path35[1];
+  if (path36[0] === defsKey) {
+    const key = path36[1];
     if (!key || !ctx.defs[key]) {
       throw new Error(`Reference not found: ${ref}`);
     }
@@ -28767,8 +28887,8 @@ var init_acp = __esm({
         this.#requestHandler = requestHandler;
         this.#notificationHandler = notificationHandler;
         this.#stream = stream;
-        this.#closedPromise = new Promise((resolve18) => {
-          this.#abortController.signal.addEventListener("abort", () => resolve18());
+        this.#closedPromise = new Promise((resolve17) => {
+          this.#abortController.signal.addEventListener("abort", () => resolve17());
         });
         this.#receive();
       }
@@ -28917,8 +29037,8 @@ var init_acp = __esm({
       }
       async sendRequest(method, params) {
         const id = this.#nextRequestId++;
-        const responsePromise = new Promise((resolve18, reject) => {
-          this.#pendingResponses.set(id, { resolve: resolve18, reject });
+        const responsePromise = new Promise((resolve17, reject) => {
+          this.#pendingResponses.set(id, { resolve: resolve17, reject });
         });
         await this.#sendMessage({ jsonrpc: "2.0", id, method, params });
         return responsePromise;
@@ -29554,13 +29674,13 @@ var init_acp_provider_instance = __esm({
             }
             this.currentStatus = "waiting_approval";
             this.detectStatusTransition();
-            const approved = await new Promise((resolve18) => {
-              this.permissionResolvers.push(resolve18);
+            const approved = await new Promise((resolve17) => {
+              this.permissionResolvers.push(resolve17);
               setTimeout(() => {
-                const idx = this.permissionResolvers.indexOf(resolve18);
+                const idx = this.permissionResolvers.indexOf(resolve17);
                 if (idx >= 0) {
                   this.permissionResolvers.splice(idx, 1);
-                  resolve18(false);
+                  resolve17(false);
                 }
               }, 3e5);
             });
@@ -30920,7 +31040,7 @@ var init_readdirp = __esm({
         this._directoryFilter = normalizeFilter(opts.directoryFilter);
         const statMethod = opts.lstat ? import_promises.lstat : import_promises.stat;
         if (wantBigintFsStats) {
-          this._stat = (path35) => statMethod(path35, { bigint: true });
+          this._stat = (path36) => statMethod(path36, { bigint: true });
         } else {
           this._stat = statMethod;
         }
@@ -30945,8 +31065,8 @@ var init_readdirp = __esm({
             const par = this.parent;
             const fil = par && par.files;
             if (fil && fil.length > 0) {
-              const { path: path35, depth } = par;
-              const slice = fil.splice(0, batch).map((dirent) => this._formatEntry(dirent, path35));
+              const { path: path36, depth } = par;
+              const slice = fil.splice(0, batch).map((dirent) => this._formatEntry(dirent, path36));
               const awaited = await Promise.all(slice);
               for (const entry of awaited) {
                 if (!entry)
@@ -30986,20 +31106,20 @@ var init_readdirp = __esm({
           this.reading = false;
         }
       }
-      async _exploreDir(path35, depth) {
+      async _exploreDir(path36, depth) {
         let files;
         try {
-          files = await (0, import_promises.readdir)(path35, this._rdOptions);
+          files = await (0, import_promises.readdir)(path36, this._rdOptions);
         } catch (error48) {
           this._onError(error48);
         }
-        return { files, depth, path: path35 };
+        return { files, depth, path: path36 };
       }
-      async _formatEntry(dirent, path35) {
+      async _formatEntry(dirent, path36) {
         let entry;
         const basename10 = this._isDirent ? dirent.name : dirent;
         try {
-          const fullPath = (0, import_node_path.resolve)((0, import_node_path.join)(path35, basename10));
+          const fullPath = (0, import_node_path.resolve)((0, import_node_path.join)(path36, basename10));
           entry = { path: (0, import_node_path.relative)(this._root, fullPath), fullPath, basename: basename10 };
           entry[this._statsProp] = this._isDirent ? dirent : await this._stat(fullPath);
         } catch (err) {
@@ -31056,16 +31176,16 @@ var init_readdirp = __esm({
 });
 
 // ../../oss/packages/daemon-core/node_modules/chokidar/handler.js
-function createFsWatchInstance(path35, options, listener, errHandler, emitRaw) {
+function createFsWatchInstance(path36, options, listener, errHandler, emitRaw) {
   const handleEvent = (rawEvent, evPath) => {
-    listener(path35);
-    emitRaw(rawEvent, evPath, { watchedPath: path35 });
-    if (evPath && path35 !== evPath) {
-      fsWatchBroadcast(sp.resolve(path35, evPath), KEY_LISTENERS, sp.join(path35, evPath));
+    listener(path36);
+    emitRaw(rawEvent, evPath, { watchedPath: path36 });
+    if (evPath && path36 !== evPath) {
+      fsWatchBroadcast(sp.resolve(path36, evPath), KEY_LISTENERS, sp.join(path36, evPath));
     }
   };
   try {
-    return (0, import_node_fs.watch)(path35, {
+    return (0, import_node_fs.watch)(path36, {
       persistent: options.persistent
     }, handleEvent);
   } catch (error48) {
@@ -31414,12 +31534,12 @@ var init_handler2 = __esm({
         listener(val1, val2, val3);
       });
     };
-    setFsWatchListener = (path35, fullPath, options, handlers) => {
+    setFsWatchListener = (path36, fullPath, options, handlers) => {
       const { listener, errHandler, rawEmitter } = handlers;
       let cont = FsWatchInstances.get(fullPath);
       let watcher;
       if (!options.persistent) {
-        watcher = createFsWatchInstance(path35, options, listener, errHandler, rawEmitter);
+        watcher = createFsWatchInstance(path36, options, listener, errHandler, rawEmitter);
         if (!watcher)
           return;
         return watcher.close.bind(watcher);
@@ -31430,7 +31550,7 @@ var init_handler2 = __esm({
         addAndConvert(cont, KEY_RAW, rawEmitter);
       } else {
         watcher = createFsWatchInstance(
-          path35,
+          path36,
           options,
           fsWatchBroadcast.bind(null, fullPath, KEY_LISTENERS),
           errHandler,
@@ -31445,7 +31565,7 @@ var init_handler2 = __esm({
             cont.watcherUnusable = true;
           if (isWindows && error48.code === "EPERM") {
             try {
-              const fd = await (0, import_promises2.open)(path35, "r");
+              const fd = await (0, import_promises2.open)(path36, "r");
               await fd.close();
               broadcastErr(error48);
             } catch (err) {
@@ -31476,7 +31596,7 @@ var init_handler2 = __esm({
       };
     };
     FsWatchFileInstances = /* @__PURE__ */ new Map();
-    setFsWatchFileListener = (path35, fullPath, options, handlers) => {
+    setFsWatchFileListener = (path36, fullPath, options, handlers) => {
       const { listener, rawEmitter } = handlers;
       let cont = FsWatchFileInstances.get(fullPath);
       const copts = cont && cont.options;
@@ -31498,7 +31618,7 @@ var init_handler2 = __esm({
             });
             const currmtime = curr.mtimeMs;
             if (curr.size !== prev.size || currmtime > prev.mtimeMs || currmtime === 0) {
-              foreach(cont.listeners, (listener2) => listener2(path35, curr));
+              foreach(cont.listeners, (listener2) => listener2(path36, curr));
             }
           })
         };
@@ -31528,13 +31648,13 @@ var init_handler2 = __esm({
        * @param listener on fs change
        * @returns closer for the watcher instance
        */
-      _watchWithNodeFs(path35, listener) {
+      _watchWithNodeFs(path36, listener) {
         const opts = this.fsw.options;
-        const directory = sp.dirname(path35);
-        const basename10 = sp.basename(path35);
+        const directory = sp.dirname(path36);
+        const basename10 = sp.basename(path36);
         const parent = this.fsw._getWatchedDir(directory);
         parent.add(basename10);
-        const absolutePath = sp.resolve(path35);
+        const absolutePath = sp.resolve(path36);
         const options = {
           persistent: opts.persistent
         };
@@ -31544,12 +31664,12 @@ var init_handler2 = __esm({
         if (opts.usePolling) {
           const enableBin = opts.interval !== opts.binaryInterval;
           options.interval = enableBin && isBinaryPath(basename10) ? opts.binaryInterval : opts.interval;
-          closer = setFsWatchFileListener(path35, absolutePath, options, {
+          closer = setFsWatchFileListener(path36, absolutePath, options, {
             listener,
             rawEmitter: this.fsw._emitRaw
           });
         } else {
-          closer = setFsWatchListener(path35, absolutePath, options, {
+          closer = setFsWatchListener(path36, absolutePath, options, {
             listener,
             errHandler: this._boundHandleError,
             rawEmitter: this.fsw._emitRaw
@@ -31571,7 +31691,7 @@ var init_handler2 = __esm({
         let prevStats = stats;
         if (parent.has(basename10))
           return;
-        const listener = async (path35, newStats) => {
+        const listener = async (path36, newStats) => {
           if (!this.fsw._throttle(THROTTLE_MODE_WATCH, file2, 5))
             return;
           if (!newStats || newStats.mtimeMs === 0) {
@@ -31585,11 +31705,11 @@ var init_handler2 = __esm({
                 this.fsw._emit(EV.CHANGE, file2, newStats2);
               }
               if ((isMacos || isLinux || isFreeBSD) && prevStats.ino !== newStats2.ino) {
-                this.fsw._closeFile(path35);
+                this.fsw._closeFile(path36);
                 prevStats = newStats2;
                 const closer2 = this._watchWithNodeFs(file2, listener);
                 if (closer2)
-                  this.fsw._addPathCloser(path35, closer2);
+                  this.fsw._addPathCloser(path36, closer2);
               } else {
                 prevStats = newStats2;
               }
@@ -31621,7 +31741,7 @@ var init_handler2 = __esm({
        * @param item basename of this item
        * @returns true if no more processing is needed for this entry.
        */
-      async _handleSymlink(entry, directory, path35, item) {
+      async _handleSymlink(entry, directory, path36, item) {
         if (this.fsw.closed) {
           return;
         }
@@ -31631,7 +31751,7 @@ var init_handler2 = __esm({
           this.fsw._incrReadyCount();
           let linkPath;
           try {
-            linkPath = await (0, import_promises2.realpath)(path35);
+            linkPath = await (0, import_promises2.realpath)(path36);
           } catch (e) {
             this.fsw._emitReady();
             return true;
@@ -31641,12 +31761,12 @@ var init_handler2 = __esm({
           if (dir.has(item)) {
             if (this.fsw._symlinkPaths.get(full) !== linkPath) {
               this.fsw._symlinkPaths.set(full, linkPath);
-              this.fsw._emit(EV.CHANGE, path35, entry.stats);
+              this.fsw._emit(EV.CHANGE, path36, entry.stats);
             }
           } else {
             dir.add(item);
             this.fsw._symlinkPaths.set(full, linkPath);
-            this.fsw._emit(EV.ADD, path35, entry.stats);
+            this.fsw._emit(EV.ADD, path36, entry.stats);
           }
           this.fsw._emitReady();
           return true;
@@ -31676,9 +31796,9 @@ var init_handler2 = __esm({
             return;
           }
           const item = entry.path;
-          let path35 = sp.join(directory, item);
+          let path36 = sp.join(directory, item);
           current.add(item);
-          if (entry.stats.isSymbolicLink() && await this._handleSymlink(entry, directory, path35, item)) {
+          if (entry.stats.isSymbolicLink() && await this._handleSymlink(entry, directory, path36, item)) {
             return;
           }
           if (this.fsw.closed) {
@@ -31687,11 +31807,11 @@ var init_handler2 = __esm({
           }
           if (item === target || !target && !previous.has(item)) {
             this.fsw._incrReadyCount();
-            path35 = sp.join(dir, sp.relative(dir, path35));
-            this._addToNodeFs(path35, initialAdd, wh, depth + 1);
+            path36 = sp.join(dir, sp.relative(dir, path36));
+            this._addToNodeFs(path36, initialAdd, wh, depth + 1);
           }
         }).on(EV.ERROR, this._boundHandleError);
-        return new Promise((resolve18, reject) => {
+        return new Promise((resolve17, reject) => {
           if (!stream)
             return reject();
           stream.once(STR_END, () => {
@@ -31700,7 +31820,7 @@ var init_handler2 = __esm({
               return;
             }
             const wasThrottled = throttler ? throttler.clear() : false;
-            resolve18(void 0);
+            resolve17(void 0);
             previous.getChildren().filter((item) => {
               return item !== directory && !current.has(item);
             }).forEach((item) => {
@@ -31757,13 +31877,13 @@ var init_handler2 = __esm({
        * @param depth Child path actually targeted for watch
        * @param target Child path actually targeted for watch
        */
-      async _addToNodeFs(path35, initialAdd, priorWh, depth, target) {
+      async _addToNodeFs(path36, initialAdd, priorWh, depth, target) {
         const ready = this.fsw._emitReady;
-        if (this.fsw._isIgnored(path35) || this.fsw.closed) {
+        if (this.fsw._isIgnored(path36) || this.fsw.closed) {
           ready();
           return false;
         }
-        const wh = this.fsw._getWatchHelpers(path35);
+        const wh = this.fsw._getWatchHelpers(path36);
         if (priorWh) {
           wh.filterPath = (entry) => priorWh.filterPath(entry);
           wh.filterDir = (entry) => priorWh.filterDir(entry);
@@ -31779,8 +31899,8 @@ var init_handler2 = __esm({
           const follow = this.fsw.options.followSymlinks;
           let closer;
           if (stats.isDirectory()) {
-            const absPath = sp.resolve(path35);
-            const targetPath = follow ? await (0, import_promises2.realpath)(path35) : path35;
+            const absPath = sp.resolve(path36);
+            const targetPath = follow ? await (0, import_promises2.realpath)(path36) : path36;
             if (this.fsw.closed)
               return;
             closer = await this._handleDir(wh.watchPath, stats, initialAdd, depth, target, wh, targetPath);
@@ -31790,29 +31910,29 @@ var init_handler2 = __esm({
               this.fsw._symlinkPaths.set(absPath, targetPath);
             }
           } else if (stats.isSymbolicLink()) {
-            const targetPath = follow ? await (0, import_promises2.realpath)(path35) : path35;
+            const targetPath = follow ? await (0, import_promises2.realpath)(path36) : path36;
             if (this.fsw.closed)
               return;
             const parent = sp.dirname(wh.watchPath);
             this.fsw._getWatchedDir(parent).add(wh.watchPath);
             this.fsw._emit(EV.ADD, wh.watchPath, stats);
-            closer = await this._handleDir(parent, stats, initialAdd, depth, path35, wh, targetPath);
+            closer = await this._handleDir(parent, stats, initialAdd, depth, path36, wh, targetPath);
             if (this.fsw.closed)
               return;
             if (targetPath !== void 0) {
-              this.fsw._symlinkPaths.set(sp.resolve(path35), targetPath);
+              this.fsw._symlinkPaths.set(sp.resolve(path36), targetPath);
             }
           } else {
             closer = this._handleFile(wh.watchPath, stats, initialAdd);
           }
           ready();
           if (closer)
-            this.fsw._addPathCloser(path35, closer);
+            this.fsw._addPathCloser(path36, closer);
           return false;
         } catch (error48) {
           if (this.fsw._handleError(error48)) {
             ready();
-            return path35;
+            return path36;
           }
         }
       }
@@ -31847,24 +31967,24 @@ function createPattern(matcher) {
   }
   return () => false;
 }
-function normalizePath(path35) {
-  if (typeof path35 !== "string")
+function normalizePath(path36) {
+  if (typeof path36 !== "string")
     throw new Error("string expected");
-  path35 = sp2.normalize(path35);
-  path35 = path35.replace(/\\/g, "/");
+  path36 = sp2.normalize(path36);
+  path36 = path36.replace(/\\/g, "/");
   let prepend = false;
-  if (path35.startsWith("//"))
+  if (path36.startsWith("//"))
     prepend = true;
-  path35 = path35.replace(DOUBLE_SLASH_RE, "/");
+  path36 = path36.replace(DOUBLE_SLASH_RE, "/");
   if (prepend)
-    path35 = "/" + path35;
-  return path35;
+    path36 = "/" + path36;
+  return path36;
 }
 function matchPatterns(patterns, testString, stats) {
-  const path35 = normalizePath(testString);
+  const path36 = normalizePath(testString);
   for (let index = 0; index < patterns.length; index++) {
     const pattern = patterns[index];
-    if (pattern(path35, stats)) {
+    if (pattern(path36, stats)) {
       return true;
     }
   }
@@ -31927,19 +32047,19 @@ var init_chokidar = __esm({
       }
       return str;
     };
-    normalizePathToUnix = (path35) => toUnix(sp2.normalize(toUnix(path35)));
-    normalizeIgnored = (cwd = "") => (path35) => {
-      if (typeof path35 === "string") {
-        return normalizePathToUnix(sp2.isAbsolute(path35) ? path35 : sp2.join(cwd, path35));
+    normalizePathToUnix = (path36) => toUnix(sp2.normalize(toUnix(path36)));
+    normalizeIgnored = (cwd = "") => (path36) => {
+      if (typeof path36 === "string") {
+        return normalizePathToUnix(sp2.isAbsolute(path36) ? path36 : sp2.join(cwd, path36));
       } else {
-        return path35;
+        return path36;
       }
     };
-    getAbsolutePath = (path35, cwd) => {
-      if (sp2.isAbsolute(path35)) {
-        return path35;
+    getAbsolutePath = (path36, cwd) => {
+      if (sp2.isAbsolute(path36)) {
+        return path36;
       }
-      return sp2.join(cwd, path35);
+      return sp2.join(cwd, path36);
     };
     EMPTY_SET = Object.freeze(/* @__PURE__ */ new Set());
     DirEntry = class {
@@ -32004,10 +32124,10 @@ var init_chokidar = __esm({
       dirParts;
       followSymlinks;
       statMethod;
-      constructor(path35, follow, fsw) {
+      constructor(path36, follow, fsw) {
         this.fsw = fsw;
-        const watchPath = path35;
-        this.path = path35 = path35.replace(REPLACER_RE, "");
+        const watchPath = path36;
+        this.path = path36 = path36.replace(REPLACER_RE, "");
         this.watchPath = watchPath;
         this.fullWatchPath = sp2.resolve(watchPath);
         this.dirParts = [];
@@ -32147,20 +32267,20 @@ var init_chokidar = __esm({
         this._closePromise = void 0;
         let paths = unifyPaths(paths_);
         if (cwd) {
-          paths = paths.map((path35) => {
-            const absPath = getAbsolutePath(path35, cwd);
+          paths = paths.map((path36) => {
+            const absPath = getAbsolutePath(path36, cwd);
             return absPath;
           });
         }
-        paths.forEach((path35) => {
-          this._removeIgnoredPath(path35);
+        paths.forEach((path36) => {
+          this._removeIgnoredPath(path36);
         });
         this._userIgnored = void 0;
         if (!this._readyCount)
           this._readyCount = 0;
         this._readyCount += paths.length;
-        Promise.all(paths.map(async (path35) => {
-          const res = await this._nodeFsHandler._addToNodeFs(path35, !_internal, void 0, 0, _origAdd);
+        Promise.all(paths.map(async (path36) => {
+          const res = await this._nodeFsHandler._addToNodeFs(path36, !_internal, void 0, 0, _origAdd);
           if (res)
             this._emitReady();
           return res;
@@ -32182,17 +32302,17 @@ var init_chokidar = __esm({
           return this;
         const paths = unifyPaths(paths_);
         const { cwd } = this.options;
-        paths.forEach((path35) => {
-          if (!sp2.isAbsolute(path35) && !this._closers.has(path35)) {
+        paths.forEach((path36) => {
+          if (!sp2.isAbsolute(path36) && !this._closers.has(path36)) {
             if (cwd)
-              path35 = sp2.join(cwd, path35);
-            path35 = sp2.resolve(path35);
+              path36 = sp2.join(cwd, path36);
+            path36 = sp2.resolve(path36);
           }
-          this._closePath(path35);
-          this._addIgnoredPath(path35);
-          if (this._watched.has(path35)) {
+          this._closePath(path36);
+          this._addIgnoredPath(path36);
+          if (this._watched.has(path36)) {
             this._addIgnoredPath({
-              path: path35,
+              path: path36,
               recursive: true
             });
           }
@@ -32256,38 +32376,38 @@ var init_chokidar = __esm({
        * @param stats arguments to be passed with event
        * @returns the error if defined, otherwise the value of the FSWatcher instance's `closed` flag
        */
-      async _emit(event, path35, stats) {
+      async _emit(event, path36, stats) {
         if (this.closed)
           return;
         const opts = this.options;
         if (isWindows)
-          path35 = sp2.normalize(path35);
+          path36 = sp2.normalize(path36);
         if (opts.cwd)
-          path35 = sp2.relative(opts.cwd, path35);
-        const args = [path35];
+          path36 = sp2.relative(opts.cwd, path36);
+        const args = [path36];
         if (stats != null)
           args.push(stats);
         const awf = opts.awaitWriteFinish;
         let pw;
-        if (awf && (pw = this._pendingWrites.get(path35))) {
+        if (awf && (pw = this._pendingWrites.get(path36))) {
           pw.lastChange = /* @__PURE__ */ new Date();
           return this;
         }
         if (opts.atomic) {
           if (event === EVENTS.UNLINK) {
-            this._pendingUnlinks.set(path35, [event, ...args]);
+            this._pendingUnlinks.set(path36, [event, ...args]);
             setTimeout(() => {
-              this._pendingUnlinks.forEach((entry, path36) => {
+              this._pendingUnlinks.forEach((entry, path37) => {
                 this.emit(...entry);
                 this.emit(EVENTS.ALL, ...entry);
-                this._pendingUnlinks.delete(path36);
+                this._pendingUnlinks.delete(path37);
               });
             }, typeof opts.atomic === "number" ? opts.atomic : 100);
             return this;
           }
-          if (event === EVENTS.ADD && this._pendingUnlinks.has(path35)) {
+          if (event === EVENTS.ADD && this._pendingUnlinks.has(path36)) {
             event = EVENTS.CHANGE;
-            this._pendingUnlinks.delete(path35);
+            this._pendingUnlinks.delete(path36);
           }
         }
         if (awf && (event === EVENTS.ADD || event === EVENTS.CHANGE) && this._readyEmitted) {
@@ -32305,16 +32425,16 @@ var init_chokidar = __esm({
               this.emitWithAll(event, args);
             }
           };
-          this._awaitWriteFinish(path35, awf.stabilityThreshold, event, awfEmit);
+          this._awaitWriteFinish(path36, awf.stabilityThreshold, event, awfEmit);
           return this;
         }
         if (event === EVENTS.CHANGE) {
-          const isThrottled = !this._throttle(EVENTS.CHANGE, path35, 50);
+          const isThrottled = !this._throttle(EVENTS.CHANGE, path36, 50);
           if (isThrottled)
             return this;
         }
         if (opts.alwaysStat && stats === void 0 && (event === EVENTS.ADD || event === EVENTS.ADD_DIR || event === EVENTS.CHANGE)) {
-          const fullPath = opts.cwd ? sp2.join(opts.cwd, path35) : path35;
+          const fullPath = opts.cwd ? sp2.join(opts.cwd, path36) : path36;
           let stats2;
           try {
             stats2 = await (0, import_promises3.stat)(fullPath);
@@ -32345,23 +32465,23 @@ var init_chokidar = __esm({
        * @param timeout duration of time to suppress duplicate actions
        * @returns tracking object or false if action should be suppressed
        */
-      _throttle(actionType, path35, timeout) {
+      _throttle(actionType, path36, timeout) {
         if (!this._throttled.has(actionType)) {
           this._throttled.set(actionType, /* @__PURE__ */ new Map());
         }
         const action = this._throttled.get(actionType);
         if (!action)
           throw new Error("invalid throttle");
-        const actionPath = action.get(path35);
+        const actionPath = action.get(path36);
         if (actionPath) {
           actionPath.count++;
           return false;
         }
         let timeoutObject;
         const clear = () => {
-          const item = action.get(path35);
+          const item = action.get(path36);
           const count = item ? item.count : 0;
-          action.delete(path35);
+          action.delete(path36);
           clearTimeout(timeoutObject);
           if (item)
             clearTimeout(item.timeoutObject);
@@ -32369,7 +32489,7 @@ var init_chokidar = __esm({
         };
         timeoutObject = setTimeout(clear, timeout);
         const thr = { timeoutObject, clear, count: 0 };
-        action.set(path35, thr);
+        action.set(path36, thr);
         return thr;
       }
       _incrReadyCount() {
@@ -32383,44 +32503,44 @@ var init_chokidar = __esm({
        * @param event
        * @param awfEmit Callback to be called when ready for event to be emitted.
        */
-      _awaitWriteFinish(path35, threshold, event, awfEmit) {
+      _awaitWriteFinish(path36, threshold, event, awfEmit) {
         const awf = this.options.awaitWriteFinish;
         if (typeof awf !== "object")
           return;
         const pollInterval = awf.pollInterval;
         let timeoutHandler;
-        let fullPath = path35;
-        if (this.options.cwd && !sp2.isAbsolute(path35)) {
-          fullPath = sp2.join(this.options.cwd, path35);
+        let fullPath = path36;
+        if (this.options.cwd && !sp2.isAbsolute(path36)) {
+          fullPath = sp2.join(this.options.cwd, path36);
         }
         const now = /* @__PURE__ */ new Date();
         const writes = this._pendingWrites;
         function awaitWriteFinishFn(prevStat) {
           (0, import_node_fs2.stat)(fullPath, (err, curStat) => {
-            if (err || !writes.has(path35)) {
+            if (err || !writes.has(path36)) {
               if (err && err.code !== "ENOENT")
                 awfEmit(err);
               return;
             }
             const now2 = Number(/* @__PURE__ */ new Date());
             if (prevStat && curStat.size !== prevStat.size) {
-              writes.get(path35).lastChange = now2;
+              writes.get(path36).lastChange = now2;
             }
-            const pw = writes.get(path35);
+            const pw = writes.get(path36);
             const df = now2 - pw.lastChange;
             if (df >= threshold) {
-              writes.delete(path35);
+              writes.delete(path36);
               awfEmit(void 0, curStat);
             } else {
               timeoutHandler = setTimeout(awaitWriteFinishFn, pollInterval, curStat);
             }
           });
         }
-        if (!writes.has(path35)) {
-          writes.set(path35, {
+        if (!writes.has(path36)) {
+          writes.set(path36, {
             lastChange: now,
             cancelWait: () => {
-              writes.delete(path35);
+              writes.delete(path36);
               clearTimeout(timeoutHandler);
               return event;
             }
@@ -32431,8 +32551,8 @@ var init_chokidar = __esm({
       /**
        * Determines whether user has asked to ignore this path.
        */
-      _isIgnored(path35, stats) {
-        if (this.options.atomic && DOT_RE.test(path35))
+      _isIgnored(path36, stats) {
+        if (this.options.atomic && DOT_RE.test(path36))
           return true;
         if (!this._userIgnored) {
           const { cwd } = this.options;
@@ -32442,17 +32562,17 @@ var init_chokidar = __esm({
           const list = [...ignoredPaths.map(normalizeIgnored(cwd)), ...ignored];
           this._userIgnored = anymatch(list, void 0);
         }
-        return this._userIgnored(path35, stats);
+        return this._userIgnored(path36, stats);
       }
-      _isntIgnored(path35, stat4) {
-        return !this._isIgnored(path35, stat4);
+      _isntIgnored(path36, stat4) {
+        return !this._isIgnored(path36, stat4);
       }
       /**
        * Provides a set of common helpers and properties relating to symlink handling.
        * @param path file or directory pattern being watched
        */
-      _getWatchHelpers(path35) {
-        return new WatchHelper(path35, this.options.followSymlinks, this);
+      _getWatchHelpers(path36) {
+        return new WatchHelper(path36, this.options.followSymlinks, this);
       }
       // Directory helpers
       // -----------------
@@ -32484,63 +32604,63 @@ var init_chokidar = __esm({
        * @param item      base path of item/directory
        */
       _remove(directory, item, isDirectory) {
-        const path35 = sp2.join(directory, item);
-        const fullPath = sp2.resolve(path35);
-        isDirectory = isDirectory != null ? isDirectory : this._watched.has(path35) || this._watched.has(fullPath);
-        if (!this._throttle("remove", path35, 100))
+        const path36 = sp2.join(directory, item);
+        const fullPath = sp2.resolve(path36);
+        isDirectory = isDirectory != null ? isDirectory : this._watched.has(path36) || this._watched.has(fullPath);
+        if (!this._throttle("remove", path36, 100))
           return;
         if (!isDirectory && this._watched.size === 1) {
           this.add(directory, item, true);
         }
-        const wp = this._getWatchedDir(path35);
+        const wp = this._getWatchedDir(path36);
         const nestedDirectoryChildren = wp.getChildren();
-        nestedDirectoryChildren.forEach((nested) => this._remove(path35, nested));
+        nestedDirectoryChildren.forEach((nested) => this._remove(path36, nested));
         const parent = this._getWatchedDir(directory);
         const wasTracked = parent.has(item);
         parent.remove(item);
         if (this._symlinkPaths.has(fullPath)) {
           this._symlinkPaths.delete(fullPath);
         }
-        let relPath = path35;
+        let relPath = path36;
         if (this.options.cwd)
-          relPath = sp2.relative(this.options.cwd, path35);
+          relPath = sp2.relative(this.options.cwd, path36);
         if (this.options.awaitWriteFinish && this._pendingWrites.has(relPath)) {
           const event = this._pendingWrites.get(relPath).cancelWait();
           if (event === EVENTS.ADD)
             return;
         }
-        this._watched.delete(path35);
+        this._watched.delete(path36);
         this._watched.delete(fullPath);
         const eventName = isDirectory ? EVENTS.UNLINK_DIR : EVENTS.UNLINK;
-        if (wasTracked && !this._isIgnored(path35))
-          this._emit(eventName, path35);
-        this._closePath(path35);
+        if (wasTracked && !this._isIgnored(path36))
+          this._emit(eventName, path36);
+        this._closePath(path36);
       }
       /**
        * Closes all watchers for a path
        */
-      _closePath(path35) {
-        this._closeFile(path35);
-        const dir = sp2.dirname(path35);
-        this._getWatchedDir(dir).remove(sp2.basename(path35));
+      _closePath(path36) {
+        this._closeFile(path36);
+        const dir = sp2.dirname(path36);
+        this._getWatchedDir(dir).remove(sp2.basename(path36));
       }
       /**
        * Closes only file-specific watchers
        */
-      _closeFile(path35) {
-        const closers = this._closers.get(path35);
+      _closeFile(path36) {
+        const closers = this._closers.get(path36);
         if (!closers)
           return;
         closers.forEach((closer) => closer());
-        this._closers.delete(path35);
+        this._closers.delete(path36);
       }
-      _addPathCloser(path35, closer) {
+      _addPathCloser(path36, closer) {
         if (!closer)
           return;
-        let list = this._closers.get(path35);
+        let list = this._closers.get(path36);
         if (!list) {
           list = [];
-          this._closers.set(path35, list);
+          this._closers.set(path36, list);
         }
         list.push(closer);
       }
@@ -32585,6 +32705,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;
@@ -32714,8 +32837,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;
@@ -32729,22 +32855,15 @@ var init_provider_loader = __esm({
       static META_FILE = ".meta.json";
       constructor(options) {
         this.logFn = options?.logFn || LOG.forComponent("Provider").asLogFn();
-        const defaultProvidersDir = path15.join(os16.homedir(), ".adhdev", "providers");
-        if (options?.userDir) {
-          this.userDir = options.userDir;
-          this.log(`Config 'providerDir' applied: ${this.userDir}`);
-        } else {
-          const localRepoPath = path15.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 = path15.join(defaultProvidersDir, ".upstream");
-        this.disableUpstream = options?.disableUpstream ?? false;
+        this.defaultProvidersDir = path15.join(os16.homedir(), ".adhdev", "providers");
+        this.userDir = this.defaultProvidersDir;
+        this.upstreamDir = path15.join(this.defaultProvidersDir, ".upstream");
+        this.disableUpstream = false;
+        this.applySourceConfig({
+          userDir: options?.userDir,
+          sourceMode: options?.sourceMode,
+          disableUpstream: options?.disableUpstream
+        });
       }
       log(msg) {
         this.logFn(`[ProviderLoader] ${msg}`);
@@ -32769,6 +32888,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 = path15.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.
       */
@@ -32819,7 +32965,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"]);
@@ -33330,7 +33476,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");
@@ -33352,7 +33498,7 @@ var init_provider_loader = __esm({
           return { updated: false };
         }
         try {
-          const etag = await new Promise((resolve18, reject) => {
+          const etag = await new Promise((resolve17, reject) => {
             const options = {
               method: "HEAD",
               hostname: "github.com",
@@ -33370,7 +33516,7 @@ var init_provider_loader = __esm({
                   headers: { "User-Agent": "adhdev-launcher" },
                   timeout: 1e4
                 }, (res2) => {
-                  resolve18(res2.headers.etag || res2.headers["last-modified"] || "");
+                  resolve17(res2.headers.etag || res2.headers["last-modified"] || "");
                 });
                 req2.on("error", reject);
                 req2.on("timeout", () => {
@@ -33379,7 +33525,7 @@ var init_provider_loader = __esm({
                 });
                 req2.end();
               } else {
-                resolve18(res.headers.etag || res.headers["last-modified"] || "");
+                resolve17(res.headers.etag || res.headers["last-modified"] || "");
               }
             });
             req.on("error", reject);
@@ -33443,7 +33589,7 @@ var init_provider_loader = __esm({
       downloadFile(url2, destPath) {
         const https = require("https");
         const http3 = require("http");
-        return new Promise((resolve18, reject) => {
+        return new Promise((resolve17, reject) => {
           const doRequest = (reqUrl, redirectCount = 0) => {
             if (redirectCount > 5) {
               reject(new Error("Too many redirects"));
@@ -33463,7 +33609,7 @@ var init_provider_loader = __esm({
               res.pipe(ws);
               ws.on("finish", () => {
                 ws.close();
-                resolve18();
+                resolve17();
               });
               ws.on("error", reject);
             });
@@ -33939,17 +34085,17 @@ async function findFreePort(ports) {
   throw new Error("No free port found");
 }
 function checkPortFree(port) {
-  return new Promise((resolve18) => {
+  return new Promise((resolve17) => {
     const server = net2.createServer();
     server.unref();
-    server.on("error", () => resolve18(false));
+    server.on("error", () => resolve17(false));
     server.listen(port, "127.0.0.1", () => {
-      server.close(() => resolve18(true));
+      server.close(() => resolve17(true));
     });
   });
 }
 async function isCdpActive(port) {
-  return new Promise((resolve18) => {
+  return new Promise((resolve17) => {
     const req = require("http").get(`http://127.0.0.1:${port}/json/version`, {
       timeout: 2e3
     }, (res) => {
@@ -33958,16 +34104,16 @@ async function isCdpActive(port) {
       res.on("end", () => {
         try {
           const info = JSON.parse(data);
-          resolve18(!!info["WebKit-Version"] || !!info["Browser"]);
+          resolve17(!!info["WebKit-Version"] || !!info["Browser"]);
         } catch {
-          resolve18(false);
+          resolve17(false);
         }
       });
     });
-    req.on("error", () => resolve18(false));
+    req.on("error", () => resolve17(false));
     req.on("timeout", () => {
       req.destroy();
-      resolve18(false);
+      resolve17(false);
     });
   });
 }
@@ -34713,7 +34859,7 @@ async function waitForPidExit(pid, timeoutMs) {
   while (Date.now() - start < timeoutMs) {
     try {
       process.kill(pid, 0);
-      await new Promise((resolve18) => setTimeout(resolve18, 250));
+      await new Promise((resolve17) => setTimeout(resolve17, 250));
     } catch {
       return;
     }
@@ -34828,7 +34974,7 @@ async function runDaemonUpgradeHelper(payload) {
     appendUpgradeLog(installOutput.trim());
   }
   if (process.platform === "win32") {
-    await new Promise((resolve18) => setTimeout(resolve18, 500));
+    await new Promise((resolve17) => setTimeout(resolve17, 500));
     cleanupStaleGlobalInstallDirs(payload.packageName);
     appendUpgradeLog("Post-install staging cleanup complete");
   }
@@ -35156,8 +35302,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 });
@@ -35178,13 +35325,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
@@ -35819,7 +35966,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((resolve18) => setTimeout(resolve18, 250));
+          await new Promise((resolve17) => setTimeout(resolve17, 250));
           let state;
           try {
             state = await this.readChat(evaluate);
@@ -35841,7 +35988,7 @@ var init_provider_adapter = __esm({
         if (this.messageCount(first) > 0 || this.lastMessageSignature(first)) {
           return first;
         }
-        await new Promise((resolve18) => setTimeout(resolve18, 150));
+        await new Promise((resolve17) => setTimeout(resolve17, 150));
         const second = await this.readChat(evaluate);
         return this.messageCount(second) >= this.messageCount(first) ? second : first;
       }
@@ -35981,7 +36128,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((resolve18) => setTimeout(resolve18, 250));
+          await new Promise((resolve17) => setTimeout(resolve17, 250));
           const state = await this.readChat(evaluate);
           const title = this.getStateTitle(state);
           if (this.titlesMatch(title, sessionId)) return true;
@@ -38493,7 +38640,7 @@ function getCliTargetBundle(ctx, type, instanceId) {
   return { target, instance, adapter };
 }
 function sleep(ms) {
-  return new Promise((resolve18) => setTimeout(resolve18, ms));
+  return new Promise((resolve17) => setTimeout(resolve17, ms));
 }
 async function waitForCliReady(ctx, type, instanceId, timeoutMs) {
   const startedAt = Date.now();
@@ -39345,18 +39492,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) {
@@ -40655,6 +40790,8 @@ var init_dev_server = __esm({
     fs14 = __toESM(require("fs"));
     path24 = __toESM(require("path"));
     init_provider_schema();
+    init_config();
+    init_provider_source_config();
     init_scaffold_template();
     init_version_archive();
     init_logger();
@@ -40669,6 +40806,7 @@ var init_dev_server = __esm({
       cdpManagers;
       instanceManager;
       cliManager;
+      onProviderSourceConfigChanged;
       logFn;
       sseClients = [];
       watchScriptPath = null;
@@ -40685,6 +40823,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) {
@@ -40694,6 +40833,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) },
@@ -40759,8 +40900,8 @@ var init_dev_server = __esm({
       }
       getEndpointList() {
         return this.routes.map((r) => {
-          const path35 = typeof r.pattern === "string" ? r.pattern : r.pattern.source.replace(/\\\//g, "/").replace(/\(\[.*?\]\+\)/g, ":type").replace(/[\^$]/g, "");
-          return `${r.method.padEnd(5)} ${path35}`;
+          const path36 = typeof r.pattern === "string" ? r.pattern : r.pattern.source.replace(/\\\//g, "/").replace(/\(\[.*?\]\+\)/g, ":type").replace(/[\^$]/g, "");
+          return `${r.method.padEnd(5)} ${path36}`;
         });
       }
       async start(port = DEV_SERVER_PORT) {
@@ -40791,15 +40932,15 @@ var init_dev_server = __esm({
             this.json(res, 500, { error: e.message });
           }
         });
-        return new Promise((resolve18, reject) => {
+        return new Promise((resolve17, reject) => {
           this.server.listen(port, "127.0.0.1", () => {
             this.log(`Dev server listening on http://127.0.0.1:${port}`);
-            resolve18();
+            resolve17();
           });
           this.server.on("error", (e) => {
             if (e.code === "EADDRINUSE") {
               this.log(`Port ${port} in use, skipping dev server`);
-              resolve18();
+              resolve17();
             } else {
               reject(e);
             }
@@ -40813,7 +40954,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);
@@ -40855,20 +41022,20 @@ var init_dev_server = __esm({
           child.stderr?.on("data", (d) => {
             stderr += d.toString().slice(0, 2e3);
           });
-          await new Promise((resolve18) => {
+          await new Promise((resolve17) => {
             const timer = setTimeout(() => {
               child.kill();
-              resolve18();
+              resolve17();
             }, 3e3);
             child.on("exit", () => {
               clearTimeout(timer);
-              resolve18();
+              resolve17();
             });
             child.stdout?.once("data", () => {
               setTimeout(() => {
                 child.kill();
                 clearTimeout(timer);
-                resolve18();
+                resolve17();
               }, 500);
             });
           });
@@ -41364,14 +41531,14 @@ var init_dev_server = __esm({
           child.stderr?.on("data", (d) => {
             stderr += d.toString();
           });
-          await new Promise((resolve18) => {
+          await new Promise((resolve17) => {
             const timer = setTimeout(() => {
               child.kill();
-              resolve18();
+              resolve17();
             }, timeout);
             child.on("exit", () => {
               clearTimeout(timer);
-              resolve18();
+              resolve17();
             });
           });
           const elapsed = Date.now() - start;
@@ -41516,18 +41683,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) {
@@ -42053,14 +42208,14 @@ data: ${JSON.stringify(msg.data)}
         res.end(JSON.stringify(data, null, 2));
       }
       async readBody(req) {
-        return new Promise((resolve18) => {
+        return new Promise((resolve17) => {
           let body = "";
           req.on("data", (chunk) => body += chunk);
           req.on("end", () => {
             try {
-              resolve18(JSON.parse(body));
+              resolve17(JSON.parse(body));
             } catch {
-              resolve18({});
+              resolve17({});
             }
           });
         });
@@ -42545,7 +42700,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((resolve18) => setTimeout(resolve18, STARTUP_POLL_MS));
+    await new Promise((resolve17) => setTimeout(resolve17, STARTUP_POLL_MS));
   }
   throw new Error(`Session host did not become ready within ${timeoutMs}ms`);
 }
@@ -42709,10 +42864,10 @@ async function installExtension(ide, extension) {
         const buffer = Buffer.from(await res.arrayBuffer());
         const fs27 = await import("fs");
         fs27.writeFileSync(vsixPath, buffer);
-        return new Promise((resolve18) => {
+        return new Promise((resolve17) => {
           const cmd = `"${ide.cliCommand}" --install-extension "${vsixPath}" --force`;
           (0, import_child_process10.exec)(cmd, { timeout: 6e4 }, (error48, _stdout, stderr) => {
-            resolve18({
+            resolve17({
               extensionId: extension.id,
               marketplaceId: extension.marketplaceId,
               success: !error48,
@@ -42725,11 +42880,11 @@ async function installExtension(ide, extension) {
     } catch (e) {
     }
   }
-  return new Promise((resolve18) => {
+  return new Promise((resolve17) => {
     const cmd = `"${ide.cliCommand}" --install-extension ${extension.marketplaceId} --force`;
     (0, import_child_process10.exec)(cmd, { timeout: 6e4 }, (error48, stdout, stderr) => {
       if (error48) {
-        resolve18({
+        resolve17({
           extensionId: extension.id,
           marketplaceId: extension.marketplaceId,
           success: false,
@@ -42737,7 +42892,7 @@ async function installExtension(ide, extension) {
           error: stderr || error48.message
         });
       } else {
-        resolve18({
+        resolve17({
           extensionId: extension.id,
           marketplaceId: extension.marketplaceId,
           success: true,
@@ -42931,10 +43086,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()) {
@@ -43039,6 +43195,10 @@ async function initDaemonComponents(config2) {
     onProviderSettingChanged: async (providerType) => {
       await refreshProviderAvailability(providerType);
       config2.onStatusChange?.();
+    },
+    onProviderSourceConfigChanged: async () => {
+      await refreshProviderAvailability();
+      config2.onStatusChange?.();
     }
   });
   agentStreamManager = new DaemonAgentStreamManager(
@@ -43088,7 +43248,8 @@ async function initDaemonComponents(config2) {
     cdpInitializer,
     cdpManagers,
     sessionRegistry,
-    detectedIdes: detectedIdesRef
+    detectedIdes: detectedIdesRef,
+    refreshProviderAvailability
   };
 }
 async function startDaemonDevSupport(options) {
@@ -43097,7 +43258,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();
@@ -43247,6 +43411,7 @@ __export(src_exports, {
   normalizeInputEnvelope: () => normalizeInputEnvelope,
   normalizeManagedStatus: () => normalizeManagedStatus,
   normalizeMessageParts: () => normalizeMessageParts,
+  parseProviderSourceConfigUpdate: () => parseProviderSourceConfigUpdate,
   partitionSessionHostDiagnosticsSessions: () => partitionSessionHostDiagnosticsSessions,
   partitionSessionHostRecords: () => partitionSessionHostRecords,
   probeCdpPort: () => probeCdpPort,
@@ -43310,6 +43475,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();
@@ -43344,7 +43510,7 @@ async function sendDaemonCommand(cmd, args = {}, port) {
   const resolvedPort = resolveDaemonCommandPort(port);
   const WebSocket4 = (await import("ws")).default;
   const { DAEMON_WS_PATH: DAEMON_WS_PATH2 } = await Promise.resolve().then(() => (init_src(), src_exports));
-  return new Promise((resolve18, reject) => {
+  return new Promise((resolve17, reject) => {
     const wsUrl = `ws://127.0.0.1:${resolvedPort}${DAEMON_WS_PATH2 || "/daemon"}`;
     const ws = new WebSocket4(wsUrl);
     const requestId = `cli-${Date.now()}`;
@@ -43385,7 +43551,7 @@ async function sendDaemonCommand(cmd, args = {}, port) {
         if (msg.type === "ext:command_result" && msg.payload?.requestId === requestId || msg.type === "daemon:command_result" || msg.type === "command_result") {
           clearTimeout(timeout);
           ws.close();
-          resolve18(msg.payload?.result || msg.payload || msg);
+          resolve17(msg.payload?.result || msg.payload || msg);
         }
       } catch {
       }
@@ -43404,13 +43570,13 @@ This command needs a running local daemon with IPC enabled. Start with: adhdev d
 }
 async function directCdpEval(expression, port = 9222) {
   const http3 = await import("http");
-  const targets = await new Promise((resolve18, reject) => {
+  const targets = await new Promise((resolve17, reject) => {
     http3.get(`http://127.0.0.1:${port}/json`, (res) => {
       let data = "";
       res.on("data", (c) => data += c);
       res.on("end", () => {
         try {
-          resolve18(JSON.parse(data));
+          resolve17(JSON.parse(data));
         } catch {
           reject(new Error("Invalid JSON"));
         }
@@ -43423,7 +43589,7 @@ async function directCdpEval(expression, port = 9222) {
   const target = (mainPages.length > 0 ? mainPages[0] : pages[0]) || targets[0];
   if (!target?.webSocketDebuggerUrl) throw new Error("No CDP target found");
   const WebSocket4 = (await import("ws")).default;
-  return new Promise((resolve18, reject) => {
+  return new Promise((resolve17, reject) => {
     const ws = new WebSocket4(target.webSocketDebuggerUrl);
     const timeout = setTimeout(() => {
       ws.close();
@@ -43445,11 +43611,11 @@ async function directCdpEval(expression, port = 9222) {
         clearTimeout(timeout);
         ws.close();
         if (msg.result?.result?.value !== void 0) {
-          resolve18(msg.result.result.value);
+          resolve17(msg.result.result.value);
         } else if (msg.result?.exceptionDetails) {
           reject(new Error(msg.result.exceptionDetails.text));
         } else {
-          resolve18(msg.result);
+          resolve17(msg.result);
         }
       }
     });
@@ -43984,14 +44150,14 @@ var require_run_async = __commonJS({
       return function() {
         var args = arguments;
         var originalThis = this;
-        var promise2 = new Promise(function(resolve18, reject) {
+        var promise2 = new Promise(function(resolve17, reject) {
           var resolved = false;
           const wrappedResolve = function(value) {
             if (resolved) {
               console.warn("Run-async promise already resolved.");
             }
             resolved = true;
-            resolve18(value);
+            resolve17(value);
           };
           var rejected = false;
           const wrappedReject = function(value) {
@@ -44782,7 +44948,7 @@ var require_Observable = __commonJS({
       Observable2.prototype.forEach = function(next, promiseCtor) {
         var _this = this;
         promiseCtor = getPromiseCtor(promiseCtor);
-        return new promiseCtor(function(resolve18, reject) {
+        return new promiseCtor(function(resolve17, reject) {
           var subscriber = new Subscriber_1.SafeSubscriber({
             next: function(value) {
               try {
@@ -44793,7 +44959,7 @@ var require_Observable = __commonJS({
               }
             },
             error: reject,
-            complete: resolve18
+            complete: resolve17
           });
           _this.subscribe(subscriber);
         });
@@ -44815,14 +44981,14 @@ var require_Observable = __commonJS({
       Observable2.prototype.toPromise = function(promiseCtor) {
         var _this = this;
         promiseCtor = getPromiseCtor(promiseCtor);
-        return new promiseCtor(function(resolve18, reject) {
+        return new promiseCtor(function(resolve17, reject) {
           var value;
           _this.subscribe(function(x) {
             return value = x;
           }, function(err) {
             return reject(err);
           }, function() {
-            return resolve18(value);
+            return resolve17(value);
           });
         });
       };
@@ -46918,11 +47084,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(resolve18) {
-          resolve18(value);
+        return value instanceof P ? value : new P(function(resolve17) {
+          resolve17(value);
         });
       }
-      return new (P || (P = Promise))(function(resolve18, reject) {
+      return new (P || (P = Promise))(function(resolve17, reject) {
         function fulfilled(value) {
           try {
             step(generator.next(value));
@@ -46938,7 +47104,7 @@ var require_innerFrom = __commonJS({
           }
         }
         function step(result) {
-          result.done ? resolve18(result.value) : adopt(result.value).then(fulfilled, rejected);
+          result.done ? resolve17(result.value) : adopt(result.value).then(fulfilled, rejected);
         }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
       });
@@ -47020,14 +47186,14 @@ var require_innerFrom = __commonJS({
       }, i);
       function verb(n) {
         i[n] = o[n] && function(v) {
-          return new Promise(function(resolve18, reject) {
-            v = o[n](v), settle(resolve18, reject, v.done, v.value);
+          return new Promise(function(resolve17, reject) {
+            v = o[n](v), settle(resolve17, reject, v.done, v.value);
           });
         };
       }
-      function settle(resolve18, reject, d, v) {
+      function settle(resolve17, reject, d, v) {
         Promise.resolve(v).then(function(v2) {
-          resolve18({ value: v2, done: d });
+          resolve17({ value: v2, done: d });
         }, reject);
       }
     };
@@ -47646,7 +47812,7 @@ var require_lastValueFrom = __commonJS({
     var EmptyError_1 = require_EmptyError();
     function lastValueFrom(source, config2) {
       var hasConfig = typeof config2 === "object";
-      return new Promise(function(resolve18, reject) {
+      return new Promise(function(resolve17, reject) {
         var _hasValue = false;
         var _value;
         source.subscribe({
@@ -47657,9 +47823,9 @@ var require_lastValueFrom = __commonJS({
           error: reject,
           complete: function() {
             if (_hasValue) {
-              resolve18(_value);
+              resolve17(_value);
             } else if (hasConfig) {
-              resolve18(config2.defaultValue);
+              resolve17(config2.defaultValue);
             } else {
               reject(new EmptyError_1.EmptyError());
             }
@@ -47681,16 +47847,16 @@ var require_firstValueFrom = __commonJS({
     var Subscriber_1 = require_Subscriber();
     function firstValueFrom(source, config2) {
       var hasConfig = typeof config2 === "object";
-      return new Promise(function(resolve18, reject) {
+      return new Promise(function(resolve17, reject) {
         var subscriber = new Subscriber_1.SafeSubscriber({
           next: function(value) {
-            resolve18(value);
+            resolve17(value);
             subscriber.unsubscribe();
           },
           error: reject,
           complete: function() {
             if (hasConfig) {
-              resolve18(config2.defaultValue);
+              resolve17(config2.defaultValue);
             } else {
               reject(new EmptyError_1.EmptyError());
             }
@@ -54809,15 +54975,15 @@ var require_route = __commonJS({
       };
     }
     function wrapConversion(toModel, graph) {
-      const path35 = [graph[toModel].parent, toModel];
+      const path36 = [graph[toModel].parent, toModel];
       let fn = conversions[graph[toModel].parent][toModel];
       let cur = graph[toModel].parent;
       while (graph[cur].parent) {
-        path35.unshift(graph[cur].parent);
+        path36.unshift(graph[cur].parent);
         fn = link(conversions[graph[cur].parent][cur], fn);
         cur = graph[cur].parent;
       }
-      fn.conversion = path35;
+      fn.conversion = path36;
       return fn;
     }
     module2.exports = function(fromModel) {
@@ -58115,7 +58281,7 @@ var require_buffer_list = __commonJS({
         }
       }, {
         key: "join",
-        value: function join31(s) {
+        value: function join32(s) {
           if (this.length === 0) return "";
           var p = this.head;
           var ret = "" + p.data;
@@ -59496,14 +59662,14 @@ var require_async_iterator = __commonJS({
       };
     }
     function readAndResolve(iter) {
-      var resolve18 = iter[kLastResolve];
-      if (resolve18 !== null) {
+      var resolve17 = iter[kLastResolve];
+      if (resolve17 !== null) {
         var data = iter[kStream].read();
         if (data !== null) {
           iter[kLastPromise] = null;
           iter[kLastResolve] = null;
           iter[kLastReject] = null;
-          resolve18(createIterResult(data, false));
+          resolve17(createIterResult(data, false));
         }
       }
     }
@@ -59511,13 +59677,13 @@ var require_async_iterator = __commonJS({
       process.nextTick(readAndResolve, iter);
     }
     function wrapForNext(lastPromise, iter) {
-      return function(resolve18, reject) {
+      return function(resolve17, reject) {
         lastPromise.then(function() {
           if (iter[kEnded]) {
-            resolve18(createIterResult(void 0, true));
+            resolve17(createIterResult(void 0, true));
             return;
           }
-          iter[kHandlePromise](resolve18, reject);
+          iter[kHandlePromise](resolve17, reject);
         }, reject);
       };
     }
@@ -59537,12 +59703,12 @@ var require_async_iterator = __commonJS({
           return Promise.resolve(createIterResult(void 0, true));
         }
         if (this[kStream].destroyed) {
-          return new Promise(function(resolve18, reject) {
+          return new Promise(function(resolve17, reject) {
             process.nextTick(function() {
               if (_this[kError]) {
                 reject(_this[kError]);
               } else {
-                resolve18(createIterResult(void 0, true));
+                resolve17(createIterResult(void 0, true));
               }
             });
           });
@@ -59565,13 +59731,13 @@ var require_async_iterator = __commonJS({
       return this;
     }), _defineProperty(_Object$setPrototypeO, "return", function _return() {
       var _this2 = this;
-      return new Promise(function(resolve18, reject) {
+      return new Promise(function(resolve17, reject) {
         _this2[kStream].destroy(null, function(err) {
           if (err) {
             reject(err);
             return;
           }
-          resolve18(createIterResult(void 0, true));
+          resolve17(createIterResult(void 0, true));
         });
       });
     }), _Object$setPrototypeO), AsyncIteratorPrototype);
@@ -59593,15 +59759,15 @@ var require_async_iterator = __commonJS({
         value: stream._readableState.endEmitted,
         writable: true
       }), _defineProperty(_Object$create, kHandlePromise, {
-        value: function value(resolve18, reject) {
+        value: function value(resolve17, reject) {
           var data = iterator[kStream].read();
           if (data) {
             iterator[kLastPromise] = null;
             iterator[kLastResolve] = null;
             iterator[kLastReject] = null;
-            resolve18(createIterResult(data, false));
+            resolve17(createIterResult(data, false));
           } else {
-            iterator[kLastResolve] = resolve18;
+            iterator[kLastResolve] = resolve17;
             iterator[kLastReject] = reject;
           }
         },
@@ -59620,12 +59786,12 @@ var require_async_iterator = __commonJS({
           iterator[kError] = err;
           return;
         }
-        var resolve18 = iterator[kLastResolve];
-        if (resolve18 !== null) {
+        var resolve17 = iterator[kLastResolve];
+        if (resolve17 !== null) {
           iterator[kLastPromise] = null;
           iterator[kLastResolve] = null;
           iterator[kLastReject] = null;
-          resolve18(createIterResult(void 0, true));
+          resolve17(createIterResult(void 0, true));
         }
         iterator[kEnded] = true;
       });
@@ -59640,7 +59806,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, resolve18, reject, _next, _throw, key, arg) {
+    function asyncGeneratorStep(gen, resolve17, reject, _next, _throw, key, arg) {
       try {
         var info = gen[key](arg);
         var value = info.value;
@@ -59649,7 +59815,7 @@ var require_from2 = __commonJS({
         return;
       }
       if (info.done) {
-        resolve18(value);
+        resolve17(value);
       } else {
         Promise.resolve(value).then(_next, _throw);
       }
@@ -59657,13 +59823,13 @@ var require_from2 = __commonJS({
     function _asyncToGenerator(fn) {
       return function() {
         var self2 = this, args = arguments;
-        return new Promise(function(resolve18, reject) {
+        return new Promise(function(resolve17, reject) {
           var gen = fn.apply(self2, args);
           function _next(value) {
-            asyncGeneratorStep(gen, resolve18, reject, _next, _throw, "next", value);
+            asyncGeneratorStep(gen, resolve17, reject, _next, _throw, "next", value);
           }
           function _throw(err) {
-            asyncGeneratorStep(gen, resolve18, reject, _next, _throw, "throw", err);
+            asyncGeneratorStep(gen, resolve17, reject, _next, _throw, "throw", err);
           }
           _next(void 0);
         });
@@ -61602,9 +61768,9 @@ var init_base = __esm({
        * @return {Promise}
        */
       run() {
-        return new Promise((resolve18, reject) => {
+        return new Promise((resolve17, reject) => {
           this._run(
-            (value) => resolve18(value),
+            (value) => resolve17(value),
             (error48) => reject(error48)
           );
         });
@@ -68236,7 +68402,7 @@ var require_lib = __commonJS({
       return matches;
     };
     exports2.analyse = analyse;
-    var detectFile = (filepath, opts = {}) => new Promise((resolve18, reject) => {
+    var detectFile = (filepath, opts = {}) => new Promise((resolve17, reject) => {
       let fd;
       const fs27 = (0, node_1.default)();
       const handler = (err, buffer) => {
@@ -68246,7 +68412,7 @@ var require_lib = __commonJS({
         if (err) {
           reject(err);
         } else if (buffer) {
-          resolve18((0, exports2.detect)(buffer));
+          resolve17((0, exports2.detect)(buffer));
         } else {
           reject(new Error("No error and no buffer received"));
         }
@@ -72687,9 +72853,9 @@ var init_prompt = __esm({
     init_utils();
     init_baseUI();
     _ = {
-      set: (obj, path35 = "", value) => {
+      set: (obj, path36 = "", value) => {
         let pointer = obj;
-        path35.split(".").forEach((key, index, arr) => {
+        path36.split(".").forEach((key, index, arr) => {
           if (key === "__proto__" || key === "constructor") return;
           if (index === arr.length - 1) {
             pointer[key] = value;
@@ -72699,8 +72865,8 @@ var init_prompt = __esm({
           pointer = pointer[key];
         });
       },
-      get: (obj, path35 = "", defaultValue) => {
-        const travel = (regexp) => String.prototype.split.call(path35, regexp).filter(Boolean).reduce(
+      get: (obj, path36 = "", defaultValue) => {
+        const travel = (regexp) => String.prototype.split.call(path36, regexp).filter(Boolean).reduce(
           // @ts-expect-error implicit any on res[key]
           (res, key) => res !== null && res !== void 0 ? res[key] : res,
           obj
@@ -74491,14 +74657,14 @@ var init_open = __esm({
       }
       const subprocess = import_node_child_process5.default.spawn(command, cliArguments, childProcessOptions);
       if (options.wait) {
-        return new Promise((resolve18, reject) => {
+        return new Promise((resolve17, reject) => {
           subprocess.once("error", reject);
           subprocess.once("close", (exitCode) => {
             if (!options.allowNonzeroExitCode && exitCode > 0) {
               reject(new Error(`Exited with code ${exitCode}`));
               return;
             }
-            resolve18(subprocess);
+            resolve17(subprocess);
           });
         });
       }
@@ -74979,7 +75145,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);
       }
@@ -74991,7 +75157,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);
       }
@@ -76001,22 +76167,22 @@ var require_filesystem = __commonJS({
     var LDD_PATH = "/usr/bin/ldd";
     var SELF_PATH = "/proc/self/exe";
     var MAX_LENGTH = 2048;
-    var readFileSync20 = (path35) => {
-      const fd = fs27.openSync(path35, "r");
+    var readFileSync20 = (path36) => {
+      const fd = fs27.openSync(path36, "r");
       const buffer = Buffer.alloc(MAX_LENGTH);
       const bytesRead = fs27.readSync(fd, buffer, 0, MAX_LENGTH, 0);
       fs27.close(fd, () => {
       });
       return buffer.subarray(0, bytesRead);
     };
-    var readFile = (path35) => new Promise((resolve18, reject) => {
-      fs27.open(path35, "r", (err, fd) => {
+    var readFile = (path36) => new Promise((resolve17, reject) => {
+      fs27.open(path36, "r", (err, fd) => {
         if (err) {
           reject(err);
         } else {
           const buffer = Buffer.alloc(MAX_LENGTH);
           fs27.read(fd, buffer, 0, MAX_LENGTH, 0, (_2, bytesRead) => {
-            resolve18(buffer.subarray(0, bytesRead));
+            resolve17(buffer.subarray(0, bytesRead));
             fs27.close(fd, () => {
             });
           });
@@ -76084,10 +76250,10 @@ var require_detect_libc = __commonJS({
     var commandOut = "";
     var safeCommand = () => {
       if (!commandOut) {
-        return new Promise((resolve18) => {
+        return new Promise((resolve17) => {
           childProcess2.exec(command, (err, out) => {
             commandOut = err ? " " : out;
-            resolve18(commandOut);
+            resolve17(commandOut);
           });
         });
       }
@@ -76129,11 +76295,11 @@ var require_detect_libc = __commonJS({
       }
       return null;
     };
-    var familyFromInterpreterPath = (path35) => {
-      if (path35) {
-        if (path35.includes("/ld-musl-")) {
+    var familyFromInterpreterPath = (path36) => {
+      if (path36) {
+        if (path36.includes("/ld-musl-")) {
           return MUSL;
-        } else if (path35.includes("/ld-linux-")) {
+        } else if (path36.includes("/ld-linux-")) {
           return GLIBC;
         }
       }
@@ -76180,8 +76346,8 @@ var require_detect_libc = __commonJS({
       cachedFamilyInterpreter = null;
       try {
         const selfContent = await readFile(SELF_PATH);
-        const path35 = interpreterPath(selfContent);
-        cachedFamilyInterpreter = familyFromInterpreterPath(path35);
+        const path36 = interpreterPath(selfContent);
+        cachedFamilyInterpreter = familyFromInterpreterPath(path36);
       } catch (e) {
       }
       return cachedFamilyInterpreter;
@@ -76193,8 +76359,8 @@ var require_detect_libc = __commonJS({
       cachedFamilyInterpreter = null;
       try {
         const selfContent = readFileSync20(SELF_PATH);
-        const path35 = interpreterPath(selfContent);
-        cachedFamilyInterpreter = familyFromInterpreterPath(path35);
+        const path36 = interpreterPath(selfContent);
+        cachedFamilyInterpreter = familyFromInterpreterPath(path36);
       } catch (e) {
       }
       return cachedFamilyInterpreter;
@@ -77913,18 +78079,18 @@ var require_sharp = __commonJS({
       `@img/sharp-${runtimePlatform}/sharp.node`,
       "@img/sharp-wasm32/sharp.node"
     ];
-    var path35;
+    var path36;
     var sharp;
     var errors = [];
-    for (path35 of paths) {
+    for (path36 of paths) {
       try {
-        sharp = require(path35);
+        sharp = require(path36);
         break;
       } catch (err) {
         errors.push(err);
       }
     }
-    if (sharp && path35.startsWith("@img/sharp-linux-x64") && !sharp._isUsingX64V2()) {
+    if (sharp && path36.startsWith("@img/sharp-linux-x64") && !sharp._isUsingX64V2()) {
       const err = new Error("Prebuilt binaries for linux-x64 require v2 microarchitecture");
       err.code = "Unsupported CPU";
       errors.push(err);
@@ -78767,14 +78933,14 @@ var require_input = __commonJS({
         return this;
       } else {
         if (this._isStreamInput()) {
-          return new Promise((resolve18, reject) => {
+          return new Promise((resolve17, reject) => {
             const finished = () => {
               this._flattenBufferIn();
               sharp.metadata(this.options, (err, metadata2) => {
                 if (err) {
                   reject(is.nativeError(err, stack));
                 } else {
-                  resolve18(metadata2);
+                  resolve17(metadata2);
                 }
               });
             };
@@ -78785,12 +78951,12 @@ var require_input = __commonJS({
             }
           });
         } else {
-          return new Promise((resolve18, reject) => {
+          return new Promise((resolve17, reject) => {
             sharp.metadata(this.options, (err, metadata2) => {
               if (err) {
                 reject(is.nativeError(err, stack));
               } else {
-                resolve18(metadata2);
+                resolve17(metadata2);
               }
             });
           });
@@ -78823,25 +78989,25 @@ var require_input = __commonJS({
         return this;
       } else {
         if (this._isStreamInput()) {
-          return new Promise((resolve18, reject) => {
+          return new Promise((resolve17, reject) => {
             this.on("finish", function() {
               this._flattenBufferIn();
               sharp.stats(this.options, (err, stats2) => {
                 if (err) {
                   reject(is.nativeError(err, stack));
                 } else {
-                  resolve18(stats2);
+                  resolve17(stats2);
                 }
               });
             });
           });
         } else {
-          return new Promise((resolve18, reject) => {
+          return new Promise((resolve17, reject) => {
             sharp.stats(this.options, (err, stats2) => {
               if (err) {
                 reject(is.nativeError(err, stack));
               } else {
-                resolve18(stats2);
+                resolve17(stats2);
               }
             });
           });
@@ -80833,15 +80999,15 @@ var require_color = __commonJS({
       };
     }
     function wrapConversion(toModel, graph) {
-      const path35 = [graph[toModel].parent, toModel];
+      const path36 = [graph[toModel].parent, toModel];
       let fn = conversions_default[graph[toModel].parent][toModel];
       let cur = graph[toModel].parent;
       while (graph[cur].parent) {
-        path35.unshift(graph[cur].parent);
+        path36.unshift(graph[cur].parent);
         fn = link(conversions_default[graph[cur].parent][cur], fn);
         cur = graph[cur].parent;
       }
-      fn.conversion = path35;
+      fn.conversion = path36;
       return fn;
     }
     function route(fromModel) {
@@ -81458,7 +81624,7 @@ var require_channel = __commonJS({
 var require_output = __commonJS({
   "../../node_modules/sharp/lib/output.js"(exports2, module2) {
     "use strict";
-    var path35 = require("path");
+    var path36 = require("path");
     var is = require_is();
     var sharp = require_sharp();
     var formats = /* @__PURE__ */ new Map([
@@ -81489,9 +81655,9 @@ var require_output = __commonJS({
       let err;
       if (!is.string(fileOut)) {
         err = new Error("Missing output file path");
-      } else if (is.string(this.options.input.file) && path35.resolve(this.options.input.file) === path35.resolve(fileOut)) {
+      } else if (is.string(this.options.input.file) && path36.resolve(this.options.input.file) === path36.resolve(fileOut)) {
         err = new Error("Cannot use same file for input and output");
-      } else if (jp2Regex.test(path35.extname(fileOut)) && !this.constructor.format.jp2k.output.file) {
+      } else if (jp2Regex.test(path36.extname(fileOut)) && !this.constructor.format.jp2k.output.file) {
         err = errJp2Save();
       }
       if (err) {
@@ -82263,7 +82429,7 @@ var require_output = __commonJS({
         return this;
       } else {
         if (this._isStreamInput()) {
-          return new Promise((resolve18, reject) => {
+          return new Promise((resolve17, reject) => {
             this.once("finish", () => {
               this._flattenBufferIn();
               sharp.pipeline(this.options, (err, data, info) => {
@@ -82271,24 +82437,24 @@ var require_output = __commonJS({
                   reject(is.nativeError(err, stack));
                 } else {
                   if (this.options.resolveWithObject) {
-                    resolve18({ data, info });
+                    resolve17({ data, info });
                   } else {
-                    resolve18(data);
+                    resolve17(data);
                   }
                 }
               });
             });
           });
         } else {
-          return new Promise((resolve18, reject) => {
+          return new Promise((resolve17, reject) => {
             sharp.pipeline(this.options, (err, data, info) => {
               if (err) {
                 reject(is.nativeError(err, stack));
               } else {
                 if (this.options.resolveWithObject) {
-                  resolve18({ data, info });
+                  resolve17({ data, info });
                 } else {
-                  resolve18(data);
+                  resolve17(data);
                 }
               }
             });
@@ -83381,7 +83547,7 @@ var init_adhdev_daemon = __esm({
     import_ws3 = require("ws");
     init_source();
     init_version();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.8.57" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.8.58" });
     ACTIVE_CHAT_POLL_STATUSES = /* @__PURE__ */ new Set([
       "generating",
       "waiting_approval",
@@ -83889,6 +84055,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();
           }
@@ -84050,7 +84218,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();
           }
@@ -84247,7 +84419,7 @@ ${err?.stack || ""}`);
             this.localWss.emit("connection", ws, req);
           });
         });
-        await new Promise((resolve18, reject) => {
+        await new Promise((resolve17, reject) => {
           const cleanup = () => {
             this.localHttpServer?.off("error", onError);
             this.localHttpServer?.off("listening", onListening);
@@ -84258,7 +84430,7 @@ ${err?.stack || ""}`);
           };
           const onListening = () => {
             cleanup();
-            resolve18();
+            resolve17();
           };
           this.localHttpServer.once("error", onError);
           this.localHttpServer.once("listening", onListening);
@@ -84418,12 +84590,12 @@ ${err?.stack || ""}`);
           this.localClients.clear();
           this.localWss?.close();
           this.localWss = null;
-          await new Promise((resolve18) => {
+          await new Promise((resolve17) => {
             if (!this.localHttpServer) {
-              resolve18();
+              resolve17();
               return;
             }
-            this.localHttpServer.close(() => resolve18());
+            this.localHttpServer.close(() => resolve17());
             this.localHttpServer = null;
           });
         } catch {
@@ -85836,7 +86008,219 @@ init_src();
 
 // src/cli/setup-commands.ts
 init_source();
+
+// src/cli/provider-source-status.ts
+function buildProviderSourceStatusLines(config2) {
+  return [
+    `Provider source mode: ${config2.disableUpstream ? `${config2.sourceMode} (upstream fetch/load disabled)` : config2.sourceMode}`,
+    `Explicit providerDir: ${config2.explicitProviderDir || "default (~/.adhdev/providers)"}`,
+    `Effective user root: ${config2.userDir}`,
+    `Upstream root: ${config2.upstreamDir}`,
+    `Provider roots: ${config2.providerRoots.join(" -> ")}`
+  ];
+}
+
+// src/cli/setup-commands.ts
 init_cdp_utils();
+function resolveLaunchableProviderTarget(providerLoader, targetArg) {
+  if (!targetArg) return null;
+  const resolvedType = providerLoader.resolveAlias(targetArg.toLowerCase());
+  const resolvedProvider = resolvedType ? providerLoader.getMeta(resolvedType) : null;
+  if (!resolvedProvider || resolvedProvider.category !== "cli" && resolvedProvider.category !== "acp") {
+    return null;
+  }
+  return {
+    resolvedType,
+    category: resolvedProvider.category
+  };
+}
+function formatSavedHistoryTimestamp(timestamp) {
+  if (!timestamp) return "-";
+  try {
+    return new Date(timestamp).toLocaleString();
+  } catch {
+    return String(timestamp);
+  }
+}
+function getSavedHistoryStatusLabel(session) {
+  return session.canResume ? "resume-ready" : "needs --dir";
+}
+function buildSavedHistorySessionLines(session) {
+  const title = session.title || session.providerSessionId;
+  const locationParts = [session.providerSessionId];
+  if (session.workspace) locationParts.push(session.workspace);
+  const summaryParts = [`${session.messageCount || 0} msgs`];
+  if (session.currentModel) summaryParts.push(session.currentModel);
+  const updated = formatSavedHistoryTimestamp(session.lastMessageAt);
+  if (updated !== "-") summaryParts.push(`updated ${updated}`);
+  summaryParts.push(getSavedHistoryStatusLabel(session));
+  const lines = [
+    source_default.bold(`  \u2022 ${title}`),
+    source_default.gray(`    ${locationParts.join(" \xB7 ")}`),
+    source_default.gray(`    ${summaryParts.join(" \xB7 ")}`)
+  ];
+  if (session.preview) {
+    lines.push(source_default.gray(`    ${session.preview}`));
+  }
+  lines.push("");
+  return lines;
+}
+function filterSavedHistorySessions(sessions, options = {}) {
+  const textQuery = String(options.textQuery || "").trim().toLowerCase();
+  const workspaceQuery = String(options.workspaceQuery || "").trim().toLowerCase();
+  const modelQuery = String(options.modelQuery || "").trim().toLowerCase();
+  return sessions.filter((session) => {
+    if (options.resumableOnly && !session.canResume) return false;
+    if (textQuery) {
+      const haystack = [session.title, session.preview].map((value) => String(value || "").toLowerCase()).join("\n");
+      if (!haystack.includes(textQuery)) return false;
+    }
+    if (workspaceQuery) {
+      const workspace = String(session.workspace || "").toLowerCase();
+      if (!workspace.includes(workspaceQuery)) return false;
+    }
+    if (modelQuery) {
+      const model = String(session.currentModel || "").toLowerCase();
+      if (!model.includes(modelQuery)) return false;
+    }
+    return true;
+  });
+}
+function sortSavedHistorySessions(sessions, sortMode = "recent") {
+  const sorted = sessions.slice();
+  sorted.sort((left2, right2) => {
+    if (sortMode === "oldest") {
+      return (left2.lastMessageAt || 0) - (right2.lastMessageAt || 0);
+    }
+    if (sortMode === "messages") {
+      const diff = (right2.messageCount || 0) - (left2.messageCount || 0);
+      if (diff !== 0) return diff;
+    }
+    return (right2.lastMessageAt || 0) - (left2.lastMessageAt || 0);
+  });
+  return sorted;
+}
+function prepareSavedHistoryListView(sessions, options = {}) {
+  const filtered = filterSavedHistorySessions(sessions, {
+    resumableOnly: options.resumableOnly,
+    textQuery: options.textQuery,
+    workspaceQuery: options.workspaceQuery,
+    modelQuery: options.modelQuery
+  });
+  const sorted = sortSavedHistorySessions(filtered, options.sortMode || "recent");
+  const offset = Math.max(0, options.offset || 0);
+  const limit = Math.max(1, options.limit || 30);
+  return {
+    sessions: sorted.slice(offset, offset + limit),
+    hasMore: sorted.length > offset + limit
+  };
+}
+function prepareSavedHistoryResumePickerSessions(sessions, options = {}) {
+  return prepareSavedHistoryListView(sessions, {
+    resumableOnly: options.resumableOnly,
+    textQuery: options.textQuery,
+    workspaceQuery: options.workspaceQuery,
+    modelQuery: options.modelQuery,
+    sortMode: options.sortMode,
+    offset: 0,
+    limit: Math.max(1, sessions.length || 1)
+  }).sessions;
+}
+function parsePositiveInteger(value, fallback2) {
+  const parsed = Number.parseInt(String(value || ""), 10);
+  return Number.isFinite(parsed) && parsed >= 0 ? parsed : fallback2;
+}
+function buildHistoryResumeLaunchPayload(cliType, session, overrideDir) {
+  const path36 = require("path");
+  const dir = typeof overrideDir === "string" && overrideDir.trim() ? path36.resolve(overrideDir.trim()) : typeof session.workspace === "string" && session.workspace.trim() ? path36.resolve(session.workspace.trim()) : "";
+  if (!dir) {
+    throw new Error(`Saved history ${session.providerSessionId} is missing workspace metadata. Pass --dir to resume it explicitly.`);
+  }
+  const payload = {
+    cliType,
+    dir,
+    resumeSessionId: session.providerSessionId
+  };
+  if (typeof session.currentModel === "string" && session.currentModel.trim()) {
+    payload.initialModel = session.currentModel.trim();
+  }
+  return payload;
+}
+function printSavedHistorySessions(providerArg, resolvedType, sessions, hasMore) {
+  console.log();
+  console.log(source_default.bold(`  \u{1F4DA} Saved History \u2014 ${providerArg} (${resolvedType})
+`));
+  if (sessions.length === 0) {
+    console.log(source_default.gray("  No saved history found yet."));
+    console.log();
+    return;
+  }
+  for (const session of sessions) {
+    for (const line of buildSavedHistorySessionLines(session)) {
+      console.log(line);
+    }
+  }
+  if (hasMore) {
+    console.log(source_default.gray("  More saved history is available. Re-run with --offset to page further."));
+    console.log();
+  }
+}
+function resolveSavedHistoryResumeSession(sessions, historySessionId) {
+  const requestedId = String(historySessionId || "").trim();
+  if (requestedId) {
+    const exact = sessions.find((session) => session.providerSessionId === requestedId || session.id === requestedId);
+    if (!exact) {
+      throw new Error(`Saved history not found: ${requestedId}`);
+    }
+    return exact;
+  }
+  const resumableSessions = sessions.filter((session) => session.canResume);
+  if (resumableSessions.length === 1) {
+    return resumableSessions[0] || null;
+  }
+  return null;
+}
+function buildSavedHistoryResumeChoices(sessions) {
+  return sessions.map((session) => {
+    const title = session.title || session.providerSessionId;
+    const workspace = session.workspace || "Workspace unknown";
+    const updated = formatSavedHistoryTimestamp(session.lastMessageAt);
+    const parts = [title, workspace];
+    if ((session.messageCount || 0) > 0) parts.push(`${session.messageCount} msgs`);
+    if (updated && updated !== "-") parts.push(updated);
+    return {
+      value: session.providerSessionId,
+      name: parts.join(" \xB7 "),
+      ...session.canResume ? {} : { disabled: "workspace metadata missing" }
+    };
+  });
+}
+async function promptForSavedHistoryResumeSession(providerArg, sessions, options = {}) {
+  if (!process.stdin.isTTY || !process.stdout.isTTY) {
+    throw new Error(`Multiple saved history entries are available for ${providerArg}. Re-run with a specific historySessionId or use an interactive terminal to choose one.`);
+  }
+  const preparedSessions = prepareSavedHistoryResumePickerSessions(sessions, options);
+  const choices = buildSavedHistoryResumeChoices(preparedSessions);
+  const resumableCount = preparedSessions.filter((session) => session.canResume).length;
+  if (resumableCount === 0) {
+    throw new Error(`No resumable saved history entries are available for ${providerArg}. Use 'adhdev history list ${providerArg}' to inspect the available records.`);
+  }
+  const inquirer2 = await Promise.resolve().then(() => (init_lib(), lib_exports));
+  const { historySessionId } = await inquirer2.default.prompt([
+    {
+      type: "list",
+      name: "historySessionId",
+      message: `Resume which saved history for ${providerArg}?`,
+      choices,
+      pageSize: 12
+    }
+  ]);
+  const selected = preparedSessions.find((session) => session.providerSessionId === historySessionId || session.id === historySessionId);
+  if (!selected) {
+    throw new Error(`Saved history not found: ${historySessionId}`);
+  }
+  return selected;
+}
 function registerSetupCommands(program2, providerLoader) {
   program2.command("setup").description("Run the interactive setup wizard (detect IDEs, login)").option("-f, --force", "Force re-run setup even if already configured").action(async (options) => {
     const { runWizard: runWizard2 } = await Promise.resolve().then(() => (init_wizard(), wizard_exports));
@@ -85980,6 +86364,172 @@ function registerSetupCommands(program2, providerLoader) {
       spinner.stop();
       console.log(source_default.red(`
 \u2717 Launch failed: ${e?.message || e}
+`));
+      process.exit(1);
+    }
+  });
+  const history = program2.command("history").description("Browse and resume provider saved history");
+  history.command("list <provider>").description("List saved history for a CLI or ACP provider").option("--json", "Print raw JSON output").option("--limit <count>", "Maximum number of saved history entries to show", "30").option("--offset <count>", "Skip the first N saved history entries", "0").option("--resumable", "Show only saved history entries that can resume immediately").option("--text <text>", "Filter saved history by title or preview substring").option("--workspace <text>", "Filter saved history by workspace path substring").option("--model <text>", "Filter saved history by model substring").option("--sort <mode>", "Sort by recent, oldest, or messages", "recent").action(async (providerArg, options) => {
+    const providerTarget = resolveLaunchableProviderTarget(providerLoader, providerArg);
+    if (!providerTarget) {
+      console.log(source_default.red(`
+\u2717 Unknown CLI/ACP provider: ${providerArg}
+`));
+      process.exit(1);
+    }
+    const { isDaemonRunning: isDaemonRunning2 } = await Promise.resolve().then(() => (init_adhdev_daemon(), adhdev_daemon_exports));
+    const daemonPort = resolveDaemonCommandPort();
+    if (!isDaemonRunning2({ port: daemonPort })) {
+      console.log(source_default.yellow(`
+  \u26A0 Daemon not running on port ${daemonPort}. Start with 'adhdev daemon${daemonPort === 19222 ? "" : ` -p ${daemonPort}`}' first.
+`));
+      console.log(source_default.gray(`  Then run: adhdev history list ${providerArg}`));
+      process.exit(1);
+    }
+    const sortMode = String(options.sort || "recent").trim().toLowerCase();
+    if (!["recent", "oldest", "messages"].includes(sortMode)) {
+      console.log(source_default.red(`
+\u2717 Unknown history sort mode: ${options.sort}
+`));
+      console.log(source_default.gray("  Valid values: recent, oldest, messages\n"));
+      process.exit(1);
+    }
+    const textQuery = String(options.text || "").trim();
+    const workspaceQuery = String(options.workspace || "").trim();
+    const modelQuery = String(options.model || "").trim();
+    const requestedLimit = Math.max(1, Math.min(100, parsePositiveInteger(options.limit, 30) || 30));
+    const requestedOffset = Math.max(0, parsePositiveInteger(options.offset, 0) || 0);
+    const needsFullHistory = options.resumable === true || sortMode !== "recent" || !!textQuery || !!workspaceQuery || !!modelQuery;
+    const result = await sendDaemonCommand("list_saved_sessions", {
+      providerType: providerTarget.resolvedType,
+      kind: providerTarget.category,
+      limit: needsFullHistory ? 100 : requestedLimit,
+      offset: needsFullHistory ? 0 : requestedOffset,
+      all: needsFullHistory
+    }, daemonPort);
+    if (!result?.success) {
+      console.log(source_default.red(`
+\u2717 ${result?.error || "Could not list saved history"}
+`));
+      process.exit(1);
+    }
+    const rawSessions = Array.isArray(result.sessions) ? result.sessions : [];
+    const view = prepareSavedHistoryListView(rawSessions, {
+      resumableOnly: options.resumable === true,
+      textQuery,
+      workspaceQuery,
+      modelQuery,
+      sortMode,
+      offset: needsFullHistory ? requestedOffset : 0,
+      limit: needsFullHistory ? requestedLimit : rawSessions.length || requestedLimit
+    });
+    const sessions = needsFullHistory ? view.sessions : rawSessions;
+    const hasMore = needsFullHistory ? view.hasMore : result.hasMore === true;
+    if (options.json) {
+      console.log(JSON.stringify({
+        providerType: providerTarget.resolvedType,
+        kind: providerTarget.category,
+        sort: sortMode,
+        resumableOnly: options.resumable === true,
+        textQuery: textQuery || null,
+        workspaceQuery: workspaceQuery || null,
+        modelQuery: modelQuery || null,
+        sessions,
+        hasMore
+      }, null, 2));
+      return;
+    }
+    printSavedHistorySessions(providerArg, providerTarget.resolvedType, sessions, hasMore);
+  });
+  history.command("resume <provider> [historySessionId]").description("Resume saved history for a CLI or ACP provider").option("-d, --dir <path>", "Override the saved workspace when resuming").option("--resumable", "When choosing interactively, hide entries that still need --dir").option("--text <text>", "When choosing interactively, filter by title or preview substring").option("--workspace <text>", "When choosing interactively, filter by workspace path substring").option("--model <text>", "When choosing interactively, filter by model substring").option("--sort <mode>", "When choosing interactively, sort by recent, oldest, or messages", "recent").action(async (providerArg, historySessionId, options) => {
+    const providerTarget = resolveLaunchableProviderTarget(providerLoader, providerArg);
+    if (!providerTarget) {
+      console.log(source_default.red(`
+\u2717 Unknown CLI/ACP provider: ${providerArg}
+`));
+      process.exit(1);
+    }
+    const { isDaemonRunning: isDaemonRunning2 } = await Promise.resolve().then(() => (init_adhdev_daemon(), adhdev_daemon_exports));
+    const daemonPort = resolveDaemonCommandPort();
+    if (!isDaemonRunning2({ port: daemonPort })) {
+      console.log(source_default.yellow(`
+  \u26A0 Daemon not running on port ${daemonPort}. Start with 'adhdev daemon${daemonPort === 19222 ? "" : ` -p ${daemonPort}`}' first.
+`));
+      console.log(source_default.gray(`  Then run: adhdev history resume ${providerArg} ${historySessionId}`));
+      process.exit(1);
+    }
+    const sortMode = String(options.sort || "recent").trim().toLowerCase();
+    if (!["recent", "oldest", "messages"].includes(sortMode)) {
+      console.log(source_default.red(`
+\u2717 Unknown history sort mode: ${options.sort}
+`));
+      console.log(source_default.gray("  Valid values: recent, oldest, messages\n"));
+      process.exit(1);
+    }
+    const workspaceQuery = String(options.workspace || "").trim();
+    const modelQuery = String(options.model || "").trim();
+    const textQuery = String(options.text || "").trim();
+    const result = await sendDaemonCommand("list_saved_sessions", {
+      providerType: providerTarget.resolvedType,
+      kind: providerTarget.category,
+      all: true
+    }, daemonPort);
+    if (!result?.success) {
+      console.log(source_default.red(`
+\u2717 ${result?.error || "Could not load saved history"}
+`));
+      process.exit(1);
+    }
+    const sessions = Array.isArray(result.sessions) ? result.sessions : [];
+    let targetSession = null;
+    try {
+      targetSession = resolveSavedHistoryResumeSession(sessions, historySessionId);
+    } catch (error48) {
+      console.log(source_default.red(`
+\u2717 ${error48?.message || error48}
+`));
+      process.exit(1);
+    }
+    if (!targetSession) {
+      try {
+        targetSession = await promptForSavedHistoryResumeSession(providerArg, sessions, {
+          resumableOnly: options.resumable === true,
+          textQuery,
+          workspaceQuery,
+          modelQuery,
+          sortMode
+        });
+      } catch (error48) {
+        console.log(source_default.red(`
+\u2717 ${error48?.message || error48}
+`));
+        process.exit(1);
+      }
+    }
+    try {
+      const payload = buildHistoryResumeLaunchPayload(providerTarget.resolvedType, targetSession, options.dir);
+      const launchResult = await sendDaemonCommand("launch_cli", payload, daemonPort);
+      if (!launchResult?.success) {
+        console.log(source_default.red(`
+\u2717 ${launchResult?.error || "Could not resume saved history"}
+`));
+        process.exit(1);
+      }
+      console.log();
+      console.log(source_default.bold(`  \u{1F680} Saved History Resumed
+`));
+      console.log(`  ${source_default.bold("Provider:")} ${providerArg} (${providerTarget.resolvedType})`);
+      console.log(`  ${source_default.bold("History:")}  ${targetSession.providerSessionId}`);
+      console.log(`  ${source_default.bold("Dir:")}      ${launchResult?.dir || payload.dir}`);
+      if (launchResult?.sessionId) {
+        console.log(`  ${source_default.bold("Session:")}  ${launchResult.sessionId}`);
+      }
+      console.log();
+      console.log(source_default.gray("  Open dashboard: https://adhf.dev/dashboard"));
+      console.log();
+    } catch (error48) {
+      console.log(source_default.red(`
+\u2717 ${error48?.message || error48}
 `));
       process.exit(1);
     }
@@ -86061,6 +86611,9 @@ function registerSetupCommands(program2, providerLoader) {
     }
     console.log(`  ${source_default.bold("User:")}         ${config2.userEmail || source_default.gray("not logged in")}`);
     console.log(`  ${source_default.bold("Server:")}       ${config2.serverUrl}`);
+    for (const line of buildProviderSourceStatusLines(providerLoader.getSourceConfig())) {
+      console.log(source_default.gray(`  ${line}`));
+    }
     console.log(`  ${source_default.bold("Setup date:")}   ${config2.setupDate || "unknown"}`);
     console.log();
   });
@@ -86166,7 +86719,7 @@ function registerSetupCommands(program2, providerLoader) {
   program2.command("uninstall").description("Completely wipe all setting, configuration, stop daemon and uninstall service").option("-f, --force", "Skip confirmation prompt").action(async (options) => {
     const inquirer2 = await Promise.resolve().then(() => (init_lib(), lib_exports));
     const fs27 = await import("fs");
-    const path35 = await import("path");
+    const path36 = await import("path");
     const os31 = await import("os");
     const { spawnSync: spawnSync3 } = await import("child_process");
     if (!options.force) {
@@ -86192,7 +86745,7 @@ function registerSetupCommands(program2, providerLoader) {
     }
     console.log(source_default.gray("  Removing OS background service..."));
     spawnSync3(process.execPath, [process.argv[1], "service", "uninstall"], { stdio: "inherit" });
-    const adhdevDir = path35.join(os31.homedir(), ".adhdev");
+    const adhdevDir = path36.join(os31.homedir(), ".adhdev");
     if (fs27.existsSync(adhdevDir)) {
       console.log(source_default.gray(`  Deleting ${adhdevDir}...`));
       try {
@@ -86346,14 +86899,14 @@ async function requestSessionHostDirect(request) {
 }
 async function runRuntimeLaunchSpec(spec) {
   const { spawn: spawn6 } = await import("child_process");
-  return await new Promise((resolve18, reject) => {
+  return await new Promise((resolve17, reject) => {
     const child = spawn6(spec.command, spec.args, {
       stdio: "inherit",
       env: spec.env,
       shell: process.platform === "win32" && spec.command !== process.execPath
     });
     child.on("error", reject);
-    child.on("exit", (code) => resolve18(code ?? 0));
+    child.on("exit", (code) => resolve17(code ?? 0));
   });
 }
 async function resolveRuntimeSessionId(target, options) {
@@ -86587,8 +87140,14 @@ function registerDaemonCommands(program2, pkgVersion3) {
     const { getCurrentDaemonLogPath: getCurrentDaemonLogPath2 } = await Promise.resolve().then(() => (init_src(), src_exports));
     const { probeSessionHostStatus: probeSessionHostStatus2 } = await Promise.resolve().then(() => (init_session_host(), session_host_exports));
     const port = parseInt(options.port, 10) || 19222;
-    const { loadConfig: loadConfig2 } = await Promise.resolve().then(() => (init_src(), src_exports));
+    const { loadConfig: loadConfig2, ProviderLoader: ProviderLoader2 } = await Promise.resolve().then(() => (init_src(), src_exports));
     const config2 = loadConfig2();
+    const providerLoader = new ProviderLoader2({
+      logFn: () => {
+      },
+      userDir: config2.providerDir,
+      sourceMode: config2.providerSourceMode
+    });
     if (isDaemonRunning2({ port })) {
       console.log(source_default.green(`
   \u2713 ADHDev Daemon is running.
@@ -86667,6 +87226,9 @@ function registerDaemonCommands(program2, pkgVersion3) {
       } catch {
         console.log(source_default.gray("  DevServer: not reachable (run `adhdev daemon --dev` for local debug APIs)"));
       }
+      for (const line of buildProviderSourceStatusLines(providerLoader.getSourceConfig())) {
+        console.log(source_default.gray(`  ${line}`));
+      }
       console.log();
     } else {
       console.log(source_default.gray(`
@@ -86817,7 +87379,7 @@ function registerDaemonCommands(program2, pkgVersion3) {
       process.exit(1);
     }
   }));
-  const runtime = program2.command("runtime").description("Primary user-facing hosted runtime surface for inspection, attach, recovery, and expert mux open flows");
+  const runtime = program2.command("runtime").description("Hosted runtime recovery and diagnostics surface for attach, recover, and expert mux flows");
   runtime.command("list").description("List hosted runtimes grouped as live runtimes, recovery snapshots, and optional inactive records").option("--json", "Print grouped JSON output").option("--all", "Include inactive records in plain-text output and JSON payload").option("--limit <count>", "Number of diagnostics entries to include", "20").action(async (options) => {
     try {
       const limit = Math.max(1, Math.min(200, parseInt(options.limit, 10) || 20));
@@ -87666,6 +88228,7 @@ function registerDoctorCommands(program2, pkgVersion3) {
 
 // src/cli/provider-commands.ts
 init_source();
+var path34 = __toESM(require("path"));
 init_cdp_utils();
 var IDE_AUTO_FIX_FUNCTIONS = [
   "openPanel",
@@ -87824,11 +88387,22 @@ async function createConfiguredProviderLoader() {
   const config2 = loadConfig2();
   const loader = new ProviderLoader2({
     userDir: config2.providerDir,
-    disableUpstream: config2.disableUpstream
+    sourceMode: config2.providerSourceMode
   });
   loader.loadAll();
   return loader;
 }
+function getProviderSourceCandidatePaths(options) {
+  const relativeNames = ["provider.json", "scripts.js", "provider.js"];
+  const roots = [options.userDir, options.upstreamDir];
+  const results = [];
+  for (const root of roots) {
+    for (const name of relativeNames) {
+      results.push(path34.join(root, options.category, options.type, name));
+    }
+  }
+  return results;
+}
 function registerProviderCommands(program2) {
   const provider = hideCommand2(program2.command("provider").description("\u{1F50C} Provider management \u2014 list, test, reload providers"));
   provider.command("list").description("List all loaded providers").option("-j, --json", "Output raw JSON").action(async (options) => {
@@ -87885,7 +88459,7 @@ function registerProviderCommands(program2) {
     } catch {
       try {
         const http3 = await import("http");
-        const result = await new Promise((resolve18, reject) => {
+        const result = await new Promise((resolve17, reject) => {
           const req = http3.request({
             hostname: "127.0.0.1",
             port: 19280,
@@ -87897,9 +88471,9 @@ function registerProviderCommands(program2) {
             res.on("data", (c) => data += c);
             res.on("end", () => {
               try {
-                resolve18(JSON.parse(data));
+                resolve17(JSON.parse(data));
               } catch {
-                resolve18({ raw: data });
+                resolve17({ raw: data });
               }
             });
           });
@@ -87960,7 +88534,7 @@ function registerProviderCommands(program2) {
       let processNames = {};
       if (category === "ide") {
         const fs27 = await import("fs");
-        const path35 = await import("path");
+        const path36 = await import("path");
         const os31 = await import("os");
         if (os31.platform() === "darwin") {
           while (true) {
@@ -87973,7 +88547,7 @@ function registerProviderCommands(program2) {
             }
             console.log(source_default.green(`  \u2713 Path verified: ${p}`));
             osPaths["darwin"] = [p];
-            processNames["darwin"] = path35.basename(p, ".app");
+            processNames["darwin"] = path36.basename(p, ".app");
             break;
           }
         } else if (os31.platform() === "win32") {
@@ -87987,7 +88561,7 @@ function registerProviderCommands(program2) {
             }
             console.log(source_default.green(`  \u2713 Path verified: ${p}`));
             osPaths["win32"] = [p];
-            processNames["win32"] = path35.basename(p, ".exe");
+            processNames["win32"] = path36.basename(p, ".exe");
             break;
           }
         }
@@ -88001,12 +88575,12 @@ function registerProviderCommands(program2) {
               console.log(source_default.yellow("Invalid port number."));
               continue;
             }
-            const isFree = await new Promise((resolve18) => {
+            const isFree = await new Promise((resolve17) => {
               const server = net3.createServer();
               server.unref();
-              server.on("error", () => resolve18(false));
+              server.on("error", () => resolve17(false));
               server.listen(port, "127.0.0.1", () => {
-                server.close(() => resolve18(true));
+                server.close(() => resolve17(true));
               });
             });
             if (!isFree) {
@@ -88021,7 +88595,7 @@ function registerProviderCommands(program2) {
       rl.close();
       const location = options.builtin ? "builtin" : "user";
       const http3 = await import("http");
-      const result = await new Promise((resolve18, reject) => {
+      const result = await new Promise((resolve17, reject) => {
         const postData = JSON.stringify({ type, name, category, location, cdpPorts, osPaths, processNames });
         const req = http3.request({
           hostname: "127.0.0.1",
@@ -88034,9 +88608,9 @@ function registerProviderCommands(program2) {
           res.on("data", (c) => data += c);
           res.on("end", () => {
             try {
-              resolve18(JSON.parse(data));
+              resolve17(JSON.parse(data));
             } catch {
-              resolve18({ raw: data });
+              resolve17({ raw: data });
             }
           });
         });
@@ -88144,7 +88718,7 @@ function registerProviderCommands(program2) {
       if (providerToFix && !isUserProvider(providerToFix)) {
         console.log(source_default.yellow(`
 \u26A0\uFE0F  [${type}] is an upstream provider.`));
-        console.log(source_default.gray(`    Preparing a writable local copy in the user providers directory and disabling upstream updates for this provider.`));
+        console.log(source_default.gray(`    Preparing a writable local override in the user providers directory. The local copy will shadow upstream by root precedence; no provider-level upstream flag is required.`));
         const pathMod = await import("path");
         const fsMod2 = await import("fs");
         const downloadedSrc = loader.getUpstreamProviderDir(providerToFix.category, type);
@@ -88153,12 +88727,6 @@ function registerProviderCommands(program2) {
         if (!fsMod2.existsSync(targetDir2)) {
           fsMod2.cpSync(sourceDir, targetDir2, { recursive: true });
         }
-        const pJsonPath = pathMod.join(targetDir2, "provider.json");
-        if (fsMod2.existsSync(pJsonPath)) {
-          const pJson = JSON.parse(fsMod2.readFileSync(pJsonPath, "utf8"));
-          pJson.disableUpstream = true;
-          fsMod2.writeFileSync(pJsonPath, JSON.stringify(pJson, null, 2));
-        }
         console.log(source_default.green(`
 \u2713 Writable local copy ready at [${targetDir2}]`));
       }
@@ -88236,7 +88804,7 @@ function registerProviderCommands(program2) {
           reference,
           ...verification ? { verification } : {}
         });
-        const startResult = await new Promise((resolve18, reject) => {
+        const startResult = await new Promise((resolve17, reject) => {
           const req = http3.request({
             hostname: "127.0.0.1",
             port: 19280,
@@ -88248,9 +88816,9 @@ function registerProviderCommands(program2) {
             res.on("data", (c) => data += c);
             res.on("end", () => {
               try {
-                resolve18(JSON.parse(data));
+                resolve17(JSON.parse(data));
               } catch {
-                resolve18({ raw: data });
+                resolve17({ raw: data });
               }
             });
           });
@@ -88284,7 +88852,7 @@ function registerProviderCommands(program2) {
         fsMock.writeFileSync(logFile, `=== Auto-Impl Started ===
 `);
         console.log(source_default.gray(`  Agent logs: ${logFile}`));
-        await new Promise((resolve18, reject) => {
+        await new Promise((resolve17, reject) => {
           http3.get(`http://127.0.0.1:19280${startResult.sseUrl}`, (res) => {
             let buffer = "";
             res.on("data", (chunk) => {
@@ -88321,7 +88889,7 @@ function registerProviderCommands(program2) {
                     if (currentData.success === false) {
                       reject(new Error(`Agent failed to implement scripts properly (exit: ${currentData.exitCode})`));
                     } else {
-                      resolve18();
+                      resolve17();
                     }
                   } else if (currentEvent === "error") {
                     fsMock.appendFileSync(logFile, `
@@ -88332,7 +88900,7 @@ function registerProviderCommands(program2) {
                 }
               }
             });
-            res.on("end", resolve18);
+            res.on("end", resolve17);
           }).on("error", reject);
         });
         console.log(source_default.green(`
@@ -88391,7 +88959,7 @@ function registerProviderCommands(program2) {
         ideType: type,
         params: options.param ? { text: options.param, sessionId: options.param, buttonText: options.param } : {}
       });
-      const result = await new Promise((resolve18, reject) => {
+      const result = await new Promise((resolve17, reject) => {
         const req = http3.request({
           hostname: "127.0.0.1",
           port: 19280,
@@ -88403,9 +88971,9 @@ function registerProviderCommands(program2) {
           res.on("data", (c) => data += c);
           res.on("end", () => {
             try {
-              resolve18(JSON.parse(data));
+              resolve17(JSON.parse(data));
             } catch {
-              resolve18({ raw: data });
+              resolve17({ raw: data });
             }
           });
         });
@@ -88441,15 +89009,15 @@ function registerProviderCommands(program2) {
   provider.command("source <type>").description("View source code of a provider").action(async (type) => {
     try {
       const http3 = await import("http");
-      const result = await new Promise((resolve18, reject) => {
+      const result = await new Promise((resolve17, reject) => {
         http3.get(`http://127.0.0.1:19280/api/providers/${type}/source`, (res) => {
           let data = "";
           res.on("data", (c) => data += c);
           res.on("end", () => {
             try {
-              resolve18(JSON.parse(data));
+              resolve17(JSON.parse(data));
             } catch {
-              resolve18({ raw: data });
+              resolve17({ raw: data });
             }
           });
         }).on("error", () => {
@@ -88463,10 +89031,12 @@ function registerProviderCommands(program2) {
         if (!providerMeta) {
           return { error: `Provider '${type}' not found` };
         }
-        const possiblePaths = [
-          pathMod.join(loader.getUserProviderDir(providerMeta.category, type), "provider.js"),
-          pathMod.join(loader.getUpstreamProviderDir(providerMeta.category, type), "provider.js")
-        ];
+        const possiblePaths = getProviderSourceCandidatePaths({
+          category: providerMeta.category,
+          type,
+          userDir: loader.getUserDir(),
+          upstreamDir: loader.getUpstreamDir()
+        });
         for (const p of possiblePaths) {
           if (fsMod.existsSync(p)) {
             return { type, path: p, source: fsMod.readFileSync(p, "utf-8") };
@@ -88495,7 +89065,7 @@ function registerProviderCommands(program2) {
     try {
       const http3 = await import("http");
       const postData = JSON.stringify({ script: "readChat", params: {} });
-      const result = await new Promise((resolve18, reject) => {
+      const result = await new Promise((resolve17, reject) => {
         const req = http3.request({
           hostname: "127.0.0.1",
           port: 19280,
@@ -88507,9 +89077,9 @@ function registerProviderCommands(program2) {
           res2.on("data", (c) => data += c);
           res2.on("end", () => {
             try {
-              resolve18(JSON.parse(data));
+              resolve17(JSON.parse(data));
             } catch {
-              resolve18({ raw: data });
+              resolve17({ raw: data });
             }
           });
         });
@@ -88750,13 +89320,13 @@ function registerCdpCommands(program2) {
   cdp.command("screenshot").description("Capture IDE screenshot").option("-p, --port <port>", "CDP port", "9222").option("-o, --output <file>", "Output file path", "/tmp/cdp_screenshot.jpg").action(async (options) => {
     try {
       const http3 = await import("http");
-      const targets = await new Promise((resolve18, reject) => {
+      const targets = await new Promise((resolve17, reject) => {
         http3.get(`http://127.0.0.1:${options.port}/json`, (res) => {
           let data = "";
           res.on("data", (c) => data += c);
           res.on("end", () => {
             try {
-              resolve18(JSON.parse(data));
+              resolve17(JSON.parse(data));
             } catch {
               reject(new Error("Invalid JSON"));
             }
@@ -88770,7 +89340,7 @@ function registerCdpCommands(program2) {
       if (!target?.webSocketDebuggerUrl) throw new Error("No CDP target");
       const WebSocket4 = (await import("ws")).default;
       const ws = new WebSocket4(target.webSocketDebuggerUrl);
-      await new Promise((resolve18, reject) => {
+      await new Promise((resolve17, reject) => {
         ws.on("open", () => {
           ws.send(JSON.stringify({ id: 1, method: "Page.captureScreenshot", params: { format: "jpeg", quality: 50 } }));
         });
@@ -88783,7 +89353,7 @@ function registerCdpCommands(program2) {
   \u2713 Screenshot saved to ${options.output}
 `));
             ws.close();
-            resolve18();
+            resolve17();
           }
         });
         ws.on("error", (e) => reject(e));
@@ -89173,8 +89743,13 @@ if (process.platform === "win32") {
     process.exit(1);
   }
 }
-var _cliProviderLoader = new ProviderLoader({ logFn: () => {
-} });
+var cliConfig = loadConfig();
+var _cliProviderLoader = new ProviderLoader({
+  logFn: () => {
+  },
+  userDir: cliConfig.providerDir,
+  sourceMode: cliConfig.providerSourceMode
+});
 _cliProviderLoader.loadAll();
 _cliProviderLoader.registerToDetector();
 var program = new import_commander.Command();
@@ -89199,9 +89774,11 @@ void (async () => {
     console.log(source_default.gray("    adhdev standalone        \u2014 Start standalone local dashboard & daemon"));
     console.log(source_default.gray("    adhdev launch cursor     \u2014 Launch IDE with CDP (e.g. cursor, windsurf)"));
     console.log(source_default.gray("    adhdev launch claude     \u2014 Launch CLI agent via the running daemon"));
-    console.log(source_default.gray("    adhdev runtime list      \u2014 Primary hosted runtime view: live, recovery, inactive"));
+    console.log(source_default.gray("    adhdev history list claude      \u2014 Browse saved CLI history"));
+    console.log(source_default.gray("    adhdev history resume claude <session> \u2014 Resume saved history explicitly"));
+    console.log(source_default.gray("    adhdev runtime list      \u2014 Hosted runtime recovery & diagnostics"));
     console.log(source_default.gray("    adhdev attach            \u2014 Attach this terminal to a live hosted runtime"));
-    console.log(source_default.gray("    adhdev recover           \u2014 Recover or resume a hosted runtime explicitly"));
+    console.log(source_default.gray("    adhdev recover           \u2014 Recover a hosted runtime after interruption"));
     console.log(source_default.gray("    adhdev status            \u2014 Check current setup"));
     console.log(source_default.gray("    adhdev doctor            \u2014 Diagnose install & native dependencies"));
     console.log(source_default.gray("    adhdev update            \u2014 Upgrade to latest version"));