@adhdev/daemon-core 0.9.70 → 0.9.72

package/dist/index.js

@@ -2226,7 +2226,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((resolve15) => setTimeout(resolve15, 50));
+          await new Promise((resolve16) => setTimeout(resolve16, 50));
         }
         const finalScreenText = this.terminalScreen.getText() || "";
         LOG.warn(
@@ -3136,7 +3136,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((resolve15) => setTimeout(resolve15, 50));
+            await new Promise((resolve16) => setTimeout(resolve16, 50));
           }
         }
         if (!allowInterventionPrompt) {
@@ -3212,13 +3212,13 @@ var init_provider_cli_adapter = __esm({
         }
         this.responseEpoch += 1;
         this.responseSettleIgnoreUntil = Date.now() + submitDelayMs + this.timeouts.outputSettle + 250;
-        await new Promise((resolve15, reject) => {
+        await new Promise((resolve16, reject) => {
           let resolved = false;
           const completion = {
             resolveOnce: () => {
               if (resolved) return;
               resolved = true;
-              resolve15();
+              resolve16();
             },
             rejectOnce: (error) => {
               if (resolved) return;
@@ -3376,17 +3376,17 @@ var init_provider_cli_adapter = __esm({
         }
       }
       waitForStopped(timeoutMs) {
-        return new Promise((resolve15) => {
+        return new Promise((resolve16) => {
           const startedAt = Date.now();
           const timer = setInterval(() => {
             if (!this.ptyProcess || this.currentStatus === "stopped") {
               clearInterval(timer);
-              resolve15(true);
+              resolve16(true);
               return;
             }
             if (Date.now() - startedAt >= timeoutMs) {
               clearInterval(timer);
-              resolve15(false);
+              resolve16(false);
             }
           }, 100);
         });
@@ -3529,11 +3529,22 @@ var init_provider_cli_adapter = __esm({
           }
         }
       }
+      getParsedDebugState() {
+        if (this.startupParseGate || typeof this.cliScripts?.parseSession !== "function") return null;
+        try {
+          const parsed = this.getScriptParsedStatus();
+          return parsed && typeof parsed === "object" ? parsed : null;
+        } catch {
+          return null;
+        }
+      }
       getDebugState() {
         const screenText = sanitizeTerminalText(this.terminalScreen.getText());
         const startupModal = this.startupParseGate ? this.runParseApproval(this.recentOutputBuffer) : null;
         const effectiveStatus = this.projectEffectiveStatus(startupModal);
         const effectiveReady = this.ready || !!startupModal;
+        const parsedDebugState = this.getParsedDebugState();
+        const parsedMessages = Array.isArray(parsedDebugState?.messages) ? parsedDebugState.messages : [];
         return {
           type: this.cliType,
           name: this.cliName,
@@ -3546,8 +3557,18 @@ var init_provider_cli_adapter = __esm({
           startupParseGate: this.startupParseGate,
           spawnAt: this.spawnAt,
           workingDir: this.workingDir,
-          messages: [],
-          messageCount: 0,
+          messages: parsedMessages,
+          messageCount: parsedMessages.length,
+          parsedStatus: parsedDebugState ? {
+            id: parsedDebugState.id,
+            status: parsedDebugState.status,
+            title: parsedDebugState.title,
+            providerSessionId: parsedDebugState.providerSessionId,
+            transcriptAuthority: parsedDebugState.transcriptAuthority,
+            coverage: parsedDebugState.coverage,
+            activeModal: parsedDebugState.activeModal,
+            messageCount: parsedMessages.length
+          } : null,
           screenText: screenText.slice(-4e3),
           currentTurnScope: this.currentTurnScope,
           startupBuffer: this.startupBuffer.slice(-4e3),
@@ -5804,8 +5825,8 @@ async function detectIDEs(providerLoader) {
       if ((0, import_fs4.existsSync)(bundledCli)) resolvedCli = bundledCli;
     }
     if (!resolvedCli && appPath && os21 === "win32") {
-      const { dirname: dirname7 } = await import("path");
-      const appDir = dirname7(appPath);
+      const { dirname: dirname8 } = await import("path");
+      const appDir = dirname8(appPath);
       const candidates = [
         `${appDir}\\\\bin\\\\${def.cli}.cmd`,
         `${appDir}\\\\bin\\\\${def.cli}`,
@@ -5869,19 +5890,19 @@ function resolveCommandPath(command) {
   return null;
 }
 function execAsync(cmd, timeoutMs = 5e3) {
-  return new Promise((resolve15) => {
+  return new Promise((resolve16) => {
     const child = (0, import_child_process2.exec)(cmd, {
       encoding: "utf-8",
       timeout: timeoutMs,
       ...process.platform === "win32" ? { windowsHide: true } : {}
     }, (err, stdout) => {
       if (err || !stdout?.trim()) {
-        resolve15(null);
+        resolve16(null);
       } else {
-        resolve15(stdout.trim());
+        resolve16(stdout.trim());
       }
     });
-    child.on("error", () => resolve15(null));
+    child.on("error", () => resolve16(null));
   });
 }
 async function detectCLIs(providerLoader, options) {
@@ -6246,7 +6267,7 @@ var DaemonCdpManager = class {
   * Returns multiple entries if multiple IDE windows are open on same port
   */
   static listAllTargets(port) {
-    return new Promise((resolve15) => {
+    return new Promise((resolve16) => {
       const req = http.get(`http://127.0.0.1:${port}/json`, (res) => {
         let data = "";
         res.on("data", (chunk) => data += chunk.toString());
@@ -6262,16 +6283,16 @@ var DaemonCdpManager = class {
               (t) => !isNonMain(t.title || "") && t.url?.includes("workbench.html") && !t.url?.includes("agent")
             );
             const fallbackPages = pages.filter((t) => !isNonMain(t.title || ""));
-            resolve15(mainPages.length > 0 ? mainPages : fallbackPages);
+            resolve16(mainPages.length > 0 ? mainPages : fallbackPages);
           } catch {
-            resolve15([]);
+            resolve16([]);
           }
         });
       });
-      req.on("error", () => resolve15([]));
+      req.on("error", () => resolve16([]));
       req.setTimeout(2e3, () => {
         req.destroy();
-        resolve15([]);
+        resolve16([]);
       });
     });
   }
@@ -6311,7 +6332,7 @@ var DaemonCdpManager = class {
     }
   }
   findTargetOnPort(port) {
-    return new Promise((resolve15) => {
+    return new Promise((resolve16) => {
       const req = http.get(`http://127.0.0.1:${port}/json`, (res) => {
         let data = "";
         res.on("data", (chunk) => data += chunk.toString());
@@ -6322,7 +6343,7 @@ var DaemonCdpManager = class {
               (t) => (t.type === "page" || t.type === "browser" || t.type === "Page") && t.webSocketDebuggerUrl
             );
             if (pages.length === 0) {
-              resolve15(targets.find((t) => t.webSocketDebuggerUrl) || null);
+              resolve16(targets.find((t) => t.webSocketDebuggerUrl) || null);
               return;
             }
             const titleFilteredPages = pages.filter((t) => !this.isNonMainTitle(t.title || ""));
@@ -6341,25 +6362,25 @@ var DaemonCdpManager = class {
                 this._targetId = selected.target.id;
               }
               this._pageTitle = selected.target.title || "";
-              resolve15(selected.target);
+              resolve16(selected.target);
               return;
             }
             if (previousTargetId) {
               this.log(`[CDP] Target ${previousTargetId} not found in page list`);
-              resolve15(null);
+              resolve16(null);
               return;
             }
             this._pageTitle = list[0]?.title || "";
-            resolve15(list[0]);
+            resolve16(list[0]);
           } catch {
-            resolve15(null);
+            resolve16(null);
           }
         });
       });
-      req.on("error", () => resolve15(null));
+      req.on("error", () => resolve16(null));
       req.setTimeout(2e3, () => {
         req.destroy();
-        resolve15(null);
+        resolve16(null);
       });
     });
   }
@@ -6370,7 +6391,7 @@ var DaemonCdpManager = class {
     this.extensionProviders = providers;
   }
   connectToTarget(wsUrl) {
-    return new Promise((resolve15) => {
+    return new Promise((resolve16) => {
       this.ws = new import_ws.default(wsUrl);
       this.ws.on("open", async () => {
         this._connected = true;
@@ -6380,17 +6401,17 @@ var DaemonCdpManager = class {
         }
         this.connectBrowserWs().catch(() => {
         });
-        resolve15(true);
+        resolve16(true);
       });
       this.ws.on("message", (data) => {
         try {
           const msg = JSON.parse(data.toString());
           if (msg.id && this.pending.has(msg.id)) {
-            const { resolve: resolve16, reject } = this.pending.get(msg.id);
+            const { resolve: resolve17, reject } = this.pending.get(msg.id);
             this.pending.delete(msg.id);
             this.failureCount = 0;
             if (msg.error) reject(new Error(msg.error.message));
-            else resolve16(msg.result);
+            else resolve17(msg.result);
           } else if (msg.method === "Runtime.executionContextCreated") {
             this.contexts.add(msg.params.context.id);
           } else if (msg.method === "Runtime.executionContextDestroyed") {
@@ -6413,7 +6434,7 @@ var DaemonCdpManager = class {
       this.ws.on("error", (err) => {
         this.log(`[CDP] WebSocket error: ${err.message}`);
         this._connected = false;
-        resolve15(false);
+        resolve16(false);
       });
     });
   }
@@ -6427,7 +6448,7 @@ var DaemonCdpManager = class {
         return;
       }
       this.log(`[CDP] Connecting browser WS for target discovery...`);
-      await new Promise((resolve15, reject) => {
+      await new Promise((resolve16, reject) => {
         this.browserWs = new import_ws.default(browserWsUrl);
         this.browserWs.on("open", async () => {
           this._browserConnected = true;
@@ -6437,16 +6458,16 @@ var DaemonCdpManager = class {
           } catch (e) {
             this.log(`[CDP] setDiscoverTargets failed: ${e.message}`);
           }
-          resolve15();
+          resolve16();
         });
         this.browserWs.on("message", (data) => {
           try {
             const msg = JSON.parse(data.toString());
             if (msg.id && this.browserPending.has(msg.id)) {
-              const { resolve: resolve16, reject: reject2 } = this.browserPending.get(msg.id);
+              const { resolve: resolve17, reject: reject2 } = this.browserPending.get(msg.id);
               this.browserPending.delete(msg.id);
               if (msg.error) reject2(new Error(msg.error.message));
-              else resolve16(msg.result);
+              else resolve17(msg.result);
             }
           } catch {
           }
@@ -6466,31 +6487,31 @@ var DaemonCdpManager = class {
     }
   }
   getBrowserWsUrl() {
-    return new Promise((resolve15) => {
+    return new Promise((resolve16) => {
       const req = http.get(`http://127.0.0.1:${this.port}/json/version`, (res) => {
         let data = "";
         res.on("data", (chunk) => data += chunk.toString());
         res.on("end", () => {
           try {
             const info = JSON.parse(data);
-            resolve15(info.webSocketDebuggerUrl || null);
+            resolve16(info.webSocketDebuggerUrl || null);
           } catch {
-            resolve15(null);
+            resolve16(null);
           }
         });
       });
-      req.on("error", () => resolve15(null));
+      req.on("error", () => resolve16(null));
       req.setTimeout(3e3, () => {
         req.destroy();
-        resolve15(null);
+        resolve16(null);
       });
     });
   }
   sendBrowser(method, params = {}, timeoutMs = 15e3) {
-    return new Promise((resolve15, reject) => {
+    return new Promise((resolve16, reject) => {
       if (!this.browserWs || !this._browserConnected) return reject(new Error("Browser WS not connected"));
       const id = this.browserMsgId++;
-      this.browserPending.set(id, { resolve: resolve15, reject });
+      this.browserPending.set(id, { resolve: resolve16, reject });
       this.browserWs.send(JSON.stringify({ id, method, params }));
       setTimeout(() => {
         if (this.browserPending.has(id)) {
@@ -6530,11 +6551,11 @@ var DaemonCdpManager = class {
   }
   // ─── CDP Protocol ────────────────────────────────────────
   sendInternal(method, params = {}, timeoutMs = 15e3) {
-    return new Promise((resolve15, reject) => {
+    return new Promise((resolve16, reject) => {
       if (!this.ws || !this._connected) return reject(new Error("CDP not connected"));
       if (this.ws.readyState !== import_ws.default.OPEN) return reject(new Error("WebSocket not open"));
       const id = this.msgId++;
-      this.pending.set(id, { resolve: resolve15, reject });
+      this.pending.set(id, { resolve: resolve16, reject });
       this.ws.send(JSON.stringify({ id, method, params }));
       setTimeout(() => {
         if (this.pending.has(id)) {
@@ -6783,7 +6804,7 @@ var DaemonCdpManager = class {
     const browserWs = this.browserWs;
     let msgId = this.browserMsgId;
     const sendWs = (method, params = {}, sessionId) => {
-      return new Promise((resolve15, reject) => {
+      return new Promise((resolve16, reject) => {
         const mid = msgId++;
         this.browserMsgId = msgId;
         const handler = (raw) => {
@@ -6792,7 +6813,7 @@ var DaemonCdpManager = class {
             if (msg.id === mid) {
               browserWs.removeListener("message", handler);
               if (msg.error) reject(new Error(msg.error.message || JSON.stringify(msg.error)));
-              else resolve15(msg.result);
+              else resolve16(msg.result);
             }
           } catch {
           }
@@ -6993,14 +7014,14 @@ var DaemonCdpManager = class {
     if (!ws || ws.readyState !== import_ws.default.OPEN) {
       throw new Error("CDP not connected");
     }
-    return new Promise((resolve15, reject) => {
+    return new Promise((resolve16, reject) => {
       const id = getNextId();
       pendingMap.set(id, {
         resolve: (result) => {
           if (result?.result?.subtype === "error") {
             reject(new Error(result.result.description));
           } else {
-            resolve15(result?.result?.value);
+            resolve16(result?.result?.value);
           }
         },
         reject
@@ -7032,10 +7053,10 @@ var DaemonCdpManager = class {
       throw new Error("CDP not connected");
     }
     const sendViaSession = (method, params = {}) => {
-      return new Promise((resolve15, reject) => {
+      return new Promise((resolve16, reject) => {
         const pendingMap = this._browserConnected ? this.browserPending : this.pending;
         const id = this._browserConnected ? this.browserMsgId++ : this.msgId++;
-        pendingMap.set(id, { resolve: resolve15, reject });
+        pendingMap.set(id, { resolve: resolve16, reject });
         ws.send(JSON.stringify({ id, sessionId, method, params }));
         setTimeout(() => {
           if (pendingMap.has(id)) {
@@ -11247,7 +11268,8 @@ function buildIdeWorkspaceSession(state, cdpManagers, options) {
     },
     errorMessage: state.errorMessage,
     errorReason: state.errorReason,
-    lastUpdated: state.lastUpdated
+    lastUpdated: state.lastUpdated,
+    settings: state.settings
   };
 }
 function buildExtensionAgentSession(parent, ext, options) {
@@ -11282,7 +11304,8 @@ function buildExtensionAgentSession(parent, ext, options) {
     },
     errorMessage: ext.errorMessage,
     errorReason: ext.errorReason,
-    lastUpdated: ext.lastUpdated
+    lastUpdated: ext.lastUpdated,
+    settings: ext.settings
   };
 }
 function shouldIncludeExtensionSession(ext) {
@@ -11348,7 +11371,8 @@ function buildCliSession(state, options) {
     },
     errorMessage: state.errorMessage,
     errorReason: state.errorReason,
-    lastUpdated: state.lastUpdated
+    lastUpdated: state.lastUpdated,
+    settings: state.settings
   };
 }
 function buildAcpSession(state, options) {
@@ -11382,7 +11406,8 @@ function buildAcpSession(state, options) {
     },
     errorMessage: state.errorMessage,
     errorReason: state.errorReason,
-    lastUpdated: state.lastUpdated
+    lastUpdated: state.lastUpdated,
+    settings: state.settings
   };
 }
 function buildSessionEntries(allStates, cdpManagers, options = {}) {
@@ -11749,6 +11774,8 @@ function getSendChatInputEnvelope(args) {
 function getHistorySessionId(h, args) {
   const explicit = typeof args?.historySessionId === "string" ? args.historySessionId.trim() : "";
   if (explicit) return explicit;
+  const explicitProviderSessionId = typeof args?.providerSessionId === "string" ? args.providerSessionId.trim() : "";
+  if (explicitProviderSessionId) return explicitProviderSessionId;
   const targetSessionId = typeof args?.targetSessionId === "string" ? args.targetSessionId.trim() : "";
   if (!targetSessionId) return void 0;
   const instance = h.ctx.instanceManager?.getInstance(targetSessionId);
@@ -12214,7 +12241,7 @@ function getCliVisibleTranscriptCount(adapter) {
 async function getStableExtensionBaseline(h) {
   const first = await readExtensionChatState(h);
   if (getStateMessageCount(first) > 0 || getStateLastSignature(first)) return first;
-  await new Promise((resolve15) => setTimeout(resolve15, 150));
+  await new Promise((resolve16) => setTimeout(resolve16, 150));
   const second = await readExtensionChatState(h);
   return getStateMessageCount(second) >= getStateMessageCount(first) ? second : first;
 }
@@ -12222,7 +12249,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((resolve15) => setTimeout(resolve15, 250));
+    await new Promise((resolve16) => setTimeout(resolve16, 250));
     const state = await readExtensionChatState(h);
     if (state?.status === "waiting_approval") return true;
     const afterCount = getStateMessageCount(state);
@@ -12312,7 +12339,32 @@ async function handleReadChat(h, args) {
         ...coverage ? { coverage } : {}
       }, args);
     }
-    return { success: false, error: `${transport} adapter not found` };
+    const historyLimit = normalizeReadChatTailLimit(args);
+    try {
+      const agentStr = provider?.type || args?.agentType || getCurrentProviderType(h);
+      const workspace = typeof args?.workspace === "string" ? args.workspace : typeof h.currentSession?.workspace === "string" ? h.currentSession.workspace : void 0;
+      const history = readProviderChatHistory(agentStr, {
+        canonicalHistory: provider?.canonicalHistory,
+        historySessionId,
+        workspace,
+        offset: 0,
+        limit: historyLimit,
+        excludeRecentCount: 0,
+        historyBehavior: provider?.historyBehavior,
+        scripts: provider?.scripts
+      });
+      const historyProviderSessionId = typeof history?.providerSessionId === "string" ? history.providerSessionId : historySessionId;
+      return buildReadChatCommandResult({
+        messages: Array.isArray(history?.messages) ? history.messages : [],
+        status: "idle",
+        ...typeof history?.title === "string" ? { title: history.title } : {},
+        ...historyProviderSessionId ? { providerSessionId: historyProviderSessionId } : {},
+        ...provider?.historyBehavior?.transcriptAuthority === "provider" || provider?.historyBehavior?.transcriptAuthority === "daemon" ? { transcriptAuthority: (provider?.historyBehavior).transcriptAuthority } : {},
+        coverage: "tail"
+      }, args);
+    } catch (error) {
+      return { success: false, error: error?.message || `${transport} adapter not found` };
+    }
   }
   if (isExtensionTransport(transport)) {
     let extensionReadChatError = "";
@@ -13830,7 +13882,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((resolve15) => setTimeout(resolve15, 50));
+          await new Promise((resolve16) => setTimeout(resolve16, 50));
           await adapter.writeRaw("\r");
         }
       }
@@ -14515,7 +14567,7 @@ var DaemonCommandHandler = class {
     try {
       const http3 = await import("http");
       const postData = JSON.stringify(body);
-      const result = await new Promise((resolve15, reject) => {
+      const result = await new Promise((resolve16, reject) => {
         const req = http3.request({
           hostname: "127.0.0.1",
           port: 19280,
@@ -14527,9 +14579,9 @@ var DaemonCommandHandler = class {
           res.on("data", (chunk) => data += chunk);
           res.on("end", () => {
             try {
-              resolve15(JSON.parse(data));
+              resolve16(JSON.parse(data));
             } catch {
-              resolve15({ raw: data });
+              resolve16({ raw: data });
             }
           });
         });
@@ -14547,15 +14599,15 @@ var DaemonCommandHandler = class {
     if (!providerType) return { success: false, error: "providerType required" };
     try {
       const http3 = await import("http");
-      const result = await new Promise((resolve15, reject) => {
+      const result = await new Promise((resolve16, reject) => {
         http3.get(`http://127.0.0.1:19280/api/providers/${providerType}/${endpoint}`, (res) => {
           let data = "";
           res.on("data", (chunk) => data += chunk);
           res.on("end", () => {
             try {
-              resolve15(JSON.parse(data));
+              resolve16(JSON.parse(data));
             } catch {
-              resolve15({ raw: data });
+              resolve16({ raw: data });
             }
           });
         }).on("error", reject);
@@ -14569,7 +14621,7 @@ var DaemonCommandHandler = class {
     try {
       const http3 = await import("http");
       const postData = JSON.stringify(args || {});
-      const result = await new Promise((resolve15, reject) => {
+      const result = await new Promise((resolve16, reject) => {
         const req = http3.request({
           hostname: "127.0.0.1",
           port: 19280,
@@ -14581,9 +14633,9 @@ var DaemonCommandHandler = class {
           res.on("data", (chunk) => data += chunk);
           res.on("end", () => {
             try {
-              resolve15(JSON.parse(data));
+              resolve16(JSON.parse(data));
             } catch {
-              resolve15({ raw: data });
+              resolve16({ raw: data });
             }
           });
         });
@@ -14707,7 +14759,7 @@ async function waitForCliAdapterReady(adapter, options) {
     if (status === "stopped") {
       throw new Error("CLI runtime stopped before it became ready");
     }
-    await new Promise((resolve15) => setTimeout(resolve15, pollMs));
+    await new Promise((resolve16) => setTimeout(resolve16, pollMs));
   }
   throw new Error(`CLI runtime did not become ready within ${timeoutMs}ms`);
 }
@@ -14863,7 +14915,7 @@ var CliProviderInstance = class {
       this.errorMessage = void 0;
       this.errorReason = void 0;
     }
-    const autoApproveActive = adapterStatus.status === "waiting_approval" && this.shouldAutoApprove();
+    const autoApproveActive = this.maybeAutoApproveStatus(adapterStatus, Date.now());
     const visibleStatus = parseErrorMessage ? "error" : autoApproveActive ? "generating" : adapterStatus.status;
     const parsedProviderSessionId = normalizeProviderSessionId(
       this.provider,
@@ -15050,18 +15102,14 @@ var CliProviderInstance = class {
       const enterCount = cliCommand.enterCount || 1;
       await this.adapter.writeRaw(cliCommand.text + "\r");
       for (let i = 1; i < enterCount; i += 1) {
-        await new Promise((resolve15) => setTimeout(resolve15, 50));
+        await new Promise((resolve16) => setTimeout(resolve16, 50));
         await this.adapter.writeRaw("\r");
       }
     }
     this.applyProviderResponse(parsed.payload, { phase: "immediate" });
   }
-  detectStatusTransition() {
-    const now = Date.now();
-    const adapterStatus = this.adapter.getStatus({ allowParse: false });
-    const parsedStatus = null;
-    const rawStatus = adapterStatus.status;
-    const autoApproveActive = rawStatus === "waiting_approval" && this.shouldAutoApprove();
+  maybeAutoApproveStatus(adapterStatus, now = Date.now()) {
+    const autoApproveActive = adapterStatus?.status === "waiting_approval" && this.shouldAutoApprove();
     if (autoApproveActive && !this.autoApproveBusy) {
       this.autoApproveBusy = true;
       if (this.autoApproveBusyTimer) clearTimeout(this.autoApproveBusyTimer);
@@ -15069,12 +15117,21 @@ var CliProviderInstance = class {
         this.autoApproveBusy = false;
         this.autoApproveBusyTimer = null;
       }, 2e3);
-      const { index: buttonIndex, label: buttonLabel } = pickApprovalButton(adapterStatus.activeModal?.buttons, this.provider);
-      this.recordAutoApproval(adapterStatus.activeModal?.message, buttonLabel, now);
+      const modal = adapterStatus.activeModal;
+      const { index: buttonIndex, label: buttonLabel } = pickApprovalButton(modal?.buttons, this.provider);
+      this.recordAutoApproval(modal?.message, buttonLabel, now);
       setTimeout(() => {
         this.adapter.resolveModal(buttonIndex);
       }, 0);
     }
+    return autoApproveActive;
+  }
+  detectStatusTransition() {
+    const now = Date.now();
+    const adapterStatus = this.adapter.getStatus({ allowParse: false });
+    const parsedStatus = null;
+    const rawStatus = adapterStatus.status;
+    const autoApproveActive = this.maybeAutoApproveStatus(adapterStatus, now);
     const newStatus = autoApproveActive ? "generating" : rawStatus;
     const dirName = this.workingDir.split("/").filter(Boolean).pop() || "session";
     const chatTitle = `${this.provider.name} \xB7 ${dirName}`;
@@ -16150,13 +16207,13 @@ var AcpProviderInstance = class {
         }
         this.currentStatus = "waiting_approval";
         this.detectStatusTransition();
-        const approved = await new Promise((resolve15) => {
-          this.permissionResolvers.push(resolve15);
+        const approved = await new Promise((resolve16) => {
+          this.permissionResolvers.push(resolve16);
           setTimeout(() => {
-            const idx = this.permissionResolvers.indexOf(resolve15);
+            const idx = this.permissionResolvers.indexOf(resolve16);
             if (idx >= 0) {
               this.permissionResolvers.splice(idx, 1);
-              resolve15(false);
+              resolve16(false);
             }
           }, 3e5);
         });
@@ -17140,7 +17197,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
         resolvedDir,
         resolvedCliArgs,
         resolvedProvider,
-        this.providerLoader.getSettings(normalizedType),
+        { ...this.providerLoader.getSettings(normalizedType), ...options?.settingsOverride || {} },
         false,
         {
           providerSessionId: sessionBinding.providerSessionId,
@@ -17394,7 +17451,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
           dir,
           args?.cliArgs,
           args?.initialModel,
-          { resumeSessionId: args?.resumeSessionId }
+          { resumeSessionId: args?.resumeSessionId, settingsOverride: args?.settings }
         );
         return {
           success: true,
@@ -18742,7 +18799,7 @@ var ProviderLoader = class _ProviderLoader {
       return { updated: false };
     }
     try {
-      const etag = await new Promise((resolve15, reject) => {
+      const etag = await new Promise((resolve16, reject) => {
         const options = {
           method: "HEAD",
           hostname: "github.com",
@@ -18760,7 +18817,7 @@ var ProviderLoader = class _ProviderLoader {
               headers: { "User-Agent": "adhdev-launcher" },
               timeout: 1e4
             }, (res2) => {
-              resolve15(res2.headers.etag || res2.headers["last-modified"] || "");
+              resolve16(res2.headers.etag || res2.headers["last-modified"] || "");
             });
             req2.on("error", reject);
             req2.on("timeout", () => {
@@ -18769,7 +18826,7 @@ var ProviderLoader = class _ProviderLoader {
             });
             req2.end();
           } else {
-            resolve15(res.headers.etag || res.headers["last-modified"] || "");
+            resolve16(res.headers.etag || res.headers["last-modified"] || "");
           }
         });
         req.on("error", reject);
@@ -18833,7 +18890,7 @@ var ProviderLoader = class _ProviderLoader {
   downloadFile(url, destPath) {
     const https = require("https");
     const http3 = require("http");
-    return new Promise((resolve15, reject) => {
+    return new Promise((resolve16, reject) => {
       const doRequest = (reqUrl, redirectCount = 0) => {
         if (redirectCount > 5) {
           reject(new Error("Too many redirects"));
@@ -18853,7 +18910,7 @@ var ProviderLoader = class _ProviderLoader {
           res.pipe(ws);
           ws.on("finish", () => {
             ws.close();
-            resolve15();
+            resolve16();
           });
           ws.on("error", reject);
         });
@@ -19432,17 +19489,17 @@ async function findFreePort(ports) {
   throw new Error("No free port found");
 }
 function checkPortFree(port) {
-  return new Promise((resolve15) => {
+  return new Promise((resolve16) => {
     const server = net.createServer();
     server.unref();
-    server.on("error", () => resolve15(false));
+    server.on("error", () => resolve16(false));
     server.listen(port, "127.0.0.1", () => {
-      server.close(() => resolve15(true));
+      server.close(() => resolve16(true));
     });
   });
 }
 async function isCdpActive(port) {
-  return new Promise((resolve15) => {
+  return new Promise((resolve16) => {
     const req = require("http").get(`http://127.0.0.1:${port}/json/version`, {
       timeout: 2e3
     }, (res) => {
@@ -19451,16 +19508,16 @@ async function isCdpActive(port) {
       res.on("end", () => {
         try {
           const info = JSON.parse(data);
-          resolve15(!!info["WebKit-Version"] || !!info["Browser"]);
+          resolve16(!!info["WebKit-Version"] || !!info["Browser"]);
         } catch {
-          resolve15(false);
+          resolve16(false);
         }
       });
     });
-    req.on("error", () => resolve15(false));
+    req.on("error", () => resolve16(false));
     req.on("timeout", () => {
       req.destroy();
-      resolve15(false);
+      resolve16(false);
     });
   });
 }
@@ -19936,7 +19993,9 @@ cleanOldFiles();
 init_logger();
 
 // src/commands/mesh-coordinator.ts
-var import_path4 = require("path");
+var import_node_fs2 = require("fs");
+var import_node_module2 = require("module");
+var import_node_path = require("path");
 var DEFAULT_SERVER_NAME = "adhdev-mesh";
 var DEFAULT_ADHDEV_MCP_COMMAND = "adhdev-mcp";
 function resolveMeshCoordinatorSetup(options) {
@@ -19961,11 +20020,23 @@ function resolveMeshCoordinatorSetup(options) {
     if (!path26) {
       return { kind: "unsupported", reason: "Provider auto-import MCP config is missing a config path" };
     }
+    const mcpServer = resolveAdhdevMcpServerLaunch({
+      meshId,
+      nodeExecutable: options.nodeExecutable,
+      adhdevMcpEntryPath: options.adhdevMcpEntryPath
+    });
+    if (!mcpServer) {
+      return {
+        kind: "unsupported",
+        reason: "Could not resolve the ADHDev MCP server entrypoint without relying on a PATH bin shim"
+      };
+    }
     return {
       kind: "auto_import",
       serverName,
-      configPath: (0, import_path4.join)(workspace, path26),
-      configFormat: mcpConfig.format
+      configPath: (0, import_node_path.join)(workspace, path26),
+      configFormat: mcpConfig.format,
+      mcpServer
     };
   }
   if (mcpConfig.mode === "manual") {
@@ -19997,6 +20068,53 @@ function resolveMeshCoordinatorSetup(options) {
 function renderMeshCoordinatorTemplate(template, values) {
   return template.replace(/\{\{\s*(meshId|workspace|serverName|adhdevMcpCommand)\s*\}\}/g, (_, key) => values[key] || "");
 }
+function resolveAdhdevMcpServerLaunch(options) {
+  const entryPath = resolveAdhdevMcpEntryPath(options.adhdevMcpEntryPath);
+  if (!entryPath) return null;
+  return {
+    command: options.nodeExecutable?.trim() || process.execPath,
+    args: [entryPath, "--repo-mesh", options.meshId]
+  };
+}
+function resolveAdhdevMcpEntryPath(explicitPath) {
+  const explicit = explicitPath?.trim();
+  if (explicit) return normalizeExistingPath(explicit) || explicit;
+  const envPath = process.env.ADHDEV_MCP_SERVER_PATH?.trim();
+  if (envPath) return normalizeExistingPath(envPath) || envPath;
+  const candidates = [];
+  const addCandidate = (candidate) => {
+    if (!candidates.includes(candidate)) candidates.push(candidate);
+  };
+  const addPackagedCandidates = (baseFile) => {
+    if (!baseFile) return;
+    const realBase = normalizeExistingPath(baseFile) || baseFile;
+    const dir = (0, import_node_path.dirname)(realBase);
+    addCandidate((0, import_node_path.resolve)(dir, "../vendor/mcp-server/index.js"));
+    addCandidate((0, import_node_path.resolve)(dir, "../../vendor/mcp-server/index.js"));
+    addCandidate((0, import_node_path.resolve)(dir, "../../../vendor/mcp-server/index.js"));
+  };
+  addPackagedCandidates(process.argv[1]);
+  for (const candidate of candidates) {
+    const normalized = normalizeExistingPath(candidate);
+    if (normalized) return normalized;
+  }
+  try {
+    const requireBase = process.argv[1] ? normalizeExistingPath(process.argv[1]) || process.argv[1] : (0, import_node_path.join)(process.cwd(), "adhdev-daemon.js");
+    const req = (0, import_node_module2.createRequire)(requireBase);
+    const resolvedModule = req.resolve("@adhdev/mcp-server");
+    return normalizeExistingPath(resolvedModule) || resolvedModule;
+  } catch {
+    return null;
+  }
+}
+function normalizeExistingPath(filePath) {
+  try {
+    if (!(0, import_node_fs2.existsSync)(filePath)) return null;
+    return import_node_fs2.realpathSync.native(filePath);
+  } catch {
+    return null;
+  }
+}
 
 // src/status/snapshot.ts
 var os17 = __toESM(require("os"));
@@ -20504,7 +20622,7 @@ async function waitForPidExit(pid, timeoutMs) {
   while (Date.now() - start < timeoutMs) {
     try {
       process.kill(pid, 0);
-      await new Promise((resolve15) => setTimeout(resolve15, 250));
+      await new Promise((resolve16) => setTimeout(resolve16, 250));
     } catch {
       return;
     }
@@ -20615,7 +20733,7 @@ async function runDaemonUpgradeHelper(payload) {
     appendUpgradeLog(installOutput.trim());
   }
   if (process.platform === "win32") {
-    await new Promise((resolve15) => setTimeout(resolve15, 500));
+    await new Promise((resolve16) => setTimeout(resolve16, 500));
     cleanupStaleGlobalInstallDirs(payload.packageName, installCommand.surface);
     appendUpgradeLog("Post-install staging cleanup complete");
   }
@@ -21453,11 +21571,16 @@ var DaemonCommandRouter = class {
         const cliType = typeof args?.cliType === "string" ? args.cliType.trim() : "claude-cli";
         if (!meshId) return { success: false, error: "meshId required" };
         try {
-          const { getMesh: getMesh3 } = await Promise.resolve().then(() => (init_mesh_config(), mesh_config_exports));
           const { buildCoordinatorSystemPrompt: buildCoordinatorSystemPrompt2 } = await Promise.resolve().then(() => (init_coordinator_prompt(), coordinator_prompt_exports));
-          const mesh = getMesh3(meshId);
+          let mesh;
+          if (args?.inlineMesh && typeof args.inlineMesh === "object") {
+            mesh = args.inlineMesh;
+          } else {
+            const { getMesh: getMesh3 } = await Promise.resolve().then(() => (init_mesh_config(), mesh_config_exports));
+            mesh = getMesh3(meshId);
+          }
           if (!mesh) return { success: false, error: "Mesh not found" };
-          if (mesh.nodes.length === 0) return { success: false, error: "No nodes in mesh" };
+          if (!Array.isArray(mesh.nodes) || mesh.nodes.length === 0) return { success: false, error: "No nodes in mesh" };
           const workspace = mesh.nodes[0].workspace;
           const providerMeta = this.deps.providerLoader.resolve?.(cliType) || this.deps.providerLoader.getMeta(cliType);
           const coordinatorSetup = resolveMeshCoordinatorSetup({
@@ -21496,9 +21619,9 @@ var DaemonCommandRouter = class {
               workspace
             };
           }
-          const { existsSync: existsSync21, readFileSync: readFileSync15, writeFileSync: writeFileSync12, copyFileSync: copyFileSync3 } = await import("fs");
+          const { existsSync: existsSync22, readFileSync: readFileSync15, writeFileSync: writeFileSync12, copyFileSync: copyFileSync3 } = await import("fs");
           const mcpConfigPath = coordinatorSetup.configPath;
-          const hadExistingMcpConfig = existsSync21(mcpConfigPath);
+          const hadExistingMcpConfig = existsSync22(mcpConfigPath);
           let existingMcpConfig = {};
           if (hadExistingMcpConfig) {
             try {
@@ -21512,8 +21635,8 @@ var DaemonCommandRouter = class {
             mcpServers: {
               ...existingMcpConfig.mcpServers || {},
               [coordinatorSetup.serverName]: {
-                command: "adhdev-mcp",
-                args: ["--repo-mesh", meshId]
+                command: coordinatorSetup.mcpServer.command,
+                args: coordinatorSetup.mcpServer.args
               }
             }
           };
@@ -21525,10 +21648,20 @@ var DaemonCommandRouter = class {
           } catch {
             systemPrompt = `You are a Repo Mesh Coordinator for "${mesh.name}". Use the adhdev-mesh MCP tools (mesh_status, mesh_list_nodes, mesh_send_task, mesh_read_chat, mesh_launch_session, etc.) to orchestrate work across ${mesh.nodes.length} node(s).`;
           }
+          const cliArgs = [];
+          if (systemPrompt) {
+            cliArgs.push("--append-system-prompt", systemPrompt);
+          }
+          if (cliType === "claude-cli") {
+            cliArgs.push("--mcp-config", coordinatorSetup.configPath);
+          }
           const launchResult = await this.deps.cliManager.handleCliCommand("launch_cli", {
             cliType,
             dir: workspace,
-            initialPrompt: systemPrompt
+            cliArgs: cliArgs.length > 0 ? cliArgs : void 0,
+            settings: {
+              meshCoordinatorFor: meshId
+            }
           });
           if (!launchResult?.success) {
             return { success: false, error: launchResult?.error || "Failed to launch CLI session" };
@@ -21831,7 +21964,8 @@ var DaemonStatusReporter = class {
         workspace: session.workspace ?? null,
         title: session.title,
         cdpConnected: session.cdpConnected,
-        summaryMetadata: session.summaryMetadata
+        summaryMetadata: session.summaryMetadata,
+        settings: session.settings
       })),
       p2p: payload.p2p,
       timestamp: now
@@ -22156,7 +22290,7 @@ var ProviderStreamAdapter = class {
     const beforeCount = this.messageCount(before);
     const beforeSignature = this.lastMessageSignature(before);
     for (let attempt = 0; attempt < 12; attempt += 1) {
-      await new Promise((resolve15) => setTimeout(resolve15, 250));
+      await new Promise((resolve16) => setTimeout(resolve16, 250));
       let state;
       try {
         state = await this.readChat(evaluate);
@@ -22178,7 +22312,7 @@ var ProviderStreamAdapter = class {
     if (this.messageCount(first) > 0 || this.lastMessageSignature(first)) {
       return first;
     }
-    await new Promise((resolve15) => setTimeout(resolve15, 150));
+    await new Promise((resolve16) => setTimeout(resolve16, 150));
     const second = await this.readChat(evaluate);
     return this.messageCount(second) >= this.messageCount(first) ? second : first;
   }
@@ -22329,7 +22463,7 @@ var ProviderStreamAdapter = class {
       if (typeof data.error === "string" && data.error.trim()) return false;
     }
     for (let attempt = 0; attempt < 6; attempt += 1) {
-      await new Promise((resolve15) => setTimeout(resolve15, 250));
+      await new Promise((resolve16) => setTimeout(resolve16, 250));
       const state = await this.readChat(evaluate);
       const title = this.getStateTitle(state);
       if (this.titlesMatch(title, sessionId)) return true;
@@ -24922,7 +25056,7 @@ function getCliTargetBundle(ctx, type, instanceId) {
   return { target, instance, adapter };
 }
 function sleep(ms) {
-  return new Promise((resolve15) => setTimeout(resolve15, ms));
+  return new Promise((resolve16) => setTimeout(resolve16, ms));
 }
 async function waitForCliReady(ctx, type, instanceId, timeoutMs) {
   const startedAt = Date.now();
@@ -27168,15 +27302,15 @@ var DevServer = class _DevServer {
         this.json(res, 500, { error: e.message });
       }
     });
-    return new Promise((resolve15, reject) => {
+    return new Promise((resolve16, reject) => {
       this.server.listen(port, "127.0.0.1", () => {
         this.log(`Dev server listening on http://127.0.0.1:${port}`);
-        resolve15();
+        resolve16();
       });
       this.server.on("error", (e) => {
         if (e.code === "EADDRINUSE") {
           this.log(`Port ${port} in use, skipping dev server`);
-          resolve15();
+          resolve16();
         } else {
           reject(e);
         }
@@ -27258,20 +27392,20 @@ var DevServer = class _DevServer {
       child.stderr?.on("data", (d) => {
         stderr += d.toString().slice(0, 2e3);
       });
-      await new Promise((resolve15) => {
+      await new Promise((resolve16) => {
         const timer = setTimeout(() => {
           child.kill();
-          resolve15();
+          resolve16();
         }, 3e3);
         child.on("exit", () => {
           clearTimeout(timer);
-          resolve15();
+          resolve16();
         });
         child.stdout?.once("data", () => {
           setTimeout(() => {
             child.kill();
             clearTimeout(timer);
-            resolve15();
+            resolve16();
           }, 500);
         });
       });
@@ -27774,14 +27908,14 @@ var DevServer = class _DevServer {
       child.stderr?.on("data", (d) => {
         stderr += d.toString();
       });
-      await new Promise((resolve15) => {
+      await new Promise((resolve16) => {
         const timer = setTimeout(() => {
           child.kill();
-          resolve15();
+          resolve16();
         }, timeout);
         child.on("exit", () => {
           clearTimeout(timer);
-          resolve15();
+          resolve16();
         });
       });
       const elapsed = Date.now() - start;
@@ -28451,14 +28585,14 @@ data: ${JSON.stringify(msg.data)}
     res.end(JSON.stringify(data, null, 2));
   }
   async readBody(req) {
-    return new Promise((resolve15) => {
+    return new Promise((resolve16) => {
       let body = "";
       req.on("data", (chunk) => body += chunk);
       req.on("end", () => {
         try {
-          resolve15(JSON.parse(body));
+          resolve16(JSON.parse(body));
         } catch {
-          resolve15({});
+          resolve16({});
         }
       });
     });
@@ -28968,7 +29102,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((resolve15) => setTimeout(resolve15, STARTUP_POLL_MS));
+    await new Promise((resolve16) => setTimeout(resolve16, STARTUP_POLL_MS));
   }
   throw new Error(`Session host did not become ready within ${timeoutMs}ms`);
 }
@@ -29146,10 +29280,10 @@ async function installExtension(ide, extension) {
         const buffer = Buffer.from(await res.arrayBuffer());
         const fs16 = await import("fs");
         fs16.writeFileSync(vsixPath, buffer);
-        return new Promise((resolve15) => {
+        return new Promise((resolve16) => {
           const cmd = `"${ide.cliCommand}" --install-extension "${vsixPath}" --force`;
           (0, import_child_process11.exec)(cmd, { timeout: 6e4 }, (error, _stdout, stderr) => {
-            resolve15({
+            resolve16({
               extensionId: extension.id,
               marketplaceId: extension.marketplaceId,
               success: !error,
@@ -29162,11 +29296,11 @@ async function installExtension(ide, extension) {
     } catch (e) {
     }
   }
-  return new Promise((resolve15) => {
+  return new Promise((resolve16) => {
     const cmd = `"${ide.cliCommand}" --install-extension ${extension.marketplaceId} --force`;
     (0, import_child_process11.exec)(cmd, { timeout: 6e4 }, (error, stdout, stderr) => {
       if (error) {
-        resolve15({
+        resolve16({
           extensionId: extension.id,
           marketplaceId: extension.marketplaceId,
           success: false,
@@ -29174,7 +29308,7 @@ async function installExtension(ide, extension) {
           error: stderr || error.message
         });
       } else {
-        resolve15({
+        resolve16({
           extensionId: extension.id,
           marketplaceId: extension.marketplaceId,
           success: true,
@@ -29268,6 +29402,48 @@ var SessionRegistry = class {
 // src/boot/daemon-lifecycle.ts
 init_logger();
 init_config();
+
+// src/mesh/mesh-events.ts
+init_mesh_config();
+init_logger();
+function setupMeshEventForwarding(components) {
+  components.instanceManager.onEvent((event) => {
+    if (event.event !== "agent:generating_completed" && event.event !== "agent:waiting_approval") return;
+    const instanceId = event.instanceId;
+    if (!instanceId) return;
+    const sourceInstance = components.instanceManager.getInstance(instanceId);
+    if (!sourceInstance || sourceInstance.category !== "cli") return;
+    const state = sourceInstance.getState();
+    const workspace = state.workspace;
+    if (!workspace) return;
+    const mesh = getMeshByRepo(workspace);
+    if (!mesh) return;
+    const allInstances = components.instanceManager.getByCategory("cli");
+    const coordinatorInstances = allInstances.filter((inst) => {
+      const instState = inst.getState();
+      if (instState.settings?.meshCoordinatorFor !== mesh.id) return false;
+      if (instState.instanceId === instanceId) return false;
+      return true;
+    });
+    if (coordinatorInstances.length === 0) return;
+    const targetNode = mesh.nodes.find((n) => n.workspace === workspace);
+    const nodeLabel = targetNode ? `Node '${targetNode.id}'` : `Agent at ${workspace}`;
+    let messageText = "";
+    if (event.event === "agent:generating_completed") {
+      messageText = `[System] ${nodeLabel} has completed its task and is now idle. You may use mesh_read_chat to review its progress.`;
+    } else if (event.event === "agent:waiting_approval") {
+      messageText = `[System] ${nodeLabel} is waiting for approval to proceed. You may use mesh_read_chat and mesh_approve to handle it.`;
+    }
+    if (!messageText) return;
+    for (const coord of coordinatorInstances) {
+      const coordState = coord.getState();
+      LOG.info("MeshEvents", `Forwarding event from ${workspace} to coordinator ${coordState.instanceId}`);
+      coord.onEvent("send_message", { input: { text: messageText, textFallback: messageText } });
+    }
+  });
+}
+
+// src/boot/daemon-lifecycle.ts
 async function initDaemonComponents(config) {
   installGlobalInterceptor();
   const appConfig = loadConfig();
@@ -29425,7 +29601,7 @@ async function initDaemonComponents(config) {
   });
   poller.start();
   instanceManager.startTicking(config.tickIntervalMs ?? 5e3);
-  return {
+  const components = {
     providerLoader,
     instanceManager,
     cliManager,
@@ -29439,6 +29615,8 @@ async function initDaemonComponents(config) {
     detectedIdes: detectedIdesRef,
     refreshProviderAvailability
   };
+  setupMeshEventForwarding(components);
+  return components;
 }
 async function startDaemonDevSupport(options) {
   const devServer = new DevServer({