@heretyc/subagent-mcp 2.12.17 → 2.12.18

package/dist/hooks/orchestration-claude.js

@@ -26,6 +26,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 +85,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,
@@ -97,6 +102,9 @@ function liftClaudeUsageFromTranscript(transcriptPath) {
                         ? usage.cache_read_input_tokens
                         : 0,
                 },
+                // Claude Code statusline receives context_window.used_percentage on its
+                // own stdin payload. Recent hook transcripts do not expose that object,
+                // so this adapter cannot pass it through without a hook-readable signal.
                 harnessPercentage: null,
             };
         }

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.18",
     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

@@ -361,9 +361,10 @@ function updateMeteringForTurn(payload, env, adapter, current, turnIndex) {
         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;

package/dist/orchestration/metering.js

@@ -120,28 +120,44 @@ 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;
+    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 +170,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 +179,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 +187,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 +198,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 +207,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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@heretyc/subagent-mcp",
-  "version": "2.12.17",
+  "version": "2.12.18",
   "description": "MCP server that launches and manages always-interactive Claude Code and Codex sub-agent sessions (no direct Anthropic/OpenAI API).",
   "keywords": [
     "mcp",