mirror of
https://github.com/openclaw/openclaw.git
synced 2026-06-06 16:32:53 +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
264 lines
8.1 KiB
TypeScript
264 lines
8.1 KiB
TypeScript
import type { AgentModelEntryConfig } from "../config/types.agent-defaults.js";
|
|
import type { AgentRuntimePolicyConfig } from "../config/types.agents-shared.js";
|
|
import type { ModelDefinitionConfig, ModelProviderConfig } from "../config/types.models.js";
|
|
import type { OpenClawConfig } from "../config/types.openclaw.js";
|
|
import { normalizeAgentId } from "../routing/session-key.js";
|
|
import { listAgentEntries, resolveSessionAgentIds } from "./agent-scope.js";
|
|
import { normalizeProviderId } from "./provider-id.js";
|
|
|
|
export type ModelRuntimePolicySource = "model" | "provider";
|
|
|
|
export type ResolvedModelRuntimePolicy = {
|
|
policy?: AgentRuntimePolicyConfig;
|
|
source?: ModelRuntimePolicySource;
|
|
matchedProvider?: string;
|
|
};
|
|
|
|
type ModelEntryMatchKind = "none" | "exact" | "provider-wildcard";
|
|
|
|
type AgentModelRuntimePolicyMatch = {
|
|
provider: string;
|
|
policy: AgentRuntimePolicyConfig;
|
|
};
|
|
|
|
type AgentModelRuntimePolicyResolution = ResolvedModelRuntimePolicy & {
|
|
ambiguous?: true;
|
|
};
|
|
|
|
function hasRuntimePolicy(value: AgentRuntimePolicyConfig | undefined): boolean {
|
|
return Boolean(value?.id?.trim());
|
|
}
|
|
|
|
function resolveProviderConfig(
|
|
config: OpenClawConfig | undefined,
|
|
provider: string | undefined,
|
|
): ModelProviderConfig | undefined {
|
|
if (!config?.models?.providers || !provider?.trim()) {
|
|
return undefined;
|
|
}
|
|
const providers = config.models.providers;
|
|
const direct = providers[provider];
|
|
if (direct) {
|
|
return direct;
|
|
}
|
|
const normalizedProvider = normalizeProviderId(provider);
|
|
for (const [candidateProvider, providerConfig] of Object.entries(providers)) {
|
|
if (normalizeProviderId(candidateProvider) === normalizedProvider) {
|
|
return providerConfig;
|
|
}
|
|
}
|
|
return undefined;
|
|
}
|
|
|
|
function normalizeModelIdForProvider(
|
|
provider: string | undefined,
|
|
modelId: string | undefined,
|
|
): string | undefined {
|
|
const trimmed = modelId?.trim();
|
|
if (!trimmed) {
|
|
return undefined;
|
|
}
|
|
const slash = trimmed.indexOf("/");
|
|
if (slash <= 0) {
|
|
return trimmed;
|
|
}
|
|
const modelProvider = normalizeProviderId(trimmed.slice(0, slash));
|
|
const expectedProvider = normalizeProviderId(provider ?? "");
|
|
if (expectedProvider && modelProvider !== expectedProvider) {
|
|
return undefined;
|
|
}
|
|
return trimmed.slice(slash + 1).trim() || undefined;
|
|
}
|
|
|
|
function parseProviderModelKey(key: string): { provider: string; modelId: string } | undefined {
|
|
const slash = key.indexOf("/");
|
|
if (slash <= 0) {
|
|
return undefined;
|
|
}
|
|
const provider = normalizeProviderId(key.slice(0, slash));
|
|
const modelId = key.slice(slash + 1).trim();
|
|
return provider && modelId ? { provider, modelId } : undefined;
|
|
}
|
|
|
|
function providerMatchesCaller(provider: string, callerProvider: string): boolean {
|
|
return !callerProvider || provider === callerProvider;
|
|
}
|
|
|
|
function resolvePolicyMatch(
|
|
matches: AgentModelRuntimePolicyMatch[],
|
|
callerProvider: string,
|
|
): AgentModelRuntimePolicyResolution {
|
|
const [first] = matches;
|
|
if (!first) {
|
|
return {};
|
|
}
|
|
if (!callerProvider && matches.some((match) => match.provider !== first.provider)) {
|
|
return { ambiguous: true };
|
|
}
|
|
return {
|
|
policy: first.policy,
|
|
source: "model",
|
|
matchedProvider: first.provider || callerProvider,
|
|
};
|
|
}
|
|
|
|
function modelEntryMatches(params: {
|
|
entry: Pick<ModelDefinitionConfig, "id">;
|
|
provider: string | undefined;
|
|
modelId: string;
|
|
}): boolean {
|
|
return modelEntryMatchKind(params) === "exact";
|
|
}
|
|
|
|
function modelEntryMatchKind(params: {
|
|
entry: Pick<ModelDefinitionConfig, "id">;
|
|
provider: string | undefined;
|
|
modelId: string;
|
|
}): ModelEntryMatchKind {
|
|
const entryId = params.entry.id.trim();
|
|
if (entryId === params.modelId) {
|
|
return "exact";
|
|
}
|
|
const parsed = parseProviderModelKey(entryId);
|
|
if (!parsed) {
|
|
return "none";
|
|
}
|
|
const callerProvider = normalizeProviderId(params.provider ?? "");
|
|
if (!providerMatchesCaller(parsed.provider, callerProvider)) {
|
|
return "none";
|
|
}
|
|
if (parsed.modelId === params.modelId) {
|
|
return "exact";
|
|
}
|
|
if (parsed.modelId === "*") {
|
|
return "provider-wildcard";
|
|
}
|
|
return "none";
|
|
}
|
|
|
|
function modelKeyMatchKind(params: {
|
|
key: string;
|
|
provider: string | undefined;
|
|
modelId: string;
|
|
}): ModelEntryMatchKind {
|
|
return modelEntryMatchKind({
|
|
entry: { id: params.key },
|
|
provider: params.provider,
|
|
modelId: params.modelId,
|
|
});
|
|
}
|
|
|
|
function modelKeyIsProviderWildcard(params: {
|
|
key: string;
|
|
provider: string | undefined;
|
|
}): boolean {
|
|
const parsed = parseProviderModelKey(params.key);
|
|
if (!parsed) {
|
|
return false;
|
|
}
|
|
const callerProvider = normalizeProviderId(params.provider ?? "");
|
|
return parsed.modelId === "*" && providerMatchesCaller(parsed.provider, callerProvider);
|
|
}
|
|
|
|
function resolveAgentModelEntryRuntimePolicy(params: {
|
|
config?: OpenClawConfig;
|
|
provider?: string;
|
|
modelId?: string;
|
|
agentId?: string;
|
|
sessionKey?: string;
|
|
matchKind: Exclude<ModelEntryMatchKind, "none">;
|
|
}): AgentModelRuntimePolicyResolution {
|
|
const modelId = normalizeModelIdForProvider(params.provider, params.modelId);
|
|
if (!params.config || (!modelId && params.matchKind !== "provider-wildcard")) {
|
|
return {};
|
|
}
|
|
const { sessionAgentId } = resolveSessionAgentIds({
|
|
config: params.config,
|
|
agentId: params.agentId,
|
|
sessionKey: params.sessionKey,
|
|
});
|
|
const agentEntry = listAgentEntries(params.config).find(
|
|
(entry) => normalizeAgentId(entry.id) === sessionAgentId,
|
|
);
|
|
const modelMaps: Array<Record<string, AgentModelEntryConfig> | undefined> = [
|
|
agentEntry?.models,
|
|
params.config.agents?.defaults?.models,
|
|
];
|
|
const callerProvider = normalizeProviderId(params.provider ?? "");
|
|
for (const models of modelMaps) {
|
|
const scopeMatches: AgentModelRuntimePolicyMatch[] = [];
|
|
for (const [key, entry] of Object.entries(models ?? {})) {
|
|
const matches = modelId
|
|
? modelKeyMatchKind({ key, provider: params.provider, modelId }) === params.matchKind
|
|
: modelKeyIsProviderWildcard({ key, provider: params.provider });
|
|
const policy = entry?.agentRuntime;
|
|
if (!matches || !policy || !hasRuntimePolicy(policy)) {
|
|
continue;
|
|
}
|
|
scopeMatches.push({ provider: parseProviderModelKey(key)?.provider ?? "", policy });
|
|
}
|
|
const resolved = resolvePolicyMatch(scopeMatches, callerProvider);
|
|
if (resolved.policy || resolved.ambiguous) {
|
|
return resolved;
|
|
}
|
|
}
|
|
return {};
|
|
}
|
|
|
|
function resolveModelConfig(params: {
|
|
providerConfig?: ModelProviderConfig;
|
|
provider?: string;
|
|
modelId?: string;
|
|
}): ModelDefinitionConfig | undefined {
|
|
const modelId = normalizeModelIdForProvider(params.provider, params.modelId);
|
|
if (!modelId || !Array.isArray(params.providerConfig?.models)) {
|
|
return undefined;
|
|
}
|
|
return params.providerConfig.models.find((entry) =>
|
|
modelEntryMatches({ entry, provider: params.provider, modelId }),
|
|
);
|
|
}
|
|
|
|
export function resolveModelRuntimePolicy(params: {
|
|
config?: OpenClawConfig;
|
|
provider?: string;
|
|
modelId?: string;
|
|
agentId?: string;
|
|
sessionKey?: string;
|
|
}): ResolvedModelRuntimePolicy {
|
|
if (process.env.OPENCLAW_BUILD_PRIVATE_QA === "1") {
|
|
const forcedRuntime = process.env.OPENCLAW_QA_FORCE_RUNTIME?.trim().toLowerCase();
|
|
if (forcedRuntime === "openclaw" || forcedRuntime === "codex") {
|
|
return { policy: { id: forcedRuntime }, source: "model" };
|
|
}
|
|
}
|
|
|
|
const agentModelPolicy = resolveAgentModelEntryRuntimePolicy({ ...params, matchKind: "exact" });
|
|
if (agentModelPolicy.ambiguous) {
|
|
return {};
|
|
}
|
|
if (agentModelPolicy.policy) {
|
|
return agentModelPolicy;
|
|
}
|
|
const providerConfig = resolveProviderConfig(params.config, params.provider);
|
|
const modelConfig = resolveModelConfig({
|
|
providerConfig,
|
|
provider: params.provider,
|
|
modelId: params.modelId,
|
|
});
|
|
if (hasRuntimePolicy(modelConfig?.agentRuntime)) {
|
|
return { policy: modelConfig?.agentRuntime, source: "model" };
|
|
}
|
|
const agentWildcardModelPolicy = resolveAgentModelEntryRuntimePolicy({
|
|
...params,
|
|
matchKind: "provider-wildcard",
|
|
});
|
|
if (agentWildcardModelPolicy.policy) {
|
|
return agentWildcardModelPolicy;
|
|
}
|
|
if (hasRuntimePolicy(providerConfig?.agentRuntime)) {
|
|
return { policy: providerConfig?.agentRuntime, source: "provider" };
|
|
}
|
|
return {};
|
|
}
|