refactor(agents): share error normalization helpers · 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
`@@ -15,6 +15,7 @@ import { redactSensitiveUrlLikeString } from "@openclaw/net-policy/redact-sensit`
`15`	`15`	`import { normalizeOptionalString } from "@openclaw/normalization-core/string-coerce";`
`16`	`16`	`import { Compile } from "typebox/compile";`
`17`	`17`	`import type { OpenClawConfig } from "../config/types.openclaw.js";`
	`18`	`+import { toErrorObject } from "../infra/errors.js";`
`18`	`19`	`import { logWarn } from "../logger.js";`
`19`	`20`	`import type { PluginManifestRegistry } from "../plugins/manifest-registry.js";`
`20`	`21`	`import { resolveGlobalSingleton } from "../shared/global-singleton.js";`
`@@ -204,7 +205,7 @@ function connectWithTimeout(`
`204`	`205`	`},`
`205`	`206`	`(error: unknown) => {`
`206`	`207`	`clearTimeout(timer);`
`207`		`-reject(toLintErrorObject(error, "Non-Error rejection"));`
	`208`	`+reject(toErrorObject(error, "Non-Error rejection"));`
`208`	`209`	`},`
`209`	`210`	`);`
`210`	`211`	`});`
`@@ -1144,17 +1145,3 @@ export const testing = {`
`1144`	`1145`	`resolveSessionMcpRuntimeIdleTtlMs,`
`1145`	`1146`	`};`
`1146`	`1147`	`export { testing as __testing };`
`1147`		`-`
`1148`		`-function toLintErrorObject(value: unknown, fallbackMessage: string): Error {`
`1149`		`-if (value instanceof Error) {`
`1150`		`-return value;`
`1151`		`-}`
`1152`		`-if (typeof value === "string") {`
`1153`		`-return new Error(value);`
`1154`		`-}`
`1155`		`-const error = new Error(fallbackMessage, { cause: value });`
`1156`		`-if ((typeof value === "object" && value !== null) \|\| typeof value === "function") {`
`1157`		`-Object.assign(error, value);`
`1158`		`-}`
`1159`		`-return error;`
`1160`		`-}`

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ import path from "node:path";`
`8`	`8`	`import { URL } from "node:url";`
`9`	`9`	`import { detectMime } from "@openclaw/media-core/mime";`
`10`	`10`	`import { isWindowsDrivePath } from "../infra/archive-path.js";`
	`11`	`+import { toErrorObject } from "../infra/errors.js";`
`11`	`12`	`import {`
`12`	`13`	`canonicalPathFromExistingAncestor,`
`13`	`14`	`root as fsRoot,`
`@@ -737,7 +738,7 @@ async function assertSandboxPathWithinAnyRoot(params: {`
`737`	`738`	`firstRootEscapeError ??= error;`
`738`	`739`	`}`
`739`	`740`	`}`
`740`		`-throw toLintErrorObject(`
	`741`	`+throw toErrorObject(`
`741`	`742`	`firstRootEscapeError ?? new Error("Path guard has no configured roots."),`
`742`	`743`	`"Non-Error thrown",`
`743`	`744`	`);`
`@@ -1127,17 +1128,3 @@ function createFsAccessError(code: string, filePath: string): NodeJS.ErrnoExcept`
`1127`	`1128`	`error.code = code;`
`1128`	`1129`	`return error;`
`1129`	`1130`	`}`
`1130`		`-`
`1131`		`-function toLintErrorObject(value: unknown, fallbackMessage: string): Error {`
`1132`		`-if (value instanceof Error) {`
`1133`		`-return value;`
`1134`		`-}`
`1135`		`-if (typeof value === "string") {`
`1136`		`-return new Error(value);`
`1137`		`-}`
`1138`		`-const error = new Error(fallbackMessage, { cause: value });`
`1139`		`-if ((typeof value === "object" && value !== null) \|\| typeof value === "function") {`
`1140`		`-Object.assign(error, value);`
`1141`		`-}`
`1142`		`-return error;`
`1143`		`-}`

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`*/`
`6`	`6`	`import { readResponseTextSnippet } from "@openclaw/media-core/read-response-with-limit";`
`7`	`7`	`import { normalizeLowercaseStringOrEmpty } from "@openclaw/normalization-core/string-coerce";`
	`8`	`+import { toErrorObject } from "../infra/errors.js";`
`8`	`9`	`import { getEnvApiKey } from "../llm/env-api-keys.js";`
`9`	`10`	`import { calculateCost, clampThinkingLevel } from "../llm/model-utils.js";`
`10`	`11`	`import {`
`@@ -681,7 +682,7 @@ function readAnthropicSseChunk(`
`681`	`682`	`}`
`682`	`683`	`settled = true;`
`683`	`684`	`signal.removeEventListener("abort", onAbort);`
`684`		`-reject(toLintErrorObject(error, "Non-Error rejection"));`
	`685`	`+reject(toErrorObject(error, "Non-Error rejection"));`
`685`	`686`	`},`
`686`	`687`	`);`
`687`	`688`	`});`
`@@ -1604,17 +1605,3 @@ export function createAnthropicMessagesTransportStreamFn(): StreamFn {`
`1604`	`1605`	`return eventStream as ReturnType<StreamFn>;`
`1605`	`1606`	`};`
`1606`	`1607`	`}`
`1607`		`-`
`1608`		`-function toLintErrorObject(value: unknown, fallbackMessage: string): Error {`
`1609`		`-if (value instanceof Error) {`
`1610`		`-return value;`
`1611`		`-}`
`1612`		`-if (typeof value === "string") {`
`1613`		`-return new Error(value);`
`1614`		`-}`
`1615`		`-const error = new Error(fallbackMessage, { cause: value });`
`1616`		`-if ((typeof value === "object" && value !== null) \|\| typeof value === "function") {`
`1617`		`-Object.assign(error, value);`
`1618`		`-}`
`1619`		`-return error;`
`1620`		`-}`

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ import { createReplyPrefixContext } from "../../channels/reply-prefix.js";`
`15`	`15`	`import { createOutboundSendDeps, type CliDeps } from "../../cli/outbound-send-deps.js";`
`16`	`16`	`import type { SessionEntry } from "../../config/sessions.js";`
`17`	`17`	`import type { OpenClawConfig } from "../../config/types.openclaw.js";`
`18`		`-import { formatErrorMessage } from "../../infra/errors.js";`
	`18`	`+import { formatErrorMessage, toErrorObject } from "../../infra/errors.js";`
