refactor(agents): share session truncation warnings · ope...

Recent Commits to openclaw:main

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

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,13 @@ import { ensureTool } from "../../utils/tools-manager.js";`
`14`	`14`	`import type { ToolDefinition, ToolRenderResultOptions } from "../extensions/types.js";`
`15`	`15`	`import { appendBoundedTextTail, normalizePositiveLimit } from "./limits.js";`
`16`	`16`	`import { resolveToCwd } from "./path-utils.js";`
`17`		`-import { formatSessionToolOutput, invalidArgText, shortenPath, str } from "./render-utils.js";`
	`17`	`+import {`
	`18`	`+appendSessionToolTruncationWarning,`
	`19`	`+formatSessionToolOutput,`
	`20`	`+invalidArgText,`
	`21`	`+shortenPath,`
	`22`	`+str,`
	`23`	`+} from "./render-utils.js";`
`18`	`24`	`import type { FindToolDetails } from "./tool-contracts.js";`
`19`	`25`	`import { wrapToolDefinition } from "./tool-definition-wrapper.js";`
`20`	`26`	`import { DEFAULT_MAX_BYTES, formatSize, truncateHead } from "./truncate.js";`
`@@ -91,21 +97,15 @@ function formatFindResult(`
`91`	`97`	`theme: typeof import("../../modes/interactive/theme/theme.js").theme,`
`92`	`98`	`showImages: boolean,`
`93`	`99`	`): string {`
`94`		`-let text = formatSessionToolOutput(result, options, theme, showImages, 20);`
`95`		`-`
`96`	`100`	`const resultLimit = result.details?.resultLimitReached;`
`97`		`-const truncation = result.details?.truncation;`
`98`		`-if (resultLimit \|\| truncation?.truncated) {`
`99`		`-const warnings: string[] = [];`
`100`		`-if (resultLimit) {`
`101`		-warnings.push(`${resultLimit} results limit`);
`102`		`-}`
`103`		`-if (truncation?.truncated) {`
`104`		-warnings.push(`${formatSize(truncation.maxBytes ?? DEFAULT_MAX_BYTES)} limit`);
`105`		`-}`
`106`		-text += `\n${theme.fg("warning", `[Truncated: ${warnings.join(", ")}]`)}`;
`107`		`-}`
`108`		`-return text;`
	`101`	`+return appendSessionToolTruncationWarning(`
	`102`	`+formatSessionToolOutput(result, options, theme, showImages, 20),`
	`103`	`+theme,`
	`104`	`+{`
	`105`	`+limit: resultLimit ? { count: resultLimit, noun: "results" } : undefined,`
	`106`	`+truncation: result.details?.truncation,`
	`107`	`+},`
	`108`	`+);`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`function buildFindResult(params: {`

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,13 @@ import { ensureTool } from "../../utils/tools-manager.js";`
`14`	`14`	`import type { ToolDefinition, ToolRenderResultOptions } from "../extensions/types.js";`
`15`	`15`	`import { appendBoundedTextTail, normalizePositiveLimit } from "./limits.js";`
`16`	`16`	`import { resolveToCwd } from "./path-utils.js";`
`17`		`-import { formatSessionToolOutput, invalidArgText, shortenPath, str } from "./render-utils.js";`
	`17`	`+import {`
	`18`	`+appendSessionToolTruncationWarning,`
	`19`	`+formatSessionToolOutput,`
	`20`	`+invalidArgText,`
	`21`	`+shortenPath,`
	`22`	`+str,`
	`23`	`+} from "./render-utils.js";`
`18`	`24`	`import type { GrepToolDetails } from "./tool-contracts.js";`
`19`	`25`	`import { wrapToolDefinition } from "./tool-definition-wrapper.js";`
`20`	`26`	`import {`
`@@ -107,25 +113,17 @@ function formatGrepResult(`
`107`	`113`	`theme: typeof import("../../modes/interactive/theme/theme.js").theme,`
`108`	`114`	`showImages: boolean,`
`109`	`115`	`): string {`
`110`		`-let text = formatSessionToolOutput(result, options, theme, showImages, 15);`
`111`		`-`
`112`	`116`	`const matchLimit = result.details?.matchLimitReached;`
`113`		`-const truncation = result.details?.truncation;`
`114`	`117`	`const linesTruncated = result.details?.linesTruncated;`
`115`		`-if (matchLimit \|\| truncation?.truncated \|\| linesTruncated) {`
`116`		`-const warnings: string[] = [];`
`117`		`-if (matchLimit) {`
`118`		-warnings.push(`${matchLimit} matches limit`);
`119`		`-}`
`120`		`-if (truncation?.truncated) {`
`121`		-warnings.push(`${formatSize(truncation.maxBytes ?? DEFAULT_MAX_BYTES)} limit`);
`122`		`-}`
`123`		`-if (linesTruncated) {`
`124`		`-warnings.push("some lines truncated");`
`125`		`-}`
`126`		-text += `\n${theme.fg("warning", `[Truncated: ${warnings.join(", ")}]`)}`;
`127`		`-}`
`128`		`-return text;`
	`118`	`+return appendSessionToolTruncationWarning(`
	`119`	`+formatSessionToolOutput(result, options, theme, showImages, 15),`
	`120`	`+theme,`
	`121`	`+{`
	`122`	`+limit: matchLimit ? { count: matchLimit, noun: "matches" } : undefined,`
	`123`	`+truncation: result.details?.truncation,`
	`124`	`+additionalWarnings: linesTruncated ? ["some lines truncated"] : undefined,`
	`125`	`+},`
	`126`	`+);`
`129`	`127`	`}`
`130`	`128`
`131`	`129`	`export function createGrepToolDefinition(`

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,13 @@ import type { AgentTool } from "../../runtime/index.js";`
`12`	`12`	`import type { ToolDefinition, ToolRenderResultOptions } from "../extensions/types.js";`
`13`	`13`	`import { normalizePositiveLimit } from "./limits.js";`
`14`	`14`	`import { resolveToCwd } from "./path-utils.js";`
`15`		`-import { formatSessionToolOutput, invalidArgText, shortenPath, str } from "./render-utils.js";`
	`15`	`+import {`
	`16`	`+appendSessionToolTruncationWarning,`
	`17`	`+formatSessionToolOutput,`
	`18`	`+invalidArgText,`
	`19`	`+shortenPath,`
	`20`	`+str,`
	`21`	`+} from "./render-utils.js";`
`16`	`22`	`import type { LsToolDetails } from "./tool-contracts.js";`
`17`	`23`	`import { wrapToolDefinition } from "./tool-definition-wrapper.js";`
`18`	`24`	`import { DEFAULT_MAX_BYTES, formatSize, truncateHead } from "./truncate.js";`
`@@ -79,21 +85,15 @@ function formatLsResult(`
`79`	`85`	`theme: typeof import("../../modes/interactive/theme/theme.js").theme,`
`80`	`86`	`showImages: boolean,`
`81`	`87`	`): string {`
`82`		`-let text = formatSessionToolOutput(result, options, theme, showImages, 20);`
`83`		`-`
`84`	`88`	`const entryLimit = result.details?.entryLimitReached;`
`85`		`-const truncation = result.details?.truncation;`
`86`		`-if (entryLimit \|\| truncation?.truncated) {`
`87`		`-const warnings: string[] = [];`
`88`		`-if (entryLimit) {`
`89`		-warnings.push(`${entryLimit} entries limit`);
`90`		`-}`
`91`		`-if (truncation?.truncated) {`
`92`		-warnings.push(`${formatSize(truncation.maxBytes ?? DEFAULT_MAX_BYTES)} limit`);
`93`		`-}`
`94`		-text += `\n${theme.fg("warning", `[Truncated: ${warnings.join(", ")}]`)}`;
`95`		`-}`
`96`		`-return text;`
	`89`	`+return appendSessionToolTruncationWarning(`
	`90`	`+formatSessionToolOutput(result, options, theme, showImages, 20),`
	`91`	`+theme,`
	`92`	`+{`
	`93`	`+limit: entryLimit ? { count: entryLimit, noun: "entries" } : undefined,`
	`94`	`+truncation: result.details?.truncation,`
	`95`	`+},`
	`96`	`+);`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`export function createLsToolDefinition(`

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,24 @@`
	`1`	`+import { describe, expect, it } from "vitest";`
	`2`	`+import { appendSessionToolTruncationWarning } from "./render-utils.js";`
	`3`	`+`
	`4`	`+const theme = {`
	`5`	+fg: (color: string, text: string) => `<${color}>${text}</${color}>`,
	`6`	`+};`
	`7`	`+`
	`8`	`+describe("appendSessionToolTruncationWarning", () => {`
	`9`	`+it("leaves output unchanged when no truncation metadata is present", () => {`
	`10`	`+expect(appendSessionToolTruncationWarning("output", theme, {})).toBe("output");`
	`11`	`+});`
	`12`	`+`
	`13`	`+it("combines limit, byte, and additional warnings in order", () => {`
	`14`	`+expect(`
	`15`	`+appendSessionToolTruncationWarning("output", theme, {`
	`16`	`+limit: { count: 5, noun: "matches" },`
	`17`	`+truncation: { truncated: true, maxBytes: 1024 },`
	`18`	`+additionalWarnings: ["some lines truncated"],`
	`19`	`+}),`
	`20`	`+).toBe(`
	`21`	`+"output\n<warning>[Truncated: 5 matches limit, 1.0KB limit, some lines truncated]</warning>",`
	`22`	`+);`
	`23`	`+});`
	`24`	`+});`

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ import type { Theme } from "../../modes/interactive/theme/theme.js";`
`10`	`10`	`import { sanitizeBinaryOutput } from "../../shell-utils.js";`
`11`	`11`	`import { stripAnsi } from "../../utils/ansi.js";`
`12`	`12`	`import type { ToolRenderResultOptions } from "../extensions/types.js";`
	`13`	`+import { DEFAULT_MAX_BYTES, formatSize, type TruncationResult } from "./truncate.js";`
`13`	`14`
`14`	`15`	`/** Shortens paths under the current home directory for display. */`
`15`	`16`	`export function shortenPath(path: unknown): string {`
`@@ -105,6 +106,29 @@ export function formatSessionToolOutput(`
`105`	`106`	`return text;`
`106`	`107`	`}`
`107`	`108`
	`109`	`+export function appendSessionToolTruncationWarning(`
	`110`	`+text: string,`
	`111`	`+theme: Pick<Theme, "fg">,`
	`112`	`+options: {`
	`113`	`+limit?: { count: number; noun: string };`
	`114`	`+truncation?: Pick<TruncationResult, "truncated" \| "maxBytes">;`
	`115`	`+additionalWarnings?: readonly string[];`
	`116`	`+},`
	`117`	`+): string {`
	`118`	`+const warnings: string[] = [];`
	`119`	`+if (options.limit) {`
	`120`	+warnings.push(`${options.limit.count} ${options.limit.noun} limit`);
	`121`	`+}`
	`122`	`+if (options.truncation?.truncated) {`
	`123`	+warnings.push(`${formatSize(options.truncation.maxBytes ?? DEFAULT_MAX_BYTES)} limit`);
	`124`	`+}`
	`125`	`+warnings.push(...(options.additionalWarnings ?? []));`
	`126`	`+if (warnings.length === 0) {`
	`127`	`+return text;`
	`128`	`+}`
	`129`	+return `${text}\n${theme.fg("warning", `[Truncated: ${warnings.join(", ")}]`)}`;
	`130`	`+}`
	`131`	`+`
`108`	`132`	`/** Formats the invalid-argument marker with the active theme. */`
`109`	`133`	`export function invalidArgText(theme: Pick<Theme, "fg">): string {`
`110`	`134`	`return theme.fg("error", "[invalid arg]");`

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

推荐订阅源

Recent Commits to openclaw:main