adhdev 0.9.58 → 0.9.60

package/dist/cli/index.js

@@ -2843,19 +2843,19 @@ function resolveCommandPath(command) {
   return null;
 }
 function execAsync(cmd, timeoutMs = 5e3) {
-  return new Promise((resolve21) => {
+  return new Promise((resolve22) => {
     const child = (0, import_child_process2.exec)(cmd, {
       encoding: "utf-8",
       timeout: timeoutMs,
       ...process.platform === "win32" ? { windowsHide: true } : {}
     }, (err, stdout) => {
       if (err || !stdout?.trim()) {
-        resolve21(null);
+        resolve22(null);
       } else {
-        resolve21(stdout.trim());
+        resolve22(stdout.trim());
       }
     });
-    child.on("error", () => resolve21(null));
+    child.on("error", () => resolve22(null));
   });
 }
 async function detectCLIs(providerLoader, options) {
@@ -3467,7 +3467,7 @@ var init_manager = __esm({
       * Returns multiple entries if multiple IDE windows are open on same port
       */
       static listAllTargets(port) {
-        return new Promise((resolve21) => {
+        return new Promise((resolve22) => {
           const req = http.get(`http://127.0.0.1:${port}/json`, (res) => {
             let data = "";
             res.on("data", (chunk) => data += chunk.toString());
@@ -3483,16 +3483,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 || ""));
-                resolve21(mainPages.length > 0 ? mainPages : fallbackPages);
+                resolve22(mainPages.length > 0 ? mainPages : fallbackPages);
               } catch {
-                resolve21([]);
+                resolve22([]);
               }
             });
           });
-          req.on("error", () => resolve21([]));
+          req.on("error", () => resolve22([]));
           req.setTimeout(2e3, () => {
             req.destroy();
-            resolve21([]);
+            resolve22([]);
           });
         });
       }
@@ -3532,7 +3532,7 @@ var init_manager = __esm({
         }
       }
       findTargetOnPort(port) {
-        return new Promise((resolve21) => {
+        return new Promise((resolve22) => {
           const req = http.get(`http://127.0.0.1:${port}/json`, (res) => {
             let data = "";
             res.on("data", (chunk) => data += chunk.toString());
@@ -3543,7 +3543,7 @@ var init_manager = __esm({
                   (t) => (t.type === "page" || t.type === "browser" || t.type === "Page") && t.webSocketDebuggerUrl
                 );
                 if (pages.length === 0) {
-                  resolve21(targets.find((t) => t.webSocketDebuggerUrl) || null);
+                  resolve22(targets.find((t) => t.webSocketDebuggerUrl) || null);
                   return;
                 }
                 const titleFilteredPages = pages.filter((t) => !this.isNonMainTitle(t.title || ""));
@@ -3562,25 +3562,25 @@ var init_manager = __esm({
                     this._targetId = selected.target.id;
                   }
                   this._pageTitle = selected.target.title || "";
-                  resolve21(selected.target);
+                  resolve22(selected.target);
                   return;
                 }
                 if (previousTargetId) {
                   this.log(`[CDP] Target ${previousTargetId} not found in page list`);
-                  resolve21(null);
+                  resolve22(null);
                   return;
                 }
                 this._pageTitle = list[0]?.title || "";
-                resolve21(list[0]);
+                resolve22(list[0]);
               } catch {
-                resolve21(null);
+                resolve22(null);
               }
             });
           });
-          req.on("error", () => resolve21(null));
+          req.on("error", () => resolve22(null));
           req.setTimeout(2e3, () => {
             req.destroy();
-            resolve21(null);
+            resolve22(null);
           });
         });
       }
@@ -3591,7 +3591,7 @@ var init_manager = __esm({
         this.extensionProviders = providers;
       }
       connectToTarget(wsUrl) {
-        return new Promise((resolve21) => {
+        return new Promise((resolve22) => {
           this.ws = new import_ws.default(wsUrl);
           this.ws.on("open", async () => {
             this._connected = true;
@@ -3601,17 +3601,17 @@ var init_manager = __esm({
             }
             this.connectBrowserWs().catch(() => {
             });
-            resolve21(true);
+            resolve22(true);
           });
           this.ws.on("message", (data) => {
             try {
               const msg = JSON.parse(data.toString());
               if (msg.id && this.pending.has(msg.id)) {
-                const { resolve: resolve22, reject } = this.pending.get(msg.id);
+                const { resolve: resolve23, reject } = this.pending.get(msg.id);
                 this.pending.delete(msg.id);
                 this.failureCount = 0;
                 if (msg.error) reject(new Error(msg.error.message));
-                else resolve22(msg.result);
+                else resolve23(msg.result);
               } else if (msg.method === "Runtime.executionContextCreated") {
                 this.contexts.add(msg.params.context.id);
               } else if (msg.method === "Runtime.executionContextDestroyed") {
@@ -3634,7 +3634,7 @@ var init_manager = __esm({
           this.ws.on("error", (err) => {
             this.log(`[CDP] WebSocket error: ${err.message}`);
             this._connected = false;
-            resolve21(false);
+            resolve22(false);
           });
         });
       }
@@ -3648,7 +3648,7 @@ var init_manager = __esm({
             return;
           }
           this.log(`[CDP] Connecting browser WS for target discovery...`);
-          await new Promise((resolve21, reject) => {
+          await new Promise((resolve22, reject) => {
             this.browserWs = new import_ws.default(browserWsUrl);
             this.browserWs.on("open", async () => {
               this._browserConnected = true;
@@ -3658,16 +3658,16 @@ var init_manager = __esm({
               } catch (e) {
                 this.log(`[CDP] setDiscoverTargets failed: ${e.message}`);
               }
-              resolve21();
+              resolve22();
             });
             this.browserWs.on("message", (data) => {
               try {
                 const msg = JSON.parse(data.toString());
                 if (msg.id && this.browserPending.has(msg.id)) {
-                  const { resolve: resolve22, reject: reject2 } = this.browserPending.get(msg.id);
+                  const { resolve: resolve23, reject: reject2 } = this.browserPending.get(msg.id);
                   this.browserPending.delete(msg.id);
                   if (msg.error) reject2(new Error(msg.error.message));
-                  else resolve22(msg.result);
+                  else resolve23(msg.result);
                 }
               } catch {
               }
@@ -3687,31 +3687,31 @@ var init_manager = __esm({
         }
       }
       getBrowserWsUrl() {
-        return new Promise((resolve21) => {
+        return new Promise((resolve22) => {
           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);
-                resolve21(info.webSocketDebuggerUrl || null);
+                resolve22(info.webSocketDebuggerUrl || null);
               } catch {
-                resolve21(null);
+                resolve22(null);
               }
             });
           });
-          req.on("error", () => resolve21(null));
+          req.on("error", () => resolve22(null));
           req.setTimeout(3e3, () => {
             req.destroy();
-            resolve21(null);
+            resolve22(null);
           });
         });
       }
       sendBrowser(method, params = {}, timeoutMs = 15e3) {
-        return new Promise((resolve21, reject) => {
+        return new Promise((resolve22, reject) => {
           if (!this.browserWs || !this._browserConnected) return reject(new Error("Browser WS not connected"));
           const id = this.browserMsgId++;
-          this.browserPending.set(id, { resolve: resolve21, reject });
+          this.browserPending.set(id, { resolve: resolve22, reject });
           this.browserWs.send(JSON.stringify({ id, method, params }));
           setTimeout(() => {
             if (this.browserPending.has(id)) {
@@ -3751,11 +3751,11 @@ var init_manager = __esm({
       }
       // ─── CDP Protocol ────────────────────────────────────────
       sendInternal(method, params = {}, timeoutMs = 15e3) {
-        return new Promise((resolve21, reject) => {
+        return new Promise((resolve22, 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: resolve21, reject });
+          this.pending.set(id, { resolve: resolve22, reject });
           this.ws.send(JSON.stringify({ id, method, params }));
           setTimeout(() => {
             if (this.pending.has(id)) {
@@ -4004,7 +4004,7 @@ var init_manager = __esm({
         const browserWs = this.browserWs;
         let msgId = this.browserMsgId;
         const sendWs = (method, params = {}, sessionId) => {
-          return new Promise((resolve21, reject) => {
+          return new Promise((resolve22, reject) => {
             const mid = msgId++;
             this.browserMsgId = msgId;
             const handler = (raw) => {
@@ -4013,7 +4013,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 resolve21(msg.result);
+                  else resolve22(msg.result);
                 }
               } catch {
               }
@@ -4214,14 +4214,14 @@ var init_manager = __esm({
         if (!ws || ws.readyState !== import_ws.default.OPEN) {
           throw new Error("CDP not connected");
         }
-        return new Promise((resolve21, reject) => {
+        return new Promise((resolve22, reject) => {
           const id = getNextId();
           pendingMap.set(id, {
             resolve: (result) => {
               if (result?.result?.subtype === "error") {
                 reject(new Error(result.result.description));
               } else {
-                resolve21(result?.result?.value);
+                resolve22(result?.result?.value);
               }
             },
             reject
@@ -4253,10 +4253,10 @@ var init_manager = __esm({
           throw new Error("CDP not connected");
         }
         const sendViaSession = (method, params = {}) => {
-          return new Promise((resolve21, reject) => {
+          return new Promise((resolve22, reject) => {
             const pendingMap = this._browserConnected ? this.browserPending : this.pending;
             const id = this._browserConnected ? this.browserMsgId++ : this.msgId++;
-            pendingMap.set(id, { resolve: resolve21, reject });
+            pendingMap.set(id, { resolve: resolve22, reject });
             ws.send(JSON.stringify({ id, sessionId, method, params }));
             setTimeout(() => {
               if (pendingMap.has(id)) {
@@ -9277,18 +9277,31 @@ function collapseReplayDuplicatesFromReadChat(messages) {
   const collapsed = [];
   const replaySignaturesInCurrentTurn = /* @__PURE__ */ new Set();
   let stableAssistantAnswerContentInCurrentTurn = "";
+  let stableAssistantAnswerCollapsedIndex = -1;
+  let stableAssistantAnswerHadInterveningActivity = false;
   let previousReplaySignature = "";
   for (const message of messages) {
     const info = getReadChatReplayCollapseInfo(message);
     if (info?.role === "user") {
       replaySignaturesInCurrentTurn.clear();
       stableAssistantAnswerContentInCurrentTurn = "";
+      stableAssistantAnswerCollapsedIndex = -1;
+      stableAssistantAnswerHadInterveningActivity = false;
       previousReplaySignature = "";
     }
     if (info?.collapsible && info.signature) {
       if (previousReplaySignature === info.signature) continue;
       if (replaySignaturesInCurrentTurn.has(info.signature)) continue;
-      if (isReplayedAssistantAnswerAfterStableAnswerInfo(info, stableAssistantAnswerContentInCurrentTurn)) continue;
+      if (isReplayedAssistantAnswerAfterStableAnswerInfo(info, stableAssistantAnswerContentInCurrentTurn)) {
+        const isAdjacentFullerAssistantAnswer = info.role === "assistant" && (!info.kind || info.kind === "standard") && stableAssistantAnswerCollapsedIndex >= 0 && stableAssistantAnswerCollapsedIndex === collapsed.length - 1 && !stableAssistantAnswerHadInterveningActivity && info.content.length > stableAssistantAnswerContentInCurrentTurn.length && info.content.startsWith(stableAssistantAnswerContentInCurrentTurn);
+        if (isAdjacentFullerAssistantAnswer) {
+          collapsed[stableAssistantAnswerCollapsedIndex] = message;
+          replaySignaturesInCurrentTurn.add(info.signature);
+          stableAssistantAnswerContentInCurrentTurn = info.content;
+          previousReplaySignature = info.signature;
+        }
+        continue;
+      }
     }
     collapsed.push(message);
     previousReplaySignature = info?.collapsible ? info.signature : "";
@@ -9297,6 +9310,10 @@ function collapseReplayDuplicatesFromReadChat(messages) {
     }
     if (isStableReadChatAssistantAnswerInfo(info)) {
       stableAssistantAnswerContentInCurrentTurn = info?.content || "";
+      stableAssistantAnswerCollapsedIndex = collapsed.length - 1;
+      stableAssistantAnswerHadInterveningActivity = false;
+    } else if (stableAssistantAnswerContentInCurrentTurn && info?.role === "assistant" && (!info.kind || info.kind !== "standard")) {
+      stableAssistantAnswerHadInterveningActivity = true;
     }
   }
   return collapsed;
@@ -9829,7 +9846,7 @@ function getCliVisibleTranscriptCount(adapter) {
 async function getStableExtensionBaseline(h) {
   const first = await readExtensionChatState(h);
   if (getStateMessageCount(first) > 0 || getStateLastSignature(first)) return first;
-  await new Promise((resolve21) => setTimeout(resolve21, 150));
+  await new Promise((resolve22) => setTimeout(resolve22, 150));
   const second = await readExtensionChatState(h);
   return getStateMessageCount(second) >= getStateMessageCount(first) ? second : first;
 }
@@ -9837,7 +9854,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((resolve21) => setTimeout(resolve21, 250));
+    await new Promise((resolve22) => setTimeout(resolve22, 250));
     const state = await readExtensionChatState(h);
     if (state?.status === "waiting_approval") return true;
     const afterCount = getStateMessageCount(state);
@@ -11491,7 +11508,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((resolve21) => setTimeout(resolve21, 50));
+          await new Promise((resolve22) => setTimeout(resolve22, 50));
           await adapter.writeRaw("\r");
         }
       }
@@ -12207,7 +12224,7 @@ var init_handler = __esm({
         try {
           const http3 = await import("http");
           const postData = JSON.stringify(body);
-          const result = await new Promise((resolve21, reject) => {
+          const result = await new Promise((resolve22, reject) => {
             const req = http3.request({
               hostname: "127.0.0.1",
               port: 19280,
@@ -12219,9 +12236,9 @@ var init_handler = __esm({
               res.on("data", (chunk) => data += chunk);
               res.on("end", () => {
                 try {
-                  resolve21(JSON.parse(data));
+                  resolve22(JSON.parse(data));
                 } catch {
-                  resolve21({ raw: data });
+                  resolve22({ raw: data });
                 }
               });
             });
@@ -12239,15 +12256,15 @@ var init_handler = __esm({
         if (!providerType) return { success: false, error: "providerType required" };
         try {
           const http3 = await import("http");
-          const result = await new Promise((resolve21, reject) => {
+          const result = await new Promise((resolve22, 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 {
-                  resolve21(JSON.parse(data));
+                  resolve22(JSON.parse(data));
                 } catch {
-                  resolve21({ raw: data });
+                  resolve22({ raw: data });
                 }
               });
             }).on("error", reject);
@@ -12261,7 +12278,7 @@ var init_handler = __esm({
         try {
           const http3 = await import("http");
           const postData = JSON.stringify(args || {});
-          const result = await new Promise((resolve21, reject) => {
+          const result = await new Promise((resolve22, reject) => {
             const req = http3.request({
               hostname: "127.0.0.1",
               port: 19280,
@@ -12273,9 +12290,9 @@ var init_handler = __esm({
               res.on("data", (chunk) => data += chunk);
               res.on("end", () => {
                 try {
-                  resolve21(JSON.parse(data));
+                  resolve22(JSON.parse(data));
                 } catch {
-                  resolve21({ raw: data });
+                  resolve22({ raw: data });
                 }
               });
             });
@@ -13301,14 +13318,14 @@ function applyTerminalColorEnv(env3) {
 function ensureNodePtySpawnHelperPermissions(logFn) {
   if (os22.platform() === "win32") return;
   try {
-    const fs23 = __require("fs");
+    const fs24 = __require("fs");
     const ptyDir = path32.resolve(path32.dirname(__require.resolve("node-pty")), "..");
     const platformArch = `${os22.platform()}-${os22.arch()}`;
     const helper = path32.join(ptyDir, "prebuilds", platformArch, "spawn-helper");
-    if (fs23.existsSync(helper)) {
-      const stat5 = fs23.statSync(helper);
+    if (fs24.existsSync(helper)) {
+      const stat5 = fs24.statSync(helper);
       if (!(stat5.mode & 73)) {
-        fs23.chmodSync(helper, stat5.mode | 493);
+        fs24.chmodSync(helper, stat5.mode | 493);
         logFn?.(`Fixed spawn-helper permissions: ${helper}`);
       }
     }
@@ -13781,8 +13798,8 @@ var init_pty_transport = __esm({
         let cwd = options.cwd;
         if (cwd) {
           try {
-            const fs23 = require("fs");
-            const stat5 = fs23.statSync(cwd);
+            const fs24 = require("fs");
+            const stat5 = fs24.statSync(cwd);
             if (!stat5.isDirectory()) cwd = os11.homedir();
           } catch {
             cwd = os11.homedir();
@@ -13885,12 +13902,12 @@ function findBinary(name) {
 function isScriptBinary(binaryPath) {
   if (!path14.isAbsolute(binaryPath)) return false;
   try {
-    const fs23 = require("fs");
-    const resolved = fs23.realpathSync(binaryPath);
+    const fs24 = require("fs");
+    const resolved = fs24.realpathSync(binaryPath);
     const head = Buffer.alloc(8);
-    const fd = fs23.openSync(resolved, "r");
-    fs23.readSync(fd, head, 0, 8, 0);
-    fs23.closeSync(fd);
+    const fd = fs24.openSync(resolved, "r");
+    fs24.readSync(fd, head, 0, 8, 0);
+    fs24.closeSync(fd);
     let i = 0;
     if (head[0] === 239 && head[1] === 187 && head[2] === 191) i = 3;
     return head[i] === 35 && head[i + 1] === 33;
@@ -13901,12 +13918,12 @@ function isScriptBinary(binaryPath) {
 function looksLikeMachOOrElf(filePath) {
   if (!path14.isAbsolute(filePath)) return false;
   try {
-    const fs23 = require("fs");
-    const resolved = fs23.realpathSync(filePath);
+    const fs24 = require("fs");
+    const resolved = fs24.realpathSync(filePath);
     const buf = Buffer.alloc(8);
-    const fd = fs23.openSync(resolved, "r");
-    fs23.readSync(fd, buf, 0, 8, 0);
-    fs23.closeSync(fd);
+    const fd = fs24.openSync(resolved, "r");
+    fs24.readSync(fd, buf, 0, 8, 0);
+    fs24.closeSync(fd);
     let i = 0;
     if (buf[0] === 239 && buf[1] === 187 && buf[2] === 191) i = 3;
     const b = buf.subarray(i);
@@ -15287,7 +15304,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((resolve21) => setTimeout(resolve21, 50));
+          await new Promise((resolve22) => setTimeout(resolve22, 50));
         }
         const finalScreenText = this.terminalScreen.getText() || "";
         LOG.warn(
@@ -16496,7 +16513,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((resolve21) => setTimeout(resolve21, 50));
+            await new Promise((resolve22) => setTimeout(resolve22, 50));
           }
         }
         if (!allowInterventionPrompt) {
@@ -16577,13 +16594,13 @@ var init_provider_cli_adapter = __esm({
         }
         this.responseEpoch += 1;
         this.responseSettleIgnoreUntil = Date.now() + submitDelayMs + this.timeouts.outputSettle + 250;
-        await new Promise((resolve21, reject) => {
+        await new Promise((resolve22, reject) => {
           let resolved = false;
           const completion = {
             resolveOnce: () => {
               if (resolved) return;
               resolved = true;
-              resolve21();
+              resolve22();
             },
             rejectOnce: (error48) => {
               if (resolved) return;
@@ -16745,17 +16762,17 @@ var init_provider_cli_adapter = __esm({
         }
       }
       waitForStopped(timeoutMs) {
-        return new Promise((resolve21) => {
+        return new Promise((resolve22) => {
           const startedAt = Date.now();
           const timer = setInterval(() => {
             if (!this.ptyProcess || this.currentStatus === "stopped") {
               clearInterval(timer);
-              resolve21(true);
+              resolve22(true);
               return;
             }
             if (Date.now() - startedAt >= timeoutMs) {
               clearInterval(timer);
-              resolve21(false);
+              resolve22(false);
             }
           }, 100);
         });
@@ -17076,7 +17093,7 @@ async function waitForCliAdapterReady(adapter, options) {
     if (status === "stopped") {
       throw new Error("CLI runtime stopped before it became ready");
     }
-    await new Promise((resolve21) => setTimeout(resolve21, pollMs));
+    await new Promise((resolve22) => setTimeout(resolve22, pollMs));
   }
   throw new Error(`CLI runtime did not become ready within ${timeoutMs}ms`);
 }
@@ -17449,7 +17466,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((resolve21) => setTimeout(resolve21, 50));
+            await new Promise((resolve22) => setTimeout(resolve22, 50));
             await this.adapter.writeRaw("\r");
           }
         }
@@ -18236,10 +18253,10 @@ function mergeDefs(...defs) {
 function cloneDef(schema) {
   return mergeDefs(schema._zod.def);
 }
-function getElementAtPath(obj, path39) {
-  if (!path39)
+function getElementAtPath(obj, path40) {
+  if (!path40)
     return obj;
-  return path39.reduce((acc, key) => acc?.[key], obj);
+  return path40.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -18551,11 +18568,11 @@ function aborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path39, issues) {
+function prefixIssues(path40, issues) {
   return issues.map((iss) => {
     var _a2;
     (_a2 = iss).path ?? (_a2.path = []);
-    iss.path.unshift(path39);
+    iss.path.unshift(path40);
     return iss;
   });
 }
@@ -18798,7 +18815,7 @@ function formatError(error48, mapper = (issue2) => issue2.message) {
 }
 function treeifyError(error48, mapper = (issue2) => issue2.message) {
   const result = { errors: [] };
-  const processError = (error49, path39 = []) => {
+  const processError = (error49, path40 = []) => {
     var _a2, _b;
     for (const issue2 of error49.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
@@ -18808,7 +18825,7 @@ function treeifyError(error48, mapper = (issue2) => issue2.message) {
       } else if (issue2.code === "invalid_element") {
         processError({ issues: issue2.issues }, issue2.path);
       } else {
-        const fullpath = [...path39, ...issue2.path];
+        const fullpath = [...path40, ...issue2.path];
         if (fullpath.length === 0) {
           result.errors.push(mapper(issue2));
           continue;
@@ -18840,8 +18857,8 @@ function treeifyError(error48, mapper = (issue2) => issue2.message) {
 }
 function toDotPath(_path) {
   const segs = [];
-  const path39 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
-  for (const seg of path39) {
+  const path40 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
+  for (const seg of path40) {
     if (typeof seg === "number")
       segs.push(`[${seg}]`);
     else if (typeof seg === "symbol")
@@ -31605,13 +31622,13 @@ function resolveRef(ref, ctx) {
   if (!ref.startsWith("#")) {
     throw new Error("External $ref is not supported, only local refs (#/...) are allowed");
   }
-  const path39 = ref.slice(1).split("/").filter(Boolean);
-  if (path39.length === 0) {
+  const path40 = ref.slice(1).split("/").filter(Boolean);
+  if (path40.length === 0) {
     return ctx.rootSchema;
   }
   const defsKey = ctx.version === "draft-2020-12" ? "$defs" : "definitions";
-  if (path39[0] === defsKey) {
-    const key = path39[1];
+  if (path40[0] === defsKey) {
+    const key = path40[1];
     if (!key || !ctx.defs[key]) {
       throw new Error(`Reference not found: ${ref}`);
     }
@@ -34038,8 +34055,8 @@ var init_acp = __esm({
         this.#requestHandler = requestHandler;
         this.#notificationHandler = notificationHandler;
         this.#stream = stream;
-        this.#closedPromise = new Promise((resolve21) => {
-          this.#abortController.signal.addEventListener("abort", () => resolve21());
+        this.#closedPromise = new Promise((resolve22) => {
+          this.#abortController.signal.addEventListener("abort", () => resolve22());
         });
         this.#receive();
       }
@@ -34188,8 +34205,8 @@ var init_acp = __esm({
       }
       async sendRequest(method, params) {
         const id = this.#nextRequestId++;
-        const responsePromise = new Promise((resolve21, reject) => {
-          this.#pendingResponses.set(id, { resolve: resolve21, reject });
+        const responsePromise = new Promise((resolve22, reject) => {
+          this.#pendingResponses.set(id, { resolve: resolve22, reject });
         });
         await this.#sendMessage({ jsonrpc: "2.0", id, method, params });
         return responsePromise;
@@ -34873,13 +34890,13 @@ var init_acp_provider_instance = __esm({
             }
             this.currentStatus = "waiting_approval";
             this.detectStatusTransition();
-            const approved = await new Promise((resolve21) => {
-              this.permissionResolvers.push(resolve21);
+            const approved = await new Promise((resolve22) => {
+              this.permissionResolvers.push(resolve22);
               setTimeout(() => {
-                const idx = this.permissionResolvers.indexOf(resolve21);
+                const idx = this.permissionResolvers.indexOf(resolve22);
                 if (idx >= 0) {
                   this.permissionResolvers.splice(idx, 1);
-                  resolve21(false);
+                  resolve22(false);
                 }
               }, 3e5);
             });
@@ -36369,7 +36386,7 @@ var init_readdirp = __esm({
         this._directoryFilter = normalizeFilter(opts.directoryFilter);
         const statMethod = opts.lstat ? import_promises3.lstat : import_promises3.stat;
         if (wantBigintFsStats) {
-          this._stat = (path39) => statMethod(path39, { bigint: true });
+          this._stat = (path40) => statMethod(path40, { bigint: true });
         } else {
           this._stat = statMethod;
         }
@@ -36394,8 +36411,8 @@ var init_readdirp = __esm({
             const par = this.parent;
             const fil = par && par.files;
             if (fil && fil.length > 0) {
-              const { path: path39, depth } = par;
-              const slice = fil.splice(0, batch).map((dirent) => this._formatEntry(dirent, path39));
+              const { path: path40, depth } = par;
+              const slice = fil.splice(0, batch).map((dirent) => this._formatEntry(dirent, path40));
               const awaited = await Promise.all(slice);
               for (const entry of awaited) {
                 if (!entry)
@@ -36435,20 +36452,20 @@ var init_readdirp = __esm({
           this.reading = false;
         }
       }
-      async _exploreDir(path39, depth) {
+      async _exploreDir(path40, depth) {
         let files;
         try {
-          files = await (0, import_promises3.readdir)(path39, this._rdOptions);
+          files = await (0, import_promises3.readdir)(path40, this._rdOptions);
         } catch (error48) {
           this._onError(error48);
         }
-        return { files, depth, path: path39 };
+        return { files, depth, path: path40 };
       }
-      async _formatEntry(dirent, path39) {
+      async _formatEntry(dirent, path40) {
         let entry;
         const basename10 = this._isDirent ? dirent.name : dirent;
         try {
-          const fullPath = (0, import_node_path.resolve)((0, import_node_path.join)(path39, basename10));
+          const fullPath = (0, import_node_path.resolve)((0, import_node_path.join)(path40, basename10));
           entry = { path: (0, import_node_path.relative)(this._root, fullPath), fullPath, basename: basename10 };
           entry[this._statsProp] = this._isDirent ? dirent : await this._stat(fullPath);
         } catch (err) {
@@ -36505,16 +36522,16 @@ var init_readdirp = __esm({
 });
 
 // ../../oss/packages/daemon-core/node_modules/chokidar/handler.js
-function createFsWatchInstance(path39, options, listener, errHandler, emitRaw) {
+function createFsWatchInstance(path40, options, listener, errHandler, emitRaw) {
   const handleEvent = (rawEvent, evPath) => {
-    listener(path39);
-    emitRaw(rawEvent, evPath, { watchedPath: path39 });
-    if (evPath && path39 !== evPath) {
-      fsWatchBroadcast(sp.resolve(path39, evPath), KEY_LISTENERS, sp.join(path39, evPath));
+    listener(path40);
+    emitRaw(rawEvent, evPath, { watchedPath: path40 });
+    if (evPath && path40 !== evPath) {
+      fsWatchBroadcast(sp.resolve(path40, evPath), KEY_LISTENERS, sp.join(path40, evPath));
     }
   };
   try {
-    return (0, import_node_fs2.watch)(path39, {
+    return (0, import_node_fs2.watch)(path40, {
       persistent: options.persistent
     }, handleEvent);
   } catch (error48) {
@@ -36863,12 +36880,12 @@ var init_handler2 = __esm({
         listener(val1, val2, val3);
       });
     };
-    setFsWatchListener = (path39, fullPath, options, handlers) => {
+    setFsWatchListener = (path40, fullPath, options, handlers) => {
       const { listener, errHandler, rawEmitter } = handlers;
       let cont = FsWatchInstances.get(fullPath);
       let watcher;
       if (!options.persistent) {
-        watcher = createFsWatchInstance(path39, options, listener, errHandler, rawEmitter);
+        watcher = createFsWatchInstance(path40, options, listener, errHandler, rawEmitter);
         if (!watcher)
           return;
         return watcher.close.bind(watcher);
@@ -36879,7 +36896,7 @@ var init_handler2 = __esm({
         addAndConvert(cont, KEY_RAW, rawEmitter);
       } else {
         watcher = createFsWatchInstance(
-          path39,
+          path40,
           options,
           fsWatchBroadcast.bind(null, fullPath, KEY_LISTENERS),
           errHandler,
@@ -36894,7 +36911,7 @@ var init_handler2 = __esm({
             cont.watcherUnusable = true;
           if (isWindows && error48.code === "EPERM") {
             try {
-              const fd = await (0, import_promises4.open)(path39, "r");
+              const fd = await (0, import_promises4.open)(path40, "r");
               await fd.close();
               broadcastErr(error48);
             } catch (err) {
@@ -36925,7 +36942,7 @@ var init_handler2 = __esm({
       };
     };
     FsWatchFileInstances = /* @__PURE__ */ new Map();
-    setFsWatchFileListener = (path39, fullPath, options, handlers) => {
+    setFsWatchFileListener = (path40, fullPath, options, handlers) => {
       const { listener, rawEmitter } = handlers;
       let cont = FsWatchFileInstances.get(fullPath);
       const copts = cont && cont.options;
@@ -36947,7 +36964,7 @@ var init_handler2 = __esm({
             });
             const currmtime = curr.mtimeMs;
             if (curr.size !== prev.size || currmtime > prev.mtimeMs || currmtime === 0) {
-              foreach(cont.listeners, (listener2) => listener2(path39, curr));
+              foreach(cont.listeners, (listener2) => listener2(path40, curr));
             }
           })
         };
@@ -36977,13 +36994,13 @@ var init_handler2 = __esm({
        * @param listener on fs change
        * @returns closer for the watcher instance
        */
-      _watchWithNodeFs(path39, listener) {
+      _watchWithNodeFs(path40, listener) {
         const opts = this.fsw.options;
-        const directory = sp.dirname(path39);
-        const basename10 = sp.basename(path39);
+        const directory = sp.dirname(path40);
+        const basename10 = sp.basename(path40);
         const parent = this.fsw._getWatchedDir(directory);
         parent.add(basename10);
-        const absolutePath = sp.resolve(path39);
+        const absolutePath = sp.resolve(path40);
         const options = {
           persistent: opts.persistent
         };
@@ -36993,12 +37010,12 @@ var init_handler2 = __esm({
         if (opts.usePolling) {
           const enableBin = opts.interval !== opts.binaryInterval;
           options.interval = enableBin && isBinaryPath(basename10) ? opts.binaryInterval : opts.interval;
-          closer = setFsWatchFileListener(path39, absolutePath, options, {
+          closer = setFsWatchFileListener(path40, absolutePath, options, {
             listener,
             rawEmitter: this.fsw._emitRaw
           });
         } else {
-          closer = setFsWatchListener(path39, absolutePath, options, {
+          closer = setFsWatchListener(path40, absolutePath, options, {
             listener,
             errHandler: this._boundHandleError,
             rawEmitter: this.fsw._emitRaw
@@ -37020,7 +37037,7 @@ var init_handler2 = __esm({
         let prevStats = stats;
         if (parent.has(basename10))
           return;
-        const listener = async (path39, newStats) => {
+        const listener = async (path40, newStats) => {
           if (!this.fsw._throttle(THROTTLE_MODE_WATCH, file2, 5))
             return;
           if (!newStats || newStats.mtimeMs === 0) {
@@ -37034,11 +37051,11 @@ var init_handler2 = __esm({
                 this.fsw._emit(EV.CHANGE, file2, newStats2);
               }
               if ((isMacos || isLinux || isFreeBSD) && prevStats.ino !== newStats2.ino) {
-                this.fsw._closeFile(path39);
+                this.fsw._closeFile(path40);
                 prevStats = newStats2;
                 const closer2 = this._watchWithNodeFs(file2, listener);
                 if (closer2)
-                  this.fsw._addPathCloser(path39, closer2);
+                  this.fsw._addPathCloser(path40, closer2);
               } else {
                 prevStats = newStats2;
               }
@@ -37070,7 +37087,7 @@ var init_handler2 = __esm({
        * @param item basename of this item
        * @returns true if no more processing is needed for this entry.
        */
-      async _handleSymlink(entry, directory, path39, item) {
+      async _handleSymlink(entry, directory, path40, item) {
         if (this.fsw.closed) {
           return;
         }
@@ -37080,7 +37097,7 @@ var init_handler2 = __esm({
           this.fsw._incrReadyCount();
           let linkPath;
           try {
-            linkPath = await (0, import_promises4.realpath)(path39);
+            linkPath = await (0, import_promises4.realpath)(path40);
           } catch (e) {
             this.fsw._emitReady();
             return true;
@@ -37090,12 +37107,12 @@ var init_handler2 = __esm({
           if (dir.has(item)) {
             if (this.fsw._symlinkPaths.get(full) !== linkPath) {
               this.fsw._symlinkPaths.set(full, linkPath);
-              this.fsw._emit(EV.CHANGE, path39, entry.stats);
+              this.fsw._emit(EV.CHANGE, path40, entry.stats);
             }
           } else {
             dir.add(item);
             this.fsw._symlinkPaths.set(full, linkPath);
-            this.fsw._emit(EV.ADD, path39, entry.stats);
+            this.fsw._emit(EV.ADD, path40, entry.stats);
           }
           this.fsw._emitReady();
           return true;
@@ -37125,9 +37142,9 @@ var init_handler2 = __esm({
             return;
           }
           const item = entry.path;
-          let path39 = sp.join(directory, item);
+          let path40 = sp.join(directory, item);
           current.add(item);
-          if (entry.stats.isSymbolicLink() && await this._handleSymlink(entry, directory, path39, item)) {
+          if (entry.stats.isSymbolicLink() && await this._handleSymlink(entry, directory, path40, item)) {
             return;
           }
           if (this.fsw.closed) {
@@ -37136,11 +37153,11 @@ var init_handler2 = __esm({
           }
           if (item === target || !target && !previous.has(item)) {
             this.fsw._incrReadyCount();
-            path39 = sp.join(dir, sp.relative(dir, path39));
-            this._addToNodeFs(path39, initialAdd, wh, depth + 1);
+            path40 = sp.join(dir, sp.relative(dir, path40));
+            this._addToNodeFs(path40, initialAdd, wh, depth + 1);
           }
         }).on(EV.ERROR, this._boundHandleError);
-        return new Promise((resolve21, reject) => {
+        return new Promise((resolve22, reject) => {
           if (!stream)
             return reject();
           stream.once(STR_END, () => {
@@ -37149,7 +37166,7 @@ var init_handler2 = __esm({
               return;
             }
             const wasThrottled = throttler ? throttler.clear() : false;
-            resolve21(void 0);
+            resolve22(void 0);
             previous.getChildren().filter((item) => {
               return item !== directory && !current.has(item);
             }).forEach((item) => {
@@ -37206,13 +37223,13 @@ var init_handler2 = __esm({
        * @param depth Child path actually targeted for watch
        * @param target Child path actually targeted for watch
        */
-      async _addToNodeFs(path39, initialAdd, priorWh, depth, target) {
+      async _addToNodeFs(path40, initialAdd, priorWh, depth, target) {
         const ready = this.fsw._emitReady;
-        if (this.fsw._isIgnored(path39) || this.fsw.closed) {
+        if (this.fsw._isIgnored(path40) || this.fsw.closed) {
           ready();
           return false;
         }
-        const wh = this.fsw._getWatchHelpers(path39);
+        const wh = this.fsw._getWatchHelpers(path40);
         if (priorWh) {
           wh.filterPath = (entry) => priorWh.filterPath(entry);
           wh.filterDir = (entry) => priorWh.filterDir(entry);
@@ -37228,8 +37245,8 @@ var init_handler2 = __esm({
           const follow = this.fsw.options.followSymlinks;
           let closer;
           if (stats.isDirectory()) {
-            const absPath = sp.resolve(path39);
-            const targetPath = follow ? await (0, import_promises4.realpath)(path39) : path39;
+            const absPath = sp.resolve(path40);
+            const targetPath = follow ? await (0, import_promises4.realpath)(path40) : path40;
             if (this.fsw.closed)
               return;
             closer = await this._handleDir(wh.watchPath, stats, initialAdd, depth, target, wh, targetPath);
@@ -37239,29 +37256,29 @@ var init_handler2 = __esm({
               this.fsw._symlinkPaths.set(absPath, targetPath);
             }
           } else if (stats.isSymbolicLink()) {
-            const targetPath = follow ? await (0, import_promises4.realpath)(path39) : path39;
+            const targetPath = follow ? await (0, import_promises4.realpath)(path40) : path40;
             if (this.fsw.closed)
               return;
             const parent = sp.dirname(wh.watchPath);
             this.fsw._getWatchedDir(parent).add(wh.watchPath);
             this.fsw._emit(EV.ADD, wh.watchPath, stats);
-            closer = await this._handleDir(parent, stats, initialAdd, depth, path39, wh, targetPath);
+            closer = await this._handleDir(parent, stats, initialAdd, depth, path40, wh, targetPath);
             if (this.fsw.closed)
               return;
             if (targetPath !== void 0) {
-              this.fsw._symlinkPaths.set(sp.resolve(path39), targetPath);
+              this.fsw._symlinkPaths.set(sp.resolve(path40), targetPath);
             }
           } else {
             closer = this._handleFile(wh.watchPath, stats, initialAdd);
           }
           ready();
           if (closer)
-            this.fsw._addPathCloser(path39, closer);
+            this.fsw._addPathCloser(path40, closer);
           return false;
         } catch (error48) {
           if (this.fsw._handleError(error48)) {
             ready();
-            return path39;
+            return path40;
           }
         }
       }
@@ -37296,24 +37313,24 @@ function createPattern(matcher) {
   }
   return () => false;
 }
-function normalizePath(path39) {
-  if (typeof path39 !== "string")
+function normalizePath(path40) {
+  if (typeof path40 !== "string")
     throw new Error("string expected");
-  path39 = sp2.normalize(path39);
-  path39 = path39.replace(/\\/g, "/");
+  path40 = sp2.normalize(path40);
+  path40 = path40.replace(/\\/g, "/");
   let prepend = false;
-  if (path39.startsWith("//"))
+  if (path40.startsWith("//"))
     prepend = true;
-  path39 = path39.replace(DOUBLE_SLASH_RE, "/");
+  path40 = path40.replace(DOUBLE_SLASH_RE, "/");
   if (prepend)
-    path39 = "/" + path39;
-  return path39;
+    path40 = "/" + path40;
+  return path40;
 }
 function matchPatterns(patterns, testString, stats) {
-  const path39 = normalizePath(testString);
+  const path40 = normalizePath(testString);
   for (let index = 0; index < patterns.length; index++) {
     const pattern = patterns[index];
-    if (pattern(path39, stats)) {
+    if (pattern(path40, stats)) {
       return true;
     }
   }
@@ -37376,19 +37393,19 @@ var init_chokidar = __esm({
       }
       return str;
     };
-    normalizePathToUnix = (path39) => toUnix(sp2.normalize(toUnix(path39)));
-    normalizeIgnored = (cwd = "") => (path39) => {
-      if (typeof path39 === "string") {
-        return normalizePathToUnix(sp2.isAbsolute(path39) ? path39 : sp2.join(cwd, path39));
+    normalizePathToUnix = (path40) => toUnix(sp2.normalize(toUnix(path40)));
+    normalizeIgnored = (cwd = "") => (path40) => {
+      if (typeof path40 === "string") {
+        return normalizePathToUnix(sp2.isAbsolute(path40) ? path40 : sp2.join(cwd, path40));
       } else {
-        return path39;
+        return path40;
       }
     };
-    getAbsolutePath = (path39, cwd) => {
-      if (sp2.isAbsolute(path39)) {
-        return path39;
+    getAbsolutePath = (path40, cwd) => {
+      if (sp2.isAbsolute(path40)) {
+        return path40;
       }
-      return sp2.join(cwd, path39);
+      return sp2.join(cwd, path40);
     };
     EMPTY_SET = Object.freeze(/* @__PURE__ */ new Set());
     DirEntry = class {
@@ -37453,10 +37470,10 @@ var init_chokidar = __esm({
       dirParts;
       followSymlinks;
       statMethod;
-      constructor(path39, follow, fsw) {
+      constructor(path40, follow, fsw) {
         this.fsw = fsw;
-        const watchPath = path39;
-        this.path = path39 = path39.replace(REPLACER_RE, "");
+        const watchPath = path40;
+        this.path = path40 = path40.replace(REPLACER_RE, "");
         this.watchPath = watchPath;
         this.fullWatchPath = sp2.resolve(watchPath);
         this.dirParts = [];
@@ -37596,20 +37613,20 @@ var init_chokidar = __esm({
         this._closePromise = void 0;
         let paths = unifyPaths(paths_);
         if (cwd) {
-          paths = paths.map((path39) => {
-            const absPath = getAbsolutePath(path39, cwd);
+          paths = paths.map((path40) => {
+            const absPath = getAbsolutePath(path40, cwd);
             return absPath;
           });
         }
-        paths.forEach((path39) => {
-          this._removeIgnoredPath(path39);
+        paths.forEach((path40) => {
+          this._removeIgnoredPath(path40);
         });
         this._userIgnored = void 0;
         if (!this._readyCount)
           this._readyCount = 0;
         this._readyCount += paths.length;
-        Promise.all(paths.map(async (path39) => {
-          const res = await this._nodeFsHandler._addToNodeFs(path39, !_internal, void 0, 0, _origAdd);
+        Promise.all(paths.map(async (path40) => {
+          const res = await this._nodeFsHandler._addToNodeFs(path40, !_internal, void 0, 0, _origAdd);
           if (res)
             this._emitReady();
           return res;
@@ -37631,17 +37648,17 @@ var init_chokidar = __esm({
           return this;
         const paths = unifyPaths(paths_);
         const { cwd } = this.options;
-        paths.forEach((path39) => {
-          if (!sp2.isAbsolute(path39) && !this._closers.has(path39)) {
+        paths.forEach((path40) => {
+          if (!sp2.isAbsolute(path40) && !this._closers.has(path40)) {
             if (cwd)
-              path39 = sp2.join(cwd, path39);
-            path39 = sp2.resolve(path39);
+              path40 = sp2.join(cwd, path40);
+            path40 = sp2.resolve(path40);
           }
-          this._closePath(path39);
-          this._addIgnoredPath(path39);
-          if (this._watched.has(path39)) {
+          this._closePath(path40);
+          this._addIgnoredPath(path40);
+          if (this._watched.has(path40)) {
             this._addIgnoredPath({
-              path: path39,
+              path: path40,
               recursive: true
             });
           }
@@ -37705,38 +37722,38 @@ var init_chokidar = __esm({
        * @param stats arguments to be passed with event
        * @returns the error if defined, otherwise the value of the FSWatcher instance's `closed` flag
        */
-      async _emit(event, path39, stats) {
+      async _emit(event, path40, stats) {
         if (this.closed)
           return;
         const opts = this.options;
         if (isWindows)
-          path39 = sp2.normalize(path39);
+          path40 = sp2.normalize(path40);
         if (opts.cwd)
-          path39 = sp2.relative(opts.cwd, path39);
-        const args = [path39];
+          path40 = sp2.relative(opts.cwd, path40);
+        const args = [path40];
         if (stats != null)
           args.push(stats);
         const awf = opts.awaitWriteFinish;
         let pw;
-        if (awf && (pw = this._pendingWrites.get(path39))) {
+        if (awf && (pw = this._pendingWrites.get(path40))) {
           pw.lastChange = /* @__PURE__ */ new Date();
           return this;
         }
         if (opts.atomic) {
           if (event === EVENTS.UNLINK) {
-            this._pendingUnlinks.set(path39, [event, ...args]);
+            this._pendingUnlinks.set(path40, [event, ...args]);
             setTimeout(() => {
-              this._pendingUnlinks.forEach((entry, path40) => {
+              this._pendingUnlinks.forEach((entry, path41) => {
                 this.emit(...entry);
                 this.emit(EVENTS.ALL, ...entry);
-                this._pendingUnlinks.delete(path40);
+                this._pendingUnlinks.delete(path41);
               });
             }, typeof opts.atomic === "number" ? opts.atomic : 100);
             return this;
           }
-          if (event === EVENTS.ADD && this._pendingUnlinks.has(path39)) {
+          if (event === EVENTS.ADD && this._pendingUnlinks.has(path40)) {
             event = EVENTS.CHANGE;
-            this._pendingUnlinks.delete(path39);
+            this._pendingUnlinks.delete(path40);
           }
         }
         if (awf && (event === EVENTS.ADD || event === EVENTS.CHANGE) && this._readyEmitted) {
@@ -37754,16 +37771,16 @@ var init_chokidar = __esm({
               this.emitWithAll(event, args);
             }
           };
-          this._awaitWriteFinish(path39, awf.stabilityThreshold, event, awfEmit);
+          this._awaitWriteFinish(path40, awf.stabilityThreshold, event, awfEmit);
           return this;
         }
         if (event === EVENTS.CHANGE) {
-          const isThrottled = !this._throttle(EVENTS.CHANGE, path39, 50);
+          const isThrottled = !this._throttle(EVENTS.CHANGE, path40, 50);
           if (isThrottled)
             return this;
         }
         if (opts.alwaysStat && stats === void 0 && (event === EVENTS.ADD || event === EVENTS.ADD_DIR || event === EVENTS.CHANGE)) {
-          const fullPath = opts.cwd ? sp2.join(opts.cwd, path39) : path39;
+          const fullPath = opts.cwd ? sp2.join(opts.cwd, path40) : path40;
           let stats2;
           try {
             stats2 = await (0, import_promises5.stat)(fullPath);
@@ -37794,23 +37811,23 @@ var init_chokidar = __esm({
        * @param timeout duration of time to suppress duplicate actions
        * @returns tracking object or false if action should be suppressed
        */
-      _throttle(actionType, path39, timeout) {
+      _throttle(actionType, path40, timeout) {
         if (!this._throttled.has(actionType)) {
           this._throttled.set(actionType, /* @__PURE__ */ new Map());
         }
         const action = this._throttled.get(actionType);
         if (!action)
           throw new Error("invalid throttle");
-        const actionPath = action.get(path39);
+        const actionPath = action.get(path40);
         if (actionPath) {
           actionPath.count++;
           return false;
         }
         let timeoutObject;
         const clear = () => {
-          const item = action.get(path39);
+          const item = action.get(path40);
           const count = item ? item.count : 0;
-          action.delete(path39);
+          action.delete(path40);
           clearTimeout(timeoutObject);
           if (item)
             clearTimeout(item.timeoutObject);
@@ -37818,7 +37835,7 @@ var init_chokidar = __esm({
         };
         timeoutObject = setTimeout(clear, timeout);
         const thr = { timeoutObject, clear, count: 0 };
-        action.set(path39, thr);
+        action.set(path40, thr);
         return thr;
       }
       _incrReadyCount() {
@@ -37832,44 +37849,44 @@ var init_chokidar = __esm({
        * @param event
        * @param awfEmit Callback to be called when ready for event to be emitted.
        */
-      _awaitWriteFinish(path39, threshold, event, awfEmit) {
+      _awaitWriteFinish(path40, threshold, event, awfEmit) {
         const awf = this.options.awaitWriteFinish;
         if (typeof awf !== "object")
           return;
         const pollInterval = awf.pollInterval;
         let timeoutHandler;
-        let fullPath = path39;
-        if (this.options.cwd && !sp2.isAbsolute(path39)) {
-          fullPath = sp2.join(this.options.cwd, path39);
+        let fullPath = path40;
+        if (this.options.cwd && !sp2.isAbsolute(path40)) {
+          fullPath = sp2.join(this.options.cwd, path40);
         }
         const now = /* @__PURE__ */ new Date();
         const writes = this._pendingWrites;
         function awaitWriteFinishFn(prevStat) {
           (0, import_node_fs3.stat)(fullPath, (err, curStat) => {
-            if (err || !writes.has(path39)) {
+            if (err || !writes.has(path40)) {
               if (err && err.code !== "ENOENT")
                 awfEmit(err);
               return;
             }
             const now2 = Number(/* @__PURE__ */ new Date());
             if (prevStat && curStat.size !== prevStat.size) {
-              writes.get(path39).lastChange = now2;
+              writes.get(path40).lastChange = now2;
             }
-            const pw = writes.get(path39);
+            const pw = writes.get(path40);
             const df = now2 - pw.lastChange;
             if (df >= threshold) {
-              writes.delete(path39);
+              writes.delete(path40);
               awfEmit(void 0, curStat);
             } else {
               timeoutHandler = setTimeout(awaitWriteFinishFn, pollInterval, curStat);
             }
           });
         }
-        if (!writes.has(path39)) {
-          writes.set(path39, {
+        if (!writes.has(path40)) {
+          writes.set(path40, {
             lastChange: now,
             cancelWait: () => {
-              writes.delete(path39);
+              writes.delete(path40);
               clearTimeout(timeoutHandler);
               return event;
             }
@@ -37880,8 +37897,8 @@ var init_chokidar = __esm({
       /**
        * Determines whether user has asked to ignore this path.
        */
-      _isIgnored(path39, stats) {
-        if (this.options.atomic && DOT_RE.test(path39))
+      _isIgnored(path40, stats) {
+        if (this.options.atomic && DOT_RE.test(path40))
           return true;
         if (!this._userIgnored) {
           const { cwd } = this.options;
@@ -37891,17 +37908,17 @@ var init_chokidar = __esm({
           const list = [...ignoredPaths.map(normalizeIgnored(cwd)), ...ignored];
           this._userIgnored = anymatch(list, void 0);
         }
-        return this._userIgnored(path39, stats);
+        return this._userIgnored(path40, stats);
       }
-      _isntIgnored(path39, stat5) {
-        return !this._isIgnored(path39, stat5);
+      _isntIgnored(path40, stat5) {
+        return !this._isIgnored(path40, stat5);
       }
       /**
        * Provides a set of common helpers and properties relating to symlink handling.
        * @param path file or directory pattern being watched
        */
-      _getWatchHelpers(path39) {
-        return new WatchHelper(path39, this.options.followSymlinks, this);
+      _getWatchHelpers(path40) {
+        return new WatchHelper(path40, this.options.followSymlinks, this);
       }
       // Directory helpers
       // -----------------
@@ -37933,63 +37950,63 @@ var init_chokidar = __esm({
        * @param item      base path of item/directory
        */
       _remove(directory, item, isDirectory) {
-        const path39 = sp2.join(directory, item);
-        const fullPath = sp2.resolve(path39);
-        isDirectory = isDirectory != null ? isDirectory : this._watched.has(path39) || this._watched.has(fullPath);
-        if (!this._throttle("remove", path39, 100))
+        const path40 = sp2.join(directory, item);
+        const fullPath = sp2.resolve(path40);
+        isDirectory = isDirectory != null ? isDirectory : this._watched.has(path40) || this._watched.has(fullPath);
+        if (!this._throttle("remove", path40, 100))
           return;
         if (!isDirectory && this._watched.size === 1) {
           this.add(directory, item, true);
         }
-        const wp = this._getWatchedDir(path39);
+        const wp = this._getWatchedDir(path40);
         const nestedDirectoryChildren = wp.getChildren();
-        nestedDirectoryChildren.forEach((nested) => this._remove(path39, nested));
+        nestedDirectoryChildren.forEach((nested) => this._remove(path40, nested));
         const parent = this._getWatchedDir(directory);
         const wasTracked = parent.has(item);
         parent.remove(item);
         if (this._symlinkPaths.has(fullPath)) {
           this._symlinkPaths.delete(fullPath);
         }
-        let relPath = path39;
+        let relPath = path40;
         if (this.options.cwd)
-          relPath = sp2.relative(this.options.cwd, path39);
+          relPath = sp2.relative(this.options.cwd, path40);
         if (this.options.awaitWriteFinish && this._pendingWrites.has(relPath)) {
           const event = this._pendingWrites.get(relPath).cancelWait();
           if (event === EVENTS.ADD)
             return;
         }
-        this._watched.delete(path39);
+        this._watched.delete(path40);
         this._watched.delete(fullPath);
         const eventName = isDirectory ? EVENTS.UNLINK_DIR : EVENTS.UNLINK;
-        if (wasTracked && !this._isIgnored(path39))
-          this._emit(eventName, path39);
-        this._closePath(path39);
+        if (wasTracked && !this._isIgnored(path40))
+          this._emit(eventName, path40);
+        this._closePath(path40);
       }
       /**
        * Closes all watchers for a path
        */
-      _closePath(path39) {
-        this._closeFile(path39);
-        const dir = sp2.dirname(path39);
-        this._getWatchedDir(dir).remove(sp2.basename(path39));
+      _closePath(path40) {
+        this._closeFile(path40);
+        const dir = sp2.dirname(path40);
+        this._getWatchedDir(dir).remove(sp2.basename(path40));
       }
       /**
        * Closes only file-specific watchers
        */
-      _closeFile(path39) {
-        const closers = this._closers.get(path39);
+      _closeFile(path40) {
+        const closers = this._closers.get(path40);
         if (!closers)
           return;
         closers.forEach((closer) => closer());
-        this._closers.delete(path39);
+        this._closers.delete(path40);
       }
-      _addPathCloser(path39, closer) {
+      _addPathCloser(path40, closer) {
         if (!closer)
           return;
-        let list = this._closers.get(path39);
+        let list = this._closers.get(path40);
         if (!list) {
           list = [];
-          this._closers.set(path39, list);
+          this._closers.set(path40, list);
         }
         list.push(closer);
       }
@@ -39191,7 +39208,7 @@ var init_provider_loader = __esm({
           return { updated: false };
         }
         try {
-          const etag = await new Promise((resolve21, reject) => {
+          const etag = await new Promise((resolve22, reject) => {
             const options = {
               method: "HEAD",
               hostname: "github.com",
@@ -39209,7 +39226,7 @@ var init_provider_loader = __esm({
                   headers: { "User-Agent": "adhdev-launcher" },
                   timeout: 1e4
                 }, (res2) => {
-                  resolve21(res2.headers.etag || res2.headers["last-modified"] || "");
+                  resolve22(res2.headers.etag || res2.headers["last-modified"] || "");
                 });
                 req2.on("error", reject);
                 req2.on("timeout", () => {
@@ -39218,7 +39235,7 @@ var init_provider_loader = __esm({
                 });
                 req2.end();
               } else {
-                resolve21(res.headers.etag || res.headers["last-modified"] || "");
+                resolve22(res.headers.etag || res.headers["last-modified"] || "");
               }
             });
             req.on("error", reject);
@@ -39282,7 +39299,7 @@ var init_provider_loader = __esm({
       downloadFile(url2, destPath) {
         const https = require("https");
         const http3 = require("http");
-        return new Promise((resolve21, reject) => {
+        return new Promise((resolve22, reject) => {
           const doRequest = (reqUrl, redirectCount = 0) => {
             if (redirectCount > 5) {
               reject(new Error("Too many redirects"));
@@ -39302,7 +39319,7 @@ var init_provider_loader = __esm({
               res.pipe(ws);
               ws.on("finish", () => {
                 ws.close();
-                resolve21();
+                resolve22();
               });
               ws.on("error", reject);
             });
@@ -39887,17 +39904,17 @@ async function findFreePort(ports) {
   throw new Error("No free port found");
 }
 function checkPortFree(port) {
-  return new Promise((resolve21) => {
+  return new Promise((resolve22) => {
     const server = net2.createServer();
     server.unref();
-    server.on("error", () => resolve21(false));
+    server.on("error", () => resolve22(false));
     server.listen(port, "127.0.0.1", () => {
-      server.close(() => resolve21(true));
+      server.close(() => resolve22(true));
     });
   });
 }
 async function isCdpActive(port) {
-  return new Promise((resolve21) => {
+  return new Promise((resolve22) => {
     const req = require("http").get(`http://127.0.0.1:${port}/json/version`, {
       timeout: 2e3
     }, (res) => {
@@ -39906,16 +39923,16 @@ async function isCdpActive(port) {
       res.on("end", () => {
         try {
           const info = JSON.parse(data);
-          resolve21(!!info["WebKit-Version"] || !!info["Browser"]);
+          resolve22(!!info["WebKit-Version"] || !!info["Browser"]);
         } catch {
-          resolve21(false);
+          resolve22(false);
         }
       });
     });
-    req.on("error", () => resolve21(false));
+    req.on("error", () => resolve22(false));
     req.on("timeout", () => {
       req.destroy();
-      resolve21(false);
+      resolve22(false);
     });
   });
 }
@@ -40051,7 +40068,7 @@ function detectCurrentWorkspace(ideId) {
     }
   } else if (plat === "win32") {
     try {
-      const fs23 = require("fs");
+      const fs24 = require("fs");
       const appNameMap = getMacAppIdentifiers();
       const appName = appNameMap[ideId];
       if (appName) {
@@ -40060,8 +40077,8 @@ function detectCurrentWorkspace(ideId) {
           appName,
           "storage.json"
         );
-        if (fs23.existsSync(storagePath)) {
-          const data = JSON.parse(fs23.readFileSync(storagePath, "utf-8"));
+        if (fs24.existsSync(storagePath)) {
+          const data = JSON.parse(fs24.readFileSync(storagePath, "utf-8"));
           const workspaces = data?.openedPathsList?.workspaces3 || data?.openedPathsList?.entries || [];
           if (workspaces.length > 0) {
             const recent = workspaces[0];
@@ -40904,7 +40921,7 @@ async function waitForPidExit(pid, timeoutMs) {
   while (Date.now() - start < timeoutMs) {
     try {
       process.kill(pid, 0);
-      await new Promise((resolve21) => setTimeout(resolve21, 250));
+      await new Promise((resolve22) => setTimeout(resolve22, 250));
     } catch {
       return;
     }
@@ -41015,7 +41032,7 @@ async function runDaemonUpgradeHelper(payload) {
     appendUpgradeLog(installOutput.trim());
   }
   if (process.platform === "win32") {
-    await new Promise((resolve21) => setTimeout(resolve21, 500));
+    await new Promise((resolve22) => setTimeout(resolve22, 500));
     cleanupStaleGlobalInstallDirs(payload.packageName, installCommand.surface);
     appendUpgradeLog("Post-install staging cleanup complete");
   }
@@ -42476,7 +42493,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((resolve21) => setTimeout(resolve21, 250));
+          await new Promise((resolve22) => setTimeout(resolve22, 250));
           let state;
           try {
             state = await this.readChat(evaluate);
@@ -42498,7 +42515,7 @@ var init_provider_adapter = __esm({
         if (this.messageCount(first) > 0 || this.lastMessageSignature(first)) {
           return first;
         }
-        await new Promise((resolve21) => setTimeout(resolve21, 150));
+        await new Promise((resolve22) => setTimeout(resolve22, 150));
         const second = await this.readChat(evaluate);
         return this.messageCount(second) >= this.messageCount(first) ? second : first;
       }
@@ -42649,7 +42666,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((resolve21) => setTimeout(resolve21, 250));
+          await new Promise((resolve22) => setTimeout(resolve22, 250));
           const state = await this.readChat(evaluate);
           const title = this.getStateTitle(state);
           if (this.titlesMatch(title, sessionId)) return true;
@@ -45296,7 +45313,7 @@ function getCliTargetBundle(ctx, type, instanceId) {
   return { target, instance, adapter };
 }
 function sleep(ms) {
-  return new Promise((resolve21) => setTimeout(resolve21, ms));
+  return new Promise((resolve22) => setTimeout(resolve22, ms));
 }
 async function waitForCliReady(ctx, type, instanceId, timeoutMs) {
   const startedAt = Date.now();
@@ -47544,8 +47561,8 @@ var init_dev_server = __esm({
       }
       getEndpointList() {
         return this.routes.map((r) => {
-          const path39 = typeof r.pattern === "string" ? r.pattern : r.pattern.source.replace(/\\\//g, "/").replace(/\(\[.*?\]\+\)/g, ":type").replace(/[\^$]/g, "");
-          return `${r.method.padEnd(5)} ${path39}`;
+          const path40 = typeof r.pattern === "string" ? r.pattern : r.pattern.source.replace(/\\\//g, "/").replace(/\(\[.*?\]\+\)/g, ":type").replace(/[\^$]/g, "");
+          return `${r.method.padEnd(5)} ${path40}`;
         });
       }
       async start(port = DEV_SERVER_PORT) {
@@ -47576,15 +47593,15 @@ var init_dev_server = __esm({
             this.json(res, 500, { error: e.message });
           }
         });
-        return new Promise((resolve21, reject) => {
+        return new Promise((resolve22, reject) => {
           this.server.listen(port, "127.0.0.1", () => {
             this.log(`Dev server listening on http://127.0.0.1:${port}`);
-            resolve21();
+            resolve22();
           });
           this.server.on("error", (e) => {
             if (e.code === "EADDRINUSE") {
               this.log(`Port ${port} in use, skipping dev server`);
-              resolve21();
+              resolve22();
             } else {
               reject(e);
             }
@@ -47666,20 +47683,20 @@ var init_dev_server = __esm({
           child.stderr?.on("data", (d) => {
             stderr += d.toString().slice(0, 2e3);
           });
-          await new Promise((resolve21) => {
+          await new Promise((resolve22) => {
             const timer = setTimeout(() => {
               child.kill();
-              resolve21();
+              resolve22();
             }, 3e3);
             child.on("exit", () => {
               clearTimeout(timer);
-              resolve21();
+              resolve22();
             });
             child.stdout?.once("data", () => {
               setTimeout(() => {
                 child.kill();
                 clearTimeout(timer);
-                resolve21();
+                resolve22();
               }, 500);
             });
           });
@@ -48182,14 +48199,14 @@ var init_dev_server = __esm({
           child.stderr?.on("data", (d) => {
             stderr += d.toString();
           });
-          await new Promise((resolve21) => {
+          await new Promise((resolve22) => {
             const timer = setTimeout(() => {
               child.kill();
-              resolve21();
+              resolve22();
             }, timeout);
             child.on("exit", () => {
               clearTimeout(timer);
-              resolve21();
+              resolve22();
             });
           });
           const elapsed = Date.now() - start;
@@ -48859,14 +48876,14 @@ data: ${JSON.stringify(msg.data)}
         res.end(JSON.stringify(data, null, 2));
       }
       async readBody(req) {
-        return new Promise((resolve21) => {
+        return new Promise((resolve22) => {
           let body = "";
           req.on("data", (chunk) => body += chunk);
           req.on("end", () => {
             try {
-              resolve21(JSON.parse(body));
+              resolve22(JSON.parse(body));
             } catch {
-              resolve21({});
+              resolve22({});
             }
           });
         });
@@ -49383,7 +49400,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((resolve21) => setTimeout(resolve21, STARTUP_POLL_MS));
+    await new Promise((resolve22) => setTimeout(resolve22, STARTUP_POLL_MS));
   }
   throw new Error(`Session host did not become ready within ${timeoutMs}ms`);
 }
@@ -49487,12 +49504,12 @@ async function installExtension(ide, extension) {
       const res = await fetch(extension.vsixUrl);
       if (res.ok) {
         const buffer = Buffer.from(await res.arrayBuffer());
-        const fs23 = await import("fs");
-        fs23.writeFileSync(vsixPath, buffer);
-        return new Promise((resolve21) => {
+        const fs24 = await import("fs");
+        fs24.writeFileSync(vsixPath, buffer);
+        return new Promise((resolve22) => {
           const cmd = `"${ide.cliCommand}" --install-extension "${vsixPath}" --force`;
           (0, import_child_process11.exec)(cmd, { timeout: 6e4 }, (error48, _stdout, stderr) => {
-            resolve21({
+            resolve22({
               extensionId: extension.id,
               marketplaceId: extension.marketplaceId,
               success: !error48,
@@ -49505,11 +49522,11 @@ async function installExtension(ide, extension) {
     } catch (e) {
     }
   }
-  return new Promise((resolve21) => {
+  return new Promise((resolve22) => {
     const cmd = `"${ide.cliCommand}" --install-extension ${extension.marketplaceId} --force`;
     (0, import_child_process11.exec)(cmd, { timeout: 6e4 }, (error48, stdout, stderr) => {
       if (error48) {
-        resolve21({
+        resolve22({
           extensionId: extension.id,
           marketplaceId: extension.marketplaceId,
           success: false,
@@ -49517,7 +49534,7 @@ async function installExtension(ide, extension) {
           error: stderr || error48.message
         });
       } else {
-        resolve21({
+        resolve22({
           extensionId: extension.id,
           marketplaceId: extension.marketplaceId,
           success: true,
@@ -50213,7 +50230,7 @@ async function sendDaemonCommand(cmd, args = {}, port) {
   const resolvedPort = resolveDaemonCommandPort(port);
   const WebSocket4 = (await import("ws")).default;
   const { DAEMON_WS_PATH: DAEMON_WS_PATH2 } = await Promise.resolve().then(() => (init_src(), src_exports));
-  return new Promise((resolve21, reject) => {
+  return new Promise((resolve22, reject) => {
     const wsUrl = `ws://127.0.0.1:${resolvedPort}${DAEMON_WS_PATH2 || "/daemon"}`;
     const ws = new WebSocket4(wsUrl);
     const requestId = `cli-${Date.now()}`;
@@ -50254,7 +50271,7 @@ async function sendDaemonCommand(cmd, args = {}, port) {
         if (msg.type === "ext:command_result" && msg.payload?.requestId === requestId || msg.type === "daemon:command_result" || msg.type === "command_result") {
           clearTimeout(timeout);
           ws.close();
-          resolve21(msg.payload?.result || msg.payload || msg);
+          resolve22(msg.payload?.result || msg.payload || msg);
         }
       } catch {
       }
@@ -50273,13 +50290,13 @@ This command needs a running local daemon with IPC enabled. Start with: adhdev d
 }
 async function directCdpEval(expression, port = 9222) {
   const http3 = await import("http");
-  const targets = await new Promise((resolve21, reject) => {
+  const targets = await new Promise((resolve22, reject) => {
     http3.get(`http://127.0.0.1:${port}/json`, (res) => {
       let data = "";
       res.on("data", (c) => data += c);
       res.on("end", () => {
         try {
-          resolve21(JSON.parse(data));
+          resolve22(JSON.parse(data));
         } catch {
           reject(new Error("Invalid JSON"));
         }
@@ -50292,7 +50309,7 @@ async function directCdpEval(expression, port = 9222) {
   const target = (mainPages.length > 0 ? mainPages[0] : pages[0]) || targets[0];
   if (!target?.webSocketDebuggerUrl) throw new Error("No CDP target found");
   const WebSocket4 = (await import("ws")).default;
-  return new Promise((resolve21, reject) => {
+  return new Promise((resolve22, reject) => {
     const ws = new WebSocket4(target.webSocketDebuggerUrl);
     const timeout = setTimeout(() => {
       ws.close();
@@ -50314,11 +50331,11 @@ async function directCdpEval(expression, port = 9222) {
         clearTimeout(timeout);
         ws.close();
         if (msg.result?.result?.value !== void 0) {
-          resolve21(msg.result.result.value);
+          resolve22(msg.result.result.value);
         } else if (msg.result?.exceptionDetails) {
           reject(new Error(msg.result.exceptionDetails.text));
         } else {
-          resolve21(msg.result);
+          resolve22(msg.result);
         }
       }
     });
@@ -50854,14 +50871,14 @@ var require_run_async = __commonJS({
       return function() {
         var args = arguments;
         var originalThis = this;
-        var promise2 = new Promise(function(resolve21, reject) {
+        var promise2 = new Promise(function(resolve22, reject) {
           var resolved = false;
           const wrappedResolve = function(value) {
             if (resolved) {
               console.warn("Run-async promise already resolved.");
             }
             resolved = true;
-            resolve21(value);
+            resolve22(value);
           };
           var rejected = false;
           const wrappedReject = function(value) {
@@ -51652,7 +51669,7 @@ var require_Observable = __commonJS({
       Observable2.prototype.forEach = function(next, promiseCtor) {
         var _this = this;
         promiseCtor = getPromiseCtor(promiseCtor);
-        return new promiseCtor(function(resolve21, reject) {
+        return new promiseCtor(function(resolve22, reject) {
           var subscriber = new Subscriber_1.SafeSubscriber({
             next: function(value) {
               try {
@@ -51663,7 +51680,7 @@ var require_Observable = __commonJS({
               }
             },
             error: reject,
-            complete: resolve21
+            complete: resolve22
           });
           _this.subscribe(subscriber);
         });
@@ -51685,14 +51702,14 @@ var require_Observable = __commonJS({
       Observable2.prototype.toPromise = function(promiseCtor) {
         var _this = this;
         promiseCtor = getPromiseCtor(promiseCtor);
-        return new promiseCtor(function(resolve21, reject) {
+        return new promiseCtor(function(resolve22, reject) {
           var value;
           _this.subscribe(function(x) {
             return value = x;
           }, function(err) {
             return reject(err);
           }, function() {
-            return resolve21(value);
+            return resolve22(value);
           });
         });
       };
@@ -53788,11 +53805,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(resolve21) {
-          resolve21(value);
+        return value instanceof P ? value : new P(function(resolve22) {
+          resolve22(value);
         });
       }
-      return new (P || (P = Promise))(function(resolve21, reject) {
+      return new (P || (P = Promise))(function(resolve22, reject) {
         function fulfilled(value) {
           try {
             step(generator.next(value));
@@ -53808,7 +53825,7 @@ var require_innerFrom = __commonJS({
           }
         }
         function step(result) {
-          result.done ? resolve21(result.value) : adopt(result.value).then(fulfilled, rejected);
+          result.done ? resolve22(result.value) : adopt(result.value).then(fulfilled, rejected);
         }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
       });
@@ -53890,14 +53907,14 @@ var require_innerFrom = __commonJS({
       }, i);
       function verb(n) {
         i[n] = o[n] && function(v) {
-          return new Promise(function(resolve21, reject) {
-            v = o[n](v), settle(resolve21, reject, v.done, v.value);
+          return new Promise(function(resolve22, reject) {
+            v = o[n](v), settle(resolve22, reject, v.done, v.value);
           });
         };
       }
-      function settle(resolve21, reject, d, v) {
+      function settle(resolve22, reject, d, v) {
         Promise.resolve(v).then(function(v2) {
-          resolve21({ value: v2, done: d });
+          resolve22({ value: v2, done: d });
         }, reject);
       }
     };
@@ -54516,7 +54533,7 @@ var require_lastValueFrom = __commonJS({
     var EmptyError_1 = require_EmptyError();
     function lastValueFrom(source, config2) {
       var hasConfig = typeof config2 === "object";
-      return new Promise(function(resolve21, reject) {
+      return new Promise(function(resolve22, reject) {
         var _hasValue = false;
         var _value;
         source.subscribe({
@@ -54527,9 +54544,9 @@ var require_lastValueFrom = __commonJS({
           error: reject,
           complete: function() {
             if (_hasValue) {
-              resolve21(_value);
+              resolve22(_value);
             } else if (hasConfig) {
-              resolve21(config2.defaultValue);
+              resolve22(config2.defaultValue);
             } else {
               reject(new EmptyError_1.EmptyError());
             }
@@ -54551,16 +54568,16 @@ var require_firstValueFrom = __commonJS({
     var Subscriber_1 = require_Subscriber();
     function firstValueFrom(source, config2) {
       var hasConfig = typeof config2 === "object";
-      return new Promise(function(resolve21, reject) {
+      return new Promise(function(resolve22, reject) {
         var subscriber = new Subscriber_1.SafeSubscriber({
           next: function(value) {
-            resolve21(value);
+            resolve22(value);
             subscriber.unsubscribe();
           },
           error: reject,
           complete: function() {
             if (hasConfig) {
-              resolve21(config2.defaultValue);
+              resolve22(config2.defaultValue);
             } else {
               reject(new EmptyError_1.EmptyError());
             }
@@ -61679,15 +61696,15 @@ var require_route = __commonJS({
       };
     }
     function wrapConversion(toModel, graph) {
-      const path39 = [graph[toModel].parent, toModel];
+      const path40 = [graph[toModel].parent, toModel];
       let fn = conversions[graph[toModel].parent][toModel];
       let cur = graph[toModel].parent;
       while (graph[cur].parent) {
-        path39.unshift(graph[cur].parent);
+        path40.unshift(graph[cur].parent);
         fn = link(conversions[graph[cur].parent][cur], fn);
         cur = graph[cur].parent;
       }
-      fn.conversion = path39;
+      fn.conversion = path40;
       return fn;
     }
     module2.exports = function(fromModel) {
@@ -66366,14 +66383,14 @@ var require_async_iterator = __commonJS({
       };
     }
     function readAndResolve(iter) {
-      var resolve21 = iter[kLastResolve];
-      if (resolve21 !== null) {
+      var resolve22 = iter[kLastResolve];
+      if (resolve22 !== null) {
         var data = iter[kStream].read();
         if (data !== null) {
           iter[kLastPromise] = null;
           iter[kLastResolve] = null;
           iter[kLastReject] = null;
-          resolve21(createIterResult(data, false));
+          resolve22(createIterResult(data, false));
         }
       }
     }
@@ -66381,13 +66398,13 @@ var require_async_iterator = __commonJS({
       process.nextTick(readAndResolve, iter);
     }
     function wrapForNext(lastPromise, iter) {
-      return function(resolve21, reject) {
+      return function(resolve22, reject) {
         lastPromise.then(function() {
           if (iter[kEnded]) {
-            resolve21(createIterResult(void 0, true));
+            resolve22(createIterResult(void 0, true));
             return;
           }
-          iter[kHandlePromise](resolve21, reject);
+          iter[kHandlePromise](resolve22, reject);
         }, reject);
       };
     }
@@ -66407,12 +66424,12 @@ var require_async_iterator = __commonJS({
           return Promise.resolve(createIterResult(void 0, true));
         }
         if (this[kStream].destroyed) {
-          return new Promise(function(resolve21, reject) {
+          return new Promise(function(resolve22, reject) {
             process.nextTick(function() {
               if (_this[kError]) {
                 reject(_this[kError]);
               } else {
-                resolve21(createIterResult(void 0, true));
+                resolve22(createIterResult(void 0, true));
               }
             });
           });
@@ -66435,13 +66452,13 @@ var require_async_iterator = __commonJS({
       return this;
     }), _defineProperty(_Object$setPrototypeO, "return", function _return() {
       var _this2 = this;
-      return new Promise(function(resolve21, reject) {
+      return new Promise(function(resolve22, reject) {
         _this2[kStream].destroy(null, function(err) {
           if (err) {
             reject(err);
             return;
           }
-          resolve21(createIterResult(void 0, true));
+          resolve22(createIterResult(void 0, true));
         });
       });
     }), _Object$setPrototypeO), AsyncIteratorPrototype);
@@ -66463,15 +66480,15 @@ var require_async_iterator = __commonJS({
         value: stream._readableState.endEmitted,
         writable: true
       }), _defineProperty(_Object$create, kHandlePromise, {
-        value: function value(resolve21, reject) {
+        value: function value(resolve22, reject) {
           var data = iterator[kStream].read();
           if (data) {
             iterator[kLastPromise] = null;
             iterator[kLastResolve] = null;
             iterator[kLastReject] = null;
-            resolve21(createIterResult(data, false));
+            resolve22(createIterResult(data, false));
           } else {
-            iterator[kLastResolve] = resolve21;
+            iterator[kLastResolve] = resolve22;
             iterator[kLastReject] = reject;
           }
         },
@@ -66490,12 +66507,12 @@ var require_async_iterator = __commonJS({
           iterator[kError] = err;
           return;
         }
-        var resolve21 = iterator[kLastResolve];
-        if (resolve21 !== null) {
+        var resolve22 = iterator[kLastResolve];
+        if (resolve22 !== null) {
           iterator[kLastPromise] = null;
           iterator[kLastResolve] = null;
           iterator[kLastReject] = null;
-          resolve21(createIterResult(void 0, true));
+          resolve22(createIterResult(void 0, true));
         }
         iterator[kEnded] = true;
       });
@@ -66510,7 +66527,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, resolve21, reject, _next, _throw, key, arg) {
+    function asyncGeneratorStep(gen, resolve22, reject, _next, _throw, key, arg) {
       try {
         var info = gen[key](arg);
         var value = info.value;
@@ -66519,7 +66536,7 @@ var require_from2 = __commonJS({
         return;
       }
       if (info.done) {
-        resolve21(value);
+        resolve22(value);
       } else {
         Promise.resolve(value).then(_next, _throw);
       }
@@ -66527,13 +66544,13 @@ var require_from2 = __commonJS({
     function _asyncToGenerator(fn) {
       return function() {
         var self2 = this, args = arguments;
-        return new Promise(function(resolve21, reject) {
+        return new Promise(function(resolve22, reject) {
           var gen = fn.apply(self2, args);
           function _next(value) {
-            asyncGeneratorStep(gen, resolve21, reject, _next, _throw, "next", value);
+            asyncGeneratorStep(gen, resolve22, reject, _next, _throw, "next", value);
           }
           function _throw(err) {
-            asyncGeneratorStep(gen, resolve21, reject, _next, _throw, "throw", err);
+            asyncGeneratorStep(gen, resolve22, reject, _next, _throw, "throw", err);
           }
           _next(void 0);
         });
@@ -68472,9 +68489,9 @@ var init_base = __esm({
        * @return {Promise}
        */
       run() {
-        return new Promise((resolve21, reject) => {
+        return new Promise((resolve22, reject) => {
           this._run(
-            (value) => resolve21(value),
+            (value) => resolve22(value),
             (error48) => reject(error48)
           );
         });
@@ -75106,26 +75123,26 @@ var require_lib = __commonJS({
       return matches;
     };
     exports2.analyse = analyse;
-    var detectFile = (filepath, opts = {}) => new Promise((resolve21, reject) => {
+    var detectFile = (filepath, opts = {}) => new Promise((resolve22, reject) => {
       let fd;
-      const fs23 = (0, node_1.default)();
+      const fs24 = (0, node_1.default)();
       const handler = (err, buffer) => {
         if (fd) {
-          fs23.closeSync(fd);
+          fs24.closeSync(fd);
         }
         if (err) {
           reject(err);
         } else if (buffer) {
-          resolve21((0, exports2.detect)(buffer));
+          resolve22((0, exports2.detect)(buffer));
         } else {
           reject(new Error("No error and no buffer received"));
         }
       };
       const sampleSize = (opts === null || opts === void 0 ? void 0 : opts.sampleSize) || 0;
       if (sampleSize > 0) {
-        fd = fs23.openSync(filepath, "r");
+        fd = fs24.openSync(filepath, "r");
         let sample = Buffer.allocUnsafe(sampleSize);
-        fs23.read(fd, sample, 0, sampleSize, opts.offset, (err, bytesRead) => {
+        fs24.read(fd, sample, 0, sampleSize, opts.offset, (err, bytesRead) => {
           if (err) {
             handler(err, null);
           } else {
@@ -75137,22 +75154,22 @@ var require_lib = __commonJS({
         });
         return;
       }
-      fs23.readFile(filepath, handler);
+      fs24.readFile(filepath, handler);
     });
     exports2.detectFile = detectFile;
     var detectFileSync = (filepath, opts = {}) => {
-      const fs23 = (0, node_1.default)();
+      const fs24 = (0, node_1.default)();
       if (opts && opts.sampleSize) {
-        const fd = fs23.openSync(filepath, "r");
+        const fd = fs24.openSync(filepath, "r");
         let sample = Buffer.allocUnsafe(opts.sampleSize);
-        const bytesRead = fs23.readSync(fd, sample, 0, opts.sampleSize, opts.offset);
+        const bytesRead = fs24.readSync(fd, sample, 0, opts.sampleSize, opts.offset);
         if (bytesRead < opts.sampleSize) {
           sample = sample.subarray(0, bytesRead);
         }
-        fs23.closeSync(fd);
+        fs24.closeSync(fd);
         return (0, exports2.detect)(sample);
       }
-      return (0, exports2.detect)(fs23.readFileSync(filepath));
+      return (0, exports2.detect)(fs24.readFileSync(filepath));
     };
     exports2.detectFileSync = detectFileSync;
     exports2.default = {
@@ -79557,9 +79574,9 @@ var init_prompt = __esm({
     init_utils();
     init_baseUI();
     _ = {
-      set: (obj, path39 = "", value) => {
+      set: (obj, path40 = "", value) => {
         let pointer = obj;
-        path39.split(".").forEach((key, index, arr) => {
+        path40.split(".").forEach((key, index, arr) => {
           if (key === "__proto__" || key === "constructor") return;
           if (index === arr.length - 1) {
             pointer[key] = value;
@@ -79569,8 +79586,8 @@ var init_prompt = __esm({
           pointer = pointer[key];
         });
       },
-      get: (obj, path39 = "", defaultValue) => {
-        const travel = (regexp) => String.prototype.split.call(path39, regexp).filter(Boolean).reduce(
+      get: (obj, path40 = "", defaultValue) => {
+        const travel = (regexp) => String.prototype.split.call(path40, regexp).filter(Boolean).reduce(
           // @ts-expect-error implicit any on res[key]
           (res, key) => res !== null && res !== void 0 ? res[key] : res,
           obj
@@ -80986,8 +81003,8 @@ var init_server_connection = __esm({
        * Returns the command result or throws on timeout / auth failure.
        */
       sendMeshCommand(targetDaemonId, command, args = {}, timeoutMs = 3e4) {
-        return new Promise((resolve21, reject) => {
-          const requestId = `mesh_${Date.now()}_${Math.random().toString(36).substring(2, 8)}`;
+        return new Promise((resolve22, reject) => {
+          const requestId = `mesh_${crypto.randomUUID()}`;
           const timer = setTimeout(() => {
             this.off("daemon_mesh_result", handler);
             reject(new Error(`Mesh command timed out after ${timeoutMs}ms`));
@@ -80999,7 +81016,7 @@ var init_server_connection = __esm({
             if (msg.payload?.success === false) {
               reject(new Error(msg.payload?.error ?? "Mesh command failed"));
             } else {
-              resolve21(msg.payload?.result);
+              resolve22(msg.payload?.result);
             }
           };
           this.on("daemon_mesh_result", handler);
@@ -82789,27 +82806,27 @@ var require_process = __commonJS({
 var require_filesystem = __commonJS({
   "../../node_modules/detect-libc/lib/filesystem.js"(exports2, module2) {
     "use strict";
-    var fs23 = require("fs");
+    var fs24 = require("fs");
     var LDD_PATH = "/usr/bin/ldd";
     var SELF_PATH = "/proc/self/exe";
     var MAX_LENGTH = 2048;
-    var readFileSync20 = (path39) => {
-      const fd = fs23.openSync(path39, "r");
+    var readFileSync20 = (path40) => {
+      const fd = fs24.openSync(path40, "r");
       const buffer = Buffer.alloc(MAX_LENGTH);
-      const bytesRead = fs23.readSync(fd, buffer, 0, MAX_LENGTH, 0);
-      fs23.close(fd, () => {
+      const bytesRead = fs24.readSync(fd, buffer, 0, MAX_LENGTH, 0);
+      fs24.close(fd, () => {
       });
       return buffer.subarray(0, bytesRead);
     };
-    var readFile2 = (path39) => new Promise((resolve21, reject) => {
-      fs23.open(path39, "r", (err, fd) => {
+    var readFile2 = (path40) => new Promise((resolve22, reject) => {
+      fs24.open(path40, "r", (err, fd) => {
         if (err) {
           reject(err);
         } else {
           const buffer = Buffer.alloc(MAX_LENGTH);
-          fs23.read(fd, buffer, 0, MAX_LENGTH, 0, (_2, bytesRead) => {
-            resolve21(buffer.subarray(0, bytesRead));
-            fs23.close(fd, () => {
+          fs24.read(fd, buffer, 0, MAX_LENGTH, 0, (_2, bytesRead) => {
+            resolve22(buffer.subarray(0, bytesRead));
+            fs24.close(fd, () => {
             });
           });
         }
@@ -82876,10 +82893,10 @@ var require_detect_libc = __commonJS({
     var commandOut = "";
     var safeCommand = () => {
       if (!commandOut) {
-        return new Promise((resolve21) => {
+        return new Promise((resolve22) => {
           childProcess.exec(command, (err, out) => {
             commandOut = err ? " " : out;
-            resolve21(commandOut);
+            resolve22(commandOut);
           });
         });
       }
@@ -82921,11 +82938,11 @@ var require_detect_libc = __commonJS({
       }
       return null;
     };
-    var familyFromInterpreterPath = (path39) => {
-      if (path39) {
-        if (path39.includes("/ld-musl-")) {
+    var familyFromInterpreterPath = (path40) => {
+      if (path40) {
+        if (path40.includes("/ld-musl-")) {
           return MUSL;
-        } else if (path39.includes("/ld-linux-")) {
+        } else if (path40.includes("/ld-linux-")) {
           return GLIBC;
         }
       }
@@ -82972,8 +82989,8 @@ var require_detect_libc = __commonJS({
       cachedFamilyInterpreter = null;
       try {
         const selfContent = await readFile2(SELF_PATH);
-        const path39 = interpreterPath(selfContent);
-        cachedFamilyInterpreter = familyFromInterpreterPath(path39);
+        const path40 = interpreterPath(selfContent);
+        cachedFamilyInterpreter = familyFromInterpreterPath(path40);
       } catch (e) {
       }
       return cachedFamilyInterpreter;
@@ -82985,8 +83002,8 @@ var require_detect_libc = __commonJS({
       cachedFamilyInterpreter = null;
       try {
         const selfContent = readFileSync20(SELF_PATH);
-        const path39 = interpreterPath(selfContent);
-        cachedFamilyInterpreter = familyFromInterpreterPath(path39);
+        const path40 = interpreterPath(selfContent);
+        cachedFamilyInterpreter = familyFromInterpreterPath(path40);
       } catch (e) {
       }
       return cachedFamilyInterpreter;
@@ -84705,18 +84722,18 @@ var require_sharp = __commonJS({
       `@img/sharp-${runtimePlatform}/sharp.node`,
       "@img/sharp-wasm32/sharp.node"
     ];
-    var path39;
+    var path40;
     var sharp;
     var errors = [];
-    for (path39 of paths) {
+    for (path40 of paths) {
       try {
-        sharp = require(path39);
+        sharp = require(path40);
         break;
       } catch (err) {
         errors.push(err);
       }
     }
-    if (sharp && path39.startsWith("@img/sharp-linux-x64") && !sharp._isUsingX64V2()) {
+    if (sharp && path40.startsWith("@img/sharp-linux-x64") && !sharp._isUsingX64V2()) {
       const err = new Error("Prebuilt binaries for linux-x64 require v2 microarchitecture");
       err.code = "Unsupported CPU";
       errors.push(err);
@@ -85559,14 +85576,14 @@ var require_input = __commonJS({
         return this;
       } else {
         if (this._isStreamInput()) {
-          return new Promise((resolve21, reject) => {
+          return new Promise((resolve22, reject) => {
             const finished = () => {
               this._flattenBufferIn();
               sharp.metadata(this.options, (err, metadata2) => {
                 if (err) {
                   reject(is.nativeError(err, stack));
                 } else {
-                  resolve21(metadata2);
+                  resolve22(metadata2);
                 }
               });
             };
@@ -85577,12 +85594,12 @@ var require_input = __commonJS({
             }
           });
         } else {
-          return new Promise((resolve21, reject) => {
+          return new Promise((resolve22, reject) => {
             sharp.metadata(this.options, (err, metadata2) => {
               if (err) {
                 reject(is.nativeError(err, stack));
               } else {
-                resolve21(metadata2);
+                resolve22(metadata2);
               }
             });
           });
@@ -85615,25 +85632,25 @@ var require_input = __commonJS({
         return this;
       } else {
         if (this._isStreamInput()) {
-          return new Promise((resolve21, reject) => {
+          return new Promise((resolve22, reject) => {
             this.on("finish", function() {
               this._flattenBufferIn();
               sharp.stats(this.options, (err, stats2) => {
                 if (err) {
                   reject(is.nativeError(err, stack));
                 } else {
-                  resolve21(stats2);
+                  resolve22(stats2);
                 }
               });
             });
           });
         } else {
-          return new Promise((resolve21, reject) => {
+          return new Promise((resolve22, reject) => {
             sharp.stats(this.options, (err, stats2) => {
               if (err) {
                 reject(is.nativeError(err, stack));
               } else {
-                resolve21(stats2);
+                resolve22(stats2);
               }
             });
           });
@@ -87625,15 +87642,15 @@ var require_color = __commonJS({
       };
     }
     function wrapConversion(toModel, graph) {
-      const path39 = [graph[toModel].parent, toModel];
+      const path40 = [graph[toModel].parent, toModel];
       let fn = conversions_default[graph[toModel].parent][toModel];
       let cur = graph[toModel].parent;
       while (graph[cur].parent) {
-        path39.unshift(graph[cur].parent);
+        path40.unshift(graph[cur].parent);
         fn = link(conversions_default[graph[cur].parent][cur], fn);
         cur = graph[cur].parent;
       }
-      fn.conversion = path39;
+      fn.conversion = path40;
       return fn;
     }
     function route(fromModel) {
@@ -88250,7 +88267,7 @@ var require_channel = __commonJS({
 var require_output = __commonJS({
   "../../node_modules/sharp/lib/output.js"(exports2, module2) {
     "use strict";
-    var path39 = require("path");
+    var path40 = require("path");
     var is = require_is();
     var sharp = require_sharp();
     var formats = /* @__PURE__ */ new Map([
@@ -88281,9 +88298,9 @@ var require_output = __commonJS({
       let err;
       if (!is.string(fileOut)) {
         err = new Error("Missing output file path");
-      } else if (is.string(this.options.input.file) && path39.resolve(this.options.input.file) === path39.resolve(fileOut)) {
+      } else if (is.string(this.options.input.file) && path40.resolve(this.options.input.file) === path40.resolve(fileOut)) {
         err = new Error("Cannot use same file for input and output");
-      } else if (jp2Regex.test(path39.extname(fileOut)) && !this.constructor.format.jp2k.output.file) {
+      } else if (jp2Regex.test(path40.extname(fileOut)) && !this.constructor.format.jp2k.output.file) {
         err = errJp2Save();
       }
       if (err) {
@@ -89055,7 +89072,7 @@ var require_output = __commonJS({
         return this;
       } else {
         if (this._isStreamInput()) {
-          return new Promise((resolve21, reject) => {
+          return new Promise((resolve22, reject) => {
             this.once("finish", () => {
               this._flattenBufferIn();
               sharp.pipeline(this.options, (err, data, info) => {
@@ -89063,24 +89080,24 @@ var require_output = __commonJS({
                   reject(is.nativeError(err, stack));
                 } else {
                   if (this.options.resolveWithObject) {
-                    resolve21({ data, info });
+                    resolve22({ data, info });
                   } else {
-                    resolve21(data);
+                    resolve22(data);
                   }
                 }
               });
             });
           });
         } else {
-          return new Promise((resolve21, reject) => {
+          return new Promise((resolve22, reject) => {
             sharp.pipeline(this.options, (err, data, info) => {
               if (err) {
                 reject(is.nativeError(err, stack));
               } else {
                 if (this.options.resolveWithObject) {
-                  resolve21({ data, info });
+                  resolve22({ data, info });
                 } else {
-                  resolve21(data);
+                  resolve22(data);
                 }
               }
             });
@@ -90010,15 +90027,38 @@ var init_daemon_mesh_manager = __esm({
   "src/daemon-mesh-manager.ts"() {
     "use strict";
     init_src();
-    DaemonMeshManager = class {
+    DaemonMeshManager = class _DaemonMeshManager {
       rules = [];
       serverConn;
       constructor(serverConn) {
         this.serverConn = serverConn;
       }
+      static COMMAND_ALLOWLIST = /* @__PURE__ */ new Set([
+        "send_chat",
+        "read_chat",
+        "git_status",
+        "git_diff_summary",
+        "launch_cli"
+      ]);
       setRules(rules) {
-        this.rules = rules;
-        LOG.info("Mesh", `[Mesh] ${rules.length} rule(s) loaded`);
+        const valid = [];
+        for (const rule of rules) {
+          if (!rule.trigger || typeof rule.trigger !== "string") {
+            LOG.warn("Mesh", `[Mesh] Skipping rule: missing or invalid 'trigger'`);
+            continue;
+          }
+          if (!rule.targetDaemonId || typeof rule.targetDaemonId !== "string") {
+            LOG.warn("Mesh", `[Mesh] Skipping rule trigger='${rule.trigger}': missing or invalid 'targetDaemonId'`);
+            continue;
+          }
+          if (!_DaemonMeshManager.COMMAND_ALLOWLIST.has(rule.command)) {
+            LOG.warn("Mesh", `[Mesh] Skipping rule trigger='${rule.trigger}': command '${rule.command}' not in allowlist`);
+            continue;
+          }
+          valid.push(rule);
+        }
+        this.rules = valid;
+        LOG.info("Mesh", `[Mesh] ${valid.length}/${rules.length} rule(s) loaded`);
       }
       async emit(event) {
         const matching = this.rules.filter((r) => r.trigger === event.trigger);
@@ -90289,7 +90329,7 @@ var init_adhdev_daemon = __esm({
     init_version();
     init_src();
     init_runtime_defaults();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.58" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.60" });
     AdhdevDaemon = class _AdhdevDaemon {
       localHttpServer = null;
       localWss = null;
@@ -91104,6 +91144,26 @@ ${err?.stack || ""}`);
         if (!result || result.success !== true) return false;
         return commandType === "launch_cli" || commandType === "launch_ide";
       }
+      async buildMeshCheckpointContext(workspace, base) {
+        if (!this.components) return base;
+        try {
+          const statusResult = await Promise.race([
+            this.components.router.execute("git_status", { workspace }, "mesh"),
+            new Promise((resolve22) => setTimeout(() => resolve22(null), 4e3))
+          ]);
+          const s = statusResult?.status ?? statusResult;
+          if (s?.isGitRepo) {
+            return {
+              ...base,
+              branch: s.branch ?? "",
+              ahead: s.ahead ?? 0,
+              behind: s.behind ?? 0
+            };
+          }
+        } catch {
+        }
+        return base;
+      }
       triggerImmediateLaunchStatusUpdate(reason) {
         this.statusReporter?.resetP2PHash();
         void this.statusReporter?.sendUnifiedStatusReport({ forceServer: true, reason });
@@ -91225,13 +91285,15 @@ ${err?.stack || ""}`);
             void this.flushP2PWorkspaceGitSubscriptions();
           }
           if (cmdType === "git_checkpoint" && routed.success && this.meshManager) {
-            void this.meshManager.emit({
-              trigger: "git_checkpoint_complete",
-              context: {
-                workspace: String(normalizedData.workspace ?? ""),
-                checkpoint_message: routed.checkpoint?.message ?? String(normalizedData.message ?? ""),
-                commit: routed.checkpoint?.commit ?? ""
-              }
+            const workspace = String(normalizedData.workspace ?? "");
+            const baseContext = {
+              workspace,
+              checkpoint_message: routed.checkpoint?.message ?? String(normalizedData.message ?? ""),
+              commit: routed.checkpoint?.commit ?? "",
+              source_session_id: String(normalizedData.targetSessionId ?? "")
+            };
+            void this.buildMeshCheckpointContext(workspace, baseContext).then((ctx) => {
+              this.meshManager.emit({ trigger: "git_checkpoint_complete", context: ctx });
             });
           }
           return { ...routed, interactionId };
@@ -91270,7 +91332,7 @@ ${err?.stack || ""}`);
             this.localWss.emit("connection", ws, req);
           });
         });
-        await new Promise((resolve21, reject) => {
+        await new Promise((resolve22, reject) => {
           const cleanup = () => {
             this.localHttpServer?.off("error", onError);
             this.localHttpServer?.off("listening", onListening);
@@ -91281,7 +91343,7 @@ ${err?.stack || ""}`);
           };
           const onListening = () => {
             cleanup();
-            resolve21();
+            resolve22();
           };
           this.localHttpServer.once("error", onError);
           this.localHttpServer.once("listening", onListening);
@@ -91455,12 +91517,12 @@ ${err?.stack || ""}`);
           this.localClients.clear();
           this.localWss?.close();
           this.localWss = null;
-          await new Promise((resolve21) => {
+          await new Promise((resolve22) => {
             if (!this.localHttpServer) {
-              resolve21();
+              resolve22();
               return;
             }
-            this.localHttpServer.close(() => resolve21());
+            this.localHttpServer.close(() => resolve22());
             this.localHttpServer = null;
           });
         } catch {
@@ -93660,8 +93722,8 @@ function registerSetupCommands(program2, getProviderLoader2) {
   });
   program2.command("uninstall").description("Completely wipe all setting, configuration, stop daemon and uninstall service").option("-f, --force", "Skip confirmation prompt").action(async (options) => {
     const inquirer2 = await Promise.resolve().then(() => (init_lib(), lib_exports));
-    const fs23 = await import("fs");
-    const path39 = await import("path");
+    const fs24 = await import("fs");
+    const path40 = await import("path");
     const os31 = await import("os");
     const { spawnSync: spawnSync3 } = await import("child_process");
     if (!options.force) {
@@ -93687,11 +93749,11 @@ function registerSetupCommands(program2, getProviderLoader2) {
     }
     console.log(source_default.gray("  Removing OS background service..."));
     spawnSync3(process.execPath, [process.argv[1], "service", "uninstall"], { stdio: "inherit" });
-    const adhdevDir = path39.join(os31.homedir(), ".adhdev");
-    if (fs23.existsSync(adhdevDir)) {
+    const adhdevDir = path40.join(os31.homedir(), ".adhdev");
+    if (fs24.existsSync(adhdevDir)) {
       console.log(source_default.gray(`  Deleting ${adhdevDir}...`));
       try {
-        fs23.rmSync(adhdevDir, { recursive: true, force: true });
+        fs24.rmSync(adhdevDir, { recursive: true, force: true });
         console.log(source_default.green("  \u2713 Data wiped."));
       } catch (e) {
         console.log(source_default.red(`  \u2717 Failed to delete ~/.adhdev: ${e.message}`));
@@ -93945,14 +94007,14 @@ async function requestSessionHostDirect(request) {
 }
 async function runRuntimeLaunchSpec(spec) {
   const { spawn: spawn7 } = await import("child_process");
-  return await new Promise((resolve21, reject) => {
+  return await new Promise((resolve22, reject) => {
     const child = spawn7(spec.command, spec.args, {
       stdio: "inherit",
       env: spec.env,
       shell: process.platform === "win32" && spec.command !== process.execPath
     });
     child.on("error", reject);
-    child.on("exit", (code) => resolve21(code ?? 0));
+    child.on("exit", (code) => resolve22(code ?? 0));
   });
 }
 async function resolveRuntimeSessionId(target, options) {
@@ -94186,7 +94248,7 @@ async function handleTraceCommand(options) {
       }
     }
     while (!stopped) {
-      await new Promise((resolve21) => setTimeout(resolve21, intervalMs));
+      await new Promise((resolve22) => setTimeout(resolve22, intervalMs));
       if (stopped) break;
       const nextTrace = await fetchTrace(buildDebugTraceFollowPollArgs(baseArgs, cursor));
       const nextBatch = collectFreshDebugTraceEntries(nextTrace, cursor);
@@ -95952,7 +96014,7 @@ function registerProviderCommands(program2) {
     } catch {
       try {
         const http3 = await import("http");
-        const result = await new Promise((resolve21, reject) => {
+        const result = await new Promise((resolve22, reject) => {
           const req = http3.request({
             hostname: "127.0.0.1",
             port: DEV_SERVER_PORT3,
@@ -95964,9 +96026,9 @@ function registerProviderCommands(program2) {
             res.on("data", (c) => data += c);
             res.on("end", () => {
               try {
-                resolve21(JSON.parse(data));
+                resolve22(JSON.parse(data));
               } catch {
-                resolve21({ raw: data });
+                resolve22({ raw: data });
               }
             });
           });
@@ -96026,35 +96088,35 @@ function registerProviderCommands(program2) {
       let osPaths = {};
       let processNames = {};
       if (category === "ide") {
-        const fs23 = await import("fs");
-        const path39 = await import("path");
+        const fs24 = await import("fs");
+        const path40 = await import("path");
         const os31 = await import("os");
         if (os31.platform() === "darwin") {
           while (true) {
             const p = (await rl.question(`macOS Application Path (e.g. /Applications/${defaultName}.app): `)).trim() || `/Applications/${defaultName}.app`;
             if (p === "skip") break;
-            if (!fs23.existsSync(p)) {
+            if (!fs24.existsSync(p)) {
               console.log(source_default.red(`  \u2717 Path not found: ${p}`));
               console.log(source_default.gray(`    (Please provide the exact absolute path to the .app or binary, or type 'skip')`));
               continue;
             }
             console.log(source_default.green(`  \u2713 Path verified: ${p}`));
             osPaths["darwin"] = [p];
-            processNames["darwin"] = path39.basename(p, ".app");
+            processNames["darwin"] = path40.basename(p, ".app");
             break;
           }
         } else if (os31.platform() === "win32") {
           while (true) {
             const p = (await rl.question(`Windows Executable Path (e.g. C:\\Program Files\\${defaultName}\\${defaultName}.exe): `)).trim();
             if (!p || p === "skip") break;
-            if (!fs23.existsSync(p)) {
+            if (!fs24.existsSync(p)) {
               console.log(source_default.red(`  \u2717 Path not found: ${p}`));
               console.log(source_default.gray(`    (Please provide the exact absolute path, or type 'skip')`));
               continue;
             }
             console.log(source_default.green(`  \u2713 Path verified: ${p}`));
             osPaths["win32"] = [p];
-            processNames["win32"] = path39.basename(p, ".exe");
+            processNames["win32"] = path40.basename(p, ".exe");
             break;
           }
         }
@@ -96068,12 +96130,12 @@ function registerProviderCommands(program2) {
               console.log(source_default.yellow("Invalid port number."));
               continue;
             }
-            const isFree = await new Promise((resolve21) => {
+            const isFree = await new Promise((resolve22) => {
               const server = net3.createServer();
               server.unref();
-              server.on("error", () => resolve21(false));
+              server.on("error", () => resolve22(false));
               server.listen(port, "127.0.0.1", () => {
-                server.close(() => resolve21(true));
+                server.close(() => resolve22(true));
               });
             });
             if (!isFree) {
@@ -96088,7 +96150,7 @@ function registerProviderCommands(program2) {
       rl.close();
       const location = options.builtin ? "builtin" : "user";
       const http3 = await import("http");
-      const result = await new Promise((resolve21, reject) => {
+      const result = await new Promise((resolve22, reject) => {
         const postData = JSON.stringify({ type, name, category, location, cdpPorts, osPaths, processNames });
         const req = http3.request({
           hostname: "127.0.0.1",
@@ -96101,9 +96163,9 @@ function registerProviderCommands(program2) {
           res.on("data", (c) => data += c);
           res.on("end", () => {
             try {
-              resolve21(JSON.parse(data));
+              resolve22(JSON.parse(data));
             } catch {
-              resolve21({ raw: data });
+              resolve22({ raw: data });
             }
           });
         });
@@ -96302,7 +96364,7 @@ function registerProviderCommands(program2) {
           reference,
           ...verification ? { verification } : {}
         });
-        const startResult = await new Promise((resolve21, reject) => {
+        const startResult = await new Promise((resolve22, reject) => {
           const req = http3.request({
             hostname: "127.0.0.1",
             port: DEV_SERVER_PORT3,
@@ -96314,9 +96376,9 @@ function registerProviderCommands(program2) {
             res.on("data", (c) => data += c);
             res.on("end", () => {
               try {
-                resolve21(JSON.parse(data));
+                resolve22(JSON.parse(data));
               } catch {
-                resolve21({ raw: data });
+                resolve22({ raw: data });
               }
             });
           });
@@ -96350,7 +96412,7 @@ function registerProviderCommands(program2) {
         fsMock.writeFileSync(logFile, `=== Auto-Impl Started ===
 `);
         console.log(source_default.gray(`  Agent logs: ${logFile}`));
-        await new Promise((resolve21, reject) => {
+        await new Promise((resolve22, reject) => {
           http3.get(`http://127.0.0.1:${DEV_SERVER_PORT3}${startResult.sseUrl}`, (res) => {
             let buffer = "";
             res.on("data", (chunk) => {
@@ -96387,7 +96449,7 @@ function registerProviderCommands(program2) {
                     if (currentData.success === false) {
                       reject(new Error(`Agent failed to implement scripts properly (exit: ${currentData.exitCode})`));
                     } else {
-                      resolve21();
+                      resolve22();
                     }
                   } else if (currentEvent === "error") {
                     fsMock.appendFileSync(logFile, `
@@ -96398,7 +96460,7 @@ function registerProviderCommands(program2) {
                 }
               }
             });
-            res.on("end", resolve21);
+            res.on("end", resolve22);
           }).on("error", reject);
         });
         console.log(source_default.green(`
@@ -96457,7 +96519,7 @@ function registerProviderCommands(program2) {
         ideType: type,
         params: options.param ? { text: options.param, sessionId: options.param, buttonText: options.param } : {}
       });
-      const result = await new Promise((resolve21, reject) => {
+      const result = await new Promise((resolve22, reject) => {
         const req = http3.request({
           hostname: "127.0.0.1",
           port: DEV_SERVER_PORT3,
@@ -96469,9 +96531,9 @@ function registerProviderCommands(program2) {
           res.on("data", (c) => data += c);
           res.on("end", () => {
             try {
-              resolve21(JSON.parse(data));
+              resolve22(JSON.parse(data));
             } catch {
-              resolve21({ raw: data });
+              resolve22({ raw: data });
             }
           });
         });
@@ -96507,15 +96569,15 @@ function registerProviderCommands(program2) {
   provider.command("source <type>").description("View source code of a provider").action(async (type) => {
     try {
       const http3 = await import("http");
-      const result = await new Promise((resolve21, reject) => {
+      const result = await new Promise((resolve22, reject) => {
         http3.get(`http://127.0.0.1:${DEV_SERVER_PORT3}/api/providers/${type}/source`, (res) => {
           let data = "";
           res.on("data", (c) => data += c);
           res.on("end", () => {
             try {
-              resolve21(JSON.parse(data));
+              resolve22(JSON.parse(data));
             } catch {
-              resolve21({ raw: data });
+              resolve22({ raw: data });
             }
           });
         }).on("error", () => {
@@ -96563,7 +96625,7 @@ function registerProviderCommands(program2) {
     try {
       const http3 = await import("http");
       const postData = JSON.stringify({ script: "readChat", params: {} });
-      const result = await new Promise((resolve21, reject) => {
+      const result = await new Promise((resolve22, reject) => {
         const req = http3.request({
           hostname: "127.0.0.1",
           port: DEV_SERVER_PORT3,
@@ -96575,9 +96637,9 @@ function registerProviderCommands(program2) {
           res2.on("data", (c) => data += c);
           res2.on("end", () => {
             try {
-              resolve21(JSON.parse(data));
+              resolve22(JSON.parse(data));
             } catch {
-              resolve21({ raw: data });
+              resolve22({ raw: data });
             }
           });
         });
@@ -96741,8 +96803,8 @@ function registerCdpCommands(program2) {
       }
       const output = typeof result === "string" ? result : JSON.stringify(result, null, 2);
       if (options.output) {
-        const fs23 = await import("fs");
-        fs23.writeFileSync(options.output, output, "utf-8");
+        const fs24 = await import("fs");
+        fs24.writeFileSync(options.output, output, "utf-8");
         console.log(source_default.green(`
   \u2713 Saved to ${options.output} (${output.length} chars)
 `));
@@ -96818,13 +96880,13 @@ function registerCdpCommands(program2) {
   cdp.command("screenshot").description("Capture IDE screenshot").option("-p, --port <port>", "CDP port", "9222").option("-o, --output <file>", "Output file path", "/tmp/cdp_screenshot.jpg").action(async (options) => {
     try {
       const http3 = await import("http");
-      const targets = await new Promise((resolve21, reject) => {
+      const targets = await new Promise((resolve22, reject) => {
         http3.get(`http://127.0.0.1:${options.port}/json`, (res) => {
           let data = "";
           res.on("data", (c) => data += c);
           res.on("end", () => {
             try {
-              resolve21(JSON.parse(data));
+              resolve22(JSON.parse(data));
             } catch {
               reject(new Error("Invalid JSON"));
             }
@@ -96838,20 +96900,20 @@ function registerCdpCommands(program2) {
       if (!target?.webSocketDebuggerUrl) throw new Error("No CDP target");
       const WebSocket4 = (await import("ws")).default;
       const ws = new WebSocket4(target.webSocketDebuggerUrl);
-      await new Promise((resolve21, reject) => {
+      await new Promise((resolve22, reject) => {
         ws.on("open", () => {
           ws.send(JSON.stringify({ id: 1, method: "Page.captureScreenshot", params: { format: "jpeg", quality: 50 } }));
         });
         ws.on("message", async (data) => {
           const msg = JSON.parse(data.toString());
           if (msg.id === 1 && msg.result?.data) {
-            const fs23 = await import("fs");
-            fs23.writeFileSync(options.output, Buffer.from(msg.result.data, "base64"));
+            const fs24 = await import("fs");
+            fs24.writeFileSync(options.output, Buffer.from(msg.result.data, "base64"));
             console.log(source_default.green(`
   \u2713 Screenshot saved to ${options.output}
 `));
             ws.close();
-            resolve21();
+            resolve22();
           }
         });
         ws.on("error", (e) => reject(e));
@@ -96867,7 +96929,9 @@ function registerCdpCommands(program2) {
 
 // src/cli/mcp-commands.ts
 var import_node_child_process3 = require("child_process");
+var fs23 = __toESM(require("fs"));
 var import_node_module3 = require("module");
+var path39 = __toESM(require("path"));
 init_source();
 function registerMcpCommands(program2) {
   program2.command("mcp").description("Start an MCP server to expose IDE agents as tools (for Claude Desktop, etc.)").option("--api-key <key>", "ADHDev cloud API key (switches to cloud mode)").option("--port <n>", "Standalone daemon port (default: 3847)", "3847").option("--password <pass>", "Standalone daemon password (if set)").option("--base-url <url>", "Override cloud API base URL").addHelpText("after", `
@@ -96885,8 +96949,8 @@ Claude Desktop config (~/.claude_desktop_config.json):
     }
   }
 
-Tools available (local):  list_sessions, read_chat, send_chat, approve, screenshot, git_status
-Tools available (cloud):  list_sessions, read_chat, send_chat, approve
+Tools available (local):  list_sessions, launch_session, check_pending, read_chat, send_chat, approve, git_status, screenshot
+Tools available (cloud):  list_sessions, launch_session, check_pending, read_chat, send_chat, approve, git_status
         `).action(async (opts) => {
     const mcpBin = resolveMcpBin();
     if (!mcpBin) {
@@ -96915,6 +96979,15 @@ Tools available (cloud):  list_sessions, read_chat, send_chat, approve
   });
 }
 function resolveMcpBin() {
+  const packagedCandidates = [
+    path39.resolve(__dirname, "../vendor/mcp-server/index.js"),
+    path39.resolve(__dirname, "../../vendor/mcp-server/index.js")
+  ];
+  for (const candidate of packagedCandidates) {
+    if (fs23.existsSync(candidate)) {
+      return candidate;
+    }
+  }
   try {
     const req = (0, import_node_module3.createRequire)(__filename);
     return req.resolve("@adhdev/mcp-server");