mirror of
https://github.com/openclaw/openclaw.git
synced 2026-05-28 22:46:49 +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
251 lines
7.6 KiB
TypeScript
251 lines
7.6 KiB
TypeScript
import {
|
|
CLAUDE_CLI_PROFILE_ID,
|
|
type OpenClawConfig,
|
|
type ProviderAuthResult,
|
|
} from "openclaw/plugin-sdk/provider-auth";
|
|
import {
|
|
isRecord,
|
|
normalizeLowercaseStringOrEmpty,
|
|
} from "openclaw/plugin-sdk/string-coerce-runtime";
|
|
import { resolveClaudeCliAnthropicModelRefs } from "./claude-model-refs.js";
|
|
import {
|
|
readClaudeCliCredentialsForSetup,
|
|
readClaudeCliCredentialsForSetupNonInteractive,
|
|
} from "./cli-auth-seam.js";
|
|
import { CLAUDE_CLI_BACKEND_ID, CLAUDE_CLI_DEFAULT_ALLOWLIST_REFS } from "./cli-shared.js";
|
|
|
|
type AgentDefaultsModel = NonNullable<NonNullable<OpenClawConfig["agents"]>["defaults"]>["model"];
|
|
type AgentDefaultsModels = NonNullable<NonNullable<OpenClawConfig["agents"]>["defaults"]>["models"];
|
|
type ClaudeCliCredential = NonNullable<ReturnType<typeof readClaudeCliCredentialsForSetup>>;
|
|
|
|
function toAnthropicModelRef(raw: string): string | null {
|
|
return resolveClaudeCliAnthropicModelRefs(raw)?.rewriteRef ?? null;
|
|
}
|
|
|
|
function toAnthropicRuntimeRefs(raw: string): string[] {
|
|
return resolveClaudeCliAnthropicModelRefs(raw)?.runtimeRefs ?? [];
|
|
}
|
|
|
|
function toAnthropicSelectedModelRef(raw: string): string | undefined {
|
|
const resolved = resolveClaudeCliAnthropicModelRefs(raw);
|
|
return resolved?.rewriteRef ?? resolved?.selectedRef;
|
|
}
|
|
|
|
function rewriteModelSelection(model: AgentDefaultsModel): {
|
|
value: AgentDefaultsModel;
|
|
primary?: string;
|
|
runtimeRefs: string[];
|
|
changed: boolean;
|
|
} {
|
|
if (typeof model === "string") {
|
|
const runtimeRefs = toAnthropicRuntimeRefs(model);
|
|
const converted = toAnthropicModelRef(model);
|
|
const selectedRef = converted ?? toAnthropicSelectedModelRef(model);
|
|
return converted
|
|
? { value: converted, primary: converted, runtimeRefs, changed: true }
|
|
: {
|
|
value: model,
|
|
...(selectedRef ? { primary: selectedRef } : {}),
|
|
runtimeRefs,
|
|
changed: false,
|
|
};
|
|
}
|
|
if (!model || typeof model !== "object" || Array.isArray(model)) {
|
|
return { value: model, runtimeRefs: [], changed: false };
|
|
}
|
|
|
|
const current = model as Record<string, unknown>;
|
|
const next: Record<string, unknown> = { ...current };
|
|
const runtimeRefs: string[] = [];
|
|
let changed = false;
|
|
let primary: string | undefined;
|
|
|
|
if (typeof current.primary === "string") {
|
|
runtimeRefs.push(...toAnthropicRuntimeRefs(current.primary));
|
|
const converted = toAnthropicModelRef(current.primary);
|
|
if (converted) {
|
|
next.primary = converted;
|
|
primary = converted;
|
|
changed = true;
|
|
} else {
|
|
primary = toAnthropicSelectedModelRef(current.primary);
|
|
}
|
|
}
|
|
|
|
const currentFallbacks = current.fallbacks;
|
|
if (Array.isArray(currentFallbacks)) {
|
|
const nextFallbacks = currentFallbacks.map((entry) => {
|
|
if (typeof entry !== "string") {
|
|
return entry;
|
|
}
|
|
runtimeRefs.push(...toAnthropicRuntimeRefs(entry));
|
|
const converted = toAnthropicModelRef(entry);
|
|
return converted ?? entry;
|
|
});
|
|
if (nextFallbacks.some((entry, index) => entry !== currentFallbacks[index])) {
|
|
next.fallbacks = nextFallbacks;
|
|
changed = true;
|
|
}
|
|
}
|
|
|
|
return {
|
|
value: changed ? next : model,
|
|
...(primary ? { primary } : {}),
|
|
runtimeRefs,
|
|
changed,
|
|
};
|
|
}
|
|
|
|
function rewriteModelEntryMap(models: Record<string, unknown> | undefined): {
|
|
value: Record<string, unknown> | undefined;
|
|
migrated: string[];
|
|
runtimeRefs: string[];
|
|
} {
|
|
if (!models) {
|
|
return { value: models, migrated: [], runtimeRefs: [] };
|
|
}
|
|
|
|
const next = { ...models };
|
|
const migrated: string[] = [];
|
|
const runtimeRefs: string[] = [];
|
|
|
|
for (const [rawKey, value] of Object.entries(models)) {
|
|
runtimeRefs.push(...toAnthropicRuntimeRefs(rawKey));
|
|
const converted = toAnthropicModelRef(rawKey);
|
|
if (!converted) {
|
|
continue;
|
|
}
|
|
if (converted === rawKey) {
|
|
continue;
|
|
}
|
|
if (!(converted in next)) {
|
|
next[converted] = value;
|
|
}
|
|
if (normalizeLowercaseStringOrEmpty(rawKey).startsWith(`${CLAUDE_CLI_BACKEND_ID}/`)) {
|
|
delete next[rawKey];
|
|
}
|
|
migrated.push(converted);
|
|
}
|
|
|
|
return {
|
|
value: migrated.length > 0 || runtimeRefs.length > 0 ? next : models,
|
|
migrated,
|
|
runtimeRefs,
|
|
};
|
|
}
|
|
|
|
function seedClaudeCliAllowlist(
|
|
models: NonNullable<AgentDefaultsModels>,
|
|
selectedRefs: readonly string[] = [],
|
|
): NonNullable<AgentDefaultsModels> {
|
|
const next = { ...models };
|
|
const runtimeRefs = new Set<string>();
|
|
for (const ref of CLAUDE_CLI_DEFAULT_ALLOWLIST_REFS) {
|
|
const canonicalRef = toAnthropicModelRef(ref) ?? ref;
|
|
runtimeRefs.add(canonicalRef);
|
|
}
|
|
for (const ref of selectedRefs) {
|
|
runtimeRefs.add(ref);
|
|
}
|
|
for (const ref of runtimeRefs) {
|
|
next[ref] = modelEntryWithClaudeCliRuntime(next[ref]);
|
|
}
|
|
return next;
|
|
}
|
|
|
|
function modelEntryWithClaudeCliRuntime(entry: unknown): Record<string, unknown> {
|
|
const base = isRecord(entry) ? { ...entry } : {};
|
|
const currentRuntimeId = isRecord(base.agentRuntime) ? base.agentRuntime.id : undefined;
|
|
const currentRuntime =
|
|
typeof currentRuntimeId === "string" ? normalizeLowercaseStringOrEmpty(currentRuntimeId) : "";
|
|
if (currentRuntime && currentRuntime !== "auto") {
|
|
return base;
|
|
}
|
|
base.agentRuntime = {
|
|
...(isRecord(base.agentRuntime) ? base.agentRuntime : {}),
|
|
id: CLAUDE_CLI_BACKEND_ID,
|
|
};
|
|
return base;
|
|
}
|
|
|
|
export function hasClaudeCliAuth(options?: { allowKeychainPrompt?: boolean }): boolean {
|
|
return Boolean(
|
|
options?.allowKeychainPrompt === false
|
|
? readClaudeCliCredentialsForSetupNonInteractive()
|
|
: readClaudeCliCredentialsForSetup(),
|
|
);
|
|
}
|
|
|
|
function buildClaudeCliAuthProfiles(
|
|
credential?: ClaudeCliCredential | null,
|
|
): ProviderAuthResult["profiles"] {
|
|
if (!credential) {
|
|
return [];
|
|
}
|
|
if (credential.type === "oauth") {
|
|
return [
|
|
{
|
|
profileId: CLAUDE_CLI_PROFILE_ID,
|
|
credential: {
|
|
type: "oauth",
|
|
provider: CLAUDE_CLI_BACKEND_ID,
|
|
access: credential.access,
|
|
refresh: credential.refresh,
|
|
expires: credential.expires,
|
|
},
|
|
},
|
|
];
|
|
}
|
|
return [
|
|
{
|
|
profileId: CLAUDE_CLI_PROFILE_ID,
|
|
credential: {
|
|
type: "token",
|
|
provider: CLAUDE_CLI_BACKEND_ID,
|
|
token: credential.token,
|
|
expires: credential.expires,
|
|
},
|
|
},
|
|
];
|
|
}
|
|
|
|
export function buildAnthropicCliMigrationResult(
|
|
config: OpenClawConfig,
|
|
credential?: ClaudeCliCredential | null,
|
|
): ProviderAuthResult {
|
|
const defaults = config.agents?.defaults;
|
|
const rewrittenModel = rewriteModelSelection(defaults?.model);
|
|
const rewrittenModels = rewriteModelEntryMap(defaults?.models);
|
|
const existingModels = (rewrittenModels.value ??
|
|
defaults?.models ??
|
|
{}) as NonNullable<AgentDefaultsModels>;
|
|
const nextModels = seedClaudeCliAllowlist(existingModels, [
|
|
...rewrittenModel.runtimeRefs,
|
|
...rewrittenModels.runtimeRefs,
|
|
...rewrittenModels.migrated,
|
|
]);
|
|
const defaultModel = rewrittenModel.primary ?? "anthropic/claude-opus-4-7";
|
|
|
|
return {
|
|
profiles: buildClaudeCliAuthProfiles(credential),
|
|
configPatch: {
|
|
agents: {
|
|
defaults: {
|
|
...(rewrittenModel.changed ? { model: rewrittenModel.value } : {}),
|
|
models: nextModels,
|
|
},
|
|
},
|
|
},
|
|
// Rewrites `claude-cli/*` -> `anthropic/*`; merge would keep stale keys.
|
|
replaceDefaultModels: true,
|
|
defaultModel,
|
|
notes: [
|
|
"Claude CLI auth detected; kept Anthropic model refs and selected the local Claude CLI runtime.",
|
|
"Existing Anthropic auth profiles are kept for rollback.",
|
|
...(rewrittenModels.migrated.length > 0
|
|
? [`Migrated allowlist entries: ${rewrittenModels.migrated.join(", ")}.`]
|
|
: []),
|
|
],
|
|
};
|
|
}
|