@adhdev/daemon-standalone 0.9.71 → 0.9.72

package/dist/index.js

@@ -30095,7 +30095,7 @@ ${rules.join("\n")}`;
                   `[${this.cliType}] Waiting for interactive prompt: status=${status} stableMs=${stableMs} recentOutputMs=${recentlyOutput} screen=${JSON.stringify(summarizeCliTraceText(screenText, 220)).slice(0, 260)}`
                 );
               }
-              await new Promise((resolve15) => setTimeout(resolve15, 50));
+              await new Promise((resolve16) => setTimeout(resolve16, 50));
             }
             const finalScreenText = this.terminalScreen.getText() || "";
             LOG2.warn(
@@ -31005,7 +31005,7 @@ ${rules.join("\n")}`;
               const deadline = Date.now() + 1e4;
               while (this.startupParseGate && Date.now() < deadline) {
                 this.resolveStartupState("send_wait");
-                await new Promise((resolve15) => setTimeout(resolve15, 50));
+                await new Promise((resolve16) => setTimeout(resolve16, 50));
               }
             }
             if (!allowInterventionPrompt) {
@@ -31081,13 +31081,13 @@ ${rules.join("\n")}`;
             }
             this.responseEpoch += 1;
             this.responseSettleIgnoreUntil = Date.now() + submitDelayMs + this.timeouts.outputSettle + 250;
-            await new Promise((resolve15, reject) => {
+            await new Promise((resolve16, reject) => {
               let resolved = false;
               const completion = {
                 resolveOnce: () => {
                   if (resolved) return;
                   resolved = true;
-                  resolve15();
+                  resolve16();
                 },
                 rejectOnce: (error48) => {
                   if (resolved) return;
@@ -31245,17 +31245,17 @@ ${rules.join("\n")}`;
             }
           }
           waitForStopped(timeoutMs) {
-            return new Promise((resolve15) => {
+            return new Promise((resolve16) => {
               const startedAt = Date.now();
               const timer = setInterval(() => {
                 if (!this.ptyProcess || this.currentStatus === "stopped") {
                   clearInterval(timer);
-                  resolve15(true);
+                  resolve16(true);
                   return;
                 }
                 if (Date.now() - startedAt >= timeoutMs) {
                   clearInterval(timer);
-                  resolve15(false);
+                  resolve16(false);
                 }
               }, 100);
             });
@@ -33656,8 +33656,8 @@ ${rules.join("\n")}`;
           if ((0, import_fs4.existsSync)(bundledCli)) resolvedCli = bundledCli;
         }
         if (!resolvedCli && appPath && os21 === "win32") {
-          const { dirname: dirname7 } = await import("path");
-          const appDir = dirname7(appPath);
+          const { dirname: dirname8 } = await import("path");
+          const appDir = dirname8(appPath);
           const candidates = [
             `${appDir}\\\\bin\\\\${def.cli}.cmd`,
             `${appDir}\\\\bin\\\\${def.cli}`,
@@ -33719,19 +33719,19 @@ ${rules.join("\n")}`;
       return null;
     }
     function execAsync(cmd, timeoutMs = 5e3) {
-      return new Promise((resolve15) => {
+      return new Promise((resolve16) => {
         const child = (0, import_child_process2.exec)(cmd, {
           encoding: "utf-8",
           timeout: timeoutMs,
           ...process.platform === "win32" ? { windowsHide: true } : {}
         }, (err, stdout) => {
           if (err || !stdout?.trim()) {
-            resolve15(null);
+            resolve16(null);
           } else {
-            resolve15(stdout.trim());
+            resolve16(stdout.trim());
           }
         });
-        child.on("error", () => resolve15(null));
+        child.on("error", () => resolve16(null));
       });
     }
     async function detectCLIs(providerLoader, options) {
@@ -34088,7 +34088,7 @@ ${rules.join("\n")}`;
       * Returns multiple entries if multiple IDE windows are open on same port
       */
       static listAllTargets(port) {
-        return new Promise((resolve15) => {
+        return new Promise((resolve16) => {
           const req = http.get(`http://127.0.0.1:${port}/json`, (res) => {
             let data = "";
             res.on("data", (chunk) => data += chunk.toString());
@@ -34104,16 +34104,16 @@ ${rules.join("\n")}`;
                   (t) => !isNonMain(t.title || "") && t.url?.includes("workbench.html") && !t.url?.includes("agent")
                 );
                 const fallbackPages = pages.filter((t) => !isNonMain(t.title || ""));
-                resolve15(mainPages.length > 0 ? mainPages : fallbackPages);
+                resolve16(mainPages.length > 0 ? mainPages : fallbackPages);
               } catch {
-                resolve15([]);
+                resolve16([]);
               }
             });
           });
-          req.on("error", () => resolve15([]));
+          req.on("error", () => resolve16([]));
           req.setTimeout(2e3, () => {
             req.destroy();
-            resolve15([]);
+            resolve16([]);
           });
         });
       }
@@ -34153,7 +34153,7 @@ ${rules.join("\n")}`;
         }
       }
       findTargetOnPort(port) {
-        return new Promise((resolve15) => {
+        return new Promise((resolve16) => {
           const req = http.get(`http://127.0.0.1:${port}/json`, (res) => {
             let data = "";
             res.on("data", (chunk) => data += chunk.toString());
@@ -34164,7 +34164,7 @@ ${rules.join("\n")}`;
                   (t) => (t.type === "page" || t.type === "browser" || t.type === "Page") && t.webSocketDebuggerUrl
                 );
                 if (pages.length === 0) {
-                  resolve15(targets.find((t) => t.webSocketDebuggerUrl) || null);
+                  resolve16(targets.find((t) => t.webSocketDebuggerUrl) || null);
                   return;
                 }
                 const titleFilteredPages = pages.filter((t) => !this.isNonMainTitle(t.title || ""));
@@ -34183,25 +34183,25 @@ ${rules.join("\n")}`;
                     this._targetId = selected.target.id;
                   }
                   this._pageTitle = selected.target.title || "";
-                  resolve15(selected.target);
+                  resolve16(selected.target);
                   return;
                 }
                 if (previousTargetId) {
                   this.log(`[CDP] Target ${previousTargetId} not found in page list`);
-                  resolve15(null);
+                  resolve16(null);
                   return;
                 }
                 this._pageTitle = list[0]?.title || "";
-                resolve15(list[0]);
+                resolve16(list[0]);
               } catch {
-                resolve15(null);
+                resolve16(null);
               }
             });
           });
-          req.on("error", () => resolve15(null));
+          req.on("error", () => resolve16(null));
           req.setTimeout(2e3, () => {
             req.destroy();
-            resolve15(null);
+            resolve16(null);
           });
         });
       }
