mirror of
https://github.com/diegosouzapw/OmniRoute.git
synced 2026-07-31 12:22:14 +03:00
* chore(release): open v3.8.37 development cycle * chore(ci): harden release flow — ratchet decoupling, fast-path drift gates, build-scope guard, heap default (#5054) Implements improvements 1-4 from the v3.8.36 release benchmark (_tasks/release-bench/v3.8.36/PLANO-MELHORIA.md): 1. Quality Ratchet decoupled from flaky coverage (ci.yml): the shard→coverage→ratchet chain meant a single flaky Coverage Shard SKIPPED the whole Quality Ratchet on the release PR (v3.8.36 #4854), so cycle drift only surfaced post-merge in #5029. The job now runs on !cancelled(); coverage download is continue-on-error and the ratchet runs --allow-missing, so the DETERMINISTIC gates (eslint/complexity/cognitive/duplication/ codeql) stay blocking even when coverage is unavailable. 2. Fast-path drift gates (quality.yml PR→release): added check:complexity, check:cognitive-complexity, and a new lightweight check:pack-policy (pack-artifact unexpected-files check WITHOUT a build, via --policy-only) so drift + stray-tarball-file regressions are caught/rebaselined PER-PR instead of cascading onto the release PR. 3. Build heap default 4096→8192 MB (build-next-isolated.mjs): the clean graph peaks ~3.9 GB and brushed the old 4 GB ceiling; 8 GB gives headroom. Comment notes heap is NOT the fix for a poisoned scope (run check:build-scope instead). 4. check:build-scope gate (new): fails if .ts/.tsx/.js/.jsx files in the tsconfig scope exceed a threshold — catches worktrees/cruft leaking into the build scope (the v3.8.36 OOM root cause: 355,215 vs 4,547 files) BEFORE it detonates next build. Wired into the fast-path. * fix(auth): only trust forwarding headers from loopback TCP peers (#4689) Integrated into release/v3.8.37 — loopback-gated forwarding headers (IP spoofing fix). Cherry-picked onto current release tip; ipUtils.test.ts 9/9 green. * fix(codex): treat OAuth 401 as unrecoverable refresh failure (#4686) Integrated into release/v3.8.37 — codex OAuth 401 treated as unrecoverable refresh. Cherry-picked onto release tip; token-refresh-service.test.ts 38/38 green. * fix(translator): preserve reasoning_effort for non-Copilot Responses clients (#4688) Integrated into release/v3.8.37 — preserve reasoning_effort for non-Copilot Responses clients. Cherry-picked onto release tip; tests 47/47 green. * fix(translator): coerce tool descriptions to strings in OpenAI normalization (#4675) Integrated into release/v3.8.37 — coerce tool descriptions to strings in OpenAI normalization. Cherry-picked onto release tip; tests 3/3 green. * feat(sse): x-omniroute-strip-reasoning header to drop reasoning_content (#4678) Integrated into release/v3.8.37 — x-omniroute-strip-reasoning header. Cherry-picked onto release tip (resolved chatCore.ts/headers.ts adjacency conflict, kept resolveCompressionHeader + isStripReasoningRequested); tests 8/8 green. * fix(combo): flatten Anthropic tool messages + tool history to prevent upstream 503 (#4648) Integrated into release/v3.8.37 — flattenToolHistory helper (combo anti-503). Cherry-picked onto release tip; tests 9/9 green. * feat(headroom): proxy lifecycle management + dashboard UI (Docker sidecar supported) (#4649) Integrated into release/v3.8.37 — headroom proxy lifecycle (status/start/stop, local-only + spawn-capable per Rules #15/#17). Cherry-picked onto release tip; lifecycle 7/7 + route-guard 43/43 + check:cycles green. * feat(cli): multi-model support for Factory Droid CLI (#4682) Integrated into release/v3.8.37 — Factory Droid multi-model support. Cherry-picked onto release tip (kept readJsoncConfig + droidCustomModels imports); droid-custom-models 11/11 green. * fix(providers): require Default Model in compatible-provider API-key setup (#4641) Integrated into release/v3.8.37 — require Default Model in compatible-provider API-key setup. Cherry-picked fix + test-move onto release tip (kept release providerSpecificData + QuotaScrapingFields; fixed moved-test import path; baseline rebaseline unneeded, 865<866); UI test 2/2 green. * fix(dashboard): stop double-masking already-masked API key in list (E2E 3/9 regression) (#4671) Integrated into release/v3.8.37 — render server-masked key verbatim (drop redundant maskKey call). Note: release's maskKey already guards '****' (since v3.8.34), so this is a safe simplification; added a contract test pinning the **** passthrough invariant (2/2 green, would fail against the pre-guard maskKey = the historical double-mask bug). * chore(quality): rebaseline file-size for rc17 PR batch drift Own growth from the merged rc17 PRs (#4678/#4686/#4688) at existing chokepoints — cohesive, not extractable: - open-sse/handlers/responseSanitizer.ts 1103->1122 (SanitizeOpenAIResponseOptions + stripReasoning, #4678) - open-sse/services/tokenRefresh.ts 2070->2090 (codex 401 unrecoverable-refresh guard, #4686) - tests/unit/token-refresh-service.test.ts 1322->1353 (401 regression case, #4686) - tests/unit/translator-openai-responses-req.test.ts 1047->1050 (reasoning_effort assertion, #4688) * docs(env): document HEADROOM_URL in .env.example + ENVIRONMENT.md The headroom proxy lifecycle (#4649) reads HEADROOM_URL (src/lib/headroom/detect.ts, default http://localhost:8787) but it was missing from the env contract, tripping check:env-doc-sync. Adds the var to both .env.example (commented, has a default) and the Proxy Health table in ENVIRONMENT.md. * fix(sse): stream writer mock abort() returns a Promise (#4788) Integrated into release/v3.8.37 — cherry-picked defining commit onto release tip; tests green. * fix(cli): fall back to default data dir when DATA_DIR is not writable (#4767) Integrated into release/v3.8.37 — cherry-picked defining commit onto release tip; tests green. * fix(oauth): verify Cursor installation on Linux before auto-import (#4770) Integrated into release/v3.8.37 — cherry-picked defining commit onto release tip; tests green. * fix(sse): track Ollama streaming usage from raw NDJSON chunks (#4754) Integrated into release/v3.8.37 — cherry-picked defining commit onto release tip; tests green. * fix(sse): strip enumDescriptions from antigravity tool schema (#4740) Integrated into release/v3.8.37 — cherry-picked defining commit onto release tip; tests green. * fix(sse): include low-level cause details in formatProviderError (#4741) Integrated into release/v3.8.37 — cherry-picked defining commit onto release tip; tests green. * fix(translator): strip x-anthropic-billing-header in claude-to-openai (#4728) Integrated into release/v3.8.37 — cherry-picked defining commit onto release tip; tests green. * fix(sse): gate Kiro image attachments behind a Claude-capability check (#4763) Integrated into release/v3.8.37 — cherry-picked defining commit onto release tip; tests green. * fix(sse): read Antigravity usage from the response.usageMetadata envelope (#4785) Integrated into release/v3.8.37 — Antigravity response.usageMetadata envelope. Cherry-picked onto release tip (resolved test-tail adjacency with #4754 Ollama block); usage-extractor 23/23 green. * fix(api): fall back to existing access token for any OAuth provider on refresh failure (#4786) Integrated into release/v3.8.37 — cherry-picked defining commit onto release tip; tests green. * fix(cli): verify launchd registration + skip self-SIGTERM in macOS autostart (#4765) Integrated into release/v3.8.37 — cherry-picked defining commit onto release tip; tests green. * fix(executors): anthropic-compatible-* gateways get Bearer alongside x-api-key (#4729) Integrated into release/v3.8.37 — cherry-picked defining commit onto release tip; tests green. * fix(sse): json_schema fallback for OpenAI-compatible providers (#4766) Integrated into release/v3.8.37 — cherry-picked defining commit onto release tip; tests green. * fix(sse): use workos auth token shape for cline (#4787) Integrated into release/v3.8.37 — cherry-picked defining commit onto release tip; tests green. * feat(sse): parse Gemini CLI 429 retryDelay from structured RetryInfo (#4738) Integrated into release/v3.8.37 — cherry-picked defining commit onto release tip; tests green. * fix(sse): finalize tool_calls finish_reason on early stream end in OpenAI Responses translator (#4764) Integrated into release/v3.8.37 — computeFinishReason finalizes tool_calls on early stream end (Responses translator). Cherry-picked onto release tip; responses-translation-fixes 29/29 green. * test(sse): golden-lock provider.ts translate-path across all providers (#4734) Integrated into release/v3.8.37 — golden-lock for provider.ts translate-path. Cherry-picked onto release tip; snapshot regenerated against the current provider set (UPDATE_GOLDEN=1, 167 entries); golden test 3/3 deterministic. * chore(quality): rebaseline file-size for rc17 leva2 PR batch drift Own growth from the merged leva2 PRs (cohesive, not extractable): - src/lib/usage/providerLimits.ts 950->955 (#4786) - open-sse/executors/default.ts NEW frozen @828 (#4729 + #4766 + #4787 header branches) - open-sse/translator/request/openai-to-kiro.ts 807->814 (#4763) - open-sse/translator/response/openai-responses.ts 923->937 (#4764) - tests/unit/executor-default-base.test.ts 1339->1440 (#4766) - tests/unit/translator-openai-to-kiro.test.ts 918->980 (#4763) * fix(dashboard): align Engine Combos editor engines with API schema (#4955) (#5062) The named-combos pipeline dropdown offered four engines (headroom, session-dedup, ccr, llmlingua) that stackedPipelineStepSchema rejects, so selecting one made PUT /api/context/combos/[id] return HTTP 400 while saveCombo swallowed the non-OK response (if (!res.ok) return). Editing the default 'Standard Savings' combo and changing an engine reproduced the 400. - Add canonical STACKED_PIPELINE_ENGINE_INTENSITIES next to the schema as the single source of truth; the client dropdown imports it so it can never drift from the discriminated union the API validates against. - Surface save errors and empty-name/empty-pipeline validation in the editor instead of failing silently. - Add a parity unit test asserting the UI engine map equals the schema union and that every (engine, intensity) the UI emits is accepted. * fix(sse): filter nameless hosted tools when converting Responses API to Chat format (#4789) Integrated into release/v3.8.37 — cherry-picked defining commit onto release tip; CHANGELOG re-merged; tests green. * fix(dashboard): keep desktop sidebar visible via explicit CSS class (#4812) Integrated into release/v3.8.37 — cherry-picked defining commit onto release tip; CHANGELOG re-merged; tests green. * fix(sse): strip enumDescriptions from Antigravity tool schemas (#4813) Integrated into release/v3.8.37 — cherry-picked defining commit onto release tip; CHANGELOG re-merged; tests green. * fix(dashboard): resolve passthrough model aliases by providerId in ModelSelectModal (#4815) Integrated into release/v3.8.37 — cherry-picked defining commit onto release tip; CHANGELOG re-merged; tests green. * fix(oauth): allow per-connection refresh lead-time override via providerSpecificData.refreshLeadMs (#4818) Integrated into release/v3.8.37 — cherry-picked defining commit onto release tip; CHANGELOG re-merged; tests green. * fix(sse): strip X-Stainless-* headers and normalize SDK User-Agent for OpenAI-compatible endpoints (#4820) Integrated into release/v3.8.37 — cherry-picked defining commit onto release tip; CHANGELOG re-merged; tests green. * fix(sse): strip Gemini built-in tools when functionDeclarations present in Antigravity envelope (#4821) Integrated into release/v3.8.37 — cherry-picked defining commit onto release tip; CHANGELOG re-merged; tests green. * fix(api): surface a Docker-localhost hint on provider-node validation connection errors (#4822) Integrated into release/v3.8.37 — cherry-picked defining commit onto release tip; CHANGELOG re-merged; tests green. * fix(sse): resolve bare model names to connection defaultModel before upstream calls (#4825) Integrated into release/v3.8.37 — cherry-picked defining commit onto release tip; CHANGELOG re-merged; tests green. * fix(build): trace-include sql.js sql-wasm.wasm in standalone bundle (#4839) Integrated into release/v3.8.37 — cherry-picked defining commit onto release tip; CHANGELOG re-merged; tests green. * fix(sse): strip Composer <|final|> sentinel markers leaking after Composer reasoning (#4842) Integrated into release/v3.8.37 — cherry-picked defining commit onto release tip; CHANGELOG re-merged; tests green. * fix(config): sync full SiliconFlow model list into registry (#4844) Integrated into release/v3.8.37 — cherry-picked defining commit onto release tip; CHANGELOG re-merged; tests green. * fix(sse): close reasoning before message content in Responses stream (#4848) Integrated into release/v3.8.37 — cherry-picked defining commit onto release tip; CHANGELOG re-merged; tests green. * fix(sse): reject unsupported Kiro [1m] context suffix (#4816) Integrated into release/v3.8.37 — cherry-picked onto release tip; test-tail conflict with #4763 resolved (kept both image + [1m] test blocks); CHANGELOG re-merged; 29/29 green. * fix(db): validate HuggingFace tokens via whoami-v2 auth probe (#4819) Integrated into release/v3.8.37 — defining commit re-homed onto the god-file-split validation module (validateHuggingFaceProvider in validation/openaiFormat.ts + map wiring); 115/115 green. * fix(sse): make anthropic-version default-guard case-insensitive (#4823) Integrated into release/v3.8.37 — conflict with #4729 Bearer-fallback resolved (kept both Bearer fallback + case-insensitive anthropic-version guard); 48/48 green. * fix(sse): sanitize Kiro tool schemas to avoid 400 "Improperly formed request" (#4847) Integrated into release/v3.8.37 — conflict in kiro-to-openai.ts resolved (kept release fallbackToolCallId + adopted #1375 toolNameMap remap); 7/7 green. * feat(sse): add GPT-4 to the GitHub Copilot provider (#4798) Integrated into release/v3.8.37 — cherry-picked defining commit onto release tip; CHANGELOG re-merged; tests green. * feat(sse): add GPT-4o mini to GitHub Copilot provider (#4797) Integrated into release/v3.8.37 — cherry-picked defining commit onto release tip; CHANGELOG re-merged; tests green. * feat(api): add MiniMax-M3 pricing row (#4814) Integrated into release/v3.8.37 — pricing row re-homed onto god-file-split pricing/regional.ts (pricing.ts is now a barrel); 4/4 green. * fix(cli): save runtime deps with --save-exact so a sibling install can't prune them (#4841) Integrated into release/v3.8.37 — trayRuntime conflict resolved (kept release SYSTRAY_SPEC + added --save-exact); 2/2 green. * fix(sse): preserve required fields in antigravity tool schemas (#4843) Integrated into release/v3.8.37 — conflict resolved (kept #4740/#4813 enumDescriptions strip + typed normalizeSchemaTypes, added required-preservation helpers; test-tail merged keeping both enumDescriptions + required tests); 7/7 green. * chore(quality): rebaseline file-size for rc17b leva3 PR batch drift * fix(sse): strip reasoning blobs from agentic context to prevent O(n^2) token growth (#4849) Integrated into release/v3.8.37 — cherry-picked defining commit onto release tip; CHANGELOG re-merged; tests green. * fix(sse): unwrap Qoder HTTP 200 SSE error envelope so fallback can trigger (#4850) Integrated into release/v3.8.37 — cherry-picked defining commit onto release tip; CHANGELOG re-merged; tests green. * fix(sse): strip temperature for Claude models with extended thinking (#4853) Integrated into release/v3.8.37 — cherry-picked defining commit onto release tip; CHANGELOG re-merged; tests green. * fix(sse): emit valid concatenable kiro tool_calls.arguments deltas (#4855) Integrated into release/v3.8.37 — cherry-picked defining commit onto release tip; CHANGELOG re-merged; tests green. * feat(sse): add toggleable tool-source diagnostics (#4856) Integrated into release/v3.8.37 — cherry-picked defining commit onto release tip; CHANGELOG re-merged; tests green. * fix(sse): redact api key from the AUTH debug log in the chat handler (#4858) Integrated into release/v3.8.37 — cherry-picked defining commit onto release tip; CHANGELOG re-merged; tests green. * fix(sse): forward AI SDK image parts in Responses translator (#4859) Integrated into release/v3.8.37 — cherry-picked defining commit onto release tip; CHANGELOG re-merged; tests green. * fix(sse): resolve custom combos by id and case-insensitive name (#4446) (#4869) Integrated into release/v3.8.37 — cherry-picked defining commit onto release tip; CHANGELOG re-merged; tests green. * fix(sse): exclude WS bridge controller-closed error from provider breaker (#4602) (#4870) Integrated into release/v3.8.37 — cherry-picked defining commit onto release tip; CHANGELOG re-merged; tests green. * feat(providers): add xAI Grok inbound translators and thinking patcher (#4910) Integrated into release/v3.8.37 — cherry-picked defining commit onto release tip; CHANGELOG re-merged; tests green. * feat(embeddings): add dimensions override field to embedding combos (#4913) Integrated into release/v3.8.37 — cherry-picked defining commit onto release tip; CHANGELOG re-merged; tests green. * feat(oauth): Codex bulk-import endpoint — POST /api/oauth/codex/import (#4914) Integrated into release/v3.8.37 — cherry-picked defining commit onto release tip; CHANGELOG re-merged; tests green. * fix(antigravity): retry transient upstream failures (#4941) Integrated into release/v3.8.37 — cherry-picked defining commit onto release tip; CHANGELOG re-merged; tests green. * fix(sse): surface malformed HTTP-200 upstream responses (#4942) Integrated into release/v3.8.37 — cherry-picked defining commit onto release tip; CHANGELOG re-merged; tests green. * fix(sse): normalize Codex custom tools (apply_patch) to { input: string } schema (#4862) Integrated into release/v3.8.37 — conflict in request/openai-responses.ts resolved (kept #4789 nameless-tool skip + added #1007 custom-tool {input:string} normalization); 48/48 green incl. #4789/#4859 regression. * fix(sse): dense, deterministic output ordering in Responses API response.completed (#4906) Integrated into release/v3.8.37 — manual integration with #4862 in response/openai-responses.ts (custom-tool funcItem + dense recordCompletedItem). Fixed a latent #4848 interaction: the close-reasoning-before-message guard force-closed <think>-tag reasoning prematurely, which dense output (#4906) then snapshotted as a partial buffer ("plan" vs "planning") — scoped the guard to native reasoning_content (!inThinking) in BOTH transformer + translator paths. Full Responses suite 203/203 green incl. #4848/#4862 regression. * feat(sse): auto-promote successful combo model to position #1 (#4852) Integrated into release/v3.8.37 — dropped the stale file-size-baseline.json hunk (re-derived against the rc17b rebaseline); code+test applied clean; 13/13 green. * feat(providers): add Pioneer AI (Fastino Labs) provider (#4909) Integrated into release/v3.8.37 — providers.ts apikey block re-homed onto god-file-split src/shared/constants/providers/apikey/frontier-labs.ts (inline APIKEY_PROVIDERS no longer exists); registry/pioneer + providers/index.ts applied clean; 6/6 green. * add DGrid AI gateway provider (#4931) Integrated into release/v3.8.37 — rebased the contributor's commit onto the release tip; providers.ts god-file-split conflict resolved by relocating the dgrid APIKEY_PROVIDERS entry into apikey/gateways.ts; CHANGELOG added. 7/7 green. Thanks @dgridOP! * chore(quality): rebaseline file-size for rc17b leva4 PR batch drift * docs(routing): sync combo strategy docs for Fusion (17 strategies) (#5067) Fusion (16th strategy, panel fan-out + judge synthesis) and headroom shipped but the strategy-count docs were stale (14/15) and omitted both. Update every combo-strategy reference to the canonical 17, add fusion + headroom to all strategy tables, and add a dedicated Fusion section to AUTO-COMBO.md documenting judgeModel / fusionTuning config + an example. - CLAUDE.md, README.md, FEATURES.md, RESILIENCE_GUIDE.md, ARCHITECTURE.md, OPEN_SSE_ARCHITECTURE.md, OMNIROUTE_VS_ALTERNATIVES.md, docs/README.md, request-pipeline.mmd: 14/15 -> 17, list fusion + headroom - docs/routing/AUTO-COMBO.md: strategy table + new Fusion strategy section - docs/openapi.yaml: add reset-window, headroom, fusion to the strategy enum * fix(oauth): classify /api/oauth/cursor/auto-import as local-only (route-guard) (#5070) The Cursor auto-import route runs execFile("which", ["cursor"]) to verify a local Cursor install before importing credentials — a child-process spawn. The check:route-guard-membership gate (Hard Rules #15/#17) flagged it as an unclassified spawn-capable route: reachable past the loopback gate, an RCE-via-tunnel surface (a leaked JWT over a tunnel could trigger the spawn). Classify the specific path in LOCAL_ONLY_API_PREFIXES so loopback enforcement runs unconditionally before any auth check. Scoped to the exact path — the rest of /api/oauth/ (browser redirect/callback flows) stays remote-reachable. TDD: added a failing-then-passing assertion in route-guard-local-prefix.test.ts (classification + an over-broadening guard proving sibling OAuth paths stay remote). check:route-guard-membership now reports 0 new gaps. * chore(release): v3.8.37 — 2026-06-26 --------- Co-authored-by: dgridOP <dgrid_op@outlook.com>
597 lines
20 KiB
TypeScript
597 lines
20 KiB
TypeScript
// @ts-nocheck
|
|
/**
|
|
* Token Usage Tracking - Extract, normalize, estimate and log token usage
|
|
*/
|
|
|
|
import { appendRequestLog } from "@/lib/usageDb";
|
|
import {
|
|
getLoggedInputTokens,
|
|
getLoggedOutputTokens,
|
|
getPromptCacheCreationTokens,
|
|
getPromptCacheReadTokens,
|
|
} from "@/lib/usage/tokenAccounting";
|
|
import { FORMATS } from "../translator/formats.ts";
|
|
|
|
// ANSI color codes
|
|
export const COLORS = {
|
|
reset: "\x1b[0m",
|
|
red: "\x1b[31m",
|
|
green: "\x1b[32m",
|
|
yellow: "\x1b[33m",
|
|
blue: "\x1b[34m",
|
|
cyan: "\x1b[36m",
|
|
};
|
|
|
|
/**
|
|
* Safety buffer added to reported token usage to prevent clients from hitting
|
|
* context window limits. Accounts for overhead from system prompts,
|
|
* tool definitions, and format translation that may not be reflected in raw usage.
|
|
*
|
|
* Configurable via:
|
|
* - Settings API / Dashboard: `usageTokenBuffer` (persisted in DB)
|
|
* - Environment variable: `USAGE_TOKEN_BUFFER`
|
|
* - Defaults to 2000 if neither is set
|
|
*
|
|
* Set to 0 to disable the buffer entirely (raw provider token counts).
|
|
*/
|
|
const DEFAULT_BUFFER_TOKENS = 2000;
|
|
|
|
let _cachedBuffer: number | null = null;
|
|
let _cacheTimestamp = 0;
|
|
const CACHE_TTL_MS = 30_000; // Re-read from DB/env every 30s
|
|
|
|
function getBufferTokens(): number {
|
|
const now = Date.now();
|
|
const isExpired = _cachedBuffer !== null && now - _cacheTimestamp >= CACHE_TTL_MS;
|
|
|
|
if (_cachedBuffer !== null && !isExpired) {
|
|
return _cachedBuffer;
|
|
}
|
|
|
|
// Priority: env var > cached DB value > default
|
|
const envVal = process.env.USAGE_TOKEN_BUFFER;
|
|
if (envVal !== undefined) {
|
|
const parsed = parseInt(envVal, 10);
|
|
if (!isNaN(parsed) && parsed >= 0) {
|
|
_cachedBuffer = parsed;
|
|
_cacheTimestamp = now;
|
|
return parsed;
|
|
}
|
|
}
|
|
|
|
// Return cached value or default; kick off async DB read to update cache.
|
|
// On first call (_cachedBuffer is null), use the default.
|
|
// On TTL expiry (_cachedBuffer is stale), continue returning the stale value
|
|
// while refreshing asynchronously — prevents blocking the hot path.
|
|
if (_cachedBuffer === null || isExpired) {
|
|
if (_cachedBuffer === null) {
|
|
_cachedBuffer = DEFAULT_BUFFER_TOKENS;
|
|
}
|
|
_cacheTimestamp = now;
|
|
_loadBufferFromDb();
|
|
}
|
|
return _cachedBuffer;
|
|
}
|
|
|
|
async function _loadBufferFromDb(): Promise<void> {
|
|
try {
|
|
const { getSettings } = await import("@/lib/db/settings");
|
|
const settings = await getSettings();
|
|
const val = settings.usageTokenBuffer;
|
|
if (typeof val === "number" && val >= 0) {
|
|
_cachedBuffer = val;
|
|
_cacheTimestamp = Date.now();
|
|
}
|
|
} catch {
|
|
// DB not ready yet or settings unavailable — keep current value
|
|
}
|
|
}
|
|
|
|
/** Force-refresh the buffer from settings (e.g. after a settings update). */
|
|
export function invalidateBufferTokensCache(): void {
|
|
_cachedBuffer = null;
|
|
_cacheTimestamp = 0;
|
|
}
|
|
|
|
/**
|
|
* Directly set the cached buffer value — called by runtimeSettings after a
|
|
* settings save so the new value is available synchronously on the next request
|
|
* (no race window between invalidation and the async DB re-read).
|
|
*/
|
|
export function setBufferTokensCache(value: number): void {
|
|
_cachedBuffer = value;
|
|
_cacheTimestamp = Date.now();
|
|
}
|
|
|
|
// Get HH:MM:SS timestamp
|
|
function getTimeString() {
|
|
return new Date().toLocaleTimeString("en-US", {
|
|
hour12: false,
|
|
hour: "2-digit",
|
|
minute: "2-digit",
|
|
second: "2-digit",
|
|
});
|
|
}
|
|
|
|
/**
|
|
* Add buffer tokens to usage to prevent context errors
|
|
* @param {object} usage - Usage object (supported format)
|
|
* @returns {object} Usage with buffer added
|
|
*/
|
|
export function addBufferToUsage(usage) {
|
|
if (!usage || typeof usage !== "object") return usage;
|
|
|
|
const buffer = getBufferTokens();
|
|
if (buffer === 0) return usage;
|
|
|
|
const result = { ...usage };
|
|
|
|
// Claude format
|
|
if (result.input_tokens !== undefined) {
|
|
result.input_tokens += buffer;
|
|
}
|
|
|
|
// OpenAI format
|
|
if (result.prompt_tokens !== undefined) {
|
|
result.prompt_tokens += buffer;
|
|
}
|
|
|
|
// Calculate or update total_tokens
|
|
if (result.total_tokens !== undefined) {
|
|
result.total_tokens += buffer;
|
|
} else if (result.prompt_tokens !== undefined && result.completion_tokens !== undefined) {
|
|
// Calculate total_tokens if not exists
|
|
result.total_tokens = result.prompt_tokens + result.completion_tokens;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
export function filterUsageForFormat(usage, targetFormat) {
|
|
if (!usage || typeof usage !== "object") return usage;
|
|
|
|
// Cross-map between Claude-style and OpenAI-style field names before filtering.
|
|
// Some providers return input_tokens/output_tokens even when using OpenAI format.
|
|
const convertedUsage = { ...usage };
|
|
if (targetFormat === FORMATS.CLAUDE || targetFormat === FORMATS.OPENAI_RESPONSES) {
|
|
// OpenAI → Claude: prompt_tokens → input_tokens
|
|
if (convertedUsage.prompt_tokens !== undefined && convertedUsage.input_tokens === undefined) {
|
|
convertedUsage.input_tokens = convertedUsage.prompt_tokens;
|
|
}
|
|
if (
|
|
convertedUsage.completion_tokens !== undefined &&
|
|
convertedUsage.output_tokens === undefined
|
|
) {
|
|
convertedUsage.output_tokens = convertedUsage.completion_tokens;
|
|
}
|
|
} else {
|
|
// Claude → OpenAI: input_tokens → prompt_tokens
|
|
if (convertedUsage.input_tokens !== undefined && convertedUsage.prompt_tokens === undefined) {
|
|
convertedUsage.prompt_tokens = convertedUsage.input_tokens;
|
|
}
|
|
if (
|
|
convertedUsage.output_tokens !== undefined &&
|
|
convertedUsage.completion_tokens === undefined
|
|
) {
|
|
convertedUsage.completion_tokens = convertedUsage.output_tokens;
|
|
}
|
|
// Ensure total_tokens is set
|
|
if (
|
|
convertedUsage.total_tokens === undefined &&
|
|
convertedUsage.prompt_tokens !== undefined &&
|
|
convertedUsage.completion_tokens !== undefined
|
|
) {
|
|
convertedUsage.total_tokens = convertedUsage.prompt_tokens + convertedUsage.completion_tokens;
|
|
}
|
|
}
|
|
|
|
// Helper to pick only defined fields from usage
|
|
const pickFields = (fields) => {
|
|
const filtered = {};
|
|
for (const field of fields) {
|
|
if (convertedUsage[field] !== undefined) {
|
|
filtered[field] = convertedUsage[field];
|
|
}
|
|
}
|
|
return filtered;
|
|
};
|
|
|
|
// Define allowed fields for each format
|
|
const formatFields = {
|
|
[FORMATS.CLAUDE]: [
|
|
"input_tokens",
|
|
"output_tokens",
|
|
"cache_read_input_tokens",
|
|
"cache_creation_input_tokens",
|
|
"estimated",
|
|
],
|
|
[FORMATS.GEMINI]: [
|
|
"promptTokenCount",
|
|
"candidatesTokenCount",
|
|
"totalTokenCount",
|
|
"cachedContentTokenCount",
|
|
"thoughtsTokenCount",
|
|
"estimated",
|
|
],
|
|
[FORMATS.OPENAI_RESPONSES]: [
|
|
"input_tokens",
|
|
"output_tokens",
|
|
"input_tokens_details",
|
|
"output_tokens_details",
|
|
"estimated",
|
|
],
|
|
// OpenAI format (default for OPENAI, CODEX, KIRO, etc.)
|
|
default: [
|
|
"prompt_tokens",
|
|
"completion_tokens",
|
|
"total_tokens",
|
|
"cached_tokens",
|
|
"reasoning_tokens",
|
|
"prompt_tokens_details",
|
|
"completion_tokens_details",
|
|
"estimated",
|
|
],
|
|
};
|
|
|
|
// Get fields for target format
|
|
let fields = formatFields[targetFormat];
|
|
|
|
// Use same fields for similar formats
|
|
if (targetFormat === FORMATS.GEMINI_CLI || targetFormat === FORMATS.ANTIGRAVITY) {
|
|
fields = formatFields[FORMATS.GEMINI];
|
|
} else if (targetFormat === FORMATS.OPENAI_RESPONSE) {
|
|
fields = formatFields[FORMATS.OPENAI_RESPONSES];
|
|
} else if (!fields) {
|
|
fields = formatFields.default;
|
|
}
|
|
|
|
return pickFields(fields);
|
|
}
|
|
|
|
/**
|
|
* Normalize usage object - ensure all values are valid numbers
|
|
*/
|
|
export function normalizeUsage(usage) {
|
|
if (!usage || typeof usage !== "object" || Array.isArray(usage)) return null;
|
|
|
|
const normalized = {};
|
|
const assignNumber = (key, value) => {
|
|
if (value === undefined || value === null) return;
|
|
const numeric = Number(value);
|
|
if (Number.isFinite(numeric)) normalized[key] = numeric;
|
|
};
|
|
|
|
assignNumber("prompt_tokens", usage?.prompt_tokens);
|
|
assignNumber("completion_tokens", usage?.completion_tokens);
|
|
assignNumber("total_tokens", usage?.total_tokens);
|
|
assignNumber("input_tokens", usage?.input_tokens);
|
|
assignNumber("output_tokens", usage?.output_tokens);
|
|
assignNumber("cache_read_input_tokens", usage?.cache_read_input_tokens);
|
|
assignNumber("cache_creation_input_tokens", usage?.cache_creation_input_tokens);
|
|
assignNumber("cached_tokens", usage?.cached_tokens);
|
|
assignNumber("reasoning_tokens", usage?.reasoning_tokens);
|
|
|
|
if (Object.keys(normalized).length === 0) return null;
|
|
return normalized;
|
|
}
|
|
|
|
/**
|
|
* Check if usage has valid token data
|
|
* Valid = has at least one token field with value > 0
|
|
* Invalid = empty object {}, null, undefined, no token fields, or all zeros
|
|
*/
|
|
export function hasValidUsage(usage) {
|
|
if (!usage || typeof usage !== "object") return false;
|
|
|
|
// Check for known token fields with value > 0
|
|
const tokenFields = [
|
|
"prompt_tokens",
|
|
"completion_tokens",
|
|
"total_tokens", // OpenAI
|
|
"input_tokens",
|
|
"output_tokens", // Claude
|
|
"promptTokenCount",
|
|
"candidatesTokenCount", // Gemini
|
|
];
|
|
|
|
for (const field of tokenFields) {
|
|
if (typeof usage[field] === "number" && usage[field] > 0) {
|
|
return true;
|
|
}
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
/**
|
|
* Extract usage from supported formats (Claude, OpenAI, Gemini, Responses API)
|
|
*/
|
|
export function extractUsage(chunk) {
|
|
if (!chunk || typeof chunk !== "object") return null;
|
|
|
|
// Claude/Antigravity streaming: message_start event carries INPUT tokens
|
|
// FIX #74: This event was not handled — input_tokens were being dropped
|
|
// Structure: { type: "message_start", message: { usage: { input_tokens: N, output_tokens: 0 } } }
|
|
//
|
|
// Note: Claude's input_tokens is only the non-cached portion.
|
|
// Sum cache tokens into prompt_tokens for a correct total (consistent with
|
|
// extractUsageFromResponse in usageExtractor.ts for non-streaming).
|
|
if (chunk.type === "message_start" && chunk.message?.usage) {
|
|
const u = chunk.message.usage;
|
|
const inputTokens = u.input_tokens || u.prompt_tokens || 0;
|
|
const cacheRead = u.cache_read_input_tokens || 0;
|
|
const cacheCreation = u.cache_creation_input_tokens || 0;
|
|
if (inputTokens > 0 || cacheRead > 0 || cacheCreation > 0) {
|
|
return normalizeUsage({
|
|
prompt_tokens: inputTokens + cacheRead + cacheCreation,
|
|
completion_tokens: u.output_tokens || u.completion_tokens || 0,
|
|
input_tokens: inputTokens + cacheRead + cacheCreation,
|
|
output_tokens: u.output_tokens || u.completion_tokens || 0,
|
|
cache_read_input_tokens: u.cache_read_input_tokens,
|
|
cache_creation_input_tokens: u.cache_creation_input_tokens,
|
|
});
|
|
}
|
|
}
|
|
|
|
// Claude format (message_delta event) — typically carries OUTPUT tokens
|
|
if (chunk.type === "message_delta" && chunk.usage && typeof chunk.usage === "object") {
|
|
const deltaInput = chunk.usage.input_tokens || 0;
|
|
const deltaCacheRead = chunk.usage.cache_read_input_tokens || 0;
|
|
const deltaCacheCreation = chunk.usage.cache_creation_input_tokens || 0;
|
|
return normalizeUsage({
|
|
prompt_tokens: deltaInput + deltaCacheRead + deltaCacheCreation,
|
|
completion_tokens: chunk.usage.output_tokens || 0,
|
|
input_tokens: deltaInput + deltaCacheRead + deltaCacheCreation,
|
|
output_tokens: chunk.usage.output_tokens || 0,
|
|
cache_read_input_tokens: chunk.usage.cache_read_input_tokens,
|
|
cache_creation_input_tokens: chunk.usage.cache_creation_input_tokens,
|
|
});
|
|
}
|
|
|
|
// OpenAI Responses API format (response.completed or response.done)
|
|
if (
|
|
(chunk.type === "response.completed" || chunk.type === "response.done") &&
|
|
chunk.response?.usage &&
|
|
typeof chunk.response.usage === "object"
|
|
) {
|
|
const usage = chunk.response.usage;
|
|
return normalizeUsage({
|
|
prompt_tokens: usage.input_tokens || usage.prompt_tokens || 0,
|
|
completion_tokens: usage.output_tokens || usage.completion_tokens || 0,
|
|
cached_tokens:
|
|
usage.input_tokens_details?.cached_tokens ??
|
|
usage.prompt_tokens_details?.cached_tokens ??
|
|
usage.cache_read_input_tokens,
|
|
cache_creation_input_tokens: usage.cache_creation_input_tokens,
|
|
reasoning_tokens:
|
|
usage.output_tokens_details?.reasoning_tokens ??
|
|
usage.completion_tokens_details?.reasoning_tokens ??
|
|
usage.reasoning_tokens,
|
|
});
|
|
}
|
|
|
|
// OpenAI format
|
|
if (
|
|
chunk.usage &&
|
|
typeof chunk.usage === "object" &&
|
|
(chunk.usage.prompt_tokens !== undefined || chunk.usage.input_tokens !== undefined)
|
|
) {
|
|
return normalizeUsage({
|
|
prompt_tokens: chunk.usage.prompt_tokens ?? chunk.usage.input_tokens ?? 0,
|
|
completion_tokens: chunk.usage.completion_tokens ?? chunk.usage.output_tokens ?? 0,
|
|
cached_tokens:
|
|
chunk.usage.prompt_tokens_details?.cached_tokens ??
|
|
chunk.usage.input_tokens_details?.cached_tokens ??
|
|
chunk.usage.prompt_cache_hit_tokens ??
|
|
chunk.usage.cached_tokens,
|
|
reasoning_tokens:
|
|
chunk.usage.completion_tokens_details?.reasoning_tokens ??
|
|
chunk.usage.output_tokens_details?.reasoning_tokens ??
|
|
chunk.usage.reasoning_tokens,
|
|
});
|
|
}
|
|
|
|
// Gemini format (Antigravity)
|
|
// Antigravity wraps usageMetadata inside a `response` envelope:
|
|
// { response: { usageMetadata: {...} } } — fall back to it so AG-shaped
|
|
// chunks do not silently drop token usage.
|
|
const usageMeta = chunk.usageMetadata || chunk.response?.usageMetadata;
|
|
if (usageMeta && typeof usageMeta === "object") {
|
|
return normalizeUsage({
|
|
prompt_tokens: usageMeta.promptTokenCount || 0,
|
|
completion_tokens: usageMeta.candidatesTokenCount || 0,
|
|
total_tokens: usageMeta.totalTokenCount,
|
|
cached_tokens: usageMeta.cachedContentTokenCount,
|
|
reasoning_tokens: usageMeta.thoughtsTokenCount,
|
|
});
|
|
}
|
|
|
|
// Ollama NDJSON format (raw from provider, before translation)
|
|
// Ollama sends: { "model": "...", "done": true, "prompt_eval_count": N, "eval_count": M }
|
|
if (chunk.done === true && typeof chunk.prompt_eval_count === "number") {
|
|
const promptEvalCount = chunk.prompt_eval_count || 0;
|
|
const evalCount = chunk.eval_count || 0;
|
|
return normalizeUsage({
|
|
prompt_tokens: promptEvalCount,
|
|
completion_tokens: evalCount,
|
|
total_tokens: promptEvalCount + evalCount,
|
|
});
|
|
}
|
|
|
|
return null;
|
|
}
|
|
|
|
// Heuristic token estimation constants
|
|
const CHARS_PER_TOKEN_SCHEMA = 6; // ~6 chars/token for JSON schemas (more verbose per token)
|
|
|
|
/**
|
|
* Improved token estimation heuristic (no dependency).
|
|
* Splits text on common token boundaries (whitespace, punctuation, camelCase)
|
|
* and applies a sub-word correction factor. Better accuracy for:
|
|
* - English text (~4 chars/token)
|
|
* - CJK text (~1 char/token for ideographs)
|
|
* - Code (~3.5 chars/token, more punctuation-heavy)
|
|
*
|
|
* @param {string} text - Text to estimate tokens for
|
|
* @returns {number} Estimated token count
|
|
*/
|
|
function estimateTokenCount(text) {
|
|
if (!text || typeof text !== "string") return 0;
|
|
|
|
// Count CJK ideographs separately — each is roughly 1 token
|
|
const cjkMatches = text.match(/[\u3000-\u9fff\uf900-\ufaff\u{20000}-\u{2fa1f}]/gu);
|
|
const cjkCount = cjkMatches ? cjkMatches.length : 0;
|
|
|
|
// Remove CJK chars for the remaining estimation
|
|
const nonCJK = text.replace(/[\u3000-\u9fff\uf900-\ufaff]/g, " ");
|
|
|
|
// Split on token boundaries: whitespace, punctuation, camelCase transitions
|
|
const tokens = nonCJK
|
|
.split(/(\s+|[^\w\s]|(?<=[a-z])(?=[A-Z]))/)
|
|
.filter((t) => t && t.trim().length > 0);
|
|
|
|
// Apply sub-word correction: BPE tokenizers often split long words
|
|
// into sub-word pieces, so raw token count underestimates slightly
|
|
const estimatedNonCJK = Math.ceil(tokens.length * 1.3);
|
|
|
|
return cjkCount + estimatedNonCJK;
|
|
}
|
|
|
|
/**
|
|
* Estimate input tokens from request body.
|
|
* Separates tool definitions (JSON schemas) from message content
|
|
* for more accurate estimation since JSON schemas are more verbose but
|
|
* compress into fewer tokens than plain text.
|
|
*/
|
|
export function estimateInputTokens(body) {
|
|
if (!body || typeof body !== "object") return 0;
|
|
|
|
try {
|
|
let toolTokens = 0;
|
|
let messageTokens = 0;
|
|
|
|
// Separate tool definitions from the rest of the body
|
|
if (body.tools && Array.isArray(body.tools)) {
|
|
const toolStr = JSON.stringify(body.tools);
|
|
toolTokens = Math.ceil(toolStr.length / CHARS_PER_TOKEN_SCHEMA);
|
|
// Estimate messages without tools
|
|
const { tools, ...bodyWithoutTools } = body;
|
|
messageTokens = estimateTokenCount(JSON.stringify(bodyWithoutTools));
|
|
} else {
|
|
messageTokens = estimateTokenCount(JSON.stringify(body));
|
|
}
|
|
|
|
return messageTokens + toolTokens;
|
|
} catch (err) {
|
|
// Fallback if stringify fails
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Estimate output tokens from content length.
|
|
* Uses improved heuristic when possible, falls back to length-based estimation.
|
|
*/
|
|
export function estimateOutputTokens(contentLength) {
|
|
if (!contentLength || contentLength <= 0) return 0;
|
|
// When we only have a character count, use 4 chars/token with sub-word correction
|
|
return Math.max(1, Math.ceil(contentLength / 3.5));
|
|
}
|
|
|
|
/**
|
|
* Format usage object based on target format
|
|
* @param {number} inputTokens - Input/prompt tokens
|
|
* @param {number} outputTokens - Output/completion tokens
|
|
* @param {string} targetFormat - Target format from FORMATS
|
|
*/
|
|
export function formatUsage(inputTokens, outputTokens, targetFormat) {
|
|
// Claude format uses input_tokens/output_tokens
|
|
if (targetFormat === FORMATS.CLAUDE) {
|
|
return addBufferToUsage({
|
|
input_tokens: inputTokens,
|
|
output_tokens: outputTokens,
|
|
estimated: true,
|
|
});
|
|
}
|
|
|
|
// Default: OpenAI format (works for openai, gemini, responses, etc.)
|
|
return addBufferToUsage({
|
|
prompt_tokens: inputTokens,
|
|
completion_tokens: outputTokens,
|
|
total_tokens: inputTokens + outputTokens,
|
|
estimated: true,
|
|
});
|
|
}
|
|
|
|
/**
|
|
* Estimate full usage when provider doesn't return it
|
|
* @param {object} body - Request body for input token estimation
|
|
* @param {number} contentLength - Content length for output token estimation
|
|
* @param {string} targetFormat - Target format from FORMATS constant
|
|
*/
|
|
export function estimateUsage(body, contentLength, targetFormat = FORMATS.OPENAI) {
|
|
return formatUsage(estimateInputTokens(body), estimateOutputTokens(contentLength), targetFormat);
|
|
}
|
|
|
|
/**
|
|
* Log usage with cache info (green color)
|
|
*/
|
|
export function logUsage(
|
|
provider,
|
|
usage,
|
|
model: string | null = null,
|
|
connectionId: string | null = null,
|
|
apiKeyInfo = null
|
|
) {
|
|
if (!usage || typeof usage !== "object") return;
|
|
|
|
const p = provider?.toUpperCase() || "UNKNOWN";
|
|
|
|
// Support both formats:
|
|
// - OpenAI: prompt_tokens, completion_tokens
|
|
// - Claude: input_tokens, output_tokens
|
|
const inTokens = getLoggedInputTokens(usage);
|
|
const outTokens = getLoggedOutputTokens(usage);
|
|
void apiKeyInfo;
|
|
const normalizedConnectionId = typeof connectionId === "string" ? connectionId : undefined;
|
|
const accountPrefix = normalizedConnectionId
|
|
? normalizedConnectionId.slice(0, 8) + "..."
|
|
: "unknown";
|
|
|
|
let msg = `[${getTimeString()}] 📊 ${COLORS.green}[USAGE] ${p} | in=${inTokens} | out=${outTokens} | account=${accountPrefix}${COLORS.reset}`;
|
|
|
|
// Add estimated flag if present
|
|
if (usage.estimated) {
|
|
msg += ` ${COLORS.yellow}(estimated)${COLORS.reset}`;
|
|
}
|
|
|
|
// Add cache info if present (unified from different formats)
|
|
const cacheRead = getPromptCacheReadTokens(usage);
|
|
if (cacheRead) msg += ` | cache_read=${cacheRead}`;
|
|
|
|
const cacheCreation = getPromptCacheCreationTokens(usage);
|
|
if (cacheCreation) msg += ` | cache_create=${cacheCreation}`;
|
|
|
|
const reasoning = usage.reasoning_tokens;
|
|
if (reasoning) msg += ` | reasoning=${reasoning}`;
|
|
|
|
console.log(msg);
|
|
|
|
// Streaming requests persist usage once in chatCore's completion callback.
|
|
// Keep this helper side-effect free apart from console visibility.
|
|
const tokens = {
|
|
input: inTokens,
|
|
output: outTokens,
|
|
cacheRead: cacheRead || 0,
|
|
cacheCreation: cacheCreation || 0,
|
|
reasoning: reasoning || 0,
|
|
};
|
|
appendRequestLog({
|
|
model: typeof model === "string" ? model : undefined,
|
|
provider: typeof provider === "string" ? provider : undefined,
|
|
connectionId: normalizedConnectionId,
|
|
tokens,
|
|
status: "200 OK",
|
|
}).catch(() => {});
|
|
}
|