mirror of
https://github.com/openclaw/openclaw.git
synced 2026-06-07 12:32:52 +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
204 lines
6.4 KiB
TypeScript
204 lines
6.4 KiB
TypeScript
import { readLoggingConfig } from "../logging/config.js";
|
|
import { redactIdentifier } from "../logging/redact-identifier.js";
|
|
import { getDefaultRedactPatterns, redactSensitiveText } from "../logging/redact.js";
|
|
import { normalizeOptionalString } from "../shared/string-coerce.js";
|
|
import {
|
|
classifyProviderRuntimeFailureKind,
|
|
getApiErrorPayloadFingerprint,
|
|
parseApiErrorInfo,
|
|
type ProviderRuntimeFailureKind,
|
|
} from "./embedded-agent-helpers.js";
|
|
import { stableStringify } from "./stable-stringify.js";
|
|
|
|
export { sanitizeForConsole } from "./console-sanitize.js";
|
|
|
|
const MAX_OBSERVATION_INPUT_CHARS = 64_000;
|
|
const MAX_FINGERPRINT_MESSAGE_CHARS = 8_000;
|
|
const RAW_ERROR_PREVIEW_MAX_CHARS = 400;
|
|
const PROVIDER_ERROR_PREVIEW_MAX_CHARS = 200;
|
|
const REQUEST_ID_RE = /\brequest[_ ]?id\b\s*[:=]\s*["'()]*([A-Za-z0-9._:-]+)/i;
|
|
const OBSERVATION_EXTRA_REDACT_PATTERNS = [
|
|
String.raw`\b(?:x-)?api[-_]?key\b\s*[:=]\s*(["']?)([^\s"'\\;]+)\1`,
|
|
String.raw`"(?:api[-_]?key|api_key)"\s*:\s*"([^"]+)"`,
|
|
String.raw`(?:\bCookie\b\s*[:=]\s*[^;=\s]+=|;\s*[^;=\s]+=)([^;\s\r\n]+)`,
|
|
];
|
|
const RAW_ERROR_CONSOLE_SUPPRESSED_FAILURE_KINDS = new Set<ProviderRuntimeFailureKind>([
|
|
"auth_html",
|
|
"auth_refresh",
|
|
"auth_scope",
|
|
]);
|
|
|
|
function resolveConfiguredRedactPatterns(): string[] {
|
|
const configured = readLoggingConfig()?.redactPatterns;
|
|
if (!Array.isArray(configured)) {
|
|
return [];
|
|
}
|
|
return configured.filter((pattern): pattern is string => typeof pattern === "string");
|
|
}
|
|
|
|
function truncateForObservation(text: string | undefined, maxChars: number): string | undefined {
|
|
const trimmed = text?.trim();
|
|
if (!trimmed) {
|
|
return undefined;
|
|
}
|
|
return trimmed.length > maxChars ? `${trimmed.slice(0, maxChars)}…` : trimmed;
|
|
}
|
|
|
|
function boundObservationInput(text: string | undefined): string | undefined {
|
|
const trimmed = text?.trim();
|
|
if (!trimmed) {
|
|
return undefined;
|
|
}
|
|
return trimmed.length > MAX_OBSERVATION_INPUT_CHARS
|
|
? trimmed.slice(0, MAX_OBSERVATION_INPUT_CHARS)
|
|
: trimmed;
|
|
}
|
|
|
|
function replaceRequestIdPreview(
|
|
text: string | undefined,
|
|
requestId: string | undefined,
|
|
): string | undefined {
|
|
if (!text || !requestId) {
|
|
return text;
|
|
}
|
|
return text.split(requestId).join(redactIdentifier(requestId, { len: 12 }));
|
|
}
|
|
|
|
function redactObservationText(text: string | undefined): string | undefined {
|
|
if (!text) {
|
|
return text;
|
|
}
|
|
// Observation logs must stay redacted even when operators disable general-purpose
|
|
// log redaction, otherwise raw provider payloads leak back into always-on logs.
|
|
const configuredPatterns = resolveConfiguredRedactPatterns();
|
|
return redactSensitiveText(text, {
|
|
mode: "tools",
|
|
patterns: [
|
|
...getDefaultRedactPatterns(),
|
|
...configuredPatterns,
|
|
...OBSERVATION_EXTRA_REDACT_PATTERNS,
|
|
],
|
|
});
|
|
}
|
|
|
|
export function shouldSuppressRawErrorConsoleSuffix(
|
|
providerRuntimeFailureKind?: ProviderRuntimeFailureKind,
|
|
): boolean {
|
|
return providerRuntimeFailureKind
|
|
? RAW_ERROR_CONSOLE_SUPPRESSED_FAILURE_KINDS.has(providerRuntimeFailureKind)
|
|
: false;
|
|
}
|
|
|
|
function buildObservationFingerprint(params: {
|
|
raw: string;
|
|
requestId?: string;
|
|
httpCode?: string;
|
|
type?: string;
|
|
message?: string;
|
|
}): string | null {
|
|
const boundedMessage =
|
|
params.message && params.message.length > MAX_FINGERPRINT_MESSAGE_CHARS
|
|
? params.message.slice(0, MAX_FINGERPRINT_MESSAGE_CHARS)
|
|
: params.message;
|
|
const structured =
|
|
params.httpCode || params.type || boundedMessage
|
|
? stableStringify({
|
|
httpCode: params.httpCode,
|
|
type: params.type,
|
|
message: boundedMessage,
|
|
})
|
|
: null;
|
|
if (structured) {
|
|
return structured;
|
|
}
|
|
if (params.requestId) {
|
|
return params.raw.split(params.requestId).join("<request_id>");
|
|
}
|
|
return getApiErrorPayloadFingerprint(params.raw);
|
|
}
|
|
|
|
export function buildApiErrorObservationFields(
|
|
rawError?: string,
|
|
opts?: { provider?: string },
|
|
): {
|
|
rawErrorPreview?: string;
|
|
rawErrorHash?: string;
|
|
rawErrorFingerprint?: string;
|
|
httpCode?: string;
|
|
providerRuntimeFailureKind?: ProviderRuntimeFailureKind;
|
|
providerErrorType?: string;
|
|
providerErrorMessagePreview?: string;
|
|
requestIdHash?: string;
|
|
} {
|
|
const trimmed = boundObservationInput(rawError);
|
|
if (!trimmed) {
|
|
return {};
|
|
}
|
|
try {
|
|
const parsed = parseApiErrorInfo(trimmed);
|
|
const requestId =
|
|
parsed?.requestId ?? normalizeOptionalString(trimmed.match(REQUEST_ID_RE)?.[1]);
|
|
const requestIdHash = requestId ? redactIdentifier(requestId, { len: 12 }) : undefined;
|
|
const rawFingerprint = buildObservationFingerprint({
|
|
raw: trimmed,
|
|
requestId,
|
|
httpCode: parsed?.httpCode,
|
|
type: parsed?.type,
|
|
message: parsed?.message,
|
|
});
|
|
const redactedRawPreview = replaceRequestIdPreview(redactObservationText(trimmed), requestId);
|
|
const redactedProviderMessage = replaceRequestIdPreview(
|
|
redactObservationText(parsed?.message),
|
|
requestId,
|
|
);
|
|
|
|
return {
|
|
rawErrorPreview: truncateForObservation(redactedRawPreview, RAW_ERROR_PREVIEW_MAX_CHARS),
|
|
rawErrorHash: redactIdentifier(trimmed, { len: 12 }),
|
|
rawErrorFingerprint: rawFingerprint
|
|
? redactIdentifier(rawFingerprint, { len: 12 })
|
|
: undefined,
|
|
httpCode: parsed?.httpCode,
|
|
providerRuntimeFailureKind: classifyProviderRuntimeFailureKind({
|
|
status: parsed?.httpCode ? Number(parsed.httpCode) : undefined,
|
|
message: trimmed,
|
|
provider: opts?.provider,
|
|
}),
|
|
providerErrorType: parsed?.type,
|
|
providerErrorMessagePreview: truncateForObservation(
|
|
redactedProviderMessage,
|
|
PROVIDER_ERROR_PREVIEW_MAX_CHARS,
|
|
),
|
|
requestIdHash,
|
|
};
|
|
} catch {
|
|
return {};
|
|
}
|
|
}
|
|
|
|
export function buildTextObservationFields(
|
|
text?: string,
|
|
opts?: { provider?: string },
|
|
): {
|
|
textPreview?: string;
|
|
textHash?: string;
|
|
textFingerprint?: string;
|
|
httpCode?: string;
|
|
providerRuntimeFailureKind?: ProviderRuntimeFailureKind;
|
|
providerErrorType?: string;
|
|
providerErrorMessagePreview?: string;
|
|
requestIdHash?: string;
|
|
} {
|
|
const observed = buildApiErrorObservationFields(text, opts);
|
|
return {
|
|
textPreview: observed.rawErrorPreview,
|
|
textHash: observed.rawErrorHash,
|
|
textFingerprint: observed.rawErrorFingerprint,
|
|
httpCode: observed.httpCode,
|
|
providerRuntimeFailureKind: observed.providerRuntimeFailureKind,
|
|
providerErrorType: observed.providerErrorType,
|
|
providerErrorMessagePreview: observed.providerErrorMessagePreview,
|
|
requestIdHash: observed.requestIdHash,
|
|
};
|
|
}
|