@heretyc/subagent-mcp 2.12.15 → 2.12.17

package/dist/context-windows.json

@@ -0,0 +1,37 @@
+{
+  "schema_version": 1,
+  "generated": "2026-07-13",
+  "notes": "Windows are harness-effective defaults. claude.default is the Claude Code standard tier; claude.long is the [1m] tier where available. codex defaults are effective usable windows matching rollout model_context_window when no per-turn harness value is present.",
+  "_comment": "Effective-basis rule: every codex window (default AND long) is stated as the effective usable window = raw_window * 0.95. codex.default 258400 = 272000*0.95; codex.long 950000 = 1000000*0.95. Pairing effective defaults with a raw 1000000 long previously under-stated ratcheted sessions ~5%; both tiers must share the effective basis so percentages stay consistent across a ratchet.",
+  "family_defaults": {
+    "claude": { "default": 200000, "long": 1000000 }
+  },
+  "claude": {
+    "claude-fable-5": { "default": 200000, "long": 1000000 },
+    "claude-mythos-5": { "default": 200000, "long": 1000000 },
+    "claude-sonnet-5": { "default": 200000, "long": 1000000 },
+    "claude-sonnet-4-6": { "default": 200000, "long": 1000000 },
+    "claude-sonnet-4-5": { "default": 200000, "long": 1000000 },
+    "claude-sonnet-4-0": { "default": 200000, "long": 1000000 },
+    "claude-opus-4-8": { "default": 200000, "long": 1000000 },
+    "claude-opus-4-7": { "default": 200000, "long": 1000000 },
+    "claude-opus-4-6": { "default": 200000, "long": 1000000 },
+    "claude-opus-4-5": { "default": 200000, "long": 1000000 },
+    "claude-opus-4-1": { "default": 200000, "long": 1000000 },
+    "claude-opus-4-0": { "default": 200000, "long": 1000000 },
+    "claude-haiku-4-5": { "default": 200000, "long": null }
+  },
+  "codex": {
+    "gpt-5.5": { "default": 258400, "long": null },
+    "gpt-5.4": { "default": 258400, "long": 950000 },
+    "gpt-5.4-mini": { "default": 258400, "long": null },
+    "gpt-5.3-codex-spark": { "default": 121600, "long": null },
+    "gpt-5.2-codex": { "default": 258400, "long": null },
+    "gpt-5-codex": { "default": 258400, "long": null },
+    "gpt-5": { "default": 258400, "long": null },
+    "codex-auto-review": { "default": 258400, "long": 950000 },
+    "o3": { "default": 200000, "long": null },
+    "o3-mini": { "default": 200000, "long": null },
+    "o4-mini": { "default": 200000, "long": null }
+  }
+}

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 { readClaudeLongContextHint } from "../orchestration/settings-hint.js";
 import { hasParentMarker } from "../launch-prompt.js";
 /**
  * Claude Code UserPromptSubmit hook entry. Reads the JSON payload from stdin,
@@ -75,6 +76,8 @@ function liftClaudeUsageFromTranscript(transcriptPath) {
             continue;
         try {
             const msg = JSON.parse(trimmed);
+            if (msg.isSidechain === true)
+                continue;
             if (msg.type !== "assistant" || !msg.message?.usage)
                 continue;
             if (typeof msg.message.model !== "string")
@@ -126,8 +129,14 @@ export const claudeAdapter = {
     currentTurn(transcriptPath) {
         return countJsonlType(transcriptPath, "user");
     },
-    liftUsage(_payload, _env, transcriptPath) {
-        return liftClaudeUsageFromTranscript(transcriptPath);
+    liftUsage(payload, env, transcriptPath) {
+        const lifted = liftClaudeUsageFromTranscript(transcriptPath);
+        if (lifted === null)
+            return null;
+        return {
+            ...lifted,
+            longContextHint: readClaudeLongContextHint(payload.cwd, env),
+        };
     },
     anonScope: "claude",
     fullDirectiveFile: "orchestration-claude.md",

package/dist/hooks/orchestration-codex.js

@@ -2,7 +2,6 @@ import { closeSync, openSync, readFileSync, readSync, realpathSync, statSync, }
 import { pathToFileURL } from "node:url";
 import { claimAndEmit, classifyOwnerClaim, computeEffectiveActive, countJsonlType, cullHookZombies, ownerKey, runHook, TRANSCRIPT_READ_CAP, } from "../orchestration/hook-core.js";
 import * as marker from "../orchestration/marker.js";
-import { resolveContextWindow, } from "../orchestration/metering.js";
 import { isParentProcessMarkerFirstLine } from "../launch-prompt.js";
 /**
  * Codex CLI hook entry. Branches on payload.hook_event_name:
@@ -85,6 +84,25 @@ function stringField(value, key) {
     const child = value[key];
     return typeof child === "string" ? child : null;
 }
+function isSubagentSourceObject(source) {
+    if (!source || typeof source !== "object")
+        return false;
+    const record = source;
+    if (Object.prototype.hasOwnProperty.call(record, "subagent")) {
+        return true;
+    }
+    for (const kind of SUBAGENT_SOURCE_STRINGS) {
+        if (Object.prototype.hasOwnProperty.call(record, kind)) {
+            return true;
+        }
+    }
+    // Local Codex rollouts did not verify the subagent object schema. Accept the
+    // known subagent kind strings if Codex places them in a discriminator field.
+    const kind = record.kind;
+    const type = record.type;
+    return ((typeof kind === "string" && SUBAGENT_SOURCE_STRINGS.has(kind)) ||
+        (typeof type === "string" && SUBAGENT_SOURCE_STRINGS.has(type)));
+}
 function isTokenCountLine(obj) {
     if (obj.type === "token_count")
         return true;
@@ -134,6 +152,7 @@ function liftCodexUsageFromRollout(transcriptPath) {
     if (!finiteNumber(input) || !finiteNumber(output) || !finiteNumber(cacheRead)) {
         return null;
     }
+    const nonCachedInput = Math.max(0, input - cacheRead);
     const modelContextWindow = latestTokenInfo?.model_context_window;
     const totalTokens = total.total_tokens;
     const harnessPercentage = finiteNumber(modelContextWindow) &&
@@ -141,15 +160,17 @@ function liftCodexUsageFromRollout(transcriptPath) {
         finiteNumber(totalTokens)
         ? (totalTokens / modelContextWindow) * 100
         : null;
-    if (harnessPercentage === null && resolveContextWindow("codex", latestModel) === null) {
-        return null;
-    }
+    // Always return the lift even when neither a harness percentage nor a static
+    // window is available (unknown codex model). hook-core is the sole writer and
+    // persists a null-window "unknown + fail-safe" metering record — matching the
+    // Claude adapter, which likewise never suppresses the record on unresolved
+    // windows. Suppressing here would leave unknown codex models with NO record.
     return {
         harness: "codex",
         model: latestModel,
         source_ref: transcriptPath,
         usage: {
-            input,
+            input: nonCachedInput,
             output,
             cache_creation: 0,
             cache_read: cacheRead,
@@ -164,11 +185,9 @@ export const codexAdapter = {
             return true;
         }
         const source = payload.source;
-        // 0.131+: source is an object whose keys name the subagent kind.
-        if (source && typeof source === "object") {
-            if (Object.prototype.hasOwnProperty.call(source, "subagent")) {
-                return true;
-            }
+        // 0.131+: source may be an object whose keys name the subagent kind.
+        if (isSubagentSourceObject(source)) {
+            return true;
         }
         // Older: source is a string enum.
         if (typeof source === "string" && SUBAGENT_SOURCE_STRINGS.has(source)) {

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.15",
+    version: "2.12.17",
     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

@@ -1,6 +1,7 @@
 import { closeSync, existsSync, openSync, readFileSync, readSync, statSync, } from "node:fs";
+import { homedir } from "node:os";
 import { fileURLToPath } from "node:url";
-import { dirname, isAbsolute, join } from "node:path";
+import { dirname, isAbsolute, join, resolve } from "node:path";
 import * as marker from "./marker.js";
 import * as reminder from "./reminder.js";
 import * as handoff from "./handoff.js";
@@ -38,11 +39,14 @@ const OWNER_CLAIM_CAP = 8;
 /**
  * Resolve the repo-root `directives/` dir at runtime. Honors an explicit plugin
  * root (Claude sets CLAUDE_PLUGIN_ROOT; a generic PLUGIN_ROOT is also accepted)
- * so the bundled plugin finds its assets wherever it is installed. Otherwise we
- * walk up from the COMPILED file location: dist/hooks/<x>.js -> ../../directives
- * === <repoRoot>/directives.
+ * so the bundled plugin finds its assets wherever it is installed, but only
+ * when that root is under an expected install prefix. Otherwise we walk up from
+ * the COMPILED file location: dist/hooks/<x>.js -> ../../directives ===
+ * <repoRoot>/directives.
  */
 export function resolveDirectivesDir(env) {
+    const here = dirname(fileURLToPath(import.meta.url));
+    const compiledRoot = resolve(here, "..", "..");
     const rootEnvName = env.CLAUDE_PLUGIN_ROOT !== undefined
         ? "CLAUDE_PLUGIN_ROOT"
         : env.PLUGIN_ROOT !== undefined
@@ -51,17 +55,57 @@ export function resolveDirectivesDir(env) {
     if (rootEnvName) {
         const root = env[rootEnvName] ?? "";
         const directivesDir = join(root, "directives");
-        if (!isAbsolute(root) || !existsSync(directivesDir)) {
-            throw new Error(`${rootEnvName} must be an absolute path with an existing directives directory: ${root}`);
+        if (isAbsolute(root) &&
+            existsSync(directivesDir) &&
+            isTrustedPluginRoot(root, env, compiledRoot)) {
+            return directivesDir;
         }
-        return directivesDir;
     }
-    const here = dirname(fileURLToPath(import.meta.url));
     // Compiled location is dist/orchestration/hook-core.js, so ../../directives
     // is the repo root's directives dir; the entry shims live at dist/hooks/<x>.js
     // and import this module, but __dirname here is the hook-core module's own
     // dir. Two levels up from dist/orchestration is the repo root either way.
-    return join(here, "..", "..", "directives");
+    return join(compiledRoot, "directives");
+}
+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;
+}
+function isPathUnder(pathValue, prefix) {
+    const child = normalizePathKey(pathValue);
+    const parent = normalizePathKey(prefix);
+    return child === parent || child.startsWith(parent + "/");
+}
+function installPrefixes(env, compiledRoot) {
+    const prefixes = [
+        compiledRoot,
+        env.npm_config_prefix,
+        env.PREFIX,
+        process.env.npm_config_prefix,
+        process.env.PREFIX,
+        process.platform === "win32" && env.APPDATA ? join(env.APPDATA, "npm") : undefined,
+        process.platform === "win32" && process.env.APPDATA
+            ? join(process.env.APPDATA, "npm")
+            : undefined,
+        join(dirname(process.execPath), ".."),
+        join(homedir(), ".claude", "plugins"),
+        join(homedir(), ".codex", "plugins", "cache"),
+        join(homedir(), ".codex", "plugins"),
+    ];
+    return [...new Set(prefixes.filter((p) => typeof p === "string" && p.length > 0))];
+}
+function isTrustedPluginRoot(root, env, compiledRoot) {
+    // Trust assumption: env roots are host-controlled only after they resolve
+    // under the package install, npm global prefix, or known plugin cache roots.
+    const resolvedRoot = resolve(root);
+    return installPrefixes(env, compiledRoot).some((prefix) => isPathUnder(resolvedRoot, prefix));
 }
 /** Read a directive asset by filename. On ANY failure return '' (fail-safe). */
 export function readDirective(env, fileName) {
@@ -171,7 +215,9 @@ export function sessionKey(payload) {
     }
     if (typeof payload.transcript_path === "string" &&
         payload.transcript_path.length > 0) {
-        return "tp-" + marker.hashKey(payload.transcript_path);
+        // Residual caveat: a genuinely moved transcript still re-keys. Prefer the
+        // host session_id when present, which remains the precedence above.
+        return "tp-" + marker.hashKey(normalizePathKey(payload.transcript_path));
     }
     return undefined;
 }
@@ -298,16 +344,7 @@ function updateMeteringForTurn(payload, env, adapter, current, turnIndex) {
     const lifted = adapter.liftUsage(payload, env, payload.transcript_path);
     if (lifted === null)
         return true;
-    // A valid harness-reported percentage stands on its own: it does not require
-    // the static model->window map, so an unknown model is NOT undetectable when a
-    // percentage was supplied. Only fall back to requiring window resolution when
-    // no harness percentage is available.
-    const hasHarnessPercentage = typeof lifted.harnessPercentage === "number" &&
-        Number.isFinite(lifted.harnessPercentage);
-    if (!hasHarnessPercentage &&
-        metering.resolveContextWindow(lifted.harness, lifted.model) === null) {
-        return true;
-    }
+    const prior = metering.readMetering(current);
     const record = metering.buildMeteringRecord({
         session_id: current,
         harness: lifted.harness,
@@ -318,9 +355,18 @@ function updateMeteringForTurn(payload, env, adapter, current, turnIndex) {
             ? payload.hook_event_name
             : "UserPromptSubmit",
         harnessPercentage: lifted.harnessPercentage,
+        longContextHint: lifted.longContextHint,
+        priorWindow: prior?.context_window_size ?? null,
+        priorWindowSource: prior?.window_source ?? null,
+        priorWindowFloor: prior?.window_floor ?? null,
     });
     metering.writeMetering(current, record);
-    return false;
+    // 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.
+    const hasHarnessPercentage = typeof lifted.harnessPercentage === "number" &&
+        Number.isFinite(lifted.harnessPercentage);
+    return !hasHarnessPercentage && record.context_window_size === null;
 }
 function providerDirectiveFile(adapter, prefix) {
     return `${prefix}-${adapter.anonScope}.md`;

package/dist/orchestration/latch.js

@@ -2,6 +2,7 @@ import { mkdirSync, readFileSync, unlinkSync, } from "node:fs";
 import { join } from "node:path";
 import { atomicWriteJson } from "./atomic-write.js";
 import { hashKey, stateDir } from "./marker.js";
+export const LATCH_REV = 2;
 export function latchPath(sessionKey) {
     return join(stateDir, `latch-${hashKey(sessionKey)}.json`);
 }
@@ -10,10 +11,20 @@ export function isLatchActive(sessionKey, now) {
     try {
         const raw = readFileSync(latchPath(sessionKey), "utf8");
         const parsed = JSON.parse(raw);
-        return (parsed.latched === true &&
+        const active = parsed.rev === LATCH_REV &&
+            parsed.latched === true &&
             typeof parsed.latched_at === "number" &&
             Number.isFinite(parsed.latched_at) &&
-            typeof parsed.session_id === "string");
+            typeof parsed.session_id === "string";
+        if (!active) {
+            try {
+                unlinkSync(latchPath(sessionKey));
+            }
+            catch {
+                // Best-effort lazy migration cleanup.
+            }
+        }
+        return active;
     }
     catch {
         return false;
@@ -25,6 +36,7 @@ export function tripLatch(sessionKey, now) {
     try {
         mkdirSync(stateDir, { recursive: true, mode: 0o700 });
         atomicWriteJson(latchPath(sessionKey), {
+            rev: LATCH_REV,
             latched: true,
             latched_at: now,
             session_id: sessionKey,

package/dist/orchestration/metering.js

@@ -1,43 +1,93 @@
 import { existsSync, mkdirSync, readFileSync, unlinkSync, } from "node:fs";
 import { join } from "node:path";
+import { fileURLToPath } from "node:url";
 import { atomicWriteJson } from "./atomic-write.js";
 import { hashKey, ORCH_DISABLE_TTL_MS, stateDir, } from "./marker.js";
 export const PLAN_LATCH_THRESHOLD_PCT = 15;
 export const HANDOFF_UNLOCK_THRESHOLD_PCT = 50;
 export const DEFAULT_CONTEXT_WINDOW = 200000;
 export const LONG_CONTEXT_WINDOW = 1000000;
-export const CODEX_KNOWN_MODEL_IDS = [
-    "gpt-5",
-    "gpt-5-codex",
-    "gpt-5.5",
-    "o3",
-    "o3-mini",
-    "o4-mini",
-];
-export const CODEX_CONTEXT_WINDOW_BY_MODEL_ID = {
-    "gpt-5": DEFAULT_CONTEXT_WINDOW,
-    "gpt-5-codex": DEFAULT_CONTEXT_WINDOW,
-    "gpt-5.5": DEFAULT_CONTEXT_WINDOW,
-    o3: DEFAULT_CONTEXT_WINDOW,
-    "o3-mini": DEFAULT_CONTEXT_WINDOW,
-    "o4-mini": DEFAULT_CONTEXT_WINDOW,
-};
-export const CLAUDE_CONTEXT_WINDOW_BY_KIND = {
-    default: DEFAULT_CONTEXT_WINDOW,
-    long: LONG_CONTEXT_WINDOW,
-};
 const EMPTY_USAGE = {
     input: 0,
     output: 0,
     cache_creation: 0,
     cache_read: 0,
 };
+let cachedWindowTable;
+let contextWindowsPathOverride = null;
 function finiteNumber(value) {
     return typeof value === "number" && Number.isFinite(value);
 }
+function isPositiveInteger(value) {
+    return Number.isInteger(value) && value > 0;
+}
+function isContextWindowEntry(value) {
+    if (!value || typeof value !== "object" || Array.isArray(value))
+        return false;
+    const record = value;
+    return (isPositiveInteger(record.default) &&
+        (record.long === null ||
+            (isPositiveInteger(record.long) && record.long > record.default)));
+}
+function isContextWindowMap(value) {
+    if (!value || typeof value !== "object" || Array.isArray(value))
+        return false;
+    return Object.values(value).every(isContextWindowEntry);
+}
+function isContextWindowTable(value) {
+    if (!value || typeof value !== "object" || Array.isArray(value))
+        return false;
+    const record = value;
+    const familyDefaults = record.family_defaults;
+    const claudeFamilyDefault = !familyDefaults ||
+        (typeof familyDefaults === "object" &&
+            familyDefaults !== null &&
+            !Array.isArray(familyDefaults) &&
+            familyDefaults?.claude !== undefined &&
+            isContextWindowEntry(familyDefaults?.claude));
+    return (record.schema_version === 1 &&
+        claudeFamilyDefault &&
+        isContextWindowMap(record.claude) &&
+        isContextWindowMap(record.codex));
+}
+function contextWindowsPath() {
+    return (contextWindowsPathOverride ??
+        fileURLToPath(new URL("../context-windows.json", import.meta.url)));
+}
+export function setContextWindowsPathForTest(path) {
+    contextWindowsPathOverride = path;
+    cachedWindowTable = undefined;
+}
+function loadContextWindowTable() {
+    if (cachedWindowTable !== undefined)
+        return cachedWindowTable;
+    try {
+        const parsed = JSON.parse(readFileSync(contextWindowsPath(), "utf8").replace(/^\uFEFF/, ""));
+        cachedWindowTable = isContextWindowTable(parsed) ? parsed : null;
+    }
+    catch {
+        cachedWindowTable = null;
+    }
+    return cachedWindowTable;
+}
+export function normalizeModelId(modelId) {
+    if (typeof modelId !== "string")
+        return null;
+    let base = modelId.trim().toLowerCase();
+    if (!base)
+        return null;
+    let idMarker = /\[1m\]/i.test(base) || /-1m\b/i.test(base);
+    base = base.replace(/\[[^\]]+\]/g, "");
+    base = base.replace(/-1m\b/g, "");
+    const dated = base.replace(/-(20\d{6})$/, "");
+    base = dated;
+    if (!base)
+        return null;
+    return { base, idMarker };
+}
 function normalizeUsage(usage) {
     if (usage === null || usage === undefined) {
-        return { usage: { ...EMPTY_USAGE }, used_tokens: null };
+        return { usage: { ...EMPTY_USAGE }, used_tokens: null, prompt_side_tokens: null };
     }
     const normalized = {
         input: finiteNumber(usage.input) ? usage.input : 0,
@@ -51,35 +101,111 @@ function normalizeUsage(usage) {
             normalized.output +
             normalized.cache_creation +
             normalized.cache_read,
+        prompt_side_tokens: normalized.input + normalized.cache_creation + normalized.cache_read,
     };
 }
-export function resolveContextWindow(harness, modelId) {
-    if (!modelId)
-        return null;
-    if (harness === "claude") {
-        if (!/^claude-/i.test(modelId))
-            return null;
-        if (/\[1m\]/i.test(modelId))
-            return LONG_CONTEXT_WINDOW;
-        return DEFAULT_CONTEXT_WINDOW;
+function usablePriorFloor(priorWindow, priorSource, priorWindowFloor) {
+    // The monotonic floor tracks the highest OBSERVED prompt-side token count,
+    // never the resolved window size. window_source gating lives in how
+    // priorWindowFloor is produced: hint-only turns record their observed tokens
+    // (not the 1M hint window), so a hint window never becomes sticky, while a
+    // ratcheted/prior turn carries the real observed floor forward.
+    void priorWindow;
+    void priorSource;
+    return finiteNumber(priorWindowFloor) ? priorWindowFloor : null;
+}
+function maybeApplyLong(candidate, source, long, enabled) {
+    if (enabled && long !== null && candidate < long) {
+        return { candidate: long, source: "hint" };
     }
-    if (harness === "codex") {
-        if (!CODEX_KNOWN_MODEL_IDS.includes(modelId)) {
-            return null;
+    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 };
+    }
+    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 (input.harness === "claude") {
+        if (!/^claude-/i.test(normalized.base)) {
+            return { window: null, source: null, window_floor, contradiction: false };
+        }
+        const entry = table.claude[normalized.base] ?? table.family_defaults?.claude ?? null;
+        if (entry === null) {
+            return { window: null, source: null, window_floor, contradiction: false };
         }
-        if (/-1m\b|\[1m\]/i.test(modelId))
-            return LONG_CONTEXT_WINDOW;
-        return CODEX_CONTEXT_WINDOW_BY_MODEL_ID[modelId];
+        const mapped = Object.prototype.hasOwnProperty.call(table.claude, normalized.base);
+        let candidate = entry.default;
+        let source = mapped ? "mapping" : "family-default";
+        const hinted = normalized.idMarker || input.longContextHint === true;
+        ({ candidate, source } = maybeApplyLong(candidate, source, entry.long, hinted));
+        if (promptSideTokens !== null && promptSideTokens > candidate) {
+            if (entry.long !== null && promptSideTokens <= entry.long) {
+                candidate = entry.long;
+                source = "ratchet";
+            }
+            else {
+                return { window: null, source: "contradiction", window_floor, contradiction: true };
+            }
+        }
+        if (priorFloor !== null && priorFloor > candidate) {
+            if (entry.long !== null && priorFloor <= entry.long) {
+                candidate = entry.long;
+                source = "prior";
+            }
+            else {
+                return { window: null, source: "contradiction", window_floor, contradiction: true };
+            }
+        }
+        return { window: candidate, source, window_floor, contradiction: false };
+    }
+    if (input.harness === "codex") {
+        const entry = table.codex[normalized.base] ?? null;
+        if (entry === null) {
+            return { window: null, source: null, window_floor, contradiction: false };
+        }
+        let candidate = entry.default;
+        let source = "mapping";
+        ({ candidate, source } = maybeApplyLong(candidate, source, entry.long, normalized.idMarker));
+        if (promptSideTokens !== null && promptSideTokens > candidate) {
+            if (entry.long !== null && promptSideTokens <= entry.long) {
+                candidate = entry.long;
+                source = "ratchet";
+            }
+            else {
+                return { window: null, source: "contradiction", window_floor, contradiction: true };
+            }
+        }
+        if (priorFloor !== null && priorFloor > candidate) {
+            if (entry.long !== null && priorFloor <= entry.long) {
+                candidate = entry.long;
+                source = "prior";
+            }
+            else {
+                return { window: null, source: "contradiction", window_floor, contradiction: true };
+            }
+        }
+        return { window: candidate, source, window_floor, contradiction: false };
     }
-    return null;
+    return { window: null, source: null, window_floor, contradiction: false };
+}
+export function resolveContextWindow(harness, modelId) {
+    return resolveContextWindowDetailed({ harness, modelId }).window;
 }
 export function meteringPath(sessionKey, stateDirOverride = stateDir) {
     return join(stateDirOverride, "ctx-" + hashKey(sessionKey) + ".json");
 }
 export function computeUsedPercentage(record) {
     if (finiteNumber(record.harnessPercentage)) {
-        // Clamp to [0,100] like the computed path: a harness could report a
-        // transiently out-of-range percentage, and phase/footer math assumes 0-100.
         return Math.min(100, Math.max(0, record.harnessPercentage));
     }
     if (record.used_tokens === null || record.context_window_size === null) {
@@ -97,10 +223,18 @@ export function phaseFor(usedPercentage) {
                 : "normal";
 }
 export function buildMeteringRecord(input) {
-    const context_window_size = resolveContextWindow(input.harness, input.model);
     const normalized = normalizeUsage(input.usage);
+    const resolution = resolveContextWindowDetailed({
+        harness: input.harness,
+        modelId: input.model,
+        longContextHint: input.longContextHint,
+        promptSideTokens: normalized.prompt_side_tokens,
+        priorWindow: input.priorWindow,
+        priorWindowSource: input.priorWindowSource,
+        priorWindowFloor: input.priorWindowFloor,
+    });
     const used_percentage = computeUsedPercentage({
-        context_window_size,
+        context_window_size: resolution.window,
         used_tokens: normalized.used_tokens,
         harnessPercentage: input.harnessPercentage,
     });
@@ -109,7 +243,9 @@ export function buildMeteringRecord(input) {
         harness: input.harness,
         model: input.model,
         source_ref: input.source_ref,
-        context_window_size,
+        context_window_size: resolution.window,
+        window_source: resolution.source,
+        window_floor: resolution.window_floor,
         usage: normalized.usage,
         used_tokens: normalized.used_tokens,
         used_percentage,

package/dist/orchestration/settings-hint.js

@@ -0,0 +1,48 @@
+import { existsSync, readFileSync } from "node:fs";
+import { homedir } from "node:os";
+import { isAbsolute, join } from "node:path";
+function readModelFromSettings(path) {
+    try {
+        if (!existsSync(path))
+            return undefined;
+        const parsed = JSON.parse(readFileSync(path, "utf8").replace(/^\uFEFF/, ""));
+        if (!parsed || typeof parsed !== "object" || Array.isArray(parsed))
+            return undefined;
+        const model = parsed.model;
+        return typeof model === "string" ? model : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+function configDir(env) {
+    const raw = env.CLAUDE_CONFIG_DIR;
+    if (typeof raw === "string" && raw.trim()) {
+        return isAbsolute(raw) ? raw : join(homedir(), raw);
+    }
+    return join(homedir(), ".claude");
+}
+export function readClaudeLongContextHint(cwd, env) {
+    const envModel = env.ANTHROPIC_MODEL;
+    if (typeof envModel === "string") {
+        return /\[1m\]/i.test(envModel);
+    }
+    // Without a session cwd there is no session to attribute a model to, so the
+    // machine-global settings fallback must NOT leak in. Real hooks always pass a
+    // cwd (so project + global lookups still apply in production); a payload with
+    // no cwd and no ANTHROPIC_MODEL yields a fail-safe null hint.
+    if (!cwd)
+        return null;
+    const paths = [
+        join(cwd, ".claude", "settings.local.json"),
+        join(cwd, ".claude", "settings.json"),
+        join(configDir(env), "settings.json"),
+    ];
+    for (const path of paths) {
+        const model = readModelFromSettings(path);
+        if (typeof model === "string") {
+            return /\[1m\]/i.test(model);
+        }
+    }
+    return null;
+}

package/dist/orchestration/update-check.js

@@ -3,7 +3,7 @@ import { join } from "node:path";
 import { readCheckForUpdates } from "../concurrency.js";
 import { atomicWriteJson } from "./atomic-write.js";
 import { stateDir } from "./marker.js";
-export const UPDATE_NOTICE_TEXT = "Notice: An improved version of subagent-mcp is available via the CLI command `subagent-mcp update` and can then be fully installed with `subagent-mcp setup`. This will fix security issues and improve user experience.";
+export const UPDATE_NOTICE_TEXT = "Notice: An improved version of subagent-mcp is available via the CLI command `subagent-mcp update` and can then be fully installed with `subagent-mcp setup`. This may include security and user experience improvements.";
 export const UPDATE_CHECK_TIMEOUT_MS = 2500;
 export const UPDATE_NOTICE_INTERVAL_MS = 12 * 60 * 60 * 1000;
 function pendingNoticePath() {
@@ -165,6 +165,7 @@ export function appendUpdateNotice(out, installedVersion, sessionId, env = proce
             notified_at: now,
             ...(sessionId ? { session_id: sessionId } : {}),
         });
+        // Injection invariant: NEVER interpolate registry-sourced strings into injected text.
         return `${out}\n${UPDATE_NOTICE_TEXT}`;
     }
     catch {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@heretyc/subagent-mcp",
-  "version": "2.12.15",
+  "version": "2.12.17",
   "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 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/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",