@askexenow/exe-os 0.9.372 → 0.9.374

package/dist/bin/deferred-daemon-restart.js

@@ -1,193 +1,197 @@
 #!/usr/bin/env node
 import {
   computeMcpSurfaceHash
-} from "../chunk-RNLF3CBB.js";
+} from "../chunk-AKLJ4JH3.js";
 import "../chunk-WCGNCH3Q.js";
-import "../chunk-LAZKEJMS.js";
-import "../chunk-OKGIOWOB.js";
-import "../chunk-ERVQTR7P.js";
-import "../chunk-7V6M3QUS.js";
-import "../chunk-WZJVGA5I.js";
-import "../chunk-5H47VHB7.js";
+import "../chunk-DIXXEE3S.js";
+import "../chunk-BBSIEYF5.js";
+import "../chunk-T3QUKNLI.js";
 import "../chunk-557C2IGL.js";
+import "../chunk-U6SUKSZR.js";
 import "../chunk-GSJLB6JI.js";
-import "../chunk-WUKQVNLP.js";
-import "../chunk-RGUDGC6A.js";
-import "../chunk-NQZUSEAR.js";
-import "../chunk-RUWWES2K.js";
-import "../chunk-RLR6VVKV.js";
-import "../chunk-V4XAKXXF.js";
+import "../chunk-ZL4AGWAH.js";
+import "../chunk-5H47VHB7.js";
+import "../chunk-KTU3EAWK.js";
+import "../chunk-GNUAL43X.js";
+import "../chunk-SEQIPGLU.js";
+import "../chunk-UM3N6VND.js";
+import "../chunk-2AJGV5UL.js";
 import "../chunk-CRCB5S7I.js";
-import "../chunk-FBYAXTDM.js";
+import "../chunk-2ZOEC4KC.js";
+import "../chunk-VMTZ4RUW.js";
+import "../chunk-23MVDXLY.js";
+import "../chunk-6WIFPD2P.js";
+import "../chunk-YO4BO2CL.js";
+import "../chunk-GLQEJOXE.js";
 import "../chunk-PHUHIVD5.js";
-import "../chunk-7R73IAHU.js";
-import "../chunk-CNC57JCS.js";
-import "../chunk-XXSNLM6R.js";
-import "../chunk-3Y5THOU6.js";
-import "../chunk-FZQWVQJG.js";
-import "../chunk-AAMGHW5W.js";
-import "../chunk-VX2F4ZUY.js";
+import "../chunk-GS7LIT34.js";
+import "../chunk-DB55JZHU.js";
+import "../chunk-Q3AXXKDF.js";
+import "../chunk-T35RCQFE.js";
+import "../chunk-6SCGLHJ7.js";
 import "../chunk-A6PDF4BO.js";
-import "../chunk-W25RLOQ2.js";
-import "../chunk-YFCNWQAM.js";
-import "../chunk-AAUWFXOX.js";
-import "../chunk-5N4SG5NB.js";
-import "../chunk-PVEM537A.js";
-import "../chunk-H37FSTF2.js";
+import "../chunk-PLZSZOZN.js";
+import "../chunk-DJOIMFKV.js";
+import "../chunk-4YLBKEL5.js";
+import "../chunk-UBMZ3YQU.js";
 import "../chunk-X2X3IGZU.js";
-import "../chunk-ZZXMB5F2.js";
-import "../chunk-GH6YJOOC.js";
-import "../chunk-RUVO3NJC.js";
+import "../chunk-UZDF6FLJ.js";
+import "../chunk-4SJ4LK4V.js";
+import "../chunk-IN6CAM4F.js";
 import "../chunk-MPVXHYD5.js";
 import "../chunk-5OPAUFLP.js";
 import "../chunk-4LWBC7CM.js";
