mirror of
https://github.com/openclaw/openclaw.git
synced 2026-06-08 18:32:56 +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
422 lines
12 KiB
TypeScript
422 lines
12 KiB
TypeScript
import type { OpenClawConfig } from "openclaw/plugin-sdk/plugin-entry";
|
|
import {
|
|
isRecord,
|
|
normalizeLowercaseStringOrEmpty,
|
|
} from "openclaw/plugin-sdk/string-coerce-runtime";
|
|
import {
|
|
resolveClaudeCliAnthropicModelRefs,
|
|
resolveKnownAnthropicModelRef,
|
|
} from "./claude-model-refs.js";
|
|
import { CLAUDE_CLI_BACKEND_ID, CLAUDE_CLI_DEFAULT_ALLOWLIST_REFS } from "./cli-constants.js";
|
|
|
|
const ANTHROPIC_PROVIDER_API = "anthropic-messages";
|
|
const ANTHROPIC_API_KEY_DEFAULT_ALLOWLIST_REFS = ["anthropic/claude-sonnet-4-6"] as const;
|
|
|
|
function normalizeProviderId(provider: string): string {
|
|
const normalized = normalizeLowercaseStringOrEmpty(provider);
|
|
if (normalized === "bedrock" || normalized === "aws-bedrock") {
|
|
return "amazon-bedrock";
|
|
}
|
|
return normalized;
|
|
}
|
|
|
|
function resolveAnthropicDefaultAuthMode(
|
|
config: OpenClawConfig,
|
|
env: NodeJS.ProcessEnv,
|
|
): "api_key" | "oauth" | null {
|
|
const profiles = config.auth?.profiles ?? {};
|
|
const anthropicProfiles = Object.entries(profiles).filter(
|
|
([, profile]) =>
|
|
profile?.provider === "anthropic" || profile?.provider === CLAUDE_CLI_BACKEND_ID,
|
|
);
|
|
|
|
const order = [
|
|
...(config.auth?.order?.anthropic ?? []),
|
|
...((config.auth?.order as Record<string, string[] | undefined> | undefined)?.[
|
|
CLAUDE_CLI_BACKEND_ID
|
|
] ?? []),
|
|
];
|
|
for (const profileId of order) {
|
|
const entry = profiles[profileId];
|
|
if (!entry || (entry.provider !== "anthropic" && entry.provider !== CLAUDE_CLI_BACKEND_ID)) {
|
|
continue;
|
|
}
|
|
if (entry.provider === CLAUDE_CLI_BACKEND_ID) {
|
|
return "oauth";
|
|
}
|
|
if (entry.mode === "api_key") {
|
|
return "api_key";
|
|
}
|
|
if (entry.mode === "oauth" || entry.mode === "token") {
|
|
return "oauth";
|
|
}
|
|
}
|
|
|
|
const hasApiKey = anthropicProfiles.some(
|
|
([, profile]) => profile?.provider === "anthropic" && profile?.mode === "api_key",
|
|
);
|
|
const hasOauth = anthropicProfiles.some(
|
|
([, profile]) =>
|
|
profile?.provider === CLAUDE_CLI_BACKEND_ID ||
|
|
profile?.mode === "oauth" ||
|
|
profile?.mode === "token",
|
|
);
|
|
if (hasApiKey && !hasOauth) {
|
|
return "api_key";
|
|
}
|
|
if (hasOauth && !hasApiKey) {
|
|
return "oauth";
|
|
}
|
|
|
|
if (env.ANTHROPIC_OAUTH_TOKEN?.trim()) {
|
|
return "oauth";
|
|
}
|
|
if (env.ANTHROPIC_API_KEY?.trim()) {
|
|
return "api_key";
|
|
}
|
|
return null;
|
|
}
|
|
|
|
function resolveModelPrimaryValue(
|
|
value: string | { primary?: string; fallbacks?: string[] } | undefined,
|
|
): string | undefined {
|
|
if (typeof value === "string") {
|
|
const trimmed = value.trim();
|
|
return trimmed || undefined;
|
|
}
|
|
const primary = value?.primary;
|
|
if (typeof primary !== "string") {
|
|
return undefined;
|
|
}
|
|
const trimmed = primary.trim();
|
|
return trimmed || undefined;
|
|
}
|
|
|
|
function parseProviderModelRef(
|
|
raw: string,
|
|
defaultProvider: string,
|
|
): { provider: string; model: string } | null {
|
|
const trimmed = raw.trim();
|
|
if (!trimmed) {
|
|
return null;
|
|
}
|
|
const slashIndex = trimmed.indexOf("/");
|
|
if (slashIndex <= 0) {
|
|
return { provider: defaultProvider, model: trimmed };
|
|
}
|
|
const provider = trimmed.slice(0, slashIndex).trim();
|
|
const model = trimmed.slice(slashIndex + 1).trim();
|
|
if (!provider || !model) {
|
|
return null;
|
|
}
|
|
return {
|
|
provider: normalizeProviderId(provider),
|
|
model,
|
|
};
|
|
}
|
|
|
|
function isAnthropicCacheRetentionTarget(
|
|
parsed: { provider: string; model: string } | null | undefined,
|
|
): parsed is { provider: string; model: string } {
|
|
return Boolean(
|
|
parsed &&
|
|
(parsed.provider === "anthropic" ||
|
|
(parsed.provider === "amazon-bedrock" &&
|
|
normalizeLowercaseStringOrEmpty(parsed.model).includes("anthropic.claude"))),
|
|
);
|
|
}
|
|
|
|
function usesClaudeCliModelSelection(config: OpenClawConfig): boolean {
|
|
const primary = resolveModelPrimaryValue(
|
|
config.agents?.defaults?.model as
|
|
| string
|
|
| { primary?: string; fallbacks?: string[] }
|
|
| undefined,
|
|
);
|
|
const parsedPrimary = primary ? parseProviderModelRef(primary, "anthropic") : null;
|
|
if (parsedPrimary?.provider === CLAUDE_CLI_BACKEND_ID) {
|
|
return true;
|
|
}
|
|
return Object.entries(config.agents?.defaults?.models ?? {}).some(([key, entry]) => {
|
|
const parsed = parseProviderModelRef(key, "anthropic");
|
|
if (parsed?.provider === CLAUDE_CLI_BACKEND_ID) {
|
|
return true;
|
|
}
|
|
const runtimeId = isRecord(entry?.agentRuntime) ? entry.agentRuntime.id : undefined;
|
|
return (
|
|
parsed?.provider === "anthropic" &&
|
|
normalizeLowercaseStringOrEmpty(runtimeId) === CLAUDE_CLI_BACKEND_ID
|
|
);
|
|
});
|
|
}
|
|
|
|
function usesSelectedClaudeCliAuthProfile(config: OpenClawConfig): boolean {
|
|
const profiles = config.auth?.profiles ?? {};
|
|
const orderedProfileIds = [
|
|
...(config.auth?.order?.anthropic ?? []),
|
|
...((config.auth?.order as Record<string, string[] | undefined> | undefined)?.[
|
|
CLAUDE_CLI_BACKEND_ID
|
|
] ?? []),
|
|
];
|
|
for (const profileId of orderedProfileIds) {
|
|
const provider = profiles[profileId]?.provider;
|
|
if (provider === CLAUDE_CLI_BACKEND_ID) {
|
|
return true;
|
|
}
|
|
if (provider === "anthropic") {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
let hasClaudeCliProfile = false;
|
|
let hasAnthropicProfile = false;
|
|
for (const profile of Object.values(profiles)) {
|
|
if (profile?.provider === CLAUDE_CLI_BACKEND_ID) {
|
|
hasClaudeCliProfile = true;
|
|
}
|
|
if (profile?.provider === "anthropic") {
|
|
hasAnthropicProfile = true;
|
|
}
|
|
}
|
|
return hasClaudeCliProfile && !hasAnthropicProfile;
|
|
}
|
|
|
|
function toCanonicalAnthropicModelRef(ref: string): string {
|
|
return ref.startsWith(`${CLAUDE_CLI_BACKEND_ID}/`)
|
|
? `anthropic/${ref.slice(CLAUDE_CLI_BACKEND_ID.length + 1)}`
|
|
: ref;
|
|
}
|
|
|
|
function modelEntryWithClaudeCliRuntime(entry: unknown): Record<string, unknown> {
|
|
const base = isRecord(entry) ? { ...entry } : {};
|
|
const currentRuntimeId = isRecord(base.agentRuntime) ? base.agentRuntime.id : undefined;
|
|
const currentRuntime = normalizeLowercaseStringOrEmpty(currentRuntimeId);
|
|
if (currentRuntime && currentRuntime !== "auto") {
|
|
return base;
|
|
}
|
|
base.agentRuntime = {
|
|
...(isRecord(base.agentRuntime) ? base.agentRuntime : {}),
|
|
id: CLAUDE_CLI_BACKEND_ID,
|
|
};
|
|
return base;
|
|
}
|
|
|
|
function collectClaudeCliRuntimeRefs(
|
|
model: string | { primary?: string; fallbacks?: string[] } | undefined,
|
|
): string[] {
|
|
const refs = new Set<string>();
|
|
if (typeof model === "string") {
|
|
for (const ref of resolveClaudeCliAnthropicModelRefs(model)?.runtimeRefs ?? []) {
|
|
refs.add(ref);
|
|
}
|
|
return [...refs];
|
|
}
|
|
if (typeof model?.primary === "string") {
|
|
for (const ref of resolveClaudeCliAnthropicModelRefs(model.primary)?.runtimeRefs ?? []) {
|
|
refs.add(ref);
|
|
}
|
|
}
|
|
for (const fallback of model?.fallbacks ?? []) {
|
|
for (const ref of resolveClaudeCliAnthropicModelRefs(fallback)?.runtimeRefs ?? []) {
|
|
refs.add(ref);
|
|
}
|
|
}
|
|
return [...refs];
|
|
}
|
|
|
|
function collectClaudeCliRuntimeRefsFromModelMap(
|
|
models: Record<string, unknown> | undefined,
|
|
): string[] {
|
|
const refs = new Set<string>();
|
|
for (const key of Object.keys(models ?? {})) {
|
|
for (const ref of resolveClaudeCliAnthropicModelRefs(key)?.runtimeRefs ?? []) {
|
|
refs.add(ref);
|
|
}
|
|
}
|
|
return [...refs];
|
|
}
|
|
|
|
function collectClaudeCliRuntimeRefsFromConfig(config: OpenClawConfig): string[] {
|
|
const refs = new Set<string>(
|
|
collectClaudeCliRuntimeRefs(
|
|
config.agents?.defaults?.model as
|
|
| string
|
|
| { primary?: string; fallbacks?: string[] }
|
|
| undefined,
|
|
),
|
|
);
|
|
for (const ref of collectClaudeCliRuntimeRefsFromModelMap(config.agents?.defaults?.models)) {
|
|
refs.add(ref);
|
|
}
|
|
for (const agent of config.agents?.list ?? []) {
|
|
for (const ref of collectClaudeCliRuntimeRefs(
|
|
agent.model as string | { primary?: string; fallbacks?: string[] } | undefined,
|
|
)) {
|
|
refs.add(ref);
|
|
}
|
|
for (const ref of collectClaudeCliRuntimeRefsFromModelMap(agent.models)) {
|
|
refs.add(ref);
|
|
}
|
|
}
|
|
return [...refs];
|
|
}
|
|
|
|
function normalizeAnthropicProviderConfig<T extends { api?: string; models?: unknown[] }>(
|
|
providerConfig: T,
|
|
): T {
|
|
if (
|
|
providerConfig.api ||
|
|
!Array.isArray(providerConfig.models) ||
|
|
providerConfig.models.length === 0
|
|
) {
|
|
return providerConfig;
|
|
}
|
|
return { ...providerConfig, api: ANTHROPIC_PROVIDER_API };
|
|
}
|
|
|
|
export function normalizeAnthropicProviderConfigForProvider<
|
|
T extends { api?: string; models?: unknown[] },
|
|
>(params: { provider: string; providerConfig: T }): T {
|
|
const provider = normalizeProviderId(params.provider);
|
|
if (provider !== "anthropic" && provider !== CLAUDE_CLI_BACKEND_ID) {
|
|
return params.providerConfig;
|
|
}
|
|
return normalizeAnthropicProviderConfig(params.providerConfig);
|
|
}
|
|
|
|
export function applyAnthropicConfigDefaults(params: {
|
|
config: OpenClawConfig;
|
|
env: NodeJS.ProcessEnv;
|
|
}): OpenClawConfig {
|
|
const defaults = params.config.agents?.defaults;
|
|
if (!defaults) {
|
|
return params.config;
|
|
}
|
|
|
|
const authMode = resolveAnthropicDefaultAuthMode(params.config, params.env);
|
|
if (!authMode) {
|
|
return params.config;
|
|
}
|
|
|
|
let mutated = false;
|
|
const nextDefaults = { ...defaults };
|
|
const contextPruning = defaults.contextPruning ?? {};
|
|
const heartbeat = defaults.heartbeat ?? {};
|
|
|
|
if (defaults.contextPruning?.mode === undefined) {
|
|
nextDefaults.contextPruning = {
|
|
...contextPruning,
|
|
mode: "cache-ttl",
|
|
ttl: defaults.contextPruning?.ttl ?? "1h",
|
|
};
|
|
mutated = true;
|
|
}
|
|
|
|
if (defaults.heartbeat?.every === undefined) {
|
|
nextDefaults.heartbeat = {
|
|
...heartbeat,
|
|
every: authMode === "oauth" ? "1h" : "30m",
|
|
};
|
|
mutated = true;
|
|
}
|
|
|
|
if (authMode === "api_key") {
|
|
const nextModels = defaults.models ? { ...defaults.models } : {};
|
|
let modelsMutated = false;
|
|
|
|
for (const [key, entry] of Object.entries(nextModels)) {
|
|
const parsed = parseProviderModelRef(key, "anthropic");
|
|
if (!isAnthropicCacheRetentionTarget(parsed)) {
|
|
continue;
|
|
}
|
|
const current = entry ?? {};
|
|
const paramsValue = (current as { params?: Record<string, unknown> }).params ?? {};
|
|
if (typeof paramsValue.cacheRetention === "string") {
|
|
continue;
|
|
}
|
|
nextModels[key] = {
|
|
...(current as Record<string, unknown>),
|
|
params: { ...paramsValue, cacheRetention: "short" },
|
|
};
|
|
modelsMutated = true;
|
|
}
|
|
|
|
const primary = resolveKnownAnthropicModelRef(
|
|
resolveModelPrimaryValue(
|
|
defaults.model as string | { primary?: string; fallbacks?: string[] } | undefined,
|
|
),
|
|
);
|
|
if (primary) {
|
|
const parsedPrimary = parseProviderModelRef(primary, "anthropic");
|
|
if (parsedPrimary && isAnthropicCacheRetentionTarget(parsedPrimary)) {
|
|
const key = `${parsedPrimary.provider}/${parsedPrimary.model}`;
|
|
const entry = nextModels[key];
|
|
const current = entry ?? {};
|
|
const paramsValue = (current as { params?: Record<string, unknown> }).params ?? {};
|
|
if (typeof paramsValue.cacheRetention !== "string") {
|
|
nextModels[key] = {
|
|
...(current as Record<string, unknown>),
|
|
params: { ...paramsValue, cacheRetention: "short" },
|
|
};
|
|
modelsMutated = true;
|
|
}
|
|
}
|
|
}
|
|
|
|
const hasAnthropicApiKeyModel = Object.keys(nextModels).some((key) =>
|
|
isAnthropicCacheRetentionTarget(parseProviderModelRef(key, "anthropic")),
|
|
);
|
|
if (hasAnthropicApiKeyModel) {
|
|
for (const ref of ANTHROPIC_API_KEY_DEFAULT_ALLOWLIST_REFS) {
|
|
if (ref in nextModels) {
|
|
continue;
|
|
}
|
|
nextModels[ref] = { params: { cacheRetention: "short" } };
|
|
modelsMutated = true;
|
|
}
|
|
}
|
|
|
|
if (modelsMutated) {
|
|
nextDefaults.models = nextModels;
|
|
mutated = true;
|
|
}
|
|
}
|
|
|
|
if (
|
|
authMode === "oauth" &&
|
|
(usesClaudeCliModelSelection(params.config) || usesSelectedClaudeCliAuthProfile(params.config))
|
|
) {
|
|
const nextModels = defaults.models ? { ...defaults.models } : {};
|
|
let modelsMutated = false;
|
|
const runtimeRefs = new Set<string>(collectClaudeCliRuntimeRefsFromConfig(params.config));
|
|
for (const rawRef of CLAUDE_CLI_DEFAULT_ALLOWLIST_REFS) {
|
|
runtimeRefs.add(toCanonicalAnthropicModelRef(rawRef));
|
|
}
|
|
for (const ref of runtimeRefs) {
|
|
const current = nextModels[ref];
|
|
const updated = modelEntryWithClaudeCliRuntime(current);
|
|
if (JSON.stringify(updated) === JSON.stringify(current ?? {})) {
|
|
continue;
|
|
}
|
|
nextModels[ref] = updated;
|
|
modelsMutated = true;
|
|
}
|
|
if (modelsMutated) {
|
|
nextDefaults.models = nextModels;
|
|
mutated = true;
|
|
}
|
|
}
|
|
|
|
if (!mutated) {
|
|
return params.config;
|
|
}
|
|
|
|
return {
|
|
...params.config,
|
|
agents: {
|
|
...params.config.agents,
|
|
defaults: nextDefaults,
|
|
},
|
|
};
|
|
}
|