@adhdev/daemon-standalone 0.8.93 → 0.8.94

package/dist/index.js

@@ -30353,7 +30353,7 @@ var require_dist2 = __commonJS({
                   `[${this.cliType}] Waiting for interactive prompt: hasPrompt=${hasPrompt} stableMs=${stableMs} recentOutputMs=${recentlyOutput} status=${status} startup=${startupLikelyActive} screen=${JSON.stringify(summarizeCliTraceText(screenText, 220)).slice(0, 260)}`
                 );
               }
-              await new Promise((resolve11) => setTimeout(resolve11, 50));
+              await new Promise((resolve12) => setTimeout(resolve12, 50));
             }
             const finalScreenText = this.terminalScreen.getText() || "";
             LOG2.warn(
@@ -30941,7 +30941,7 @@ var require_dist2 = __commonJS({
           }
           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;
           }
@@ -30949,12 +30949,24 @@ var require_dist2 = __commonJS({
           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
             };
@@ -30990,6 +31002,15 @@ var require_dist2 = __commonJS({
               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();
             }
@@ -31194,7 +31215,7 @@ ${data.message || ""}`.trim();
               const deadline = Date.now() + 1e4;
               while (this.startupParseGate && Date.now() < deadline) {
                 this.resolveStartupState("send_wait");
-                await new Promise((resolve11) => setTimeout(resolve11, 50));
+                await new Promise((resolve12) => setTimeout(resolve12, 50));
               }
             }
             if (!allowInterventionPrompt) {
@@ -31286,12 +31307,12 @@ ${data.message || ""}`.trim();
                 if (this.isWaitingForResponse) this.finishResponse();
               }, this.timeouts.maxResponse);
             };
