mirror of
https://github.com/diegosouzapw/OmniRoute.git
synced 2026-07-31 12:22:14 +03:00
* fix(streaming): #1211 greedy strip omniModel tags to prevent literal \n\n artifacts - Changed regex quantifier from ? to * in combo.ts, comboAgentMiddleware.ts, and contextHandoff.ts to greedily strip all JSON-escaped newline sequences surrounding <omniModel> tags in SSE streaming chunks - Added \r to the character class for cross-platform robustness - Fixed Playwright strict-mode violation in combo-unification.spec.ts - Bumped OpenAPI version and CHANGELOG to 3.6.6 * fix: 3 bugs found during issue triage (#1175, #1187/#1218, #1202) - fix(gemini): strip VS Code JSON Schema extensions from tool schemas (#1175) Add enumDescriptions, markdownDescription, markdownEnumDescriptions, enumItemLabels and tags to UNSUPPORTED_SCHEMA_CONSTRAINTS so the Gemini sanitizer removes them before forwarding. GitHub Copilot injects these non-standard fields into tool definitions, causing Gemini to reject with 'Unknown name enumDescriptions at functionDeclarations[n].parameters'. - fix(health-check): unwrap proxy config object before passing to getAccessToken (#1187 #1218) resolveProxyForConnection() returns { proxy, level, levelId } but the health check loop was passing the full wrapper to getAccessToken(), which expects the inner config object (.host, .port etc). The proxy dispatcher validated .host on the wrapper (undefined) and threw 'Context proxy host is required', silently marking every connection as unhealthy every sweep. Fix mirrors the pattern already used in chatHelpers.ts: proxyResult?.proxy || null. - fix(ui): debounce models.dev sync interval slider to save only on release (#1202) The slider's onChange fired updateInterval() on every drag tick, sending a PATCH per pixel of movement. Rapid API responses overwrote UI state mid-drag. Introduce draftIntervalHours for smooth visual feedback; the PATCH fires on onMouseUp / onBlur once the user releases the control. * fix(providers): update Xiaomi MiMo token-plan endpoints (#1238) Integrated into release/v3.6.6 * fix(cc-compatible): trim beta flags and preserve cache passthrough (#1230) Integrated into release/v3.6.6 * feat(memory+skills): full-featured memory & skills systems with tests (#1228) Integrated into release/v3.6.6 * fix: forward client x-initiator header to GitHub Copilot upstream (#1227) Integrated into release/v3.6.6 * feat(bailian-quota): add Alibaba Coding Plan quota monitoring (#1235) * fix: resolve v3.6.6 backlog bugs (#1206, #1211, #1220, #1231) - fix(core): #1206 inject startup guard against app/ and src/app/ conflict - fix(health): #1220 add HEALTHCHECK_STAGGER_MS to prevent token refresh bursting - fix(proxy): #1231 prioritize HTTP 429 over quota body heuristics - fix(sse): #1211 strip leading double-newlines in responses API stream * fix(tests): resolve memory migration and skills route pagination bugs from PR overlaps * docs: Update CHANGELOG.md with v3.6.6 features (#1182, #1165, #1177) * chore(release): bump version to 3.6.6 Update package versions for the electron app and open-sse package. Sync llm.txt metadata and feature headings with the 3.6.6 release. * feat(core): harden outbound provider calls and add cooldown retries Add guarded outbound fetch helpers with private/local URL blocking, controlled retries, timeout normalization, and route-level status propagation for provider validation and model discovery. Introduce cooldown-aware chat retries with configurable requestRetry and maxRetryIntervalSec settings, model-scoped cooldown responses, and improved rate-limit learning from headers and error bodies so short upstream lockouts can recover automatically. Also align Antigravity and Codex header handling, require API keys for Pollinations, validate web runtime env at startup, restore sanitized Gemini tool names in translated responses, and inject a synthetic Claude text block when upstream SSE completes empty. * feat(models): add glmt preset and hybrid token counting Introduce GLM Thinking as a first-class provider preset with shared GLM model metadata, pricing, usage sync, dashboard support, and provider request defaults for higher token budgets and longer timeouts. Use provider-side /messages/count_tokens when a Claude-compatible upstream supports it, while preserving estimated fallback behavior for missing models, missing credentials, and upstream failures. Also add startup seeding for default model aliases and normalize common cross-proxy model dialects so canonical slashful model ids do not get misrouted during resolution. * feat(api): add sync tokens and v1 websocket bridge Add dedicated sync token storage, issuance, revocation, and bundle download routes backed by stable config bundle versioning and ETag support. Expose the v1 websocket handshake route and custom Next server bridge so OpenAI-compatible websocket traffic can be upgraded and proxied through the dashboard and API bridge. Expand compliance auditing with structured metadata, pagination, request context, auth and provider credential events, and SSRF-blocked validation logging. * docs: Update all documentation for v3.6.6 - CHANGELOG: Add WebSocket bridge, GLM Thinking preset, safe outbound fetch/SSRF guard, cooldown-aware retries, compliance audit v2, model alias seeding, and all Internal Improvements for the 3 new commits - README: Expand v3.6.x highlights table with 10 new features; add SafeOutboundFetch, CooldownAwareRetry, SSRF guard, TPS metric, sync tokens, WebSocket bridge to Resilience/Observability/Deployment tables - ARCHITECTURE: Bump date; add new modules to executive summary, API routes, SSE core services, Auth/Security section; add SSRF/Outbound guard failure mode (section 6); expand module mapping - ENVIRONMENT: Add OMNIROUTE_CRYPT_KEY/OMNIROUTE_API_KEY_BASE64 legacy aliases, OUTBOUND_SSRF_GUARD_ENABLED, CODEX_CLIENT_VERSION, and REQUEST_RETRY/MAX_RETRY_INTERVAL_SEC cooldown retry settings - FEATURES: Add 6 new feature sections — V1 WebSocket Bridge, Sync Tokens & Config Bundle, GLM Thinking Preset, Safe Outbound Fetch & SSRF Guard, Cooldown-Aware Retries, Compliance Audit v2 * fix: use api64 for proxy test (#1255) Integrated into release/v3.6.6 — IPv6 proxy test fix * fix(page): update custom models section to include all providers #1200 (#1256) Integrated into release/v3.6.6 — Gemini custom model picker fix * fix: provide default client_id fallbacks to prevent broken OAuth requests (#1246) Integrated into release/v3.6.6 — OAuth client_id default fallbacks * fix: translate max_tokens/max_completion_tokens → max_output_tokens in Chat→Responses translator (#1245) Integrated into release/v3.6.6 — max_tokens → max_output_tokens Responses API translation + unit tests * feat(oauth): support cursor-agent CLI as Cursor credential source (#1258) Integrated into release/v3.6.6 — cursor-agent CLI credential source support * fix(cc-compatible): restore upstream SSE and correct stream/combo timeout behavior (#1257) Integrated into release/v3.6.6 — CC-compatible upstream SSE restore + stream timeout fix + README table repair * fix(cli-tools): resolve API key resolution and model mapping bugs in CLI tools (#1263) Integrated into release/v3.6.6 * feat(cli-tools): add Qwen Code CLI integration (#1266) Integrated into release/v3.6.6 * fix(i18n): add missing zh-CN translations and fix logger imports (#1269) Integrated into release/v3.6.6 * fix(i18n): add Chinese i18n support to dashboard components (#1274) Integrated into release/v3.6.6 * feat: update Pollinations to require API key, remove free tier flag (#1177) * feat: friendly error messages for crypto/encryption failures (#1165) * feat: add TPS (tokens per second) metric column to request logs (#1182) * feat: merge custom/imported models into filter list for all providers (#1191) * feat(fallback): Fix provider-profile-driven lockouts (#1267) This integrates rdself's unify-provider-profile-locks PR manually to handle structural conflicts. * fix(claude): proper Anthropic SDK integration (#1271) * fix(healthcheck): use correct proxy wrapper format for getAccessToken (#1272) * chore(release): v3.6.6 — skills registry stability fix + final integration * fix(auth): harden bootstrap auth and memory dashboard behavior Restrict unauthenticated writes to /api/settings/require-login to the initial bootstrap window while keeping read-only checks public. This prevents post-setup config changes without blocking first-run login setup, and the onboarding flow now logs in immediately after setting the password. Restore memory API filtering and pagination behavior by supporting q searches, honoring offset-based requests, and avoiding unrelated fallback results when FTS misses. Update dashboard stats fallback to use the response totals consistently. Package the MCP server with explicit file entries and add regression tests for bootstrap auth and memory route behavior * fix(codex): remove max_output_tokens from body for compatibility * chore(release): v3.6.6 — include PR 1274 fixes in changelog * chore: exclude additional build artifacts and internal directories from npm package distribution * fix: update Gemini OAuth test to match registry defaults + codex UI improvements * fix: restore .mjs refs for scripts/ in test imports after ts migration * fix: restore next.config.mjs ref in dev-origins test * fix: implement db migration safety checks and codex config format * fix: disable mass-migration abort during unit tests based on auto-backup flag * fix: update script regex in auto-update tests to use .mjs * feat: Add Perplexity Web (Session) provider (#1289) Integrated into release/v3.6.6 * fix(cli): resolve codex routing config parsing, standardize select model button positioning, and clarify oauth documentation * docs(changelog): record recent cli, provider, and test updates Document the latest fixes for Codex routing configuration parsing and Lobehub provider icon fallback behavior. Add the note that the remaining JavaScript test files were migrated to TypeScript ES modules to reflect the completed test stack transition. * chore(release): merge #1286 minor improvements manually to avoid testing conflict * chore(test): rename perplexity-web.test.mjs to .ts to maintain 100% TS codebase * chore(docs): update CHANGELOG.md for perplexity-web provider * fix(security): resolve CodeQL incomplete URL substring sanitization via URL parsing in test mocks * fix: integrate compressContext() into chatCore.ts request pipeline Proactively compress oversized contexts before sending to upstream providers, preventing context_length_exceeded errors. Compression triggers at 85% of model's context limit using the existing 3-layer compressContext() function. - Import compressContext, estimateTokens, getTokenLimit from contextManager - Add compression check after translation, before executor dispatch - Estimate tokens and compare against 85% threshold of model's context limit - Apply 3-layer compression (trim tools, compress thinking, purify history) - Log compression events with before/after token counts and layers applied - Audit compression events for observability - Add unit tests verifying integration behavior Closes #1290 * fix(tests): align reasoning expectations with GLM thinking structure * fix: prevent orphaned tool_result messages in purifyHistory() When purifyHistory() drops oldest messages to fit context window, it can split tool_use/tool_result pairs — keeping the tool_result but dropping the tool_use that initiated it. This causes upstream providers to reject the request with format errors. Add fixToolPairs() that runs after each purification pass to remove: - OpenAI format: orphaned role='tool' messages without matching tool_calls ID - Claude format: orphaned tool_result content blocks without matching tool_use ID Closes #1291 * fix(tests): supply tool_use in mock so it is not dropped * chore: convert remaining test to TypeScript * fix(tests): restore compatibility with compressContext threshold test after tsx migration * docs: finalize v3.6.6 release documentation * fix(core): finalize provider removal, type issues, and codex API key config * fix(dashboard): render Web/Cookie, Search, Audio provider sections and fix TypeScript errors * fix: increase MCP web_search timeout to 60s (#1278) * fix: route combo testing properly for embedding models (#1260) * fix: accumulate excluded accounts in combo fallback loop (#1233) * fix: strip leading whitespace and newlines from first streaming chunk (#1211) * docs: clarify VPS and Docker settings for OAuth credentials (#1204) * fix: return real retry-after for pipeline gates (#1301) Integrated into release/v3.6.6 — returns real Retry-After values from pipeline gates * feat: streaming semantic cache, Cursor auto-version detection, and call-log enhancements (#1296) Integrated into release/v3.6.6 — streaming semantic cache, Cursor auto-version detection, call-log cache_source tracking * feat(api): support more OpenAI types (image, embeddings, audio-transcriptions, audio-speech) (#1297) Integrated into release/v3.6.6 — adds embeddings, audio-transcriptions, audio-speech, and images-generations support for custom OpenAI-compatible providers, plus Pollinations image registry * deps: bump hono from 4.12.12 to 4.12.14 (#1302) Integrated into release/v3.6.6 * deps: bump hono from 4.12.12 to 4.12.14 (#1306) Integrated into release/v3.6.6 * chore: stabilization fixes for v3.6.6 (#1298, #1254, #59, CI) * fix(providers): match correct endpoint for Xiaomi MiMo, strip routing prefix for custom openai endpoints (#1303, #1261) * feat(storage): add database backup cleanup controls * chore(release): v3.6.6 — Final Stabilization Push * Backport call log storage refactor to release/v3.6.6 (#1307) Integrated into release/v3.6.6 * deps: update dompurify to 3.4.0 to resolve CVE-XYZ (#60) * test: disable sqlite auto backup in CI to resolve E2E timeout (#24481475058) * chore(docs): sync CHANGELOG for v3.6.6 with missing features and fixes * chore(release): prep v3.6.6 infrastructure and type safety fixes - Migrated legacy .mjs scripts to .ts (bin, prepublish, policies) - Resolved pre-commit strict lint (t11 budget) errors in combo.ts - Explicitly typed all TS bindings in pack-artifact policies - Updated package.json commands to run Node via tsx/esm internally - Hardened CI/CD with explicit node version 22.22.2 checks - Completed stage validations for v3.6.6 final release * chore: fix TS build errors and e2e timeouts in CI - Migrate nodeRuntimeSupport to TS interfaces avoiding implicit any - Increase visibility timeouts in skills-marketplace E2E test to 15s to bypass CI flakiness - Complete migration of .mjs scripts to .ts ensuring type safety * chore(release): sync package version 3.6.6 across workspaces * test(e2e): universally increase UI component visibility timeouts from 5s to 15s to bypass CI starvation * chore(build): inject baseUrl, paths, and types:node into MITM tsconfig within prepublish hook to fix missing types in CI check --------- Co-authored-by: diegosouzapw <diegosouzapw@users.noreply.github.com> Co-authored-by: Jack <5443152+hijak@users.noreply.github.com> Co-authored-by: Randi <55005611+rdself@users.noreply.github.com> Co-authored-by: Paijo <14921983+oyi77@users.noreply.github.com> Co-authored-by: Samuel Cedric <ceds.sam@gmail.com> Co-authored-by: Max Garmash <max@37bytes.com> Co-authored-by: Markus Hartung <mail@hartmark.se> Co-authored-by: Gi99lin <74502520+Gi99lin@users.noreply.github.com> Co-authored-by: Payne <baboialex95@gmail.com> Co-authored-by: Benson K B <bensonkbmca@gmail.com> Co-authored-by: clousky2020 <33016567+clousky2020@users.noreply.github.com> Co-authored-by: Ravi Tharuma <25951435+RaviTharuma@users.noreply.github.com> Co-authored-by: oyi77 <oyi77@users.noreply.github.com> Co-authored-by: Hdsje <vovan877@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: xiaoge1688 <moyekongling@gmail.com>
545 lines
18 KiB
TypeScript
545 lines
18 KiB
TypeScript
/**
|
|
* 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;
|
|
}
|
|
|
|
// 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("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,
|
|
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,
|
|
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,
|
|
reasoning_tokens:
|
|
chunk.usage.completion_tokens_details?.reasoning_tokens ??
|
|
chunk.usage.output_tokens_details?.reasoning_tokens,
|
|
});
|
|
}
|
|
|
|
// Gemini format (Antigravity)
|
|
if (chunk.usageMetadata && typeof chunk.usageMetadata === "object") {
|
|
return normalizeUsage({
|
|
prompt_tokens: chunk.usageMetadata?.promptTokenCount || 0,
|
|
completion_tokens: chunk.usageMetadata?.candidatesTokenCount || 0,
|
|
total_tokens: chunk.usageMetadata?.totalTokenCount,
|
|
cached_tokens: chunk.usageMetadata?.cachedContentTokenCount,
|
|
reasoning_tokens: chunk.usageMetadata?.thoughtsTokenCount,
|
|
});
|
|
}
|
|
|
|
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 = null, connectionId = 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);
|
|
const accountPrefix = connectionId ? connectionId.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, provider, connectionId, tokens, status: "200 OK" }).catch(() => {});
|
|
}
|