mirror of
https://github.com/openclaw/openclaw.git
synced 2026-06-06 08:02:54 +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
364 lines
11 KiB
TypeScript
364 lines
11 KiB
TypeScript
import type { AssistantMessage } from "../llm/types.js";
|
|
import { extractTextFromChatContent } from "../shared/chat-content.js";
|
|
import {
|
|
normalizeAssistantPhase,
|
|
parseAssistantTextSignature,
|
|
type AssistantPhase,
|
|
} from "../shared/chat-message-content.js";
|
|
import { sanitizeAssistantVisibleText } from "../shared/text/assistant-visible-text.js";
|
|
import { stripReasoningTagsFromText } from "../shared/text/reasoning-tags.js";
|
|
import { sanitizeUserFacingText } from "./embedded-agent-helpers/sanitize-user-facing-text.js";
|
|
import type { AgentMessage } from "./runtime/index.js";
|
|
import { formatToolDetail, resolveToolDisplay } from "./tool-display.js";
|
|
|
|
export {
|
|
stripDowngradedToolCallText,
|
|
stripMinimaxToolCallXml,
|
|
} from "../shared/text/assistant-visible-text.js";
|
|
export { stripModelSpecialTokens } from "../shared/text/model-special-tokens.js";
|
|
|
|
export function isAssistantMessage(msg: AgentMessage | undefined): msg is AssistantMessage {
|
|
return msg?.role === "assistant";
|
|
}
|
|
|
|
/**
|
|
* Strip thinking tags and their content from text.
|
|
* This is a safety net for cases where the model outputs <think> tags
|
|
* that slip through other filtering mechanisms.
|
|
*/
|
|
export function stripThinkingTagsFromText(text: string): string {
|
|
return stripReasoningTagsFromText(text, { mode: "strict", trim: "both" });
|
|
}
|
|
|
|
function sanitizeAssistantText(text: string): string {
|
|
return sanitizeAssistantVisibleText(text);
|
|
}
|
|
|
|
function finalizeAssistantExtraction(msg: AssistantMessage, extracted: string): string {
|
|
const errorContext = msg.stopReason === "error";
|
|
return sanitizeUserFacingText(extracted, { errorContext });
|
|
}
|
|
|
|
type AssistantTextExtractionResult = {
|
|
text: string;
|
|
hadRequestedPhase: boolean;
|
|
};
|
|
|
|
function extractAssistantTextForPhase(
|
|
msg: AssistantMessage,
|
|
phase?: AssistantPhase,
|
|
): AssistantTextExtractionResult {
|
|
const messagePhase = normalizeAssistantPhase((msg as { phase?: unknown }).phase);
|
|
const shouldIncludeContent = (resolvedPhase?: AssistantPhase) => {
|
|
if (phase) {
|
|
return resolvedPhase === phase;
|
|
}
|
|
return resolvedPhase === undefined;
|
|
};
|
|
|
|
if (typeof msg.content === "string") {
|
|
const hadRequestedPhase = phase ? messagePhase === phase : messagePhase === undefined;
|
|
return {
|
|
text: shouldIncludeContent(messagePhase)
|
|
? finalizeAssistantExtraction(msg, sanitizeAssistantText(msg.content))
|
|
: "",
|
|
hadRequestedPhase,
|
|
};
|
|
}
|
|
|
|
if (!Array.isArray(msg.content)) {
|
|
return { text: "", hadRequestedPhase: false };
|
|
}
|
|
|
|
const hasExplicitPhasedTextBlocks = msg.content.some((block) => {
|
|
if (!block || typeof block !== "object") {
|
|
return false;
|
|
}
|
|
const record = block as { type?: unknown; textSignature?: unknown };
|
|
if (record.type !== "text") {
|
|
return false;
|
|
}
|
|
return Boolean(parseAssistantTextSignature(record.textSignature)?.phase);
|
|
});
|
|
|
|
let hadRequestedPhase = false;
|
|
const extracted =
|
|
extractTextFromChatContent(
|
|
msg.content.filter((block) => {
|
|
if (!block || typeof block !== "object") {
|
|
return false;
|
|
}
|
|
const record = block as { type?: unknown; textSignature?: unknown };
|
|
if (record.type !== "text") {
|
|
return false;
|
|
}
|
|
const signature = parseAssistantTextSignature(record.textSignature);
|
|
const resolvedPhase =
|
|
signature?.phase ?? (hasExplicitPhasedTextBlocks ? undefined : messagePhase);
|
|
if (phase ? resolvedPhase === phase : resolvedPhase === undefined) {
|
|
hadRequestedPhase = true;
|
|
}
|
|
return shouldIncludeContent(resolvedPhase);
|
|
}),
|
|
{
|
|
sanitizeText: (text) => sanitizeAssistantText(text),
|
|
joinWith: "\n",
|
|
normalizeText: (text) => text.trim(),
|
|
},
|
|
) ?? "";
|
|
|
|
return {
|
|
text: finalizeAssistantExtraction(msg, extracted),
|
|
hadRequestedPhase,
|
|
};
|
|
}
|
|
|
|
export function extractAssistantVisibleText(msg: AssistantMessage): string {
|
|
const finalAnswerExtraction = extractAssistantTextForPhase(msg, "final_answer");
|
|
if (finalAnswerExtraction.hadRequestedPhase) {
|
|
return finalAnswerExtraction.text.trim() ? finalAnswerExtraction.text : "";
|
|
}
|
|
|
|
return extractAssistantTextForPhase(msg).text;
|
|
}
|
|
|
|
export function extractAssistantText(msg: AssistantMessage): string {
|
|
const extracted =
|
|
extractTextFromChatContent(msg.content, {
|
|
sanitizeText: (text) => sanitizeAssistantText(text),
|
|
joinWith: "\n",
|
|
normalizeText: (text) => text.trim(),
|
|
}) ?? "";
|
|
// Only apply keyword-based error rewrites when the assistant message is actually an error.
|
|
// Otherwise normal prose that *mentions* errors (e.g. "context overflow") can get clobbered.
|
|
// Gate on stopReason only — a non-error response with an errorMessage set (e.g. from a
|
|
// background tool failure) should not have its content rewritten (#13935).
|
|
return finalizeAssistantExtraction(msg, extracted);
|
|
}
|
|
|
|
export function extractAssistantThinking(msg: AssistantMessage): string {
|
|
if (!Array.isArray(msg.content)) {
|
|
return "";
|
|
}
|
|
const blocks = msg.content
|
|
.map((block) => {
|
|
if (!block || typeof block !== "object") {
|
|
return "";
|
|
}
|
|
const record = block as unknown as Record<string, unknown>;
|
|
if (record.type === "thinking" && typeof record.thinking === "string") {
|
|
const thinking = record.thinking.trim();
|
|
if (thinking) {
|
|
return thinking;
|
|
}
|
|
if (typeof record.thinkingSignature === "string" && record.thinkingSignature.trim()) {
|
|
return "Native reasoning was produced; no summary text was returned.";
|
|
}
|
|
}
|
|
return "";
|
|
})
|
|
.filter(Boolean);
|
|
return blocks.join("\n").trim();
|
|
}
|
|
|
|
export function formatReasoningMessage(text: string): string {
|
|
const trimmed = text.trim();
|
|
if (!trimmed) {
|
|
return "";
|
|
}
|
|
// Show reasoning in italics (cursive) for markdown-friendly surfaces (Discord, etc.).
|
|
// Keep a plain prefix so existing parsing/detection keeps working.
|
|
// Note: Underscore markdown cannot span multiple lines on Telegram, so we wrap
|
|
// each non-empty line separately.
|
|
const italicLines = trimmed
|
|
.split("\n")
|
|
.map((line) => (line ? `_${line}_` : line))
|
|
.join("\n");
|
|
return `Thinking\n\n${italicLines}`;
|
|
}
|
|
|
|
type ThinkTaggedSplitBlock =
|
|
| { type: "thinking"; thinking: string }
|
|
| { type: "text"; text: string };
|
|
|
|
const THINKING_TAG_NAME_PATTERN = String.raw`(?:(?:antml:)?(?:think(?:ing)?|thought)|antthinking)`;
|
|
const THINKING_TAG_OPEN_RE = new RegExp(String.raw`<\s*${THINKING_TAG_NAME_PATTERN}\s*>`, "i");
|
|
const THINKING_TAG_CLOSE_RE = new RegExp(
|
|
String.raw`<\s*\/\s*${THINKING_TAG_NAME_PATTERN}\s*>`,
|
|
"i",
|
|
);
|
|
const THINKING_TAG_OPEN_GLOBAL_RE = new RegExp(
|
|
String.raw`<\s*${THINKING_TAG_NAME_PATTERN}\s*>`,
|
|
"gi",
|
|
);
|
|
const THINKING_TAG_CLOSE_GLOBAL_RE = new RegExp(
|
|
String.raw`<\s*\/\s*${THINKING_TAG_NAME_PATTERN}\s*>`,
|
|
"gi",
|
|
);
|
|
export const THINKING_TAG_SCAN_RE = new RegExp(
|
|
String.raw`<\s*(\/?)\s*${THINKING_TAG_NAME_PATTERN}\s*>`,
|
|
"gi",
|
|
);
|
|
|
|
export function splitThinkingTaggedText(text: string): ThinkTaggedSplitBlock[] | null {
|
|
const trimmedStart = text.trimStart();
|
|
// Avoid false positives: only treat it as structured thinking when it begins
|
|
// with a think tag (common for local/OpenAI-compat providers that emulate
|
|
// reasoning blocks via tags).
|
|
if (!trimmedStart.startsWith("<")) {
|
|
return null;
|
|
}
|
|
if (!THINKING_TAG_OPEN_RE.test(trimmedStart)) {
|
|
return null;
|
|
}
|
|
if (!THINKING_TAG_CLOSE_RE.test(text)) {
|
|
return null;
|
|
}
|
|
|
|
let inThinking = false;
|
|
let cursor = 0;
|
|
let thinkingStart = 0;
|
|
const blocks: ThinkTaggedSplitBlock[] = [];
|
|
|
|
const pushText = (value: string) => {
|
|
if (!value) {
|
|
return;
|
|
}
|
|
blocks.push({ type: "text", text: value });
|
|
};
|
|
const pushThinking = (value: string) => {
|
|
const cleaned = value.trim();
|
|
if (!cleaned) {
|
|
return;
|
|
}
|
|
blocks.push({ type: "thinking", thinking: cleaned });
|
|
};
|
|
|
|
for (const match of text.matchAll(THINKING_TAG_SCAN_RE)) {
|
|
const index = match.index ?? 0;
|
|
const isClose = match[1]?.includes("/") ?? false;
|
|
|
|
if (!inThinking && !isClose) {
|
|
pushText(text.slice(cursor, index));
|
|
thinkingStart = index + match[0].length;
|
|
inThinking = true;
|
|
continue;
|
|
}
|
|
|
|
if (inThinking && isClose) {
|
|
pushThinking(text.slice(thinkingStart, index));
|
|
cursor = index + match[0].length;
|
|
inThinking = false;
|
|
}
|
|
}
|
|
|
|
if (inThinking) {
|
|
return null;
|
|
}
|
|
pushText(text.slice(cursor));
|
|
|
|
const hasThinking = blocks.some((b) => b.type === "thinking");
|
|
if (!hasThinking) {
|
|
return null;
|
|
}
|
|
return blocks;
|
|
}
|
|
|
|
export function promoteThinkingTagsToBlocks(message: AssistantMessage): void {
|
|
if (!Array.isArray(message.content)) {
|
|
return;
|
|
}
|
|
const hasThinkingBlock = message.content.some(
|
|
(block) => block && typeof block === "object" && block.type === "thinking",
|
|
);
|
|
if (hasThinkingBlock) {
|
|
return;
|
|
}
|
|
|
|
const next: AssistantMessage["content"] = [];
|
|
let changed = false;
|
|
|
|
for (const block of message.content) {
|
|
if (!block || typeof block !== "object" || !("type" in block)) {
|
|
next.push(block);
|
|
continue;
|
|
}
|
|
if (block.type !== "text") {
|
|
next.push(block);
|
|
continue;
|
|
}
|
|
const split = splitThinkingTaggedText(block.text);
|
|
if (!split) {
|
|
next.push(block);
|
|
continue;
|
|
}
|
|
changed = true;
|
|
for (const part of split) {
|
|
if (part.type === "thinking") {
|
|
next.push({ type: "thinking", thinking: part.thinking });
|
|
} else if (part.type === "text") {
|
|
const cleaned = part.text.trimStart();
|
|
if (cleaned) {
|
|
next.push({ type: "text", text: cleaned });
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
if (!changed) {
|
|
return;
|
|
}
|
|
message.content = next;
|
|
}
|
|
|
|
export function extractThinkingFromTaggedText(text: string): string {
|
|
if (!text) {
|
|
return "";
|
|
}
|
|
let result = "";
|
|
let lastIndex = 0;
|
|
let inThinking = false;
|
|
for (const match of text.matchAll(THINKING_TAG_SCAN_RE)) {
|
|
const idx = match.index ?? 0;
|
|
if (inThinking) {
|
|
result += text.slice(lastIndex, idx);
|
|
}
|
|
const isClose = match[1] === "/";
|
|
inThinking = !isClose;
|
|
lastIndex = idx + match[0].length;
|
|
}
|
|
return result.trim();
|
|
}
|
|
|
|
export function extractThinkingFromTaggedStream(text: string): string {
|
|
if (!text) {
|
|
return "";
|
|
}
|
|
const closed = extractThinkingFromTaggedText(text);
|
|
if (closed) {
|
|
return closed;
|
|
}
|
|
|
|
const openMatches = [...text.matchAll(THINKING_TAG_OPEN_GLOBAL_RE)];
|
|
if (openMatches.length === 0) {
|
|
return "";
|
|
}
|
|
const closeMatches = [...text.matchAll(THINKING_TAG_CLOSE_GLOBAL_RE)];
|
|
const lastOpen = openMatches[openMatches.length - 1];
|
|
const lastClose = closeMatches[closeMatches.length - 1];
|
|
if (lastClose && (lastClose.index ?? -1) > (lastOpen.index ?? -1)) {
|
|
return closed;
|
|
}
|
|
const start = (lastOpen.index ?? 0) + lastOpen[0].length;
|
|
return text.slice(start).trim();
|
|
}
|
|
|
|
export function inferToolMetaFromArgs(
|
|
toolName: string,
|
|
args: unknown,
|
|
options?: { detailMode?: "explain" | "raw" },
|
|
): string | undefined {
|
|
const display = resolveToolDisplay({ name: toolName, args, detailMode: options?.detailMode });
|
|
return formatToolDetail(display);
|
|
}
|