-            await new Promise((resolve11) => {
+            await new Promise((resolve12) => {
               let resolved = false;
               const resolveOnce = () => {
                 if (resolved) return;
                 resolved = true;
-                resolve11();
+                resolve12();
               };
               const submit = () => {
                 if (!this.ptyProcess) {
@@ -31465,17 +31486,17 @@ ${data.message || ""}`.trim();
             }
           }
           waitForStopped(timeoutMs) {
-            return new Promise((resolve11) => {
+            return new Promise((resolve12) => {
               const startedAt = Date.now();
               const timer = setInterval(() => {
                 if (!this.ptyProcess || this.currentStatus === "stopped") {
                   clearInterval(timer);
-                  resolve11(true);
+                  resolve12(true);
                   return;
                 }
                 if (Date.now() - startedAt >= timeoutMs) {
                   clearInterval(timer);
-                  resolve11(false);
+                  resolve12(false);
                 }
               }, 100);
             });
@@ -31640,7 +31661,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", {
@@ -32580,15 +32616,15 @@ ${data.message || ""}`.trim();
       return null;
     }
     function execAsync(cmd, timeoutMs = 5e3) {
-      return new Promise((resolve11) => {
+      return new Promise((resolve12) => {
         const child = (0, import_child_process2.exec)(cmd, { encoding: "utf-8", timeout: timeoutMs }, (err, stdout) => {
           if (err || !stdout?.trim()) {
-            resolve11(null);
+            resolve12(null);
           } else {
-            resolve11(stdout.trim());
+            resolve12(stdout.trim());
           }
         });
-        child.on("error", () => resolve11(null));
+        child.on("error", () => resolve12(null));
       });
     }
     async function detectCLIs(providerLoader, options) {
@@ -32940,7 +32976,7 @@ ${data.message || ""}`.trim();
       * Returns multiple entries if multiple IDE windows are open on same port
       */
       static listAllTargets(port) {
-        return new Promise((resolve11) => {
+        return new Promise((resolve12) => {
           const req = http.get(`http://127.0.0.1:${port}/json`, (res) => {
             let data = "";
             res.on("data", (chunk) => data += chunk.toString());
@@ -32956,16 +32992,16 @@ ${data.message || ""}`.trim();
                   (t) => !isNonMain(t.title || "") && t.url?.includes("workbench.html") && !t.url?.includes("agent")
                 );
                 const fallbackPages = pages.filter((t) => !isNonMain(t.title || ""));
-                resolve11(mainPages.length > 0 ? mainPages : fallbackPages);
+                resolve12(mainPages.length > 0 ? mainPages : fallbackPages);
               } catch {
-                resolve11([]);
+                resolve12([]);
               }
             });
           });
-          req.on("error", () => resolve11([]));
+          req.on("error", () => resolve12([]));
           req.setTimeout(2e3, () => {
             req.destroy();
-            resolve11([]);
+            resolve12([]);
           });
         });
       }
@@ -33005,7 +33041,7 @@ ${data.message || ""}`.trim();
         }
       }
       findTargetOnPort(port) {
-        return new Promise((resolve11) => {
+        return new Promise((resolve12) => {
           const req = http.get(`http://127.0.0.1:${port}/json`, (res) => {
             let data = "";
             res.on("data", (chunk) => data += chunk.toString());
@@ -33016,7 +33052,7 @@ ${data.message || ""}`.trim();
                   (t) => (t.type === "page" || t.type === "browser" || t.type === "Page") && t.webSocketDebuggerUrl
                 );
                 if (pages.length === 0) {
-                  resolve11(targets.find((t) => t.webSocketDebuggerUrl) || null);
+                  resolve12(targets.find((t) => t.webSocketDebuggerUrl) || null);
                   return;
                 }
                 const titleFilteredPages = pages.filter((t) => !this.isNonMainTitle(t.title || ""));
@@ -33035,25 +33071,25 @@ ${data.message || ""}`.trim();
                     this._targetId = selected.target.id;
                   }
                   this._pageTitle = selected.target.title || "";
-                  resolve11(selected.target);
+                  resolve12(selected.target);
                   return;
                 }
                 if (previousTargetId) {
                   this.log(`[CDP] Target ${previousTargetId} not found in page list`);
-                  resolve11(null);
+                  resolve12(null);
                   return;
                 }
                 this._pageTitle = list[0]?.title || "";
-                resolve11(list[0]);
+                resolve12(list[0]);
               } catch {
-                resolve11(null);
+                resolve12(null);
               }
             });
           });
-          req.on("error", () => resolve11(null));
+          req.on("error", () => resolve12(null));
           req.setTimeout(2e3, () => {
             req.destroy();
-            resolve11(null);
+            resolve12(null);
           });
         });
       }
@@ -33064,7 +33100,7 @@ ${data.message || ""}`.trim();
         this.extensionProviders = providers;
       }
       connectToTarget(wsUrl) {
-        return new Promise((resolve11) => {
+        return new Promise((resolve12) => {
           this.ws = new import_ws2.default(wsUrl);
           this.ws.on("open", async () => {
             this._connected = true;
@@ -33074,17 +33110,17 @@ ${data.message || ""}`.trim();
             }
             this.connectBrowserWs().catch(() => {
             });
-            resolve11(true);
+            resolve12(true);
           });
           this.ws.on("message", (data) => {
             try {
               const msg = JSON.parse(data.toString());
               if (msg.id && this.pending.has(msg.id)) {
-                const { resolve: resolve12, reject } = this.pending.get(msg.id);
+                const { resolve: resolve13, reject } = this.pending.get(msg.id);
                 this.pending.delete(msg.id);
                 this.failureCount = 0;
                 if (msg.error) reject(new Error(msg.error.message));
-                else resolve12(msg.result);
+                else resolve13(msg.result);
               } else if (msg.method === "Runtime.executionContextCreated") {
                 this.contexts.add(msg.params.context.id);
               } else if (msg.method === "Runtime.executionContextDestroyed") {
@@ -33107,7 +33143,7 @@ ${data.message || ""}`.trim();
           this.ws.on("error", (err) => {
             this.log(`[CDP] WebSocket error: ${err.message}`);
             this._connected = false;
-            resolve11(false);
+            resolve12(false);
           });
         });
       }
@@ -33121,7 +33157,7 @@ ${data.message || ""}`.trim();
             return;
           }
           this.log(`[CDP] Connecting browser WS for target discovery...`);
-          await new Promise((resolve11, reject) => {
+          await new Promise((resolve12, reject) => {
             this.browserWs = new import_ws2.default(browserWsUrl);
             this.browserWs.on("open", async () => {
               this._browserConnected = true;
@@ -33131,16 +33167,16 @@ ${data.message || ""}`.trim();
               } catch (e) {
                 this.log(`[CDP] setDiscoverTargets failed: ${e.message}`);
               }
-              resolve11();
+              resolve12();
             });
             this.browserWs.on("message", (data) => {
               try {
                 const msg = JSON.parse(data.toString());
                 if (msg.id && this.browserPending.has(msg.id)) {
-                  const { resolve: resolve12, reject: reject2 } = this.browserPending.get(msg.id);
+                  const { resolve: resolve13, reject: reject2 } = this.browserPending.get(msg.id);
                   this.browserPending.delete(msg.id);
                   if (msg.error) reject2(new Error(msg.error.message));
-                  else resolve12(msg.result);
+                  else resolve13(msg.result);
                 }
               } catch {
               }
@@ -33160,31 +33196,31 @@ ${data.message || ""}`.trim();
         }
       }
       getBrowserWsUrl() {
-        return new Promise((resolve11) => {
+        return new Promise((resolve12) => {
           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);
-                resolve11(info.webSocketDebuggerUrl || null);
+                resolve12(info.webSocketDebuggerUrl || null);
               } catch {
-                resolve11(null);
+                resolve12(null);
               }
             });
           });
-          req.on("error", () => resolve11(null));
+          req.on("error", () => resolve12(null));
           req.setTimeout(3e3, () => {
             req.destroy();
-            resolve11(null);
+            resolve12(null);
           });
         });
       }
       sendBrowser(method, params = {}, timeoutMs = 15e3) {
-        return new Promise((resolve11, reject) => {
+        return new Promise((resolve12, reject) => {
           if (!this.browserWs || !this._browserConnected) return reject(new Error("Browser WS not connected"));
           const id = this.browserMsgId++;
-          this.browserPending.set(id, { resolve: resolve11, reject });
+          this.browserPending.set(id, { resolve: resolve12, reject });
           this.browserWs.send(JSON.stringify({ id, method, params }));
           setTimeout(() => {
             if (this.browserPending.has(id)) {
@@ -33224,11 +33260,11 @@ ${data.message || ""}`.trim();
       }
       // ─── CDP Protocol ────────────────────────────────────────
       sendInternal(method, params = {}, timeoutMs = 15e3) {
-        return new Promise((resolve11, reject) => {
+        return new Promise((resolve12, reject) => {
           if (!this.ws || !this._connected) return reject(new Error("CDP not connected"));
           if (this.ws.readyState !== import_ws2.default.OPEN) return reject(new Error("WebSocket not open"));
           const id = this.msgId++;
-          this.pending.set(id, { resolve: resolve11, reject });
+          this.pending.set(id, { resolve: resolve12, reject });
           this.ws.send(JSON.stringify({ id, method, params }));
           setTimeout(() => {
             if (this.pending.has(id)) {
@@ -33477,7 +33513,7 @@ ${data.message || ""}`.trim();
         const browserWs = this.browserWs;
         let msgId = this.browserMsgId;
         const sendWs = (method, params = {}, sessionId) => {
-          return new Promise((resolve11, reject) => {
+          return new Promise((resolve12, reject) => {
             const mid = msgId++;
             this.browserMsgId = msgId;
             const handler = (raw) => {
@@ -33486,7 +33522,7 @@ ${data.message || ""}`.trim();
                 if (msg.id === mid) {
                   browserWs.removeListener("message", handler);
                   if (msg.error) reject(new Error(msg.error.message || JSON.stringify(msg.error)));
-                  else resolve11(msg.result);
+                  else resolve12(msg.result);
                 }
               } catch {
               }
@@ -33687,14 +33723,14 @@ ${data.message || ""}`.trim();
         if (!ws2 || ws2.readyState !== import_ws2.default.OPEN) {
           throw new Error("CDP not connected");
         }
-        return new Promise((resolve11, reject) => {
+        return new Promise((resolve12, reject) => {
           const id = getNextId();
           pendingMap.set(id, {
             resolve: (result) => {
               if (result?.result?.subtype === "error") {
                 reject(new Error(result.result.description));
               } else {
-                resolve11(result?.result?.value);
+                resolve12(result?.result?.value);
               }
             },
             reject
@@ -33726,10 +33762,10 @@ ${data.message || ""}`.trim();
           throw new Error("CDP not connected");
         }
         const sendViaSession = (method, params = {}) => {
-          return new Promise((resolve11, reject) => {
+          return new Promise((resolve12, reject) => {
             const pendingMap = this._browserConnected ? this.browserPending : this.pending;
             const id = this._browserConnected ? this.browserMsgId++ : this.msgId++;
-            pendingMap.set(id, { resolve: resolve11, reject });
+            pendingMap.set(id, { resolve: resolve12, reject });
             ws2.send(JSON.stringify({ id, sessionId, method, params }));
             setTimeout(() => {
               if (pendingMap.has(id)) {
@@ -37568,7 +37604,9 @@ ${effect.notification.body || ""}`.trim();
       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;
@@ -37865,7 +37903,7 @@ ${effect.notification.body || ""}`.trim();
     async function getStableExtensionBaseline(h) {
       const first = await readExtensionChatState(h);
       if (getStateMessageCount(first) > 0 || getStateLastSignature(first)) return first;
-      await new Promise((resolve11) => setTimeout(resolve11, 150));
+      await new Promise((resolve12) => setTimeout(resolve12, 150));
       const second = await readExtensionChatState(h);
       return getStateMessageCount(second) >= getStateMessageCount(first) ? second : first;
     }
@@ -37873,7 +37911,7 @@ ${effect.notification.body || ""}`.trim();
       const beforeCount = getStateMessageCount(before);
       const beforeSignature = getStateLastSignature(before);
       for (let attempt = 0; attempt < 12; attempt += 1) {
-        await new Promise((resolve11) => setTimeout(resolve11, 250));
+        await new Promise((resolve12) => setTimeout(resolve12, 250));
         const state = await readExtensionChatState(h);
         if (state?.status === "waiting_approval") return true;
         const afterCount = getStateMessageCount(state);
@@ -38637,10 +38675,17 @@ ${effect.notification.body || ""}`.trim();
           }
         }
         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;
+        LOG2.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();
@@ -40079,7 +40124,7 @@ ${effect.notification.body || ""}`.trim();
         try {
           const http3 = await import("http");
           const postData = JSON.stringify(body);
-          const result = await new Promise((resolve11, reject) => {
+          const result = await new Promise((resolve12, reject) => {
             const req = http3.request({
               hostname: "127.0.0.1",
               port: 19280,
@@ -40091,9 +40136,9 @@ ${effect.notification.body || ""}`.trim();
               res.on("data", (chunk) => data += chunk);
               res.on("end", () => {
                 try {
-                  resolve11(JSON.parse(data));
+                  resolve12(JSON.parse(data));
                 } catch {
-                  resolve11({ raw: data });
+                  resolve12({ raw: data });
                 }
               });
             });
@@ -40111,15 +40156,15 @@ ${effect.notification.body || ""}`.trim();
         if (!providerType) return { success: false, error: "providerType required" };
         try {
           const http3 = await import("http");
-          const result = await new Promise((resolve11, reject) => {
+          const result = await new Promise((resolve12, 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 {
-                  resolve11(JSON.parse(data));
+                  resolve12(JSON.parse(data));
                 } catch {
-                  resolve11({ raw: data });
+                  resolve12({ raw: data });
                 }
               });
             }).on("error", reject);
@@ -40133,7 +40178,7 @@ ${effect.notification.body || ""}`.trim();
         try {
           const http3 = await import("http");
           const postData = JSON.stringify(args || {});
-          const result = await new Promise((resolve11, reject) => {
+          const result = await new Promise((resolve12, reject) => {
             const req = http3.request({
               hostname: "127.0.0.1",
               port: 19280,
@@ -40145,9 +40190,9 @@ ${effect.notification.body || ""}`.trim();
               res.on("data", (chunk) => data += chunk);
               res.on("end", () => {
                 try {
-                  resolve11(JSON.parse(data));
+                  resolve12(JSON.parse(data));
                 } catch {
-                  resolve11({ raw: data });
+                  resolve12({ raw: data });
                 }
               });
             });
@@ -40241,7 +40286,7 @@ ${effect.notification.body || ""}`.trim();
         if (status === "stopped") {
           throw new Error("CLI runtime stopped before it became ready");
         }
-        await new Promise((resolve11) => setTimeout(resolve11, pollMs));
+        await new Promise((resolve12) => setTimeout(resolve12, pollMs));
       }
       throw new Error(`CLI runtime did not become ready within ${timeoutMs}ms`);
     }
@@ -41543,13 +41588,13 @@ ${effect.notification.body || ""}`.trim();
             }
             this.currentStatus = "waiting_approval";
             this.detectStatusTransition();
-            const approved = await new Promise((resolve11) => {
-              this.permissionResolvers.push(resolve11);
+            const approved = await new Promise((resolve12) => {
+              this.permissionResolvers.push(resolve12);
               setTimeout(() => {
-                const idx = this.permissionResolvers.indexOf(resolve11);
+                const idx = this.permissionResolvers.indexOf(resolve12);
                 if (idx >= 0) {
                   this.permissionResolvers.splice(idx, 1);
-                  resolve11(false);
+                  resolve12(false);
                 }
               }, 3e5);
             });
@@ -43077,10 +43122,75 @@ Run 'adhdev doctor' for detailed diagnostics.`
       }
       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(path13.join(candidate, category))
+          );
+        } catch {
+          return false;
+        }
+      }
+      static hasProviderRootMarker(candidate) {
+        try {
+          return fs6.existsSync(path13.join(candidate, _ProviderLoader.SIBLING_MARKER_FILE));
+        } catch {
+          return false;
+        }
+      }
+      detectDefaultUserDir() {
+        const fallback = path13.join(os13.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 = path13.resolve(start);
+          while (!visited.has(current)) {
+            visited.add(current);
+            const siblingCandidate = path13.join(path13.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 = path13.dirname(current);
+            if (parent === current) break;
+            current = parent;
+          }
+        }
+        return { path: fallback, source: "home-default" };
+      }
       constructor(options) {
         this.logFn = options?.logFn || LOG2.forComponent("Provider").asLogFn();
+        this.probeStarts = options?.probeStarts ?? [process.cwd(), __dirname];
         this.defaultProvidersDir = path13.join(os13.homedir(), ".adhdev", "providers");
-        this.userDir = this.defaultProvidersDir;
+        const detected = this.detectDefaultUserDir();
+        this.userDir = detected.path;
+        this.userDirSource = detected.source;
         this.upstreamDir = path13.join(this.defaultProvidersDir, ".upstream");
         this.disableUpstream = false;
         this.applySourceConfig({
@@ -43118,6 +43228,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
           disableUpstream: this.disableUpstream,
           explicitProviderDir: this.explicitProviderDir,
           userDir: this.userDir,
+          userDirSource: this.userDirSource,
           upstreamDir: this.upstreamDir,
           providerRoots: this.getProviderRoots()
         };
@@ -43128,7 +43239,14 @@ Run 'adhdev doctor' for detailed diagnostics.`
           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 = path13.join(this.defaultProvidersDir, ".upstream");
         this.disableUpstream = this.sourceMode === "no-upstream";
         if (this.explicitProviderDir) {
@@ -43722,7 +43840,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
           return { updated: false };
         }
         try {
-          const etag = await new Promise((resolve11, reject) => {
+          const etag = await new Promise((resolve12, reject) => {
             const options = {
               method: "HEAD",
               hostname: "github.com",
@@ -43740,7 +43858,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
                   headers: { "User-Agent": "adhdev-launcher" },
                   timeout: 1e4
                 }, (res2) => {
-                  resolve11(res2.headers.etag || res2.headers["last-modified"] || "");
+                  resolve12(res2.headers.etag || res2.headers["last-modified"] || "");
                 });
                 req2.on("error", reject);
                 req2.on("timeout", () => {
@@ -43749,7 +43867,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
                 });
                 req2.end();
               } else {
-                resolve11(res.headers.etag || res.headers["last-modified"] || "");
+                resolve12(res.headers.etag || res.headers["last-modified"] || "");
               }
             });
             req.on("error", reject);
@@ -43813,7 +43931,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
       downloadFile(url2, destPath) {
         const https = require("https");
         const http3 = require("http");
-        return new Promise((resolve11, reject) => {
+        return new Promise((resolve12, reject) => {
           const doRequest = (reqUrl, redirectCount = 0) => {
             if (redirectCount > 5) {
               reject(new Error("Too many redirects"));
@@ -43833,7 +43951,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
               res.pipe(ws2);
               ws2.on("finish", () => {
                 ws2.close();
-                resolve11();
+                resolve12();
               });
               ws2.on("error", reject);
             });
@@ -44306,17 +44424,17 @@ Run 'adhdev doctor' for detailed diagnostics.`
       throw new Error("No free port found");
     }
     function checkPortFree(port) {
-      return new Promise((resolve11) => {
+      return new Promise((resolve12) => {
         const server = net3.createServer();
         server.unref();
-        server.on("error", () => resolve11(false));
+        server.on("error", () => resolve12(false));
         server.listen(port, "127.0.0.1", () => {
-          server.close(() => resolve11(true));
+          server.close(() => resolve12(true));
         });
       });
     }
     async function isCdpActive(port) {
-      return new Promise((resolve11) => {
+      return new Promise((resolve12) => {
         const req = require("http").get(`http://127.0.0.1:${port}/json/version`, {
           timeout: 2e3
         }, (res) => {
@@ -44325,16 +44443,16 @@ Run 'adhdev doctor' for detailed diagnostics.`
           res.on("end", () => {
             try {
               const info = JSON.parse(data);
-              resolve11(!!info["WebKit-Version"] || !!info["Browser"]);
+              resolve12(!!info["WebKit-Version"] || !!info["Browser"]);
             } catch {
-              resolve11(false);
+              resolve12(false);
             }
           });
         });
-        req.on("error", () => resolve11(false));
+        req.on("error", () => resolve12(false));
         req.on("timeout", () => {
           req.destroy();
-          resolve11(false);
+          resolve12(false);
         });
       });
     }
@@ -45116,7 +45234,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
       while (Date.now() - start < timeoutMs) {
         try {
           process.kill(pid, 0);
-          await new Promise((resolve11) => setTimeout(resolve11, 250));
+          await new Promise((resolve12) => setTimeout(resolve12, 250));
         } catch {
           return;
         }
@@ -45231,7 +45349,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
         appendUpgradeLog(installOutput.trim());
       }
       if (process.platform === "win32") {
-        await new Promise((resolve11) => setTimeout(resolve11, 500));
+        await new Promise((resolve12) => setTimeout(resolve12, 500));
         cleanupStaleGlobalInstallDirs(payload.packageName);
         appendUpgradeLog("Post-install staging cleanup complete");
       }
@@ -46559,7 +46677,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
         const beforeCount = this.messageCount(before);
         const beforeSignature = this.lastMessageSignature(before);
         for (let attempt = 0; attempt < 12; attempt += 1) {
-          await new Promise((resolve11) => setTimeout(resolve11, 250));
+          await new Promise((resolve12) => setTimeout(resolve12, 250));
           let state;
           try {
             state = await this.readChat(evaluate);
@@ -46581,7 +46699,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
         if (this.messageCount(first) > 0 || this.lastMessageSignature(first)) {
           return first;
         }
-        await new Promise((resolve11) => setTimeout(resolve11, 150));
+        await new Promise((resolve12) => setTimeout(resolve12, 150));
         const second = await this.readChat(evaluate);
         return this.messageCount(second) >= this.messageCount(first) ? second : first;
       }
@@ -46732,7 +46850,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
           if (typeof data.error === "string" && data.error.trim()) return false;
         }
         for (let attempt = 0; attempt < 6; attempt += 1) {
-          await new Promise((resolve11) => setTimeout(resolve11, 250));
+          await new Promise((resolve12) => setTimeout(resolve12, 250));
           const state = await this.readChat(evaluate);
           const title = this.getStateTitle(state);
           if (this.titlesMatch(title, sessionId)) return true;
@@ -49236,7 +49354,7 @@ async (params) => {
       return { target, instance, adapter };
     }
     function sleep(ms2) {
-      return new Promise((resolve11) => setTimeout(resolve11, ms2));
+      return new Promise((resolve12) => setTimeout(resolve12, ms2));
     }
     async function waitForCliReady(ctx, type, instanceId, timeoutMs) {
       const startedAt = Date.now();
@@ -51490,15 +51608,15 @@ data: ${JSON.stringify(msg.data)}
             this.json(res, 500, { error: e.message });
           }
         });
-        return new Promise((resolve11, reject) => {
+        return new Promise((resolve12, reject) => {
           this.server.listen(port, "127.0.0.1", () => {
             this.log(`Dev server listening on http://127.0.0.1:${port}`);
-            resolve11();
+            resolve12();
           });
           this.server.on("error", (e) => {
             if (e.code === "EADDRINUSE") {
               this.log(`Port ${port} in use, skipping dev server`);
-              resolve11();
+              resolve12();
             } else {
               reject(e);
             }
@@ -51580,20 +51698,20 @@ data: ${JSON.stringify(msg.data)}
           child.stderr?.on("data", (d) => {
             stderr += d.toString().slice(0, 2e3);
           });
-          await new Promise((resolve11) => {
+          await new Promise((resolve12) => {
             const timer = setTimeout(() => {
               child.kill();
-              resolve11();
+              resolve12();
             }, 3e3);
             child.on("exit", () => {
               clearTimeout(timer);
-              resolve11();
+              resolve12();
             });
             child.stdout?.once("data", () => {
               setTimeout(() => {
                 child.kill();
                 clearTimeout(timer);
-                resolve11();
+                resolve12();
               }, 500);
             });
           });
@@ -52109,14 +52227,14 @@ data: ${JSON.stringify(msg.data)}
           child.stderr?.on("data", (d) => {
             stderr += d.toString();
           });
-          await new Promise((resolve11) => {
+          await new Promise((resolve12) => {
             const timer = setTimeout(() => {
               child.kill();
-              resolve11();
+              resolve12();
             }, timeout);
             child.on("exit", () => {
               clearTimeout(timer);
-              resolve11();
+              resolve12();
             });
           });
           const elapsed = Date.now() - start;
@@ -52786,14 +52904,14 @@ data: ${JSON.stringify(msg.data)}
         res.end(JSON.stringify(data, null, 2));
       }
       async readBody(req) {
-        return new Promise((resolve11) => {
+        return new Promise((resolve12) => {
           let body = "";
           req.on("data", (chunk) => body += chunk);
           req.on("end", () => {
             try {
-              resolve11(JSON.parse(body));
+              resolve12(JSON.parse(body));
             } catch {
-              resolve11({});
+              resolve12({});
             }
           });
         });
@@ -53293,7 +53411,7 @@ data: ${JSON.stringify(msg.data)}
       const deadline = Date.now() + timeoutMs;
       while (Date.now() < deadline) {
         if (await canConnect(endpoint)) return;
-        await new Promise((resolve11) => setTimeout(resolve11, STARTUP_POLL_MS));
+        await new Promise((resolve12) => setTimeout(resolve12, STARTUP_POLL_MS));
       }
       throw new Error(`Session host did not become ready within ${timeoutMs}ms`);
     }
@@ -53467,10 +53585,10 @@ data: ${JSON.stringify(msg.data)}
             const buffer = Buffer.from(await res.arrayBuffer());
             const fs15 = await import("fs");
             fs15.writeFileSync(vsixPath, buffer);
-            return new Promise((resolve11) => {
+            return new Promise((resolve12) => {
               const cmd = `"${ide.cliCommand}" --install-extension "${vsixPath}" --force`;
               (0, import_child_process10.exec)(cmd, { timeout: 6e4 }, (error48, _stdout, stderr) => {
-                resolve11({
+                resolve12({
                   extensionId: extension.id,
                   marketplaceId: extension.marketplaceId,
                   success: !error48,
@@ -53483,11 +53601,11 @@ data: ${JSON.stringify(msg.data)}
         } catch (e) {
         }
       }
-      return new Promise((resolve11) => {
+      return new Promise((resolve12) => {
         const cmd = `"${ide.cliCommand}" --install-extension ${extension.marketplaceId} --force`;
         (0, import_child_process10.exec)(cmd, { timeout: 6e4 }, (error48, stdout, stderr) => {
           if (error48) {
-            resolve11({
+            resolve12({
               extensionId: extension.id,
               marketplaceId: extension.marketplaceId,
               success: false,
@@ -53495,7 +53613,7 @@ data: ${JSON.stringify(msg.data)}
               error: stderr || error48.message
             });
           } else {
-            resolve11({
+            resolve12({
               extensionId: extension.id,
               marketplaceId: extension.marketplaceId,
               success: true,
@@ -55332,7 +55450,6 @@ var StandaloneServer = class {
     const status = this.getWsStatus(this.buildSharedSnapshot("live"));
     this.lastWsStatusSignature = this.buildWsStatusSignature(status);
     ws2.send(JSON.stringify({ type: "status", data: status }));
-    void this.pushWsRuntimeSnapshots(ws2);
     ws2.on("message", async (raw) => {
       try {
         const msg = JSON.parse(raw.toString());