chore(deadcode): share runner tool-call type guard · open...

Recent Commits to openclaw:main

vincentkoc · 2026-06-21 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ import type { AgentMessage } from "../../runtime/index.js";`
`9`	`9`	`import { stripToolResultDetails } from "../../session-transcript-repair.js";`
`10`	`10`	`import { normalizeAssistantReplayContent } from "../replay-history.js";`
`11`	`11`	`import { markTranscriptPromptText } from "../tool-result-context-guard.js";`
	`12`	`+import { isRunnerToolCallBlockType } from "./attempt.tool-call-block-type.js";`
`12`	`13`	`import type { RuntimeContextCustomMessage } from "./runtime-context-prompt.js";`
`13`	`14`
`14`	`15`	`type LlmBoundaryOptions = {`
`@@ -633,6 +634,6 @@ function isToolCallAssistantMessage(message: AgentMessage): boolean {`
`633`	`634`	`return false;`
`634`	`635`	`}`
`635`	`636`	`const type = (block as { type?: unknown }).type;`
`636`		`-return type === "toolCall" \|\| type === "toolUse" \|\| type === "functionCall";`
	`637`	`+return isRunnerToolCallBlockType(type);`
`637`	`638`	`});`
`638`	`639`	`}`

Original file line number	Diff line number	Diff line change
`@@ -10,12 +10,9 @@ import {`
`10`	`10`	`createHtmlEntityToolCallArgumentDecodingWrapper,`
`11`	`11`	`decodeHtmlEntitiesInObject,`
`12`	`12`	`} from "../tool-call-argument-decoding.js";`
	`13`	`+import { isRunnerToolCallBlockType } from "./attempt.tool-call-block-type.js";`
`13`	`14`	`import { wrapStreamObjectEvents } from "./stream-wrapper.js";`
`14`	`15`
`15`		`-function isToolCallBlockType(type: unknown): boolean {`
`16`		`-return type === "toolCall" \|\| type === "toolUse" \|\| type === "functionCall";`
`17`		`-}`
`18`		`-`
`19`	`16`	`const MAX_TOOLCALL_REPAIR_BUFFER_CHARS = 64_000;`
`20`	`17`	`const MAX_TOOLCALL_REPAIR_LEADING_CHARS = 96;`
`21`	`18`	`const MAX_TOOLCALL_REPAIR_TRAILING_CHARS = 3;`
`@@ -581,7 +578,7 @@ function readToolCallNameInMessage(message: unknown, contentIndex: number): stri`
`581`	`578`	`return undefined;`
`582`	`579`	`}`
`583`	`580`	`const typedBlock = block as { type?: unknown; name?: unknown };`
`584`		`-if (!isToolCallBlockType(typedBlock.type) \|\| typeof typedBlock.name !== "string") {`
	`581`	`+if (!isRunnerToolCallBlockType(typedBlock.type) \|\| typeof typedBlock.name !== "string") {`
`585`	`582`	`return undefined;`
`586`	`583`	`}`
`587`	`584`	`return normalizeToolCallRepairToolName(typedBlock.name);`
`@@ -604,7 +601,7 @@ function repairToolCallArgumentsInMessage(`
`604`	`601`	`return;`
`605`	`602`	`}`
`606`	`603`	`const typedBlock = block as { type?: unknown; arguments?: unknown };`
`607`		`-if (!isToolCallBlockType(typedBlock.type)) {`
	`604`	`+if (!isRunnerToolCallBlockType(typedBlock.type)) {`
`608`	`605`	`return;`
`609`	`606`	`}`
`610`	`607`	`typedBlock.arguments = repairedArgs;`
`@@ -623,7 +620,7 @@ function hasMeaningfulToolCallArgumentsInMessage(message: unknown, contentIndex:`
`623`	`620`	`return false;`
`624`	`621`	`}`
`625`	`622`	`const typedBlock = block as { type?: unknown; arguments?: unknown };`
`626`		`-if (!isToolCallBlockType(typedBlock.type)) {`
	`623`	`+if (!isRunnerToolCallBlockType(typedBlock.type)) {`
`627`	`624`	`return false;`
`628`	`625`	`}`
`629`	`626`	`return (`
`@@ -647,7 +644,7 @@ function clearToolCallArgumentsInMessage(message: unknown, contentIndex: number)`
`647`	`644`	`return;`
`648`	`645`	`}`
`649`	`646`	`const typedBlock = block as { type?: unknown; arguments?: unknown };`
`650`		`-if (!isToolCallBlockType(typedBlock.type)) {`
	`647`	`+if (!isRunnerToolCallBlockType(typedBlock.type)) {`
`651`	`648`	`return;`
`652`	`649`	`}`
`653`	`650`	`typedBlock.arguments = {};`

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+export function isRunnerToolCallBlockType(type: unknown): boolean {`
	`2`	`+return type === "toolCall" \|\| type === "toolUse" \|\| type === "functionCall";`
	`3`	`+}`

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ import {`
`31`	`31`	`import { couldNormalizeToolNamePrefixToAllowedTool, normalizeToolName } from "../../tool-policy.js";`
`32`	`32`	`import { shouldAllowProviderOwnedThinkingReplay } from "../../transcript-policy.js";`
`33`	`33`	`import type { TranscriptPolicy } from "../../transcript-policy.js";`
	`34`	`+import { isRunnerToolCallBlockType } from "./attempt.tool-call-block-type.js";`
`34`	`35`	`import { wrapStreamObjectEvents } from "./stream-wrapper.js";`
`35`	`36`
`36`	`37`	`const BLANK_TOOL_CALL_NAME_DESCRIPTION = "blank tool name";`
`@@ -238,10 +239,6 @@ function normalizeToolCallNameForDispatch(`
`238`	`239`	`return resolveStructuredAllowedToolName(trimmed, allowedToolNames) ?? trimmed;`
`239`	`240`	`}`
`240`	`241`
`241`		`-function isToolCallBlockType(type: unknown): boolean {`
`242`		`-return type === "toolCall" \|\| type === "toolUse" \|\| type === "functionCall";`
`243`		`-}`
`244`		`-`
`245`	`242`	`const REPLAY_TOOL_CALL_NAME_MAX_CHARS = 64;`
`246`	`243`
`247`	`244`	`type ReplayToolCallBlock = {`
`@@ -298,7 +295,7 @@ function isReplayToolCallBlock(block: unknown): block is ReplayToolCallBlock {`
`298`	`295`	`if (!block \|\| typeof block !== "object") {`
`299`	`296`	`return false;`
`300`	`297`	`}`
`301`		`-return isToolCallBlockType((block as { type?: unknown }).type);`
	`298`	`+return isRunnerToolCallBlockType((block as { type?: unknown }).type);`
`302`	`299`	`}`
`303`	`300`
`304`	`301`	`function replayToolCallHasInput(block: ReplayToolCallBlock): boolean {`
`@@ -533,7 +530,7 @@ function sanitizeAnthropicReplayToolResults(`
`533`	`530`	`continue;`
`534`	`531`	`}`
`535`	`532`	`const typedBlock = block as { type?: unknown; id?: unknown };`
`536`		`-if (!isToolCallBlockType(typedBlock.type) \|\| typeof typedBlock.id !== "string") {`
	`533`	`+if (!isRunnerToolCallBlockType(typedBlock.type) \|\| typeof typedBlock.id !== "string") {`
`537`	`534`	`continue;`
`538`	`535`	`}`
`539`	`536`	`const trimmedId = typedBlock.id.trim();`
`@@ -625,7 +622,7 @@ function normalizeToolCallIdsInMessage(message: unknown): void {`
`625`	`622`	`continue;`
`626`	`623`	`}`
`627`	`624`	`const typedBlock = block as { type?: unknown; id?: unknown };`
`628`		`-if (!isToolCallBlockType(typedBlock.type) \|\| typeof typedBlock.id !== "string") {`
	`625`	`+if (!isRunnerToolCallBlockType(typedBlock.type) \|\| typeof typedBlock.id !== "string") {`
`629`	`626`	`continue;`
`630`	`627`	`}`
`631`	`628`	`const trimmedId = typedBlock.id.trim();`
`@@ -642,7 +639,7 @@ function normalizeToolCallIdsInMessage(message: unknown): void {`
`642`	`639`	`continue;`
`643`	`640`	`}`
`644`	`641`	`const typedBlock = block as { type?: unknown; id?: unknown };`
`645`		`-if (!isToolCallBlockType(typedBlock.type)) {`
	`642`	`+if (!isRunnerToolCallBlockType(typedBlock.type)) {`
`646`	`643`	`continue;`
`647`	`644`	`}`
`648`	`645`	`if (typeof typedBlock.id === "string") {`
`@@ -674,7 +671,7 @@ function trimWhitespaceFromToolCallNamesInMessage(`
`674`	`671`	`): void {`
`675`	`672`	`visitObjectContentBlocks(message, (block) => {`
`676`	`673`	`const typedBlock = block as { type?: unknown; name?: unknown; id?: unknown };`
`677`		`-if (!isToolCallBlockType(typedBlock.type)) {`
	`674`	`+if (!isRunnerToolCallBlockType(typedBlock.type)) {`
`678`	`675`	`return;`
`679`	`676`	`}`
`680`	`677`	`const rawId = typeof typedBlock.id === "string" ? typedBlock.id : undefined;`
`@@ -721,7 +718,7 @@ function classifyToolCallMessage(`
`721`	`718`	`continue;`
`722`	`719`	`}`
`723`	`720`	`const typedBlock = block as { type?: unknown; name?: unknown };`
`724`		`-if (!isToolCallBlockType(typedBlock.type)) {`
	`721`	`+if (!isRunnerToolCallBlockType(typedBlock.type)) {`
`725`	`722`	`continue;`
`726`	`723`	`}`
`727`	`724`	`sawToolCall = true;`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main