mirror of
https://github.com/openclaw/openclaw.git
synced 2026-06-02 01:34:59 +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
229 lines
7.1 KiB
TypeScript
229 lines
7.1 KiB
TypeScript
import { AnthropicVertex as AnthropicVertexSdk } from "@anthropic-ai/vertex-sdk";
|
|
import type { StreamFn } from "openclaw/plugin-sdk/agent-core";
|
|
import {
|
|
stream as streamDefault,
|
|
type Model,
|
|
type ProviderStreamOptions,
|
|
} from "openclaw/plugin-sdk/llm";
|
|
import {
|
|
applyAnthropicPayloadPolicyToParams,
|
|
resolveAnthropicPayloadPolicy,
|
|
} from "openclaw/plugin-sdk/provider-stream-shared";
|
|
import { resolveAnthropicVertexClientRegion, resolveAnthropicVertexProjectId } from "./region.js";
|
|
|
|
type AnthropicVertexTransportOptions = ProviderStreamOptions & {
|
|
client?: unknown;
|
|
thinkingEnabled?: boolean;
|
|
thinkingBudgetTokens?: number;
|
|
effort?: "low" | "medium" | "high" | "xhigh" | "max";
|
|
};
|
|
|
|
type AnthropicVertexEffort = NonNullable<AnthropicVertexTransportOptions["effort"]>;
|
|
type AnthropicVertexAdaptiveEffort = AnthropicVertexEffort | "xhigh";
|
|
type AnthropicVertexClientOptions = {
|
|
baseURL?: string;
|
|
projectId?: string;
|
|
region: string;
|
|
};
|
|
|
|
export type AnthropicVertexStreamDeps = {
|
|
AnthropicVertex: new (options: AnthropicVertexClientOptions) => unknown;
|
|
streamAnthropic: typeof streamDefault;
|
|
};
|
|
|
|
const defaultAnthropicVertexStreamDeps: AnthropicVertexStreamDeps = {
|
|
AnthropicVertex: AnthropicVertexSdk as AnthropicVertexStreamDeps["AnthropicVertex"],
|
|
streamAnthropic: streamDefault,
|
|
};
|
|
|
|
function isClaudeOpus47Model(modelId: string): boolean {
|
|
return modelId.includes("opus-4-7") || modelId.includes("opus-4.7");
|
|
}
|
|
|
|
function isClaudeOpus46Model(modelId: string): boolean {
|
|
return modelId.includes("opus-4-6") || modelId.includes("opus-4.6");
|
|
}
|
|
|
|
function supportsAdaptiveThinking(modelId: string): boolean {
|
|
return (
|
|
isClaudeOpus47Model(modelId) ||
|
|
isClaudeOpus46Model(modelId) ||
|
|
modelId.includes("sonnet-4-6") ||
|
|
modelId.includes("sonnet-4.6")
|
|
);
|
|
}
|
|
|
|
function mapAnthropicAdaptiveEffort(
|
|
reasoning: string,
|
|
modelId: string,
|
|
): AnthropicVertexAdaptiveEffort {
|
|
const effortMap: Record<string, AnthropicVertexAdaptiveEffort> = {
|
|
minimal: "low",
|
|
low: "low",
|
|
medium: "medium",
|
|
high: "high",
|
|
xhigh: isClaudeOpus47Model(modelId) ? "xhigh" : isClaudeOpus46Model(modelId) ? "max" : "high",
|
|
};
|
|
return effortMap[reasoning] ?? "high";
|
|
}
|
|
|
|
function resolveAnthropicVertexMaxTokens(params: {
|
|
modelMaxTokens: number | undefined;
|
|
requestedMaxTokens: number | undefined;
|
|
}): number | undefined {
|
|
const modelMax =
|
|
typeof params.modelMaxTokens === "number" &&
|
|
Number.isFinite(params.modelMaxTokens) &&
|
|
params.modelMaxTokens > 0
|
|
? Math.floor(params.modelMaxTokens)
|
|
: undefined;
|
|
const requested =
|
|
typeof params.requestedMaxTokens === "number" &&
|
|
Number.isFinite(params.requestedMaxTokens) &&
|
|
params.requestedMaxTokens > 0
|
|
? Math.floor(params.requestedMaxTokens)
|
|
: undefined;
|
|
|
|
if (modelMax !== undefined && requested !== undefined) {
|
|
return Math.min(requested, modelMax);
|
|
}
|
|
return requested ?? modelMax;
|
|
}
|
|
|
|
function createAnthropicVertexOnPayload(params: {
|
|
model: { api: string; baseUrl?: string; provider: string };
|
|
cacheRetention: ProviderStreamOptions["cacheRetention"] | undefined;
|
|
onPayload: ProviderStreamOptions["onPayload"] | undefined;
|
|
}): NonNullable<ProviderStreamOptions["onPayload"]> {
|
|
const policy = resolveAnthropicPayloadPolicy({
|
|
provider: params.model.provider,
|
|
api: params.model.api,
|
|
baseUrl: params.model.baseUrl,
|
|
cacheRetention: params.cacheRetention,
|
|
enableCacheControl: true,
|
|
});
|
|
|
|
function applyPolicy(payload: unknown): unknown {
|
|
if (payload && typeof payload === "object" && !Array.isArray(payload)) {
|
|
applyAnthropicPayloadPolicyToParams(payload as Record<string, unknown>, policy);
|
|
}
|
|
return payload;
|
|
}
|
|
|
|
return async (payload, model) => {
|
|
const shapedPayload = applyPolicy(payload);
|
|
const nextPayload = await params.onPayload?.(shapedPayload, model);
|
|
if (nextPayload === undefined || nextPayload === shapedPayload) {
|
|
return shapedPayload;
|
|
}
|
|
return applyPolicy(nextPayload);
|
|
};
|
|
}
|
|
|
|
/**
|
|
* Create a StreamFn that routes through OpenClaw's generic model stream with an
|
|
* injected `AnthropicVertex` client. All streaming, message conversion, and
|
|
* event handling is handled by the shared model runtime - we only supply the GCP-authenticated
|
|
* client and provider transport options.
|
|
*/
|
|
export function createAnthropicVertexStreamFn(
|
|
projectId: string | undefined,
|
|
region: string,
|
|
baseURL?: string,
|
|
deps: AnthropicVertexStreamDeps = defaultAnthropicVertexStreamDeps,
|
|
): StreamFn {
|
|
const client = new deps.AnthropicVertex({
|
|
region,
|
|
...(baseURL ? { baseURL } : {}),
|
|
...(projectId ? { projectId } : {}),
|
|
});
|
|
|
|
return (model, context, options) => {
|
|
const transportModel = model as Model<"anthropic-messages"> & {
|
|
api: string;
|
|
baseUrl?: string;
|
|
provider: string;
|
|
};
|
|
const maxTokens = resolveAnthropicVertexMaxTokens({
|
|
modelMaxTokens: transportModel.maxTokens,
|
|
requestedMaxTokens: options?.maxTokens,
|
|
});
|
|
const opts: AnthropicVertexTransportOptions = {
|
|
client,
|
|
temperature: options?.temperature,
|
|
...(maxTokens !== undefined ? { maxTokens } : {}),
|
|
signal: options?.signal,
|
|
cacheRetention: options?.cacheRetention,
|
|
sessionId: options?.sessionId,
|
|
headers: options?.headers,
|
|
onPayload: createAnthropicVertexOnPayload({
|
|
model: transportModel,
|
|
cacheRetention: options?.cacheRetention,
|
|
onPayload: options?.onPayload,
|
|
}),
|
|
maxRetryDelayMs: options?.maxRetryDelayMs,
|
|
metadata: options?.metadata,
|
|
};
|
|
|
|
if (options?.reasoning) {
|
|
if (supportsAdaptiveThinking(model.id)) {
|
|
opts.thinkingEnabled = true;
|
|
opts.effort = mapAnthropicAdaptiveEffort(
|
|
options.reasoning,
|
|
model.id,
|
|
) as AnthropicVertexEffort;
|
|
} else {
|
|
opts.thinkingEnabled = true;
|
|
const budgets = options.thinkingBudgets;
|
|
opts.thinkingBudgetTokens =
|
|
(budgets && options.reasoning in budgets
|
|
? budgets[options.reasoning as keyof typeof budgets]
|
|
: undefined) ?? 10000;
|
|
}
|
|
} else {
|
|
opts.thinkingEnabled = false;
|
|
}
|
|
|
|
return deps.streamAnthropic(transportModel, context, opts);
|
|
};
|
|
}
|
|
|
|
function resolveAnthropicVertexSdkBaseUrl(baseUrl?: string): string | undefined {
|
|
const trimmed = baseUrl?.trim();
|
|
if (!trimmed) {
|
|
return undefined;
|
|
}
|
|
|
|
try {
|
|
const url = new URL(trimmed);
|
|
const normalizedPath = url.pathname.replace(/\/+$/, "");
|
|
if (!normalizedPath || normalizedPath === "") {
|
|
url.pathname = "/v1";
|
|
return url.toString().replace(/\/$/, "");
|
|
}
|
|
if (!normalizedPath.endsWith("/v1")) {
|
|
url.pathname = `${normalizedPath}/v1`;
|
|
return url.toString().replace(/\/$/, "");
|
|
}
|
|
return trimmed;
|
|
} catch {
|
|
return trimmed;
|
|
}
|
|
}
|
|
|
|
export function createAnthropicVertexStreamFnForModel(
|
|
model: { baseUrl?: string },
|
|
env: NodeJS.ProcessEnv = process.env,
|
|
deps?: AnthropicVertexStreamDeps,
|
|
): StreamFn {
|
|
return createAnthropicVertexStreamFn(
|
|
resolveAnthropicVertexProjectId(env),
|
|
resolveAnthropicVertexClientRegion({
|
|
baseUrl: model.baseUrl,
|
|
env,
|
|
}),
|
|
resolveAnthropicVertexSdkBaseUrl(model.baseUrl),
|
|
deps,
|
|
);
|
|
}
|