adhdev 0.8.93 → 0.8.95

package/dist/cli/index.js

@@ -1502,15 +1502,15 @@ function resolveCommandPath(command) {
   return null;
 }
 function execAsync(cmd, timeoutMs = 5e3) {
-  return new Promise((resolve17) => {
+  return new Promise((resolve18) => {
     const child = (0, import_child_process2.exec)(cmd, { encoding: "utf-8", timeout: timeoutMs }, (err, stdout) => {
       if (err || !stdout?.trim()) {
-        resolve17(null);
+        resolve18(null);
       } else {
-        resolve17(stdout.trim());
+        resolve18(stdout.trim());
       }
     });
-    child.on("error", () => resolve17(null));
+    child.on("error", () => resolve18(null));
   });
 }
 async function detectCLIs(providerLoader, options) {
@@ -2118,7 +2118,7 @@ var init_manager = __esm({
       * Returns multiple entries if multiple IDE windows are open on same port
       */
       static listAllTargets(port) {
-        return new Promise((resolve17) => {
+        return new Promise((resolve18) => {
           const req = http.get(`http://127.0.0.1:${port}/json`, (res) => {
             let data = "";
             res.on("data", (chunk) => data += chunk.toString());
@@ -2134,16 +2134,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 || ""));
-                resolve17(mainPages.length > 0 ? mainPages : fallbackPages);
+                resolve18(mainPages.length > 0 ? mainPages : fallbackPages);
               } catch {
-                resolve17([]);
+                resolve18([]);
               }
             });
           });
-          req.on("error", () => resolve17([]));
+          req.on("error", () => resolve18([]));
           req.setTimeout(2e3, () => {
             req.destroy();
-            resolve17([]);
+            resolve18([]);
           });
         });
       }
@@ -2183,7 +2183,7 @@ var init_manager = __esm({
         }
       }
       findTargetOnPort(port) {
-        return new Promise((resolve17) => {
+        return new Promise((resolve18) => {
           const req = http.get(`http://127.0.0.1:${port}/json`, (res) => {
             let data = "";
             res.on("data", (chunk) => data += chunk.toString());
@@ -2194,7 +2194,7 @@ var init_manager = __esm({
                   (t) => (t.type === "page" || t.type === "browser" || t.type === "Page") && t.webSocketDebuggerUrl
                 );
                 if (pages.length === 0) {
-                  resolve17(targets.find((t) => t.webSocketDebuggerUrl) || null);
+                  resolve18(targets.find((t) => t.webSocketDebuggerUrl) || null);
                   return;
                 }
                 const titleFilteredPages = pages.filter((t) => !this.isNonMainTitle(t.title || ""));
@@ -2213,25 +2213,25 @@ var init_manager = __esm({
                     this._targetId = selected.target.id;
                   }
                   this._pageTitle = selected.target.title || "";
-                  resolve17(selected.target);
+                  resolve18(selected.target);
                   return;
                 }
                 if (previousTargetId) {
                   this.log(`[CDP] Target ${previousTargetId} not found in page list`);
-                  resolve17(null);
+                  resolve18(null);
                   return;
                 }
                 this._pageTitle = list[0]?.title || "";
-                resolve17(list[0]);
+                resolve18(list[0]);
               } catch {
-                resolve17(null);
+                resolve18(null);
               }
             });
           });
-          req.on("error", () => resolve17(null));
+          req.on("error", () => resolve18(null));
           req.setTimeout(2e3, () => {
             req.destroy();
-            resolve17(null);
+            resolve18(null);
           });
         });
       }
@@ -2242,7 +2242,7 @@ var init_manager = __esm({
         this.extensionProviders = providers;
       }
       connectToTarget(wsUrl) {
-        return new Promise((resolve17) => {
+        return new Promise((resolve18) => {
           this.ws = new import_ws.default(wsUrl);
           this.ws.on("open", async () => {
             this._connected = true;
@@ -2252,17 +2252,17 @@ var init_manager = __esm({
             }
             this.connectBrowserWs().catch(() => {
             });
-            resolve17(true);
+            resolve18(true);
           });
           this.ws.on("message", (data) => {
             try {
               const msg = JSON.parse(data.toString());
               if (msg.id && this.pending.has(msg.id)) {
-                const { resolve: resolve18, reject } = this.pending.get(msg.id);
+                const { resolve: resolve19, reject } = this.pending.get(msg.id);
                 this.pending.delete(msg.id);
                 this.failureCount = 0;
                 if (msg.error) reject(new Error(msg.error.message));
-                else resolve18(msg.result);
+                else resolve19(msg.result);
               } else if (msg.method === "Runtime.executionContextCreated") {
                 this.contexts.add(msg.params.context.id);
               } else if (msg.method === "Runtime.executionContextDestroyed") {
@@ -2285,7 +2285,7 @@ var init_manager = __esm({
           this.ws.on("error", (err) => {
             this.log(`[CDP] WebSocket error: ${err.message}`);
             this._connected = false;
-            resolve17(false);
+            resolve18(false);
           });
         });
       }
@@ -2299,7 +2299,7 @@ var init_manager = __esm({
             return;
           }
           this.log(`[CDP] Connecting browser WS for target discovery...`);
-          await new Promise((resolve17, reject) => {
+          await new Promise((resolve18, reject) => {
             this.browserWs = new import_ws.default(browserWsUrl);
             this.browserWs.on("open", async () => {
               this._browserConnected = true;
@@ -2309,16 +2309,16 @@ var init_manager = __esm({
               } catch (e) {
                 this.log(`[CDP] setDiscoverTargets failed: ${e.message}`);
               }
-              resolve17();
+              resolve18();
             });
             this.browserWs.on("message", (data) => {
               try {
                 const msg = JSON.parse(data.toString());
                 if (msg.id && this.browserPending.has(msg.id)) {
-                  const { resolve: resolve18, reject: reject2 } = this.browserPending.get(msg.id);
+                  const { resolve: resolve19, reject: reject2 } = this.browserPending.get(msg.id);
                   this.browserPending.delete(msg.id);
                   if (msg.error) reject2(new Error(msg.error.message));
-                  else resolve18(msg.result);
+                  else resolve19(msg.result);
                 }
               } catch {
               }
@@ -2338,31 +2338,31 @@ var init_manager = __esm({
         }
       }
       getBrowserWsUrl() {
-        return new Promise((resolve17) => {
+        return new Promise((resolve18) => {
           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);
-                resolve17(info.webSocketDebuggerUrl || null);
+                resolve18(info.webSocketDebuggerUrl || null);
               } catch {
-                resolve17(null);
+                resolve18(null);
               }
             });
           });
-          req.on("error", () => resolve17(null));
+          req.on("error", () => resolve18(null));
           req.setTimeout(3e3, () => {
             req.destroy();
-            resolve17(null);
+            resolve18(null);
           });
         });
       }
       sendBrowser(method, params = {}, timeoutMs = 15e3) {
-        return new Promise((resolve17, reject) => {
+        return new Promise((resolve18, reject) => {
           if (!this.browserWs || !this._browserConnected) return reject(new Error("Browser WS not connected"));
           const id = this.browserMsgId++;
-          this.browserPending.set(id, { resolve: resolve17, reject });
+          this.browserPending.set(id, { resolve: resolve18, reject });
           this.browserWs.send(JSON.stringify({ id, method, params }));
           setTimeout(() => {
             if (this.browserPending.has(id)) {
@@ -2402,11 +2402,11 @@ var init_manager = __esm({
       }
       // ─── CDP Protocol ────────────────────────────────────────
       sendInternal(method, params = {}, timeoutMs = 15e3) {
-        return new Promise((resolve17, reject) => {
+        return new Promise((resolve18, 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: resolve17, reject });
+          this.pending.set(id, { resolve: resolve18, reject });
           this.ws.send(JSON.stringify({ id, method, params }));
           setTimeout(() => {
             if (this.pending.has(id)) {
@@ -2655,7 +2655,7 @@ var init_manager = __esm({
         const browserWs = this.browserWs;
         let msgId = this.browserMsgId;
         const sendWs = (method, params = {}, sessionId) => {
-          return new Promise((resolve17, reject) => {
+          return new Promise((resolve18, reject) => {
             const mid = msgId++;
             this.browserMsgId = msgId;
             const handler = (raw) => {
@@ -2664,7 +2664,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 resolve17(msg.result);
+                  else resolve18(msg.result);
                 }
               } catch {
               }
@@ -2865,14 +2865,14 @@ var init_manager = __esm({
         if (!ws || ws.readyState !== import_ws.default.OPEN) {
           throw new Error("CDP not connected");
         }
-        return new Promise((resolve17, reject) => {
+        return new Promise((resolve18, reject) => {
           const id = getNextId();
           pendingMap.set(id, {
             resolve: (result) => {
               if (result?.result?.subtype === "error") {
                 reject(new Error(result.result.description));
               } else {
-                resolve17(result?.result?.value);
+                resolve18(result?.result?.value);
               }
             },
             reject
@@ -2904,10 +2904,10 @@ var init_manager = __esm({
           throw new Error("CDP not connected");
         }
         const sendViaSession = (method, params = {}) => {
-          return new Promise((resolve17, reject) => {
+          return new Promise((resolve18, reject) => {
             const pendingMap = this._browserConnected ? this.browserPending : this.pending;
             const id = this._browserConnected ? this.browserMsgId++ : this.msgId++;
-            pendingMap.set(id, { resolve: resolve17, reject });
+            pendingMap.set(id, { resolve: resolve18, reject });
             ws.send(JSON.stringify({ id, sessionId, method, params }));
             setTimeout(() => {
               if (pendingMap.has(id)) {
@@ -4661,6 +4661,125 @@ function listSavedHistorySessions(agentType, options = {}) {
     return { sessions: [], hasMore: false };
   }
 }
+function normalizeCanonicalHermesMessageContent(content) {
+  if (typeof content === "string") return content.trim();
+  if (content == null) return "";
+  try {
+    return JSON.stringify(content).trim();
+  } catch {
+    return String(content).trim();
+  }
+}
+function extractCanonicalHermesMessageTimestamp(message, fallbackTs) {
+  const numericTimestamp = Number(message.receivedAt || message.timestamp || message.ts || 0);
+  if (Number.isFinite(numericTimestamp) && numericTimestamp > 0) return numericTimestamp;
+  const stringTimestamp = typeof message.ts === "string" ? Date.parse(message.ts) : typeof message.timestamp === "string" ? Date.parse(message.timestamp) : NaN;
+  if (Number.isFinite(stringTimestamp) && stringTimestamp > 0) return stringTimestamp;
+  return fallbackTs;
+}
+function readExistingHermesSessionStartRecord(historySessionId) {
+  try {
+    const dir = path7.join(HISTORY_DIR, "hermes-cli");
+    if (!fs3.existsSync(dir)) return null;
+    const files = listHistoryFiles(dir, historySessionId).sort();
+    for (const file2 of files) {
+      const lines = fs3.readFileSync(path7.join(dir, file2), "utf-8").split("\n").filter(Boolean);
+      for (const line of lines) {
+        try {
+          const parsed = JSON.parse(line);
+          if (parsed.historySessionId !== historySessionId) continue;
+          if (parsed.kind === "session_start" && parsed.role === "system") {
+            return parsed;
+          }
+        } catch {
+        }
+      }
+    }
+    return null;
+  } catch {
+    return null;
+  }
+}
+function rebuildHermesSavedHistoryFromCanonicalSession(historySessionId) {
+  const normalizedSessionId = normalizeSavedHistorySessionId("hermes-cli", historySessionId);
+  if (!normalizedSessionId) return false;
+  try {
+    const sessionFilePath = path7.join(os6.homedir(), ".hermes", "sessions", `session_${normalizedSessionId}.json`);
+    if (!fs3.existsSync(sessionFilePath)) return false;
+    const raw = JSON.parse(fs3.readFileSync(sessionFilePath, "utf-8"));
+    const canonicalMessages = Array.isArray(raw.messages) ? raw.messages : [];
+    const dir = path7.join(HISTORY_DIR, "hermes-cli");
+    fs3.mkdirSync(dir, { recursive: true });
+    const existingSessionStart = readExistingHermesSessionStartRecord(normalizedSessionId);
+    const records = [];
+    if (existingSessionStart) {
+      records.push({
+        ...existingSessionStart,
+        historySessionId: normalizedSessionId
+      });
+    }
+    let fallbackTs = Date.parse(raw.session_start || raw.last_updated || "") || Date.now();
+    for (const message of canonicalMessages) {
+      const role = String(message.role || "").trim();
+      const content = normalizeCanonicalHermesMessageContent(message.content);
+      if (!content) continue;
+      const receivedAt = extractCanonicalHermesMessageTimestamp(message, fallbackTs);
+      fallbackTs = receivedAt + 1;
+      if (role === "user") {
+        records.push({
+          ts: new Date(receivedAt).toISOString(),
+          receivedAt,
+          role: "user",
+          content,
+          kind: "standard",
+          agent: "hermes-cli",
+          historySessionId: normalizedSessionId
+        });
+        continue;
+      }
+      if (role === "assistant") {
+        records.push({
+          ts: new Date(receivedAt).toISOString(),
+          receivedAt,
+          role: "assistant",
+          content,
+          kind: "standard",
+          agent: "hermes-cli",
+          historySessionId: normalizedSessionId
+        });
+        continue;
+      }
+      if (role === "tool") {
+        records.push({
+          ts: new Date(receivedAt).toISOString(),
+          receivedAt,
+          role: "assistant",
+          content,
+          kind: "tool",
+          senderName: "Tool",
+          agent: "hermes-cli",
+          historySessionId: normalizedSessionId
+        });
+      }
+    }
+    if (records.length === 0) return false;
+    const prefix = `${normalizedSessionId.replace(/[^a-zA-Z0-9_-]/g, "_")}_`;
+    for (const file2 of fs3.readdirSync(dir)) {
+      if (file2.startsWith(prefix) && file2.endsWith(".jsonl")) {
+        fs3.unlinkSync(path7.join(dir, file2));
+      }
+    }
+    const targetDate = new Date(records[records.length - 1].receivedAt || Date.now()).toISOString().slice(0, 10);
+    const filePath = path7.join(dir, `${prefix}${targetDate}.jsonl`);
+    fs3.writeFileSync(filePath, `${records.map((record2) => JSON.stringify(record2)).join("\n")}
+`, "utf-8");
+    invalidatePersistedSavedHistoryIndex("hermes-cli", dir);
+    savedHistorySessionCache.delete("hermes-cli");
+    return true;
+  } catch {
+    return false;
+  }
+}
 var fs3, path7, os6, HISTORY_DIR, RETAIN_DAYS, SAVED_HISTORY_INDEX_VERSION, SAVED_HISTORY_INDEX_FILE, SAVED_HISTORY_INDEX_LOCK_SUFFIX, SAVED_HISTORY_INDEX_LOCK_WAIT_MS, SAVED_HISTORY_INDEX_LOCK_STALE_MS, SAVED_HISTORY_INDEX_LOCK_POLL_MS, SAVED_HISTORY_ROLLUP_THRESHOLD_BYTES, savedHistorySessionCache, savedHistoryFileSummaryCache, savedHistoryBackgroundRefresh, savedHistoryRollupInFlight, CODEX_STARTER_PROMPT_RE, ChatHistoryWriter;
 var init_chat_history = __esm({
   "../../oss/packages/daemon-core/src/config/chat-history.ts"() {
@@ -7475,7 +7594,9 @@ function getTargetInstance(h, args) {
   const targetSessionId = typeof args?.targetSessionId === "string" ? args.targetSessionId.trim() : "";
   const sessionId = targetSessionId || h.currentSession?.sessionId || "";
   if (!sessionId) return null;
-  return h.ctx.instanceManager?.getInstance(sessionId) || null;
+  const session = h.ctx.sessionRegistry?.get(sessionId);
+  const instanceKey = session?.adapterKey || session?.instanceKey || sessionId;
+  return h.ctx.instanceManager?.getInstance(instanceKey) || null;
 }
 function getTargetTransport(h, provider) {
   if (h.currentSession?.transport) return h.currentSession.transport;
@@ -7772,7 +7893,7 @@ function getStateLastSignature(state) {
 async function getStableExtensionBaseline(h) {
   const first = await readExtensionChatState(h);
   if (getStateMessageCount(first) > 0 || getStateLastSignature(first)) return first;
-  await new Promise((resolve17) => setTimeout(resolve17, 150));
+  await new Promise((resolve18) => setTimeout(resolve18, 150));
   const second = await readExtensionChatState(h);
   return getStateMessageCount(second) >= getStateMessageCount(first) ? second : first;
 }
@@ -7780,7 +7901,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((resolve17) => setTimeout(resolve17, 250));
+    await new Promise((resolve18) => setTimeout(resolve18, 250));
     const state = await readExtensionChatState(h);
     if (state?.status === "waiting_approval") return true;
     const afterCount = getStateMessageCount(state);
@@ -8544,10 +8665,17 @@ async function handleResolveAction(h, args) {
       }
     }
     const status = adapter.getStatus();
-    if (status?.status !== "waiting_approval") {
+    const targetInstance = getTargetInstance(h, args);
+    const targetState = targetInstance?.getState?.();
+    const surfacedModal = targetState?.activeChat?.activeModal && Array.isArray(targetState.activeChat.activeModal.buttons) && targetState.activeChat.activeModal.buttons.some((candidate) => typeof candidate === "string" && candidate.trim()) ? targetState.activeChat.activeModal : null;
+    const statusModal = status?.activeModal && Array.isArray(status.activeModal.buttons) && status.activeModal.buttons.some((candidate) => typeof candidate === "string" && candidate.trim()) ? status.activeModal : null;
+    const effectiveModal = statusModal || surfacedModal;
+    const effectiveStatus = status?.status === "waiting_approval" || targetState?.activeChat?.status === "waiting_approval" ? "waiting_approval" : status?.status;
+    LOG.info("Command", `[resolveAction] CLI PTY gate target=${String(args?.targetSessionId || "")} rawStatus=${String(status?.status || "")} effectiveStatus=${String(effectiveStatus || "")} statusModal=${statusModal ? "yes" : "no"} surfacedModal=${surfacedModal ? "yes" : "no"} instance=${targetInstance ? "yes" : "no"}`);
+    if (effectiveStatus !== "waiting_approval" && !effectiveModal) {
       return { success: false, error: "Not in approval state" };
     }
-    const buttons = status.activeModal?.buttons || ["Allow once", "Always allow", "Deny"];
+    const buttons = effectiveModal?.buttons || ["Allow once", "Always allow", "Deny"];
     let buttonIndex = typeof args?.buttonIndex === "number" ? args.buttonIndex : -1;
     if (buttonIndex < 0) {
       const btnLower = button.toLowerCase();
@@ -10058,7 +10186,7 @@ var init_handler = __esm({
         try {
           const http3 = await import("http");
           const postData = JSON.stringify(body);
-          const result = await new Promise((resolve17, reject) => {
+          const result = await new Promise((resolve18, reject) => {
             const req = http3.request({
               hostname: "127.0.0.1",
               port: 19280,
@@ -10070,9 +10198,9 @@ var init_handler = __esm({
               res.on("data", (chunk) => data += chunk);
               res.on("end", () => {
                 try {
-                  resolve17(JSON.parse(data));
+                  resolve18(JSON.parse(data));
                 } catch {
-                  resolve17({ raw: data });
+                  resolve18({ raw: data });
                 }
               });
             });
@@ -10090,15 +10218,15 @@ var init_handler = __esm({
         if (!providerType) return { success: false, error: "providerType required" };
         try {
           const http3 = await import("http");
-          const result = await new Promise((resolve17, reject) => {
+          const result = await new Promise((resolve18, 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 {
-                  resolve17(JSON.parse(data));
+                  resolve18(JSON.parse(data));
                 } catch {
-                  resolve17({ raw: data });
+                  resolve18({ raw: data });
                 }
               });
             }).on("error", reject);
@@ -10112,7 +10240,7 @@ var init_handler = __esm({
         try {
           const http3 = await import("http");
           const postData = JSON.stringify(args || {});
-          const result = await new Promise((resolve17, reject) => {
+          const result = await new Promise((resolve18, reject) => {
             const req = http3.request({
               hostname: "127.0.0.1",
               port: 19280,
@@ -10124,9 +10252,9 @@ var init_handler = __esm({
               res.on("data", (chunk) => data += chunk);
               res.on("end", () => {
                 try {
-                  resolve17(JSON.parse(data));
+                  resolve18(JSON.parse(data));
                 } catch {
-                  resolve17({ raw: data });
+                  resolve18({ raw: data });
                 }
               });
             });
@@ -12784,7 +12912,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((resolve17) => setTimeout(resolve17, 50));
+          await new Promise((resolve18) => setTimeout(resolve18, 50));
         }
         const finalScreenText = this.terminalScreen.getText() || "";
         LOG.warn(
@@ -13372,7 +13500,7 @@ var init_provider_cli_adapter = __esm({
       }
       projectEffectiveStatus(startupModal = null) {
         if (this.parseErrorMessage) return "error";
-        if (startupModal) return "waiting_approval";
+        if (startupModal || this.activeModal) return "waiting_approval";
         if (this.isWaitingForResponse && this.currentTurnScope && this.currentStatus === "idle") return "generating";
         return this.currentStatus;
       }
@@ -13380,12 +13508,24 @@ var init_provider_cli_adapter = __esm({
       getStatus() {
         const screenText = this.terminalScreen.getText() || "";
         const startupModal = this.startupParseGate ? this.getStartupConfirmationModal(screenText) : null;
-        const effectiveStatus = this.projectEffectiveStatus(startupModal);
+        let effectiveStatus = this.projectEffectiveStatus(startupModal);
+        let effectiveModal = startupModal || this.activeModal;
+        if (!startupModal && !effectiveModal && typeof this.cliScripts?.parseOutput === "function") {
+          try {
+            const parsed = this.getScriptParsedStatus();
+            const parsedModal = parsed?.activeModal && Array.isArray(parsed.activeModal.buttons) && parsed.activeModal.buttons.some((button) => typeof button === "string" && button.trim()) ? parsed.activeModal : null;
+            if (parsed?.status === "waiting_approval" && parsedModal) {
+              effectiveStatus = "waiting_approval";
+              effectiveModal = parsedModal;
+            }
+          } catch {
+          }
+        }
         return {
           status: effectiveStatus,
           messages: [...this.committedMessages],
           workingDir: this.workingDir,
-          activeModal: startupModal || this.activeModal,
+          activeModal: effectiveModal,
           errorMessage: this.parseErrorMessage || void 0,
           errorReason: this.parseErrorMessage ? "parse_error" : void 0
         };
@@ -13421,6 +13561,15 @@ var init_provider_cli_adapter = __esm({
           this.currentTurnScope,
           screenText
         );
+        const parsedModal = parsed?.activeModal && Array.isArray(parsed.activeModal.buttons) && parsed.activeModal.buttons.some((button) => typeof button === "string" && button.trim()) ? parsed.activeModal : null;
+        if (parsedModal && parsed?.status === "waiting_approval") {
+          this.activeModal = parsedModal;
+          this.isWaitingForResponse = true;
+          if (this.currentStatus !== "waiting_approval") {
+            this.setStatus("waiting_approval", "parsed_waiting_approval");
+            this.onStatusChange?.();
+          }
+        }
         if (this.maybeCommitVisibleIdleTranscript(parsed)) {
           return this.getScriptParsedStatus();
         }
@@ -13625,7 +13774,7 @@ ${data.message || ""}`.trim();
           const deadline = Date.now() + 1e4;
           while (this.startupParseGate && Date.now() < deadline) {
             this.resolveStartupState("send_wait");
-            await new Promise((resolve17) => setTimeout(resolve17, 50));
+            await new Promise((resolve18) => setTimeout(resolve18, 50));
           }
         }
         if (!allowInterventionPrompt) {
@@ -13717,12 +13866,12 @@ ${data.message || ""}`.trim();
             if (this.isWaitingForResponse) this.finishResponse();
           }, this.timeouts.maxResponse);
         };
-        await new Promise((resolve17) => {
+        await new Promise((resolve18) => {
           let resolved = false;
           const resolveOnce = () => {
             if (resolved) return;
             resolved = true;
-            resolve17();
+            resolve18();
           };
           const submit = () => {
             if (!this.ptyProcess) {
@@ -13896,17 +14045,17 @@ ${data.message || ""}`.trim();
         }
       }
       waitForStopped(timeoutMs) {
-        return new Promise((resolve17) => {
+        return new Promise((resolve18) => {
           const startedAt = Date.now();
           const timer = setInterval(() => {
             if (!this.ptyProcess || this.currentStatus === "stopped") {
               clearInterval(timer);
-              resolve17(true);
+              resolve18(true);
               return;
             }
             if (Date.now() - startedAt >= timeoutMs) {
               clearInterval(timer);
-              resolve17(false);
+              resolve18(false);
             }
           }, 100);
         });
@@ -14071,7 +14220,22 @@ ${data.message || ""}`.trim();
       }
       resolveModal(buttonIndex) {
         const screenText = this.terminalScreen.getText() || "";
-        const modal = this.activeModal || this.getStartupConfirmationModal(screenText);
+        let modal = this.activeModal || this.getStartupConfirmationModal(screenText);
+        if (!modal && typeof this.cliScripts?.parseOutput === "function") {
+          try {
+            const parsed = this.getScriptParsedStatus();
+            const parsedModal = parsed?.activeModal && Array.isArray(parsed.activeModal.buttons) && parsed.activeModal.buttons.some((button) => typeof button === "string" && button.trim()) ? parsed.activeModal : null;
+            if (parsed?.status === "waiting_approval" && parsedModal) {
+              modal = parsedModal;
+              this.activeModal = parsedModal;
+              if (this.currentStatus !== "waiting_approval") {
+                this.setStatus("waiting_approval", "resolve_modal_parse");
+                this.onStatusChange?.();
+              }
+            }
+          } catch {
+          }
+        }
         if (!this.ptyProcess || this.currentStatus !== "waiting_approval" && !modal) return;
         this.clearIdleFinishCandidate("resolve_modal");
         this.recordTrace("resolve_modal", {
@@ -14250,7 +14414,7 @@ async function waitForCliAdapterReady(adapter, options) {
     if (status === "stopped") {
       throw new Error("CLI runtime stopped before it became ready");
     }
-    await new Promise((resolve17) => setTimeout(resolve17, pollMs));
+    await new Promise((resolve18) => setTimeout(resolve18, pollMs));
   }
   throw new Error(`CLI runtime did not become ready within ${timeoutMs}ms`);
 }
@@ -14309,6 +14473,7 @@ var init_cli_provider_instance = __esm({
       historyWriter;
       runtimeMessages = [];
       lastPersistedHistoryMessages = [];
+      lastCanonicalHermesSyncMtimeMs = 0;
       instanceId;
       suppressIdleHistoryReplay = false;
       errorMessage = void 0;
@@ -14341,34 +14506,7 @@ var init_cli_provider_instance = __esm({
         await this.enforceFreshSessionLaunchIfNeeded();
         this.maybeAppendRuntimeRecoveryMessage(this.adapter.getRuntimeMetadata());
         if (this.providerSessionId) {
-          this.historyWriter.compactHistorySession(this.type, this.providerSessionId);
-          const restoredHistory = readChatHistory(this.type, 0, 200, this.providerSessionId);
-          this.historyWriter.seedSessionHistory(
-            this.type,
-            restoredHistory.messages,
-            this.providerSessionId,
-            this.instanceId
-          );
-          this.lastPersistedHistoryMessages = restoredHistory.messages.map((message) => ({
-            role: message.role,
-            content: message.content,
-            kind: message.kind,
-            senderName: message.senderName,
-            receivedAt: message.receivedAt
-          }));
-          this.suppressIdleHistoryReplay = restoredHistory.messages.length > 0;
-          if (restoredHistory.messages.length > 0) {
-            this.adapter.seedCommittedMessages(
-              restoredHistory.messages.map((message) => ({
-                role: message.role,
-                content: message.content,
-                timestamp: message.receivedAt,
-                receivedAt: message.receivedAt,
-                kind: message.kind,
-                senderName: message.senderName
-              }))
-            );
-          }
+          this.restorePersistedHistoryFromCurrentSession();
         }
         if (this.providerSessionId && this.launchMode === "resume") {
           const resumedAt = Date.now();
@@ -14477,6 +14615,7 @@ var init_cli_provider_instance = __esm({
           parsedMessages = historyMessageCount > 0 ? parsedMessages.slice(-historyMessageCount) : [];
         }
         const mergedMessages = this.mergeConversationMessages(parsedMessages);
+        const canonicalHermesBackedHistory = this.syncCanonicalHermesSavedHistoryIfNeeded();
         const dirName = this.workingDir.split("/").filter(Boolean).pop() || "session";
         if (parsedMessages.length > 0) {
           const shouldSkipReplayPersist = this.suppressIdleHistoryReplay && adapterStatus.status === "idle" && parsedStatus?.status === "idle";
@@ -14494,7 +14633,7 @@ var init_cli_provider_instance = __esm({
             senderName: typeof message.senderName === "string" ? message.senderName : void 0,
             receivedAt: typeof message.receivedAt === "number" ? message.receivedAt : message.timestamp
           }));
-          if (!shouldSkipReplayPersist && normalizedMessagesToSave.length > 0) {
+          if (!canonicalHermesBackedHistory && !shouldSkipReplayPersist && normalizedMessagesToSave.length > 0) {
             const incrementalMessages = buildIncrementalHistoryAppendMessages(this.lastPersistedHistoryMessages, normalizedMessagesToSave);
             this.historyWriter.appendNewMessages(
               this.type,
@@ -14504,7 +14643,9 @@ var init_cli_provider_instance = __esm({
               this.providerSessionId
             );
           }
-          this.lastPersistedHistoryMessages = normalizedMessagesToSave;
+          if (!canonicalHermesBackedHistory) {
+            this.lastPersistedHistoryMessages = normalizedMessagesToSave;
+          }
         }
         this.applyProviderResponse(parsedStatus, { phase: "immediate" });
         const surface = resolveProviderStateSurface({
@@ -14961,6 +15102,7 @@ ${effect.notification.body || ""}`.trim();
         this.providerSessionId = nextSessionId;
         this.historyWriter.promoteHistorySession(this.type, previousHistorySessionId, nextSessionId);
         this.historyWriter.writeSessionStart(this.type, nextSessionId, this.workingDir, this.instanceId);
+        this.restorePersistedHistoryFromCurrentSession();
         this.adapter.updateRuntimeMeta({ providerSessionId: nextSessionId });
         this.onProviderSessionResolved?.({
           instanceId: this.instanceId,
@@ -14972,6 +15114,61 @@ ${effect.notification.body || ""}`.trim();
         });
         LOG.info("CLI", `[${this.type}] discovered provider session id: ${nextSessionId}`);
       }
+      syncCanonicalHermesSavedHistoryIfNeeded() {
+        if (this.type !== "hermes-cli" || !this.providerSessionId) return false;
+        try {
+          const canonicalPath = path12.join(os14.homedir(), ".hermes", "sessions", `session_${this.providerSessionId}.json`);
+          if (!fs5.existsSync(canonicalPath)) return false;
+          const stat4 = fs5.statSync(canonicalPath);
+          if (stat4.mtimeMs <= this.lastCanonicalHermesSyncMtimeMs) return true;
+          const rebuilt = rebuildHermesSavedHistoryFromCanonicalSession(this.providerSessionId);
+          if (!rebuilt) return false;
+          this.lastCanonicalHermesSyncMtimeMs = stat4.mtimeMs;
+          const restoredHistory = readChatHistory(this.type, 0, 200, this.providerSessionId);
+          this.lastPersistedHistoryMessages = restoredHistory.messages.map((message) => ({
+            role: message.role,
+            content: message.content,
+            kind: message.kind,
+            senderName: message.senderName,
+            receivedAt: message.receivedAt
+          }));
+          return true;
+        } catch {
+          return false;
+        }
+      }
+      restorePersistedHistoryFromCurrentSession() {
+        if (!this.providerSessionId) return;
+        this.syncCanonicalHermesSavedHistoryIfNeeded();
+        this.historyWriter.compactHistorySession(this.type, this.providerSessionId);
+        const restoredHistory = readChatHistory(this.type, 0, 200, this.providerSessionId);
+        this.historyWriter.seedSessionHistory(
+          this.type,
+          restoredHistory.messages,
+          this.providerSessionId,
+          this.instanceId
+        );
+        this.lastPersistedHistoryMessages = restoredHistory.messages.map((message) => ({
+          role: message.role,
+          content: message.content,
+          kind: message.kind,
+          senderName: message.senderName,
+          receivedAt: message.receivedAt
+        }));
+        this.suppressIdleHistoryReplay = restoredHistory.messages.length > 0;
+        if (restoredHistory.messages.length > 0) {
+          this.adapter.seedCommittedMessages(
+            restoredHistory.messages.map((message) => ({
+              role: message.role,
+              content: message.content,
+              timestamp: message.receivedAt,
+              receivedAt: message.receivedAt,
+              kind: message.kind,
+              senderName: message.senderName
+            }))
+          );
+        }
+      }
       getProbeDirectories() {
         const dirs = /* @__PURE__ */ new Set();
         const addDir = (value) => {
@@ -31064,8 +31261,8 @@ var init_acp = __esm({
         this.#requestHandler = requestHandler;
         this.#notificationHandler = notificationHandler;
         this.#stream = stream;
-        this.#closedPromise = new Promise((resolve17) => {
-          this.#abortController.signal.addEventListener("abort", () => resolve17());
+        this.#closedPromise = new Promise((resolve18) => {
+          this.#abortController.signal.addEventListener("abort", () => resolve18());
         });
         this.#receive();
       }
@@ -31214,8 +31411,8 @@ var init_acp = __esm({
       }
       async sendRequest(method, params) {
         const id = this.#nextRequestId++;
-        const responsePromise = new Promise((resolve17, reject) => {
-          this.#pendingResponses.set(id, { resolve: resolve17, reject });
+        const responsePromise = new Promise((resolve18, reject) => {
+          this.#pendingResponses.set(id, { resolve: resolve18, reject });
         });
         await this.#sendMessage({ jsonrpc: "2.0", id, method, params });
         return responsePromise;
@@ -31886,13 +32083,13 @@ var init_acp_provider_instance = __esm({
             }
             this.currentStatus = "waiting_approval";
             this.detectStatusTransition();
-            const approved = await new Promise((resolve17) => {
-              this.permissionResolvers.push(resolve17);
+            const approved = await new Promise((resolve18) => {
+              this.permissionResolvers.push(resolve18);
               setTimeout(() => {
-                const idx = this.permissionResolvers.indexOf(resolve17);
+                const idx = this.permissionResolvers.indexOf(resolve18);
                 if (idx >= 0) {
                   this.permissionResolvers.splice(idx, 1);
-                  resolve17(false);
+                  resolve18(false);
                 }
               }, 3e5);
             });
@@ -34115,7 +34312,7 @@ var init_handler2 = __esm({
             this._addToNodeFs(path35, initialAdd, wh, depth + 1);
           }
         }).on(EV.ERROR, this._boundHandleError);
-        return new Promise((resolve17, reject) => {
+        return new Promise((resolve18, reject) => {
           if (!stream)
             return reject();
           stream.once(STR_END, () => {
@@ -34124,7 +34321,7 @@ var init_handler2 = __esm({
               return;
             }
             const wasThrottled = throttler ? throttler.clear() : false;
-            resolve17(void 0);
+            resolve18(void 0);
             previous.getChildren().filter((item) => {
               return item !== directory && !current.has(item);
             }).forEach((item) => {
@@ -35215,10 +35412,75 @@ var init_provider_loader = __esm({
       }
       static GITHUB_TARBALL_URL = "https://github.com/vilmire/adhdev-providers/archive/refs/heads/main.tar.gz";
       static META_FILE = ".meta.json";
+      static REPO_PROVIDER_DIRNAME = "adhdev-providers";
+      static SIBLING_MARKER_FILE = ".adhdev-provider-root";
+      static SIBLING_ENV_VAR = "ADHDEV_USE_SIBLING_PROVIDERS";
+      probeStarts = [];
+      siblingLogged = false;
+      userDirSource = "home-default";
+      /** Process-level dedup for stderr sibling-adoption notices (shared across all ProviderLoader instances). */
+      static siblingStderrLogged = /* @__PURE__ */ new Set();
+      static looksLikeProviderRoot(candidate) {
+        try {
+          if (!fs6.existsSync(candidate) || !fs6.statSync(candidate).isDirectory()) return false;
+          return ["ide", "extension", "cli", "acp"].some(
+            (category) => fs6.existsSync(path14.join(candidate, category))
+          );
+        } catch {
+          return false;
+        }
+      }
+      static hasProviderRootMarker(candidate) {
+        try {
+          return fs6.existsSync(path14.join(candidate, _ProviderLoader.SIBLING_MARKER_FILE));
+        } catch {
+          return false;
+        }
+      }
+      detectDefaultUserDir() {
+        const fallback2 = path14.join(os16.homedir(), ".adhdev", "providers");
+        const envOptIn = process.env[_ProviderLoader.SIBLING_ENV_VAR] === "1";
+        const visited = /* @__PURE__ */ new Set();
+        for (const start of this.probeStarts) {
+          let current = path14.resolve(start);
+          while (!visited.has(current)) {
+            visited.add(current);
+            const siblingCandidate = path14.join(path14.dirname(current), _ProviderLoader.REPO_PROVIDER_DIRNAME);
+            if (_ProviderLoader.looksLikeProviderRoot(siblingCandidate)) {
+              const hasMarker = _ProviderLoader.hasProviderRootMarker(siblingCandidate);
+              if (envOptIn || hasMarker) {
+                const source = hasMarker ? "sibling-marker" : "sibling-env";
+                if (!this.siblingLogged) {
+                  this.log(`Using sibling provider checkout (${source}): ${siblingCandidate}`);
+                  this.siblingLogged = true;
+                }
+                if (!_ProviderLoader.siblingStderrLogged.has(siblingCandidate)) {
+                  _ProviderLoader.siblingStderrLogged.add(siblingCandidate);
+                  try {
+                    process.stderr.write(
+                      `[adhdev] Using sibling adhdev-providers checkout (${source}): ${siblingCandidate}
+`
+                    );
+                  } catch {
+                  }
+                }
+                return { path: siblingCandidate, source };
+              }
+            }
+            const parent = path14.dirname(current);
+            if (parent === current) break;
+            current = parent;
+          }
+        }
+        return { path: fallback2, source: "home-default" };
+      }
       constructor(options) {
         this.logFn = options?.logFn || LOG.forComponent("Provider").asLogFn();
+        this.probeStarts = options?.probeStarts ?? [process.cwd(), __dirname];
         this.defaultProvidersDir = path14.join(os16.homedir(), ".adhdev", "providers");
-        this.userDir = this.defaultProvidersDir;
+        const detected = this.detectDefaultUserDir();
+        this.userDir = detected.path;
+        this.userDirSource = detected.source;
         this.upstreamDir = path14.join(this.defaultProvidersDir, ".upstream");
         this.disableUpstream = false;
         this.applySourceConfig({
@@ -35256,6 +35518,7 @@ var init_provider_loader = __esm({
           disableUpstream: this.disableUpstream,
           explicitProviderDir: this.explicitProviderDir,
           userDir: this.userDir,
+          userDirSource: this.userDirSource,
           upstreamDir: this.upstreamDir,
           providerRoots: this.getProviderRoots()
         };
@@ -35266,7 +35529,14 @@ var init_provider_loader = __esm({
           this.explicitProviderDir = options.userDir?.trim() ? options.userDir : null;
         }
         this.sourceMode = nextSourceMode;
-        this.userDir = this.explicitProviderDir || this.defaultProvidersDir;
+        if (this.explicitProviderDir) {
+          this.userDir = this.explicitProviderDir;
+          this.userDirSource = "explicit";
+        } else {
+          const detected = this.detectDefaultUserDir();
+          this.userDir = detected.path;
+          this.userDirSource = detected.source;
+        }
         this.upstreamDir = path14.join(this.defaultProvidersDir, ".upstream");
         this.disableUpstream = this.sourceMode === "no-upstream";
         if (this.explicitProviderDir) {
@@ -35860,7 +36130,7 @@ var init_provider_loader = __esm({
           return { updated: false };
         }
         try {
-          const etag = await new Promise((resolve17, reject) => {
+          const etag = await new Promise((resolve18, reject) => {
             const options = {
               method: "HEAD",
               hostname: "github.com",
@@ -35878,7 +36148,7 @@ var init_provider_loader = __esm({
                   headers: { "User-Agent": "adhdev-launcher" },
                   timeout: 1e4
                 }, (res2) => {
-                  resolve17(res2.headers.etag || res2.headers["last-modified"] || "");
+                  resolve18(res2.headers.etag || res2.headers["last-modified"] || "");
                 });
                 req2.on("error", reject);
                 req2.on("timeout", () => {
@@ -35887,7 +36157,7 @@ var init_provider_loader = __esm({
                 });
                 req2.end();
               } else {
-                resolve17(res.headers.etag || res.headers["last-modified"] || "");
+                resolve18(res.headers.etag || res.headers["last-modified"] || "");
               }
             });
             req.on("error", reject);
@@ -35951,7 +36221,7 @@ var init_provider_loader = __esm({
       downloadFile(url2, destPath) {
         const https = require("https");
         const http3 = require("http");
-        return new Promise((resolve17, reject) => {
+        return new Promise((resolve18, reject) => {
           const doRequest = (reqUrl, redirectCount = 0) => {
             if (redirectCount > 5) {
               reject(new Error("Too many redirects"));
@@ -35971,7 +36241,7 @@ var init_provider_loader = __esm({
               res.pipe(ws);
               ws.on("finish", () => {
                 ws.close();
-                resolve17();
+                resolve18();
               });
               ws.on("error", reject);
             });
@@ -36447,17 +36717,17 @@ async function findFreePort(ports) {
   throw new Error("No free port found");
 }
 function checkPortFree(port) {
-  return new Promise((resolve17) => {
+  return new Promise((resolve18) => {
     const server = net2.createServer();
     server.unref();
-    server.on("error", () => resolve17(false));
+    server.on("error", () => resolve18(false));
     server.listen(port, "127.0.0.1", () => {
-      server.close(() => resolve17(true));
+      server.close(() => resolve18(true));
     });
   });
 }
 async function isCdpActive(port) {
-  return new Promise((resolve17) => {
+  return new Promise((resolve18) => {
     const req = require("http").get(`http://127.0.0.1:${port}/json/version`, {
       timeout: 2e3
     }, (res) => {
@@ -36466,16 +36736,16 @@ async function isCdpActive(port) {
       res.on("end", () => {
         try {
           const info = JSON.parse(data);
-          resolve17(!!info["WebKit-Version"] || !!info["Browser"]);
+          resolve18(!!info["WebKit-Version"] || !!info["Browser"]);
         } catch {
-          resolve17(false);
+          resolve18(false);
         }
       });
     });
-    req.on("error", () => resolve17(false));
+    req.on("error", () => resolve18(false));
     req.on("timeout", () => {
       req.destroy();
-      resolve17(false);
+      resolve18(false);
     });
   });
 }
@@ -37285,7 +37555,7 @@ async function waitForPidExit(pid, timeoutMs) {
   while (Date.now() - start < timeoutMs) {
     try {
       process.kill(pid, 0);
-      await new Promise((resolve17) => setTimeout(resolve17, 250));
+      await new Promise((resolve18) => setTimeout(resolve18, 250));
     } catch {
       return;
     }
@@ -37400,7 +37670,7 @@ async function runDaemonUpgradeHelper(payload) {
     appendUpgradeLog(installOutput.trim());
   }
   if (process.platform === "win32") {
-    await new Promise((resolve17) => setTimeout(resolve17, 500));
+    await new Promise((resolve18) => setTimeout(resolve18, 500));
     cleanupStaleGlobalInstallDirs(payload.packageName);
     appendUpgradeLog("Post-install staging cleanup complete");
   }
@@ -38808,7 +39078,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((resolve17) => setTimeout(resolve17, 250));
+          await new Promise((resolve18) => setTimeout(resolve18, 250));
           let state;
           try {
             state = await this.readChat(evaluate);
@@ -38830,7 +39100,7 @@ var init_provider_adapter = __esm({
         if (this.messageCount(first) > 0 || this.lastMessageSignature(first)) {
           return first;
         }
-        await new Promise((resolve17) => setTimeout(resolve17, 150));
+        await new Promise((resolve18) => setTimeout(resolve18, 150));
         const second = await this.readChat(evaluate);
         return this.messageCount(second) >= this.messageCount(first) ? second : first;
       }
@@ -38981,7 +39251,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((resolve17) => setTimeout(resolve17, 250));
+          await new Promise((resolve18) => setTimeout(resolve18, 250));
           const state = await this.readChat(evaluate);
           const title = this.getStateTitle(state);
           if (this.titlesMatch(title, sessionId)) return true;
@@ -41556,7 +41826,7 @@ function getCliTargetBundle(ctx, type, instanceId) {
   return { target, instance, adapter };
 }
 function sleep(ms) {
-  return new Promise((resolve17) => setTimeout(resolve17, ms));
+  return new Promise((resolve18) => setTimeout(resolve18, ms));
 }
 async function waitForCliReady(ctx, type, instanceId, timeoutMs) {
   const startedAt = Date.now();
@@ -43848,15 +44118,15 @@ var init_dev_server = __esm({
             this.json(res, 500, { error: e.message });
           }
         });
-        return new Promise((resolve17, reject) => {
+        return new Promise((resolve18, reject) => {
           this.server.listen(port, "127.0.0.1", () => {
             this.log(`Dev server listening on http://127.0.0.1:${port}`);
-            resolve17();
+            resolve18();
           });
           this.server.on("error", (e) => {
             if (e.code === "EADDRINUSE") {
               this.log(`Port ${port} in use, skipping dev server`);
-              resolve17();
+              resolve18();
             } else {
               reject(e);
             }
@@ -43938,20 +44208,20 @@ var init_dev_server = __esm({
           child.stderr?.on("data", (d) => {
             stderr += d.toString().slice(0, 2e3);
           });
-          await new Promise((resolve17) => {
+          await new Promise((resolve18) => {
             const timer = setTimeout(() => {
               child.kill();
-              resolve17();
+              resolve18();
             }, 3e3);
             child.on("exit", () => {
               clearTimeout(timer);
-              resolve17();
+              resolve18();
             });
             child.stdout?.once("data", () => {
               setTimeout(() => {
                 child.kill();
                 clearTimeout(timer);
-                resolve17();
+                resolve18();
               }, 500);
             });
           });
@@ -44467,14 +44737,14 @@ var init_dev_server = __esm({
           child.stderr?.on("data", (d) => {
             stderr += d.toString();
           });
-          await new Promise((resolve17) => {
+          await new Promise((resolve18) => {
             const timer = setTimeout(() => {
               child.kill();
-              resolve17();
+              resolve18();
             }, timeout);
             child.on("exit", () => {
               clearTimeout(timer);
-              resolve17();
+              resolve18();
             });
           });
           const elapsed = Date.now() - start;
@@ -45144,14 +45414,14 @@ data: ${JSON.stringify(msg.data)}
         res.end(JSON.stringify(data, null, 2));
       }
       async readBody(req) {
-        return new Promise((resolve17) => {
+        return new Promise((resolve18) => {
           let body = "";
           req.on("data", (chunk) => body += chunk);
           req.on("end", () => {
             try {
-              resolve17(JSON.parse(body));
+              resolve18(JSON.parse(body));
             } catch {
-              resolve17({});
+              resolve18({});
             }
           });
         });
@@ -45666,7 +45936,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((resolve17) => setTimeout(resolve17, STARTUP_POLL_MS));
+    await new Promise((resolve18) => setTimeout(resolve18, STARTUP_POLL_MS));
   }
   throw new Error(`Session host did not become ready within ${timeoutMs}ms`);
 }
@@ -45772,10 +46042,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((resolve17) => {
+        return new Promise((resolve18) => {
           const cmd = `"${ide.cliCommand}" --install-extension "${vsixPath}" --force`;
           (0, import_child_process10.exec)(cmd, { timeout: 6e4 }, (error48, _stdout, stderr) => {
-            resolve17({
+            resolve18({
               extensionId: extension.id,
               marketplaceId: extension.marketplaceId,
               success: !error48,
@@ -45788,11 +46058,11 @@ async function installExtension(ide, extension) {
     } catch (e) {
     }
   }
-  return new Promise((resolve17) => {
+  return new Promise((resolve18) => {
     const cmd = `"${ide.cliCommand}" --install-extension ${extension.marketplaceId} --force`;
     (0, import_child_process10.exec)(cmd, { timeout: 6e4 }, (error48, stdout, stderr) => {
       if (error48) {
-        resolve17({
+        resolve18({
           extensionId: extension.id,
           marketplaceId: extension.marketplaceId,
           success: false,
@@ -45800,7 +46070,7 @@ async function installExtension(ide, extension) {
           error: stderr || error48.message
         });
       } else {
-        resolve17({
+        resolve18({
           extensionId: extension.id,
           marketplaceId: extension.marketplaceId,
           success: true,
@@ -46464,7 +46734,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((resolve17, reject) => {
+  return new Promise((resolve18, reject) => {
     const wsUrl = `ws://127.0.0.1:${resolvedPort}${DAEMON_WS_PATH2 || "/daemon"}`;
     const ws = new WebSocket4(wsUrl);
     const requestId = `cli-${Date.now()}`;
@@ -46505,7 +46775,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();
-          resolve17(msg.payload?.result || msg.payload || msg);
+          resolve18(msg.payload?.result || msg.payload || msg);
         }
       } catch {
       }
@@ -46524,13 +46794,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((resolve17, reject) => {
+  const targets = await new Promise((resolve18, reject) => {
     http3.get(`http://127.0.0.1:${port}/json`, (res) => {
       let data = "";
       res.on("data", (c) => data += c);
       res.on("end", () => {
         try {
-          resolve17(JSON.parse(data));
+          resolve18(JSON.parse(data));
         } catch {
           reject(new Error("Invalid JSON"));
         }
@@ -46543,7 +46813,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((resolve17, reject) => {
+  return new Promise((resolve18, reject) => {
     const ws = new WebSocket4(target.webSocketDebuggerUrl);
     const timeout = setTimeout(() => {
       ws.close();
@@ -46565,11 +46835,11 @@ async function directCdpEval(expression, port = 9222) {
         clearTimeout(timeout);
         ws.close();
         if (msg.result?.result?.value !== void 0) {
-          resolve17(msg.result.result.value);
+          resolve18(msg.result.result.value);
         } else if (msg.result?.exceptionDetails) {
           reject(new Error(msg.result.exceptionDetails.text));
         } else {
-          resolve17(msg.result);
+          resolve18(msg.result);
         }
       }
     });
@@ -47105,14 +47375,14 @@ var require_run_async = __commonJS({
       return function() {
         var args = arguments;
         var originalThis = this;
-        var promise2 = new Promise(function(resolve17, reject) {
+        var promise2 = new Promise(function(resolve18, reject) {
           var resolved = false;
           const wrappedResolve = function(value) {
             if (resolved) {
               console.warn("Run-async promise already resolved.");
             }
             resolved = true;
-            resolve17(value);
+            resolve18(value);
           };
           var rejected = false;
           const wrappedReject = function(value) {
@@ -47903,7 +48173,7 @@ var require_Observable = __commonJS({
       Observable2.prototype.forEach = function(next, promiseCtor) {
         var _this = this;
         promiseCtor = getPromiseCtor(promiseCtor);
-        return new promiseCtor(function(resolve17, reject) {
+        return new promiseCtor(function(resolve18, reject) {
           var subscriber = new Subscriber_1.SafeSubscriber({
             next: function(value) {
               try {
@@ -47914,7 +48184,7 @@ var require_Observable = __commonJS({
               }
             },
             error: reject,
-            complete: resolve17
+            complete: resolve18
           });
           _this.subscribe(subscriber);
         });
@@ -47936,14 +48206,14 @@ var require_Observable = __commonJS({
       Observable2.prototype.toPromise = function(promiseCtor) {
         var _this = this;
         promiseCtor = getPromiseCtor(promiseCtor);
-        return new promiseCtor(function(resolve17, reject) {
+        return new promiseCtor(function(resolve18, reject) {
           var value;
           _this.subscribe(function(x) {
             return value = x;
           }, function(err) {
             return reject(err);
           }, function() {
-            return resolve17(value);
+            return resolve18(value);
           });
         });
       };
@@ -50039,11 +50309,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(resolve17) {
-          resolve17(value);
+        return value instanceof P ? value : new P(function(resolve18) {
+          resolve18(value);
         });
       }
-      return new (P || (P = Promise))(function(resolve17, reject) {
+      return new (P || (P = Promise))(function(resolve18, reject) {
         function fulfilled(value) {
           try {
             step(generator.next(value));
@@ -50059,7 +50329,7 @@ var require_innerFrom = __commonJS({
           }
         }
         function step(result) {
-          result.done ? resolve17(result.value) : adopt(result.value).then(fulfilled, rejected);
+          result.done ? resolve18(result.value) : adopt(result.value).then(fulfilled, rejected);
         }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
       });
@@ -50141,14 +50411,14 @@ var require_innerFrom = __commonJS({
       }, i);
       function verb(n) {
         i[n] = o[n] && function(v) {
-          return new Promise(function(resolve17, reject) {
-            v = o[n](v), settle(resolve17, reject, v.done, v.value);
+          return new Promise(function(resolve18, reject) {
+            v = o[n](v), settle(resolve18, reject, v.done, v.value);
           });
         };
       }
-      function settle(resolve17, reject, d, v) {
+      function settle(resolve18, reject, d, v) {
         Promise.resolve(v).then(function(v2) {
-          resolve17({ value: v2, done: d });
+          resolve18({ value: v2, done: d });
         }, reject);
       }
     };
@@ -50767,7 +51037,7 @@ var require_lastValueFrom = __commonJS({
     var EmptyError_1 = require_EmptyError();
     function lastValueFrom(source, config2) {
       var hasConfig = typeof config2 === "object";
-      return new Promise(function(resolve17, reject) {
+      return new Promise(function(resolve18, reject) {
         var _hasValue = false;
         var _value;
         source.subscribe({
@@ -50778,9 +51048,9 @@ var require_lastValueFrom = __commonJS({
           error: reject,
           complete: function() {
             if (_hasValue) {
-              resolve17(_value);
+              resolve18(_value);
             } else if (hasConfig) {
-              resolve17(config2.defaultValue);
+              resolve18(config2.defaultValue);
             } else {
               reject(new EmptyError_1.EmptyError());
             }
@@ -50802,16 +51072,16 @@ var require_firstValueFrom = __commonJS({
     var Subscriber_1 = require_Subscriber();
     function firstValueFrom(source, config2) {
       var hasConfig = typeof config2 === "object";
-      return new Promise(function(resolve17, reject) {
+      return new Promise(function(resolve18, reject) {
         var subscriber = new Subscriber_1.SafeSubscriber({
           next: function(value) {
-            resolve17(value);
+            resolve18(value);
             subscriber.unsubscribe();
           },
           error: reject,
           complete: function() {
             if (hasConfig) {
-              resolve17(config2.defaultValue);
+              resolve18(config2.defaultValue);
             } else {
               reject(new EmptyError_1.EmptyError());
             }
@@ -62617,14 +62887,14 @@ var require_async_iterator = __commonJS({
       };
     }
     function readAndResolve(iter) {
-      var resolve17 = iter[kLastResolve];
-      if (resolve17 !== null) {
+      var resolve18 = iter[kLastResolve];
+      if (resolve18 !== null) {
         var data = iter[kStream].read();
         if (data !== null) {
           iter[kLastPromise] = null;
           iter[kLastResolve] = null;
           iter[kLastReject] = null;
-          resolve17(createIterResult(data, false));
+          resolve18(createIterResult(data, false));
         }
       }
     }
@@ -62632,13 +62902,13 @@ var require_async_iterator = __commonJS({
       process.nextTick(readAndResolve, iter);
     }
     function wrapForNext(lastPromise, iter) {
-      return function(resolve17, reject) {
+      return function(resolve18, reject) {
         lastPromise.then(function() {
           if (iter[kEnded]) {
-            resolve17(createIterResult(void 0, true));
+            resolve18(createIterResult(void 0, true));
             return;
           }
-          iter[kHandlePromise](resolve17, reject);
+          iter[kHandlePromise](resolve18, reject);
         }, reject);
       };
     }
@@ -62658,12 +62928,12 @@ var require_async_iterator = __commonJS({
           return Promise.resolve(createIterResult(void 0, true));
         }
         if (this[kStream].destroyed) {
-          return new Promise(function(resolve17, reject) {
+          return new Promise(function(resolve18, reject) {
             process.nextTick(function() {
               if (_this[kError]) {
                 reject(_this[kError]);
               } else {
-                resolve17(createIterResult(void 0, true));
+                resolve18(createIterResult(void 0, true));
               }
             });
           });
@@ -62686,13 +62956,13 @@ var require_async_iterator = __commonJS({
       return this;
     }), _defineProperty(_Object$setPrototypeO, "return", function _return() {
       var _this2 = this;
-      return new Promise(function(resolve17, reject) {
+      return new Promise(function(resolve18, reject) {
         _this2[kStream].destroy(null, function(err) {
           if (err) {
             reject(err);
             return;
           }
-          resolve17(createIterResult(void 0, true));
+          resolve18(createIterResult(void 0, true));
         });
       });
     }), _Object$setPrototypeO), AsyncIteratorPrototype);
@@ -62714,15 +62984,15 @@ var require_async_iterator = __commonJS({
         value: stream._readableState.endEmitted,
         writable: true
       }), _defineProperty(_Object$create, kHandlePromise, {
-        value: function value(resolve17, reject) {
+        value: function value(resolve18, reject) {
           var data = iterator[kStream].read();
           if (data) {
             iterator[kLastPromise] = null;
             iterator[kLastResolve] = null;
             iterator[kLastReject] = null;
-            resolve17(createIterResult(data, false));
+            resolve18(createIterResult(data, false));
           } else {
-            iterator[kLastResolve] = resolve17;
+            iterator[kLastResolve] = resolve18;
             iterator[kLastReject] = reject;
           }
         },
@@ -62741,12 +63011,12 @@ var require_async_iterator = __commonJS({
           iterator[kError] = err;
           return;
         }
-        var resolve17 = iterator[kLastResolve];
-        if (resolve17 !== null) {
+        var resolve18 = iterator[kLastResolve];
+        if (resolve18 !== null) {
           iterator[kLastPromise] = null;
           iterator[kLastResolve] = null;
           iterator[kLastReject] = null;
-          resolve17(createIterResult(void 0, true));
+          resolve18(createIterResult(void 0, true));
         }
         iterator[kEnded] = true;
       });
@@ -62761,7 +63031,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, resolve17, reject, _next, _throw, key, arg) {
+    function asyncGeneratorStep(gen, resolve18, reject, _next, _throw, key, arg) {
       try {
         var info = gen[key](arg);
         var value = info.value;
@@ -62770,7 +63040,7 @@ var require_from2 = __commonJS({
         return;
       }
       if (info.done) {
-        resolve17(value);
+        resolve18(value);
       } else {
         Promise.resolve(value).then(_next, _throw);
       }
@@ -62778,13 +63048,13 @@ var require_from2 = __commonJS({
     function _asyncToGenerator(fn) {
       return function() {
         var self2 = this, args = arguments;
-        return new Promise(function(resolve17, reject) {
+        return new Promise(function(resolve18, reject) {
           var gen = fn.apply(self2, args);
           function _next(value) {
-            asyncGeneratorStep(gen, resolve17, reject, _next, _throw, "next", value);
+            asyncGeneratorStep(gen, resolve18, reject, _next, _throw, "next", value);
           }
           function _throw(err) {
-            asyncGeneratorStep(gen, resolve17, reject, _next, _throw, "throw", err);
+            asyncGeneratorStep(gen, resolve18, reject, _next, _throw, "throw", err);
           }
           _next(void 0);
         });
@@ -64723,9 +64993,9 @@ var init_base = __esm({
        * @return {Promise}
        */
       run() {
-        return new Promise((resolve17, reject) => {
+        return new Promise((resolve18, reject) => {
           this._run(
-            (value) => resolve17(value),
+            (value) => resolve18(value),
             (error48) => reject(error48)
           );
         });
@@ -71357,7 +71627,7 @@ var require_lib = __commonJS({
       return matches;
     };
     exports2.analyse = analyse;
-    var detectFile = (filepath, opts = {}) => new Promise((resolve17, reject) => {
+    var detectFile = (filepath, opts = {}) => new Promise((resolve18, reject) => {
       let fd;
       const fs27 = (0, node_1.default)();
       const handler = (err, buffer) => {
@@ -71367,7 +71637,7 @@ var require_lib = __commonJS({
         if (err) {
           reject(err);
         } else if (buffer) {
-          resolve17((0, exports2.detect)(buffer));
+          resolve18((0, exports2.detect)(buffer));
         } else {
           reject(new Error("No error and no buffer received"));
         }
@@ -77612,14 +77882,14 @@ var init_open = __esm({
       }
       const subprocess = import_node_child_process5.default.spawn(command, cliArguments, childProcessOptions);
       if (options.wait) {
-        return new Promise((resolve17, reject) => {
+        return new Promise((resolve18, reject) => {
           subprocess.once("error", reject);
           subprocess.once("close", (exitCode) => {
             if (!options.allowNonzeroExitCode && exitCode > 0) {
               reject(new Error(`Exited with code ${exitCode}`));
               return;
             }
-            resolve17(subprocess);
+            resolve18(subprocess);
           });
         });
       }
@@ -79199,14 +79469,14 @@ var require_filesystem = __commonJS({
       });
       return buffer.subarray(0, bytesRead);
     };
-    var readFile = (path35) => new Promise((resolve17, reject) => {
+    var readFile = (path35) => new Promise((resolve18, reject) => {
       fs27.open(path35, "r", (err, fd) => {
         if (err) {
           reject(err);
         } else {
           const buffer = Buffer.alloc(MAX_LENGTH);
           fs27.read(fd, buffer, 0, MAX_LENGTH, 0, (_2, bytesRead) => {
-            resolve17(buffer.subarray(0, bytesRead));
+            resolve18(buffer.subarray(0, bytesRead));
             fs27.close(fd, () => {
             });
           });
@@ -79274,10 +79544,10 @@ var require_detect_libc = __commonJS({
     var commandOut = "";
     var safeCommand = () => {
       if (!commandOut) {
-        return new Promise((resolve17) => {
+        return new Promise((resolve18) => {
           childProcess2.exec(command, (err, out) => {
             commandOut = err ? " " : out;
-            resolve17(commandOut);
+            resolve18(commandOut);
           });
         });
       }
@@ -81957,14 +82227,14 @@ var require_input = __commonJS({
         return this;
       } else {
         if (this._isStreamInput()) {
-          return new Promise((resolve17, reject) => {
+          return new Promise((resolve18, reject) => {
             const finished = () => {
               this._flattenBufferIn();
               sharp.metadata(this.options, (err, metadata2) => {
                 if (err) {
                   reject(is.nativeError(err, stack));
                 } else {
-                  resolve17(metadata2);
+                  resolve18(metadata2);
                 }
               });
             };
@@ -81975,12 +82245,12 @@ var require_input = __commonJS({
             }
           });
         } else {
-          return new Promise((resolve17, reject) => {
+          return new Promise((resolve18, reject) => {
             sharp.metadata(this.options, (err, metadata2) => {
               if (err) {
                 reject(is.nativeError(err, stack));
               } else {
-                resolve17(metadata2);
+                resolve18(metadata2);
               }
             });
           });
@@ -82013,25 +82283,25 @@ var require_input = __commonJS({
         return this;
       } else {
         if (this._isStreamInput()) {
-          return new Promise((resolve17, reject) => {
+          return new Promise((resolve18, reject) => {
             this.on("finish", function() {
               this._flattenBufferIn();
               sharp.stats(this.options, (err, stats2) => {
                 if (err) {
                   reject(is.nativeError(err, stack));
                 } else {
-                  resolve17(stats2);
+                  resolve18(stats2);
                 }
               });
             });
           });
         } else {
-          return new Promise((resolve17, reject) => {
+          return new Promise((resolve18, reject) => {
             sharp.stats(this.options, (err, stats2) => {
               if (err) {
                 reject(is.nativeError(err, stack));
               } else {
-                resolve17(stats2);
+                resolve18(stats2);
               }
             });
           });
@@ -85453,7 +85723,7 @@ var require_output = __commonJS({
         return this;
       } else {
         if (this._isStreamInput()) {
-          return new Promise((resolve17, reject) => {
+          return new Promise((resolve18, reject) => {
             this.once("finish", () => {
               this._flattenBufferIn();
               sharp.pipeline(this.options, (err, data, info) => {
@@ -85461,24 +85731,24 @@ var require_output = __commonJS({
                   reject(is.nativeError(err, stack));
                 } else {
                   if (this.options.resolveWithObject) {
-                    resolve17({ data, info });
+                    resolve18({ data, info });
                   } else {
-                    resolve17(data);
+                    resolve18(data);
                   }
                 }
               });
             });
           });
         } else {
-          return new Promise((resolve17, reject) => {
+          return new Promise((resolve18, reject) => {
             sharp.pipeline(this.options, (err, data, info) => {
               if (err) {
                 reject(is.nativeError(err, stack));
               } else {
                 if (this.options.resolveWithObject) {
-                  resolve17({ data, info });
+                  resolve18({ data, info });
                 } else {
-                  resolve17(data);
+                  resolve18(data);
                 }
               }
             });
@@ -86532,7 +86802,7 @@ var init_adhdev_daemon = __esm({
     init_version();
     init_src();
     init_runtime_defaults();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.8.93" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.8.95" });
     AdhdevDaemon = class _AdhdevDaemon {
       localHttpServer = null;
       localWss = null;
@@ -87376,7 +87646,7 @@ ${err?.stack || ""}`);
             this.localWss.emit("connection", ws, req);
           });
         });
-        await new Promise((resolve17, reject) => {
+        await new Promise((resolve18, reject) => {
           const cleanup = () => {
             this.localHttpServer?.off("error", onError);
             this.localHttpServer?.off("listening", onListening);
@@ -87387,7 +87657,7 @@ ${err?.stack || ""}`);
           };
           const onListening = () => {
             cleanup();
-            resolve17();
+            resolve18();
           };
           this.localHttpServer.once("error", onError);
           this.localHttpServer.once("listening", onListening);
@@ -87547,12 +87817,12 @@ ${err?.stack || ""}`);
           this.localClients.clear();
           this.localWss?.close();
           this.localWss = null;
-          await new Promise((resolve17) => {
+          await new Promise((resolve18) => {
             if (!this.localHttpServer) {
-              resolve17();
+              resolve18();
               return;
             }
-            this.localHttpServer.close(() => resolve17());
+            this.localHttpServer.close(() => resolve18());
             this.localHttpServer = null;
           });
         } catch {
@@ -89003,11 +89273,25 @@ init_source();
 init_src();
 
 // src/cli/provider-source-status.ts
+function describeUserDirSource(source) {
+  switch (source) {
+    case "sibling-env":
+      return " (auto-adopted sibling checkout via ADHDEV_USE_SIBLING_PROVIDERS=1)";
+    case "sibling-marker":
+      return " (auto-adopted sibling checkout via .adhdev-provider-root marker)";
+    case "explicit":
+      return " (from config.providerDir)";
+    case "home-default":
+    case void 0:
+      return "";
+  }
+}
 function buildProviderSourceStatusLines(config2) {
+  const sourceSuffix = describeUserDirSource(config2.userDirSource);
   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}`,
+    `Explicit providerDir: ${config2.explicitProviderDir || `default (${config2.userDir})`}`,
+    `Effective user root: ${config2.userDir}${sourceSuffix}`,
     `Upstream root: ${config2.upstreamDir}`,
     `Provider roots: ${config2.providerRoots.join(" -> ")}`
   ];
@@ -89867,6 +90151,20 @@ function buildRuntimeOpenLaunchSpec(options) {
   return spec;
 }
 
+// src/cli/provider-loader-factory.ts
+async function createConfiguredProviderLoader(options = {}) {
+  const { ProviderLoader: ProviderLoader2, loadConfig: loadConfig2 } = await Promise.resolve().then(() => (init_src(), src_exports));
+  const config2 = loadConfig2();
+  const loader = new ProviderLoader2({
+    logFn: options.silent === false ? void 0 : () => {
+    },
+    userDir: config2.providerDir,
+    sourceMode: config2.providerSourceMode
+  });
+  if (options.load) loader.loadAll();
+  return loader;
+}
+
 // src/cli/debug-trace-cli.ts
 function normalizeOptionalFilter(value) {
   if (typeof value !== "string") return void 0;
@@ -89980,14 +90278,14 @@ async function requestSessionHostDirect(request) {
 }
 async function runRuntimeLaunchSpec(spec) {
   const { spawn: spawn6 } = await import("child_process");
-  return await new Promise((resolve17, reject) => {
+  return await new Promise((resolve18, 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) => resolve17(code ?? 0));
+    child.on("exit", (code) => resolve18(code ?? 0));
   });
 }
 async function resolveRuntimeSessionId(target, options) {
@@ -90221,7 +90519,7 @@ async function handleTraceCommand(options) {
       }
     }
     while (!stopped) {
-      await new Promise((resolve17) => setTimeout(resolve17, intervalMs));
+      await new Promise((resolve18) => setTimeout(resolve18, intervalMs));
       if (stopped) break;
       const nextTrace = await fetchTrace(buildDebugTraceFollowPollArgs(baseArgs, cursor));
       const nextBatch = collectFreshDebugTraceEntries(nextTrace, cursor);
@@ -90344,17 +90642,11 @@ function registerDaemonCommands(program2, pkgVersion3) {
   }));
   hideCommand(program2.command("daemon:status").description("Check ADHDev Daemon status").option("-p, --port <port>", "Local WS server port", DEFAULT_DAEMON_PORT_TEXT).action(async (options) => {
     const { isDaemonRunning: isDaemonRunning2, getDaemonPid: getDaemonPid2 } = await Promise.resolve().then(() => (init_adhdev_daemon(), adhdev_daemon_exports));
-    const { getCurrentDaemonLogPath: getCurrentDaemonLogPath2 } = await Promise.resolve().then(() => (init_src(), src_exports));
+    const { getCurrentDaemonLogPath: getCurrentDaemonLogPath2, loadConfig: loadConfig2 } = 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) || DEFAULT_DAEMON_PORT;
-    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
-    });
+    const providerLoader = await createConfiguredProviderLoader();
     if (isDaemonRunning2({ port })) {
       console.log(source_default.green(`
   \u2713 ADHDev Daemon is running.
@@ -91370,7 +91662,7 @@ function registerDoctorCommands(program2, pkgVersion3) {
     } catch {
     }
     try {
-      const providerLoader = new ProviderLoader();
+      const providerLoader = await createConfiguredProviderLoader({ load: true });
       const cliResults = await detectCLIs(providerLoader);
       for (const cli of cliResults) {
         checks.push({
@@ -91590,15 +91882,8 @@ function hideCommand2(command) {
   command.hideHelp?.();
   return command;
 }
-async function createConfiguredProviderLoader() {
-  const { ProviderLoader: ProviderLoader2, loadConfig: loadConfig2 } = await Promise.resolve().then(() => (init_src(), src_exports));
-  const config2 = loadConfig2();
-  const loader = new ProviderLoader2({
-    userDir: config2.providerDir,
-    sourceMode: config2.providerSourceMode
-  });
-  loader.loadAll();
-  return loader;
+async function createConfiguredProviderLoader2() {
+  return createConfiguredProviderLoader({ silent: false, load: true });
 }
 function getProviderSourceCandidatePaths(options) {
   const relativeNames = ["provider.json", "scripts.js", "provider.js"];
@@ -91615,7 +91900,7 @@ 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) => {
     try {
-      const loader = await createConfiguredProviderLoader();
+      const loader = await createConfiguredProviderLoader2();
       const providers = loader.getAll();
       if (options.json) {
         console.log(JSON.stringify(providers.map((p) => ({
@@ -91667,7 +91952,7 @@ function registerProviderCommands(program2) {
     } catch {
       try {
         const http3 = await import("http");
-        const result = await new Promise((resolve17, reject) => {
+        const result = await new Promise((resolve18, reject) => {
           const req = http3.request({
             hostname: "127.0.0.1",
             port: DEV_SERVER_PORT3,
@@ -91679,9 +91964,9 @@ function registerProviderCommands(program2) {
             res.on("data", (c) => data += c);
             res.on("end", () => {
               try {
-                resolve17(JSON.parse(data));
+                resolve18(JSON.parse(data));
               } catch {
-                resolve17({ raw: data });
+                resolve18({ raw: data });
               }
             });
           });
@@ -91783,12 +92068,12 @@ function registerProviderCommands(program2) {
               console.log(source_default.yellow("Invalid port number."));
               continue;
             }
-            const isFree = await new Promise((resolve17) => {
+            const isFree = await new Promise((resolve18) => {
               const server = net3.createServer();
               server.unref();
-              server.on("error", () => resolve17(false));
+              server.on("error", () => resolve18(false));
               server.listen(port, "127.0.0.1", () => {
-                server.close(() => resolve17(true));
+                server.close(() => resolve18(true));
               });
             });
             if (!isFree) {
@@ -91803,7 +92088,7 @@ function registerProviderCommands(program2) {
       rl.close();
       const location = options.builtin ? "builtin" : "user";
       const http3 = await import("http");
-      const result = await new Promise((resolve17, reject) => {
+      const result = await new Promise((resolve18, reject) => {
         const postData = JSON.stringify({ type, name, category, location, cdpPorts, osPaths, processNames });
         const req = http3.request({
           hostname: "127.0.0.1",
@@ -91816,9 +92101,9 @@ function registerProviderCommands(program2) {
           res.on("data", (c) => data += c);
           res.on("end", () => {
             try {
-              resolve17(JSON.parse(data));
+              resolve18(JSON.parse(data));
             } catch {
-              resolve17({ raw: data });
+              resolve18({ raw: data });
             }
           });
         });
@@ -91828,7 +92113,7 @@ function registerProviderCommands(program2) {
       }).catch(async () => {
         const pathMod = await import("path");
         const fsMod = await import("fs");
-        const loader = await createConfiguredProviderLoader();
+        const loader = await createConfiguredProviderLoader2();
         let targetDir = location === "builtin" ? loader.getUpstreamProviderDir(category, type) : loader.getUserProviderDir(category, type);
         if (fsMod.existsSync(targetDir)) return { error: `Provider already exists at ${targetDir}` };
         const isExt = category === "extension";
@@ -91881,7 +92166,7 @@ function registerProviderCommands(program2) {
     try {
       const http3 = await import("http");
       const inquirer2 = (await Promise.resolve().then(() => (init_lib(), lib_exports))).default;
-      const loader = await createConfiguredProviderLoader();
+      const loader = await createConfiguredProviderLoader2();
       const allProviders = loader.getAll();
       const fsMod = await import("fs");
       const isUserProvider = (p) => {
@@ -92012,7 +92297,7 @@ function registerProviderCommands(program2) {
           reference,
           ...verification ? { verification } : {}
         });
-        const startResult = await new Promise((resolve17, reject) => {
+        const startResult = await new Promise((resolve18, reject) => {
           const req = http3.request({
             hostname: "127.0.0.1",
             port: DEV_SERVER_PORT3,
@@ -92024,9 +92309,9 @@ function registerProviderCommands(program2) {
             res.on("data", (c) => data += c);
             res.on("end", () => {
               try {
-                resolve17(JSON.parse(data));
+                resolve18(JSON.parse(data));
               } catch {
-                resolve17({ raw: data });
+                resolve18({ raw: data });
               }
             });
           });
@@ -92060,7 +92345,7 @@ function registerProviderCommands(program2) {
         fsMock.writeFileSync(logFile, `=== Auto-Impl Started ===
 `);
         console.log(source_default.gray(`  Agent logs: ${logFile}`));
-        await new Promise((resolve17, reject) => {
+        await new Promise((resolve18, reject) => {
           http3.get(`http://127.0.0.1:${DEV_SERVER_PORT3}${startResult.sseUrl}`, (res) => {
             let buffer = "";
             res.on("data", (chunk) => {
@@ -92097,7 +92382,7 @@ function registerProviderCommands(program2) {
                     if (currentData.success === false) {
                       reject(new Error(`Agent failed to implement scripts properly (exit: ${currentData.exitCode})`));
                     } else {
-                      resolve17();
+                      resolve18();
                     }
                   } else if (currentEvent === "error") {
                     fsMock.appendFileSync(logFile, `
@@ -92108,7 +92393,7 @@ function registerProviderCommands(program2) {
                 }
               }
             });
-            res.on("end", resolve17);
+            res.on("end", resolve18);
           }).on("error", reject);
         });
         console.log(source_default.green(`
@@ -92167,7 +92452,7 @@ function registerProviderCommands(program2) {
         ideType: type,
         params: options.param ? { text: options.param, sessionId: options.param, buttonText: options.param } : {}
       });
-      const result = await new Promise((resolve17, reject) => {
+      const result = await new Promise((resolve18, reject) => {
         const req = http3.request({
           hostname: "127.0.0.1",
           port: DEV_SERVER_PORT3,
@@ -92179,9 +92464,9 @@ function registerProviderCommands(program2) {
           res.on("data", (c) => data += c);
           res.on("end", () => {
             try {
-              resolve17(JSON.parse(data));
+              resolve18(JSON.parse(data));
             } catch {
-              resolve17({ raw: data });
+              resolve18({ raw: data });
             }
           });
         });
@@ -92217,15 +92502,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((resolve17, reject) => {
+      const result = await new Promise((resolve18, reject) => {
         http3.get(`http://127.0.0.1:${DEV_SERVER_PORT3}/api/providers/${type}/source`, (res) => {
           let data = "";
           res.on("data", (c) => data += c);
           res.on("end", () => {
             try {
-              resolve17(JSON.parse(data));
+              resolve18(JSON.parse(data));
             } catch {
-              resolve17({ raw: data });
+              resolve18({ raw: data });
             }
           });
         }).on("error", () => {
@@ -92234,7 +92519,7 @@ function registerProviderCommands(program2) {
       }).catch(async () => {
         const pathMod = await import("path");
         const fsMod = await import("fs");
-        const loader = await createConfiguredProviderLoader();
+        const loader = await createConfiguredProviderLoader2();
         const providerMeta = loader.getMeta(type);
         if (!providerMeta) {
           return { error: `Provider '${type}' not found` };
@@ -92273,7 +92558,7 @@ function registerProviderCommands(program2) {
     try {
       const http3 = await import("http");
       const postData = JSON.stringify({ script: "readChat", params: {} });
-      const result = await new Promise((resolve17, reject) => {
+      const result = await new Promise((resolve18, reject) => {
         const req = http3.request({
           hostname: "127.0.0.1",
           port: DEV_SERVER_PORT3,
@@ -92285,9 +92570,9 @@ function registerProviderCommands(program2) {
           res2.on("data", (c) => data += c);
           res2.on("end", () => {
             try {
-              resolve17(JSON.parse(data));
+              resolve18(JSON.parse(data));
             } catch {
-              resolve17({ raw: data });
+              resolve18({ raw: data });
             }
           });
         });
@@ -92528,13 +92813,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((resolve17, reject) => {
+      const targets = await new Promise((resolve18, reject) => {
         http3.get(`http://127.0.0.1:${options.port}/json`, (res) => {
           let data = "";
           res.on("data", (c) => data += c);
           res.on("end", () => {
             try {
-              resolve17(JSON.parse(data));
+              resolve18(JSON.parse(data));
             } catch {
               reject(new Error("Invalid JSON"));
             }
@@ -92548,7 +92833,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((resolve17, reject) => {
+      await new Promise((resolve18, reject) => {
         ws.on("open", () => {
           ws.send(JSON.stringify({ id: 1, method: "Page.captureScreenshot", params: { format: "jpeg", quality: 50 } }));
         });
@@ -92561,7 +92846,7 @@ function registerCdpCommands(program2) {
   \u2713 Screenshot saved to ${options.output}
 `));
             ws.close();
-            resolve17();
+            resolve18();
           }
         });
         ws.on("error", (e) => reject(e));