-import "../chunk-UVW7YFAF.js";
-import "../chunk-7PSLK36P.js";
-import "../chunk-HHE2HV3V.js";
-import "../chunk-5AHRZI3R.js";
-import "../chunk-OZBII5E3.js";
-import "../chunk-SEP5ITFQ.js";
-import "../chunk-IPMUWYRQ.js";
-import "../chunk-O4ZFRK6W.js";
+import "../chunk-N7VEP5B3.js";
+import "../chunk-44TLJZJ5.js";
+import "../chunk-NBXDXKLC.js";
+import "../chunk-AETLDRZB.js";
+import "../chunk-I4DNJFDR.js";
+import "../chunk-636LKCKE.js";
+import "../chunk-BJ7AVSY6.js";
+import "../chunk-OVEQE6YS.js";
 import "../chunk-S2YTU74T.js";
-import "../chunk-53PYNYTW.js";
-import "../chunk-MINXPXAB.js";
-import "../chunk-RIK5GRWI.js";
-import "../chunk-RBYHJDAT.js";
-import "../chunk-FB343XQX.js";
-import "../chunk-THM7J6UI.js";
-import "../chunk-4ZJ5BPY6.js";
+import "../chunk-IRVOXUSK.js";
+import "../chunk-GJI77VDO.js";
+import "../chunk-LGS2V2XD.js";
+import "../chunk-TQAZTRQ3.js";
+import "../chunk-DJ7YXOTU.js";
+import "../chunk-JHI5WMK5.js";
+import "../chunk-PB5S7YOF.js";
 import "../chunk-3OEVDGIY.js";
-import "../chunk-KZXMP6JG.js";
-import "../chunk-QLA3RTH4.js";
+import "../chunk-4YNA3CM6.js";
+import "../chunk-AWWKRZMB.js";
 import "../chunk-SSC7EKY2.js";
-import "../chunk-7WQRFSZI.js";
-import "../chunk-OW5RZIDW.js";
+import "../chunk-SL6KQYDU.js";
+import "../chunk-XNNECNDL.js";
+import "../chunk-PHBU4LGO.js";
+import "../chunk-XFTEX77S.js";
 import "../chunk-EXDW3E2R.js";
-import "../chunk-SBJV2PCU.js";
-import "../chunk-R6FLELV6.js";
 import "../chunk-KM6XSFHP.js";
-import "../chunk-ZNUJFX7L.js";
-import "../chunk-E5HAY3DQ.js";
+import "../chunk-UQGSBM3U.js";
+import "../chunk-HDLAB7W3.js";
 import "../chunk-YQGMSXT5.js";
 import "../chunk-75H4R62K.js";
-import "../chunk-VKXS2YGN.js";
+import "../chunk-QHJR7IMX.js";
 import "../chunk-MMRUBN3I.js";
 import "../chunk-2XZ6X3PJ.js";
-import "../chunk-ORA5BWCV.js";
-import "../chunk-6XEYELCA.js";
-import "../chunk-HIVZ53YB.js";
-import "../chunk-THIJIOE2.js";
-import "../chunk-77JP3LK4.js";
-import "../chunk-WV3TOOL7.js";
+import "../chunk-NRG7KZIP.js";
+import "../chunk-R4CBHKZ2.js";
+import "../chunk-EXTZSNWL.js";
+import "../chunk-PY3FOMRN.js";
+import "../chunk-VKJGHAZT.js";
+import "../chunk-KQ6RJWRW.js";
 import "../chunk-NEHOQ3P2.js";
-import "../chunk-CW2UCKHS.js";
-import "../chunk-VV5EZZNT.js";
-import "../chunk-JTB5V6BV.js";
+import "../chunk-TADAO3HV.js";
+import "../chunk-HTBEVCO2.js";
+import "../chunk-3SXHEQ7X.js";
 import "../chunk-NUTZJZKW.js";
 import "../chunk-X2Z5GT3V.js";
-import "../chunk-ZISQOOER.js";
-import "../chunk-MBNIJXKI.js";
-import "../chunk-PGLPUP37.js";
-import "../chunk-TGPQMMQP.js";
-import "../chunk-ZYCLSEZT.js";
-import "../chunk-Z6BZQHP5.js";
+import "../chunk-EKE37MO4.js";
+import "../chunk-WMEYJT4R.js";
+import "../chunk-XZ65ST2I.js";
+import "../chunk-VYQ7B7DI.js";
+import "../chunk-ULIBLJ6W.js";
 import "../chunk-GUMRIUI5.js";
+import "../chunk-Z6BZQHP5.js";
 import "../chunk-VGMACSEV.js";
