@heretyc/subagent-mcp 2.12.15 → 2.12.16
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/context-windows.json +37 -0
- package/dist/hooks/orchestration-claude.js +11 -2
- package/dist/hooks/orchestration-codex.js +7 -5
- package/dist/index.js +1 -1
- package/dist/orchestration/hook-core.js +11 -11
- package/dist/orchestration/latch.js +14 -2
- package/dist/orchestration/metering.js +178 -42
- package/dist/orchestration/settings-hint.js +48 -0
- package/package.json +2 -2
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
{
|
|
2
|
+
"schema_version": 1,
|
|
3
|
+
"generated": "2026-07-13",
|
|
4
|
+
"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.",
|
|
5
|
+
"_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.",
|
|
6
|
+
"family_defaults": {
|
|
7
|
+
"claude": { "default": 200000, "long": 1000000 }
|
|
8
|
+
},
|
|
9
|
+
"claude": {
|
|
10
|
+
"claude-fable-5": { "default": 200000, "long": 1000000 },
|
|
11
|
+
"claude-mythos-5": { "default": 200000, "long": 1000000 },
|
|
12
|
+
"claude-sonnet-5": { "default": 200000, "long": 1000000 },
|
|
13
|
+
"claude-sonnet-4-6": { "default": 200000, "long": 1000000 },
|
|
14
|
+
"claude-sonnet-4-5": { "default": 200000, "long": 1000000 },
|
|
15
|
+
"claude-sonnet-4-0": { "default": 200000, "long": 1000000 },
|
|
16
|
+
"claude-opus-4-8": { "default": 200000, "long": 1000000 },
|
|
17
|
+
"claude-opus-4-7": { "default": 200000, "long": 1000000 },
|
|
18
|
+
"claude-opus-4-6": { "default": 200000, "long": 1000000 },
|
|
19
|
+
"claude-opus-4-5": { "default": 200000, "long": 1000000 },
|
|
20
|
+
"claude-opus-4-1": { "default": 200000, "long": 1000000 },
|
|
21
|
+
"claude-opus-4-0": { "default": 200000, "long": 1000000 },
|
|
22
|
+
"claude-haiku-4-5": { "default": 200000, "long": null }
|
|
23
|
+
},
|
|
24
|
+
"codex": {
|
|
25
|
+
"gpt-5.5": { "default": 258400, "long": null },
|
|
26
|
+
"gpt-5.4": { "default": 258400, "long": 950000 },
|
|
27
|
+
"gpt-5.4-mini": { "default": 258400, "long": null },
|
|
28
|
+
"gpt-5.3-codex-spark": { "default": 121600, "long": null },
|
|
29
|
+
"gpt-5.2-codex": { "default": 258400, "long": null },
|
|
30
|
+
"gpt-5-codex": { "default": 258400, "long": null },
|
|
31
|
+
"gpt-5": { "default": 258400, "long": null },
|
|
32
|
+
"codex-auto-review": { "default": 258400, "long": 950000 },
|
|
33
|
+
"o3": { "default": 200000, "long": null },
|
|
34
|
+
"o3-mini": { "default": 200000, "long": null },
|
|
35
|
+
"o4-mini": { "default": 200000, "long": null }
|
|
36
|
+
}
|
|
37
|
+
}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { closeSync, openSync, readFileSync, readSync, realpathSync, statSync, } from "node:fs";
|
|
2
2
|
import { pathToFileURL } from "node:url";
|
|
3
3
|
import { countJsonlType, runHook, TRANSCRIPT_READ_CAP, } from "../orchestration/hook-core.js";
|
|
4
|
+
import { readClaudeLongContextHint } from "../orchestration/settings-hint.js";
|
|
4
5
|
import { hasParentMarker } from "../launch-prompt.js";
|
|
5
6
|
/**
|
|
6
7
|
* Claude Code UserPromptSubmit hook entry. Reads the JSON payload from stdin,
|
|
@@ -75,6 +76,8 @@ function liftClaudeUsageFromTranscript(transcriptPath) {
|
|
|
75
76
|
continue;
|
|
76
77
|
try {
|
|
77
78
|
const msg = JSON.parse(trimmed);
|
|
79
|
+
if (msg.isSidechain === true)
|
|
80
|
+
continue;
|
|
78
81
|
if (msg.type !== "assistant" || !msg.message?.usage)
|
|
79
82
|
continue;
|
|
80
83
|
if (typeof msg.message.model !== "string")
|
|
@@ -126,8 +129,14 @@ export const claudeAdapter = {
|
|
|
126
129
|
currentTurn(transcriptPath) {
|
|
127
130
|
return countJsonlType(transcriptPath, "user");
|
|
128
131
|
},
|
|
129
|
-
liftUsage(
|
|
130
|
-
|
|
132
|
+
liftUsage(payload, env, transcriptPath) {
|
|
133
|
+
const lifted = liftClaudeUsageFromTranscript(transcriptPath);
|
|
134
|
+
if (lifted === null)
|
|
135
|
+
return null;
|
|
136
|
+
return {
|
|
137
|
+
...lifted,
|
|
138
|
+
longContextHint: readClaudeLongContextHint(payload.cwd, env),
|
|
139
|
+
};
|
|
131
140
|
},
|
|
132
141
|
anonScope: "claude",
|
|
133
142
|
fullDirectiveFile: "orchestration-claude.md",
|
|
@@ -2,7 +2,6 @@ import { closeSync, openSync, readFileSync, readSync, realpathSync, statSync, }
|
|
|
2
2
|
import { pathToFileURL } from "node:url";
|
|
3
3
|
import { claimAndEmit, classifyOwnerClaim, computeEffectiveActive, countJsonlType, cullHookZombies, ownerKey, runHook, TRANSCRIPT_READ_CAP, } from "../orchestration/hook-core.js";
|
|
4
4
|
import * as marker from "../orchestration/marker.js";
|
|
5
|
-
import { resolveContextWindow, } from "../orchestration/metering.js";
|
|
6
5
|
import { isParentProcessMarkerFirstLine } from "../launch-prompt.js";
|
|
7
6
|
/**
|
|
8
7
|
* Codex CLI hook entry. Branches on payload.hook_event_name:
|
|
@@ -134,6 +133,7 @@ function liftCodexUsageFromRollout(transcriptPath) {
|
|
|
134
133
|
if (!finiteNumber(input) || !finiteNumber(output) || !finiteNumber(cacheRead)) {
|
|
135
134
|
return null;
|
|
136
135
|
}
|
|
136
|
+
const nonCachedInput = Math.max(0, input - cacheRead);
|
|
137
137
|
const modelContextWindow = latestTokenInfo?.model_context_window;
|
|
138
138
|
const totalTokens = total.total_tokens;
|
|
139
139
|
const harnessPercentage = finiteNumber(modelContextWindow) &&
|
|
@@ -141,15 +141,17 @@ function liftCodexUsageFromRollout(transcriptPath) {
|
|
|
141
141
|
finiteNumber(totalTokens)
|
|
142
142
|
? (totalTokens / modelContextWindow) * 100
|
|
143
143
|
: null;
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
144
|
+
// Always return the lift even when neither a harness percentage nor a static
|
|
145
|
+
// window is available (unknown codex model). hook-core is the sole writer and
|
|
146
|
+
// persists a null-window "unknown + fail-safe" metering record — matching the
|
|
147
|
+
// Claude adapter, which likewise never suppresses the record on unresolved
|
|
148
|
+
// windows. Suppressing here would leave unknown codex models with NO record.
|
|
147
149
|
return {
|
|
148
150
|
harness: "codex",
|
|
149
151
|
model: latestModel,
|
|
150
152
|
source_ref: transcriptPath,
|
|
151
153
|
usage: {
|
|
152
|
-
input,
|
|
154
|
+
input: nonCachedInput,
|
|
153
155
|
output,
|
|
154
156
|
cache_creation: 0,
|
|
155
157
|
cache_read: cacheRead,
|
package/dist/index.js
CHANGED
|
@@ -572,7 +572,7 @@ const ORCHESTRATION_INSTRUCTIONS = "subagent-mcp - CANONICAL OPERATING MODEL (fu
|
|
|
572
572
|
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.";
|
|
573
573
|
const server = new McpServer({
|
|
574
574
|
name: "subagent-mcp",
|
|
575
|
-
version: "2.12.
|
|
575
|
+
version: "2.12.16",
|
|
576
576
|
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.",
|
|
577
577
|
}, {
|
|
578
578
|
instructions: process.env.SUBAGENT_MCP_SUBAGENT === "1"
|
|
@@ -298,16 +298,7 @@ function updateMeteringForTurn(payload, env, adapter, current, turnIndex) {
|
|
|
298
298
|
const lifted = adapter.liftUsage(payload, env, payload.transcript_path);
|
|
299
299
|
if (lifted === null)
|
|
300
300
|
return true;
|
|
301
|
-
|
|
302
|
-
// the static model->window map, so an unknown model is NOT undetectable when a
|
|
303
|
-
// percentage was supplied. Only fall back to requiring window resolution when
|
|
304
|
-
// no harness percentage is available.
|
|
305
|
-
const hasHarnessPercentage = typeof lifted.harnessPercentage === "number" &&
|
|
306
|
-
Number.isFinite(lifted.harnessPercentage);
|
|
307
|
-
if (!hasHarnessPercentage &&
|
|
308
|
-
metering.resolveContextWindow(lifted.harness, lifted.model) === null) {
|
|
309
|
-
return true;
|
|
310
|
-
}
|
|
301
|
+
const prior = metering.readMetering(current);
|
|
311
302
|
const record = metering.buildMeteringRecord({
|
|
312
303
|
session_id: current,
|
|
313
304
|
harness: lifted.harness,
|
|
@@ -318,9 +309,18 @@ function updateMeteringForTurn(payload, env, adapter, current, turnIndex) {
|
|
|
318
309
|
? payload.hook_event_name
|
|
319
310
|
: "UserPromptSubmit",
|
|
320
311
|
harnessPercentage: lifted.harnessPercentage,
|
|
312
|
+
longContextHint: lifted.longContextHint,
|
|
313
|
+
priorWindow: prior?.context_window_size ?? null,
|
|
314
|
+
priorWindowSource: prior?.window_source ?? null,
|
|
315
|
+
priorWindowFloor: prior?.window_floor ?? null,
|
|
321
316
|
});
|
|
322
317
|
metering.writeMetering(current, record);
|
|
323
|
-
|
|
318
|
+
// A valid harness-reported percentage stands on its own. Without one, a null
|
|
319
|
+
// window means the host is undetectable for this turn, even though the record
|
|
320
|
+
// is still persisted for observability and same-turn fail-safe agreement.
|
|
321
|
+
const hasHarnessPercentage = typeof lifted.harnessPercentage === "number" &&
|
|
322
|
+
Number.isFinite(lifted.harnessPercentage);
|
|
323
|
+
return !hasHarnessPercentage && record.context_window_size === null;
|
|
324
324
|
}
|
|
325
325
|
function providerDirectiveFile(adapter, prefix) {
|
|
326
326
|
return `${prefix}-${adapter.anonScope}.md`;
|
|
@@ -2,6 +2,7 @@ import { mkdirSync, readFileSync, unlinkSync, } from "node:fs";
|
|
|
2
2
|
import { join } from "node:path";
|
|
3
3
|
import { atomicWriteJson } from "./atomic-write.js";
|
|
4
4
|
import { hashKey, stateDir } from "./marker.js";
|
|
5
|
+
export const LATCH_REV = 2;
|
|
5
6
|
export function latchPath(sessionKey) {
|
|
6
7
|
return join(stateDir, `latch-${hashKey(sessionKey)}.json`);
|
|
7
8
|
}
|
|
@@ -10,10 +11,20 @@ export function isLatchActive(sessionKey, now) {
|
|
|
10
11
|
try {
|
|
11
12
|
const raw = readFileSync(latchPath(sessionKey), "utf8");
|
|
12
13
|
const parsed = JSON.parse(raw);
|
|
13
|
-
|
|
14
|
+
const active = parsed.rev === LATCH_REV &&
|
|
15
|
+
parsed.latched === true &&
|
|
14
16
|
typeof parsed.latched_at === "number" &&
|
|
15
17
|
Number.isFinite(parsed.latched_at) &&
|
|
16
|
-
typeof parsed.session_id === "string"
|
|
18
|
+
typeof parsed.session_id === "string";
|
|
19
|
+
if (!active) {
|
|
20
|
+
try {
|
|
21
|
+
unlinkSync(latchPath(sessionKey));
|
|
22
|
+
}
|
|
23
|
+
catch {
|
|
24
|
+
// Best-effort lazy migration cleanup.
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
return active;
|
|
17
28
|
}
|
|
18
29
|
catch {
|
|
19
30
|
return false;
|
|
@@ -25,6 +36,7 @@ export function tripLatch(sessionKey, now) {
|
|
|
25
36
|
try {
|
|
26
37
|
mkdirSync(stateDir, { recursive: true, mode: 0o700 });
|
|
27
38
|
atomicWriteJson(latchPath(sessionKey), {
|
|
39
|
+
rev: LATCH_REV,
|
|
28
40
|
latched: true,
|
|
29
41
|
latched_at: now,
|
|
30
42
|
session_id: sessionKey,
|
|
@@ -1,43 +1,93 @@
|
|
|
1
1
|
import { existsSync, mkdirSync, readFileSync, unlinkSync, } from "node:fs";
|
|
2
2
|
import { join } from "node:path";
|
|
3
|
+
import { fileURLToPath } from "node:url";
|
|
3
4
|
import { atomicWriteJson } from "./atomic-write.js";
|
|
4
5
|
import { hashKey, ORCH_DISABLE_TTL_MS, stateDir, } from "./marker.js";
|
|
5
6
|
export const PLAN_LATCH_THRESHOLD_PCT = 15;
|
|
6
7
|
export const HANDOFF_UNLOCK_THRESHOLD_PCT = 50;
|
|
7
8
|
export const DEFAULT_CONTEXT_WINDOW = 200000;
|
|
8
9
|
export const LONG_CONTEXT_WINDOW = 1000000;
|
|
9
|
-
export const CODEX_KNOWN_MODEL_IDS = [
|
|
10
|
-
"gpt-5",
|
|
11
|
-
"gpt-5-codex",
|
|
12
|
-
"gpt-5.5",
|
|
13
|
-
"o3",
|
|
14
|
-
"o3-mini",
|
|
15
|
-
"o4-mini",
|
|
16
|
-
];
|
|
17
|
-
export const CODEX_CONTEXT_WINDOW_BY_MODEL_ID = {
|
|
18
|
-
"gpt-5": DEFAULT_CONTEXT_WINDOW,
|
|
19
|
-
"gpt-5-codex": DEFAULT_CONTEXT_WINDOW,
|
|
20
|
-
"gpt-5.5": DEFAULT_CONTEXT_WINDOW,
|
|
21
|
-
o3: DEFAULT_CONTEXT_WINDOW,
|
|
22
|
-
"o3-mini": DEFAULT_CONTEXT_WINDOW,
|
|
23
|
-
"o4-mini": DEFAULT_CONTEXT_WINDOW,
|
|
24
|
-
};
|
|
25
|
-
export const CLAUDE_CONTEXT_WINDOW_BY_KIND = {
|
|
26
|
-
default: DEFAULT_CONTEXT_WINDOW,
|
|
27
|
-
long: LONG_CONTEXT_WINDOW,
|
|
28
|
-
};
|
|
29
10
|
const EMPTY_USAGE = {
|
|
30
11
|
input: 0,
|
|
31
12
|
output: 0,
|
|
32
13
|
cache_creation: 0,
|
|
33
14
|
cache_read: 0,
|
|
34
15
|
};
|
|
16
|
+
let cachedWindowTable;
|
|
17
|
+
let contextWindowsPathOverride = null;
|
|
35
18
|
function finiteNumber(value) {
|
|
36
19
|
return typeof value === "number" && Number.isFinite(value);
|
|
37
20
|
}
|
|
21
|
+
function isPositiveInteger(value) {
|
|
22
|
+
return Number.isInteger(value) && value > 0;
|
|
23
|
+
}
|
|
24
|
+
function isContextWindowEntry(value) {
|
|
25
|
+
if (!value || typeof value !== "object" || Array.isArray(value))
|
|
26
|
+
return false;
|
|
27
|
+
const record = value;
|
|
28
|
+
return (isPositiveInteger(record.default) &&
|
|
29
|
+
(record.long === null ||
|
|
30
|
+
(isPositiveInteger(record.long) && record.long > record.default)));
|
|
31
|
+
}
|
|
32
|
+
function isContextWindowMap(value) {
|
|
33
|
+
if (!value || typeof value !== "object" || Array.isArray(value))
|
|
34
|
+
return false;
|
|
35
|
+
return Object.values(value).every(isContextWindowEntry);
|
|
36
|
+
}
|
|
37
|
+
function isContextWindowTable(value) {
|
|
38
|
+
if (!value || typeof value !== "object" || Array.isArray(value))
|
|
39
|
+
return false;
|
|
40
|
+
const record = value;
|
|
41
|
+
const familyDefaults = record.family_defaults;
|
|
42
|
+
const claudeFamilyDefault = !familyDefaults ||
|
|
43
|
+
(typeof familyDefaults === "object" &&
|
|
44
|
+
familyDefaults !== null &&
|
|
45
|
+
!Array.isArray(familyDefaults) &&
|
|
46
|
+
familyDefaults?.claude !== undefined &&
|
|
47
|
+
isContextWindowEntry(familyDefaults?.claude));
|
|
48
|
+
return (record.schema_version === 1 &&
|
|
49
|
+
claudeFamilyDefault &&
|
|
50
|
+
isContextWindowMap(record.claude) &&
|
|
51
|
+
isContextWindowMap(record.codex));
|
|
52
|
+
}
|
|
53
|
+
function contextWindowsPath() {
|
|
54
|
+
return (contextWindowsPathOverride ??
|
|
55
|
+
fileURLToPath(new URL("../context-windows.json", import.meta.url)));
|
|
56
|
+
}
|
|
57
|
+
export function setContextWindowsPathForTest(path) {
|
|
58
|
+
contextWindowsPathOverride = path;
|
|
59
|
+
cachedWindowTable = undefined;
|
|
60
|
+
}
|
|
61
|
+
function loadContextWindowTable() {
|
|
62
|
+
if (cachedWindowTable !== undefined)
|
|
63
|
+
return cachedWindowTable;
|
|
64
|
+
try {
|
|
65
|
+
const parsed = JSON.parse(readFileSync(contextWindowsPath(), "utf8").replace(/^\uFEFF/, ""));
|
|
66
|
+
cachedWindowTable = isContextWindowTable(parsed) ? parsed : null;
|
|
67
|
+
}
|
|
68
|
+
catch {
|
|
69
|
+
cachedWindowTable = null;
|
|
70
|
+
}
|
|
71
|
+
return cachedWindowTable;
|
|
72
|
+
}
|
|
73
|
+
export function normalizeModelId(modelId) {
|
|
74
|
+
if (typeof modelId !== "string")
|
|
75
|
+
return null;
|
|
76
|
+
let base = modelId.trim().toLowerCase();
|
|
77
|
+
if (!base)
|
|
78
|
+
return null;
|
|
79
|
+
let idMarker = /\[1m\]/i.test(base) || /-1m\b/i.test(base);
|
|
80
|
+
base = base.replace(/\[[^\]]+\]/g, "");
|
|
81
|
+
base = base.replace(/-1m\b/g, "");
|
|
82
|
+
const dated = base.replace(/-(20\d{6})$/, "");
|
|
83
|
+
base = dated;
|
|
84
|
+
if (!base)
|
|
85
|
+
return null;
|
|
86
|
+
return { base, idMarker };
|
|
87
|
+
}
|
|
38
88
|
function normalizeUsage(usage) {
|
|
39
89
|
if (usage === null || usage === undefined) {
|
|
40
|
-
return { usage: { ...EMPTY_USAGE }, used_tokens: null };
|
|
90
|
+
return { usage: { ...EMPTY_USAGE }, used_tokens: null, prompt_side_tokens: null };
|
|
41
91
|
}
|
|
42
92
|
const normalized = {
|
|
43
93
|
input: finiteNumber(usage.input) ? usage.input : 0,
|
|
@@ -51,35 +101,111 @@ function normalizeUsage(usage) {
|
|
|
51
101
|
normalized.output +
|
|
52
102
|
normalized.cache_creation +
|
|
53
103
|
normalized.cache_read,
|
|
104
|
+
prompt_side_tokens: normalized.input + normalized.cache_creation + normalized.cache_read,
|
|
54
105
|
};
|
|
55
106
|
}
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
107
|
+
function usablePriorFloor(priorWindow, priorSource, priorWindowFloor) {
|
|
108
|
+
// The monotonic floor tracks the highest OBSERVED prompt-side token count,
|
|
109
|
+
// never the resolved window size. window_source gating lives in how
|
|
110
|
+
// priorWindowFloor is produced: hint-only turns record their observed tokens
|
|
111
|
+
// (not the 1M hint window), so a hint window never becomes sticky, while a
|
|
112
|
+
// ratcheted/prior turn carries the real observed floor forward.
|
|
113
|
+
void priorWindow;
|
|
114
|
+
void priorSource;
|
|
115
|
+
return finiteNumber(priorWindowFloor) ? priorWindowFloor : null;
|
|
116
|
+
}
|
|
117
|
+
function maybeApplyLong(candidate, source, long, enabled) {
|
|
118
|
+
if (enabled && long !== null && candidate < long) {
|
|
119
|
+
return { candidate: long, source: "hint" };
|
|
65
120
|
}
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
121
|
+
return { candidate, source };
|
|
122
|
+
}
|
|
123
|
+
export function resolveContextWindowDetailed(input) {
|
|
124
|
+
const normalized = normalizeModelId(input.modelId);
|
|
125
|
+
if (normalized === null) {
|
|
126
|
+
return { window: null, source: null, window_floor: null, contradiction: false };
|
|
127
|
+
}
|
|
128
|
+
const table = loadContextWindowTable();
|
|
129
|
+
if (table === null) {
|
|
130
|
+
return { window: null, source: null, window_floor: null, contradiction: false };
|
|
131
|
+
}
|
|
132
|
+
const promptSideTokens = finiteNumber(input.promptSideTokens)
|
|
133
|
+
? input.promptSideTokens
|
|
134
|
+
: null;
|
|
135
|
+
const priorFloor = usablePriorFloor(input.priorWindow, input.priorWindowSource, input.priorWindowFloor);
|
|
136
|
+
const observedFloor = Math.max(promptSideTokens ?? 0, priorFloor ?? 0);
|
|
137
|
+
const window_floor = observedFloor > 0 ? observedFloor : null;
|
|
138
|
+
if (input.harness === "claude") {
|
|
139
|
+
if (!/^claude-/i.test(normalized.base)) {
|
|
140
|
+
return { window: null, source: null, window_floor, contradiction: false };
|
|
141
|
+
}
|
|
142
|
+
const entry = table.claude[normalized.base] ?? table.family_defaults?.claude ?? null;
|
|
143
|
+
if (entry === null) {
|
|
144
|
+
return { window: null, source: null, window_floor, contradiction: false };
|
|
69
145
|
}
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
146
|
+
const mapped = Object.prototype.hasOwnProperty.call(table.claude, normalized.base);
|
|
147
|
+
let candidate = entry.default;
|
|
148
|
+
let source = mapped ? "mapping" : "family-default";
|
|
149
|
+
const hinted = normalized.idMarker || input.longContextHint === true;
|
|
150
|
+
({ candidate, source } = maybeApplyLong(candidate, source, entry.long, hinted));
|
|
151
|
+
if (promptSideTokens !== null && promptSideTokens > candidate) {
|
|
152
|
+
if (entry.long !== null && promptSideTokens <= entry.long) {
|
|
153
|
+
candidate = entry.long;
|
|
154
|
+
source = "ratchet";
|
|
155
|
+
}
|
|
156
|
+
else {
|
|
157
|
+
return { window: null, source: "contradiction", window_floor, contradiction: true };
|
|
158
|
+
}
|
|
159
|
+
}
|
|
160
|
+
if (priorFloor !== null && priorFloor > candidate) {
|
|
161
|
+
if (entry.long !== null && priorFloor <= entry.long) {
|
|
162
|
+
candidate = entry.long;
|
|
163
|
+
source = "prior";
|
|
164
|
+
}
|
|
165
|
+
else {
|
|
166
|
+
return { window: null, source: "contradiction", window_floor, contradiction: true };
|
|
167
|
+
}
|
|
168
|
+
}
|
|
169
|
+
return { window: candidate, source, window_floor, contradiction: false };
|
|
170
|
+
}
|
|
171
|
+
if (input.harness === "codex") {
|
|
172
|
+
const entry = table.codex[normalized.base] ?? null;
|
|
173
|
+
if (entry === null) {
|
|
174
|
+
return { window: null, source: null, window_floor, contradiction: false };
|
|
175
|
+
}
|
|
176
|
+
let candidate = entry.default;
|
|
177
|
+
let source = "mapping";
|
|
178
|
+
({ candidate, source } = maybeApplyLong(candidate, source, entry.long, normalized.idMarker));
|
|
179
|
+
if (promptSideTokens !== null && promptSideTokens > candidate) {
|
|
180
|
+
if (entry.long !== null && promptSideTokens <= entry.long) {
|
|
181
|
+
candidate = entry.long;
|
|
182
|
+
source = "ratchet";
|
|
183
|
+
}
|
|
184
|
+
else {
|
|
185
|
+
return { window: null, source: "contradiction", window_floor, contradiction: true };
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
if (priorFloor !== null && priorFloor > candidate) {
|
|
189
|
+
if (entry.long !== null && priorFloor <= entry.long) {
|
|
190
|
+
candidate = entry.long;
|
|
191
|
+
source = "prior";
|
|
192
|
+
}
|
|
193
|
+
else {
|
|
194
|
+
return { window: null, source: "contradiction", window_floor, contradiction: true };
|
|
195
|
+
}
|
|
196
|
+
}
|
|
197
|
+
return { window: candidate, source, window_floor, contradiction: false };
|
|
73
198
|
}
|
|
74
|
-
return null;
|
|
199
|
+
return { window: null, source: null, window_floor, contradiction: false };
|
|
200
|
+
}
|
|
201
|
+
export function resolveContextWindow(harness, modelId) {
|
|
202
|
+
return resolveContextWindowDetailed({ harness, modelId }).window;
|
|
75
203
|
}
|
|
76
204
|
export function meteringPath(sessionKey, stateDirOverride = stateDir) {
|
|
77
205
|
return join(stateDirOverride, "ctx-" + hashKey(sessionKey) + ".json");
|
|
78
206
|
}
|
|
79
207
|
export function computeUsedPercentage(record) {
|
|
80
208
|
if (finiteNumber(record.harnessPercentage)) {
|
|
81
|
-
// Clamp to [0,100] like the computed path: a harness could report a
|
|
82
|
-
// transiently out-of-range percentage, and phase/footer math assumes 0-100.
|
|
83
209
|
return Math.min(100, Math.max(0, record.harnessPercentage));
|
|
84
210
|
}
|
|
85
211
|
if (record.used_tokens === null || record.context_window_size === null) {
|
|
@@ -97,10 +223,18 @@ export function phaseFor(usedPercentage) {
|
|
|
97
223
|
: "normal";
|
|
98
224
|
}
|
|
99
225
|
export function buildMeteringRecord(input) {
|
|
100
|
-
const context_window_size = resolveContextWindow(input.harness, input.model);
|
|
101
226
|
const normalized = normalizeUsage(input.usage);
|
|
227
|
+
const resolution = resolveContextWindowDetailed({
|
|
228
|
+
harness: input.harness,
|
|
229
|
+
modelId: input.model,
|
|
230
|
+
longContextHint: input.longContextHint,
|
|
231
|
+
promptSideTokens: normalized.prompt_side_tokens,
|
|
232
|
+
priorWindow: input.priorWindow,
|
|
233
|
+
priorWindowSource: input.priorWindowSource,
|
|
234
|
+
priorWindowFloor: input.priorWindowFloor,
|
|
235
|
+
});
|
|
102
236
|
const used_percentage = computeUsedPercentage({
|
|
103
|
-
context_window_size,
|
|
237
|
+
context_window_size: resolution.window,
|
|
104
238
|
used_tokens: normalized.used_tokens,
|
|
105
239
|
harnessPercentage: input.harnessPercentage,
|
|
106
240
|
});
|
|
@@ -109,7 +243,9 @@ export function buildMeteringRecord(input) {
|
|
|
109
243
|
harness: input.harness,
|
|
110
244
|
model: input.model,
|
|
111
245
|
source_ref: input.source_ref,
|
|
112
|
-
context_window_size,
|
|
246
|
+
context_window_size: resolution.window,
|
|
247
|
+
window_source: resolution.source,
|
|
248
|
+
window_floor: resolution.window_floor,
|
|
113
249
|
usage: normalized.usage,
|
|
114
250
|
used_tokens: normalized.used_tokens,
|
|
115
251
|
used_percentage,
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
import { existsSync, readFileSync } from "node:fs";
|
|
2
|
+
import { homedir } from "node:os";
|
|
3
|
+
import { isAbsolute, join } from "node:path";
|
|
4
|
+
function readModelFromSettings(path) {
|
|
5
|
+
try {
|
|
6
|
+
if (!existsSync(path))
|
|
7
|
+
return undefined;
|
|
8
|
+
const parsed = JSON.parse(readFileSync(path, "utf8").replace(/^\uFEFF/, ""));
|
|
9
|
+
if (!parsed || typeof parsed !== "object" || Array.isArray(parsed))
|
|
10
|
+
return undefined;
|
|
11
|
+
const model = parsed.model;
|
|
12
|
+
return typeof model === "string" ? model : undefined;
|
|
13
|
+
}
|
|
14
|
+
catch {
|
|
15
|
+
return undefined;
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
function configDir(env) {
|
|
19
|
+
const raw = env.CLAUDE_CONFIG_DIR;
|
|
20
|
+
if (typeof raw === "string" && raw.trim()) {
|
|
21
|
+
return isAbsolute(raw) ? raw : join(homedir(), raw);
|
|
22
|
+
}
|
|
23
|
+
return join(homedir(), ".claude");
|
|
24
|
+
}
|
|
25
|
+
export function readClaudeLongContextHint(cwd, env) {
|
|
26
|
+
const envModel = env.ANTHROPIC_MODEL;
|
|
27
|
+
if (typeof envModel === "string") {
|
|
28
|
+
return /\[1m\]/i.test(envModel);
|
|
29
|
+
}
|
|
30
|
+
// Without a session cwd there is no session to attribute a model to, so the
|
|
31
|
+
// machine-global settings fallback must NOT leak in. Real hooks always pass a
|
|
32
|
+
// cwd (so project + global lookups still apply in production); a payload with
|
|
33
|
+
// no cwd and no ANTHROPIC_MODEL yields a fail-safe null hint.
|
|
34
|
+
if (!cwd)
|
|
35
|
+
return null;
|
|
36
|
+
const paths = [
|
|
37
|
+
join(cwd, ".claude", "settings.local.json"),
|
|
38
|
+
join(cwd, ".claude", "settings.json"),
|
|
39
|
+
join(configDir(env), "settings.json"),
|
|
40
|
+
];
|
|
41
|
+
for (const path of paths) {
|
|
42
|
+
const model = readModelFromSettings(path);
|
|
43
|
+
if (typeof model === "string") {
|
|
44
|
+
return /\[1m\]/i.test(model);
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
return null;
|
|
48
|
+
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@heretyc/subagent-mcp",
|
|
3
|
-
"version": "2.12.
|
|
3
|
+
"version": "2.12.16",
|
|
4
4
|
"description": "MCP server that launches and manages always-interactive Claude Code and Codex sub-agent sessions (no direct Anthropic/OpenAI API).",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"mcp",
|
|
@@ -39,7 +39,7 @@
|
|
|
39
39
|
"postinstall": "node scripts/postinstall.mjs",
|
|
40
40
|
"prepare": "npm run build",
|
|
41
41
|
"prepublishOnly": "npm test",
|
|
42
|
-
"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"
|
|
42
|
+
"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"
|
|
43
43
|
},
|
|
44
44
|
"author": "Lexi Blackburn",
|
|
45
45
|
"license": "Apache-2.0",
|