fix(agents): bound search tool stderr · openclaw/openclaw...

Recent Commits to openclaw:main

vincentkoc · 2026-05-28 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import { keyHint } from "../../modes/interactive/components/keybinding-hints.js"`
`8`	`8`	`import type { AgentTool } from "../../runtime/index.js";`
`9`	`9`	`import { ensureTool } from "../../utils/tools-manager.js";`
`10`	`10`	`import type { ToolDefinition, ToolRenderResultOptions } from "../extensions/types.js";`
`11`		`-import { normalizePositiveLimit } from "./limits.js";`
	`11`	`+import { appendBoundedTextTail, normalizePositiveLimit } from "./limits.js";`
`12`	`12`	`import { resolveToCwd } from "./path-utils.js";`
`13`	`13`	`import { getTextOutput, invalidArgText, shortenPath, str } from "./render-utils.js";`
`14`	`14`	`import type { FindToolDetails } from "./tool-contracts.js";`
`@@ -277,7 +277,7 @@ export function createFindToolDefinition(`
`277`	`277`	`};`
`278`	`278`
`279`	`279`	`child.stderr?.on("data", (chunk) => {`
`280`		`-stderr += chunk.toString();`
	`280`	`+stderr = appendBoundedTextTail(stderr, chunk);`
`281`	`281`	`});`
`282`	`282`
`283`	`283`	`rl.on("line", (line) => {`

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import { keyHint } from "../../modes/interactive/components/keybinding-hints.js"`
`8`	`8`	`import type { AgentTool } from "../../runtime/index.js";`
`9`	`9`	`import { ensureTool } from "../../utils/tools-manager.js";`
`10`	`10`	`import type { ToolDefinition, ToolRenderResultOptions } from "../extensions/types.js";`
`11`		`-import { normalizePositiveLimit } from "./limits.js";`
	`11`	`+import { appendBoundedTextTail, normalizePositiveLimit } from "./limits.js";`
`12`	`12`	`import { resolveToCwd } from "./path-utils.js";`
`13`	`13`	`import { getTextOutput, invalidArgText, shortenPath, str } from "./render-utils.js";`
`14`	`14`	`import type { GrepToolDetails } from "./tool-contracts.js";`
`@@ -270,7 +270,7 @@ export function createGrepToolDefinition(`
`270`	`270`	`};`
`271`	`271`	`signal?.addEventListener("abort", onAbort, { once: true });`
`272`	`272`	`child.stderr?.on("data", (chunk) => {`
`273`		`-stderr += chunk.toString();`
	`273`	`+stderr = appendBoundedTextTail(stderr, chunk);`
`274`	`274`	`});`
`275`	`275`
`276`	`276`	`const formatBlock = async (filePath: string, lineNumber: number): Promise<string[]> => {`

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,9 @@`
`1`	`1`	`import { describe, expect, it } from "vitest";`
`2`		`-import { normalizePositiveLimit } from "./limits.js";`
	`2`	`+import {`
	`3`	`+appendBoundedTextTail,`
	`4`	`+normalizePositiveLimit,`
	`5`	`+SESSION_TOOL_STDERR_TAIL_BYTES,`
	`6`	`+} from "./limits.js";`
`3`	`7`
`4`	`8`	`describe("session tool limits", () => {`
`5`	`9`	`it.each([`
`@@ -13,4 +17,25 @@ describe("session tool limits", () => {`
`13`	`17`	`])("normalizes %s to %s", (input, expected) => {`
`14`	`18`	`expect(normalizePositiveLimit(input, 500)).toBe(expected);`
`15`	`19`	`});`
	`20`	`+`
	`21`	`+it("keeps a bounded tail of accumulated child output", () => {`
	`22`	`+let output = appendBoundedTextTail("old-", "middle-", 12);`
	`23`	`+output = appendBoundedTextTail(output, "recent", 12);`
	`24`	`+`
	`25`	`+expect(output).toBe("iddle-recent");`
	`26`	`+expect(Buffer.byteLength(output, "utf8")).toBeLessThanOrEqual(12);`
	`27`	`+});`
	`28`	`+`
	`29`	`+it("clips oversized chunks to the configured tail bytes", () => {`
	`30`	`+const output = appendBoundedTextTail("ignored", Buffer.from("x".repeat(128)), 16);`
	`31`	`+`
	`32`	`+expect(output).toBe("x".repeat(16));`
	`33`	`+expect(Buffer.byteLength(output, "utf8")).toBe(16);`
	`34`	`+});`
	`35`	`+`
	`36`	`+it("uses the session stderr tail limit by default", () => {`
	`37`	`+const output = appendBoundedTextTail("", "x".repeat(SESSION_TOOL_STDERR_TAIL_BYTES + 1));`
	`38`	`+`
	`39`	`+expect(Buffer.byteLength(output, "utf8")).toBe(SESSION_TOOL_STDERR_TAIL_BYTES);`
	`40`	`+});`
`16`	`41`	`});`

Original file line number	Diff line number	Diff line change
`@@ -4,3 +4,27 @@ export function normalizePositiveLimit(value: number \| undefined, fallback: numb`
`4`	`4`	`}`
`5`	`5`	`return Math.max(1, Math.floor(value));`
`6`	`6`	`}`
	`7`	`+`
	`8`	`+export const SESSION_TOOL_STDERR_TAIL_BYTES = 64 * 1024;`
	`9`	`+`
	`10`	`+export function appendBoundedTextTail(`
	`11`	`+current: string,`
	`12`	`+chunk: Buffer \| string,`
	`13`	`+maxBytes = SESSION_TOOL_STDERR_TAIL_BYTES,`
	`14`	`+): string {`
	`15`	`+const effectiveMaxBytes = normalizePositiveLimit(maxBytes, SESSION_TOOL_STDERR_TAIL_BYTES);`
	`16`	`+const chunkBuffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);`
	`17`	`+if (chunkBuffer.byteLength >= effectiveMaxBytes) {`
	`18`	`+return chunkBuffer.subarray(chunkBuffer.byteLength - effectiveMaxBytes).toString("utf8");`
	`19`	`+}`
	`20`	`+`
	`21`	`+const currentBuffer = Buffer.from(current);`
	`22`	`+const nextBytes = currentBuffer.byteLength + chunkBuffer.byteLength;`
	`23`	`+if (nextBytes <= effectiveMaxBytes) {`
	`24`	+return `${current}${chunkBuffer.toString("utf8")}`;
	`25`	`+}`
	`26`	`+`
	`27`	`+const currentTailBytes = Math.max(0, effectiveMaxBytes - chunkBuffer.byteLength);`
	`28`	`+const currentTail = currentBuffer.subarray(currentBuffer.byteLength - currentTailBytes);`
	`29`	`+return Buffer.concat([currentTail, chunkBuffer], effectiveMaxBytes).toString("utf8");`
	`30`	`+}`

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