refactor(agents): reuse shared error normalization · openclaw/openclaw@a87aed4

Recent Commits to openclaw:main

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

File tree

src/agents/sessions/tools

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ import { existsSync } from "node:fs";`
`8`	`8`	`import { Container, Text, truncateToWidth } from "@earendil-works/pi-tui";`
`9`	`9`	`import { resolveTimerTimeoutMs } from "@openclaw/normalization-core/number-coercion";`
`10`	`10`	`import { Type } from "typebox";`
	`11`	`+import { toErrorObject } from "../../../infra/errors.js";`
`11`	`12`	`import { keyHint } from "../../modes/interactive/components/keybinding-hints.js";`
`12`	`13`	`import { truncateToVisualLines } from "../../modes/interactive/components/visual-truncate.js";`
`13`	`14`	`import { theme } from "../../modes/interactive/theme/theme.js";`
`@@ -121,7 +122,7 @@ export function createLocalBashOperations(options?: { shellPath?: string }): Bas`
`121`	`122`	`if (signal) {`
`122`	`123`	`signal.removeEventListener("abort", onAbort);`
`123`	`124`	`}`
`124`		`-reject(toLintErrorObject(err, "Non-Error rejection"));`
	`125`	`+reject(toErrorObject(err, "Non-Error rejection"));`
`125`	`126`	`});`
`126`	`127`	`});`
`127`	`128`	`},`
`@@ -473,17 +474,3 @@ export function createBashTool(`
`473`	`474`	`): AgentTool<typeof bashSchema> {`
`474`	`475`	`return wrapToolDefinition(createBashToolDefinition(cwd, options));`
`475`	`476`	`}`
`476`		`-`
`477`		`-function toLintErrorObject(value: unknown, fallbackMessage: string): Error {`
`478`		`-if (value instanceof Error) {`
`479`		`-return value;`
`480`		`-}`
`481`		`-if (typeof value === "string") {`
`482`		`-return new Error(value);`
`483`		`-}`
`484`		`-const error = new Error(fallbackMessage, { cause: value });`
`485`		`-if ((typeof value === "object" && value !== null) \|\| typeof value === "function") {`
`486`		`-Object.assign(error, value);`
`487`		`-}`
`488`		`-return error;`
`489`		`-}`

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ 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 { toErrorObject } from "../../../infra/errors.js";`
`10`	`11`	`import type { AgentTool } from "../../runtime/index.js";`
`11`	`12`	`import type { ToolDefinition, ToolRenderResultOptions } from "../extensions/types.js";`
`12`	`13`	`import { normalizePositiveLimit } from "./limits.js";`
`@@ -216,7 +217,7 @@ export function createLsToolDefinition(`
`216`	`217`	`});`
`217`	`218`	`} catch (e: unknown) {`
`218`	`219`	`signal?.removeEventListener("abort", onAbort);`
`219`		`-reject(toLintErrorObject(e, "Non-Error rejection"));`
	`220`	`+reject(toErrorObject(e, "Non-Error rejection"));`
`220`	`221`	`}`
`221`	`222`	`})();`
`222`	`223`	`});`
`@@ -237,17 +238,3 @@ export function createLsToolDefinition(`
`237`	`238`	`export function createLsTool(cwd: string, options?: LsToolOptions): AgentTool<typeof lsSchema> {`
`238`	`239`	`return wrapToolDefinition(createLsToolDefinition(cwd, options));`
`239`	`240`	`}`
`240`		`-`
`241`		`-function toLintErrorObject(value: unknown, fallbackMessage: string): Error {`
`242`		`-if (value instanceof Error) {`
`243`		`-return value;`
`244`		`-}`
`245`		`-if (typeof value === "string") {`
`246`		`-return new Error(value);`
`247`		`-}`
`248`		`-const error = new Error(fallbackMessage, { cause: value });`
`249`		`-if ((typeof value === "object" && value !== null) \|\| typeof value === "function") {`
`250`		`-Object.assign(error, value);`
`251`		`-}`
`252`		`-return error;`
`253`		`-}`

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ import { access as fsAccess, readFile as fsReadFile } from "node:fs/promises";`
`8`	`8`	`import { basename, dirname, isAbsolute, relative, resolve as resolvePath, sep } from "node:path";`
`9`	`9`	`import { Text } from "@earendil-works/pi-tui";`
`10`	`10`	`import { Type } from "typebox";`
	`11`	`+import { toErrorObject } from "../../../infra/errors.js";`
`11`	`12`	`import { decodeWindowsTextFileBuffer } from "../../../infra/windows-encoding.js";`
`12`	`13`	`import type { ImageContent, Model, TextContent } from "../../../llm/types.js";`
`13`	`14`	`import {`
`@@ -409,7 +410,7 @@ export function createReadToolDefinition(`
`409`	`410`	`} catch (error: unknown) {`
`410`	`411`	`signal?.removeEventListener("abort", onAbort);`
`411`	`412`	`if (!aborted) {`
`412`		`-reject(toLintErrorObject(error, "Non-Error rejection"));`
	`413`	`+reject(toErrorObject(error, "Non-Error rejection"));`
`413`	`414`	`}`
`414`	`415`	`}`
`415`	`416`	`})();`
`@@ -451,17 +452,3 @@ export function createReadTool(`
`451`	`452`	`): AgentTool<typeof readSchema> {`
`452`	`453`	`return wrapToolDefinition(createReadToolDefinition(cwd, options));`
`453`	`454`	`}`
`454`		`-`
`455`		`-function toLintErrorObject(value: unknown, fallbackMessage: string): Error {`
`456`		`-if (value instanceof Error) {`
`457`		`-return value;`
`458`		`-}`
`459`		`-if (typeof value === "string") {`
`460`		`-return new Error(value);`
`461`		`-}`
`462`		`-const error = new Error(fallbackMessage, { cause: value });`
`463`		`-if ((typeof value === "object" && value !== null) \|\| typeof value === "function") {`
`464`		`-Object.assign(error, value);`
`465`		`-}`
`466`		`-return error;`
`467`		`-}`

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

推荐订阅源

Recent Commits to openclaw:main

File tree