mirror of
https://github.com/affaan-m/everything-claude-code.git
synced 2026-06-12 19:23:07 +08:00
* fix(hooks): fail open on oversized stdin instead of echoing truncated JSON (#2222) run-with-flags.js capped stdin at 1MB but every fallthrough path still echoed the truncated string to stdout. The harness parses hook stdout as JSON, got a document cut mid-stream, and blocked the tool call — so any Edit/Write with a >1MB hook payload was permanently blocked by every registered pre-write hook, before ECC_HOOK_PROFILE / ECC_DISABLED_HOOKS gating could run. - Exit 0 with empty stdout (no opinion) when the stdin cap trips, before any echo or gating logic. - Flush stdout via write callback before process.exit: exiting right after stdout.write() dropped everything past the ~64KB pipe buffer, cutting even sub-cap pass-through payloads mid-JSON. Regression tests cover the enabled, disabled, and missing-arg paths for oversized payloads plus full echo of sub-cap >64KB payloads. * fix(codex): stop emitting invalid exa url entry, align merge with connector policy (#2224) The Codex MCP merge declared exa with a url key, but Codex's [mcp_servers.*] TOML schema is stdio-only — the url key makes the entire config.toml fail to load, bricking both the codex CLI and the desktop app. Every install/update re-injected the line because the urlEntry branch treated the broken entry as present. - ECC_SERVERS now emits only the current default set per docs/MCP-CONNECTOR-POLICY.md: chrome-devtools (stdio, command/args). Retired servers (supabase, playwright, context7, exa, github, memory, sequential-thinking) are never re-emitted; existing user-managed entries are untouched. - The merge now repairs the exact ECC-emitted broken form (url-only exa entry) on every run so re-running the installer fixes broken configs instead of preserving them. User stdio exa entries (command + mcp-remote) are left alone. - check-codex-global-state.sh requires chrome-devtools instead of the retired set, and flags url-only exa entries with a repair hint. Tests cover repair, re-run idempotence, stdio-entry preservation, and no-retired-server emission in add, update, dry-run, and disabled modes. * fix(hooks): never echo truncated stdin from Stop hooks (#2090) Stop hooks follow the ECC pass-through convention (echo stdin on stdout), but every echoing Stop hook capped stdin and echoed the capped string. The Stop payload carries last_assistant_message, so a long final assistant message produced a JSON document cut mid-stream on stdout, which the harness reports as 'Stop hook error: JSON validation failed' across the whole Stop chain. Reproduced: a Stop payload with a >64KB last_assistant_message run through run-with-flags + cost-tracker emitted exactly 65536 bytes of invalid JSON (cost-tracker capped stdin at 64KB — far below realistic Stop payloads). - cost-tracker: raise the cap to 1MB (matching all other hooks) and suppress the pass-through echo when stdin was truncated. - check-console-log, stop-format-typecheck, desktop-notify: suppress the echo when stdin was truncated; flush stdout before process.exit so sub-cap payloads are not cut at the ~64KB pipe buffer. - All hooks keep exiting 0 (fail-open); diagnostics go to stderr. New stop-hooks-stdout test asserts the contract for every registered Stop hook: stdout is empty or valid JSON, exit code 0 — for realistic 100KB payloads and oversized >1MB payloads, via the production runner and via direct invocation. Updated the old hooks.test.js case that codified the truncated-echo behavior. * fix(hooks): dampen GateGuard fact-force repetition in long sessions (#2142) In long autonomous sessions the fact-force gate produced 10+ near-identical 'state facts -> blocked -> restate -> retry' blocks in one context window, which measurably raises the odds of the model collapsing into a degenerate single-token repetition loop. - Track a per-session fact_force_denials counter in GateGuard state (merged max across concurrent writers, reset with the session, robust to malformed on-disk values). - The first GATEGUARD_FACT_FORCE_FULL_DENIALS denials (default 3) keep the full four-fact block; later denials emit a condensed single-line message that carries the denial ordinal, so consecutive denials are structurally different and never textually identical. - True retries of the same target remain allowed without re-prompting (unchanged). Destructive-Bash and routine-Bash gates are unchanged, as are the ECC_GATEGUARD=off / ECC_DISABLED_HOOKS escape hatches. Eight new tests cover budget counting, condensed format, ordinal advancement, retry pass-through, env tuning, malformed state, MultiEdit dampening, and destructive-gate exemption. * fix(hooks): keep security hooks able to block on oversized stdin (#2222) Refine the truncation fail-open: instead of skipping the hook entirely, the runner now suppresses only its own raw-echo when stdin was truncated. The hook still executes and receives the truncated flag (run() context / ECC_HOOK_INPUT_TRUNCATED), so config-protection keeps blocking truncated protected-config payloads (its test requires exit 2) while pass-through hooks fail open with empty stdout as before. * style: apply repo formatter to touched hook files
222 lines
7.7 KiB
JavaScript
Executable File
222 lines
7.7 KiB
JavaScript
Executable File
#!/usr/bin/env node
|
|
/**
|
|
* Cost Tracker Hook (v2)
|
|
*
|
|
* Reads transcript_path from Stop hook stdin, sums usage across all
|
|
* assistant turns in the session JSONL, and appends one row to
|
|
* ~/.claude/metrics/costs.jsonl.
|
|
*
|
|
* Stop hook stdin payload: { session_id, transcript_path, cwd, hook_event_name, ... }
|
|
* The Stop payload does NOT include `usage` or `model` directly. The previous
|
|
* version of this hook expected those fields and silently produced zero-filled
|
|
* rows (verified: 2,340 rows captured with 0.0% non-zero token rate over 52
|
|
* days). The fix is to read the transcript file Claude Code already passes us.
|
|
*
|
|
* JSONL assistant entry shape (per Claude Code):
|
|
* { type: "assistant", message: { model, usage: { input_tokens, output_tokens,
|
|
* cache_creation_input_tokens, cache_read_input_tokens } } }
|
|
*
|
|
* Cumulative behavior: Stop fires per assistant response, not per session.
|
|
* Each row therefore represents the cumulative session total up to that point.
|
|
* To get per-session cost, take the last row per session_id. To get per-day
|
|
* spend, aggregate.
|
|
*
|
|
* Harness-cost contract (optional, opt-in by the statusline):
|
|
* If the user's statusline (which receives `cost.total_cost_usd` directly
|
|
* from Claude Code) writes `{ts, cost_usd}` to
|
|
* `<os.tmpdir()>/harness-cost-<session_id>.json` on each render, this hook
|
|
* prefers that authoritative value over the transcript-sum estimate when
|
|
* the cache is fresh (≤ 300s). The transcript-sum is kept as a safe
|
|
* fallback because:
|
|
* - the hard-coded rate table cannot represent Opus 4.7's >200K-token
|
|
* 2x tier or the 1h-cache 2x tier (under-counts on long sessions);
|
|
* - summing the full transcript double-counts work done across
|
|
* `--resume` boundaries while `cost.total_cost_usd` is per-process.
|
|
* Absent a writer, behavior is unchanged.
|
|
*/
|
|
|
|
'use strict';
|
|
|
|
const fs = require('fs');
|
|
const os = require('os');
|
|
const path = require('path');
|
|
const { ensureDir, appendFile, getClaudeDir } = require('../lib/utils');
|
|
const { sanitizeSessionId } = require('../lib/session-bridge');
|
|
|
|
const HARNESS_COST_MAX_AGE_SECONDS = 300;
|
|
|
|
/**
|
|
* Read authoritative harness cost from the per-session cache file.
|
|
* @param {string} sessionId
|
|
* @param {number} maxAgeSeconds
|
|
* @returns {number|null} cost in USD, or null on miss / stale / parse error
|
|
*/
|
|
function readHarnessCost(sessionId, maxAgeSeconds) {
|
|
if (!sessionId) return null;
|
|
try {
|
|
const fp = path.join(os.tmpdir(), `harness-cost-${sessionId}.json`);
|
|
if (!fs.existsSync(fp)) return null;
|
|
const obj = JSON.parse(fs.readFileSync(fp, 'utf8'));
|
|
const ts = Number(obj && obj.ts);
|
|
const cost = Number(obj && obj.cost_usd);
|
|
if (!Number.isFinite(ts) || !Number.isFinite(cost) || cost < 0) return null;
|
|
const age = Math.floor(Date.now() / 1000) - ts;
|
|
if (age < 0 || age > maxAgeSeconds) return null;
|
|
return cost;
|
|
} catch {
|
|
return null;
|
|
}
|
|
}
|
|
|
|
// Approximate per-1M-token billing rates (USD).
|
|
// Cache creation: 1.25x input rate. Cache read: 0.1x input rate.
|
|
const RATE_TABLE = {
|
|
haiku: { in: 0.80, out: 4.0, cacheWrite: 1.00, cacheRead: 0.08 },
|
|
sonnet: { in: 3.00, out: 15.0, cacheWrite: 3.75, cacheRead: 0.30 },
|
|
opus: { in: 15.00, out: 75.0, cacheWrite: 18.75, cacheRead: 1.50 }
|
|
};
|
|
|
|
function getRates(model) {
|
|
const m = String(model || '').toLowerCase();
|
|
if (m.includes('haiku')) return RATE_TABLE.haiku;
|
|
if (m.includes('opus')) return RATE_TABLE.opus;
|
|
return RATE_TABLE.sonnet;
|
|
}
|
|
|
|
function toNumber(v) {
|
|
const n = Number(v);
|
|
return Number.isFinite(n) ? n : 0;
|
|
}
|
|
|
|
/**
|
|
* Scan the session JSONL and sum token usage across all assistant turns.
|
|
* Returns { inputTokens, outputTokens, cacheWriteTokens, cacheReadTokens, model }
|
|
* or null on read failure.
|
|
*/
|
|
function sumUsageFromTranscript(transcriptPath) {
|
|
let content;
|
|
try {
|
|
content = fs.readFileSync(transcriptPath, 'utf8');
|
|
} catch {
|
|
return null;
|
|
}
|
|
|
|
let inputTokens = 0;
|
|
let outputTokens = 0;
|
|
let cacheWriteTokens = 0;
|
|
let cacheReadTokens = 0;
|
|
let model = 'unknown';
|
|
|
|
for (const line of content.split('\n')) {
|
|
if (!line.trim()) continue;
|
|
let entry;
|
|
try { entry = JSON.parse(line); } catch { continue; }
|
|
|
|
if (entry.type !== 'assistant') continue;
|
|
const msg = entry.message;
|
|
if (!msg || !msg.usage) continue;
|
|
|
|
const u = msg.usage;
|
|
inputTokens += toNumber(u.input_tokens);
|
|
outputTokens += toNumber(u.output_tokens);
|
|
cacheWriteTokens += toNumber(u.cache_creation_input_tokens);
|
|
cacheReadTokens += toNumber(u.cache_read_input_tokens);
|
|
|
|
if (msg.model && msg.model !== 'unknown') model = msg.model;
|
|
}
|
|
|
|
return { inputTokens, outputTokens, cacheWriteTokens, cacheReadTokens, model };
|
|
}
|
|
|
|
// 1MB, matching the other Stop hooks. The Stop payload carries
|
|
// last_assistant_message, which routinely exceeded the old 64KB cap and
|
|
// made this hook echo a JSON document cut mid-stream (#2090).
|
|
const MAX_STDIN = 1024 * 1024;
|
|
let raw = '';
|
|
let truncated = false;
|
|
|
|
process.stdin.setEncoding('utf8');
|
|
process.stdin.on('data', chunk => {
|
|
if (raw.length < MAX_STDIN) {
|
|
const remaining = MAX_STDIN - raw.length;
|
|
raw += chunk.substring(0, remaining);
|
|
if (chunk.length > remaining) truncated = true;
|
|
} else {
|
|
truncated = true;
|
|
}
|
|
});
|
|
|
|
process.stdin.on('end', () => {
|
|
try {
|
|
const input = raw.trim() ? JSON.parse(raw) : {};
|
|
|
|
const transcriptPath = (typeof input.transcript_path === 'string' && input.transcript_path)
|
|
? input.transcript_path
|
|
: process.env.CLAUDE_TRANSCRIPT_PATH || null;
|
|
|
|
const sessionId =
|
|
sanitizeSessionId(input.session_id) ||
|
|
sanitizeSessionId(process.env.ECC_SESSION_ID) ||
|
|
sanitizeSessionId(process.env.CLAUDE_SESSION_ID) ||
|
|
'default';
|
|
|
|
let usageTotals = null;
|
|
if (transcriptPath && fs.existsSync(transcriptPath)) {
|
|
usageTotals = sumUsageFromTranscript(transcriptPath);
|
|
}
|
|
|
|
const {
|
|
inputTokens = 0,
|
|
outputTokens = 0,
|
|
cacheWriteTokens = 0,
|
|
cacheReadTokens = 0,
|
|
model = 'unknown'
|
|
} = usageTotals || {};
|
|
|
|
const rates = getRates(model);
|
|
const transcriptCostUsd = Math.round((
|
|
(inputTokens / 1e6) * rates.in +
|
|
(outputTokens / 1e6) * rates.out +
|
|
(cacheWriteTokens / 1e6) * rates.cacheWrite +
|
|
(cacheReadTokens / 1e6) * rates.cacheRead
|
|
) * 1e6) / 1e6;
|
|
|
|
// Prefer the harness's authoritative `cost.total_cost_usd` when the
|
|
// statusline has written it to the per-session cache (see contract in
|
|
// the file header). The harness number reflects API-billed truth
|
|
// (correct rates, 1h-cache 2x, >200K tier 2x) and is per-process so it
|
|
// does not drift across `--resume`. Cache miss → transcript-sum.
|
|
const harnessCost = readHarnessCost(sessionId, HARNESS_COST_MAX_AGE_SECONDS);
|
|
const estimatedCostUsd = harnessCost !== null
|
|
? Math.round(harnessCost * 1e6) / 1e6
|
|
: transcriptCostUsd;
|
|
|
|
const metricsDir = path.join(getClaudeDir(), 'metrics');
|
|
ensureDir(metricsDir);
|
|
|
|
const row = {
|
|
timestamp: new Date().toISOString(),
|
|
session_id: sessionId,
|
|
transcript_path: transcriptPath || '',
|
|
model,
|
|
input_tokens: inputTokens,
|
|
output_tokens: outputTokens,
|
|
cache_write_tokens: cacheWriteTokens,
|
|
cache_read_tokens: cacheReadTokens,
|
|
estimated_cost_usd: estimatedCostUsd
|
|
};
|
|
|
|
appendFile(path.join(metricsDir, 'costs.jsonl'), `${JSON.stringify(row)}\n`);
|
|
} catch {
|
|
// Non-blocking — never fail the Stop hook.
|
|
}
|
|
|
|
// Pass stdin through (ECC hook convention) — but never echo truncated
|
|
// stdin: invalid JSON on stdout is reported as a Stop hook failure (#2090).
|
|
if (truncated) {
|
|
process.stderr.write('[Hook] cost-tracker: stdin exceeded 1MB; suppressing pass-through (fail-open)\n');
|
|
return;
|
|
}
|
|
process.stdout.write(raw);
|
|
});
|