@heretyc/subagent-mcp 2.12.17 → 2.12.19

package/README.md

@@ -52,8 +52,10 @@ subagent-mcp setup
 
 Installing the package only ships the program. It does not connect anything on
 its own. `subagent-mcp setup` finds your Claude Code or Codex install and
-registers both the server and the per-turn orchestration hooks. Preview first
-with `subagent-mcp setup --dry-run`.
+registers both the server and the per-turn orchestration hooks. For Claude Code
+it also registers or wraps `statusLine` so the hook can read Claude's
+authoritative context percentage without replacing your custom statusline.
+Preview first with `subagent-mcp setup --dry-run`.
 
 ### Restart, Then Turn On The Invariant
 

package/dist/doctor.js

@@ -2,14 +2,14 @@
 // `subagent-mcp doctor` — read-only health check for the installed addon.
 //
 // Diagnoses install completeness, vendor presence, and whether each vendor's
-// wiring (MCP server + hooks) points at THIS install. Doctor self-repairs
+// wiring (MCP server + hooks/statusLine) points at THIS install. Doctor self-repairs
 // missing MCP registrations via vendor CLIs; use `subagent-mcp setup` for
 // config-file and hook repairs.
 //
 // Exit code: 0 = everything healthy, 1 = at least one check failed.
 import { verifyWiring } from "./setup.js";
 export async function runDoctor() {
-    console.log("subagent-mcp doctor (checks wiring; repairs missing MCP registrations via vendor CLIs)\n");
+    console.log("subagent-mcp doctor (checks wiring, including Claude statusLine; repairs missing MCP registrations via vendor CLIs)\n");
     const major = Number(process.versions.node.split(".")[0]);
     console.log(`  ${major >= 18 ? "PASS" : "FAIL"}  node version — ${process.versions.node}` +
         (major >= 18 ? "" : " (Node >= 18 required)"));

package/dist/hooks/orchestration-claude.js

@@ -1,6 +1,7 @@
 import { closeSync, openSync, readFileSync, readSync, realpathSync, statSync, } from "node:fs";
 import { pathToFileURL } from "node:url";
-import { countJsonlType, runHook, TRANSCRIPT_READ_CAP, } from "../orchestration/hook-core.js";
+import { countJsonlType, runHook, sessionKey, TRANSCRIPT_READ_CAP, } from "../orchestration/hook-core.js";
+import { readStatuslineRecord } from "../orchestration/statusline-state.js";
 import { readClaudeLongContextHint } from "../orchestration/settings-hint.js";
 import { hasParentMarker } from "../launch-prompt.js";
 /**
@@ -26,6 +27,11 @@ const SUBAGENT_ENTRYPOINTS = new Set([
 function finiteNumber(value) {
     return typeof value === "number" && Number.isFinite(value);
 }
+function isRealClaudeModel(value) {
+    return (typeof value === "string" &&
+        value.trim() !== "" &&
+        value.trim() !== "<synthetic>");
+}
 function readTranscriptTail(transcriptPath) {
     if (!transcriptPath)
         return null;
@@ -80,12 +86,12 @@ function liftClaudeUsageFromTranscript(transcriptPath) {
                 continue;
             if (msg.type !== "assistant" || !msg.message?.usage)
                 continue;
-            if (typeof msg.message.model !== "string")
-                return null;
+            if (!isRealClaudeModel(msg.message.model))
+                continue;
             const usage = msg.message.usage;
             return {
                 harness: "claude",
-                model: msg.message.model,
+                model: msg.message.model.trim(),
                 source_ref: transcriptPath,
                 usage: {
                     input: finiteNumber(usage.input_tokens) ? usage.input_tokens : 0,
@@ -133,8 +139,18 @@ export const claudeAdapter = {
         const lifted = liftClaudeUsageFromTranscript(transcriptPath);
         if (lifted === null)
             return null;
+        const statusline = readStatuslineRecord(sessionKey(payload), typeof payload.cwd === "string" ? payload.cwd : undefined);
         return {
             ...lifted,
+            harnessPercentage: typeof statusline?.used_percentage === "number" &&
+                Number.isFinite(statusline.used_percentage)
+                ? statusline.used_percentage
+                : null,
+            harnessContextWindow: typeof statusline?.context_window_size === "number" &&
+                Number.isFinite(statusline.context_window_size) &&
+                statusline.context_window_size > 0
+                ? statusline.context_window_size
+                : null,
             longContextHint: readClaudeLongContextHint(payload.cwd, env),
         };
     },

package/dist/hooks/statusline-claude.js

@@ -0,0 +1,126 @@
+import { spawn } from "node:child_process";
+import { pathToFileURL } from "node:url";
+import { realpathSync } from "node:fs";
+import { statuslineRecordFromPayload, writeStatuslineRecord, } from "../orchestration/statusline-state.js";
+function readStdinBuffer() {
+    return new Promise((resolve) => {
+        const chunks = [];
+        process.stdin.on("data", (chunk) => {
+            chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(String(chunk)));
+        });
+        process.stdin.on("end", () => resolve(Buffer.concat(chunks)));
+        process.stdin.on("error", () => resolve(Buffer.concat(chunks)));
+    });
+}
+function parsePayload(raw) {
+    try {
+        const text = raw.toString("utf8");
+        if (!text.trim())
+            return {};
+        const parsed = JSON.parse(text);
+        return parsed && typeof parsed === "object" && !Array.isArray(parsed)
+            ? parsed
+            : {};
+    }
+    catch {
+        return {};
+    }
+}
+function defaultLine(payload) {
+    const model = payload.model && typeof payload.model === "object" && !Array.isArray(payload.model)
+        ? payload.model.display_name
+        : null;
+    const contextWindow = payload.context_window &&
+        typeof payload.context_window === "object" &&
+        !Array.isArray(payload.context_window)
+        ? payload.context_window
+        : {};
+    const label = typeof model === "string" && model.trim()
+        ? model.trim()
+        : "Claude";
+    const pct = typeof contextWindow.used_percentage === "number" &&
+        Number.isFinite(contextWindow.used_percentage)
+        ? ` Ctx:${Math.round(contextWindow.used_percentage)}%`
+        : "";
+    return `${label}${pct}\n`;
+}
+function writeSideChannel(payload) {
+    try {
+        const record = statuslineRecordFromPayload(payload);
+        if (record !== null)
+            writeStatuslineRecord(payload, record);
+    }
+    catch {
+        // Status lines must never fail rendering.
+    }
+}
+const MAX_INNER_STDOUT_BYTES = 64 * 1024;
+function delegate(command, raw, fallback) {
+    return new Promise((resolve) => {
+        const chunks = [];
+        let buffered = 0;
+        let resolved = false;
+        const finish = () => {
+            if (resolved)
+                return;
+            resolved = true;
+            const output = Buffer.concat(chunks, buffered);
+            process.stdout.write(output.toString("utf8").trim() ? output : fallback);
+            resolve();
+        };
+        try {
+            const child = spawn(command, {
+                shell: true,
+                stdio: ["pipe", "pipe", "inherit"],
+            });
+            child.stdout.on("data", (chunk) => {
+                const data = Buffer.isBuffer(chunk) ? chunk : Buffer.from(String(chunk));
+                if (buffered >= MAX_INNER_STDOUT_BYTES)
+                    return;
+                const remaining = MAX_INNER_STDOUT_BYTES - buffered;
+                const stored = data.byteLength <= remaining
+                    ? data
+                    : data.subarray(0, remaining);
+                chunks.push(stored);
+                buffered += stored.byteLength;
+            });
+            child.on("error", () => {
+                if (resolved)
+                    return;
+                resolved = true;
+                process.stdout.write(fallback);
+                resolve();
+            });
+            child.on("close", () => {
+                finish();
+            });
+            child.stdin.end(raw);
+        }
+        catch {
+            process.stdout.write(fallback);
+            resolve();
+        }
+    });
+}
+export async function runStatusline(argv = process.argv.slice(2)) {
+    const raw = await readStdinBuffer();
+    const payload = parsePayload(raw);
+    const fallback = defaultLine(payload);
+    writeSideChannel(payload);
+    const inner = (argv.length === 1 ? argv[0] : argv.join(" ")).trim();
+    if (inner) {
+        await delegate(inner, raw, fallback);
+    }
+    else {
+        process.stdout.write(fallback);
+    }
+}
+const isMain = process.argv[1] !== undefined &&
+    import.meta.url === pathToFileURL(realpathSync(process.argv[1])).href;
+if (isMain) {
+    runStatusline()
+        .catch(() => {
+        process.stdout.write("Claude\n");
+    })
+        .finally(() => process.exit(0));
+}

package/dist/index.js

@@ -572,7 +572,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. launch_agent is code-capped at 2 spawn levels below the main orchestrator: depth 1 may launch depth 2 workers; depth 2 workers cannot spawn further.\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.17",
+    version: "2.12.19",
     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"

package/dist/orchestration/hook-core.js

@@ -7,6 +7,7 @@ import * as reminder from "./reminder.js";
 import * as handoff from "./handoff.js";
 import * as latch from "./latch.js";
 import * as metering from "./metering.js";
+import { sweepHookState } from "./state-sweep.js";
 import * as template from "./template.js";
 import { cullStaleSlots, slotDir, ZOMBIE_FORCE_GRACE_MS, } from "../concurrency.js";
 import { appendUpdateNotice, readInstalledPackageInfo, } from "./update-check.js";
@@ -355,15 +356,17 @@ function updateMeteringForTurn(payload, env, adapter, current, turnIndex) {
             ? payload.hook_event_name
             : "UserPromptSubmit",
         harnessPercentage: lifted.harnessPercentage,
+        harnessContextWindow: lifted.harnessContextWindow,
         longContextHint: lifted.longContextHint,
         priorWindow: prior?.context_window_size ?? null,
         priorWindowSource: prior?.window_source ?? null,
         priorWindowFloor: prior?.window_floor ?? null,
     });
     metering.writeMetering(current, record);
-    // A valid harness-reported percentage stands on its own. Without one, a null
-    // window means the host is undetectable for this turn, even though the record
-    // is still persisted for observability and same-turn fail-safe agreement.
+    // A valid harness-reported percentage stands on its own. Without one, we fall
+    // back to the window: context_window_size is always numeric under the
+    // assumed-default ladder, so the null guard remains as a dead-man fallback only
+    // (the record is still persisted for observability and same-turn fail-safe agreement).
     const hasHarnessPercentage = typeof lifted.harnessPercentage === "number" &&
         Number.isFinite(lifted.harnessPercentage);
     return !hasHarnessPercentage && record.context_window_size === null;
@@ -482,6 +485,7 @@ function appendHookUpdateNotice(out, current, env) {
 export function runHook(payload, env, adapter) {
     try {
         cullHookZombies();
+        sweepHookState();
         if (adapter.isSubagent(payload, env)) {
             return "";
         }

package/dist/orchestration/metering.js

@@ -120,28 +120,53 @@ function maybeApplyLong(candidate, source, long, enabled) {
     }
     return { candidate, source };
 }
-export function resolveContextWindowDetailed(input) {
-    const normalized = normalizeModelId(input.modelId);
-    if (normalized === null) {
-        return { window: null, source: null, window_floor: null, contradiction: false };
-    }
-    const table = loadContextWindowTable();
-    if (table === null) {
-        return { window: null, source: null, window_floor: null, contradiction: false };
+function assumedDefaultResolution(window_floor) {
+    if (window_floor !== null && window_floor > DEFAULT_CONTEXT_WINDOW) {
+        return {
+            window: window_floor,
+            source: "assumed-default+floor",
+            window_floor,
+            contradiction: false,
+        };
     }
+    return {
+        window: DEFAULT_CONTEXT_WINDOW,
+        source: "assumed-default",
+        window_floor,
+        contradiction: false,
+    };
+}
+export function resolveContextWindowDetailed(input) {
     const promptSideTokens = finiteNumber(input.promptSideTokens)
         ? input.promptSideTokens
         : null;
     const priorFloor = usablePriorFloor(input.priorWindow, input.priorWindowSource, input.priorWindowFloor);
     const observedFloor = Math.max(promptSideTokens ?? 0, priorFloor ?? 0);
     const window_floor = observedFloor > 0 ? observedFloor : null;
+    if (finiteNumber(input.harnessContextWindow) &&
+        input.harnessContextWindow > 0) {
+        return {
+            window: input.harnessContextWindow,
+            source: "harness",
+            window_floor,
+            contradiction: false,
+        };
+    }
+    const normalized = normalizeModelId(input.modelId);
+    if (normalized === null) {
+        return assumedDefaultResolution(window_floor);
+    }
+    const table = loadContextWindowTable();
+    if (table === null) {
+        return assumedDefaultResolution(window_floor);
+    }
     if (input.harness === "claude") {
         if (!/^claude-/i.test(normalized.base)) {
-            return { window: null, source: null, window_floor, contradiction: false };
+            return assumedDefaultResolution(window_floor);
         }
         const entry = table.claude[normalized.base] ?? table.family_defaults?.claude ?? null;
         if (entry === null) {
-            return { window: null, source: null, window_floor, contradiction: false };
+            return assumedDefaultResolution(window_floor);
         }
         const mapped = Object.prototype.hasOwnProperty.call(table.claude, normalized.base);
         let candidate = entry.default;
@@ -154,7 +179,7 @@ export function resolveContextWindowDetailed(input) {
                 source = "ratchet";
             }
             else {
-                return { window: null, source: "contradiction", window_floor, contradiction: true };
+                return { window: entry.long ?? entry.default, source: "contradiction", window_floor, contradiction: true };
             }
         }
         if (priorFloor !== null && priorFloor > candidate) {
@@ -163,7 +188,7 @@ export function resolveContextWindowDetailed(input) {
                 source = "prior";
             }
             else {
-                return { window: null, source: "contradiction", window_floor, contradiction: true };
+                return { window: entry.long ?? entry.default, source: "contradiction", window_floor, contradiction: true };
             }
         }
         return { window: candidate, source, window_floor, contradiction: false };
@@ -171,7 +196,7 @@ export function resolveContextWindowDetailed(input) {
     if (input.harness === "codex") {
         const entry = table.codex[normalized.base] ?? null;
         if (entry === null) {
-            return { window: null, source: null, window_floor, contradiction: false };
+            return assumedDefaultResolution(window_floor);
         }
         let candidate = entry.default;
         let source = "mapping";
@@ -182,7 +207,7 @@ export function resolveContextWindowDetailed(input) {
                 source = "ratchet";
             }
             else {
-                return { window: null, source: "contradiction", window_floor, contradiction: true };
+                return { window: entry.long ?? entry.default, source: "contradiction", window_floor, contradiction: true };
             }
         }
         if (priorFloor !== null && priorFloor > candidate) {
@@ -191,12 +216,12 @@ export function resolveContextWindowDetailed(input) {
                 source = "prior";
             }
             else {
-                return { window: null, source: "contradiction", window_floor, contradiction: true };
+                return { window: entry.long ?? entry.default, source: "contradiction", window_floor, contradiction: true };
             }
         }
         return { window: candidate, source, window_floor, contradiction: false };
     }
-    return { window: null, source: null, window_floor, contradiction: false };
+    return assumedDefaultResolution(window_floor);
 }
 export function resolveContextWindow(harness, modelId) {
     return resolveContextWindowDetailed({ harness, modelId }).window;
@@ -232,6 +257,7 @@ export function buildMeteringRecord(input) {
         priorWindow: input.priorWindow,
         priorWindowSource: input.priorWindowSource,
         priorWindowFloor: input.priorWindowFloor,
+        harnessContextWindow: input.harnessContextWindow,
     });
     const used_percentage = computeUsedPercentage({
         context_window_size: resolution.window,

package/dist/orchestration/state-sweep.js

@@ -0,0 +1,79 @@
+import { existsSync, readdirSync, readFileSync, statSync, unlinkSync, writeFileSync, } from "node:fs";
+import { join } from "node:path";
+import { LATCH_REV } from "./latch.js";
+import { stateDir } from "./marker.js";
+import { STATUSLINE_TTL_MS } from "./statusline-state.js";
+export const SWEEP_INTERVAL_MS = 60 * 60 * 1000;
+function finiteNumber(value) {
+    return typeof value === "number" && Number.isFinite(value);
+}
+function readJson(path) {
+    try {
+        return JSON.parse(readFileSync(path, "utf8"));
+    }
+    catch {
+        return null;
+    }
+}
+function staleByRecordOrMtime(path, now) {
+    const parsed = readJson(path);
+    const updated = parsed && typeof parsed === "object"
+        ? parsed.updated_at
+        : null;
+    if (finiteNumber(updated))
+        return now - updated > STATUSLINE_TTL_MS;
+    try {
+        return now - statSync(path).mtimeMs > STATUSLINE_TTL_MS;
+    }
+    catch {
+        return false;
+    }
+}
+function obsoleteLatch(path) {
+    const parsed = readJson(path);
+    if (!parsed || typeof parsed !== "object")
+        return true;
+    const rev = parsed.rev;
+    return !Number.isInteger(rev) || rev < LATCH_REV;
+}
+function deleteBestEffort(path) {
+    try {
+        unlinkSync(path);
+    }
+    catch {
+        // Best-effort sweep. Hooks must never fail host turns.
+    }
+}
+export function sweepHookState(stateDirOverride = stateDir, now = Date.now()) {
+    try {
+        const stamp = join(stateDirOverride, "sweep.stamp");
+        if (existsSync(stamp)) {
+            try {
+                if (now - statSync(stamp).mtimeMs < SWEEP_INTERVAL_MS)
+                    return;
+            }
+            catch {
+                // If the stamp cannot be read, try a sweep and rewrite it.
+            }
+        }
+        for (const name of readdirSync(stateDirOverride)) {
+            const path = join(stateDirOverride, name);
+            if (/^latch-[0-9a-f]{16}\.json$/i.test(name)) {
+                if (obsoleteLatch(path))
+                    deleteBestEffort(path);
+            }
+            else if (/^(ctx|sl)-[0-9a-f]{16}\.json$/i.test(name)) {
+                if (staleByRecordOrMtime(path, now))
+                    deleteBestEffort(path);
+            }
+            else if (/^sl-cwd-[0-9a-f]{16}\.json$/i.test(name)) {
+                if (staleByRecordOrMtime(path, now))
+                    deleteBestEffort(path);
+            }
+        }
+        writeFileSync(stamp, String(now), { encoding: "utf8", mode: 0o600 });
+    }
+    catch {
+        // Best-effort only.
+    }
+}

package/dist/orchestration/statusline-state.js

@@ -0,0 +1,125 @@
+import { existsSync, mkdirSync, readFileSync, } from "node:fs";
+import { join, resolve } from "node:path";
+import { atomicWriteJson } from "./atomic-write.js";
+import { cwdHash, hashKey, stateDir } from "./marker.js";
+export const STATUSLINE_TTL_MS = 24 * 60 * 60 * 1000;
+function finiteNumber(value) {
+    return typeof value === "number" && Number.isFinite(value);
+}
+function normalizePathKey(pathValue) {
+    let p = resolve(pathValue);
+    p = p.replace(/\\/g, "/");
+    if (process.platform === "win32") {
+        p = p.toLowerCase();
+    }
+    if (p.length > 1 && p.endsWith("/")) {
+        p = p.slice(0, -1);
+    }
+    return p;
+}
+export function statuslineSessionKey(payload) {
+    if (typeof payload.session_id === "string" && payload.session_id.length > 0) {
+        return payload.session_id;
+    }
+    if (typeof payload.transcript_path === "string" &&
+        payload.transcript_path.length > 0) {
+        return "tp-" + hashKey(normalizePathKey(payload.transcript_path));
+    }
+    return undefined;
+}
+export function statuslinePathForSession(sessionKey, stateDirOverride = stateDir) {
+    return join(stateDirOverride, "sl-" + hashKey(sessionKey) + ".json");
+}
+export function statuslinePathForCwd(cwd, stateDirOverride = stateDir) {
+    return join(stateDirOverride, "sl-cwd-" + cwdHash(cwd) + ".json");
+}
+function pathForPayload(payload, stateDirOverride = stateDir) {
+    const key = statuslineSessionKey(payload);
+    if (key !== undefined)
+        return statuslinePathForSession(key, stateDirOverride);
+    return typeof payload.cwd === "string" && payload.cwd.length > 0
+        ? statuslinePathForCwd(payload.cwd, stateDirOverride)
+        : null;
+}
+function isStatuslineRecord(value) {
+    if (!value || typeof value !== "object")
+        return false;
+    const record = value;
+    return record.source === "statusline" && finiteNumber(record.updated_at);
+}
+export function writeStatuslineRecord(payload, record, stateDirOverride = stateDir) {
+    try {
+        const path = pathForPayload(payload, stateDirOverride);
+        if (path === null)
+            return false;
+        mkdirSync(stateDirOverride, { recursive: true, mode: 0o700 });
+        atomicWriteJson(path, record, { encoding: "utf8", mode: 0o600 });
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+function readFresh(path, now) {
+    try {
+        if (!existsSync(path))
+            return null;
+        const parsed = JSON.parse(readFileSync(path, "utf8"));
+        if (!isStatuslineRecord(parsed))
+            return null;
+        if (now - parsed.updated_at > STATUSLINE_TTL_MS)
+            return null;
+        return parsed;
+    }
+    catch {
+        return null;
+    }
+}
+export function readStatuslineRecord(sessionKey, cwd, stateDirOverride = stateDir, now = Date.now()) {
+    if (sessionKey !== undefined) {
+        const keyed = readFresh(statuslinePathForSession(sessionKey, stateDirOverride), now);
+        if (keyed !== null)
+            return keyed;
+    }
+    if (cwd !== undefined && cwd.length > 0) {
+        return readFresh(statuslinePathForCwd(cwd, stateDirOverride), now);
+    }
+    return null;
+}
+export function statuslineRecordFromPayload(payload, now = Date.now()) {
+    const contextWindow = payload.context_window &&
+        typeof payload.context_window === "object" &&
+        !Array.isArray(payload.context_window)
+        ? payload.context_window
+        : {};
+    const currentUsage = contextWindow.current_usage &&
+        typeof contextWindow.current_usage === "object" &&
+        !Array.isArray(contextWindow.current_usage)
+        ? contextWindow.current_usage
+        : {};
+    const used = contextWindow.used_percentage;
+    const size = contextWindow.context_window_size;
+    if (!finiteNumber(used) && !finiteNumber(size))
+        return null;
+    return {
+        session_id: typeof payload.session_id === "string" ? payload.session_id : null,
+        used_percentage: finiteNumber(used) ? used : null,
+        context_window_size: finiteNumber(size) ? size : null,
+        usage: {
+            input: finiteNumber(currentUsage.input_tokens)
+                ? currentUsage.input_tokens
+                : 0,
+            output: finiteNumber(currentUsage.output_tokens)
+                ? currentUsage.output_tokens
+                : 0,
+            cache_creation: finiteNumber(currentUsage.cache_creation_input_tokens)
+                ? currentUsage.cache_creation_input_tokens
+                : 0,
+            cache_read: finiteNumber(currentUsage.cache_read_input_tokens)
+                ? currentUsage.cache_read_input_tokens
+                : 0,
+        },
+        updated_at: now,
+        source: "statusline",
+    };
+}

package/dist/setup.js

@@ -16,11 +16,13 @@
 //   - Every config file is backed up before its first edit.
 //   - Failures never abort the run: they are collected and reported at the end
 //     with a copy-paste repair prompt the user can hand to Claude/Codex.
-import { existsSync, readFileSync, writeFileSync, copyFileSync, mkdirSync, } from "node:fs";
+import { existsSync, readFileSync, writeFileSync, copyFileSync, mkdirSync, readdirSync, statSync, } from "node:fs";
 import { homedir } from "node:os";
 import { join, dirname, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import { execFileSync, execSync } from "node:child_process";
+import { stateDir } from "./orchestration/marker.js";
+import { STATUSLINE_TTL_MS } from "./orchestration/statusline-state.js";
 const cliArgs = process.argv.slice(3); // argv[2]='setup', flags start at [3]
 const DRY_RUN = cliArgs.includes("--dry-run");
 export const SERVER_NAME = "subagent-mcp";
@@ -35,9 +37,49 @@ export function serverPaths(root = INSTALL_ROOT) {
         server: `${f}/dist/index.js`,
         claudeHook: `${f}/dist/hooks/orchestration-claude.js`,
         claudePreToolHook: `${f}/dist/hooks/orchestration-claude-pretool.js`,
+        claudeStatuslineHook: `${f}/dist/hooks/statusline-claude.js`,
         codexHook: `${f}/dist/hooks/orchestration-codex.js`,
     };
 }
+function statuslineCommand(shimPath, innerCommand = "") {
+    const inner = innerCommand.trim();
+    return `node "${shimPath}"${inner ? ` ${quoteStatuslineInnerArg(inner)}` : ""}`;
+}
+function quoteStatuslineInnerArg(command) {
+    if (process.platform === "win32") {
+        return JSON.stringify(command);
+    }
+    return `'${command.replace(/'/g, "'\\''")}'`;
+}
+function extractStatuslineInner(command) {
+    const marker = "statusline-claude.js";
+    const idx = command.indexOf(marker);
+    if (idx < 0)
+        return null;
+    let restStart = idx + marker.length;
+    if (command[restStart] === "\"")
+        restStart++;
+    const rest = command.slice(restStart).trim();
+    return unquoteStatuslineInnerArg(rest);
+}
+function unquoteStatuslineInnerArg(arg) {
+    if (!arg)
+        return arg;
+    if (process.platform === "win32" && arg.startsWith("\"")) {
+        try {
+            const parsed = JSON.parse(arg);
+            if (typeof parsed === "string")
+                return parsed;
+        }
+        catch {
+            return arg;
+        }
+    }
+    if (process.platform !== "win32" && arg.startsWith("'") && arg.endsWith("'")) {
+        return arg.slice(1, -1).replace(/'\\''/g, "'");
+    }
+    return arg;
+}
 /**
  * Pure-node PATH lookup. `where`/`which` are not guaranteed to exist (minimal
  * containers, stripped distros), so scan PATH ourselves. On win32, PATHEXT
@@ -67,7 +109,7 @@ export function findOnPath(cmd, env = process.env, platform = process.platform)
  * orchestration-claude.js at any OTHER path/shape -> repaired (rewritten to the
  * canonical exec form). Absent -> added. Unrelated hooks are never touched.
  */
-export function reconcileClaudeSettings(s, hookPath, preToolHookPath = hookPath.replace(/orchestration-claude\.js$/, "orchestration-claude-pretool.js")) {
+export function reconcileClaudeSettings(s, hookPath, preToolHookPath = hookPath.replace(/orchestration-claude\.js$/, "orchestration-claude-pretool.js"), statuslineHookPath = hookPath.replace(/orchestration-claude\.js$/, "statusline-claude.js")) {
     const hooksBlock = (s.hooks ?? {});
     s.hooks = hooksBlock;
     const reconcile = (event, scriptName, desired) => {
@@ -103,12 +145,40 @@ export function reconcileClaudeSettings(s, hookPath, preToolHookPath = hookPath.
         args: [preToolHookPath],
         timeout: 5,
     });
-    const status = prompt.status === "repaired" || pretool.status === "repaired"
+    const statusline = reconcileClaudeStatusLine(s, statuslineHookPath);
+    const status = prompt.status === "repaired" || pretool.status === "repaired" || statusline.status === "repaired"
         ? "repaired"
-        : prompt.status === "added" || pretool.status === "added"
+        : prompt.status === "added" || pretool.status === "added" || statusline.status === "added"
             ? "added"
             : "ok";
-    return { changed: prompt.changed || pretool.changed, status };
+    return { changed: prompt.changed || pretool.changed || statusline.changed, status };
+}
+export function reconcileClaudeStatusLine(s, statuslineHookPath) {
+    const current = s.statusLine;
+    const currentCommand = current && typeof current === "object" && !Array.isArray(current) &&
+        typeof current.command === "string"
+        ? current.command
+        : typeof current === "string"
+            ? current
+            : null;
+    const inner = currentCommand !== null ? extractStatuslineInner(currentCommand) : null;
+    const desired = {
+        type: "command",
+        command: statuslineCommand(statuslineHookPath, inner ?? currentCommand ?? ""),
+    };
+    if (currentCommand === null) {
+        s.statusLine = desired;
+        return { changed: true, status: "added" };
+    }
+    if (current &&
+        typeof current === "object" &&
+        !Array.isArray(current) &&
+        current.type === desired.type &&
+        current.command === desired.command) {
+        return { changed: false, status: "ok" };
+    }
+    s.statusLine = desired;
+    return { changed: true, status: "repaired" };
 }
 /**
  * Reconcile the user-scope MCP server entry in a parsed ~/.claude.json.
@@ -230,6 +300,7 @@ export function verifyInstall(root = INSTALL_ROOT) {
         "dist/global-subagent-mcp-config.jsonc",
         "dist/hooks/orchestration-claude.js",
         "dist/hooks/orchestration-claude-pretool.js",
+        "dist/hooks/statusline-claude.js",
         "dist/hooks/orchestration-codex.js",
         "directives/carryover-claude.md",
         "directives/carryover-codex.md",
@@ -382,7 +453,8 @@ function repairPromptFor(vendor, problem) {
             `the global bin shim "subagent-mcp" (use 'claude mcp add subagent-mcp subagent-mcp -s user' or edit the mcpServers ` +
             `key in ~/.claude.json), and (2) ensure ~/.claude/settings.json has ` +
             `hooks.UserPromptSubmit -> {type:"command", command:"node", args:["${p.claudeHook}"]} and ` +
-            `hooks.PreToolUse -> {type:"command", command:"node", args:["${p.claudePreToolHook}"], timeout:5}. ` +
+            `hooks.PreToolUse -> {type:"command", command:"node", args:["${p.claudePreToolHook}"], timeout:5}, and ` +
+            `statusLine -> {type:"command", command:"node \\"${p.claudeStatuslineHook}\\""}. ` +
             `Back up any file before editing it.`);
     }
     return (`subagent-mcp setup hit a problem on my machine: ${problem}. ` +
@@ -563,6 +635,21 @@ export function registrationDetail(registered, attemptedRepair) {
         ? "not registered; CLI repair failed"
         : "not registered — run: subagent-mcp doctor";
 }
+export function hasRecentStatuslineSignal(stateDirOverride = stateDir, now = Date.now()) {
+    try {
+        for (const name of readdirSync(stateDirOverride)) {
+            if (!/^sl-(?:cwd-)?[0-9a-f]{16}\.json$/i.test(name))
+                continue;
+            const stat = statSync(join(stateDirOverride, name));
+            if (now - stat.mtimeMs <= STATUSLINE_TTL_MS)
+                return true;
+        }
+    }
+    catch {
+        return false;
+    }
+    return false;
+}
 function checkCliRegistration(cli, addArgs, repair, deps = defaultExecDeps) {
     let registered = registeredViaCli(cli, deps);
     let attemptedRepair = false;
@@ -599,6 +686,16 @@ export function verifyWiring(root = INSTALL_ROOT, repair = false) {
             ok: hk.status === "ok",
             detail: hk.status === "ok" ? "wired" : `${hk.status === "repaired" ? "stale path" : "not wired"} - run: subagent-mcp setup`,
         });
+        const sl = reconcileClaudeStatusLine(sj, p.claudeStatuslineHook);
+        results.push({
+            label: "claude: statusLine",
+            ok: sl.status === "ok",
+            detail: sl.status === "ok"
+                ? hasRecentStatuslineSignal()
+                    ? "wired; signal live"
+                    : "wired; waiting for Claude statusLine signal"
+                : `${sl.status === "repaired" ? "stale path" : "not wired"} - run: subagent-mcp setup`,
+        });
     }
     else if (hasClaudeConfig) {
         const cj = readJson(join(home, ".claude.json"), {});
@@ -615,6 +712,16 @@ export function verifyWiring(root = INSTALL_ROOT, repair = false) {
             ok: hk.status === "ok",
             detail: hk.status === "ok" ? "wired" : `${hk.status === "repaired" ? "stale path" : "not wired"} - run: subagent-mcp setup`,
         });
+        const sl = reconcileClaudeStatusLine(sj, p.claudeStatuslineHook);
+        results.push({
+            label: "claude: statusLine",
+            ok: sl.status === "ok",
+            detail: sl.status === "ok"
+                ? hasRecentStatuslineSignal()
+                    ? "wired; signal live"
+                    : "wired; waiting for Claude statusLine signal"
+                : `${sl.status === "repaired" ? "stale path" : "not wired"} - run: subagent-mcp setup`,
+        });
     }
     const hasCodexCli = findOnPath("codex") !== null;
     const hasCodex = hasCodexCli || existsSync(join(home, ".codex"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@heretyc/subagent-mcp",
-  "version": "2.12.17",
+  "version": "2.12.19",
   "description": "MCP server that launches and manages always-interactive Claude Code and Codex sub-agent sessions (no direct Anthropic/OpenAI API).",
   "keywords": [
     "mcp",
@@ -39,7 +39,7 @@
     "postinstall": "node scripts/postinstall.mjs",
     "prepare": "npm run build",
     "prepublishOnly": "npm test",
-    "test": "npm run check:versions && npm run check:prose && 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/atomic-write.test.mjs && node test/zombie.test.mjs && node test/zombie-reap-idle.test.mjs && node test/orchestration-marker.test.mjs && node test/orchestration-metering.test.mjs && node test/orchestration-latch.test.mjs && node test/orchestration-handoff.test.mjs && node test/orchestration-template.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-200-line-footprint.test.mjs && node test/no-per-provider-cap.test.mjs && node test/no-api-keys.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/handoff-resume-skill.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 scripts/validate_context_windows.mjs && node test/seed-sites.test.mjs && node test/config-bom.test.mjs && node test/permission-system.test.mjs && node test/lifecycle-matrix.test.mjs && node test/output-hook-registration.test.mjs && node test/mcp-compliance.test.mjs"
+    "test": "npm run check:versions && npm run check:prose && 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/atomic-write.test.mjs && node test/zombie.test.mjs && node test/zombie-reap-idle.test.mjs && node test/orchestration-marker.test.mjs && node test/orchestration-metering.test.mjs && node test/orchestration-latch.test.mjs && node test/orchestration-handoff.test.mjs && node test/orchestration-template.test.mjs && node test/orchestration-hook-core.test.mjs && node test/orchestration-adapters.test.mjs && node test/statusline-claude.test.mjs && node test/orchestration-sweep.test.mjs && node test/orchestration-pretool.test.mjs && node test/orchestration-directives.test.mjs && node test/no-five-call.test.mjs && node test/no-200-line-footprint.test.mjs && node test/no-per-provider-cap.test.mjs && node test/no-api-keys.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/handoff-resume-skill.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 scripts/validate_context_windows.mjs && node test/seed-sites.test.mjs && node test/config-bom.test.mjs && node test/permission-system.test.mjs && node test/lifecycle-matrix.test.mjs && node test/output-hook-registration.test.mjs && node test/mcp-compliance.test.mjs"
   },
   "author": "Lexi Blackburn",
   "license": "Apache-2.0",