-import "../chunk-IDZPQG2D.js";
-import "../chunk-YYA5LXCT.js";
+import "../chunk-MOGA4Q7F.js";
+import "../chunk-FNEZ4BWT.js";
 import "../chunk-MWEIBVBS.js";
 import "../chunk-QGGH7LOU.js";
 import "../chunk-VHJVD3MZ.js";
 import "../chunk-TWMWHDOY.js";
 import "../chunk-EEZOBN6X.js";
-import "../chunk-ZXB56YR2.js";
+import "../chunk-TFKCERAK.js";
 import "../chunk-VMHZSZQJ.js";
-import "../chunk-OYQNNKNS.js";
-import "../chunk-7UTJA6HF.js";
+import "../chunk-MXPNVSXI.js";
+import "../chunk-VZAFWPAY.js";
 import "../chunk-CHCA3ZM2.js";
 import "../chunk-OTVEIJUQ.js";
-import "../chunk-3F2UB4IQ.js";
-import "../chunk-HECXZGGZ.js";
-import "../chunk-QTYJPWJN.js";
-import "../chunk-HR2R2QER.js";
-import "../chunk-LDL3S7AC.js";
+import "../chunk-DN4YVV4Z.js";
+import "../chunk-ZCERWHY2.js";
+import "../chunk-CBCGDEJA.js";
+import "../chunk-M4IRPXSZ.js";
+import "../chunk-NKETJCB5.js";
 import "../chunk-B6TI3TZT.js";
-import "../chunk-QR624DER.js";
-import "../chunk-KYFFVTGO.js";
-import "../chunk-2ADYTOHQ.js";
+import "../chunk-ZSODLMFV.js";
+import "../chunk-55BEFF4V.js";
+import "../chunk-K4ESASPL.js";
 import "../chunk-5MOYSU5A.js";
 import "../chunk-4QCFFW2H.js";
 import "../chunk-76CJBM36.js";
-import "../chunk-XHYHX6F7.js";
+import "../chunk-QLZ46RCK.js";
+import "../chunk-AKLQSC6W.js";
 import "../chunk-BTSWFMEH.js";
-import "../chunk-WAEKYKTK.js";
-import "../chunk-44C7QNZS.js";
-import "../chunk-JTWTBX2M.js";
+import "../chunk-6RKKVPYF.js";
+import "../chunk-4EN3IZ3Q.js";
 import "../chunk-KI5PFRG6.js";
+import "../chunk-3KDCORDO.js";
 import "../chunk-WT4RI36X.js";
 import "../chunk-E23LNUWJ.js";
 import "../chunk-QAEWWYHL.js";
 import "../chunk-EIKATSE4.js";
-import "../chunk-MDGYXUOV.js";
-import "../chunk-GBNB4EWD.js";
-import "../chunk-UXLO7VHX.js";
-import "../chunk-DSOQUQTV.js";
-import "../chunk-E2WEFZOR.js";
+import "../chunk-MJCSEIFI.js";
+import "../chunk-XH7YL7JM.js";
+import "../chunk-ORM7ZFKC.js";
+import "../chunk-VI4ATC6I.js";
+import "../chunk-A27Q27CT.js";
+import "../chunk-W75GTHR3.js";
 import "../chunk-AJIXH5JF.js";
-import "../chunk-L6ZNURWN.js";
-import "../chunk-XTWHNLGD.js";
+import "../chunk-7GE2EQ23.js";
+import "../chunk-GZOG2MAX.js";
 import "../chunk-AM7S2TY6.js";
-import "../chunk-HIIXCAEE.js";
+import "../chunk-6YVUR3OU.js";
 import "../chunk-CVYC6DUW.js";
-import "../chunk-QZL6E4UB.js";
-import "../chunk-CDUB5Q6J.js";
+import "../chunk-GOMQ7PVQ.js";
+import "../chunk-4IK2K3B3.js";
 import {
   requestDeployRestart
-} from "../chunk-UQUUNGTP.js";
+} from "../chunk-NUK7EEN5.js";
 import {
   handOffToSupervisor,
   isSupervisorConfigured,
   runSupervisorCommand
-} from "../chunk-IVU3WN7S.js";
-import "../chunk-RIECV7SR.js";
-import "../chunk-LNOS24GV.js";
+} from "../chunk-ZG62LIK3.js";
+import "../chunk-EKYYMIVT.js";
 import {
   computeDaemonHeapCapMb
 } from "../chunk-NLEW62VC.js";
