@adhdev/daemon-core 0.9.82-rc.129 → 0.9.82-rc.130

package/dist/index.js

@@ -2153,19 +2153,19 @@ function resolveCommandPath(command) {
   return null;
 }
 function execAsync(cmd, timeoutMs = 5e3) {
-  return new Promise((resolve17) => {
+  return new Promise((resolve18) => {
     const child = (0, import_child_process.exec)(cmd, {
       encoding: "utf-8",
       timeout: timeoutMs,
       ...process.platform === "win32" ? { windowsHide: true } : {}
     }, (err, stdout) => {
       if (err || !stdout?.trim()) {
-        resolve17(null);
+        resolve18(null);
       } else {
-        resolve17(stdout.trim());
+        resolve18(stdout.trim());
       }
     });
-    child.on("error", () => resolve17(null));
+    child.on("error", () => resolve18(null));
   });
 }
 async function detectCLIs(providerLoader, options) {
@@ -5384,7 +5384,7 @@ ${lastSnapshot}`;
               `[${this.cliType}] Waiting for interactive prompt: status=${status} stableMs=${stableMs} recentOutputMs=${recentlyOutput} screen=${JSON.stringify(summarizeCliTraceText(screenText, 220)).slice(0, 260)}`
             );
           }
-          await new Promise((resolve17) => setTimeout(resolve17, 50));
+          await new Promise((resolve18) => setTimeout(resolve18, 50));
         }
         const finalScreenText = this.terminalScreen.getText() || "";
         LOG.warn(
@@ -6629,7 +6629,7 @@ ${lastSnapshot}`;
           const deadline = Date.now() + 1e4;
           while (this.startupParseGate && Date.now() < deadline) {
             this.resolveStartupState("send_wait");
-            await new Promise((resolve17) => setTimeout(resolve17, 50));
+            await new Promise((resolve18) => setTimeout(resolve18, 50));
           }
         }
         const parsedStatusBeforeSend = !allowInputDuringGeneration ? (() => {
@@ -6726,13 +6726,13 @@ ${lastSnapshot}`;
         }
         this.responseEpoch += 1;
         this.responseSettleIgnoreUntil = Date.now() + submitDelayMs + this.timeouts.outputSettle + 250;
-        await new Promise((resolve17, reject) => {
+        await new Promise((resolve18, reject) => {
           let resolved = false;
           const completion = {
             resolveOnce: () => {
               if (resolved) return;
               resolved = true;
-              resolve17();
+              resolve18();
             },
             rejectOnce: (error) => {
               if (resolved) return;
@@ -6890,17 +6890,17 @@ ${lastSnapshot}`;
         }
       }
       waitForStopped(timeoutMs) {
-        return new Promise((resolve17) => {
+        return new Promise((resolve18) => {
           const startedAt = Date.now();
           const timer = setInterval(() => {
             if (!this.ptyProcess || this.currentStatus === "stopped") {
               clearInterval(timer);
-              resolve17(true);
+              resolve18(true);
               return;
             }
             if (Date.now() - startedAt >= timeoutMs) {
               clearInterval(timer);
-              resolve17(false);
+              resolve18(false);
             }
           }, 100);
         });
@@ -11026,7 +11026,7 @@ var DaemonCdpManager = class {
   * Returns multiple entries if multiple IDE windows are open on same port
   */
   static listAllTargets(port) {
-    return new Promise((resolve17) => {
+    return new Promise((resolve18) => {
       const req = http.get(`http://127.0.0.1:${port}/json`, (res) => {
         let data = "";
         res.on("data", (chunk) => data += chunk.toString());
@@ -11042,16 +11042,16 @@ var DaemonCdpManager = class {
               (t) => !isNonMain(t.title || "") && t.url?.includes("workbench.html") && !t.url?.includes("agent")
             );
             const fallbackPages = pages.filter((t) => !isNonMain(t.title || ""));
-            resolve17(mainPages.length > 0 ? mainPages : fallbackPages);
+            resolve18(mainPages.length > 0 ? mainPages : fallbackPages);
           } catch {
-            resolve17([]);
+            resolve18([]);
           }
         });
       });
-      req.on("error", () => resolve17([]));
+      req.on("error", () => resolve18([]));
       req.setTimeout(2e3, () => {
         req.destroy();
-        resolve17([]);
+        resolve18([]);
       });
     });
   }
@@ -11091,7 +11091,7 @@ var DaemonCdpManager = class {
     }
   }
   findTargetOnPort(port) {
-    return new Promise((resolve17) => {
+    return new Promise((resolve18) => {
       const req = http.get(`http://127.0.0.1:${port}/json`, (res) => {
         let data = "";
         res.on("data", (chunk) => data += chunk.toString());
@@ -11102,7 +11102,7 @@ var DaemonCdpManager = class {
               (t) => (t.type === "page" || t.type === "browser" || t.type === "Page") && t.webSocketDebuggerUrl
             );
             if (pages.length === 0) {
-              resolve17(targets.find((t) => t.webSocketDebuggerUrl) || null);
+              resolve18(targets.find((t) => t.webSocketDebuggerUrl) || null);
               return;
             }
             const titleFilteredPages = pages.filter((t) => !this.isNonMainTitle(t.title || ""));
@@ -11121,25 +11121,25 @@ var DaemonCdpManager = class {
                 this._targetId = selected.target.id;
               }
               this._pageTitle = selected.target.title || "";
-              resolve17(selected.target);
+              resolve18(selected.target);
               return;
             }
             if (previousTargetId) {
               this.log(`[CDP] Target ${previousTargetId} not found in page list`);
-              resolve17(null);
+              resolve18(null);
               return;
             }
             this._pageTitle = list[0]?.title || "";
-            resolve17(list[0]);
+            resolve18(list[0]);
           } catch {
-            resolve17(null);
+            resolve18(null);
           }
         });
       });
-      req.on("error", () => resolve17(null));
+      req.on("error", () => resolve18(null));
       req.setTimeout(2e3, () => {
         req.destroy();
-        resolve17(null);
+        resolve18(null);
       });
     });
   }
@@ -11150,7 +11150,7 @@ var DaemonCdpManager = class {
     this.extensionProviders = providers;
   }
   connectToTarget(wsUrl) {
-    return new Promise((resolve17) => {
+    return new Promise((resolve18) => {
       this.ws = new import_ws.default(wsUrl);
       this.ws.on("open", async () => {
         this._connected = true;
@@ -11160,17 +11160,17 @@ var DaemonCdpManager = class {
         }
         this.connectBrowserWs().catch(() => {
         });
-        resolve17(true);
+        resolve18(true);
       });
       this.ws.on("message", (data) => {
         try {
           const msg = JSON.parse(data.toString());
           if (msg.id && this.pending.has(msg.id)) {
-            const { resolve: resolve18, reject } = this.pending.get(msg.id);
+            const { resolve: resolve19, reject } = this.pending.get(msg.id);
             this.pending.delete(msg.id);
             this.failureCount = 0;
             if (msg.error) reject(new Error(msg.error.message));
-            else resolve18(msg.result);
+            else resolve19(msg.result);
           } else if (msg.method === "Runtime.executionContextCreated") {
             this.contexts.add(msg.params.context.id);
           } else if (msg.method === "Runtime.executionContextDestroyed") {
@@ -11193,7 +11193,7 @@ var DaemonCdpManager = class {
       this.ws.on("error", (err) => {
         this.log(`[CDP] WebSocket error: ${err.message}`);
         this._connected = false;
-        resolve17(false);
+        resolve18(false);
       });
     });
   }
@@ -11207,7 +11207,7 @@ var DaemonCdpManager = class {
         return;
       }
       this.log(`[CDP] Connecting browser WS for target discovery...`);
-      await new Promise((resolve17, reject) => {
+      await new Promise((resolve18, reject) => {
         this.browserWs = new import_ws.default(browserWsUrl);
         this.browserWs.on("open", async () => {
           this._browserConnected = true;
@@ -11217,16 +11217,16 @@ var DaemonCdpManager = class {
           } catch (e) {
             this.log(`[CDP] setDiscoverTargets failed: ${e.message}`);
           }
-          resolve17();
+          resolve18();
         });
         this.browserWs.on("message", (data) => {
           try {
             const msg = JSON.parse(data.toString());
             if (msg.id && this.browserPending.has(msg.id)) {
-              const { resolve: resolve18, reject: reject2 } = this.browserPending.get(msg.id);
+              const { resolve: resolve19, reject: reject2 } = this.browserPending.get(msg.id);
               this.browserPending.delete(msg.id);
               if (msg.error) reject2(new Error(msg.error.message));
-              else resolve18(msg.result);
+              else resolve19(msg.result);
             }
           } catch {
           }
@@ -11246,31 +11246,31 @@ var DaemonCdpManager = class {
     }
   }
   getBrowserWsUrl() {
-    return new Promise((resolve17) => {
+    return new Promise((resolve18) => {
       const req = http.get(`http://127.0.0.1:${this.port}/json/version`, (res) => {
         let data = "";
         res.on("data", (chunk) => data += chunk.toString());
         res.on("end", () => {
           try {
             const info = JSON.parse(data);
-            resolve17(info.webSocketDebuggerUrl || null);
+            resolve18(info.webSocketDebuggerUrl || null);
           } catch {
-            resolve17(null);
+            resolve18(null);
           }
         });
       });
-      req.on("error", () => resolve17(null));
+      req.on("error", () => resolve18(null));
       req.setTimeout(3e3, () => {
         req.destroy();
-        resolve17(null);
+        resolve18(null);
       });
     });
   }
   sendBrowser(method, params = {}, timeoutMs = 15e3) {
-    return new Promise((resolve17, reject) => {
+    return new Promise((resolve18, reject) => {
       if (!this.browserWs || !this._browserConnected) return reject(new Error("Browser WS not connected"));
       const id = this.browserMsgId++;
-      this.browserPending.set(id, { resolve: resolve17, reject });
+      this.browserPending.set(id, { resolve: resolve18, reject });
       this.browserWs.send(JSON.stringify({ id, method, params }));
       setTimeout(() => {
         if (this.browserPending.has(id)) {
@@ -11310,11 +11310,11 @@ var DaemonCdpManager = class {
   }
   // ─── CDP Protocol ────────────────────────────────────────
   sendInternal(method, params = {}, timeoutMs = 15e3) {
-    return new Promise((resolve17, reject) => {
+    return new Promise((resolve18, reject) => {
       if (!this.ws || !this._connected) return reject(new Error("CDP not connected"));
       if (this.ws.readyState !== import_ws.default.OPEN) return reject(new Error("WebSocket not open"));
       const id = this.msgId++;
-      this.pending.set(id, { resolve: resolve17, reject });
+      this.pending.set(id, { resolve: resolve18, reject });
       this.ws.send(JSON.stringify({ id, method, params }));
       setTimeout(() => {
         if (this.pending.has(id)) {
@@ -11563,7 +11563,7 @@ var DaemonCdpManager = class {
     const browserWs = this.browserWs;
     let msgId = this.browserMsgId;
     const sendWs = (method, params = {}, sessionId) => {
-      return new Promise((resolve17, reject) => {
+      return new Promise((resolve18, reject) => {
         const mid = msgId++;
         this.browserMsgId = msgId;
         const handler = (raw) => {
@@ -11572,7 +11572,7 @@ var DaemonCdpManager = class {
             if (msg.id === mid) {
               browserWs.removeListener("message", handler);
               if (msg.error) reject(new Error(msg.error.message || JSON.stringify(msg.error)));
-              else resolve17(msg.result);
+              else resolve18(msg.result);
             }
           } catch {
           }
@@ -11773,14 +11773,14 @@ var DaemonCdpManager = class {
     if (!ws || ws.readyState !== import_ws.default.OPEN) {
       throw new Error("CDP not connected");
     }
-    return new Promise((resolve17, reject) => {
+    return new Promise((resolve18, reject) => {
       const id = getNextId();
       pendingMap.set(id, {
         resolve: (result) => {
           if (result?.result?.subtype === "error") {
             reject(new Error(result.result.description));
           } else {
-            resolve17(result?.result?.value);
+            resolve18(result?.result?.value);
           }
         },
         reject
@@ -11812,10 +11812,10 @@ var DaemonCdpManager = class {
       throw new Error("CDP not connected");
     }
     const sendViaSession = (method, params = {}) => {
-      return new Promise((resolve17, reject) => {
+      return new Promise((resolve18, reject) => {
         const pendingMap = this._browserConnected ? this.browserPending : this.pending;
         const id = this._browserConnected ? this.browserMsgId++ : this.msgId++;
-        pendingMap.set(id, { resolve: resolve17, reject });
+        pendingMap.set(id, { resolve: resolve18, reject });
         ws.send(JSON.stringify({ id, sessionId, method, params }));
         setTimeout(() => {
           if (pendingMap.has(id)) {
@@ -16921,7 +16921,7 @@ function getSendChatInputEnvelope(args) {
   return normalizeInputEnvelope(args?.input ? { input: args.input } : args);
 }
 function sleep(ms) {
-  return new Promise((resolve17) => setTimeout(resolve17, ms));
+  return new Promise((resolve18) => setTimeout(resolve18, ms));
 }
 async function waitOnceForFreshHermesCliStart(adapter, log) {
   if (adapter.cliType !== "hermes-cli") return;
@@ -17161,6 +17161,39 @@ function readExactRuntimeMirrorMessages(args) {
     return historySessionId === targetSessionId || instanceId === targetSessionId;
   });
 }
+function normalizeComparableWorkspace(value) {
+  const text = typeof value === "string" ? value.trim() : "";
+  if (!text) return "";
+  return path12.resolve(text);
+}
+function isCurrentRuntimePtySafelyAttributed(args) {
+  if (args.adapter.cliType !== "codex-cli") return false;
+  if (!Array.isArray(args.ptyMessages) || args.ptyMessages.length === 0) return false;
+  const targetSessionId = typeof args.readChatArgs?.targetSessionId === "string" ? args.readChatArgs.targetSessionId.trim() : "";
+  const currentSession = args.helpers.currentSession;
+  const currentSessionId = typeof currentSession?.sessionId === "string" ? currentSession.sessionId.trim() : "";
+  if (!targetSessionId || !currentSessionId || targetSessionId !== currentSessionId) return false;
+  const runtimeMeta = typeof args.adapter.getRuntimeMetadata === "function" ? args.adapter.getRuntimeMetadata() : null;
+  const runtimeId = typeof runtimeMeta?.runtimeId === "string" ? runtimeMeta.runtimeId.trim() : "";
+  if (!runtimeId || runtimeId !== targetSessionId) return false;
+  const surfaceKind = typeof runtimeMeta?.surfaceKind === "string" ? runtimeMeta.surfaceKind : "";
+  if (surfaceKind === "inactive_record" || surfaceKind === "recovery_snapshot") return false;
+  const sessionWorkspace = normalizeComparableWorkspace(args.sessionWorkspace);
+  const adapterWorkspace = normalizeComparableWorkspace(args.adapter.workingDir);
+  if (!sessionWorkspace || !adapterWorkspace || sessionWorkspace !== adapterWorkspace) return false;
+  const intendedWorkspace = normalizeComparableWorkspace(args.intendedWorkspace);
+  if (intendedWorkspace && intendedWorkspace !== sessionWorkspace) return false;
+  const registryEntry = args.helpers.ctx?.sessionRegistry?.get?.(targetSessionId);
+  const registryInstanceKey = typeof registryEntry?.adapterKey === "string" && registryEntry.adapterKey.trim() ? registryEntry.adapterKey.trim() : typeof registryEntry?.instanceKey === "string" && registryEntry.instanceKey.trim() ? registryEntry.instanceKey.trim() : "";
+  if (registryInstanceKey) {
+    const targetInstance = args.helpers.ctx?.instanceManager?.getInstance?.(registryInstanceKey);
+    if (targetInstance) {
+      const instanceType = typeof targetInstance.type === "string" ? targetInstance.type : "";
+      if (instanceType && instanceType !== args.adapter.cliType) return false;
+    }
+  }
+  return true;
+}
 function supportsCliNativeTranscript(providerType, provider) {
   if (CLI_NATIVE_TRANSCRIPT_PROVIDERS.has(providerType)) return true;
   return provider?.category === "cli" && isNativeSourceCanonicalHistory(provider?.canonicalHistory);
@@ -17778,7 +17811,7 @@ function getCliVisibleTranscriptCount(adapter) {
 async function getStableExtensionBaseline(h) {
   const first = await readExtensionChatState(h);
   if (getStateMessageCount(first) > 0 || getStateLastSignature(first)) return first;
-  await new Promise((resolve17) => setTimeout(resolve17, 150));
+  await new Promise((resolve18) => setTimeout(resolve18, 150));
   const second = await readExtensionChatState(h);
   return getStateMessageCount(second) >= getStateMessageCount(first) ? second : first;
 }
@@ -17786,7 +17819,7 @@ async function verifyExtensionSendObserved(h, before) {
   const beforeCount = getStateMessageCount(before);
   const beforeSignature = getStateLastSignature(before);
   for (let attempt = 0; attempt < 12; attempt += 1) {
-    await new Promise((resolve17) => setTimeout(resolve17, 250));
+    await new Promise((resolve18) => setTimeout(resolve18, 250));
     const state = await readExtensionChatState(h);
     if (state?.status === "waiting_approval") return true;
     const afterCount = getStateMessageCount(state);
@@ -18009,8 +18042,16 @@ async function handleReadChat(h, args) {
               freshEnough
             });
             const unsafeNativeFallback = adapter.cliType === "codex-cli" && isUnsafeNativeTranscriptFallback(fallbackReason);
-            const safeRuntimeAckMessages = unsafeNativeFallback ? selectRuntimeInputAckMessages(returnedMessages) : [];
-            const exactRuntimeMirrorMessages = unsafeNativeFallback && safeRuntimeAckMessages.length === 0 ? readExactRuntimeMirrorMessages({
+            const safeCurrentRuntimePtyMessages = unsafeNativeFallback && isCurrentRuntimePtySafelyAttributed({
+              adapter,
+              helpers: h,
+              readChatArgs: args,
+              sessionWorkspace,
+              intendedWorkspace,
+              ptyMessages: returnedMessages
+            });
+            const safeRuntimeAckMessages = unsafeNativeFallback && !safeCurrentRuntimePtyMessages ? selectRuntimeInputAckMessages(returnedMessages) : [];
+            const exactRuntimeMirrorMessages = unsafeNativeFallback && !safeCurrentRuntimePtyMessages && safeRuntimeAckMessages.length === 0 ? readExactRuntimeMirrorMessages({
               providerType,
               targetSessionId: typeof args?.targetSessionId === "string" ? args.targetSessionId : void 0,
               currentSessionId: typeof h.currentSession?.sessionId === "string" ? h.currentSession.sessionId : void 0,
@@ -18019,10 +18060,17 @@ async function handleReadChat(h, args) {
             }) : [];
             const safeDaemonMessages = safeRuntimeAckMessages.length > 0 ? safeRuntimeAckMessages : exactRuntimeMirrorMessages;
             if (unsafeNativeFallback) {
-              selectedMessages = safeDaemonMessages;
-              selectedTranscriptAuthority = safeDaemonMessages.length > 0 ? "daemon" : void 0;
-              selectedCoverage = safeDaemonMessages.length > 0 ? "tail" : void 0;
-              selectedStatus = coerceUnsafeNativeFallbackStatus(returnedStatus, activeModal);
+              if (safeCurrentRuntimePtyMessages) {
+                selectedMessages = returnedMessages;
+                selectedTranscriptAuthority = "daemon";
+                selectedCoverage = coverage || "current-turn";
+                selectedStatus = returnedStatus;
+              } else {
+                selectedMessages = safeDaemonMessages;
+                selectedTranscriptAuthority = safeDaemonMessages.length > 0 ? "daemon" : void 0;
+                selectedCoverage = safeDaemonMessages.length > 0 ? "tail" : void 0;
+                selectedStatus = coerceUnsafeNativeFallbackStatus(returnedStatus, activeModal);
+              }
             }
             messageSource = buildCliMessageSourceProvenance({
               selected: "pty-parser",
@@ -18040,11 +18088,16 @@ async function handleReadChat(h, args) {
               unavailableReason,
               nativeMessages,
               ptyMessages: returnedMessages,
-              returnedMessages: unsafeNativeFallback ? safeDaemonMessages : returnedMessages,
+              returnedMessages: unsafeNativeFallback && !safeCurrentRuntimePtyMessages ? safeDaemonMessages : returnedMessages,
               safeMapping,
               freshEnough,
-              ptyStatusApprovalOnly: unsafeNativeFallback
+              ptyStatusApprovalOnly: unsafeNativeFallback && !safeCurrentRuntimePtyMessages
             });
+            if (safeCurrentRuntimePtyMessages) {
+              messageSource.selectedDaemonSource = "current-runtime-pty";
+              messageSource.transcriptAuthority = "daemon";
+              messageSource.runtimeMappingSafe = true;
+            }
             if (unsafeNativeFallback && exactRuntimeMirrorMessages.length > 0) {
               messageSource.selectedDaemonSource = "exact-runtime-mirror";
               messageSource.transcriptAuthority = "daemon";
@@ -19727,7 +19780,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((resolve17) => setTimeout(resolve17, 50));
+          await new Promise((resolve18) => setTimeout(resolve18, 50));
           await adapter.writeRaw("\r");
         }
       }
@@ -20416,7 +20469,7 @@ var DaemonCommandHandler = class {
     try {
       const http3 = await import("http");
       const postData = JSON.stringify(body);
-      const result = await new Promise((resolve17, reject) => {
+      const result = await new Promise((resolve18, reject) => {
         const req = http3.request({
           hostname: "127.0.0.1",
           port: 19280,
@@ -20428,9 +20481,9 @@ var DaemonCommandHandler = class {
           res.on("data", (chunk) => data += chunk);
           res.on("end", () => {
             try {
-              resolve17(JSON.parse(data));
+              resolve18(JSON.parse(data));
             } catch {
-              resolve17({ raw: data });
+              resolve18({ raw: data });
             }
           });
         });
@@ -20448,15 +20501,15 @@ var DaemonCommandHandler = class {
     if (!providerType) return { success: false, error: "providerType required" };
     try {
       const http3 = await import("http");
-      const result = await new Promise((resolve17, reject) => {
+      const result = await new Promise((resolve18, reject) => {
         http3.get(`http://127.0.0.1:19280/api/providers/${providerType}/${endpoint}`, (res) => {
           let data = "";
           res.on("data", (chunk) => data += chunk);
           res.on("end", () => {
             try {
-              resolve17(JSON.parse(data));
+              resolve18(JSON.parse(data));
             } catch {
-              resolve17({ raw: data });
+              resolve18({ raw: data });
             }
           });
         }).on("error", reject);
@@ -20470,7 +20523,7 @@ var DaemonCommandHandler = class {
     try {
       const http3 = await import("http");
       const postData = JSON.stringify(args || {});
-      const result = await new Promise((resolve17, reject) => {
+      const result = await new Promise((resolve18, reject) => {
         const req = http3.request({
           hostname: "127.0.0.1",
           port: 19280,
@@ -20482,9 +20535,9 @@ var DaemonCommandHandler = class {
           res.on("data", (chunk) => data += chunk);
           res.on("end", () => {
             try {
-              resolve17(JSON.parse(data));
+              resolve18(JSON.parse(data));
             } catch {
-              resolve17({ raw: data });
+              resolve18({ raw: data });
             }
           });
         });
@@ -20728,7 +20781,7 @@ async function waitForCliAdapterReady(adapter, options) {
     if (status === "stopped") {
       throw new Error("CLI runtime stopped before it became ready");
     }
-    await new Promise((resolve17) => setTimeout(resolve17, pollMs));
+    await new Promise((resolve18) => setTimeout(resolve18, pollMs));
   }
   throw new Error(`CLI runtime did not become ready within ${timeoutMs}ms`);
 }
@@ -21126,7 +21179,7 @@ var CliProviderInstance = class {
       const enterCount = cliCommand.enterCount || 1;
       await this.adapter.writeRaw(cliCommand.text + "\r");
       for (let i = 1; i < enterCount; i += 1) {
-        await new Promise((resolve17) => setTimeout(resolve17, 50));
+        await new Promise((resolve18) => setTimeout(resolve18, 50));
         await this.adapter.writeRaw("\r");
       }
     }
@@ -22563,13 +22616,13 @@ var AcpProviderInstance = class {
         }
         this.currentStatus = "waiting_approval";
         this.detectStatusTransition();
-        const approved = await new Promise((resolve17) => {
-          this.permissionResolvers.push(resolve17);
+        const approved = await new Promise((resolve18) => {
+          this.permissionResolvers.push(resolve18);
           setTimeout(() => {
-            const idx = this.permissionResolvers.indexOf(resolve17);
+            const idx = this.permissionResolvers.indexOf(resolve18);
             if (idx >= 0) {
               this.permissionResolvers.splice(idx, 1);
-              resolve17(false);
+              resolve18(false);
             }
           }, 3e5);
         });
@@ -23278,7 +23331,7 @@ async function waitForZeroMessageStartingLaunch(adapter) {
   } catch {
     return false;
   }
-  await new Promise((resolve17) => setTimeout(resolve17, ZERO_MESSAGE_STARTING_SEND_WAIT_MS));
+  await new Promise((resolve18) => setTimeout(resolve18, ZERO_MESSAGE_STARTING_SEND_WAIT_MS));
   try {
     return hasZeroMessageStartingLaunch(adapter);
   } catch {
@@ -25378,7 +25431,7 @@ var ProviderLoader = class _ProviderLoader {
       return { updated: false };
     }
     try {
-      const etag = await new Promise((resolve17, reject) => {
+      const etag = await new Promise((resolve18, reject) => {
         const options = {
           method: "HEAD",
           hostname: "github.com",
@@ -25396,7 +25449,7 @@ var ProviderLoader = class _ProviderLoader {
               headers: { "User-Agent": "adhdev-launcher" },
               timeout: 1e4
             }, (res2) => {
-              resolve17(res2.headers.etag || res2.headers["last-modified"] || "");
+              resolve18(res2.headers.etag || res2.headers["last-modified"] || "");
             });
             req2.on("error", reject);
             req2.on("timeout", () => {
@@ -25405,7 +25458,7 @@ var ProviderLoader = class _ProviderLoader {
             });
             req2.end();
           } else {
-            resolve17(res.headers.etag || res.headers["last-modified"] || "");
+            resolve18(res.headers.etag || res.headers["last-modified"] || "");
           }
         });
         req.on("error", reject);
@@ -25469,7 +25522,7 @@ var ProviderLoader = class _ProviderLoader {
   downloadFile(url, destPath) {
     const https = require("https");
     const http3 = require("http");
-    return new Promise((resolve17, reject) => {
+    return new Promise((resolve18, reject) => {
       const doRequest = (reqUrl, redirectCount = 0) => {
         if (redirectCount > 5) {
           reject(new Error("Too many redirects"));
@@ -25489,7 +25542,7 @@ var ProviderLoader = class _ProviderLoader {
           res.pipe(ws);
           ws.on("finish", () => {
             ws.close();
-            resolve17();
+            resolve18();
           });
           ws.on("error", reject);
         });
@@ -25992,10 +26045,10 @@ function findMacAppProcessPids(psOutput, appPaths) {
 
 // src/launch.ts
 async function execQuiet(command, options = {}) {
-  return new Promise((resolve17) => {
+  return new Promise((resolve18) => {
     (0, import_child_process6.exec)(command, options, (error, stdout) => {
-      if (error) return resolve17("");
-      resolve17(stdout.toString());
+      if (error) return resolve18("");
+      resolve18(stdout.toString());
     });
   });
 }
@@ -26076,17 +26129,17 @@ async function findFreePort(ports) {
   throw new Error("No free port found");
 }
 function checkPortFree(port) {
-  return new Promise((resolve17) => {
+  return new Promise((resolve18) => {
     const server = net.createServer();
     server.unref();
-    server.on("error", () => resolve17(false));
+    server.on("error", () => resolve18(false));
     server.listen(port, "127.0.0.1", () => {
-      server.close(() => resolve17(true));
+      server.close(() => resolve18(true));
     });
   });
 }
 async function isCdpActive(port) {
-  return new Promise((resolve17) => {
+  return new Promise((resolve18) => {
     const req = require("http").get(`http://127.0.0.1:${port}/json/version`, {
       timeout: 2e3
     }, (res) => {
@@ -26095,16 +26148,16 @@ async function isCdpActive(port) {
       res.on("end", () => {
         try {
           const info = JSON.parse(data);
-          resolve17(!!info["WebKit-Version"] || !!info["Browser"]);
+          resolve18(!!info["WebKit-Version"] || !!info["Browser"]);
         } catch {
-          resolve17(false);
+          resolve18(false);
         }
       });
     });
-    req.on("error", () => resolve17(false));
+    req.on("error", () => resolve18(false));
     req.on("timeout", () => {
       req.destroy();
-      resolve17(false);
+      resolve18(false);
     });
   });
 }
@@ -27354,7 +27407,7 @@ async function waitForPidExit(pid, timeoutMs) {
   while (Date.now() - start < timeoutMs) {
     try {
       process.kill(pid, 0);
-      await new Promise((resolve17) => setTimeout(resolve17, 250));
+      await new Promise((resolve18) => setTimeout(resolve18, 250));
     } catch {
       return;
     }
@@ -27465,7 +27518,7 @@ async function runDaemonUpgradeHelper(payload) {
     appendUpgradeLog(installOutput.trim());
   }
   if (process.platform === "win32") {
-    await new Promise((resolve17) => setTimeout(resolve17, 500));
+    await new Promise((resolve18) => setTimeout(resolve18, 500));
     cleanupStaleGlobalInstallDirs(payload.packageName, installCommand.surface);
     appendUpgradeLog("Post-install staging cleanup complete");
   }
@@ -31663,7 +31716,7 @@ var DaemonCommandRouter = class {
           const setupPromise = finishWorktreeSetup();
           const setupResult = await Promise.race([
             setupPromise.then((value) => ({ completed: true, value })),
-            new Promise((resolve17) => setTimeout(() => resolve17({ completed: false }), setupWaitMs))
+            new Promise((resolve18) => setTimeout(() => resolve18({ completed: false }), setupWaitMs))
           ]);
           if (!setupResult.completed) {
             setupPromise.catch((error) => {
@@ -33061,7 +33114,7 @@ var ProviderStreamAdapter = class {
     const beforeCount = this.messageCount(before);
     const beforeSignature = this.lastMessageSignature(before);
     for (let attempt = 0; attempt < 12; attempt += 1) {
-      await new Promise((resolve17) => setTimeout(resolve17, 250));
+      await new Promise((resolve18) => setTimeout(resolve18, 250));
       let state;
       try {
         state = await this.readChat(evaluate);
@@ -33083,7 +33136,7 @@ var ProviderStreamAdapter = class {
     if (this.messageCount(first) > 0 || this.lastMessageSignature(first)) {
       return first;
     }
-    await new Promise((resolve17) => setTimeout(resolve17, 150));
+    await new Promise((resolve18) => setTimeout(resolve18, 150));
     const second = await this.readChat(evaluate);
     return this.messageCount(second) >= this.messageCount(first) ? second : first;
   }
@@ -33234,7 +33287,7 @@ var ProviderStreamAdapter = class {
       if (typeof data.error === "string" && data.error.trim()) return false;
     }
     for (let attempt = 0; attempt < 6; attempt += 1) {
-      await new Promise((resolve17) => setTimeout(resolve17, 250));
+      await new Promise((resolve18) => setTimeout(resolve18, 250));
       const state = await this.readChat(evaluate);
       const title = this.getStateTitle(state);
       if (this.titlesMatch(title, sessionId)) return true;
@@ -34162,13 +34215,13 @@ var VersionArchive = class {
   }
 };
 async function runCommand(cmd, timeout = 1e4) {
-  return new Promise((resolve17) => {
+  return new Promise((resolve18) => {
     (0, import_child_process9.exec)(cmd, {
       encoding: "utf-8",
       timeout
     }, (error, stdout) => {
-      if (error) return resolve17(null);
-      resolve17(stdout.trim());
+      if (error) return resolve18(null);
+      resolve18(stdout.trim());
     });
   });
 }
@@ -35857,7 +35910,7 @@ function getCliTargetBundle(ctx, type, instanceId) {
   return { target, instance, adapter };
 }
 function sleep2(ms) {
-  return new Promise((resolve17) => setTimeout(resolve17, ms));
+  return new Promise((resolve18) => setTimeout(resolve18, ms));
 }
 async function waitForCliReady(ctx, type, instanceId, timeoutMs) {
   const startedAt = Date.now();
@@ -38112,15 +38165,15 @@ var DevServer = class _DevServer {
         this.json(res, 500, { error: e.message });
       }
     });
-    return new Promise((resolve17, reject) => {
+    return new Promise((resolve18, reject) => {
       this.server.listen(port, "127.0.0.1", () => {
         this.log(`Dev server listening on http://127.0.0.1:${port}`);
-        resolve17();
+        resolve18();
       });
       this.server.on("error", (e) => {
         if (e.code === "EADDRINUSE") {
           this.log(`Port ${port} in use, skipping dev server`);
-          resolve17();
+          resolve18();
         } else {
           reject(e);
         }
@@ -38202,20 +38255,20 @@ var DevServer = class _DevServer {
       child.stderr?.on("data", (d) => {
         stderr += d.toString().slice(0, 2e3);
       });
-      await new Promise((resolve17) => {
+      await new Promise((resolve18) => {
         const timer = setTimeout(() => {
           child.kill();
-          resolve17();
+          resolve18();
         }, 3e3);
         child.on("exit", () => {
           clearTimeout(timer);
-          resolve17();
+          resolve18();
         });
         child.stdout?.once("data", () => {
           setTimeout(() => {
             child.kill();
             clearTimeout(timer);
-            resolve17();
+            resolve18();
           }, 500);
         });
       });
@@ -38718,14 +38771,14 @@ var DevServer = class _DevServer {
       child.stderr?.on("data", (d) => {
         stderr += d.toString();
       });
-      await new Promise((resolve17) => {
+      await new Promise((resolve18) => {
         const timer = setTimeout(() => {
           child.kill();
-          resolve17();
+          resolve18();
         }, timeout);
         child.on("exit", () => {
           clearTimeout(timer);
-          resolve17();
+          resolve18();
         });
       });
       const elapsed = Date.now() - start;
@@ -39395,14 +39448,14 @@ data: ${JSON.stringify(msg.data)}
     res.end(JSON.stringify(data, null, 2));
   }
   async readBody(req) {
-    return new Promise((resolve17) => {
+    return new Promise((resolve18) => {
       let body = "";
       req.on("data", (chunk) => body += chunk);
       req.on("end", () => {
         try {
-          resolve17(JSON.parse(body));
+          resolve18(JSON.parse(body));
         } catch {
-          resolve17({});
+          resolve18({});
         }
       });
     });
@@ -39940,7 +39993,7 @@ async function waitForReady(endpoint, timeoutMs = STARTUP_TIMEOUT_MS, requiredRe
   const deadline = Date.now() + timeoutMs;
   while (Date.now() < deadline) {
     if (await canConnect(endpoint, requiredRequestTypes)) return;
-    await new Promise((resolve17) => setTimeout(resolve17, STARTUP_POLL_MS));
+    await new Promise((resolve18) => setTimeout(resolve18, STARTUP_POLL_MS));
   }
   throw new Error(`Session host did not become ready within ${timeoutMs}ms`);
 }
@@ -40120,10 +40173,10 @@ async function installExtension(ide, extension) {
         const buffer = Buffer.from(await res.arrayBuffer());
         const fs17 = await import("fs");
         fs17.writeFileSync(vsixPath, buffer);
-        return new Promise((resolve17) => {
+        return new Promise((resolve18) => {
           const cmd = `"${ide.cliCommand}" --install-extension "${vsixPath}" --force`;
           (0, import_child_process10.exec)(cmd, { timeout: 6e4 }, (error, _stdout, stderr) => {
-            resolve17({
+            resolve18({
               extensionId: extension.id,
               marketplaceId: extension.marketplaceId,
               success: !error,
@@ -40136,11 +40189,11 @@ async function installExtension(ide, extension) {
     } catch (e) {
     }
   }
-  return new Promise((resolve17) => {
+  return new Promise((resolve18) => {
     const cmd = `"${ide.cliCommand}" --install-extension ${extension.marketplaceId} --force`;
     (0, import_child_process10.exec)(cmd, { timeout: 6e4 }, (error, stdout, stderr) => {
       if (error) {
-        resolve17({
+        resolve18({
           extensionId: extension.id,
           marketplaceId: extension.marketplaceId,
           success: false,
@@ -40148,7 +40201,7 @@ async function installExtension(ide, extension) {
           error: stderr || error.message
         });
       } else {
-        resolve17({
+        resolve18({
           extensionId: extension.id,
           marketplaceId: extension.marketplaceId,
           success: true,