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

package/dist/index.js

@@ -24286,19 +24286,19 @@ Follow these recovery rules:
       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) {
@@ -27542,7 +27542,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() || "";
             LOG2.warn(
@@ -28787,7 +28787,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 ? (() => {
@@ -28884,13 +28884,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: (error48) => {
                   if (resolved) return;
@@ -29048,17 +29048,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);
             });
@@ -33114,7 +33114,7 @@ ${lastSnapshot}`;
       * 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());
@@ -33130,16 +33130,16 @@ ${lastSnapshot}`;
                   (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([]);
           });
         });
       }
@@ -33179,7 +33179,7 @@ ${lastSnapshot}`;
         }
       }
       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());
@@ -33190,7 +33190,7 @@ ${lastSnapshot}`;
                   (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 || ""));
@@ -33209,25 +33209,25 @@ ${lastSnapshot}`;
                     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);
           });
         });
       }
@@ -33238,7 +33238,7 @@ ${lastSnapshot}`;
         this.extensionProviders = providers;
       }
       connectToTarget(wsUrl) {
-        return new Promise((resolve17) => {
+        return new Promise((resolve18) => {
           this.ws = new import_ws2.default(wsUrl);
           this.ws.on("open", async () => {
             this._connected = true;
@@ -33248,17 +33248,17 @@ ${lastSnapshot}`;
             }
             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") {
@@ -33281,7 +33281,7 @@ ${lastSnapshot}`;
           this.ws.on("error", (err) => {
             this.log(`[CDP] WebSocket error: ${err.message}`);
             this._connected = false;
-            resolve17(false);
+            resolve18(false);
           });
         });
       }
@@ -33295,7 +33295,7 @@ ${lastSnapshot}`;
             return;
           }
           this.log(`[CDP] Connecting browser WS for target discovery...`);
-          await new Promise((resolve17, reject) => {
+          await new Promise((resolve18, reject) => {
             this.browserWs = new import_ws2.default(browserWsUrl);
             this.browserWs.on("open", async () => {
               this._browserConnected = true;
@@ -33305,16 +33305,16 @@ ${lastSnapshot}`;
               } 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 {
               }
@@ -33334,31 +33334,31 @@ ${lastSnapshot}`;
         }
       }
       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)) {
@@ -33398,11 +33398,11 @@ ${lastSnapshot}`;
       }
       // ─── 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_ws2.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)) {
@@ -33651,7 +33651,7 @@ ${lastSnapshot}`;
         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) => {
@@ -33660,7 +33660,7 @@ ${lastSnapshot}`;
                 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 {
               }
@@ -33861,14 +33861,14 @@ ${lastSnapshot}`;
         if (!ws || ws.readyState !== import_ws2.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
@@ -33900,10 +33900,10 @@ ${lastSnapshot}`;
           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)) {
@@ -38947,7 +38947,7 @@ ${effect.notification.body || ""}`.trim();
       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;
@@ -39187,6 +39187,39 @@ ${effect.notification.body || ""}`.trim();
         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);
@@ -39804,7 +39837,7 @@ ${effect.notification.body || ""}`.trim();
     async function getStableExtensionBaseline(h) {
       const first = await readExtensionChatState(h);
       if (getStateMessageCount(first) > 0 || getStateLastSignature(first)) return first;
-      await new Promise((resolve17) => setTimeout(resolve17, 150));
+      await new Promise((resolve18) => setTimeout(resolve18, 150));
       const second = await readExtensionChatState(h);
       return getStateMessageCount(second) >= getStateMessageCount(first) ? second : first;
     }
@@ -39812,7 +39845,7 @@ ${effect.notification.body || ""}`.trim();
       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);
@@ -40035,8 +40068,16 @@ ${effect.notification.body || ""}`.trim();
                   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,
@@ -40045,10 +40086,17 @@ ${effect.notification.body || ""}`.trim();
                 }) : [];
                 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",
@@ -40066,11 +40114,16 @@ ${effect.notification.body || ""}`.trim();
                   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";
@@ -41743,7 +41796,7 @@ ${effect.notification.body || ""}`.trim();
             const enterCount = cliCommand.enterCount || 1;
             await adapter.writeRaw(cliCommand.text + "\r");
             for (let i = 1; i < enterCount; i += 1) {
-              await new Promise((resolve17) => setTimeout(resolve17, 50));
+              await new Promise((resolve18) => setTimeout(resolve18, 50));
               await adapter.writeRaw("\r");
             }
           }
@@ -42428,7 +42481,7 @@ ${effect.notification.body || ""}`.trim();
         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,
@@ -42440,9 +42493,9 @@ ${effect.notification.body || ""}`.trim();
               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 });
                 }
               });
             });
@@ -42460,15 +42513,15 @@ ${effect.notification.body || ""}`.trim();
         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);
@@ -42482,7 +42535,7 @@ ${effect.notification.body || ""}`.trim();
         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,
@@ -42494,9 +42547,9 @@ ${effect.notification.body || ""}`.trim();
               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 });
                 }
               });
             });
@@ -42732,7 +42785,7 @@ ${effect.notification.body || ""}`.trim();
         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`);
     }
@@ -43130,7 +43183,7 @@ ${effect.notification.body || ""}`.trim();
           const enterCount = cliCommand.enterCount || 1;
           await this.adapter.writeRaw(cliCommand.text + "\r");
           for (let i = 1; i < enterCount; i += 1) {
-            await new Promise((resolve17) => setTimeout(resolve17, 50));
+            await new Promise((resolve18) => setTimeout(resolve18, 50));
             await this.adapter.writeRaw("\r");
           }
         }