-import "../chunk-W2IRQJ6R.js";
+import "../chunk-SLLLOOEI.js";
+import "../chunk-V3WLC5TJ.js";
+import "../chunk-JTVIANUB.js";
 import "../chunk-HYZV25LY.js";
 import "../chunk-GJV3WDWM.js";
 import "../chunk-GL57PO3K.js";
-import "../chunk-ADNBOKYZ.js";
+import "../chunk-GM7TLYOK.js";
 import "../chunk-ML4S5SHZ.js";
 import "../chunk-MP2AFCGL.js";
-import "../chunk-5DCCKHDY.js";
-import "../chunk-TKDITWDN.js";
+import "../chunk-TAMDAOCU.js";
 import "../chunk-BBMTVAE3.js";
+import "../chunk-TKDITWDN.js";
 import "../chunk-5YEUPUV4.js";
-import "../chunk-UTDMTQNH.js";
+import "../chunk-DSJI76XL.js";
 import "../chunk-YYB5PMTK.js";
 import "../chunk-NJFJWQNN.js";
 import "../chunk-V3W3SATA.js";
 import "../chunk-JY5GAZYC.js";
 import "../chunk-FXU7JOXK.js";
 import "../chunk-SO7KTH3Q.js";
-import "../chunk-HPXFKUGU.js";
 import "../chunk-WNBZJSQT.js";
+import "../chunk-HPXFKUGU.js";
 import "../chunk-F55P3H4S.js";
-import "../chunk-TCTED52S.js";
-import "../chunk-DKBPCOU4.js";
+import "../chunk-FTZET5YX.js";
+import "../chunk-L6RXG36J.js";
 import "../chunk-A7XLR3K7.js";
-import "../chunk-GB3AHV5F.js";
+import "../chunk-GQOEWNVM.js";
 import {
   SYSTEMD_DAEMON_UNIT
 } from "../chunk-A7JYF4RG.js";
 import "../chunk-ARX6TAGN.js";
 import {
   resolveDataDir
-} from "../chunk-QMSEL5YS.js";
+} from "../chunk-ZIG7VPJV.js";
 import "../chunk-HSGBZSCA.js";
+import "../chunk-RH4AH3YB.js";
 import "../chunk-6Y4B3QF6.js";
 import "../chunk-JKKZGDLP.js";
 import "../chunk-MLKGABMK.js";

package/dist/bin/exe-agent-config.js

@@ -6,15 +6,15 @@ import {
   getAgentRuntime,
   loadAgentConfig,
   setAgentRuntime
-} from "../chunk-XTWHNLGD.js";
+} from "../chunk-GZOG2MAX.js";
 import "../chunk-AM7S2TY6.js";
 import {
   loadEmployeesSync
-} from "../chunk-5DCCKHDY.js";
-import "../chunk-TKDITWDN.js";
+} from "../chunk-TAMDAOCU.js";
 import "../chunk-BBMTVAE3.js";
+import "../chunk-TKDITWDN.js";
 import "../chunk-5YEUPUV4.js";
-import "../chunk-UTDMTQNH.js";
+import "../chunk-DSJI76XL.js";
 import "../chunk-YYB5PMTK.js";
 import "../chunk-NJFJWQNN.js";
 import "../chunk-V3W3SATA.js";
@@ -23,8 +23,9 @@ import "../chunk-FXU7JOXK.js";
 import {
   DEFAULT_RUNTIME
 } from "../chunk-WNBZJSQT.js";
-import "../chunk-QMSEL5YS.js";
+import "../chunk-ZIG7VPJV.js";
 import "../chunk-HSGBZSCA.js";
+import "../chunk-RH4AH3YB.js";
 import "../chunk-JKKZGDLP.js";
 import "../chunk-MLKGABMK.js";
 

package/dist/bin/exe-agent.js

