refactor(agents): share session tool output rendering · openclaw/openclaw@336494c

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
`@@ -9,13 +9,12 @@ import path from "node:path";`
`9`	`9`	`import { createInterface } from "node:readline";`
`10`	`10`	`import { Text } from "@earendil-works/pi-tui";`
`11`	`11`	`import { Type } from "typebox";`
`12`		`-import { keyHint } from "../../modes/interactive/components/keybinding-hints.js";`
`13`	`12`	`import type { AgentTool } from "../../runtime/index.js";`
`14`	`13`	`import { ensureTool } from "../../utils/tools-manager.js";`
`15`	`14`	`import type { ToolDefinition, ToolRenderResultOptions } from "../extensions/types.js";`
`16`	`15`	`import { appendBoundedTextTail, normalizePositiveLimit } from "./limits.js";`
`17`	`16`	`import { resolveToCwd } from "./path-utils.js";`
`18`		`-import { getTextOutput, invalidArgText, shortenPath, str } from "./render-utils.js";`
	`17`	`+import { formatSessionToolOutput, invalidArgText, shortenPath, str } from "./render-utils.js";`
`19`	`18`	`import type { FindToolDetails } from "./tool-contracts.js";`
`20`	`19`	`import { wrapToolDefinition } from "./tool-definition-wrapper.js";`
`21`	`20`	`import { DEFAULT_MAX_BYTES, formatSize, truncateHead } from "./truncate.js";`
`@@ -92,18 +91,7 @@ function formatFindResult(`
`92`	`91`	`theme: typeof import("../../modes/interactive/theme/theme.js").theme,`
`93`	`92`	`showImages: boolean,`
`94`	`93`	`): string {`
`95`		`-const output = getTextOutput(result, showImages).trim();`
`96`		`-let text = "";`
`97`		`-if (output) {`
`98`		`-const lines = output.split("\n");`
`99`		`-const maxLines = options.expanded ? lines.length : 20;`
`100`		`-const displayLines = lines.slice(0, maxLines);`
`101`		`-const remaining = lines.length - maxLines;`
`102`		-text += `\n${displayLines.map((line) => theme.fg("toolOutput", line)).join("\n")}`;
`103`		`-if (remaining > 0) {`
`104`		-text += `${theme.fg("muted", `\n... (${remaining} more lines,`)} ${keyHint("app.tools.expand", "to expand")})`;
`105`		`-}`
`106`		`-}`
	`94`	`+let text = formatSessionToolOutput(result, options, theme, showImages, 20);`
`107`	`95`
`108`	`96`	`const resultLimit = result.details?.resultLimitReached;`
`109`	`97`	`const truncation = result.details?.truncation;`

Original file line number	Diff line number	Diff line change
`@@ -9,13 +9,12 @@ import path from "node:path";`
`9`	`9`	`import { createInterface } from "node:readline";`
`10`	`10`	`import { Text } from "@earendil-works/pi-tui";`
`11`	`11`	`import { Type } from "typebox";`
`12`		`-import { keyHint } from "../../modes/interactive/components/keybinding-hints.js";`
`13`	`12`	`import type { AgentTool } from "../../runtime/index.js";`
`14`	`13`	`import { ensureTool } from "../../utils/tools-manager.js";`
`15`	`14`	`import type { ToolDefinition, ToolRenderResultOptions } from "../extensions/types.js";`
`16`	`15`	`import { appendBoundedTextTail, normalizePositiveLimit } from "./limits.js";`
`17`	`16`	`import { resolveToCwd } from "./path-utils.js";`
`18`		`-import { getTextOutput, invalidArgText, shortenPath, str } from "./render-utils.js";`
	`17`	`+import { formatSessionToolOutput, invalidArgText, shortenPath, str } from "./render-utils.js";`
`19`	`18`	`import type { GrepToolDetails } from "./tool-contracts.js";`
`20`	`19`	`import { wrapToolDefinition } from "./tool-definition-wrapper.js";`
`21`	`20`	`import {`
`@@ -108,18 +107,7 @@ function formatGrepResult(`
`108`	`107`	`theme: typeof import("../../modes/interactive/theme/theme.js").theme,`
`109`	`108`	`showImages: boolean,`
`110`	`109`	`): string {`
`111`		`-const output = getTextOutput(result, showImages).trim();`
`112`		`-let text = "";`
`113`		`-if (output) {`
`114`		`-const lines = output.split("\n");`
`115`		`-const maxLines = options.expanded ? lines.length : 15;`
`116`		`-const displayLines = lines.slice(0, maxLines);`
`117`		`-const remaining = lines.length - maxLines;`
`118`		-text += `\n${displayLines.map((line) => theme.fg("toolOutput", line)).join("\n")}`;
`119`		`-if (remaining > 0) {`
`120`		-text += `${theme.fg("muted", `\n... (${remaining} more lines,`)} ${keyHint("app.tools.expand", "to expand")})`;
`121`		`-}`
`122`		`-}`
	`110`	`+let text = formatSessionToolOutput(result, options, theme, showImages, 15);`
`123`	`111`
`124`	`112`	`const matchLimit = result.details?.matchLimitReached;`
`125`	`113`	`const truncation = result.details?.truncation;`

Original file line number	Diff line number	Diff line change
`@@ -7,12 +7,11 @@ import { existsSync, readdirSync, statSync } from "node:fs";`
`7`	`7`	`import nodePath from "node:path";`
`8`	`8`	`import { Text } from "@earendil-works/pi-tui";`
`9`	`9`	`import { Type } from "typebox";`
`10`		`-import { keyHint } from "../../modes/interactive/components/keybinding-hints.js";`
`11`	`10`	`import type { AgentTool } from "../../runtime/index.js";`
`12`	`11`	`import type { ToolDefinition, ToolRenderResultOptions } from "../extensions/types.js";`
`13`	`12`	`import { normalizePositiveLimit } from "./limits.js";`
`14`	`13`	`import { resolveToCwd } from "./path-utils.js";`
`15`		`-import { getTextOutput, invalidArgText, shortenPath, str } from "./render-utils.js";`
	`14`	`+import { formatSessionToolOutput, invalidArgText, shortenPath, str } from "./render-utils.js";`
`16`	`15`	`import type { LsToolDetails } from "./tool-contracts.js";`
`17`	`16`	`import { wrapToolDefinition } from "./tool-definition-wrapper.js";`
`18`	`17`	`import { DEFAULT_MAX_BYTES, formatSize, truncateHead } from "./truncate.js";`
`@@ -79,18 +78,7 @@ function formatLsResult(`
`79`	`78`	`theme: typeof import("../../modes/interactive/theme/theme.js").theme,`
`80`	`79`	`showImages: boolean,`
`81`	`80`	`): string {`
`82`		`-const output = getTextOutput(result, showImages).trim();`
`83`		`-let text = "";`
`84`		`-if (output) {`
`85`		`-const lines = output.split("\n");`
`86`		`-const maxLines = options.expanded ? lines.length : 20;`
`87`		`-const displayLines = lines.slice(0, maxLines);`
`88`		`-const remaining = lines.length - maxLines;`
`89`		-text += `\n${displayLines.map((line) => theme.fg("toolOutput", line)).join("\n")}`;
`90`		`-if (remaining > 0) {`
`91`		-text += `${theme.fg("muted", `\n... (${remaining} more lines,`)} ${keyHint("app.tools.expand", "to expand")})`;
`92`		`-}`
`93`		`-}`
	`81`	`+let text = formatSessionToolOutput(result, options, theme, showImages, 20);`
`94`	`82`
`95`	`83`	`const entryLimit = result.details?.entryLimitReached;`
`96`	`84`	`const truncation = result.details?.truncation;`

Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,11 @@`
`5`	`5`	`*/`
`6`	`6`	`import * as os from "node:os";`
`7`	`7`	`import { getCapabilities, getImageDimensions, imageFallback } from "@earendil-works/pi-tui";`
	`8`	`+import { keyHint } from "../../modes/interactive/components/keybinding-hints.js";`
`8`	`9`	`import type { Theme } from "../../modes/interactive/theme/theme.js";`
`9`	`10`	`import { sanitizeBinaryOutput } from "../../shell-utils.js";`
`10`	`11`	`import { stripAnsi } from "../../utils/ansi.js";`
	`12`	`+import type { ToolRenderResultOptions } from "../extensions/types.js";`
`11`	`13`
`12`	`14`	`/** Shortens paths under the current home directory for display. */`
`13`	`15`	`export function shortenPath(path: unknown): string {`
`@@ -79,6 +81,30 @@ export function getTextOutput(`
`79`	`81`	`return output;`
`80`	`82`	`}`
`81`	`83`
	`84`	`+/** Renders bounded text output with the shared TUI expansion hint. */`
	`85`	`+export function formatSessionToolOutput(`
	`86`	`+result: { content: Array<{ type: string; text?: string; data?: string; mimeType?: string }> },`
	`87`	`+options: ToolRenderResultOptions,`
	`88`	`+theme: Pick<Theme, "fg">,`
	`89`	`+showImages: boolean,`
	`90`	`+collapsedLineLimit: number,`
	`91`	`+): string {`
	`92`	`+const output = getTextOutput(result, showImages).trim();`
	`93`	`+if (!output) {`
	`94`	`+return "";`
	`95`	`+}`
	`96`	`+`
	`97`	`+const lines = output.split("\n");`
	`98`	`+const maxLines = options.expanded ? lines.length : collapsedLineLimit;`
	`99`	`+const displayLines = lines.slice(0, maxLines);`
	`100`	`+const remaining = lines.length - maxLines;`
	`101`	+let text = `\n${displayLines.map((line) => theme.fg("toolOutput", line)).join("\n")}`;
	`102`	`+if (remaining > 0) {`
	`103`	+text += `${theme.fg("muted", `\n... (${remaining} more lines,`)} ${keyHint("app.tools.expand", "to expand")})`;
	`104`	`+}`
	`105`	`+return text;`
	`106`	`+}`
	`107`	`+`
`82`	`108`	`/** Formats the invalid-argument marker with the active theme. */`
`83`	`109`	`export function invalidArgText(theme: Pick<Theme, "fg">): string {`
`84`	`110`	`return theme.fg("error", "[invalid arg]");`

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

推荐订阅源

Recent Commits to openclaw:main