refactor: unify stableStringify implementations (#80457) · openclaw/openclaw@53fedc7

Recent Commits to openclaw:main

thesomewhaty · 2026-05-12 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ import { parseBooleanValue } from "../utils/boolean.js";`
`8`	`8`	`import { safeJsonStringify } from "../utils/safe-json.js";`
`9`	`9`	`import { sanitizeDiagnosticPayload } from "./payload-redaction.js";`
`10`	`10`	`import { getQueuedFileWriter, type QueuedFileWriter } from "./queued-file-writer.js";`
	`11`	`+import { stableStringify } from "./stable-stringify.js";`
`11`	`12`	`import { buildAgentTraceBase } from "./trace-base.js";`
`12`	`13`
`13`	`14`	`type CacheTraceStage =`
`@@ -107,57 +108,6 @@ function getWriter(filePath: string): CacheTraceWriter {`
`107`	`108`	`return getQueuedFileWriter(writers, filePath);`
`108`	`109`	`}`
`109`	`110`
`110`		`-function stableStringify(value: unknown, seen: WeakSet<object> = new WeakSet()): string {`
`111`		`-if (value === null \|\| value === undefined) {`
`112`		`-return String(value);`
`113`		`-}`
`114`		`-if (typeof value === "number" && !Number.isFinite(value)) {`
`115`		`-return JSON.stringify(String(value));`
`116`		`-}`
`117`		`-if (typeof value === "bigint") {`
`118`		`-return JSON.stringify(value.toString());`
`119`		`-}`
`120`		`-if (typeof value !== "object") {`
`121`		`-return JSON.stringify(value) ?? "null";`
`122`		`-}`
`123`		`-if (seen.has(value)) {`
`124`		`-return JSON.stringify("[Circular]");`
`125`		`-}`
`126`		`-seen.add(value);`
`127`		`-if (value instanceof Error) {`
`128`		`-return stableStringify(`
`129`		`-{`
`130`		`-name: value.name,`
`131`		`-message: value.message,`
`132`		`-stack: value.stack,`
`133`		`-},`
`134`		`-seen,`
`135`		`-);`
`136`		`-}`
`137`		`-if (value instanceof Uint8Array) {`
`138`		`-return stableStringify(`
`139`		`-{`
`140`		`-type: "Uint8Array",`
`141`		`-data: Buffer.from(value).toString("base64"),`
`142`		`-},`
`143`		`-seen,`
`144`		`-);`
`145`		`-}`
`146`		`-if (Array.isArray(value)) {`
`147`		`-const serializedEntries: string[] = [];`
`148`		`-for (const entry of value) {`
`149`		`-serializedEntries.push(stableStringify(entry, seen));`
`150`		`-}`
`151`		-return `[${serializedEntries.join(",")}]`;
`152`		`-}`
`153`		`-const record = value as Record<string, unknown>;`
`154`		`-const serializedFields: string[] = [];`
`155`		`-for (const key of Object.keys(record).toSorted()) {`
`156`		-serializedFields.push(`${JSON.stringify(key)}:${stableStringify(record[key], seen)}`);
`157`		`-}`
`158`		-return `{${serializedFields.join(",")}}`;
`159`		`-}`
`160`		`-`
`161`	`111`	`function digest(value: unknown): string {`
`162`	`112`	`const serialized = stableStringify(value);`
`163`	`113`	`return crypto.createHash("sha256").update(serialized).digest("hex");`

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ import {`
`18`	`18`	`} from "./agent-scope.js";`
`19`	`19`	`import { MODELS_JSON_STATE } from "./models-config-state.js";`
`20`	`20`	`import { planOpenClawModelsJson } from "./models-config.plan.js";`
	`21`	`+import { stableStringify } from "./stable-stringify.js";`
`21`	`22`
`22`	`23`	`export { resetModelsJsonReadyCacheForTest } from "./models-config-state.js";`
`23`	`24`
`@@ -30,21 +31,6 @@ async function readFileMtimeMs(pathname: string): Promise<number \| null> {`
`30`	`31`	`}`
`31`	`32`	`}`
`32`	`33`
`33`		`-function stableStringify(value: unknown): string {`
`34`		`-if (value === null \|\| typeof value !== "object") {`
`35`		`-return JSON.stringify(value);`
`36`		`-}`
`37`		`-if (Array.isArray(value)) {`
`38`		-return `[${value.map((entry) => stableStringify(entry)).join(",")}]`;
`39`		`-}`
`40`		`-const entries = Object.entries(value as Record<string, unknown>).toSorted(([a], [b]) =>`
`41`		`-a.localeCompare(b),`
`42`		`-);`
`43`		-return `{${entries
`44`		- .map(([key, entry]) => `${JSON.stringify(key)}:${stableStringify(entry)}`)
`45`		- .join(",")}}`;
`46`		`-}`
`47`		`-`
`48`	`34`	`async function buildModelsJsonFingerprint(params: {`
`49`	`35`	`config: OpenClawConfig;`
`50`	`36`	`sourceConfigForSecrets: OpenClawConfig;`

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,46 @@`
	`1`	`+import { describe, expect, it } from "vitest";`
	`2`	`+import { stableStringify } from "./stable-stringify.js";`
	`3`	`+`
	`4`	`+describe("stableStringify", () => {`
	`5`	`+it("sorts object keys recursively", () => {`
	`6`	`+expect(stableStringify({ b: { d: 4, c: 3 }, a: 1 })).toBe('{"a":1,"b":{"c":3,"d":4}}');`
	`7`	`+});`
	`8`	`+`
	`9`	`+it("marks true circular references without collapsing repeated references", () => {`
	`10`	`+const shared = { value: 1 };`
	`11`	`+const root: Record<string, unknown> = { first: shared, second: shared };`
	`12`	`+root.self = root;`
	`13`	`+`
	`14`	`+expect(stableStringify(root)).toBe(`
	`15`	`+'{"first":{"value":1},"second":{"value":1},"self":"[Circular]"}',`
	`16`	`+);`
	`17`	`+});`
	`18`	`+`
	`19`	`+it("handles circular arrays without treating later siblings as circular", () => {`
	`20`	`+const shared = { value: "same" };`
	`21`	`+const items: unknown[] = [shared, shared];`
	`22`	`+items.push(items);`
	`23`	`+`
	`24`	`+expect(stableStringify(items)).toBe('[{"value":"same"},{"value":"same"},"[Circular]"]');`
	`25`	`+});`
	`26`	`+`
	`27`	`+it("serializes cache-trace edge types deterministically", () => {`
	`28`	`+const error = new Error("boom");`
	`29`	`+error.stack = "Error: boom\n at test";`
	`30`	`+`
	`31`	`+expect(`
	`32`	`+stableStringify({`
	`33`	`+bytes: new Uint8Array([1, 2, 3]),`
	`34`	`+ error,`
	`35`	`+finite: 1,`
	`36`	`+infinity: Infinity,`
	`37`	`+nan: Number.NaN,`
	`38`	`+nil: null,`
	`39`	`+token: 123n,`
	`40`	`+undef: undefined,`
	`41`	`+}),`
	`42`	`+).toBe(`
	`43`	`+'{"bytes":{"data":"AQID","type":"Uint8Array"},"error":{"message":"boom","name":"Error","stack":"Error: boom\\n at test"},"finite":1,"infinity":"Infinity","nan":"NaN","nil":null,"token":"123","undef":undefined}',`
	`44`	`+);`
	`45`	`+});`
	`46`	`+});`

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,65 @@`
	`1`	`+import { Buffer } from "node:buffer";`
	`2`	`+`
`1`	`3`	`export function stableStringify(value: unknown): string {`
`2`		`-if (value === null \|\| typeof value !== "object") {`
	`4`	`+return stringifyStableValue(value, new WeakSet());`
	`5`	`+}`
	`6`	`+`
	`7`	`+function stringifyStableValue(value: unknown, stack: WeakSet<object>): string {`
	`8`	`+if (value === null \|\| value === undefined) {`
	`9`	`+return String(value);`
	`10`	`+}`
	`11`	`+if (typeof value === "number" && !Number.isFinite(value)) {`
	`12`	`+return JSON.stringify(String(value));`
	`13`	`+}`
	`14`	`+if (typeof value === "bigint") {`
	`15`	`+return JSON.stringify(value.toString());`
	`16`	`+}`
	`17`	`+if (typeof value !== "object") {`
`3`	`18`	`return JSON.stringify(value) ?? "null";`
`4`	`19`	`}`
	`20`	`+if (stack.has(value)) {`
	`21`	`+return JSON.stringify("[Circular]");`
	`22`	`+}`
	`23`	`+`
	`24`	`+stack.add(value);`
	`25`	`+try {`
	`26`	`+return stringifyObjectValue(value, stack);`
	`27`	`+} finally {`
	`28`	`+stack.delete(value);`
	`29`	`+}`
	`30`	`+}`
	`31`	`+`
	`32`	`+function stringifyObjectValue(value: object, stack: WeakSet<object>): string {`
	`33`	`+if (value instanceof Error) {`
	`34`	`+return stringifyStableValue(`
	`35`	`+{`
	`36`	`+name: value.name,`
	`37`	`+message: value.message,`
	`38`	`+stack: value.stack,`
	`39`	`+},`
	`40`	`+stack,`
	`41`	`+);`
	`42`	`+}`
	`43`	`+if (value instanceof Uint8Array) {`
	`44`	`+return stringifyStableValue(`
	`45`	`+{`
	`46`	`+type: "Uint8Array",`
	`47`	`+data: Buffer.from(value).toString("base64"),`
	`48`	`+},`
	`49`	`+stack,`
	`50`	`+);`
	`51`	`+}`
`5`	`52`	`if (Array.isArray(value)) {`
`6`		-return `[${value.map((entry) => stableStringify(entry)).join(",")}]`;
	`53`	`+const serializedEntries: string[] = [];`
	`54`	`+for (const entry of value) {`
	`55`	`+serializedEntries.push(stringifyStableValue(entry, stack));`
	`56`	`+}`
	`57`	+return `[${serializedEntries.join(",")}]`;
`7`	`58`	`}`
`8`	`59`	`const record = value as Record<string, unknown>;`
`9`		`-const keys = Object.keys(record).toSorted();`
`10`		-const entries = keys.map((key) => `${JSON.stringify(key)}:${stableStringify(record[key])}`);
`11`		-return `{${entries.join(",")}}`;
	`60`	`+const serializedFields: string[] = [];`
	`61`	`+for (const key of Object.keys(record).toSorted()) {`
	`62`	+serializedFields.push(`${JSON.stringify(key)}:${stringifyStableValue(record[key], stack)}`);
	`63`	`+}`
	`64`	+return `{${serializedFields.join(",")}}`;
`12`	`65`	`}`

Original file line number	Diff line number	Diff line change
`@@ -225,6 +225,22 @@ describe("tool-loop-detection", () => {`
`225`	`225`	`expect(hash.startsWith("read:")).toBe(true);`
`226`	`226`	`expect(hash.length).toBe("read:".length + 64);`
`227`	`227`	`});`
	`228`	`+`
	`229`	`+it("hashes circular params without collapsing repeated references", () => {`
	`230`	`+const shared = { id: "shared" };`
	`231`	`+const payload: Record<string, unknown> = { first: shared, second: shared };`
	`232`	`+payload.self = payload;`
	`233`	`+`
	`234`	`+const equivalentShared = { id: "shared" };`
	`235`	`+const equivalentPayload: Record<string, unknown> = {`
	`236`	`+second: equivalentShared,`
	`237`	`+first: equivalentShared,`
	`238`	`+};`
	`239`	`+equivalentPayload.self = equivalentPayload;`
	`240`	`+`
	`241`	`+expect(hashToolCall("tool", payload)).toBe(hashToolCall("tool", equivalentPayload));`
	`242`	`+expect(hashToolCall("tool", payload)).toEqual(expect.stringMatching(/^tool:[a-f0-9]{64}$/));`
	`243`	`+});`
`228`	`244`	`});`
`229`	`245`
`230`	`246`	`describe("recordToolCall", () => {`

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ import type { ToolLoopDetectionConfig } from "../config/types.tools.js";`
`3`	`3`	`import type { SessionState, ToolCallRecord } from "../logging/diagnostic-session-state.js";`
`4`	`4`	`import { createSubsystemLogger } from "../logging/subsystem.js";`
`5`	`5`	`import { isPlainObject } from "../utils.js";`
	`6`	`+import { stableStringify } from "./stable-stringify.js";`
`6`	`7`
`7`	`8`	`const log = createSubsystemLogger("agents/loop-detection");`
`8`	`9`
`@@ -132,43 +133,11 @@ export function hashToolCall(toolName: string, params: unknown): string {`
`132`	`133`	return `${toolName}:${digestStable(params)}`;
`133`	`134`	`}`
`134`	`135`
`135`		`-function stableStringify(value: unknown): string {`
`136`		`-if (value === null \|\| typeof value !== "object") {`
`137`		`-return JSON.stringify(value);`
`138`		`-}`
`139`		`-if (Array.isArray(value)) {`
`140`		-return `[${value.map(stableStringify).join(",")}]`;
`141`		`-}`
`142`		`-const obj = value as Record<string, unknown>;`
`143`		`-const keys = Object.keys(obj).toSorted();`
`144`		-return `{${keys.map((k) => `${JSON.stringify(k)}:${stableStringify(obj[k])}`).join(",")}}`;
`145`		`-}`
`146`		`-`
`147`	`136`	`function digestStable(value: unknown): string {`
`148`		`-const serialized = stableStringifyFallback(value);`
	`137`	`+const serialized = stableStringify(value);`
`149`	`138`	`return createHash("sha256").update(serialized).digest("hex");`
`150`	`139`	`}`
`151`	`140`
`152`		`-function stableStringifyFallback(value: unknown): string {`
`153`		`-try {`
`154`		`-return stableStringify(value);`
`155`		`-} catch {`
`156`		`-if (value === null \|\| value === undefined) {`
`157`		-return `${value}`;
`158`		`-}`
`159`		`-if (typeof value === "string") {`
`160`		`-return value;`
`161`		`-}`
`162`		`-if (typeof value === "number" \|\| typeof value === "boolean" \|\| typeof value === "bigint") {`
`163`		-return `${value}`;
`164`		`-}`
`165`		`-if (value instanceof Error) {`
`166`		-return `${value.name}:${value.message}`;
`167`		`-}`
`168`		`-return Object.prototype.toString.call(value);`
`169`		`-}`
`170`		`-}`
`171`		`-`
`172`	`141`	`function isKnownPollToolCall(toolName: string, params: unknown): boolean {`
`173`	`142`	`if (toolName === "command_status") {`
`174`	`143`	`return true;`

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

推荐订阅源

Recent Commits to openclaw:main