@@ -1,4 +1,7 @@
 #!/usr/bin/env node
+import {
+  FileEditTool
+} from "../chunk-R4WMF32C.js";
 import {
   BashTool
 } from "../chunk-TQDARPML.js";
@@ -15,8 +18,11 @@ import {
   FileWriteTool
 } from "../chunk-XEKO37NM.js";
 import {
-  FileEditTool
-} from "../chunk-R4WMF32C.js";
+  currentMcpSessionKey,
+  registerMcpChild,
+  terminateSessionMcpChildren,
+  unregisterMcpChild
+} from "../chunk-ANLFH23R.js";
 import {
   createTerminalRenderer,
   renderAgentEvents
@@ -25,7 +31,10 @@ import "../chunk-CMCYL2JC.js";
 import "../chunk-NGVOA6ZQ.js";
 import {
   agentLoop
-} from "../chunk-E5QQZDQN.js";
+} from "../chunk-HNWS7YHN.js";
+import {
+  createDefaultHooks
+} from "../chunk-O377P7GM.js";
 import {
   ToolRegistry
 } from "../chunk-JRLNE3T2.js";
@@ -33,9 +42,6 @@ import {
   EMPLOYEE_PERMISSIONS
 } from "../chunk-2O2UKMUE.js";
 import "../chunk-HF25XPZE.js";
-import {
-  createDefaultHooks
-} from "../chunk-O377P7GM.js";
 import {
   OllamaProvider
 } from "../chunk-FWFFZGSC.js";
@@ -45,21 +51,24 @@ import {
 } from "../chunk-ECGTESAP.js";
 import {
   getSessionPrompt
-} from "../chunk-6XEYELCA.js";
-import "../chunk-HIVZ53YB.js";
-import "../chunk-THIJIOE2.js";
-import "../chunk-5DCCKHDY.js";
-import "../chunk-TKDITWDN.js";
+} from "../chunk-R4CBHKZ2.js";
+import "../chunk-EXTZSNWL.js";
+import "../chunk-PY3FOMRN.js";
+import "../chunk-SLLLOOEI.js";
+import "../chunk-V3WLC5TJ.js";
+import "../chunk-TAMDAOCU.js";
 import "../chunk-BBMTVAE3.js";
+import "../chunk-TKDITWDN.js";
 import "../chunk-5YEUPUV4.js";
-import "../chunk-UTDMTQNH.js";
+import "../chunk-DSJI76XL.js";
 import "../chunk-YYB5PMTK.js";
 import "../chunk-NJFJWQNN.js";
 import "../chunk-V3W3SATA.js";
 import "../chunk-JY5GAZYC.js";
 import "../chunk-FXU7JOXK.js";
-import "../chunk-QMSEL5YS.js";
+import "../chunk-ZIG7VPJV.js";
 import "../chunk-HSGBZSCA.js";
+import "../chunk-RH4AH3YB.js";
 import "../chunk-JKKZGDLP.js";
 import "../chunk-MLKGABMK.js";
 
@@ -108,25 +117,37 @@ var McpToolWrapper = class {
   }
 };
 var DEFAULT_MCP_REQUEST_TIMEOUT_MS = 15e3;
