mirror of
https://github.com/openclaw/openclaw.git
synced 2026-06-01 12:36:50 +00:00
* refactor: extract agent core package Introduce packages/agent-core as the OpenClaw-owned home for reusable agent loop, harness, session, prompt, and runtime dependency contracts. * refactor: extract shared llm runtime Move provider model registries, stream wrappers, OAuth helpers, and LLM utilities into src/llm with plugin-sdk barrels instead of depending on the old embedded runtime layout. * refactor: remove pi runtime internals Rename remaining Pi-shaped agent surfaces to OpenClaw agent runtime names, delete obsolete Pi docs and package graph checks, and add the third-party notice for incorporated code. * refactor: tighten agent session runtime Make agent-core/runtime dependencies explicit, consolidate compaction and session transcript helpers, and move model/session helpers behind OpenClaw-owned contracts. * refactor: remove static model and pi auth paths Drop static model catalogs and Pi auth bridges, move model/provider facts to manifest-owned runtime contracts, and harden internal embedded-agent utilities. * refactor: remove legacy provider compat paths * docs: remove agent parity notes * fix: skip provider wildcard metadata parsing * refactor: share session extension sdk loading * refactor: inline acpx proxy error formatter * refactor: fold edit recovery into edit tool * fix: accept extension batch separator * test: align startup provider plugin expectations * fix: restore provider-scoped release discovery * test: align static asset packaging expectations * fix: run static provider catalogs during scoped discovery * fix: add provider entry catalogs for scoped live discovery * fix: load lightweight provider catalog entries * fix: refresh provider-scoped plugin metadata * fix: keep provider catalog entries on release live path * fix: keep static manifest models in release live checks * fix: harden release model discovery * fix: reduce OpenAI live cache probe reasoning * fix: disable OpenAI cache probe reasoning * ci: extend OpenAI gateway live timeout * fix: extend live gateway model budget * fix: stabilize release validation regressions * fix: honor provider aliases in model rows * fix: stabilize release validation lanes * fix: stabilize release memory qa * ci: stabilize release validation lanes * ci: prefer ipv4 for live docker node calls * fix: restore shared tool-call stream wrapper * ci: remove legacy pi test shard alias * fix: clean up embedded agent test drift * fix: stabilize runtime alias status * fix: clean up embedded agent ci drift * fix: restore release ci invariants * fix: clean up post-rebase runtime drift * fix: restore release ci checks * fix: restore release ci after rebase * fix: remove stale pi runtime path * test: align compaction runtime expectations * test: update plugin prerelease expectations * fix: handle claude live tool approvals * fix: stabilize release validation gates * fix: finish agent runtime import * test: finish post-rebase agent runtime mocks * fix: keep codex compaction native * fix: stabilize codex app-server hook tests * test: isolate codex diagnostic active run * test: remove codex diagnostic completion race # Conflicts: # extensions/codex/src/app-server/run-attempt.test.ts * ci: fix full release manifest performance run id * refactor: narrow llm plugin sdk boundary * chore: drop generated google boundary stamps * fix: repair rebase fallout * fix: clean up rebased runtime references * fix: decode codex jwt payloads as base64url * fix: preserve shipped pi runtime alias * fix: add scoped sdk virtual modules * fix: decode llm codex oauth jwt as base64url * fix: avoid stale vertex adc negative cache * fix: harden tool arg decoding and codeql path * fix: keep vertex adc negative checks live * refactor: consolidate codex jwt and edit helpers * fix: await codex oauth node runtime imports * fix: preserve sdk tool and notice contracts * fix: preserve shipped compat config boundaries * fix: align codex oauth callback host * fix: terminate agent-core loop streams on failure * fix: keep codex oauth callback alive during fallback * ci: include session tools in critical codeql scans * fix: keep Cloudflare Anthropic provider auth header * docs: redirect legacy pi runtime pages * fix: honor bundled web provider compat discovery * fix: protect session output spill files * fix: keep legacy agent dir env blocked * fix: contain auto-discovered skill symlinks * fix: harden agent core sdk proxy surfaces * fix: restore approval reaction sdk compat * fix: keep live docker runs bounded * fix: keep codex oauth redirect host aligned * fix: resolve post-rebase agent runtime drift * fix: redact anthropic oauth parse failures * fix: preserve responses strict tool shaping * fix: repair agent runtime rebase cleanup * docs: redirect retired parity pages * fix: bound auto-discovered resources to roots * fix: repair post-rebase agent test drift * fix: preserve bundled provider allowlist migration * fix: preserve manifest-owned provider aliases * fix: declare photon image dependency * fix: keep provider headers out of proxy body * fix: preserve shipped env aliases * fix: refresh control ui i18n generated state * fix: quote read fallback paths * fix: preview edits through configured backend * test: satisfy core test typecheck * fix: preserve ZAI usage auth fallback * test: repair codex diagnostic test * fix: repair agent runtime rebase drift * test: finish embedded runner import rename * fix: repair agent runtime rebase integrations * test: align compaction oauth fallback expectations * fix: allow sdk-auth session models * fix: update doctor tool schema import * fix: preserve bedrock plugin region * fix: stream harmony-like prose immediately * ci: include session runtime in codeql shards * fix: repair latest rebase integrations * fix: honor explicit codex websocket transport * fix: keep openai-compatible credentials provider-scoped * fix: refresh sdk api baseline after rebase * fix: route cli runtime aliases through openclaw harness * test: rename stale harness mock expectation * test: rename embedded agent overflow calls * test: clean embedded auth test wording * test: use openclaw stream types in deepinfra cache test * fix: refresh sdk api baseline on latest main * fix: honor bundled discovery compat allowlists * fix: refresh sdk api baseline after latest rebase * fix: remove stale rebase imports * test: rename stale model catalog mock * test: mock renamed doctor runtime modules * fix: map canonical kimi env auth * fix: use internal model registry in bench script * fix: migrate deepinfra provider catalog entry * fix: enforce builtin tool suppression * fix: route compaction auth and proxy payloads safely * refactor: prune unused llm registry leftovers * test: update codex hooks session import * test: fix model picker ci coverage * test: align model picker auth mock types
304 lines
8.7 KiB
TypeScript
304 lines
8.7 KiB
TypeScript
import { asFiniteNumber } from "../shared/number-coercion.js";
|
|
|
|
export type UsageLike = {
|
|
input?: number;
|
|
output?: number;
|
|
cacheRead?: number;
|
|
cacheWrite?: number;
|
|
total?: number;
|
|
// Common alternates across providers/SDKs.
|
|
inputTokens?: number;
|
|
outputTokens?: number;
|
|
promptTokens?: number;
|
|
completionTokens?: number;
|
|
input_tokens?: number;
|
|
output_tokens?: number;
|
|
prompt_tokens?: number;
|
|
completion_tokens?: number;
|
|
cache_read_input_tokens?: number;
|
|
cache_creation_input_tokens?: number;
|
|
reasoningTokens?: number;
|
|
reasoning_tokens?: number;
|
|
completion_tokens_details?: { reasoning_tokens?: number };
|
|
output_tokens_details?: { reasoning_tokens?: number };
|
|
// Moonshot/Kimi uses cached_tokens for cache read count (explicit caching API).
|
|
cached_tokens?: number;
|
|
// OpenAI Responses reports cached prompt reuse here.
|
|
input_tokens_details?: { cached_tokens?: number };
|
|
// Kimi K2 uses prompt_tokens_details.cached_tokens for automatic prefix caching.
|
|
prompt_tokens_details?: { cached_tokens?: number };
|
|
// Some agents/logs emit alternate naming.
|
|
totalTokens?: number;
|
|
total_tokens?: number;
|
|
cache_read?: number;
|
|
cache_write?: number;
|
|
// llama.cpp-style streamed completion metadata.
|
|
prompt_n?: number;
|
|
predicted_n?: number;
|
|
timings?: {
|
|
prompt_n?: number;
|
|
predicted_n?: number;
|
|
};
|
|
};
|
|
|
|
export type NormalizedUsage = {
|
|
input?: number;
|
|
output?: number;
|
|
cacheRead?: number;
|
|
cacheWrite?: number;
|
|
reasoningTokens?: number;
|
|
total?: number;
|
|
};
|
|
|
|
export type OpenAiChatCompletionsUsage = {
|
|
prompt_tokens: number;
|
|
completion_tokens: number;
|
|
total_tokens: number;
|
|
prompt_tokens_details?: { cached_tokens: number };
|
|
completion_tokens_details?: { reasoning_tokens: number };
|
|
};
|
|
|
|
export type AssistantUsageSnapshot = {
|
|
input: number;
|
|
output: number;
|
|
cacheRead: number;
|
|
cacheWrite: number;
|
|
totalTokens: number;
|
|
cost: {
|
|
input: number;
|
|
output: number;
|
|
cacheRead: number;
|
|
cacheWrite: number;
|
|
total: number;
|
|
};
|
|
};
|
|
|
|
export function makeZeroUsageSnapshot(): AssistantUsageSnapshot {
|
|
return {
|
|
input: 0,
|
|
output: 0,
|
|
cacheRead: 0,
|
|
cacheWrite: 0,
|
|
totalTokens: 0,
|
|
cost: {
|
|
input: 0,
|
|
output: 0,
|
|
cacheRead: 0,
|
|
cacheWrite: 0,
|
|
total: 0,
|
|
},
|
|
};
|
|
}
|
|
|
|
export function hasNonzeroUsage(usage?: NormalizedUsage | null): usage is NormalizedUsage {
|
|
if (!usage) {
|
|
return false;
|
|
}
|
|
return [
|
|
usage.input,
|
|
usage.output,
|
|
usage.cacheRead,
|
|
usage.cacheWrite,
|
|
usage.reasoningTokens,
|
|
usage.total,
|
|
].some((v) => typeof v === "number" && Number.isFinite(v) && v > 0);
|
|
}
|
|
|
|
const normalizeTokenCount = (value: unknown): number | undefined => {
|
|
const numeric = asFiniteNumber(value);
|
|
if (numeric === undefined) {
|
|
return undefined;
|
|
}
|
|
if (numeric <= 0) {
|
|
return 0;
|
|
}
|
|
return Math.min(Math.trunc(numeric), Number.MAX_SAFE_INTEGER);
|
|
};
|
|
|
|
export function normalizeUsage(raw?: UsageLike | null): NormalizedUsage | undefined {
|
|
if (!raw) {
|
|
return undefined;
|
|
}
|
|
|
|
const cacheRead = normalizeTokenCount(
|
|
raw.cacheRead ??
|
|
raw.cache_read ??
|
|
raw.cache_read_input_tokens ??
|
|
raw.cached_tokens ??
|
|
raw.input_tokens_details?.cached_tokens ??
|
|
raw.prompt_tokens_details?.cached_tokens,
|
|
);
|
|
|
|
const rawInputValue =
|
|
raw.input ??
|
|
raw.inputTokens ??
|
|
raw.input_tokens ??
|
|
raw.promptTokens ??
|
|
raw.prompt_tokens ??
|
|
raw.prompt_n ??
|
|
raw.timings?.prompt_n;
|
|
|
|
const usesOpenAIStylePromptTotals =
|
|
raw.cached_tokens !== undefined ||
|
|
raw.input_tokens_details?.cached_tokens !== undefined ||
|
|
raw.prompt_tokens_details?.cached_tokens !== undefined;
|
|
|
|
// Some providers (shared model runtime OpenAI-format) pre-subtract cached_tokens from
|
|
// prompt/input totals upstream, while OpenAI-style prompt/input aliases
|
|
// include cached tokens in the reported prompt total. Normalize both cases
|
|
// to uncached input tokens so downstream prompt-token math does not double-
|
|
// count cache reads.
|
|
const rawInput = asFiniteNumber(rawInputValue);
|
|
const normalizedInput =
|
|
rawInput !== undefined && usesOpenAIStylePromptTotals && cacheRead !== undefined
|
|
? rawInput - cacheRead
|
|
: rawInput;
|
|
const input = normalizeTokenCount(normalizedInput);
|
|
const output = normalizeTokenCount(
|
|
raw.output ??
|
|
raw.outputTokens ??
|
|
raw.output_tokens ??
|
|
raw.completionTokens ??
|
|
raw.completion_tokens ??
|
|
raw.predicted_n ??
|
|
raw.timings?.predicted_n,
|
|
);
|
|
const cacheWrite = normalizeTokenCount(
|
|
raw.cacheWrite ?? raw.cache_write ?? raw.cache_creation_input_tokens,
|
|
);
|
|
const reasoningTokens = normalizeTokenCount(
|
|
raw.reasoningTokens ??
|
|
raw.reasoning_tokens ??
|
|
raw.completion_tokens_details?.reasoning_tokens ??
|
|
raw.output_tokens_details?.reasoning_tokens,
|
|
);
|
|
const total = normalizeTokenCount(raw.total ?? raw.totalTokens ?? raw.total_tokens);
|
|
|
|
if (
|
|
input === undefined &&
|
|
output === undefined &&
|
|
cacheRead === undefined &&
|
|
cacheWrite === undefined &&
|
|
reasoningTokens === undefined &&
|
|
total === undefined
|
|
) {
|
|
return undefined;
|
|
}
|
|
|
|
return {
|
|
input,
|
|
output,
|
|
cacheRead,
|
|
cacheWrite,
|
|
...(reasoningTokens !== undefined ? { reasoningTokens } : {}),
|
|
total,
|
|
};
|
|
}
|
|
|
|
/**
|
|
* Maps normalized usage to OpenAI Chat Completions `usage` fields.
|
|
*
|
|
* `prompt_tokens` is input + cacheRead (cache write is excluded to match the
|
|
* OpenAI-style breakdown used by the compat endpoint).
|
|
*
|
|
* `total_tokens` is the greater of the component sum and aggregate `total` when
|
|
* present, so a partial breakdown cannot discard a valid upstream total.
|
|
*
|
|
* `prompt_tokens_details.cached_tokens` is emitted when `cacheRead > 0` so
|
|
* downstream chat-completions clients can compute the cache-aware blended
|
|
* cost. Field name and shape match OpenAI's documented usage breakdown:
|
|
* https://platform.openai.com/docs/guides/prompt-caching
|
|
*/
|
|
export function toOpenAiChatCompletionsUsage(
|
|
usage: NormalizedUsage | undefined,
|
|
): OpenAiChatCompletionsUsage {
|
|
const input = usage?.input ?? 0;
|
|
const output = usage?.output ?? 0;
|
|
const cacheRead = usage?.cacheRead ?? 0;
|
|
const promptTokens = Math.max(0, input + cacheRead);
|
|
const completionTokens = Math.max(0, output);
|
|
const componentTotal = promptTokens + completionTokens;
|
|
const aggregateRaw = usage?.total;
|
|
const aggregateTotal =
|
|
typeof aggregateRaw === "number" && Number.isFinite(aggregateRaw)
|
|
? Math.max(0, aggregateRaw)
|
|
: undefined;
|
|
const totalTokens =
|
|
aggregateTotal !== undefined ? Math.max(componentTotal, aggregateTotal) : componentTotal;
|
|
|
|
const reasoningTokens = normalizeTokenCount(usage?.reasoningTokens);
|
|
return {
|
|
prompt_tokens: promptTokens,
|
|
completion_tokens: completionTokens,
|
|
total_tokens: totalTokens,
|
|
...(cacheRead > 0 ? { prompt_tokens_details: { cached_tokens: cacheRead } } : {}),
|
|
...(reasoningTokens !== undefined
|
|
? { completion_tokens_details: { reasoning_tokens: reasoningTokens } }
|
|
: {}),
|
|
};
|
|
}
|
|
|
|
export function derivePromptTokens(usage?: {
|
|
input?: number;
|
|
cacheRead?: number;
|
|
cacheWrite?: number;
|
|
}): number | undefined {
|
|
if (!usage) {
|
|
return undefined;
|
|
}
|
|
const input = usage.input ?? 0;
|
|
const cacheRead = usage.cacheRead ?? 0;
|
|
const cacheWrite = usage.cacheWrite ?? 0;
|
|
const sum = input + cacheRead + cacheWrite;
|
|
return sum > 0 ? sum : undefined;
|
|
}
|
|
|
|
export function deriveContextPromptTokens(params: {
|
|
lastCallUsage?: NormalizedUsage;
|
|
promptTokens?: number;
|
|
usage?: NormalizedUsage;
|
|
}): number | undefined {
|
|
const promptOverride = params.promptTokens;
|
|
if (typeof promptOverride === "number" && Number.isFinite(promptOverride) && promptOverride > 0) {
|
|
return promptOverride;
|
|
}
|
|
|
|
return derivePromptTokens(params.lastCallUsage) ?? derivePromptTokens(params.usage);
|
|
}
|
|
|
|
export function deriveSessionTotalTokens(params: {
|
|
usage?: {
|
|
input?: number;
|
|
output?: number;
|
|
total?: number;
|
|
cacheRead?: number;
|
|
cacheWrite?: number;
|
|
};
|
|
contextTokens?: number;
|
|
promptTokens?: number;
|
|
}): number | undefined {
|
|
const promptOverride = params.promptTokens;
|
|
const hasPromptOverride =
|
|
typeof promptOverride === "number" && Number.isFinite(promptOverride) && promptOverride > 0;
|
|
|
|
const usage = params.usage;
|
|
if (!usage && !hasPromptOverride) {
|
|
return undefined;
|
|
}
|
|
|
|
// NOTE: SessionEntry.totalTokens is used as a prompt/context snapshot.
|
|
// It intentionally excludes completion/output tokens.
|
|
const promptTokens = deriveContextPromptTokens({
|
|
promptTokens: hasPromptOverride ? promptOverride : undefined,
|
|
usage,
|
|
});
|
|
|
|
if (!(typeof promptTokens === "number") || !Number.isFinite(promptTokens) || promptTokens <= 0) {
|
|
return undefined;
|
|
}
|
|
|
|
// Keep this value unclamped; display layers are responsible for capping
|
|
// percentages for terminal output.
|
|
return promptTokens;
|
|
}
|