@heretyc/subagent-mcp 2.12.3 → 2.12.4

package/dist/index.js

@@ -19,6 +19,7 @@ import { loadRoutingTable, buildCandidates, validatePresence, TASK_CATEGORIES, A
 import { createDeadlockWindow } from "./deadlock.js";
 import { createRulesetGate, RULESET_HARD_FAIL_MSG, } from "./ruleset.js";
 import { CONFIG_FILENAME, NONBLOCKING_CULL_DEPS, ZOMBIE_FORCE_GRACE_MS, ZOMBIE_LIVE_IDLE_MS, ZOMBIE_TERMINAL_IDLE_MS, buildProcessTreeKillCommands, drainZombieIntents, drainZombieReports, defaultConfigPath, globalCapMessage, readSlotMetadata, readGlobalCap, releaseSlot, reserveSlot, slotDir, writeSlotMetadata, } from "./concurrency.js";
+import { shouldReapTerminalButAlive } from "./zombie.js";
 import * as orchestrationMarker from "./orchestration/marker.js";
 import * as modelMode from "./orchestration/model-mode.js";
 import { startLivenessHeartbeat } from "./orchestration/liveness.js";
@@ -246,10 +247,7 @@ function runToolMaintenance() {
         }
         const slotMeta = agent.slotPath ? readSlotMetadata(agent.slotPath) : null;
         adoptNewerSlotActivity(agent, slotMeta);
-        const terminalButAlive = (agent.status === "finished" || agent.status === "errored" || agent.status === "stopped") &&
-            !agent.driver.closed &&
-            agent.exitedAt !== null &&
-            now - agent.exitedAt > zombieTerminalIdleMs();
+        const terminalButAlive = shouldReapTerminalButAlive(agent, now, zombieTerminalIdleMs());
         if (terminalButAlive) {
             const record = markZombieKilled(agent, "terminal_but_alive", now);
             records.push(record);
@@ -378,6 +376,8 @@ function handleCompletedStdoutLines(agent, lines, at) {
             agent.status = "finished";
             if (agent.exitedAt === null)
                 agent.exitedAt = at;
+            releaseSlot(agent.slotPath ?? null);
+            agent.slotPath = null;
         }
     }
 }
@@ -442,7 +442,7 @@ const ORCHESTRATION_INSTRUCTIONS = "subagent-mcp - CANONICAL OPERATING MODEL (fu
 const SUBAGENT_INSTRUCTIONS = "SUB-AGENT SESSION: you are a child process launched by subagent-mcp. Follow the parent prompt. Do not treat yourself as the orchestrator, do not re-trigger orchestration carryover, and do not launch further sub-agents unless the parent prompt explicitly assigns that.\n\nMODEL SELECTION MODE (parallel to orchestration-mode, set via the model-selection-mode tool). DEFAULT is \"smart\" and is used whenever unset: in smart, launch_agent REJECTS any call supplying provider/model/effort selectors and the server auto-picks the best model. \"user-approved-overrides\" opens a 30-MINUTE window where selectors are HONORED, enforced LAZILY (the mode reverts to smart on the next launch_agent call after 30 minutes) and re-enabling does NOT extend an active window. HONOR-BASED: you MUST NOT set \"user-approved-overrides\" without explicit interactive USER authorization via the structured-question tool (AskUserQuestion on Claude / request-user-input on Codex); never enable it on your own initiative.";
 const server = new McpServer({
     name: "subagent-mcp",
-    version: "2.12.3",
+    version: "2.12.4",
     description: "Launches always-interactive local Claude and Codex sub-agent sessions and is the orchestrator's sole launch channel. Claude runs via the Claude Agent SDK over the local Claude Code executable; Codex via `codex app-server` over stdio. The server never calls Anthropic or OpenAI HTTP APIs directly.",
 }, {
     instructions: process.env.SUBAGENT_MCP_SUBAGENT === "1"
@@ -1012,7 +1012,7 @@ server.tool("launch_agent", "Spawn a sub-agent session. CONTRACT: every `prompt`
 }) // ponytail: launch_agent still reaps, but callers do not receive zombie_report.
 );
 // Tool 2: poll_agent
