@integrity-labs/agt-cli 0.21.0 → 0.21.1

package/dist/lib/manager-worker.js

@@ -22,7 +22,7 @@ import {
   resolveChannels,
   resolveDmTarget,
   wrapScheduledTaskPrompt
-} from "../chunk-NANARUEF.js";
+} from "../chunk-NLEW5BPX.js";
 import {
   findTaskByTemplate,
   getProjectDir,
@@ -92,6 +92,25 @@ function computeIntegrationsHash(integrations) {
 
 // src/lib/stale-mcp-reaper.ts
 import { execFileSync } from "child_process";
+var rotationTimestamps = /* @__PURE__ */ new Map();
+var DEFAULT_ROTATION_GRACE_MS = 15e3;
+function rotationKey(codeName, serverKey) {
+  return `${codeName}\0${serverKey}`;
+}
+function recordStaleRotation(codeName, serverKeys, now = Date.now) {
+  const ts = now();
+  for (const key of serverKeys) {
+    rotationTimestamps.set(rotationKey(codeName, key), ts);
+  }
+}
+function wasRecentlyRotated(codeName, serverKey, withinMs, now = Date.now) {
+  const k = rotationKey(codeName, serverKey);
+  const ts = rotationTimestamps.get(k);
+  if (ts === void 0) return false;
+  if (now() - ts < withinMs) return true;
+  rotationTimestamps.delete(k);
+  return false;
+}
 function parseEnvIntegrationsEntries(content) {
   const entries = /* @__PURE__ */ new Map();
   for (const raw of content.split(/\r?\n/)) {
@@ -264,6 +283,16 @@ function reapStaleMcpChildren(args) {
   for (const pid of targets) {
     killProcess(pid, "SIGTERM");
   }
+  const killedKeys = /* @__PURE__ */ new Set();
+  for (const pid of targets) {
+    const argv = byPid.get(pid)?.args ?? "";
+    for (const key of serverKeys) {
+      const entry = mcpJson?.mcpServers?.[key];
+      const matchers = buildArgvMatchersForEntry(key, entry);
+      if (matchers.some((re) => re.test(argv))) killedKeys.add(key);
+    }
+  }
+  if (killedKeys.size > 0) recordStaleRotation(codeName, killedKeys);
   setTimeout(() => {
     try {
       let freshPsOutput;
@@ -343,6 +372,7 @@ function reapMissingMcpSessions(args) {
     sessionStartedAt,
     stopSession,
     graceMs = DEFAULT_COLD_START_GRACE_MS,
+    rotationGraceMs = DEFAULT_ROTATION_GRACE_MS,
     onGiveUp,
     onRestart
   } = args;
@@ -369,13 +399,27 @@ function reapMissingMcpSessions(args) {
     return { missing: [], restarted: false, reason: "healthy" };
   }
   const rows = parsePsRows(psOutput);
-  const missing = findMissingMcpServers({ rows, codeName, mcpJson });
+  const missingRaw = findMissingMcpServers({ rows, codeName, mcpJson });
+  const rotationGraced = [];
+  const missing = [];
+  for (const key of missingRaw) {
+    if (wasRecentlyRotated(codeName, key, rotationGraceMs, now)) {
+      rotationGraced.push(key);
+    } else {
+      missing.push(key);
+    }
+  }
+  if (rotationGraced.length > 0) {
+    log2(
+      `[mcp-presence-reaper] '${codeName}': skipping [${rotationGraced.join(", ")}] within rotation grace window (${rotationGraceMs}ms) \u2014 child(ren) just SIGTERM'd by stale-mcp-reaper, awaiting respawn on next tool call (ENG-5344)`
+    );
+  }
   const declared = mcpJson.mcpServers ?? {};
   const liveKeys = /* @__PURE__ */ new Set();
   for (const key of Object.keys(declared)) {
     const entry = declared[key];
     if (typeof entry?.command !== "string") continue;
-    if (!missing.includes(key)) liveKeys.add(key);
+    if (!missingRaw.includes(key)) liveKeys.add(key);
   }
   for (const key of liveKeys) {
     const state2 = presenceReaperState.get(stateKey(codeName, key));
@@ -387,7 +431,12 @@ function reapMissingMcpSessions(args) {
     }
   }
   if (missing.length === 0) {
-    return { missing, restarted: false, reason: "healthy" };
+    return {
+      missing,
+      restarted: false,
+      reason: "healthy",
+      rotationGraced: rotationGraced.length > 0 ? rotationGraced : void 0
+    };
   }
   const givenUp = [];
   const active = [];
@@ -426,7 +475,13 @@ function reapMissingMcpSessions(args) {
     }
   }
   if (active.length === 0) {
-    return { missing, restarted: false, reason: "all-keys-over-cap", givenUp };
+    return {
+      missing,
+      restarted: false,
+      reason: "all-keys-over-cap",
+      givenUp,
+      rotationGraced: rotationGraced.length > 0 ? rotationGraced : void 0
+    };
   }
   const givenUpSuffix = givenUp.length > 0 ? ` (skipping over-cap: [${givenUp.join(", ")}])` : "";
   log2(
@@ -449,7 +504,12 @@ function reapMissingMcpSessions(args) {
     }
   }
   stopSession(codeName);
-  return { missing, restarted: true, givenUp: givenUp.length > 0 ? givenUp : void 0 };
+  return {
+    missing,
+    restarted: true,
+    givenUp: givenUp.length > 0 ? givenUp : void 0,
+    rotationGraced: rotationGraced.length > 0 ? rotationGraced : void 0
+  };
 }
 
 // src/lib/channel-restart-decision.ts
@@ -2338,7 +2398,7 @@ function clearAgentCaches(agentId, codeName) {
 var cachedFrameworkVersion = null;
 var lastVersionCheckAt = 0;
 var VERSION_CHECK_INTERVAL_MS = 5 * 60 * 1e3;
-var agtCliVersion = true ? "0.21.0" : "dev";
+var agtCliVersion = true ? "0.21.1" : "dev";
 function resolveBrewPath(execFileSync4) {
   try {
     const out = execFileSync4("which", ["brew"], { timeout: 5e3 }).toString().trim();