From 7bf100b0283f63773618207431d3c2b0201fbbbd Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 28 May 2026 20:56:45 -0400
Subject: [PATCH] fix: validate embedded chat history limits

---
 .../tools/embedded-gateway-stub.test.ts       | 47 +++++++++++++++++++
 src/agents/tools/embedded-gateway-stub.ts     |  3 +-
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/src/agents/tools/embedded-gateway-stub.test.ts b/src/agents/tools/embedded-gateway-stub.test.ts
index 75f19acaaaf..e9cf5e00272 100644
--- a/src/agents/tools/embedded-gateway-stub.test.ts
+++ b/src/agents/tools/embedded-gateway-stub.test.ts
@@ -132,4 +132,51 @@ describe("embedded gateway stub", () => {
       },
     );
   });
+
+  it("normalizes string chat history limits before projection", async () => {
+    const rawMessages = [
+      { role: "user", content: "older" },
+      { role: "assistant", content: "newer" },
+    ];
+    runtime.readSessionMessagesAsync.mockResolvedValueOnce(rawMessages);
+
+    const callGateway = createEmbeddedCallGateway();
+    await callGateway<{ messages: unknown[] }>({
+      method: "chat.history",
+      params: { sessionKey: "agent:main:main", limit: "2" },
+    });
+
+    expect(runtime.projectRecentChatDisplayMessages).toHaveBeenCalledWith(rawMessages, {
+      maxChars: 100_000,
+      maxMessages: 2,
+    });
+    expect(runtime.readSessionMessagesAsync).toHaveBeenCalledWith(
+      "sess-main",
+      "/tmp/openclaw-sessions.json",
+      undefined,
+      {
+        mode: "recent",
+        maxMessages: 2,
+        maxBytes: 1024 * 1024,
+      },
+    );
+  });
+
+  it("rejects malformed chat history limits before reading session files", async () => {
+    const callGateway = createEmbeddedCallGateway();
+
+    await expect(
+      callGateway({
+        method: "chat.history",
+        params: { sessionKey: "agent:main:main", limit: "2.5" },
+      }),
+    ).rejects.toThrow("limit must be a positive integer");
+    await expect(
+      callGateway({
+        method: "chat.history",
+        params: { sessionKey: "agent:main:main", limit: -1 },
+      }),
+    ).rejects.toThrow("limit must be a positive integer");
+    expect(runtime.readSessionMessagesAsync).not.toHaveBeenCalled();
+  });
 });
diff --git a/src/agents/tools/embedded-gateway-stub.ts b/src/agents/tools/embedded-gateway-stub.ts
index b33617bcbbf..116b6733472 100644
--- a/src/agents/tools/embedded-gateway-stub.ts
+++ b/src/agents/tools/embedded-gateway-stub.ts
@@ -4,6 +4,7 @@ import type { SessionsListParams, SessionsResolveParams } from "../../gateway/pr
 import type { ReadSessionMessagesAsyncOptions } from "../../gateway/session-utils.fs.js";
 import type { SessionsListResult } from "../../gateway/session-utils.types.js";
 import type { SessionsResolveResult } from "../../gateway/sessions-resolve.js";
+import { readPositiveIntegerParam } from "./common.js";
 
 type EmbeddedCallGateway = <T = Record<string, unknown>>(opts: CallGatewayOptions) => Promise<T>;
 
@@ -108,7 +109,7 @@ async function handleChatHistory(params: Record<string, unknown>): Promise<{
   const rt = await getRuntime();
 
   const sessionKey = typeof params.sessionKey === "string" ? params.sessionKey : "";
-  const limit = typeof params.limit === "number" ? params.limit : undefined;
+  const limit = readPositiveIntegerParam(params, "limit");
 
   const { cfg, storePath, entry } = rt.loadSessionEntry(sessionKey);
   const sessionId = entry?.sessionId as string | undefined;