fix(cli): wrap malformed trajectory export requests

vincentkoc · vincentkoc · commit 49e288823cda · 2026-05-14T18:52:05.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -48,6 +48,7 @@ Docs: https://docs.openclaw.ai
 - QQBot: reject malformed stored cron payload base64 before JSON decoding structured reminder data.
 - Telnyx voice-call: use the raw `client_state` fallback when webhook state is malformed base64 instead of using silently corrupted decoded text.
 - Google Meet: report malformed node-host params JSON with plugin-owned errors instead of leaking raw JSON parser failures.
+- CLI/export-trajectory: report malformed encoded request JSON with a stable CLI error instead of leaking raw parser output.
 - Models config/auth: stop inferring provider env-var markers from broad `^[A-Z_][A-Z0-9_]*$` strings, and resolve config-backed provider `apiKey` values only through structured env SecretRefs (`secrets.providers[id]` / `secrets.defaults`), so unrelated env vars cannot accidentally become provider credentials. Thanks @sallyom.
 - Media fetch: skip allocating and buffering the response body for bodyless media responses (HEAD probes and 204-style empty bodies), avoiding wasted heap on streams that carry no payload. Thanks @shakkernerd.
 - CLI/onboarding: forward provider-specific auth flags (e.g. `--openai-api-key`) through the onboarding wizard so they reach provider auth methods via `ctx.opts`, letting `--openai-api-key "$OPENAI_API_KEY"` skip the redundant "use existing env var?" prompt in non-interactive harnesses. (#81669) Thanks @sjf.
diff --git a/src/commands/export-trajectory.test.ts b/src/commands/export-trajectory.test.ts
@@ -45,6 +45,18 @@ describe("exportTrajectoryCommand", () => {
     expect(runtime.exit).toHaveBeenCalledWith(1);
   });
 
+  it("reports malformed encoded request JSON without leaking parser output", async () => {
+    const runtime = createRuntime();
+    const requestJsonBase64 = Buffer.from("not json", "utf8").toString("base64url");
+
+    await exportTrajectoryCommand({ requestJsonBase64 }, runtime);
+
+    expect(runtime.error).toHaveBeenCalledWith(
+      "Failed to decode trajectory export request: Encoded trajectory export request is invalid JSON",
+    );
+    expect(runtime.exit).toHaveBeenCalledWith(1);
+  });
+
   it("points missing session users at the sessions command", async () => {
     const runtime = createRuntime();
 
diff --git a/src/commands/export-trajectory.ts b/src/commands/export-trajectory.ts
@@ -46,7 +46,12 @@ function decodeExportTrajectoryRequest(encoded: string): Partial<ExportTrajector
   if (!ENCODED_EXPORT_REQUEST_RE.test(trimmed)) {
     throw new Error("Encoded trajectory export request is invalid");
   }
-  const decoded = JSON.parse(Buffer.from(trimmed, "base64url").toString("utf8")) as unknown;
+  let decoded: unknown;
+  try {
+    decoded = JSON.parse(Buffer.from(trimmed, "base64url").toString("utf8")) as unknown;
+  } catch {
+    throw new Error("Encoded trajectory export request is invalid JSON");
+  }
   if (!decoded || typeof decoded !== "object" || Array.isArray(decoded)) {
     throw new Error("Encoded trajectory export request must be a JSON object");
   }

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,12 @@ function decodeExportTrajectoryRequest(encoded: string): Partial<ExportTrajector`
`46`	`46`	`if (!ENCODED_EXPORT_REQUEST_RE.test(trimmed)) {`
`47`	`47`	`throw new Error("Encoded trajectory export request is invalid");`
`48`	`48`	`}`
`49`		`- const decoded = JSON.parse(Buffer.from(trimmed, "base64url").toString("utf8")) as unknown;`
	`49`	`+ let decoded: unknown;`
	`50`	`+ try {`
	`51`	`+ decoded = JSON.parse(Buffer.from(trimmed, "base64url").toString("utf8")) as unknown;`
	`52`	`+ } catch {`
	`53`	`+ throw new Error("Encoded trajectory export request is invalid JSON");`
	`54`	`+ }`
`50`	`55`	`if (!decoded \|\| typeof decoded !== "object" \|\| Array.isArray(decoded)) {`
`51`	`56`	`throw new Error("Encoded trajectory export request must be a JSON object");`
`52`	`57`	`}`