mirror of
https://github.com/openclaw/openclaw.git
synced 2026-06-01 22:56:38 +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
370 lines
11 KiB
TypeScript
370 lines
11 KiB
TypeScript
import type { StreamFn } from "openclaw/plugin-sdk/agent-core";
|
|
import {
|
|
streamSimple,
|
|
type AssistantMessage,
|
|
type AssistantMessageEvent,
|
|
} from "openclaw/plugin-sdk/llm";
|
|
import type { ProviderWrapStreamFnContext } from "openclaw/plugin-sdk/plugin-entry";
|
|
import {
|
|
composeProviderStreamWrappers,
|
|
createPlainTextToolCallCompatWrapper,
|
|
createToolStreamWrapper,
|
|
} from "openclaw/plugin-sdk/provider-stream-shared";
|
|
|
|
const XAI_FAST_MODEL_IDS = new Map<string, string>([
|
|
["grok-3", "grok-3-fast"],
|
|
["grok-3-mini", "grok-3-mini-fast"],
|
|
["grok-4", "grok-4-fast"],
|
|
["grok-4-0709", "grok-4-fast"],
|
|
]);
|
|
|
|
interface MutableAssistantMessageEventStream extends AsyncIterable<AssistantMessageEvent> {
|
|
result: () => Promise<AssistantMessage>;
|
|
}
|
|
|
|
function resolveXaiFastModelId(modelId: unknown): string | undefined {
|
|
if (typeof modelId !== "string") {
|
|
return undefined;
|
|
}
|
|
return XAI_FAST_MODEL_IDS.get(modelId.trim());
|
|
}
|
|
|
|
function stripUnsupportedStrictFlag(tool: unknown): unknown {
|
|
if (!tool || typeof tool !== "object") {
|
|
return tool;
|
|
}
|
|
const toolObj = tool as Record<string, unknown>;
|
|
const fn = toolObj.function;
|
|
if (!fn || typeof fn !== "object") {
|
|
return tool;
|
|
}
|
|
const fnObj = fn as Record<string, unknown>;
|
|
if (typeof fnObj.strict !== "boolean") {
|
|
return tool;
|
|
}
|
|
const nextFunction = { ...fnObj };
|
|
delete nextFunction.strict;
|
|
return { ...toolObj, function: nextFunction };
|
|
}
|
|
|
|
function supportsExplicitImageInput(model: { input?: unknown }): boolean {
|
|
return Array.isArray(model.input) && model.input.includes("image");
|
|
}
|
|
|
|
function supportsReasoningControls(model: { compat?: unknown; reasoning?: unknown }): boolean {
|
|
const compat =
|
|
model.compat && typeof model.compat === "object"
|
|
? (model.compat as { supportsReasoningEffort?: unknown })
|
|
: undefined;
|
|
return model.reasoning === true && compat?.supportsReasoningEffort !== false;
|
|
}
|
|
|
|
const TOOL_RESULT_IMAGE_REPLAY_TEXT = "Attached image(s) from tool result:";
|
|
const HTML_ENTITY_RE = /&(?:amp|lt|gt|quot|apos|#39|#x[0-9a-f]+|#\d+);/i;
|
|
const NAMED_HTML_ENTITIES = new Map<string, string>([
|
|
["amp", "&"],
|
|
["apos", "'"],
|
|
["gt", ">"],
|
|
["lt", "<"],
|
|
["quot", '"'],
|
|
]);
|
|
|
|
function decodeHtmlEntities(value: string): string {
|
|
return value.replace(/&(#x[0-9a-f]+|#\d+|amp|lt|gt|quot|apos|#39);/gi, (match, entity) => {
|
|
const normalized = String(entity).toLowerCase();
|
|
if (normalized === "#39") {
|
|
return "'";
|
|
}
|
|
if (normalized.startsWith("#x")) {
|
|
return String.fromCodePoint(Number.parseInt(normalized.slice(2), 16));
|
|
}
|
|
if (normalized.startsWith("#")) {
|
|
return String.fromCodePoint(Number.parseInt(normalized.slice(1), 10));
|
|
}
|
|
return NAMED_HTML_ENTITIES.get(normalized) ?? match;
|
|
});
|
|
}
|
|
|
|
function decodeHtmlEntitiesInObject(value: unknown): unknown {
|
|
switch (typeof value) {
|
|
case "string":
|
|
return HTML_ENTITY_RE.test(value) ? decodeHtmlEntities(value) : value;
|
|
case "object":
|
|
if (!value) {
|
|
return value;
|
|
}
|
|
if (Array.isArray(value)) {
|
|
return value.map((entry) => decodeHtmlEntitiesInObject(entry));
|
|
}
|
|
return Object.fromEntries(
|
|
Object.entries(value as Record<string, unknown>).map(([key, entry]) => [
|
|
key,
|
|
decodeHtmlEntitiesInObject(entry),
|
|
]),
|
|
);
|
|
default:
|
|
return value;
|
|
}
|
|
}
|
|
|
|
function visitContentBlocks(
|
|
value: unknown,
|
|
visitor: (block: Record<string, unknown>) => void,
|
|
): void {
|
|
if (Array.isArray(value)) {
|
|
for (const entry of value) {
|
|
visitContentBlocks(entry, visitor);
|
|
}
|
|
return;
|
|
}
|
|
if (!value || typeof value !== "object") {
|
|
return;
|
|
}
|
|
const block = value as Record<string, unknown>;
|
|
visitor(block);
|
|
if ("content" in block) {
|
|
visitContentBlocks(block.content, visitor);
|
|
}
|
|
}
|
|
|
|
function decodeToolCallArgumentsHtmlEntitiesInMessage(message: unknown): void {
|
|
visitContentBlocks(message, (block) => {
|
|
if (block.type !== "toolCall" || !block.arguments || typeof block.arguments !== "object") {
|
|
return;
|
|
}
|
|
block.arguments = decodeHtmlEntitiesInObject(block.arguments);
|
|
});
|
|
}
|
|
|
|
type ReplayableInputImagePart =
|
|
| {
|
|
type: "input_image";
|
|
source: { type: "url"; url: string } | { type: "base64"; media_type: string; data: string };
|
|
}
|
|
| { type: "input_image"; image_url: string; detail?: string };
|
|
|
|
type NormalizedFunctionCallOutput = {
|
|
normalizedItem: unknown;
|
|
imageParts: Array<Record<string, unknown>>;
|
|
};
|
|
|
|
function isReplayableInputImagePart(
|
|
part: Record<string, unknown>,
|
|
): part is ReplayableInputImagePart {
|
|
if (part.type !== "input_image") {
|
|
return false;
|
|
}
|
|
if (typeof part.image_url === "string") {
|
|
return true;
|
|
}
|
|
if (!part.source || typeof part.source !== "object") {
|
|
return false;
|
|
}
|
|
const source = part.source as {
|
|
type?: unknown;
|
|
url?: unknown;
|
|
media_type?: unknown;
|
|
data?: unknown;
|
|
};
|
|
if (source.type === "url") {
|
|
return typeof source.url === "string";
|
|
}
|
|
return (
|
|
source.type === "base64" &&
|
|
typeof source.media_type === "string" &&
|
|
typeof source.data === "string"
|
|
);
|
|
}
|
|
|
|
function normalizeXaiResponsesFunctionCallOutput(
|
|
item: unknown,
|
|
includeImages: boolean,
|
|
): NormalizedFunctionCallOutput {
|
|
if (!item || typeof item !== "object") {
|
|
return { normalizedItem: item, imageParts: [] };
|
|
}
|
|
|
|
const itemObj = item as Record<string, unknown>;
|
|
if (itemObj.type !== "function_call_output" || !Array.isArray(itemObj.output)) {
|
|
return { normalizedItem: itemObj, imageParts: [] };
|
|
}
|
|
|
|
const outputParts = itemObj.output as Array<Record<string, unknown>>;
|
|
const textOutput = outputParts
|
|
.filter(
|
|
(part): part is { type: "input_text"; text: string } =>
|
|
part.type === "input_text" && typeof part.text === "string",
|
|
)
|
|
.map((part) => part.text)
|
|
.join("");
|
|
|
|
const imageParts = includeImages
|
|
? outputParts.filter((part): part is ReplayableInputImagePart =>
|
|
isReplayableInputImagePart(part),
|
|
)
|
|
: [];
|
|
const hadNonTextParts = outputParts.some((part) => part.type !== "input_text");
|
|
|
|
return {
|
|
normalizedItem: {
|
|
...itemObj,
|
|
output: textOutput || (hadNonTextParts ? "(see attached image)" : ""),
|
|
},
|
|
imageParts,
|
|
};
|
|
}
|
|
|
|
function normalizeXaiResponsesToolResultPayload(
|
|
payloadObj: Record<string, unknown>,
|
|
model: { api?: unknown; input?: unknown },
|
|
): void {
|
|
if (model.api !== "openai-responses" || !Array.isArray(payloadObj.input)) {
|
|
return;
|
|
}
|
|
|
|
const includeImages = supportsExplicitImageInput(model);
|
|
const normalizedInput: unknown[] = [];
|
|
const collectedImageParts: Array<Record<string, unknown>> = [];
|
|
|
|
for (const item of payloadObj.input) {
|
|
const normalized = normalizeXaiResponsesFunctionCallOutput(item, includeImages);
|
|
normalizedInput.push(normalized.normalizedItem);
|
|
collectedImageParts.push(...normalized.imageParts);
|
|
}
|
|
|
|
if (collectedImageParts.length > 0) {
|
|
normalizedInput.push({
|
|
type: "message",
|
|
role: "user",
|
|
content: [
|
|
{ type: "input_text", text: TOOL_RESULT_IMAGE_REPLAY_TEXT },
|
|
...collectedImageParts,
|
|
],
|
|
});
|
|
}
|
|
|
|
payloadObj.input = normalizedInput;
|
|
}
|
|
|
|
export function createXaiToolPayloadCompatibilityWrapper(
|
|
baseStreamFn: StreamFn | undefined,
|
|
): StreamFn {
|
|
const underlying = baseStreamFn ?? streamSimple;
|
|
return (model, context, options) => {
|
|
const originalOnPayload = options?.onPayload;
|
|
return underlying(model, context, {
|
|
...options,
|
|
onPayload: (payload) => {
|
|
if (payload && typeof payload === "object") {
|
|
const payloadObj = payload as Record<string, unknown>;
|
|
if (Array.isArray(payloadObj.tools)) {
|
|
payloadObj.tools = payloadObj.tools.map((tool) => stripUnsupportedStrictFlag(tool));
|
|
}
|
|
normalizeXaiResponsesToolResultPayload(payloadObj, model);
|
|
if (!supportsReasoningControls(model)) {
|
|
delete payloadObj.reasoning;
|
|
delete payloadObj.reasoningEffort;
|
|
delete payloadObj.reasoning_effort;
|
|
}
|
|
}
|
|
return originalOnPayload?.(payload, model);
|
|
},
|
|
});
|
|
};
|
|
}
|
|
|
|
export function createXaiFastModeWrapper(
|
|
baseStreamFn: StreamFn | undefined,
|
|
fastMode: boolean,
|
|
): StreamFn {
|
|
const underlying = baseStreamFn ?? streamSimple;
|
|
return (model, context, options) => {
|
|
const supportsFastAliasTransport =
|
|
model.api === "openai-completions" || model.api === "openai-responses";
|
|
if (!fastMode || !supportsFastAliasTransport || model.provider !== "xai") {
|
|
return underlying(model, context, options);
|
|
}
|
|
|
|
const fastModelId = resolveXaiFastModelId(model.id);
|
|
if (!fastModelId) {
|
|
return underlying(model, context, options);
|
|
}
|
|
|
|
return underlying({ ...model, id: fastModelId }, context, options);
|
|
};
|
|
}
|
|
|
|
function transformXaiStreamEvent(
|
|
value: unknown,
|
|
transformMessage: (message: unknown) => void,
|
|
): void {
|
|
if (!value || typeof value !== "object") {
|
|
return;
|
|
}
|
|
const event = value as { partial?: unknown; message?: unknown };
|
|
transformMessage(event.partial);
|
|
transformMessage(event.message);
|
|
}
|
|
|
|
function wrapStreamMessageObjects(
|
|
stream: MutableAssistantMessageEventStream,
|
|
transformMessage: (message: unknown) => void,
|
|
): MutableAssistantMessageEventStream {
|
|
const originalResult = stream.result.bind(stream);
|
|
stream.result = async () => {
|
|
const message = await originalResult();
|
|
transformMessage(message);
|
|
return message;
|
|
};
|
|
|
|
const originalAsyncIterator = stream[Symbol.asyncIterator].bind(stream);
|
|
(stream as { [Symbol.asyncIterator]: typeof originalAsyncIterator })[Symbol.asyncIterator] =
|
|
function () {
|
|
const iterator = originalAsyncIterator();
|
|
return {
|
|
async next() {
|
|
const result = await iterator.next();
|
|
if (!result.done) {
|
|
transformXaiStreamEvent(result.value, transformMessage);
|
|
}
|
|
return result;
|
|
},
|
|
async return(value?: unknown) {
|
|
return iterator.return?.(value) ?? { done: true as const, value: undefined };
|
|
},
|
|
async throw(error?: unknown) {
|
|
return iterator.throw?.(error) ?? { done: true as const, value: undefined };
|
|
},
|
|
};
|
|
};
|
|
return stream;
|
|
}
|
|
|
|
function createXaiToolCallArgumentDecodingWrapper(baseStreamFn: StreamFn | undefined): StreamFn {
|
|
const underlying = baseStreamFn ?? streamSimple;
|
|
return (model, context, options) => {
|
|
const maybeStream = underlying(model, context, options);
|
|
if (maybeStream && typeof maybeStream === "object" && "then" in maybeStream) {
|
|
return Promise.resolve(maybeStream).then((stream) =>
|
|
wrapStreamMessageObjects(stream, decodeToolCallArgumentsHtmlEntitiesInMessage),
|
|
);
|
|
}
|
|
return wrapStreamMessageObjects(maybeStream, decodeToolCallArgumentsHtmlEntitiesInMessage);
|
|
};
|
|
}
|
|
|
|
export function wrapXaiProviderStream(ctx: ProviderWrapStreamFnContext): StreamFn | undefined {
|
|
const extraParams = ctx.extraParams;
|
|
const fastMode = extraParams?.fastMode;
|
|
const toolStreamEnabled = extraParams?.tool_stream !== false;
|
|
return composeProviderStreamWrappers(ctx.streamFn, (streamFn) => {
|
|
let wrappedStreamFn = createXaiToolPayloadCompatibilityWrapper(streamFn);
|
|
if (typeof fastMode === "boolean") {
|
|
wrappedStreamFn = createXaiFastModeWrapper(wrappedStreamFn, fastMode);
|
|
}
|
|
wrappedStreamFn = createXaiToolCallArgumentDecodingWrapper(wrappedStreamFn);
|
|
wrappedStreamFn = createPlainTextToolCallCompatWrapper(wrappedStreamFn);
|
|
return createToolStreamWrapper(wrappedStreamFn, toolStreamEnabled);
|
|
});
|
|
}
|