@@ -44565,13 +44618,13 @@ ${effect.notification.body || ""}`.trim();
             }
             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);
             });
@@ -45274,7 +45327,7 @@ ${rawInput}` : rawInput;
       } 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 {
@@ -47366,7 +47419,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
           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",
@@ -47384,7 +47437,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
                   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", () => {
@@ -47393,7 +47446,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
                 });
                 req2.end();
               } else {
-                resolve17(res.headers.etag || res.headers["last-modified"] || "");
+                resolve18(res.headers.etag || res.headers["last-modified"] || "");
               }
             });
             req.on("error", reject);
@@ -47457,7 +47510,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
       downloadFile(url2, destPath) {
         const https = require("https");
         const http3 = require("http");
-        return new Promise((resolve17, reject) => {
+        return new Promise((resolve18, reject) => {
           const doRequest = (reqUrl, redirectCount = 0) => {
             if (redirectCount > 5) {
               reject(new Error("Too many redirects"));
@@ -47477,7 +47530,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
               res.pipe(ws);
               ws.on("finish", () => {
                 ws.close();
-                resolve17();
+                resolve18();
               });
               ws.on("error", reject);
             });
@@ -47976,10 +48029,10 @@ Run 'adhdev doctor' for detailed diagnostics.`
       return pids;
     }
     async function execQuiet(command, options = {}) {
-      return new Promise((resolve17) => {
+      return new Promise((resolve18) => {
         (0, import_child_process6.exec)(command, options, (error48, stdout) => {
-          if (error48) return resolve17("");
-          resolve17(stdout.toString());
+          if (error48) return resolve18("");
+          resolve18(stdout.toString());
         });
       });
     }
@@ -48060,17 +48113,17 @@ Run 'adhdev doctor' for detailed diagnostics.`
       throw new Error("No free port found");
     }
     function checkPortFree(port) {
-      return new Promise((resolve17) => {
+      return new Promise((resolve18) => {
         const server = net3.createServer();
         server.unref();
-        server.on("error", () => resolve17(false));
+        server.on("error", () => resolve18(false));
         server.listen(port, "127.0.0.1", () => {
-          server.close(() => resolve17(true));
+          server.close(() => resolve18(true));
         });
       });
     }
     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) => {
@@ -48079,16 +48132,16 @@ Run 'adhdev doctor' for detailed diagnostics.`
           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);
         });
       });
     }
@@ -49322,7 +49375,7 @@ ${(0, import_node_path.resolve)(workspace || os17.tmpdir())}`;
       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;
         }
@@ -49433,7 +49486,7 @@ ${(0, import_node_path.resolve)(workspace || os17.tmpdir())}`;
         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");
       }
@@ -53629,7 +53682,7 @@ ${e?.stderr || ""}`
               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((error48) => {
@@ -55015,7 +55068,7 @@ ${block2}`);
         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);
@@ -55037,7 +55090,7 @@ ${block2}`);
         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;
       }
@@ -55188,7 +55241,7 @@ ${block2}`);
           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;
@@ -56106,13 +56159,13 @@ ${block2}`);
       }
     };
     async function runCommand(cmd, timeout = 1e4) {
-      return new Promise((resolve17) => {
+      return new Promise((resolve18) => {
         (0, import_child_process9.exec)(cmd, {
           encoding: "utf-8",
           timeout
         }, (error48, stdout) => {
-          if (error48) return resolve17(null);
-          resolve17(stdout.trim());
+          if (error48) return resolve18(null);
+          resolve18(stdout.trim());
         });
       });
     }
@@ -57791,7 +57844,7 @@ async (params) => {
       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();
@@ -60042,15 +60095,15 @@ data: ${JSON.stringify(msg.data)}
             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);
             }
@@ -60132,20 +60185,20 @@ data: ${JSON.stringify(msg.data)}
           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);
             });
           });
@@ -60648,14 +60701,14 @@ data: ${JSON.stringify(msg.data)}
           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;
@@ -61325,14 +61378,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({});
             }
           });
         });
@@ -61862,7 +61915,7 @@ data: ${JSON.stringify(msg.data)}
       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`);
     }
@@ -62038,10 +62091,10 @@ data: ${JSON.stringify(msg.data)}
             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 }, (error48, _stdout, stderr) => {
-                resolve17({
+                resolve18({
                   extensionId: extension.id,
                   marketplaceId: extension.marketplaceId,
                   success: !error48,
@@ -62054,11 +62107,11 @@ data: ${JSON.stringify(msg.data)}
         } catch (e) {
         }
       }
-      return new Promise((resolve17) => {
+      return new Promise((resolve18) => {
         const cmd = `"${ide.cliCommand}" --install-extension ${extension.marketplaceId} --force`;
         (0, import_child_process10.exec)(cmd, { timeout: 6e4 }, (error48, stdout, stderr) => {
           if (error48) {
-            resolve17({
+            resolve18({
               extensionId: extension.id,
               marketplaceId: extension.marketplaceId,
               success: false,
@@ -62066,7 +62119,7 @@ data: ${JSON.stringify(msg.data)}
               error: stderr || error48.message
             });
           } else {
-            resolve17({
+            resolve18({
               extensionId: extension.id,
               marketplaceId: extension.marketplaceId,
               success: true,