adhdev 0.9.71 → 0.9.73

package/dist/index.js

@@ -2656,8 +2656,8 @@ async function detectIDEs(providerLoader) {
       if ((0, import_fs4.existsSync)(bundledCli)) resolvedCli = bundledCli;
     }
     if (!resolvedCli && appPath && os29 === "win32") {
-      const { dirname: dirname10 } = await import("path");
-      const appDir = dirname10(appPath);
+      const { dirname: dirname11 } = await import("path");
+      const appDir = dirname11(appPath);
       const candidates = [
         `${appDir}\\\\bin\\\\${def.cli}.cmd`,
         `${appDir}\\\\bin\\\\${def.cli}`,
@@ -2729,19 +2729,19 @@ function resolveCommandPath(command) {
   return null;
 }
 function execAsync(cmd, timeoutMs = 5e3) {
-  return new Promise((resolve19) => {
+  return new Promise((resolve20) => {
     const child = (0, import_child_process2.exec)(cmd, {
       encoding: "utf-8",
       timeout: timeoutMs,
       ...process.platform === "win32" ? { windowsHide: true } : {}
     }, (err, stdout) => {
       if (err || !stdout?.trim()) {
-        resolve19(null);
+        resolve20(null);
       } else {
-        resolve19(stdout.trim());
+        resolve20(stdout.trim());
       }
     });
-    child.on("error", () => resolve19(null));
+    child.on("error", () => resolve20(null));
   });
 }
 async function detectCLIs(providerLoader, options) {
@@ -3353,7 +3353,7 @@ var init_manager = __esm({
       * Returns multiple entries if multiple IDE windows are open on same port
       */
       static listAllTargets(port) {
-        return new Promise((resolve19) => {
+        return new Promise((resolve20) => {
           const req = http.get(`http://127.0.0.1:${port}/json`, (res) => {
             let data = "";
             res.on("data", (chunk) => data += chunk.toString());
@@ -3369,16 +3369,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 || ""));
-                resolve19(mainPages.length > 0 ? mainPages : fallbackPages);
+                resolve20(mainPages.length > 0 ? mainPages : fallbackPages);
               } catch {
-                resolve19([]);
+                resolve20([]);
               }
             });
           });
-          req.on("error", () => resolve19([]));
+          req.on("error", () => resolve20([]));
           req.setTimeout(2e3, () => {
             req.destroy();
-            resolve19([]);
+            resolve20([]);
           });
         });
       }
@@ -3418,7 +3418,7 @@ var init_manager = __esm({
         }
       }
       findTargetOnPort(port) {
-        return new Promise((resolve19) => {
+        return new Promise((resolve20) => {
           const req = http.get(`http://127.0.0.1:${port}/json`, (res) => {
             let data = "";
             res.on("data", (chunk) => data += chunk.toString());
@@ -3429,7 +3429,7 @@ var init_manager = __esm({
                   (t) => (t.type === "page" || t.type === "browser" || t.type === "Page") && t.webSocketDebuggerUrl
                 );
                 if (pages.length === 0) {
-                  resolve19(targets.find((t) => t.webSocketDebuggerUrl) || null);
+                  resolve20(targets.find((t) => t.webSocketDebuggerUrl) || null);
                   return;
                 }
                 const titleFilteredPages = pages.filter((t) => !this.isNonMainTitle(t.title || ""));
@@ -3448,25 +3448,25 @@ var init_manager = __esm({
                     this._targetId = selected.target.id;
                   }
                   this._pageTitle = selected.target.title || "";
-                  resolve19(selected.target);
+                  resolve20(selected.target);
                   return;
                 }
                 if (previousTargetId) {
                   this.log(`[CDP] Target ${previousTargetId} not found in page list`);
-                  resolve19(null);
+                  resolve20(null);
                   return;
                 }
                 this._pageTitle = list[0]?.title || "";
-                resolve19(list[0]);
+                resolve20(list[0]);
               } catch {
-                resolve19(null);
+                resolve20(null);
               }
             });
           });
-          req.on("error", () => resolve19(null));
+          req.on("error", () => resolve20(null));
           req.setTimeout(2e3, () => {
             req.destroy();
-            resolve19(null);
+            resolve20(null);
           });
         });
       }
@@ -3477,7 +3477,7 @@ var init_manager = __esm({
         this.extensionProviders = providers;
       }
       connectToTarget(wsUrl) {
-        return new Promise((resolve19) => {
+        return new Promise((resolve20) => {
           this.ws = new import_ws.default(wsUrl);
           this.ws.on("open", async () => {
             this._connected = true;
@@ -3487,17 +3487,17 @@ var init_manager = __esm({
             }
             this.connectBrowserWs().catch(() => {
             });
-            resolve19(true);
+            resolve20(true);
           });
           this.ws.on("message", (data) => {
             try {
               const msg = JSON.parse(data.toString());
               if (msg.id && this.pending.has(msg.id)) {
-                const { resolve: resolve20, reject } = this.pending.get(msg.id);
+                const { resolve: resolve21, reject } = this.pending.get(msg.id);
                 this.pending.delete(msg.id);
                 this.failureCount = 0;
                 if (msg.error) reject(new Error(msg.error.message));
-                else resolve20(msg.result);
+                else resolve21(msg.result);
               } else if (msg.method === "Runtime.executionContextCreated") {
                 this.contexts.add(msg.params.context.id);
               } else if (msg.method === "Runtime.executionContextDestroyed") {
@@ -3520,7 +3520,7 @@ var init_manager = __esm({
           this.ws.on("error", (err) => {
             this.log(`[CDP] WebSocket error: ${err.message}`);
             this._connected = false;
-            resolve19(false);
+            resolve20(false);
           });
         });
       }
@@ -3534,7 +3534,7 @@ var init_manager = __esm({
             return;
           }
           this.log(`[CDP] Connecting browser WS for target discovery...`);
-          await new Promise((resolve19, reject) => {
+          await new Promise((resolve20, reject) => {
             this.browserWs = new import_ws.default(browserWsUrl);
             this.browserWs.on("open", async () => {
               this._browserConnected = true;
@@ -3544,16 +3544,16 @@ var init_manager = __esm({
               } catch (e) {
                 this.log(`[CDP] setDiscoverTargets failed: ${e.message}`);
               }
-              resolve19();
+              resolve20();
             });
             this.browserWs.on("message", (data) => {
               try {
                 const msg = JSON.parse(data.toString());
                 if (msg.id && this.browserPending.has(msg.id)) {
-                  const { resolve: resolve20, reject: reject2 } = this.browserPending.get(msg.id);
+                  const { resolve: resolve21, reject: reject2 } = this.browserPending.get(msg.id);
                   this.browserPending.delete(msg.id);
                   if (msg.error) reject2(new Error(msg.error.message));
-                  else resolve20(msg.result);
+                  else resolve21(msg.result);
                 }
               } catch {
               }
@@ -3573,31 +3573,31 @@ var init_manager = __esm({
         }
       }
       getBrowserWsUrl() {
-        return new Promise((resolve19) => {
+        return new Promise((resolve20) => {
           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);
-                resolve19(info.webSocketDebuggerUrl || null);
+                resolve20(info.webSocketDebuggerUrl || null);
               } catch {
-                resolve19(null);
+                resolve20(null);
               }
             });
           });
-          req.on("error", () => resolve19(null));
+          req.on("error", () => resolve20(null));
           req.setTimeout(3e3, () => {
             req.destroy();
-            resolve19(null);
+            resolve20(null);
           });
         });
       }
       sendBrowser(method, params = {}, timeoutMs = 15e3) {
-        return new Promise((resolve19, reject) => {
+        return new Promise((resolve20, reject) => {
           if (!this.browserWs || !this._browserConnected) return reject(new Error("Browser WS not connected"));
           const id = this.browserMsgId++;
-          this.browserPending.set(id, { resolve: resolve19, reject });
+          this.browserPending.set(id, { resolve: resolve20, reject });
           this.browserWs.send(JSON.stringify({ id, method, params }));
           setTimeout(() => {
             if (this.browserPending.has(id)) {
@@ -3637,11 +3637,11 @@ var init_manager = __esm({
       }
       // ─── CDP Protocol ────────────────────────────────────────
       sendInternal(method, params = {}, timeoutMs = 15e3) {
-        return new Promise((resolve19, reject) => {
+        return new Promise((resolve20, 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: resolve19, reject });
+          this.pending.set(id, { resolve: resolve20, reject });
           this.ws.send(JSON.stringify({ id, method, params }));
           setTimeout(() => {
             if (this.pending.has(id)) {
@@ -3890,7 +3890,7 @@ var init_manager = __esm({
         const browserWs = this.browserWs;
         let msgId = this.browserMsgId;
         const sendWs = (method, params = {}, sessionId) => {
-          return new Promise((resolve19, reject) => {
+          return new Promise((resolve20, reject) => {
             const mid = msgId++;
             this.browserMsgId = msgId;
             const handler = (raw) => {
@@ -3899,7 +3899,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 resolve19(msg.result);
+                  else resolve20(msg.result);
                 }
               } catch {
               }
@@ -4100,14 +4100,14 @@ var init_manager = __esm({
         if (!ws || ws.readyState !== import_ws.default.OPEN) {
           throw new Error("CDP not connected");
         }
-        return new Promise((resolve19, reject) => {
+        return new Promise((resolve20, reject) => {
           const id = getNextId();
           pendingMap.set(id, {
             resolve: (result) => {
               if (result?.result?.subtype === "error") {
                 reject(new Error(result.result.description));
               } else {
-                resolve19(result?.result?.value);
+                resolve20(result?.result?.value);
               }
             },
             reject
@@ -4139,10 +4139,10 @@ var init_manager = __esm({
           throw new Error("CDP not connected");
         }
         const sendViaSession = (method, params = {}) => {
-          return new Promise((resolve19, reject) => {
+          return new Promise((resolve20, reject) => {
             const pendingMap = this._browserConnected ? this.browserPending : this.pending;
             const id = this._browserConnected ? this.browserMsgId++ : this.msgId++;
-            pendingMap.set(id, { resolve: resolve19, reject });
+            pendingMap.set(id, { resolve: resolve20, reject });
             ws.send(JSON.stringify({ id, sessionId, method, params }));
             setTimeout(() => {
               if (pendingMap.has(id)) {
@@ -9527,7 +9527,7 @@ function getCliVisibleTranscriptCount(adapter) {
 async function getStableExtensionBaseline(h) {
   const first = await readExtensionChatState(h);
   if (getStateMessageCount(first) > 0 || getStateLastSignature(first)) return first;
-  await new Promise((resolve19) => setTimeout(resolve19, 150));
+  await new Promise((resolve20) => setTimeout(resolve20, 150));
   const second = await readExtensionChatState(h);
   return getStateMessageCount(second) >= getStateMessageCount(first) ? second : first;
 }
@@ -9535,7 +9535,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((resolve19) => setTimeout(resolve19, 250));
+    await new Promise((resolve20) => setTimeout(resolve20, 250));
     const state = await readExtensionChatState(h);
     if (state?.status === "waiting_approval") return true;
     const afterCount = getStateMessageCount(state);
@@ -11207,7 +11207,7 @@ async function executeProviderScript(h, args, scriptName) {
         const enterCount = cliCommand.enterCount || 1;
         await adapter.writeRaw(cliCommand.text + "\r");
         for (let i = 1; i < enterCount; i += 1) {
-          await new Promise((resolve19) => setTimeout(resolve19, 50));
+          await new Promise((resolve20) => setTimeout(resolve20, 50));
           await adapter.writeRaw("\r");
         }
       }
@@ -11923,7 +11923,7 @@ var init_handler = __esm({
         try {
           const http3 = await import("http");
           const postData = JSON.stringify(body);
-          const result = await new Promise((resolve19, reject) => {
+          const result = await new Promise((resolve20, reject) => {
             const req = http3.request({
               hostname: "127.0.0.1",
               port: 19280,
@@ -11935,9 +11935,9 @@ var init_handler = __esm({
               res.on("data", (chunk) => data += chunk);
               res.on("end", () => {
                 try {
-                  resolve19(JSON.parse(data));
+                  resolve20(JSON.parse(data));
                 } catch {
-                  resolve19({ raw: data });
+                  resolve20({ raw: data });
                 }
               });
             });
@@ -11955,15 +11955,15 @@ var init_handler = __esm({
         if (!providerType) return { success: false, error: "providerType required" };
         try {
           const http3 = await import("http");
-          const result = await new Promise((resolve19, reject) => {
+          const result = await new Promise((resolve20, 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 {
-                  resolve19(JSON.parse(data));
+                  resolve20(JSON.parse(data));
                 } catch {
-                  resolve19({ raw: data });
+                  resolve20({ raw: data });
                 }
               });
             }).on("error", reject);
@@ -11977,7 +11977,7 @@ var init_handler = __esm({
         try {
           const http3 = await import("http");
           const postData = JSON.stringify(args || {});
-          const result = await new Promise((resolve19, reject) => {
+          const result = await new Promise((resolve20, reject) => {
             const req = http3.request({
               hostname: "127.0.0.1",
               port: 19280,
@@ -11989,9 +11989,9 @@ var init_handler = __esm({
               res.on("data", (chunk) => data += chunk);
               res.on("end", () => {
                 try {
-                  resolve19(JSON.parse(data));
+                  resolve20(JSON.parse(data));
                 } catch {
-                  resolve19({ raw: data });
+                  resolve20({ raw: data });
                 }
               });
             });
@@ -14138,7 +14138,7 @@ var init_provider_cli_adapter = __esm({
               `[${this.cliType}] Waiting for interactive prompt: status=${status} stableMs=${stableMs} recentOutputMs=${recentlyOutput} screen=${JSON.stringify(summarizeCliTraceText(screenText, 220)).slice(0, 260)}`
             );
           }
-          await new Promise((resolve19) => setTimeout(resolve19, 50));
+          await new Promise((resolve20) => setTimeout(resolve20, 50));
         }
         const finalScreenText = this.terminalScreen.getText() || "";
         LOG.warn(
@@ -15048,7 +15048,7 @@ var init_provider_cli_adapter = __esm({
           const deadline = Date.now() + 1e4;
           while (this.startupParseGate && Date.now() < deadline) {
             this.resolveStartupState("send_wait");
-            await new Promise((resolve19) => setTimeout(resolve19, 50));
+            await new Promise((resolve20) => setTimeout(resolve20, 50));
           }
         }
         if (!allowInterventionPrompt) {
@@ -15124,13 +15124,13 @@ var init_provider_cli_adapter = __esm({
         }
         this.responseEpoch += 1;
         this.responseSettleIgnoreUntil = Date.now() + submitDelayMs + this.timeouts.outputSettle + 250;
-        await new Promise((resolve19, reject) => {
+        await new Promise((resolve20, reject) => {
           let resolved = false;
           const completion = {
             resolveOnce: () => {
               if (resolved) return;
               resolved = true;
-              resolve19();
+              resolve20();
             },
             rejectOnce: (error48) => {
               if (resolved) return;
@@ -15288,17 +15288,17 @@ var init_provider_cli_adapter = __esm({
         }
       }
       waitForStopped(timeoutMs) {
-        return new Promise((resolve19) => {
+        return new Promise((resolve20) => {
           const startedAt = Date.now();
           const timer = setInterval(() => {
             if (!this.ptyProcess || this.currentStatus === "stopped") {
               clearInterval(timer);
-              resolve19(true);
+              resolve20(true);
               return;
             }
             if (Date.now() - startedAt >= timeoutMs) {
               clearInterval(timer);
-              resolve19(false);
+              resolve20(false);
             }
           }, 100);
         });
@@ -15636,7 +15636,7 @@ async function waitForCliAdapterReady(adapter, options) {
     if (status === "stopped") {
       throw new Error("CLI runtime stopped before it became ready");
     }
-    await new Promise((resolve19) => setTimeout(resolve19, pollMs));
+    await new Promise((resolve20) => setTimeout(resolve20, pollMs));
   }
   throw new Error(`CLI runtime did not become ready within ${timeoutMs}ms`);
 }
@@ -16001,7 +16001,7 @@ var init_cli_provider_instance = __esm({
           const enterCount = cliCommand.enterCount || 1;
           await this.adapter.writeRaw(cliCommand.text + "\r");
           for (let i = 1; i < enterCount; i += 1) {
-            await new Promise((resolve19) => setTimeout(resolve19, 50));
+            await new Promise((resolve20) => setTimeout(resolve20, 50));
             await this.adapter.writeRaw("\r");
           }
         }
@@ -32583,8 +32583,8 @@ var init_acp = __esm({
         this.#requestHandler = requestHandler;
         this.#notificationHandler = notificationHandler;
         this.#stream = stream;
-        this.#closedPromise = new Promise((resolve19) => {
-          this.#abortController.signal.addEventListener("abort", () => resolve19());
+        this.#closedPromise = new Promise((resolve20) => {
+          this.#abortController.signal.addEventListener("abort", () => resolve20());
         });
         this.#receive();
       }
@@ -32733,8 +32733,8 @@ var init_acp = __esm({
       }
       async sendRequest(method, params) {
         const id = this.#nextRequestId++;
-        const responsePromise = new Promise((resolve19, reject) => {
-          this.#pendingResponses.set(id, { resolve: resolve19, reject });
+        const responsePromise = new Promise((resolve20, reject) => {
+          this.#pendingResponses.set(id, { resolve: resolve20, reject });
         });
         await this.#sendMessage({ jsonrpc: "2.0", id, method, params });
         return responsePromise;
@@ -33418,13 +33418,13 @@ var init_acp_provider_instance = __esm({
             }
             this.currentStatus = "waiting_approval";
             this.detectStatusTransition();
-            const approved = await new Promise((resolve19) => {
-              this.permissionResolvers.push(resolve19);
+            const approved = await new Promise((resolve20) => {
+              this.permissionResolvers.push(resolve20);
               setTimeout(() => {
-                const idx = this.permissionResolvers.indexOf(resolve19);
+                const idx = this.permissionResolvers.indexOf(resolve20);
                 if (idx >= 0) {
                   this.permissionResolvers.splice(idx, 1);
-                  resolve19(false);
+                  resolve20(false);
                 }
               }, 3e5);
             });
@@ -35559,9 +35559,9 @@ var init_handler2 = __esm({
         if (this.fsw.closed) {
           return;
         }
-        const dirname10 = sp.dirname(file2);
+        const dirname11 = sp.dirname(file2);
         const basename9 = sp.basename(file2);
-        const parent = this.fsw._getWatchedDir(dirname10);
+        const parent = this.fsw._getWatchedDir(dirname11);
         let prevStats = stats;
         if (parent.has(basename9))
           return;
@@ -35588,7 +35588,7 @@ var init_handler2 = __esm({
                 prevStats = newStats2;
               }
             } catch (error48) {
-              this.fsw._remove(dirname10, basename9);
+              this.fsw._remove(dirname11, basename9);
             }
           } else if (parent.has(basename9)) {
             const at = newStats.atimeMs;
@@ -35685,7 +35685,7 @@ var init_handler2 = __esm({
             this._addToNodeFs(path33, initialAdd, wh, depth + 1);
           }
         }).on(EV.ERROR, this._boundHandleError);
-        return new Promise((resolve19, reject) => {
+        return new Promise((resolve20, reject) => {
           if (!stream)
             return reject();
           stream.once(STR_END, () => {
@@ -35694,7 +35694,7 @@ var init_handler2 = __esm({
               return;
             }
             const wasThrottled = throttler ? throttler.clear() : false;
-            resolve19(void 0);
+            resolve20(void 0);
             previous.getChildren().filter((item) => {
               return item !== directory && !current.has(item);
             }).forEach((item) => {
@@ -37794,7 +37794,7 @@ var init_provider_loader = __esm({
           return { updated: false };
         }
         try {
-          const etag = await new Promise((resolve19, reject) => {
+          const etag = await new Promise((resolve20, reject) => {
             const options = {
               method: "HEAD",
               hostname: "github.com",
@@ -37812,7 +37812,7 @@ var init_provider_loader = __esm({
                   headers: { "User-Agent": "adhdev-launcher" },
                   timeout: 1e4
                 }, (res2) => {
-                  resolve19(res2.headers.etag || res2.headers["last-modified"] || "");
+                  resolve20(res2.headers.etag || res2.headers["last-modified"] || "");
                 });
                 req2.on("error", reject);
                 req2.on("timeout", () => {
@@ -37821,7 +37821,7 @@ var init_provider_loader = __esm({
                 });
                 req2.end();
               } else {
-                resolve19(res.headers.etag || res.headers["last-modified"] || "");
+                resolve20(res.headers.etag || res.headers["last-modified"] || "");
               }
             });
             req.on("error", reject);
@@ -37885,7 +37885,7 @@ var init_provider_loader = __esm({
       downloadFile(url2, destPath) {
         const https = require("https");
         const http3 = require("http");
-        return new Promise((resolve19, reject) => {
+        return new Promise((resolve20, reject) => {
           const doRequest = (reqUrl, redirectCount = 0) => {
             if (redirectCount > 5) {
               reject(new Error("Too many redirects"));
@@ -37905,7 +37905,7 @@ var init_provider_loader = __esm({
               res.pipe(ws);
               ws.on("finish", () => {
                 ws.close();
-                resolve19();
+                resolve20();
               });
               ws.on("error", reject);
             });
@@ -38490,17 +38490,17 @@ async function findFreePort(ports) {
   throw new Error("No free port found");
 }
 function checkPortFree(port) {
-  return new Promise((resolve19) => {
+  return new Promise((resolve20) => {
     const server = net2.createServer();
     server.unref();
-    server.on("error", () => resolve19(false));
+    server.on("error", () => resolve20(false));
     server.listen(port, "127.0.0.1", () => {
-      server.close(() => resolve19(true));
+      server.close(() => resolve20(true));
     });
   });
 }
 async function isCdpActive(port) {
-  return new Promise((resolve19) => {
+  return new Promise((resolve20) => {
     const req = require("http").get(`http://127.0.0.1:${port}/json/version`, {
       timeout: 2e3
     }, (res) => {
@@ -38509,16 +38509,16 @@ async function isCdpActive(port) {
       res.on("end", () => {
         try {
           const info = JSON.parse(data);
-          resolve19(!!info["WebKit-Version"] || !!info["Browser"]);
+          resolve20(!!info["WebKit-Version"] || !!info["Browser"]);
         } catch {
-          resolve19(false);
+          resolve20(false);
         }
       });
     });
-    req.on("error", () => resolve19(false));
+    req.on("error", () => resolve20(false));
     req.on("timeout", () => {
       req.destroy();
-      resolve19(false);
+      resolve20(false);
     });
   });
 }
@@ -39029,11 +39029,23 @@ function resolveMeshCoordinatorSetup(options) {
     if (!path33) {
       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, path33),
-      configFormat: mcpConfig.format
+      configPath: (0, import_node_path2.join)(workspace, path33),
+      configFormat: mcpConfig.format,
+      mcpServer
     };
   }
   if (mcpConfig.mode === "manual") {
@@ -39065,11 +39077,60 @@ function resolveMeshCoordinatorSetup(options) {
 function renderMeshCoordinatorTemplate(template, values) {
   return template.replace(/\{\{\s*(meshId|workspace|serverName|adhdevMcpCommand)\s*\}\}/g, (_2, key) => values[key] || "");
 }
-var import_path4, DEFAULT_SERVER_NAME, DEFAULT_ADHDEV_MCP_COMMAND;
+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_fs4.existsSync)(filePath)) return null;
+    return import_node_fs4.realpathSync.native(filePath);
+  } catch {
+    return null;
+  }
+}
+var import_node_fs4, import_node_module2, import_node_path2, DEFAULT_SERVER_NAME, DEFAULT_ADHDEV_MCP_COMMAND;
 var init_mesh_coordinator = __esm({
   "../../oss/packages/daemon-core/src/commands/mesh-coordinator.ts"() {
     "use strict";
-    import_path4 = require("path");
+    import_node_fs4 = require("fs");
+    import_node_module2 = require("module");
+    import_node_path2 = require("path");
     DEFAULT_SERVER_NAME = "adhdev-mesh";
     DEFAULT_ADHDEV_MCP_COMMAND = "adhdev-mcp";
   }
@@ -39588,7 +39649,7 @@ async function waitForPidExit(pid, timeoutMs) {
   while (Date.now() - start < timeoutMs) {
     try {
       process.kill(pid, 0);
-      await new Promise((resolve19) => setTimeout(resolve19, 250));
+      await new Promise((resolve20) => setTimeout(resolve20, 250));
     } catch {
       return;
     }
@@ -39699,7 +39760,7 @@ async function runDaemonUpgradeHelper(payload) {
     appendUpgradeLog(installOutput.trim());
   }
   if (process.platform === "win32") {
-    await new Promise((resolve19) => setTimeout(resolve19, 500));
+    await new Promise((resolve20) => setTimeout(resolve20, 500));
     cleanupStaleGlobalInstallDirs(payload.packageName, installCommand.surface);
     appendUpgradeLog("Post-install staging cleanup complete");
   }
@@ -40585,7 +40646,20 @@ var init_router = __esm({
               }
               if (!mesh) return { success: false, error: "Mesh not found" };
               if (!Array.isArray(mesh.nodes) || mesh.nodes.length === 0) return { success: false, error: "No nodes in mesh" };
-              const workspace = mesh.nodes[0].workspace;
+              const requestedCoordinatorNodeId = typeof args?.coordinatorNodeId === "string" ? args.coordinatorNodeId.trim() : "";
+              const preferredCoordinatorNodeId = requestedCoordinatorNodeId || (typeof mesh.coordinator?.preferredNodeId === "string" ? mesh.coordinator.preferredNodeId.trim() : "");
+              const coordinatorNode = preferredCoordinatorNodeId ? mesh.nodes.find((node) => node?.id === preferredCoordinatorNodeId || node?.nodeId === preferredCoordinatorNodeId) : mesh.nodes[0];
+              if (!coordinatorNode) {
+                return {
+                  success: false,
+                  code: "mesh_coordinator_node_not_found",
+                  error: `Coordinator node ${preferredCoordinatorNodeId} was not found in mesh`,
+                  meshId,
+                  cliType
+                };
+              }
+              const workspace = typeof coordinatorNode.workspace === "string" ? coordinatorNode.workspace.trim() : "";
+              if (!workspace) return { success: false, error: "Coordinator node workspace required", meshId, cliType };
               const providerMeta = this.deps.providerLoader.resolve?.(cliType) || this.deps.providerLoader.getMeta(cliType);
               const coordinatorSetup = resolveMeshCoordinatorSetup({
                 provider: providerMeta,
@@ -40623,9 +40697,9 @@ var init_router = __esm({
                   workspace
                 };
               }
-              const { existsSync: existsSync25, readFileSync: readFileSync20, writeFileSync: writeFileSync14, copyFileSync: copyFileSync4 } = await import("fs");
+              const { existsSync: existsSync26, readFileSync: readFileSync20, writeFileSync: writeFileSync14, copyFileSync: copyFileSync4 } = await import("fs");
               const mcpConfigPath = coordinatorSetup.configPath;
-              const hadExistingMcpConfig = existsSync25(mcpConfigPath);
+              const hadExistingMcpConfig = existsSync26(mcpConfigPath);
               let existingMcpConfig = {};
               if (hadExistingMcpConfig) {
                 try {
@@ -40639,8 +40713,8 @@ var init_router = __esm({
                 mcpServers: {
                   ...existingMcpConfig.mcpServers || {},
                   [coordinatorSetup.serverName]: {
-                    command: "adhdev-mcp",
-                    args: ["--repo-mesh", meshId]
+                    command: coordinatorSetup.mcpServer.command,
+                    args: coordinatorSetup.mcpServer.args
                   }
                 }
               };
@@ -41326,7 +41400,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((resolve19) => setTimeout(resolve19, 250));
+          await new Promise((resolve20) => setTimeout(resolve20, 250));
           let state;
           try {
             state = await this.readChat(evaluate);
@@ -41348,7 +41422,7 @@ var init_provider_adapter = __esm({
         if (this.messageCount(first) > 0 || this.lastMessageSignature(first)) {
           return first;
         }
-        await new Promise((resolve19) => setTimeout(resolve19, 150));
+        await new Promise((resolve20) => setTimeout(resolve20, 150));
         const second = await this.readChat(evaluate);
         return this.messageCount(second) >= this.messageCount(first) ? second : first;
       }
@@ -41499,7 +41573,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((resolve19) => setTimeout(resolve19, 250));
+          await new Promise((resolve20) => setTimeout(resolve20, 250));
           const state = await this.readChat(evaluate);
           const title = this.getStateTitle(state);
           if (this.titlesMatch(title, sessionId)) return true;
@@ -44146,7 +44220,7 @@ function getCliTargetBundle(ctx, type, instanceId) {
   return { target, instance, adapter };
 }
 function sleep(ms) {
-  return new Promise((resolve19) => setTimeout(resolve19, ms));
+  return new Promise((resolve20) => setTimeout(resolve20, ms));
 }
 async function waitForCliReady(ctx, type, instanceId, timeoutMs) {
   const startedAt = Date.now();
@@ -46426,15 +46500,15 @@ var init_dev_server = __esm({
             this.json(res, 500, { error: e.message });
           }
         });
-        return new Promise((resolve19, reject) => {
+        return new Promise((resolve20, reject) => {
           this.server.listen(port, "127.0.0.1", () => {
             this.log(`Dev server listening on http://127.0.0.1:${port}`);
-            resolve19();
+            resolve20();
           });
           this.server.on("error", (e) => {
             if (e.code === "EADDRINUSE") {
               this.log(`Port ${port} in use, skipping dev server`);
-              resolve19();
+              resolve20();
             } else {
               reject(e);
             }
@@ -46516,20 +46590,20 @@ var init_dev_server = __esm({
           child.stderr?.on("data", (d) => {
             stderr += d.toString().slice(0, 2e3);
           });
-          await new Promise((resolve19) => {
+          await new Promise((resolve20) => {
             const timer = setTimeout(() => {
               child.kill();
-              resolve19();
+              resolve20();
             }, 3e3);
             child.on("exit", () => {
               clearTimeout(timer);
-              resolve19();
+              resolve20();
             });
             child.stdout?.once("data", () => {
               setTimeout(() => {
                 child.kill();
                 clearTimeout(timer);
-                resolve19();
+                resolve20();
               }, 500);
             });
           });
@@ -47032,14 +47106,14 @@ var init_dev_server = __esm({
           child.stderr?.on("data", (d) => {
             stderr += d.toString();
           });
-          await new Promise((resolve19) => {
+          await new Promise((resolve20) => {
             const timer = setTimeout(() => {
               child.kill();
-              resolve19();
+              resolve20();
             }, timeout);
             child.on("exit", () => {
               clearTimeout(timer);
-              resolve19();
+              resolve20();
             });
           });
           const elapsed = Date.now() - start;
@@ -47709,14 +47783,14 @@ data: ${JSON.stringify(msg.data)}
         res.end(JSON.stringify(data, null, 2));
       }
       async readBody(req) {
-        return new Promise((resolve19) => {
+        return new Promise((resolve20) => {
           let body = "";
           req.on("data", (chunk) => body += chunk);
           req.on("end", () => {
             try {
-              resolve19(JSON.parse(body));
+              resolve20(JSON.parse(body));
             } catch {
-              resolve19({});
+              resolve20({});
             }
           });
         });
@@ -48233,7 +48307,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((resolve19) => setTimeout(resolve19, STARTUP_POLL_MS));
+    await new Promise((resolve20) => setTimeout(resolve20, STARTUP_POLL_MS));
   }
   throw new Error(`Session host did not become ready within ${timeoutMs}ms`);
 }
@@ -48339,10 +48413,10 @@ async function installExtension(ide, extension) {
         const buffer = Buffer.from(await res.arrayBuffer());
         const fs20 = await import("fs");
         fs20.writeFileSync(vsixPath, buffer);
-        return new Promise((resolve19) => {
+        return new Promise((resolve20) => {
           const cmd = `"${ide.cliCommand}" --install-extension "${vsixPath}" --force`;
           (0, import_child_process11.exec)(cmd, { timeout: 6e4 }, (error48, _stdout, stderr) => {
-            resolve19({
+            resolve20({
               extensionId: extension.id,
               marketplaceId: extension.marketplaceId,
               success: !error48,
@@ -48355,11 +48429,11 @@ async function installExtension(ide, extension) {
     } catch (e) {
     }
   }
-  return new Promise((resolve19) => {
+  return new Promise((resolve20) => {
     const cmd = `"${ide.cliCommand}" --install-extension ${extension.marketplaceId} --force`;
     (0, import_child_process11.exec)(cmd, { timeout: 6e4 }, (error48, stdout, stderr) => {
       if (error48) {
-        resolve19({
+        resolve20({
           extensionId: extension.id,
           marketplaceId: extension.marketplaceId,
           success: false,
@@ -48367,7 +48441,7 @@ async function installExtension(ide, extension) {
           error: stderr || error48.message
         });
       } else {
-        resolve19({
+        resolve20({
           extensionId: extension.id,
           marketplaceId: extension.marketplaceId,
           success: true,
@@ -49222,7 +49296,7 @@ var init_server_connection = __esm({
        * Returns the command result or throws on timeout / auth failure.
        */
       sendMeshCommand(targetDaemonId, command, args = {}, timeoutMs = 3e4) {
-        return new Promise((resolve19, reject) => {
+        return new Promise((resolve20, reject) => {
           const requestId = `mesh_${crypto.randomUUID()}`;
           const timer = setTimeout(() => {
             this.off("daemon_mesh_result", handler);
@@ -49235,7 +49309,7 @@ var init_server_connection = __esm({
             if (msg.payload?.success === false) {
               reject(new Error(msg.payload?.error ?? "Mesh command failed"));
             } else {
-              resolve19(msg.payload?.result);
+              resolve20(msg.payload?.result);
             }
           };
           this.on("daemon_mesh_result", handler);
@@ -50542,19 +50616,19 @@ var init_peer_connection_manager = __esm({
 });
 
 // src/daemon-p2p/index.ts
-var fs16, path27, import_node_module2, esmRequire, DaemonP2PSender;
+var fs16, path27, import_node_module3, esmRequire, DaemonP2PSender;
 var init_daemon_p2p = __esm({
   "src/daemon-p2p/index.ts"() {
     "use strict";
     fs16 = __toESM(require("fs"));
     path27 = __toESM(require("path"));
-    import_node_module2 = require("module");
+    import_node_module3 = require("module");
     init_src();
     init_data_channel_router();
     init_screenshot_sender();
     init_peer_connection_manager();
     init_log();
-    esmRequire = (0, import_node_module2.createRequire)(__filename);
+    esmRequire = (0, import_node_module3.createRequire)(__filename);
     DaemonP2PSender = class {
       serverConn;
       peers = /* @__PURE__ */ new Map();
@@ -51031,14 +51105,14 @@ var require_filesystem = __commonJS({
       });
       return buffer.subarray(0, bytesRead);
     };
-    var readFile2 = (path33) => new Promise((resolve19, reject) => {
+    var readFile2 = (path33) => new Promise((resolve20, reject) => {
       fs20.open(path33, "r", (err, fd) => {
         if (err) {
           reject(err);
         } else {
           const buffer = Buffer.alloc(MAX_LENGTH);
           fs20.read(fd, buffer, 0, MAX_LENGTH, 0, (_2, bytesRead) => {
-            resolve19(buffer.subarray(0, bytesRead));
+            resolve20(buffer.subarray(0, bytesRead));
             fs20.close(fd, () => {
             });
           });
@@ -51106,10 +51180,10 @@ var require_detect_libc = __commonJS({
     var commandOut = "";
     var safeCommand = () => {
       if (!commandOut) {
-        return new Promise((resolve19) => {
+        return new Promise((resolve20) => {
           childProcess.exec(command, (err, out) => {
             commandOut = err ? " " : out;
-            resolve19(commandOut);
+            resolve20(commandOut);
           });
         });
       }
@@ -53789,14 +53863,14 @@ var require_input = __commonJS({
         return this;
       } else {
         if (this._isStreamInput()) {
-          return new Promise((resolve19, reject) => {
+          return new Promise((resolve20, reject) => {
             const finished = () => {
               this._flattenBufferIn();
               sharp.metadata(this.options, (err, metadata2) => {
                 if (err) {
                   reject(is.nativeError(err, stack));
                 } else {
-                  resolve19(metadata2);
+                  resolve20(metadata2);
                 }
               });
             };
@@ -53807,12 +53881,12 @@ var require_input = __commonJS({
             }
           });
         } else {
-          return new Promise((resolve19, reject) => {
+          return new Promise((resolve20, reject) => {
             sharp.metadata(this.options, (err, metadata2) => {
               if (err) {
                 reject(is.nativeError(err, stack));
               } else {
-                resolve19(metadata2);
+                resolve20(metadata2);
               }
             });
           });
@@ -53845,25 +53919,25 @@ var require_input = __commonJS({
         return this;
       } else {
         if (this._isStreamInput()) {
-          return new Promise((resolve19, reject) => {
+          return new Promise((resolve20, reject) => {
             this.on("finish", function() {
               this._flattenBufferIn();
               sharp.stats(this.options, (err, stats2) => {
                 if (err) {
                   reject(is.nativeError(err, stack));
                 } else {
-                  resolve19(stats2);
+                  resolve20(stats2);
                 }
               });
             });
           });
         } else {
-          return new Promise((resolve19, reject) => {
+          return new Promise((resolve20, reject) => {
             sharp.stats(this.options, (err, stats2) => {
               if (err) {
                 reject(is.nativeError(err, stack));
               } else {
-                resolve19(stats2);
+                resolve20(stats2);
               }
             });
           });
@@ -57285,7 +57359,7 @@ var require_output = __commonJS({
         return this;
       } else {
         if (this._isStreamInput()) {
-          return new Promise((resolve19, reject) => {
+          return new Promise((resolve20, reject) => {
             this.once("finish", () => {
               this._flattenBufferIn();
               sharp.pipeline(this.options, (err, data, info) => {
@@ -57293,24 +57367,24 @@ var require_output = __commonJS({
                   reject(is.nativeError(err, stack));
                 } else {
                   if (this.options.resolveWithObject) {
-                    resolve19({ data, info });
+                    resolve20({ data, info });
                   } else {
-                    resolve19(data);
+                    resolve20(data);
                   }
                 }
               });
             });
           });
         } else {
-          return new Promise((resolve19, reject) => {
+          return new Promise((resolve20, reject) => {
             sharp.pipeline(this.options, (err, data, info) => {
               if (err) {
                 reject(is.nativeError(err, stack));
               } else {
                 if (this.options.resolveWithObject) {
-                  resolve19({ data, info });
+                  resolve20({ data, info });
                 } else {
-                  resolve19(data);
+                  resolve20(data);
                 }
               }
             });
@@ -58689,9 +58763,9 @@ function resolvePackageVersion(options) {
   const injectedVersion = options?.injectedVersion || "unknown";
   const dir = options?.dirname || __dirname;
   const possiblePaths = [
-    (0, import_path5.join)(dir, "..", "..", "package.json"),
-    (0, import_path5.join)(dir, "..", "package.json"),
-    (0, import_path5.join)(dir, "package.json")
+    (0, import_path4.join)(dir, "..", "..", "package.json"),
+    (0, import_path4.join)(dir, "..", "package.json"),
+    (0, import_path4.join)(dir, "package.json")
   ];
   for (const p of possiblePaths) {
     try {
@@ -58702,12 +58776,12 @@ function resolvePackageVersion(options) {
   }
   return injectedVersion;
 }
-var import_fs7, import_path5;
+var import_fs7, import_path4;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
     import_fs7 = require("fs");
-    import_path5 = require("path");
+    import_path4 = require("path");
   }
 });
 
@@ -59036,7 +59110,7 @@ var init_adhdev_daemon = __esm({
     init_version();
     init_src();
     init_runtime_defaults();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.71" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.73" });
     AdhdevDaemon = class _AdhdevDaemon {
       localHttpServer = null;
       localWss = null;
@@ -59852,7 +59926,7 @@ ${err?.stack || ""}`);
         try {
           const statusResult = await Promise.race([
             this.components.router.execute("git_status", { workspace }, "mesh"),
-            new Promise((resolve19) => setTimeout(() => resolve19(null), 4e3))
+            new Promise((resolve20) => setTimeout(() => resolve20(null), 4e3))
           ]);
           const s = statusResult?.status ?? statusResult;
           if (s?.isGitRepo) {
@@ -60035,7 +60109,7 @@ ${err?.stack || ""}`);
             this.localWss.emit("connection", ws, req);
           });
         });
-        await new Promise((resolve19, reject) => {
+        await new Promise((resolve20, reject) => {
           const cleanup = () => {
             this.localHttpServer?.off("error", onError);
             this.localHttpServer?.off("listening", onListening);
@@ -60046,7 +60120,7 @@ ${err?.stack || ""}`);
           };
           const onListening = () => {
             cleanup();
-            resolve19();
+            resolve20();
           };
           this.localHttpServer.once("error", onError);
           this.localHttpServer.once("listening", onListening);
@@ -60220,12 +60294,12 @@ ${err?.stack || ""}`);
           this.localClients.clear();
           this.localWss?.close();
           this.localWss = null;
-          await new Promise((resolve19) => {
+          await new Promise((resolve20) => {
             if (!this.localHttpServer) {
-              resolve19();
+              resolve20();
               return;
             }
-            this.localHttpServer.close(() => resolve19());
+            this.localHttpServer.close(() => resolve20());
             this.localHttpServer = null;
           });
         } catch {
@@ -60773,14 +60847,14 @@ var require_run_async = __commonJS({
       return function() {
         var args = arguments;
         var originalThis = this;
-        var promise2 = new Promise(function(resolve19, reject) {
+        var promise2 = new Promise(function(resolve20, reject) {
           var resolved = false;
           const wrappedResolve = function(value) {
             if (resolved) {
               console.warn("Run-async promise already resolved.");
             }
             resolved = true;
-            resolve19(value);
+            resolve20(value);
           };
           var rejected = false;
           const wrappedReject = function(value) {
@@ -61571,7 +61645,7 @@ var require_Observable = __commonJS({
       Observable2.prototype.forEach = function(next, promiseCtor) {
         var _this = this;
         promiseCtor = getPromiseCtor(promiseCtor);
-        return new promiseCtor(function(resolve19, reject) {
+        return new promiseCtor(function(resolve20, reject) {
           var subscriber = new Subscriber_1.SafeSubscriber({
             next: function(value) {
               try {
@@ -61582,7 +61656,7 @@ var require_Observable = __commonJS({
               }
             },
             error: reject,
-            complete: resolve19
+            complete: resolve20
           });
           _this.subscribe(subscriber);
         });
@@ -61604,14 +61678,14 @@ var require_Observable = __commonJS({
       Observable2.prototype.toPromise = function(promiseCtor) {
         var _this = this;
         promiseCtor = getPromiseCtor(promiseCtor);
-        return new promiseCtor(function(resolve19, reject) {
+        return new promiseCtor(function(resolve20, reject) {
           var value;
           _this.subscribe(function(x) {
             return value = x;
           }, function(err) {
             return reject(err);
           }, function() {
-            return resolve19(value);
+            return resolve20(value);
           });
         });
       };
@@ -63707,11 +63781,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(resolve19) {
-          resolve19(value);
+        return value instanceof P ? value : new P(function(resolve20) {
+          resolve20(value);
         });
       }
-      return new (P || (P = Promise))(function(resolve19, reject) {
+      return new (P || (P = Promise))(function(resolve20, reject) {
         function fulfilled(value) {
           try {
             step(generator.next(value));
@@ -63727,7 +63801,7 @@ var require_innerFrom = __commonJS({
           }
         }
         function step(result) {
-          result.done ? resolve19(result.value) : adopt(result.value).then(fulfilled, rejected);
+          result.done ? resolve20(result.value) : adopt(result.value).then(fulfilled, rejected);
         }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
       });
@@ -63809,14 +63883,14 @@ var require_innerFrom = __commonJS({
       }, i);
       function verb(n) {
         i[n] = o[n] && function(v) {
-          return new Promise(function(resolve19, reject) {
-            v = o[n](v), settle(resolve19, reject, v.done, v.value);
+          return new Promise(function(resolve20, reject) {
+            v = o[n](v), settle(resolve20, reject, v.done, v.value);
           });
         };
       }
-      function settle(resolve19, reject, d, v) {
+      function settle(resolve20, reject, d, v) {
         Promise.resolve(v).then(function(v2) {
-          resolve19({ value: v2, done: d });
+          resolve20({ value: v2, done: d });
         }, reject);
       }
     };
@@ -64435,7 +64509,7 @@ var require_lastValueFrom = __commonJS({
     var EmptyError_1 = require_EmptyError();
     function lastValueFrom(source, config2) {
       var hasConfig = typeof config2 === "object";
-      return new Promise(function(resolve19, reject) {
+      return new Promise(function(resolve20, reject) {
         var _hasValue = false;
         var _value;
         source.subscribe({
@@ -64446,9 +64520,9 @@ var require_lastValueFrom = __commonJS({
           error: reject,
           complete: function() {
             if (_hasValue) {
-              resolve19(_value);
+              resolve20(_value);
             } else if (hasConfig) {
-              resolve19(config2.defaultValue);
+              resolve20(config2.defaultValue);
             } else {
               reject(new EmptyError_1.EmptyError());
             }
@@ -64470,16 +64544,16 @@ var require_firstValueFrom = __commonJS({
     var Subscriber_1 = require_Subscriber();
     function firstValueFrom(source, config2) {
       var hasConfig = typeof config2 === "object";
-      return new Promise(function(resolve19, reject) {
+      return new Promise(function(resolve20, reject) {
         var subscriber = new Subscriber_1.SafeSubscriber({
           next: function(value) {
-            resolve19(value);
+            resolve20(value);
             subscriber.unsubscribe();
           },
           error: reject,
           complete: function() {
             if (hasConfig) {
-              resolve19(config2.defaultValue);
+              resolve20(config2.defaultValue);
             } else {
               reject(new EmptyError_1.EmptyError());
             }
@@ -76285,14 +76359,14 @@ var require_async_iterator = __commonJS({
       };
     }
     function readAndResolve(iter) {
-      var resolve19 = iter[kLastResolve];
-      if (resolve19 !== null) {
+      var resolve20 = iter[kLastResolve];
+      if (resolve20 !== null) {
         var data = iter[kStream].read();
         if (data !== null) {
           iter[kLastPromise] = null;
           iter[kLastResolve] = null;
           iter[kLastReject] = null;
-          resolve19(createIterResult(data, false));
+          resolve20(createIterResult(data, false));
         }
       }
     }
@@ -76300,13 +76374,13 @@ var require_async_iterator = __commonJS({
       process.nextTick(readAndResolve, iter);
     }
     function wrapForNext(lastPromise, iter) {
-      return function(resolve19, reject) {
+      return function(resolve20, reject) {
         lastPromise.then(function() {
           if (iter[kEnded]) {
-            resolve19(createIterResult(void 0, true));
+            resolve20(createIterResult(void 0, true));
             return;
           }
-          iter[kHandlePromise](resolve19, reject);
+          iter[kHandlePromise](resolve20, reject);
         }, reject);
       };
     }
@@ -76326,12 +76400,12 @@ var require_async_iterator = __commonJS({
           return Promise.resolve(createIterResult(void 0, true));
         }
         if (this[kStream].destroyed) {
-          return new Promise(function(resolve19, reject) {
+          return new Promise(function(resolve20, reject) {
             process.nextTick(function() {
               if (_this[kError]) {
                 reject(_this[kError]);
               } else {
-                resolve19(createIterResult(void 0, true));
+                resolve20(createIterResult(void 0, true));
               }
             });
           });
@@ -76354,13 +76428,13 @@ var require_async_iterator = __commonJS({
       return this;
     }), _defineProperty(_Object$setPrototypeO, "return", function _return() {
       var _this2 = this;
-      return new Promise(function(resolve19, reject) {
+      return new Promise(function(resolve20, reject) {
         _this2[kStream].destroy(null, function(err) {
           if (err) {
             reject(err);
             return;
           }
-          resolve19(createIterResult(void 0, true));
+          resolve20(createIterResult(void 0, true));
         });
       });
     }), _Object$setPrototypeO), AsyncIteratorPrototype);
@@ -76382,15 +76456,15 @@ var require_async_iterator = __commonJS({
         value: stream._readableState.endEmitted,
         writable: true
       }), _defineProperty(_Object$create, kHandlePromise, {
-        value: function value(resolve19, reject) {
+        value: function value(resolve20, reject) {
           var data = iterator[kStream].read();
           if (data) {
             iterator[kLastPromise] = null;
             iterator[kLastResolve] = null;
             iterator[kLastReject] = null;
-            resolve19(createIterResult(data, false));
+            resolve20(createIterResult(data, false));
           } else {
-            iterator[kLastResolve] = resolve19;
+            iterator[kLastResolve] = resolve20;
             iterator[kLastReject] = reject;
           }
         },
@@ -76409,12 +76483,12 @@ var require_async_iterator = __commonJS({
           iterator[kError] = err;
           return;
         }
-        var resolve19 = iterator[kLastResolve];
-        if (resolve19 !== null) {
+        var resolve20 = iterator[kLastResolve];
+        if (resolve20 !== null) {
           iterator[kLastPromise] = null;
           iterator[kLastResolve] = null;
           iterator[kLastReject] = null;
-          resolve19(createIterResult(void 0, true));
+          resolve20(createIterResult(void 0, true));
         }
         iterator[kEnded] = true;
       });
@@ -76429,7 +76503,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, resolve19, reject, _next, _throw, key, arg) {
+    function asyncGeneratorStep(gen, resolve20, reject, _next, _throw, key, arg) {
       try {
         var info = gen[key](arg);
         var value = info.value;
@@ -76438,7 +76512,7 @@ var require_from2 = __commonJS({
         return;
       }
       if (info.done) {
-        resolve19(value);
+        resolve20(value);
       } else {
         Promise.resolve(value).then(_next, _throw);
       }
@@ -76446,13 +76520,13 @@ var require_from2 = __commonJS({
     function _asyncToGenerator(fn) {
       return function() {
         var self2 = this, args = arguments;
-        return new Promise(function(resolve19, reject) {
+        return new Promise(function(resolve20, reject) {
           var gen = fn.apply(self2, args);
           function _next(value) {
-            asyncGeneratorStep(gen, resolve19, reject, _next, _throw, "next", value);
+            asyncGeneratorStep(gen, resolve20, reject, _next, _throw, "next", value);
           }
           function _throw(err) {
-            asyncGeneratorStep(gen, resolve19, reject, _next, _throw, "throw", err);
+            asyncGeneratorStep(gen, resolve20, reject, _next, _throw, "throw", err);
           }
           _next(void 0);
         });
@@ -78391,9 +78465,9 @@ var init_base = __esm({
        * @return {Promise}
        */
       run() {
-        return new Promise((resolve19, reject) => {
+        return new Promise((resolve20, reject) => {
           this._run(
-            (value) => resolve19(value),
+            (value) => resolve20(value),
             (error48) => reject(error48)
           );
         });
@@ -85025,7 +85099,7 @@ var require_lib2 = __commonJS({
       return matches;
     };
     exports2.analyse = analyse;
-    var detectFile = (filepath, opts = {}) => new Promise((resolve19, reject) => {
+    var detectFile = (filepath, opts = {}) => new Promise((resolve20, reject) => {
       let fd;
       const fs20 = (0, node_1.default)();
       const handler = (err, buffer) => {
@@ -85035,7 +85109,7 @@ var require_lib2 = __commonJS({
         if (err) {
           reject(err);
         } else if (buffer) {
-          resolve19((0, exports2.detect)(buffer));
+          resolve20((0, exports2.detect)(buffer));
         } else {
           reject(new Error("No error and no buffer received"));
         }
@@ -88963,14 +89037,14 @@ function splitStringBySpace(str) {
   }
   return pieces;
 }
-var import_chardet, import_child_process14, import_fs8, import_node_path2, import_node_os4, import_node_crypto2, import_iconv_lite, ExternalEditor;
+var import_chardet, import_child_process14, import_fs8, import_node_path3, import_node_os4, import_node_crypto2, import_iconv_lite, ExternalEditor;
 var init_esm2 = __esm({
   "../../node_modules/@inquirer/external-editor/dist/esm/index.js"() {
     "use strict";
     import_chardet = __toESM(require_lib2(), 1);
     import_child_process14 = require("child_process");
     import_fs8 = require("fs");
-    import_node_path2 = __toESM(require("path"), 1);
+    import_node_path3 = __toESM(require("path"), 1);
     import_node_os4 = __toESM(require("os"), 1);
     import_node_crypto2 = require("crypto");
     import_iconv_lite = __toESM(require_lib3(), 1);
@@ -89035,8 +89109,8 @@ var init_esm2 = __esm({
           const prefix = sanitizeAffix(this.fileOptions.prefix);
           const postfix = sanitizeAffix(this.fileOptions.postfix);
           const filename = `${prefix}${id}${postfix}`;
-          const candidate = import_node_path2.default.resolve(baseDir, filename);
-          const baseResolved = import_node_path2.default.resolve(baseDir) + import_node_path2.default.sep;
+          const candidate = import_node_path3.default.resolve(baseDir, filename);
+          const baseResolved = import_node_path3.default.resolve(baseDir) + import_node_path3.default.sep;
           if (!candidate.startsWith(baseResolved)) {
             throw new Error("Resolved temporary file escaped the base directory");
           }