-server.tool("poll_agent", "Get an agent's current status and output. `processing` = ALIVE with visible provider activity in the last 10 min; `stalled` = ALIVE but no visible provider stream item for 10 min (thinking, or awaiting a temp-file handoff) — NOT dead, so prefer `wait`/re-poll over killing. Always returns `alive` + `idle_seconds`, plus `recent_stream` (last 3 timestamped visible stream items) and a `hint` while stalled. `verbose: true` also returns `final_output`, the agent's final assistant turn from its captured stdout.", {
+server.tool("poll_agent", "Get an agent's current status and output. `processing` = ALIVE with visible provider activity in the last 10 min; `stalled` = ALIVE but no visible provider stream item for 10 min (thinking, or awaiting a temp-file handoff) — NOT dead, so prefer `wait`/re-poll over killing. Polling refreshes the agent's idle clock. Always returns `alive` + `idle_seconds`, plus `recent_stream` (last 3 timestamped visible stream items) and a `hint` while stalled. `verbose: true` also returns `final_output`, the agent's final assistant turn from its captured stdout.", {
     agent_id: z.string(),
     verbose: z.boolean().optional().default(false),
 }, withMaintenance(async (params) => {
@@ -1032,6 +1032,7 @@ server.tool("poll_agent", "Get an agent's current status and output. `processing
     // completed/failed immediately (no up-to-10s health-monitor lag).
     const now = Date.now();
     reconcileAgent(agent, now);
+    agent.lastActivity = now;
     const escapedStdout = escapeUntrustedTags(agent.stdout);
     const escapedStderr = escapeUntrustedTags(agent.stderr);
     const stdoutTail = envelopeUntrustedOutput(escapedStdout.length > 2000
@@ -1085,7 +1086,7 @@ server.tool("poll_agent", "Get an agent's current status and output. `processing
     };
 }, { includeZombieReport: true }));
 // Tool 3: kill_agent
-server.tool("kill_agent", "Terminate a live agent/session (status `processing`, `stalled`, or turn-finished but still interactive) by immediately force-killing its managed driver. No-op for already-terminal closed agents.", {
+server.tool("kill_agent", "Terminate a live agent/session (status `processing`, `stalled`, or turn-finished but still interactive) by immediately force-killing its managed driver. A finished agent is force-killed automatically after 6 minutes of no `send_message`/`poll_agent` activity; call `kill_agent` sooner to free resources immediately. No-op for already-terminal closed agents.", {
     agent_id: z.string(),
 }, withMaintenance(async (params) => {
     const agent = agents.get(params.agent_id);
@@ -1262,7 +1263,7 @@ server.tool("list_agents", "List all agents with token-efficient core metrics (s
     };
 }, { includeZombieReport: true }));
 // Tool 6: wait
-server.tool("wait", "Blocks until one or more sub-agents reach a reportable state (turn-finished, errored, stopped, or zombie_killed), returning exit code when known + local-time timestamp; or returns the live-job list after a 15-minute timeout. This is how you learn an agent finished — do NOT poll-loop. A `finished` agent with null exit_code is still alive and accepts `send_message`; a `stalled` agent is still ALIVE and does NOT end the wait. `verbose: true` adds each finished agent's `final_output`.", {
+server.tool("wait", "Blocks until one or more sub-agents reach a reportable state (turn-finished, errored, stopped, or zombie_killed), returning exit code when known + local-time timestamp; or returns the live-job list after a 15-minute timeout. This is how you learn an agent finished — do NOT poll-loop. A `finished` agent with null exit_code is still alive and accepts `send_message`; `send_message`/`poll_agent` activity keeps it alive, and 6 minutes idle auto-kills it. A `stalled` agent is still ALIVE and does NOT end the wait. `verbose: true` adds each finished agent's `final_output`.", {
     verbose: z.boolean().optional().default(false),
 }, withMaintenance(async (params, zombieRecords) => {
     const { verbose } = params;

package/dist/zombie.js

@@ -3,7 +3,7 @@ import { platform } from "node:os";
 import { basename, dirname, join } from "node:path";
 import { execFileSync } from "node:child_process";
 export const ZOMBIE_LIVE_IDLE_MS = 6 * 60 * 1000;
-export const ZOMBIE_TERMINAL_IDLE_MS = 30 * 1000;
+export const ZOMBIE_TERMINAL_IDLE_MS = 6 * 60 * 1000;
 export const ZOMBIE_FORCE_GRACE_MS = 20 * 1000;
 export const ZOMBIE_INTENTS_FILENAME = "zombie-intents.jsonl";
 export const ZOMBIE_REPORTS_FILENAME = "zombie-reports.jsonl";
@@ -72,7 +72,7 @@ export function writeSlotMetadata(slotPath, metadata) {
     };
     writeFileSync(slotPath, JSON.stringify(full), { mode: 0o600 });
 }
-function drainJsonl(path) {
+export function drainJsonl(path) {
     if (!existsSync(path))
         return [];
     const claim = join(dirname(path), `${basename(path)}.${process.pid}.drain`);
@@ -84,7 +84,14 @@ function drainJsonl(path) {
     }
     try {
         const records = [];
-        for (const line of readFileSync(claim, "utf8").split(/\r?\n/).filter(Boolean)) {
+        let raw;
+        try {
+            raw = readFileSync(claim, "utf8");
+        }
+        catch {
+            return [];
+        }
+        for (const line of raw.split(/\r?\n/).filter(Boolean)) {
             try {
                 records.push(JSON.parse(line));
             }
@@ -101,6 +108,12 @@ function drainJsonl(path) {
         catch { }
     }
 }
+export function shouldReapTerminalButAlive(agent, now, terminalIdleMs) {
+    return ((agent.status === "finished" || agent.status === "errored" || agent.status === "stopped") &&
+        !agent.driver.closed &&
+        agent.exitedAt !== null &&
+        now - Math.max(agent.exitedAt, agent.lastActivity) > terminalIdleMs);
+}
 export function buildProcessTreeKillCommands(pid, p = platform()) {
     if (p === "win32") {
         return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@heretyc/subagent-mcp",
-  "version": "2.12.3",
+  "version": "2.12.4",
   "description": "MCP server that launches and manages always-interactive Claude Code and Codex sub-agent sessions (no direct Anthropic/OpenAI API).",
   "keywords": [
     "mcp",
@@ -38,7 +38,7 @@
     "postinstall": "node scripts/postinstall.mjs",
     "prepare": "npm run build",
     "prepublishOnly": "npm test",
-    "test": "npm run check:versions && node test/effort.test.mjs && node test/drivers.test.mjs && node test/platform.test.mjs && node test/wait.test.mjs && node test/status.test.mjs && node test/output.test.mjs && node test/stream.test.mjs && node test/routing.test.mjs && node test/deadlock.test.mjs && node test/handler-validation.test.mjs && node test/index-handler.test.mjs && node test/ruleset.test.mjs && node test/ruleset-exec.test.mjs && node test/ruleset-handler.test.mjs && node test/failover.test.mjs && node test/global-concurrency-cap.test.mjs && node test/update-check.test.mjs && node test/zombie.test.mjs && node test/orchestration-marker.test.mjs && node test/orchestration-hook-core.test.mjs && node test/orchestration-adapters.test.mjs && node test/orchestration-pretool.test.mjs && node test/orchestration-directives.test.mjs && node test/no-five-call.test.mjs && node test/no-per-provider-cap.test.mjs && node test/rag-pointers.test.mjs && node test/check-worktree-subagent.test.mjs && node test/launch-agent-upsert.test.mjs && node test/claude-session-limit.test.mjs && node test/init-migration.test.mjs && node test/init-global.test.mjs && node test/mirror-fragments.test.mjs && node test/performance-tier-effort.test.mjs && node test/setup-repair.test.mjs && node test/setup-quoting.test.mjs && node test/setup-wire.test.mjs && node test/setup-cli-integration.test.mjs && node test/init.test.mjs && node test/model-selection-mode.test.mjs && node test/cli-args.test.mjs && node test/index-guard.test.mjs && node test/drivers-guard.test.mjs && node test/audit-next13-lb3.test.mjs && node test/zombie-guard.test.mjs && node test/concurrency-guard.test.mjs && node test/hook-core-guard.test.mjs && node scripts/validate_provider.mjs && node scripts/validate_seed_sites.mjs && node scripts/validate_routing_audit.mjs && node test/seed-sites.test.mjs && node test/mcp-compliance.test.mjs"
+    "test": "npm run check:versions && node test/effort.test.mjs && node test/drivers.test.mjs && node test/platform.test.mjs && node test/wait.test.mjs && node test/status.test.mjs && node test/output.test.mjs && node test/stream.test.mjs && node test/routing.test.mjs && node test/deadlock.test.mjs && node test/handler-validation.test.mjs && node test/index-handler.test.mjs && node test/ruleset.test.mjs && node test/ruleset-exec.test.mjs && node test/ruleset-handler.test.mjs && node test/failover.test.mjs && node test/global-concurrency-cap.test.mjs && node test/update-check.test.mjs && node test/zombie.test.mjs && node test/zombie-reap-idle.test.mjs && node test/orchestration-marker.test.mjs && node test/orchestration-hook-core.test.mjs && node test/orchestration-adapters.test.mjs && node test/orchestration-pretool.test.mjs && node test/orchestration-directives.test.mjs && node test/no-five-call.test.mjs && node test/no-per-provider-cap.test.mjs && node test/rag-pointers.test.mjs && node test/check-worktree-subagent.test.mjs && node test/launch-agent-upsert.test.mjs && node test/claude-session-limit.test.mjs && node test/init-migration.test.mjs && node test/init-global.test.mjs && node test/mirror-fragments.test.mjs && node test/performance-tier-effort.test.mjs && node test/setup-repair.test.mjs && node test/setup-quoting.test.mjs && node test/setup-wire.test.mjs && node test/setup-cli-integration.test.mjs && node test/init.test.mjs && node test/model-selection-mode.test.mjs && node test/cli-args.test.mjs && node test/index-guard.test.mjs && node test/drivers-guard.test.mjs && node test/audit-next13-lb3.test.mjs && node test/zombie-guard.test.mjs && node test/concurrency-guard.test.mjs && node test/hook-core-guard.test.mjs && node scripts/validate_provider.mjs && node scripts/validate_seed_sites.mjs && node scripts/validate_routing_audit.mjs && node test/seed-sites.test.mjs && node test/mcp-compliance.test.mjs"
   },
   "author": "Lexi Blackburn",
   "license": "Apache-2.0",