mirror of
https://github.com/openclaw/openclaw.git
synced 2026-06-02 17:55:15 +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
209 lines
6.9 KiB
TypeScript
209 lines
6.9 KiB
TypeScript
import { formatRawAssistantErrorForUi } from "../agents/embedded-agent-helpers.js";
|
|
import { areRuntimeModelRefsEquivalent } from "../agents/model-runtime-aliases.js";
|
|
import type { OpenClawConfig } from "../config/types.openclaw.js";
|
|
import { normalizeOptionalString } from "../shared/string-coerce.js";
|
|
import type { FallbackNoticeState } from "../status/fallback-notice-state.js";
|
|
import { formatProviderModelRef } from "./model-runtime.js";
|
|
import type { RuntimeFallbackAttempt } from "./reply/agent-runner-execution.js";
|
|
export {
|
|
resolveActiveFallbackState,
|
|
type FallbackNoticeState,
|
|
} from "../status/fallback-notice-state.js";
|
|
|
|
const FALLBACK_REASON_PART_MAX = 80;
|
|
const TRANSIENT_FALLBACK_REASONS = new Set([
|
|
"rate_limit",
|
|
"overloaded",
|
|
"timeout",
|
|
"empty_response",
|
|
"no_error_details",
|
|
"unclassified",
|
|
]);
|
|
const TRANSIENT_ERROR_DETAIL_HINT_RE =
|
|
/\b(?:429|5\d\d|too many requests|usage limit|quota|try again in|retry[- ]after|seconds?|minutes?|hours?|temporarily unavailable|overloaded|service unavailable|throttl)\b/i;
|
|
|
|
function truncateFallbackReasonPart(value: string, max = FALLBACK_REASON_PART_MAX): string {
|
|
const text = value.replace(/\s+/g, " ").trim();
|
|
if (text.length <= max) {
|
|
return text;
|
|
}
|
|
return `${text.slice(0, Math.max(0, max - 1)).trimEnd()}…`;
|
|
}
|
|
|
|
function formatFallbackAttemptErrorPreview(attempt: RuntimeFallbackAttempt): string | undefined {
|
|
const rawError = attempt.error?.trim();
|
|
if (!rawError) {
|
|
return undefined;
|
|
}
|
|
if (!attempt.reason || !TRANSIENT_FALLBACK_REASONS.has(attempt.reason)) {
|
|
return undefined;
|
|
}
|
|
if (!TRANSIENT_ERROR_DETAIL_HINT_RE.test(rawError)) {
|
|
return undefined;
|
|
}
|
|
const formatted = formatRawAssistantErrorForUi(rawError)
|
|
.replace(/^⚠️\s*/, "")
|
|
.replace(/\s+/g, " ")
|
|
.trim();
|
|
if (!formatted || /unknown error/i.test(formatted)) {
|
|
return undefined;
|
|
}
|
|
return formatted;
|
|
}
|
|
|
|
function formatFallbackAttemptReason(attempt: RuntimeFallbackAttempt): string {
|
|
const errorPreview = formatFallbackAttemptErrorPreview(attempt);
|
|
if (errorPreview) {
|
|
return errorPreview;
|
|
}
|
|
const reason = attempt.reason?.trim();
|
|
if (reason) {
|
|
return reason.replace(/_/g, " ");
|
|
}
|
|
const code = attempt.code?.trim();
|
|
if (code) {
|
|
return code;
|
|
}
|
|
if (typeof attempt.status === "number") {
|
|
return `HTTP ${attempt.status}`;
|
|
}
|
|
return truncateFallbackReasonPart(attempt.error || "error");
|
|
}
|
|
|
|
function formatFallbackAttemptSummary(attempt: RuntimeFallbackAttempt): string {
|
|
return `${formatProviderModelRef(attempt.provider, attempt.model)} ${formatFallbackAttemptReason(attempt)}`;
|
|
}
|
|
|
|
function buildFallbackReasonSummary(attempts: RuntimeFallbackAttempt[]): string {
|
|
const firstAttempt = attempts[0];
|
|
const firstReason = firstAttempt
|
|
? formatFallbackAttemptReason(firstAttempt)
|
|
: "selected model unavailable";
|
|
const moreAttempts = attempts.length > 1 ? ` (+${attempts.length - 1} more attempts)` : "";
|
|
return `${truncateFallbackReasonPart(firstReason)}${moreAttempts}`;
|
|
}
|
|
|
|
function buildFallbackAttemptSummaries(attempts: RuntimeFallbackAttempt[]): string[] {
|
|
return attempts.map((attempt) =>
|
|
truncateFallbackReasonPart(formatFallbackAttemptSummary(attempt)),
|
|
);
|
|
}
|
|
|
|
export function buildFallbackNotice(params: {
|
|
selectedProvider: string;
|
|
selectedModel: string;
|
|
activeProvider: string;
|
|
activeModel: string;
|
|
attempts: RuntimeFallbackAttempt[];
|
|
cfg?: OpenClawConfig;
|
|
}): string | null {
|
|
const selected = formatProviderModelRef(params.selectedProvider, params.selectedModel);
|
|
const active = formatProviderModelRef(params.activeProvider, params.activeModel);
|
|
if (areRuntimeModelRefsEquivalent(selected, active, { config: params.cfg })) {
|
|
return null;
|
|
}
|
|
const reasonSummary = buildFallbackReasonSummary(params.attempts);
|
|
return `↪️ Model Fallback: ${active} (selected ${selected}; ${reasonSummary})`;
|
|
}
|
|
|
|
export function buildFallbackClearedNotice(params: {
|
|
selectedProvider: string;
|
|
selectedModel: string;
|
|
previousActiveModel?: string;
|
|
}): string {
|
|
const selected = formatProviderModelRef(params.selectedProvider, params.selectedModel);
|
|
const previous = normalizeOptionalString(params.previousActiveModel);
|
|
if (previous && previous !== selected) {
|
|
return `↪️ Model Fallback cleared: ${selected} (was ${previous})`;
|
|
}
|
|
return `↪️ Model Fallback cleared: ${selected}`;
|
|
}
|
|
|
|
type ResolvedFallbackTransition = {
|
|
selectedModelRef: string;
|
|
activeModelRef: string;
|
|
fallbackActive: boolean;
|
|
fallbackTransitioned: boolean;
|
|
fallbackCleared: boolean;
|
|
reasonSummary: string;
|
|
attemptSummaries: string[];
|
|
previousState: {
|
|
selectedModel?: string;
|
|
activeModel?: string;
|
|
reason?: string;
|
|
};
|
|
nextState: {
|
|
selectedModel?: string;
|
|
activeModel?: string;
|
|
reason?: string;
|
|
};
|
|
stateChanged: boolean;
|
|
};
|
|
|
|
export function resolveFallbackTransition(params: {
|
|
selectedProvider: string;
|
|
selectedModel: string;
|
|
activeProvider: string;
|
|
activeModel: string;
|
|
attempts: RuntimeFallbackAttempt[];
|
|
state?: FallbackNoticeState;
|
|
cfg?: OpenClawConfig;
|
|
}): ResolvedFallbackTransition {
|
|
const selectedModelRef = formatProviderModelRef(params.selectedProvider, params.selectedModel);
|
|
const activeModelRef = formatProviderModelRef(params.activeProvider, params.activeModel);
|
|
const previousState = {
|
|
selectedModel: normalizeOptionalString(params.state?.fallbackNoticeSelectedModel),
|
|
activeModel: normalizeOptionalString(params.state?.fallbackNoticeActiveModel),
|
|
reason: normalizeOptionalString(params.state?.fallbackNoticeReason),
|
|
};
|
|
const comparisonOptions = { config: params.cfg };
|
|
const fallbackActive = !areRuntimeModelRefsEquivalent(
|
|
selectedModelRef,
|
|
activeModelRef,
|
|
comparisonOptions,
|
|
);
|
|
const fallbackTransitioned =
|
|
fallbackActive &&
|
|
(previousState.selectedModel !== selectedModelRef ||
|
|
previousState.activeModel !== activeModelRef);
|
|
const previousStateWasRealFallback = Boolean(
|
|
previousState.selectedModel &&
|
|
previousState.activeModel &&
|
|
!areRuntimeModelRefsEquivalent(
|
|
previousState.selectedModel,
|
|
previousState.activeModel,
|
|
comparisonOptions,
|
|
),
|
|
);
|
|
const fallbackCleared = !fallbackActive && previousStateWasRealFallback;
|
|
const reasonSummary = buildFallbackReasonSummary(params.attempts);
|
|
const attemptSummaries = buildFallbackAttemptSummaries(params.attempts);
|
|
const nextState = fallbackActive
|
|
? {
|
|
selectedModel: selectedModelRef,
|
|
activeModel: activeModelRef,
|
|
reason: reasonSummary,
|
|
}
|
|
: {
|
|
selectedModel: undefined,
|
|
activeModel: undefined,
|
|
reason: undefined,
|
|
};
|
|
const stateChanged =
|
|
previousState.selectedModel !== nextState.selectedModel ||
|
|
previousState.activeModel !== nextState.activeModel ||
|
|
previousState.reason !== nextState.reason;
|
|
return {
|
|
selectedModelRef,
|
|
activeModelRef,
|
|
fallbackActive,
|
|
fallbackTransitioned,
|
|
fallbackCleared,
|
|
reasonSummary,
|
|
attemptSummaries,
|
|
previousState,
|
|
nextState,
|
|
stateChanged,
|
|
};
|
|
}
|