@@ -34212,7 +34212,7 @@ ${rules.join("\n")}`;
         this.extensionProviders = providers;
       }
       connectToTarget(wsUrl) {
-        return new Promise((resolve15) => {
+        return new Promise((resolve16) => {
           this.ws = new import_ws2.default(wsUrl);
           this.ws.on("open", async () => {
             this._connected = true;
@@ -34222,17 +34222,17 @@ ${rules.join("\n")}`;
             }
             this.connectBrowserWs().catch(() => {
             });
-            resolve15(true);
+            resolve16(true);
           });
           this.ws.on("message", (data) => {
             try {
               const msg = JSON.parse(data.toString());
               if (msg.id && this.pending.has(msg.id)) {
-                const { resolve: resolve16, reject } = this.pending.get(msg.id);
+                const { resolve: resolve17, reject } = this.pending.get(msg.id);
                 this.pending.delete(msg.id);
                 this.failureCount = 0;
                 if (msg.error) reject(new Error(msg.error.message));
-                else resolve16(msg.result);
+                else resolve17(msg.result);
               } else if (msg.method === "Runtime.executionContextCreated") {
                 this.contexts.add(msg.params.context.id);
               } else if (msg.method === "Runtime.executionContextDestroyed") {
@@ -34255,7 +34255,7 @@ ${rules.join("\n")}`;
           this.ws.on("error", (err) => {
             this.log(`[CDP] WebSocket error: ${err.message}`);
             this._connected = false;
-            resolve15(false);
+            resolve16(false);
           });
         });
       }
@@ -34269,7 +34269,7 @@ ${rules.join("\n")}`;
             return;
           }
           this.log(`[CDP] Connecting browser WS for target discovery...`);
-          await new Promise((resolve15, reject) => {
+          await new Promise((resolve16, reject) => {
             this.browserWs = new import_ws2.default(browserWsUrl);
             this.browserWs.on("open", async () => {
               this._browserConnected = true;
@@ -34279,16 +34279,16 @@ ${rules.join("\n")}`;
               } catch (e) {
                 this.log(`[CDP] setDiscoverTargets failed: ${e.message}`);
               }
-              resolve15();
+              resolve16();
             });
             this.browserWs.on("message", (data) => {
               try {
                 const msg = JSON.parse(data.toString());
                 if (msg.id && this.browserPending.has(msg.id)) {
-                  const { resolve: resolve16, reject: reject2 } = this.browserPending.get(msg.id);
+                  const { resolve: resolve17, reject: reject2 } = this.browserPending.get(msg.id);
                   this.browserPending.delete(msg.id);
                   if (msg.error) reject2(new Error(msg.error.message));
-                  else resolve16(msg.result);
+                  else resolve17(msg.result);
                 }
               } catch {
               }
@@ -34308,31 +34308,31 @@ ${rules.join("\n")}`;
         }
       }
       getBrowserWsUrl() {
-        return new Promise((resolve15) => {
+        return new Promise((resolve16) => {
           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);
-                resolve15(info.webSocketDebuggerUrl || null);
+                resolve16(info.webSocketDebuggerUrl || null);
               } catch {
-                resolve15(null);
+                resolve16(null);
               }
             });
           });
-          req.on("error", () => resolve15(null));
+          req.on("error", () => resolve16(null));
           req.setTimeout(3e3, () => {
             req.destroy();
-            resolve15(null);
+            resolve16(null);
           });
         });
       }
       sendBrowser(method, params = {}, timeoutMs = 15e3) {
-        return new Promise((resolve15, reject) => {
+        return new Promise((resolve16, reject) => {
           if (!this.browserWs || !this._browserConnected) return reject(new Error("Browser WS not connected"));
           const id = this.browserMsgId++;
-          this.browserPending.set(id, { resolve: resolve15, reject });
+          this.browserPending.set(id, { resolve: resolve16, reject });
           this.browserWs.send(JSON.stringify({ id, method, params }));
           setTimeout(() => {
             if (this.browserPending.has(id)) {
@@ -34372,11 +34372,11 @@ ${rules.join("\n")}`;
       }
       // ─── CDP Protocol ────────────────────────────────────────
       sendInternal(method, params = {}, timeoutMs = 15e3) {
-        return new Promise((resolve15, reject) => {
+        return new Promise((resolve16, 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: resolve15, reject });
+          this.pending.set(id, { resolve: resolve16, reject });
           this.ws.send(JSON.stringify({ id, method, params }));
           setTimeout(() => {
             if (this.pending.has(id)) {
@@ -34625,7 +34625,7 @@ ${rules.join("\n")}`;
         const browserWs = this.browserWs;
         let msgId = this.browserMsgId;
         const sendWs = (method, params = {}, sessionId) => {
-          return new Promise((resolve15, reject) => {
+          return new Promise((resolve16, reject) => {
             const mid = msgId++;
             this.browserMsgId = msgId;
             const handler = (raw) => {
@@ -34634,7 +34634,7 @@ ${rules.join("\n")}`;
                 if (msg.id === mid) {
                   browserWs.removeListener("message", handler);
                   if (msg.error) reject(new Error(msg.error.message || JSON.stringify(msg.error)));
-                  else resolve15(msg.result);
+                  else resolve16(msg.result);
                 }
               } catch {
               }
@@ -34835,14 +34835,14 @@ ${rules.join("\n")}`;
         if (!ws2 || ws2.readyState !== import_ws2.default.OPEN) {
           throw new Error("CDP not connected");
         }
-        return new Promise((resolve15, reject) => {
+        return new Promise((resolve16, reject) => {
           const id = getNextId();
           pendingMap.set(id, {
             resolve: (result) => {
               if (result?.result?.subtype === "error") {
                 reject(new Error(result.result.description));
               } else {
-                resolve15(result?.result?.value);
+                resolve16(result?.result?.value);
               }
             },
             reject
@@ -34874,10 +34874,10 @@ ${rules.join("\n")}`;
           throw new Error("CDP not connected");
         }
         const sendViaSession = (method, params = {}) => {
-          return new Promise((resolve15, reject) => {
+          return new Promise((resolve16, reject) => {
             const pendingMap = this._browserConnected ? this.browserPending : this.pending;
             const id = this._browserConnected ? this.browserMsgId++ : this.msgId++;
-            pendingMap.set(id, { resolve: resolve15, reject });
+            pendingMap.set(id, { resolve: resolve16, reject });
             ws2.send(JSON.stringify({ id, sessionId, method, params }));
             setTimeout(() => {
               if (pendingMap.has(id)) {
@@ -40000,7 +40000,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((resolve15) => setTimeout(resolve15, 150));
+      await new Promise((resolve16) => setTimeout(resolve16, 150));
       const second = await readExtensionChatState(h);
       return getStateMessageCount(second) >= getStateMessageCount(first) ? second : first;
     }
@@ -40008,7 +40008,7 @@ ${effect.notification.body || ""}`.trim();
       const beforeCount = getStateMessageCount(before);
       const beforeSignature = getStateLastSignature(before);
       for (let attempt = 0; attempt < 12; attempt += 1) {
-        await new Promise((resolve15) => setTimeout(resolve15, 250));
+        await new Promise((resolve16) => setTimeout(resolve16, 250));
         const state = await readExtensionChatState(h);
         if (state?.status === "waiting_approval") return true;
         const afterCount = getStateMessageCount(state);
@@ -41631,7 +41631,7 @@ ${effect.notification.body || ""}`.trim();
             const enterCount = cliCommand.enterCount || 1;
             await adapter.writeRaw(cliCommand.text + "\r");
             for (let i = 1; i < enterCount; i += 1) {
-              await new Promise((resolve15) => setTimeout(resolve15, 50));
+              await new Promise((resolve16) => setTimeout(resolve16, 50));
               await adapter.writeRaw("\r");
             }
           }
@@ -42312,7 +42312,7 @@ ${effect.notification.body || ""}`.trim();
         try {
           const http3 = await import("http");
           const postData = JSON.stringify(body);
-          const result = await new Promise((resolve15, reject) => {
+          const result = await new Promise((resolve16, reject) => {
             const req = http3.request({
               hostname: "127.0.0.1",
               port: 19280,
@@ -42324,9 +42324,9 @@ ${effect.notification.body || ""}`.trim();
               res.on("data", (chunk) => data += chunk);
               res.on("end", () => {
                 try {
-                  resolve15(JSON.parse(data));
+                  resolve16(JSON.parse(data));
                 } catch {
-                  resolve15({ raw: data });
+                  resolve16({ raw: data });
                 }
               });
             });
@@ -42344,15 +42344,15 @@ ${effect.notification.body || ""}`.trim();
         if (!providerType) return { success: false, error: "providerType required" };
         try {
           const http3 = await import("http");
-          const result = await new Promise((resolve15, reject) => {
+          const result = await new Promise((resolve16, 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 {
-                  resolve15(JSON.parse(data));
+                  resolve16(JSON.parse(data));
                 } catch {
-                  resolve15({ raw: data });
+                  resolve16({ raw: data });
                 }
               });
             }).on("error", reject);
@@ -42366,7 +42366,7 @@ ${effect.notification.body || ""}`.trim();
         try {
           const http3 = await import("http");
           const postData = JSON.stringify(args || {});
-          const result = await new Promise((resolve15, reject) => {
+          const result = await new Promise((resolve16, reject) => {
             const req = http3.request({
               hostname: "127.0.0.1",
               port: 19280,
@@ -42378,9 +42378,9 @@ ${effect.notification.body || ""}`.trim();
               res.on("data", (chunk) => data += chunk);
               res.on("end", () => {
                 try {
-                  resolve15(JSON.parse(data));
+                  resolve16(JSON.parse(data));
                 } catch {
-                  resolve15({ raw: data });
+                  resolve16({ raw: data });
                 }
               });
             });
@@ -42496,7 +42496,7 @@ ${effect.notification.body || ""}`.trim();
         if (status === "stopped") {
           throw new Error("CLI runtime stopped before it became ready");
         }
-        await new Promise((resolve15) => setTimeout(resolve15, pollMs));
+        await new Promise((resolve16) => setTimeout(resolve16, pollMs));
       }
       throw new Error(`CLI runtime did not become ready within ${timeoutMs}ms`);
     }
@@ -42839,7 +42839,7 @@ ${effect.notification.body || ""}`.trim();
           const enterCount = cliCommand.enterCount || 1;
           await this.adapter.writeRaw(cliCommand.text + "\r");
           for (let i = 1; i < enterCount; i += 1) {
-            await new Promise((resolve15) => setTimeout(resolve15, 50));
+            await new Promise((resolve16) => setTimeout(resolve16, 50));
             await this.adapter.writeRaw("\r");
           }
         }
@@ -43942,13 +43942,13 @@ ${effect.notification.body || ""}`.trim();
             }
             this.currentStatus = "waiting_approval";
             this.detectStatusTransition();
-            const approved = await new Promise((resolve15) => {
-              this.permissionResolvers.push(resolve15);
+            const approved = await new Promise((resolve16) => {
+              this.permissionResolvers.push(resolve16);
               setTimeout(() => {
-                const idx = this.permissionResolvers.indexOf(resolve15);
+                const idx = this.permissionResolvers.indexOf(resolve16);
                 if (idx >= 0) {
                   this.permissionResolvers.splice(idx, 1);
-                  resolve15(false);
+                  resolve16(false);
                 }
               }, 3e5);
             });
@@ -46520,7 +46520,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
           return { updated: false };
         }
         try {
-          const etag = await new Promise((resolve15, reject) => {
+          const etag = await new Promise((resolve16, reject) => {
             const options = {
               method: "HEAD",
               hostname: "github.com",
@@ -46538,7 +46538,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
                   headers: { "User-Agent": "adhdev-launcher" },
                   timeout: 1e4
                 }, (res2) => {
-                  resolve15(res2.headers.etag || res2.headers["last-modified"] || "");
+                  resolve16(res2.headers.etag || res2.headers["last-modified"] || "");
                 });
                 req2.on("error", reject);
                 req2.on("timeout", () => {
@@ -46547,7 +46547,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
                 });
                 req2.end();
               } else {
-                resolve15(res.headers.etag || res.headers["last-modified"] || "");
+                resolve16(res.headers.etag || res.headers["last-modified"] || "");
               }
             });
             req.on("error", reject);
@@ -46611,7 +46611,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
       downloadFile(url2, destPath) {
         const https = require("https");
         const http3 = require("http");
-        return new Promise((resolve15, reject) => {
+        return new Promise((resolve16, reject) => {
           const doRequest = (reqUrl, redirectCount = 0) => {
             if (redirectCount > 5) {
               reject(new Error("Too many redirects"));
@@ -46631,7 +46631,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
               res.pipe(ws2);
               ws2.on("finish", () => {
                 ws2.close();
-                resolve15();
+                resolve16();
               });
               ws2.on("error", reject);
             });
@@ -47206,17 +47206,17 @@ Run 'adhdev doctor' for detailed diagnostics.`
       throw new Error("No free port found");
     }
     function checkPortFree(port) {
-      return new Promise((resolve15) => {
+      return new Promise((resolve16) => {
         const server = net3.createServer();
         server.unref();
-        server.on("error", () => resolve15(false));
+        server.on("error", () => resolve16(false));
         server.listen(port, "127.0.0.1", () => {
-          server.close(() => resolve15(true));
+          server.close(() => resolve16(true));
         });
       });
     }
     async function isCdpActive(port) {
-      return new Promise((resolve15) => {
+      return new Promise((resolve16) => {
         const req = require("http").get(`http://127.0.0.1:${port}/json/version`, {
           timeout: 2e3
         }, (res) => {
@@ -47225,16 +47225,16 @@ Run 'adhdev doctor' for detailed diagnostics.`
           res.on("end", () => {
             try {
               const info = JSON.parse(data);
-              resolve15(!!info["WebKit-Version"] || !!info["Browser"]);
+              resolve16(!!info["WebKit-Version"] || !!info["Browser"]);
             } catch {
-              resolve15(false);
+              resolve16(false);
             }
           });
         });
-        req.on("error", () => resolve15(false));
+        req.on("error", () => resolve16(false));
         req.on("timeout", () => {
           req.destroy();
-          resolve15(false);
+          resolve16(false);
         });
       });
     }
@@ -47702,7 +47702,9 @@ Run 'adhdev doctor' for detailed diagnostics.`
     }
     cleanOldFiles();
     init_logger();
-    var import_path4 = require("path");
+    var import_node_fs22 = require("fs");
+    var import_node_module2 = require("module");
+    var import_node_path2 = require("path");
     var DEFAULT_SERVER_NAME = "adhdev-mesh";
     var DEFAULT_ADHDEV_MCP_COMMAND = "adhdev-mcp";
     function resolveMeshCoordinatorSetup(options) {
@@ -47727,11 +47729,23 @@ Run 'adhdev doctor' for detailed diagnostics.`
         if (!path26) {
           return { kind: "unsupported", reason: "Provider auto-import MCP config is missing a config path" };
         }
+        const mcpServer = resolveAdhdevMcpServerLaunch({
+          meshId,
+          nodeExecutable: options.nodeExecutable,
+          adhdevMcpEntryPath: options.adhdevMcpEntryPath
+        });
+        if (!mcpServer) {
+          return {
+            kind: "unsupported",
+            reason: "Could not resolve the ADHDev MCP server entrypoint without relying on a PATH bin shim"
+          };
+        }
         return {
           kind: "auto_import",
           serverName,
-          configPath: (0, import_path4.join)(workspace, path26),
-          configFormat: mcpConfig.format
+          configPath: (0, import_node_path2.join)(workspace, path26),
+          configFormat: mcpConfig.format,
+          mcpServer
         };
       }
       if (mcpConfig.mode === "manual") {
@@ -47763,6 +47777,53 @@ Run 'adhdev doctor' for detailed diagnostics.`
     function renderMeshCoordinatorTemplate(template, values) {
       return template.replace(/\{\{\s*(meshId|workspace|serverName|adhdevMcpCommand)\s*\}\}/g, (_, key) => values[key] || "");
     }
+    function resolveAdhdevMcpServerLaunch(options) {
+      const entryPath = resolveAdhdevMcpEntryPath(options.adhdevMcpEntryPath);
+      if (!entryPath) return null;
+      return {
+        command: options.nodeExecutable?.trim() || process.execPath,
+        args: [entryPath, "--repo-mesh", options.meshId]
+      };
+    }
+    function resolveAdhdevMcpEntryPath(explicitPath) {
+      const explicit = explicitPath?.trim();
+      if (explicit) return normalizeExistingPath(explicit) || explicit;
+      const envPath = process.env.ADHDEV_MCP_SERVER_PATH?.trim();
+      if (envPath) return normalizeExistingPath(envPath) || envPath;
+      const candidates = [];
+      const addCandidate = (candidate) => {
+        if (!candidates.includes(candidate)) candidates.push(candidate);
+      };
+      const addPackagedCandidates = (baseFile) => {
+        if (!baseFile) return;
+        const realBase = normalizeExistingPath(baseFile) || baseFile;
+        const dir = (0, import_node_path2.dirname)(realBase);
+        addCandidate((0, import_node_path2.resolve)(dir, "../vendor/mcp-server/index.js"));
+        addCandidate((0, import_node_path2.resolve)(dir, "../../vendor/mcp-server/index.js"));
+        addCandidate((0, import_node_path2.resolve)(dir, "../../../vendor/mcp-server/index.js"));
+      };
+      addPackagedCandidates(process.argv[1]);
+      for (const candidate of candidates) {
+        const normalized = normalizeExistingPath(candidate);
+        if (normalized) return normalized;
+      }
+      try {
+        const requireBase = process.argv[1] ? normalizeExistingPath(process.argv[1]) || process.argv[1] : (0, import_node_path2.join)(process.cwd(), "adhdev-daemon.js");
+        const req = (0, import_node_module2.createRequire)(requireBase);
+        const resolvedModule = req.resolve("@adhdev/mcp-server");
+        return normalizeExistingPath(resolvedModule) || resolvedModule;
+      } catch {
+        return null;
+      }
+    }
+    function normalizeExistingPath(filePath) {
+      try {
+        if (!(0, import_node_fs22.existsSync)(filePath)) return null;
+        return import_node_fs22.realpathSync.native(filePath);
+      } catch {
+        return null;
+      }
+    }
     var os17 = __toESM2(require("os"));
     init_config();
     init_terminal_screen();
@@ -48266,7 +48327,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
       while (Date.now() - start < timeoutMs) {
         try {
           process.kill(pid, 0);
-          await new Promise((resolve15) => setTimeout(resolve15, 250));
+          await new Promise((resolve16) => setTimeout(resolve16, 250));
         } catch {
           return;
         }
@@ -48377,7 +48438,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
         appendUpgradeLog(installOutput.trim());
       }
       if (process.platform === "win32") {
-        await new Promise((resolve15) => setTimeout(resolve15, 500));
+        await new Promise((resolve16) => setTimeout(resolve16, 500));
         cleanupStaleGlobalInstallDirs(payload.packageName, installCommand.surface);
         appendUpgradeLog("Post-install staging cleanup complete");
       }
@@ -49261,9 +49322,9 @@ Run 'adhdev doctor' for detailed diagnostics.`
                   workspace
                 };
               }
-              const { existsSync: existsSync21, readFileSync: readFileSync15, writeFileSync: writeFileSync12, copyFileSync: copyFileSync3 } = await import("fs");
+              const { existsSync: existsSync22, readFileSync: readFileSync15, writeFileSync: writeFileSync12, copyFileSync: copyFileSync3 } = await import("fs");
               const mcpConfigPath = coordinatorSetup.configPath;
-              const hadExistingMcpConfig = existsSync21(mcpConfigPath);
+              const hadExistingMcpConfig = existsSync22(mcpConfigPath);
               let existingMcpConfig = {};
               if (hadExistingMcpConfig) {
                 try {
@@ -49277,8 +49338,8 @@ Run 'adhdev doctor' for detailed diagnostics.`
                 mcpServers: {
                   ...existingMcpConfig.mcpServers || {},
                   [coordinatorSetup.serverName]: {
-                    command: "adhdev-mcp",
-                    args: ["--repo-mesh", meshId]
+                    command: coordinatorSetup.mcpServer.command,
+                    args: coordinatorSetup.mcpServer.args
                   }
                 }
               };
@@ -49920,7 +49981,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((resolve15) => setTimeout(resolve15, 250));
+          await new Promise((resolve16) => setTimeout(resolve16, 250));
           let state;
           try {
             state = await this.readChat(evaluate);
@@ -49942,7 +50003,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
         if (this.messageCount(first) > 0 || this.lastMessageSignature(first)) {
           return first;
         }
-        await new Promise((resolve15) => setTimeout(resolve15, 150));
+        await new Promise((resolve16) => setTimeout(resolve16, 150));
         const second = await this.readChat(evaluate);
         return this.messageCount(second) >= this.messageCount(first) ? second : first;
       }
@@ -50093,7 +50154,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((resolve15) => setTimeout(resolve15, 250));
+          await new Promise((resolve16) => setTimeout(resolve16, 250));
           const state = await this.readChat(evaluate);
           const title = this.getStateTitle(state);
           if (this.titlesMatch(title, sessionId)) return true;
@@ -52666,7 +52727,7 @@ async (params) => {
       return { target, instance, adapter };
     }
     function sleep(ms2) {
-      return new Promise((resolve15) => setTimeout(resolve15, ms2));
+      return new Promise((resolve16) => setTimeout(resolve16, ms2));
     }
     async function waitForCliReady(ctx, type, instanceId, timeoutMs) {
       const startedAt = Date.now();
@@ -54908,15 +54969,15 @@ data: ${JSON.stringify(msg.data)}
             this.json(res, 500, { error: e.message });
           }
         });
-        return new Promise((resolve15, reject) => {
+        return new Promise((resolve16, reject) => {
           this.server.listen(port, "127.0.0.1", () => {
             this.log(`Dev server listening on http://127.0.0.1:${port}`);
-            resolve15();
+            resolve16();
           });
           this.server.on("error", (e) => {
             if (e.code === "EADDRINUSE") {
               this.log(`Port ${port} in use, skipping dev server`);
-              resolve15();
+              resolve16();
             } else {
               reject(e);
             }
@@ -54998,20 +55059,20 @@ data: ${JSON.stringify(msg.data)}
           child.stderr?.on("data", (d) => {
             stderr += d.toString().slice(0, 2e3);
           });
-          await new Promise((resolve15) => {
+          await new Promise((resolve16) => {
             const timer = setTimeout(() => {
               child.kill();
-              resolve15();
+              resolve16();
             }, 3e3);
             child.on("exit", () => {
               clearTimeout(timer);
-              resolve15();
+              resolve16();
             });
             child.stdout?.once("data", () => {
               setTimeout(() => {
                 child.kill();
                 clearTimeout(timer);
-                resolve15();
+                resolve16();
               }, 500);
             });
           });
@@ -55514,14 +55575,14 @@ data: ${JSON.stringify(msg.data)}
           child.stderr?.on("data", (d) => {
             stderr += d.toString();
           });
-          await new Promise((resolve15) => {
+          await new Promise((resolve16) => {
             const timer = setTimeout(() => {
               child.kill();
-              resolve15();
+              resolve16();
             }, timeout);
             child.on("exit", () => {
               clearTimeout(timer);
-              resolve15();
+              resolve16();
             });
           });
           const elapsed = Date.now() - start;
@@ -56191,14 +56252,14 @@ data: ${JSON.stringify(msg.data)}
         res.end(JSON.stringify(data, null, 2));
       }
       async readBody(req) {
-        return new Promise((resolve15) => {
+        return new Promise((resolve16) => {
           let body = "";
           req.on("data", (chunk) => body += chunk);
           req.on("end", () => {
             try {
-              resolve15(JSON.parse(body));
+              resolve16(JSON.parse(body));
             } catch {
-              resolve15({});
+              resolve16({});
             }
           });
         });
@@ -56700,7 +56761,7 @@ data: ${JSON.stringify(msg.data)}
       const deadline = Date.now() + timeoutMs;
       while (Date.now() < deadline) {
         if (await canConnect(endpoint)) return;
-        await new Promise((resolve15) => setTimeout(resolve15, STARTUP_POLL_MS));
+        await new Promise((resolve16) => setTimeout(resolve16, STARTUP_POLL_MS));
       }
       throw new Error(`Session host did not become ready within ${timeoutMs}ms`);
     }
@@ -56874,10 +56935,10 @@ data: ${JSON.stringify(msg.data)}
             const buffer = Buffer.from(await res.arrayBuffer());
             const fs16 = await import("fs");
             fs16.writeFileSync(vsixPath, buffer);
-            return new Promise((resolve15) => {
+            return new Promise((resolve16) => {
               const cmd = `"${ide.cliCommand}" --install-extension "${vsixPath}" --force`;
               (0, import_child_process11.exec)(cmd, { timeout: 6e4 }, (error48, _stdout, stderr) => {
-                resolve15({
+                resolve16({
                   extensionId: extension.id,
                   marketplaceId: extension.marketplaceId,
                   success: !error48,
@@ -56890,11 +56951,11 @@ data: ${JSON.stringify(msg.data)}
         } catch (e) {
         }
       }
-      return new Promise((resolve15) => {
+      return new Promise((resolve16) => {
         const cmd = `"${ide.cliCommand}" --install-extension ${extension.marketplaceId} --force`;
         (0, import_child_process11.exec)(cmd, { timeout: 6e4 }, (error48, stdout, stderr) => {
           if (error48) {
-            resolve15({
+            resolve16({
               extensionId: extension.id,
               marketplaceId: extension.marketplaceId,
               success: false,
@@ -56902,7 +56963,7 @@ data: ${JSON.stringify(msg.data)}
               error: stderr || error48.message
             });
           } else {
-            resolve15({
+            resolve16({
               extensionId: extension.id,
               marketplaceId: extension.marketplaceId,
               success: true,