vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-06 16:30:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: share tool call transcript helpers

Browse Source
This commit is contained in:
Peter Steinberger
2026-04-18 21:22:17 +01:00
parent f298f86a7f
commit 848f154f3e
3 changed files with 83 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/agents/session-transcript-repair.ts
View File

@@ -5,11 +5,15 @@ import {
readStringValue,
} from "../shared/string-coerce.js";
import { extractToolCallsFromAssistant, extractToolResultId } from "./tool-call-id.js";
import {
REDACTED_SESSIONS_SPAWN_ATTACHMENT_CONTENT,
SESSIONS_SPAWN_ATTACHMENT_METADATA_KEYS,
isAllowedToolCallName,
isRedactedSessionsSpawnAttachment,
normalizeAllowedToolNames,
} from "./tool-call-shared.js";
const TOOL_CALL_NAME_MAX_CHARS = 64;
const TOOL_CALL_NAME_RE = /^[A-Za-z0-9_:.-]+$/;
const REDACTED_SESSIONS_SPAWN_ATTACHMENT_CONTENT = "__OPENCLAW_REDACTED__";
const SESSIONS_SPAWN_ATTACHMENT_METADATA_KEYS = ["name", "encoding", "mimeType"] as const;
export { isRedactedSessionsSpawnAttachment } from "./tool-call-shared.js";
type RawToolCallBlock = {
type?: unknown;
@@ -53,40 +57,6 @@ function hasToolCallId(block: RawToolCallBlock): boolean {
return hasNonEmptyStringField(block.id);
}
function normalizeAllowedToolNames(allowedToolNames?: Iterable<string>): Set<string> | null {
if (!allowedToolNames) {
return null;
}
const normalized = new Set<string>();
for (const name of allowedToolNames) {
if (typeof name !== "string") {
continue;
}
const trimmed = name.trim();
if (trimmed) {
normalized.add(normalizeLowercaseStringOrEmpty(trimmed));
}
}
return normalized.size > 0 ? normalized : null;
}
function hasToolCallName(block: RawToolCallBlock, allowedToolNames: Set<string> | null): boolean {
if (typeof block.name !== "string") {
return false;
}
const trimmed = block.name.trim();
if (!trimmed) {
return false;
}
if (trimmed.length > TOOL_CALL_NAME_MAX_CHARS || !TOOL_CALL_NAME_RE.test(trimmed)) {
return false;
}
if (!allowedToolNames) {
return true;
}
return allowedToolNames.has(normalizeLowercaseStringOrEmpty(trimmed));
}
function redactSessionsSpawnAttachmentsArgs(value: unknown): unknown {
if (!value || typeof value !== "object") {
return value;
@@ -127,28 +97,6 @@ function redactSessionsSpawnAttachment(item: unknown): Record<string, unknown> {
return next;
}
export function isRedactedSessionsSpawnAttachment(item: unknown): boolean {
if (!item || typeof item !== "object") {
return false;
}
const attachment = item as Record<string, unknown>;
if (attachment.content !== REDACTED_SESSIONS_SPAWN_ATTACHMENT_CONTENT) {
return false;
}
for (const key of Object.keys(attachment)) {
if (key === "content") {
continue;
}
if (!(SESSIONS_SPAWN_ATTACHMENT_METADATA_KEYS as readonly string[]).includes(key)) {
return false;
}
if (typeof attachment[key] !== "string" || attachment[key].trim().length === 0) {
return false;
}
}
return true;
}
function sanitizeToolCallBlock(block: RawToolCallBlock): RawToolCallBlock {
const rawName = readStringValue(block.name);
const trimmedName = rawName?.trim();
@@ -212,7 +160,7 @@ function isReplaySafeThinkingAssistantTurn(
!hasToolCallInput(block) ||
!toolCallId ||
seenToolCallIds.has(toolCallId) ||
!hasToolCallName(block, allowedToolNames)
!isAllowedToolCallName(block.name, allowedToolNames)
) {
return false;
}
@@ -364,7 +312,7 @@ export function repairToolCallInputs(
isRawToolCallBlock(block) &&
(!hasToolCallInput(block) ||
!hasToolCallId(block) ||
!hasToolCallName(block, allowedToolNames))
!isAllowedToolCallName((block as RawToolCallBlock).name, allowedToolNames))
) {
droppedToolCalls += 1;
droppedInMessage += 1;

71
src/agents/tool-call-id.ts
View File

@@ -1,13 +1,14 @@
import { createHash } from "node:crypto";
import type { AgentMessage } from "@mariozechner/pi-agent-core";
import { normalizeLowercaseStringOrEmpty } from "../shared/string-coerce.js";
import {
isAllowedToolCallName,
isRedactedSessionsSpawnAttachment,
normalizeAllowedToolNames,
} from "./tool-call-shared.js";
export type ToolCallIdMode = "strict" | "strict9";
const NATIVE_ANTHROPIC_TOOL_USE_ID_RE = /^toolu_[A-Za-z0-9_]+$/;
const REDACTED_SESSIONS_SPAWN_ATTACHMENT_CONTENT = "__OPENCLAW_REDACTED__";
const SESSIONS_SPAWN_ATTACHMENT_METADATA_KEYS = ["name", "encoding", "mimeType"] as const;
const TOOL_CALL_NAME_MAX_CHARS = 64;
const TOOL_CALL_NAME_RE = /^[A-Za-z0-9_:.-]+$/;
const STRICT9_LEN = 9;
const TOOL_CALL_TYPES = new Set(["toolCall", "toolUse", "functionCall"]);
@@ -111,46 +112,6 @@ function hasToolCallInput(block: ReplaySafeToolCallBlock): boolean {
return hasInput || hasArguments;
}
function normalizeAllowedToolNames(allowedToolNames?: Iterable<string>): Set<string> | null {
if (!allowedToolNames) {
return null;
}
const normalized = new Set<string>();
for (const name of allowedToolNames) {
if (typeof name !== "string") {
continue;
}
const trimmed = name.trim();
if (!trimmed) {
continue;
}
normalized.add(normalizeLowercaseStringOrEmpty(trimmed));
}
return normalized.size > 0 ? normalized : null;
}
function isRedactedSessionsSpawnAttachment(item: unknown): boolean {
if (!item || typeof item !== "object") {
return false;
}
const attachment = item as Record<string, unknown>;
if (attachment.content !== REDACTED_SESSIONS_SPAWN_ATTACHMENT_CONTENT) {
return false;
}
for (const key of Object.keys(attachment)) {
if (key === "content") {
continue;
}
if (!(SESSIONS_SPAWN_ATTACHMENT_METADATA_KEYS as readonly string[]).includes(key)) {
return false;
}
if (typeof attachment[key] !== "string" || attachment[key].trim().length === 0) {
return false;
}
}
return true;
}
function toolCallNeedsReplayMutation(block: ReplaySafeToolCallBlock): boolean {
const rawName = typeof block.name === "string" ? block.name : undefined;
const trimmedName = rawName?.trim();
@@ -177,26 +138,6 @@ function toolCallNeedsReplayMutation(block: ReplaySafeToolCallBlock): boolean {
return false;
}
function hasReplaySafeToolCallName(
block: ReplaySafeToolCallBlock,
allowedToolNames: Set<string> | null,
): boolean {
if (typeof block.name !== "string") {
return false;
}
const trimmed = block.name.trim();
if (!trimmed) {
return false;
}
if (trimmed.length > TOOL_CALL_NAME_MAX_CHARS || !TOOL_CALL_NAME_RE.test(trimmed)) {
return false;
}
if (!allowedToolNames) {
return true;
}
return allowedToolNames.has(normalizeLowercaseStringOrEmpty(trimmed));
}
function isReplaySafeThinkingAssistantMessage(
message: Extract<AgentMessage, { role: "assistant" }>,
allowedToolNames: Set<string> | null,
@@ -227,7 +168,7 @@ function isReplaySafeThinkingAssistantMessage(
!hasToolCallInput(typedBlock) ||
!toolCallId ||
seenToolCallIds.has(toolCallId) ||
!hasReplaySafeToolCallName(typedBlock, allowedToolNames) ||
!isAllowedToolCallName(typedBlock.name, allowedToolNames) ||
toolCallNeedsReplayMutation(typedBlock)
) {
return false;

67
src/agents/tool-call-shared.ts Normal file
View File

@@ -0,0 +1,67 @@
import { normalizeLowercaseStringOrEmpty } from "../shared/string-coerce.js";
export const TOOL_CALL_NAME_MAX_CHARS = 64;
export const TOOL_CALL_NAME_RE = /^[A-Za-z0-9_:.-]+$/;
export const REDACTED_SESSIONS_SPAWN_ATTACHMENT_CONTENT = "__OPENCLAW_REDACTED__";
export const SESSIONS_SPAWN_ATTACHMENT_METADATA_KEYS = ["name", "encoding", "mimeType"] as const;
export function normalizeAllowedToolNames(allowedToolNames?: Iterable<string>): Set<string> | null {
if (!allowedToolNames) {
return null;
}
const normalized = new Set<string>();
for (const name of allowedToolNames) {
if (typeof name !== "string") {
continue;
}
const trimmed = name.trim();
if (!trimmed) {
continue;
}
normalized.add(normalizeLowercaseStringOrEmpty(trimmed));
}
return normalized.size > 0 ? normalized : null;
}
export function isAllowedToolCallName(
name: unknown,
allowedToolNames: Set<string> | null,
): boolean {
if (typeof name !== "string") {
return false;
}
const trimmed = name.trim();
if (!trimmed) {
return false;
}
if (trimmed.length > TOOL_CALL_NAME_MAX_CHARS || !TOOL_CALL_NAME_RE.test(trimmed)) {
return false;
}
if (!allowedToolNames) {
return true;
}
return allowedToolNames.has(normalizeLowercaseStringOrEmpty(trimmed));
}
export function isRedactedSessionsSpawnAttachment(item: unknown): boolean {
if (!item || typeof item !== "object") {
return false;
}
const attachment = item as Record<string, unknown>;
if (attachment.content !== REDACTED_SESSIONS_SPAWN_ATTACHMENT_CONTENT) {
return false;
}
for (const key of Object.keys(attachment)) {
if (key === "content") {
continue;
}
if (!(SESSIONS_SPAWN_ATTACHMENT_METADATA_KEYS as readonly string[]).includes(key)) {
return false;
}
if (typeof attachment[key] !== "string" || attachment[key].trim().length === 0) {
return false;
}
}
return true;
}