+var CLOSE_SIGKILL_GRACE_MS = 3e3;
 var McpStdioClient = class {
   constructor(command, args = [], options = {}) {
     this.command = command;
     this.args = args;
     this.requestTimeoutMs = Math.max(1, options.requestTimeoutMs ?? DEFAULT_MCP_REQUEST_TIMEOUT_MS);
+    this.sessionKey = options.sessionKey ?? currentMcpSessionKey();
   }
   command;
   args;
   child = null;
+  childPid = null;
   requestId = 0;
   pending = /* @__PURE__ */ new Map();
   buffer = "";
   MAX_BUFFER = 1e7;
   // 10MB cap
   requestTimeoutMs;
+  sessionKey;
+  closeGraceMs = CLOSE_SIGKILL_GRACE_MS;
+  /** Pending SIGKILL escalation from close(); cancelled the moment the child exits. */
+  forceKillTimer = null;
   async connect() {
     this.child = spawn(this.command, this.args, {
       stdio: ["pipe", "pipe", "pipe"]
     });
+    const spawnedAtMs = Date.now();
+    if (this.child.pid != null) {
+      this.childPid = this.child.pid;
+      registerMcpChild(this.sessionKey, this.child.pid, this.command, process.pid, spawnedAtMs);
+    }
     this.child.stdout.on("data", (chunk) => {
       this.buffer += chunk.toString("utf-8");
       if (this.buffer.length > this.MAX_BUFFER) {
@@ -139,6 +160,8 @@ var McpStdioClient = class {
       this.rejectAllPending(err);
     });
     this.child.on("exit", (code, signal) => {
+      this.cancelForceKill();
+      if (this.childPid != null) unregisterMcpChild(this.sessionKey, this.childPid);
       this.rejectAllPending(
         new Error(`MCP server exited before responding (code=${code ?? "null"}, signal=${signal ?? "null"})`)
       );
@@ -169,12 +192,50 @@ var McpStdioClient = class {
     return result;
   }
   async close() {
-    if (this.child) {
-      this.child.kill("SIGTERM");
-      this.child = null;
+    const child = this.child;
+    this.child = null;
+    if (child) {
+      this.signalChild(child, "SIGTERM");
+      this.forceKillTimer = this.scheduleForceKill(() => {
+        this.forceKillTimer = null;
+        if (child.exitCode !== null || child.signalCode !== null) return;
+        this.signalChild(child, "SIGKILL");
+      }, this.closeGraceMs);
     }
     this.rejectAllPending(new Error("MCP client closed"));
   }
+  /** Cancel any pending SIGKILL escalation. Idempotent. */
+  cancelForceKill() {
+    const timer = this.forceKillTimer;
+    this.forceKillTimer = null;
+    if (timer) timer.cancel();
+  }
+  /**
+   * Signal the child through its handle.
+   *
+   * PROCESS GROUPS — deliberate, unchanged blast radius: the child is spawned
+   * without `detached`, so it shares our process group. Signalling `-pid` would
+   * therefore hit our *own* group (the agent/daemon itself), and a group id is a
+   * recycled integer with exactly the same hazard as a recycled PID. So we signal
+   * the single process we own and nothing else. Grandchildren the MCP server
+   * spawns are not orphan-proofed here; that is what the on-disk registry plus
+   * the daemon's identity-guarded reaper exist for, and widening this to a group
+   * kill is a separate, deliberate decision — not a side effect of this fix.
+   *
+   * @internal Overridable purely as a test seam.
+   */
+  signalChild(child, signal) {
+    try {
+      child.kill(signal);
+    } catch {
+    }
+  }
+  /** @internal Overridable purely as a test seam (deterministic timers in tests). */
+  scheduleForceKill(run, ms) {
+    const timer = setTimeout(run, ms);
+    timer.unref?.();
+    return { cancel: () => clearTimeout(timer) };
+  }
   request(method, params) {
     return new Promise((resolve, reject) => {
       if (!this.child?.stdin?.writable) {
@@ -234,8 +295,8 @@ var McpStdioClient = class {
     }
   }
 };
-async function createMcpTools(serverCommand, serverArgs = []) {
-  const client = new McpStdioClient(serverCommand, serverArgs);
+async function createMcpTools(serverCommand, serverArgs = [], options = {}) {
+  const client = new McpStdioClient(serverCommand, serverArgs, options);
   await client.connect();
   const mcpTools = await client.listTools();
   const tools = mcpTools.map(
@@ -317,14 +378,14 @@ function resolveMcpServerCommand(env = process.env, proxyPath = fileURLToPath(ne
   }
   return { command: execPath, args: [proxyPath] };
 }
-async function registerMcpTools(registry, connect = createMcpTools, env = process.env) {
+async function registerMcpTools(registry, connect = createMcpTools, env = process.env, sessionKey) {
   const server = resolveMcpServerCommand(env);
   if (!server) {
     console.error("[exe-agent] MCP disabled (EXE_AGENT_MCP=0) \u2014 builtin tools only.");
     return null;
   }
   try {
-    const { tools, client } = await connect(server.command, server.args);
+    const { tools, client } = await connect(server.command, server.args, sessionKey ? { sessionKey } : void 0);
     const builtins = new Set(registry.names());
     let registered = 0;
     for (const tool of tools) {
@@ -345,6 +406,38 @@ async function registerMcpTools(registry, connect = createMcpTools, env = proces
     return null;
   }
 }
+var MCP_TEARDOWN_GRACE_MS = 3e3;
+var MCP_TEARDOWN_MARGIN_MS = 500;
+var MCP_TEARDOWN_CEILING_MS = MCP_TEARDOWN_GRACE_MS + MCP_TEARDOWN_MARGIN_MS;
+async function shutdownMcpChildren(client, sessionKey, deps = {}) {
+  const terminate = deps.terminate ?? terminateSessionMcpChildren;
+  const graceMs = deps.graceMs ?? MCP_TEARDOWN_GRACE_MS;
+  const ceilingMs = deps.ceilingMs ?? MCP_TEARDOWN_CEILING_MS;
+  const warn = deps.warn ?? ((msg) => process.stderr.write(msg));
+  const setTimer = deps.setTimer ?? ((fn, ms) => {
+    const t = setTimeout(fn, ms);
+    t.unref?.();
+    return { cancel: () => clearTimeout(t) };
+  });
+  try {
+    client?.close();
+  } catch {
+  }
+  let timer;
+  const sweep = Promise.resolve().then(() => terminate(sessionKey, { graceMs })).then(() => "complete").catch(() => "complete");
+  const ceiling = new Promise((resolve) => {
+    timer = setTimer(() => resolve("timeout"), ceilingMs);
+  });
+  const outcome = await Promise.race([sweep, ceiling]);
+  timer?.cancel();
+  if (outcome === "timeout") {
+    warn(
+      `[exe-agent] MCP teardown exceeded ${ceilingMs}ms \u2014 exiting anyway. Any surviving child stays in the MCP child registry for the daemon reaper.
+`
+    );
+  }
+  return outcome;
+}
 async function main() {
   const args = parseArgs(process.argv);
   if (!args.employee) {
@@ -360,15 +453,13 @@ async function main() {
   const model = args.model ?? provider.defaultModel ?? "claude-sonnet-4-20250514";
   const registry = new ToolRegistry();
   registerBuiltinTools(registry);
-  const mcpClient = await registerMcpTools(registry);
+  const mcpSessionKey = currentMcpSessionKey();
+  const mcpClient = await registerMcpTools(registry, createMcpTools, process.env, mcpSessionKey);
   const abortController = new AbortController();
   const shutdown = () => {
     process.stderr.write("\n[exe-agent] Shutting down...\n");
     abortController.abort();
-    try {
-      mcpClient?.close();
-    } catch {
-    }
+    void shutdownMcpChildren(mcpClient, mcpSessionKey);
   };
   process.on("SIGINT", shutdown);
   process.on("SIGTERM", shutdown);
@@ -407,12 +498,10 @@ async function main() {
     rl.prompt();
   });
   rl.on("close", () => {
-    try {
-      mcpClient?.close();
-    } catch {
-    }
-    console.error("[exe-agent] Session ended.");
-    process.exit(0);
+    void shutdownMcpChildren(mcpClient, mcpSessionKey).then(() => {
+      console.error("[exe-agent] Session ended.");
+      process.exit(0);
+    });
   });
 }
 function isDirectRun(entry = process.argv[1], selfUrl = import.meta.url) {
@@ -424,13 +513,18 @@ function isDirectRun(entry = process.argv[1], selfUrl = import.meta.url) {
   }
 }
 if (isDirectRun()) {
-  main().catch((err) => {
+  main().catch(async (err) => {
     console.error(`[exe-agent] Fatal: ${err instanceof Error ? err.message : String(err)}`);
+    await shutdownMcpChildren(null, currentMcpSessionKey());
     process.exit(1);
   });
 }
 export {
+  MCP_TEARDOWN_CEILING_MS,
+  MCP_TEARDOWN_GRACE_MS,
+  MCP_TEARDOWN_MARGIN_MS,
   isDirectRun,
   registerMcpTools,
-  resolveMcpServerCommand
+  resolveMcpServerCommand,
+  shutdownMcpChildren
 };