`19`	`19`	`import {`
`20`	`20`	`resolveAgentDeliveryPlanWithSessionRoute,`
`21`	`21`	`resolveAgentOutboundTarget,`
`@@ -702,7 +702,7 @@ export async function deliverAgentCommandResult(`
`702`	`702`	`};`
`703`	`703`	`if (strictPreDeliveryError) {`
`704`	`704`	`emitJsonEnvelope(deliveryStatus);`
`705`		`-throw toLintErrorObject(strictPreDeliveryError, "Non-Error thrown");`
	`705`	`+throw toErrorObject(strictPreDeliveryError, "Non-Error thrown");`
`706`	`706`	`}`
`707`	`707`
`708`	`708`	`const deliveryPayloads = projectOutboundPayloadPlanForOutbound(outboundPayloadPlan);`
`@@ -802,17 +802,3 @@ export async function deliverAgentCommandResult(`
`802`	`802`	`deliveryStatus,`
`803`	`803`	`});`
`804`	`804`	`}`
`805`		`-`
`806`		`-function toLintErrorObject(value: unknown, fallbackMessage: string): Error {`
`807`		`-if (value instanceof Error) {`
`808`		`-return value;`
`809`		`-}`
`810`		`-if (typeof value === "string") {`
`811`		`-return new Error(value);`
`812`		`-}`
`813`		`-const error = new Error(fallbackMessage, { cause: value });`
`814`		`-if ((typeof value === "object" && value !== null) \|\| typeof value === "function") {`
`815`		`-Object.assign(error, value);`
`816`		`-}`
`817`		`-return error;`
`818`		`-}`

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ import path from "node:path";`
`6`	`6`	`import { fileURLToPath, pathToFileURL } from "node:url";`
`7`	`7`	`import { Worker } from "node:worker_threads";`
`8`	`8`	`import { resolveTimerTimeoutMs } from "@openclaw/normalization-core/number-coercion";`
	`9`	`+import { toErrorObject } from "../infra/errors.js";`
`9`	`10`	`import {`
`10`	`11`	`buildHistoryPrunePlan,`
`11`	`12`	`buildOversizedFallbackPlan,`
`@@ -60,7 +61,7 @@ function runCompactionPlanningWorker(params: {`
`60`	`61`	`}): Promise<CompactionPlanningWorkerValue> {`
`61`	`62`	`if (params.signal?.aborted) {`
`62`	`63`	`return Promise.reject(`
`63`		`-toLintErrorObject(`
	`64`	`+toErrorObject(`
`64`	`65`	`params.signal.reason ?? new Error("compaction planning aborted"),`
`65`	`66`	`"Non-Error rejection",`
`66`	`67`	`),`
`@@ -105,7 +106,7 @@ function runCompactionPlanningWorker(params: {`
`105`	`106`	`settle(`
`106`	`107`	`() =>`
`107`	`108`	`reject(`
`108`		`-toLintErrorObject(`
	`109`	`+toErrorObject(`
`109`	`110`	`params.signal?.reason ?? new Error("compaction planning aborted"),`
`110`	`111`	`"Non-Error rejection",`
`111`	`112`	`),`
`@@ -367,17 +368,3 @@ export const compactionPlanningWorkerTesting = {`
`367`	`368`	`runCompactionPlanningWorker,`
`368`	`369`	`CompactionPlanningWorkerError,`
`369`	`370`	`};`
`370`		`-`
`371`		`-function toLintErrorObject(value: unknown, fallbackMessage: string): Error {`
`372`		`-if (value instanceof Error) {`
`373`		`-return value;`
`374`		`-}`
`375`		`-if (typeof value === "string") {`
`376`		`-return new Error(value);`
`377`		`-}`
`378`		`-const error = new Error(fallbackMessage, { cause: value });`
`379`		`-if ((typeof value === "object" && value !== null) \|\| typeof value === "function") {`
`380`		`-Object.assign(error, value);`
`381`		`-}`
`382`		`-return error;`
`383`		`-}`

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ import {`
`25`	`25`	`resolveExpiresAtMsFromDurationMs,`
`26`	`26`	`} from "@openclaw/normalization-core/number-coercion";`
`27`	`27`	`import type { OpenClawConfig } from "../../config/types.openclaw.js";`
	`28`	`+import { toErrorObject } from "../../infra/errors.js";`
`28`	`29`	`import { resolveOpenClawPackageRootSync } from "../../infra/openclaw-root.js";`
`29`	`30`	`import { privateFileStoreSync } from "../../infra/private-file-store.js";`
`30`	`31`	`import { createSubsystemLogger } from "../../logging/subsystem.js";`
`@@ -1235,7 +1236,7 @@ function postNativeHookRelayBridgeRecord(params: {`
`1235`	`1236`	`const rejectOnce = (error: unknown) => {`
`1236`	`1237`	`if (!settled) {`
`1237`	`1238`	`settled = true;`
`1238`		`-reject(toLintErrorObject(error, "Non-Error rejection"));`
	`1239`	`+reject(toErrorObject(error, "Non-Error rejection"));`
`1239`	`1240`	`}`
`1240`	`1241`	`};`
`1241`	`1242`	`const req = httpRequest(`
`@@ -2060,10 +2061,10 @@ async function waitForNativeHookRelayApprovalDecision(params: {`
`2060`	`2061`	`let onAbort: (() => void) \| undefined;`
`2061`	`2062`	`const abortPromise = new Promise<never>((_, reject) => {`
`2062`	`2063`	`if (params.signal!.aborted) {`
`2063`		`-reject(toLintErrorObject(params.signal!.reason, "Non-Error rejection"));`
	`2064`	`+reject(toErrorObject(params.signal!.reason, "Non-Error rejection"));`
`2064`	`2065`	`return;`
`2065`	`2066`	`}`
`2066`		`-onAbort = () => reject(toLintErrorObject(params.signal!.reason, "Non-Error rejection"));`
	`2067`	`+onAbort = () => reject(toErrorObject(params.signal!.reason, "Non-Error rejection"));`
`2067`	`2068`	`params.signal!.addEventListener("abort", onAbort, { once: true });`
`2068`	`2069`	`});`
`2069`	`2070`	`try {`
`@@ -2380,17 +2381,3 @@ export const testing = {`
`2380`	`2381`	`},`
`2381`	`2382`	`} as const;`
`2382`	`2383`	`export { testing as __testing };`
`2383`		`-`
`2384`		`-function toLintErrorObject(value: unknown, fallbackMessage: string): Error {`
`2385`		`-if (value instanceof Error) {`
`2386`		`-return value;`
`2387`		`-}`
`2388`		`-if (typeof value === "string") {`
`2389`		`-return new Error(value);`
`2390`		`-}`
`2391`		`-const error = new Error(fallbackMessage, { cause: value });`
`2392`		`-if ((typeof value === "object" && value !== null) \|\| typeof value === "function") {`
`2393`		`-Object.assign(error, value);`
`2394`		`-}`
`2395`		`-return error;`
`2396`		`-}`

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import {`
`9`	`9`	`} from "../config/model-input.js";`
`10`	`10`	`import type { OpenClawConfig } from "../config/types.openclaw.js";`
`11`	`11`	`import { emitFailoverEvent } from "../infra/diagnostic-events.js";`
`12`		`-import { formatErrorMessage } from "../infra/errors.js";`
	`12`	`+import { formatErrorMessage, toErrorObject } from "../infra/errors.js";`
`13`	`13`	`import { createSubsystemLogger } from "../logging/subsystem.js";`
`14`	`14`	`import { normalizePluginsConfig } from "../plugins/config-state.js";`
`15`	`15`	`import { getCurrentPluginMetadataSnapshot } from "../plugins/current-plugin-metadata-snapshot.js";`
`@@ -431,7 +431,7 @@ async function runFallbackAttempt<T>(params: {`
`431`	`431`	`});`
`432`	`432`	`if (classifiedError) {`
`433`	`433`	`if (isTerminalAbort(params.abortSignal)) {`
`434`		`-throw toLintErrorObject(classifiedError, "Non-Error thrown");`
	`434`	`+throw toErrorObject(classifiedError, "Non-Error thrown");`
`435`	`435`	`}`
`436`	`436`	`const preserveResultOnExhaustion =`
`437`	`437`	`classification &&`
`@@ -670,7 +670,7 @@ function throwFallbackFailureSummary(params: {`
`670`	`670`	`agentDir?: string;`
`671`	`671`	`}): never {`
`672`	`672`	`if (params.attempts.length <= 1 && params.lastError) {`
`673`		`-throw toLintErrorObject(params.lastError, "Non-Error thrown");`
	`673`	`+throw toErrorObject(params.lastError, "Non-Error thrown");`
`674`	`674`	`}`
`675`	`675`
`676`	`676`	`if (params.attribution?.sessionId) {`
`@@ -1946,17 +1946,3 @@ export async function runWithImageModelFallback<T>(params: {`
`1946`	`1946`	`});`
`1947`	`1947`	`}`
`1948`	`1948`	`export { testing as __testing };`
`1949`		`-`
`1950`		`-function toLintErrorObject(value: unknown, fallbackMessage: string): Error {`
`1951`		`-if (value instanceof Error) {`
`1952`		`-return value;`
`1953`		`-}`
`1954`		`-if (typeof value === "string") {`
`1955`		`-return new Error(value);`
`1956`		`-}`
`1957`		`-const error = new Error(fallbackMessage, { cause: value });`
`1958`		`-if ((typeof value === "object" && value !== null) \|\| typeof value === "function") {`
`1959`		`-Object.assign(error, value);`
`1960`		`-}`
`1961`		`-return error;`
`1962`		`-}`

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ import { fileURLToPath, pathToFileURL } from "node:url";`
`8`	`8`	`import { Worker } from "node:worker_threads";`
`9`	`9`	`import { hashRuntimeConfigValue } from "../config/runtime-snapshot.js";`
`10`	`10`	`import type { OpenClawConfig } from "../config/types.openclaw.js";`
	`11`	`+import { toErrorObject } from "../infra/errors.js";`
`11`	`12`	`import {`
`12`	`13`	`listAgentIds,`
`13`	`14`	`resolveAgentDir,`
`@@ -582,7 +583,7 @@ function runProviderAuthWarmWorker(params: {`
`582`	`583`	`resolve({ agents: [] });`
`583`	`584`	`return;`
`584`	`585`	`}`
`585`		`-reject(toLintErrorObject(error, "Non-Error rejection"));`
	`586`	`+reject(toErrorObject(error, "Non-Error rejection"));`
`586`	`587`	`});`
`587`	`588`	`});`
`588`	`589`	`worker.once("exit", (code) => {`
`@@ -638,17 +639,3 @@ export async function warmCurrentProviderAuthStateOffMainThread(`
`638`	`639`	`}`
`639`	`640`	`publishProviderAuthWarmSnapshot(snapshot);`
`640`	`641`	`}`
`641`		`-`
`642`		`-function toLintErrorObject(value: unknown, fallbackMessage: string): Error {`
`643`		`-if (value instanceof Error) {`
`644`		`-return value;`
`645`		`-}`
`646`		`-if (typeof value === "string") {`
`647`		`-return new Error(value);`
`648`		`-}`
`649`		`-const error = new Error(fallbackMessage, { cause: value });`
`650`		`-if ((typeof value === "object" && value !== null) \|\| typeof value === "function") {`
`651`		`-Object.assign(error, value);`
`652`		`-}`
`653`		`-return error;`
`654`		`-}`

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ import {`
`9`	`9`	`resolvePositiveTimerTimeoutMs,`
`10`	`10`	`} from "@openclaw/normalization-core/number-coercion";`
`11`	`11`	`import type { ModelProviderLocalServiceConfig } from "../config/types.models.js";`
	`12`	`+import { toErrorObject } from "../infra/errors.js";`
`12`	`13`	`import type { Model } from "../llm/types.js";`
`13`	`14`	`import { createSubsystemLogger } from "../logging/subsystem.js";`
`14`	`15`	`import {`
`@@ -430,7 +431,7 @@ function waitForAbort<T>(promise: Promise<T>, signal?: AbortSignal \| null): Prom`
`430`	`431`	`},`
`431`	`432`	`(error: unknown) => {`
`432`	`433`	`cleanup();`
`433`		`-reject(toLintErrorObject(error, "Non-Error rejection"));`
	`434`	`+reject(toErrorObject(error, "Non-Error rejection"));`
`434`	`435`	`},`
`435`	`436`	`);`
`436`	`437`	`});`
`@@ -523,17 +524,3 @@ export function hasLocalServiceProcessExited(`
`523`	`524`	`): boolean {`
`524`	`525`	`return child.exitCode !== null \|\| child.signalCode !== null;`
`525`	`526`	`}`
`526`		`-`
`527`		`-function toLintErrorObject(value: unknown, fallbackMessage: string): Error {`
`528`		`-if (value instanceof Error) {`
`529`		`-return value;`
`530`		`-}`
`531`		`-if (typeof value === "string") {`
`532`		`-return new Error(value);`
`533`		`-}`
`534`		`-const error = new Error(fallbackMessage, { cause: value });`
`535`		`-if ((typeof value === "object" && value !== null) \|\| typeof value === "function") {`
`536`		`-Object.assign(error, value);`
`537`		`-}`
`538`		`-return error;`
`539`		`-}`

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ import fs from "node:fs/promises";`
`8`	`8`	`import os from "node:os";`
`9`	`9`	`import path from "node:path";`
`10`	`10`	`import { resolveRootPath } from "../../infra/boundary-path.js";`
	`11`	`+import { toErrorObject } from "../../infra/errors.js";`
`11`	`12`	`import { parseSshTarget } from "../../infra/ssh-tunnel.js";`
`12`	`13`	`import { resolvePreferredOpenClawTmpDir } from "../../infra/tmp-openclaw-dir.js";`
`13`	`14`	`import { resolveUserPath } from "../../utils.js";`
`@@ -743,7 +744,7 @@ export async function uploadDirectoryToSshTarget(params: {`
`743`	`744`	`const fail = (error: unknown) => {`
`744`	`745`	`tar.kill("SIGKILL");`
`745`	`746`	`ssh.kill("SIGKILL");`
`746`		`-reject(toLintErrorObject(error, "Non-Error rejection"));`
	`747`	`+reject(toErrorObject(error, "Non-Error rejection"));`
`747`	`748`	`};`
`748`	`749`
`749`	`750`	`tar.on("error", fail);`
`@@ -846,17 +847,3 @@ async function writeSecretMaterial(`
`846`	`847`	`await fs.chmod(pathname, 0o600);`
`847`	`848`	`return pathname;`
`848`	`849`	`}`
`849`		`-`
`850`		`-function toLintErrorObject(value: unknown, fallbackMessage: string): Error {`
`851`		`-if (value instanceof Error) {`
`852`		`-return value;`
`853`		`-}`
`854`		`-if (typeof value === "string") {`
`855`		`-return new Error(value);`
`856`		`-}`
`857`		`-const error = new Error(fallbackMessage, { cause: value });`
`858`		`-if ((typeof value === "object" && value !== null) \|\| typeof value === "function") {`
`859`		`-Object.assign(error, value);`
`860`		`-}`
`861`		`-return error;`
`862`		`-}`

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

推荐订阅源

Recent Commits to openclaw:main