From 2f0b0befbaee027061f58e1bdeb050419a9ab6eb Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Sat, 9 May 2026 19:14:10 +0100
Subject: [PATCH] test: tighten coding tools assertions

---
 ...tools.create-openclaw-coding-tools.test.ts | 98 ++++++++++---------
 1 file changed, 53 insertions(+), 45 deletions(-)

diff --git a/src/agents/pi-tools.create-openclaw-coding-tools.test.ts b/src/agents/pi-tools.create-openclaw-coding-tools.test.ts
index 2c331c5f708..2d0cf88fbb4 100644
--- a/src/agents/pi-tools.create-openclaw-coding-tools.test.ts
+++ b/src/agents/pi-tools.create-openclaw-coding-tools.test.ts
@@ -93,6 +93,7 @@ function applyRuntimeToolsAllow<T extends { name: string }>(tools: T[], toolsAll
 }
 
 type OpenClawCodingTool = ReturnType<typeof createOpenClawCodingTools>[number];
+type OpenClawToolsOptions = NonNullable<Parameters<typeof createOpenClawTools>[0]>;
 
 function toolNameList(tools: readonly { name: string }[]): string[] {
   return tools.map((tool) => tool.name);
@@ -113,6 +114,28 @@ function requireToolExecute(tool: OpenClawCodingTool): NonNullable<OpenClawCodin
   return tool.execute;
 }
 
+function latestCreateOpenClawToolsOptions(): OpenClawToolsOptions {
+  const calls = vi.mocked(createOpenClawTools).mock.calls;
+  const lastCall = calls.at(-1);
+  const options = lastCall?.[0];
+  if (!options) {
+    throw new Error("expected createOpenClawTools call");
+  }
+  return options;
+}
+
+function expectListIncludes(
+  list: readonly string[] | undefined,
+  expected: readonly string[],
+): void {
+  if (!list) {
+    throw new Error("expected string list");
+  }
+  for (const value of expected) {
+    expect(list.includes(value)).toBe(true);
+  }
+}
+
 describe("createOpenClawCodingTools", () => {
   const testConfig: OpenClawConfig = {};
 
@@ -129,9 +152,7 @@ describe("createOpenClawCodingTools", () => {
     const values = new Set<string>();
     collectActionValues(action, values);
 
-    expect([...values]).toEqual(
-      expect.arrayContaining(["restart", "config.get", "config.patch", "config.apply"]),
-    );
+    expectListIncludes([...values], ["restart", "config.get", "config.patch", "config.apply"]);
   });
 
   it("exposes only an explicitly authorized owner-only tool to non-owner sessions", () => {
@@ -193,11 +214,9 @@ describe("createOpenClawCodingTools", () => {
       runtimeToolAllowlist: ["memory_search", "memory_get"],
     });
 
-    expect(createOpenClawToolsMock).toHaveBeenCalledWith(
-      expect.objectContaining({
-        pluginToolAllowlist: expect.arrayContaining(["memory_search", "memory_get"]),
-      }),
-    );
+    expect(createOpenClawToolsMock).toHaveBeenCalledTimes(1);
+    const options = latestCreateOpenClawToolsOptions();
+    expectListIncludes(options.pluginToolAllowlist, ["memory_search", "memory_get"]);
   });
 
   it("passes source reply delivery mode to OpenClaw tool construction", () => {
@@ -210,11 +229,8 @@ describe("createOpenClawCodingTools", () => {
       sourceReplyDeliveryMode: "message_tool_only",
     });
 
-    expect(createOpenClawToolsMock).toHaveBeenCalledWith(
-      expect.objectContaining({
-        sourceReplyDeliveryMode: "message_tool_only",
-      }),
-    );
+    expect(createOpenClawToolsMock).toHaveBeenCalledTimes(1);
+    expect(latestCreateOpenClawToolsOptions().sourceReplyDeliveryMode).toBe("message_tool_only");
   });
 
   it("skips unrelated tool families when construction is planned from a narrow allowlist", () => {
@@ -258,11 +274,8 @@ describe("createOpenClawCodingTools", () => {
       },
     });
 
-    expect(createOpenClawToolsMock).toHaveBeenCalledWith(
-      expect.objectContaining({
-        disablePluginTools: true,
-      }),
-    );
+    expect(createOpenClawToolsMock).toHaveBeenCalledTimes(1);
+    expect(latestCreateOpenClawToolsOptions().disablePluginTools).toBe(true);
   });
 
   it("keeps plugin-only construction off the OpenClaw core factory", () => {
@@ -293,11 +306,11 @@ describe("createOpenClawCodingTools", () => {
       config: { tools: { alsoAllow: ["lobster"] } },
     });
 
-    expect(createOpenClawToolsMock).toHaveBeenCalledWith(
-      expect.objectContaining({
-        pluginToolAllowlist: ["lobster", DEFAULT_PLUGIN_TOOLS_ALLOWLIST_ENTRY],
-      }),
-    );
+    expect(createOpenClawToolsMock).toHaveBeenCalledTimes(1);
+    expect(latestCreateOpenClawToolsOptions().pluginToolAllowlist).toStrictEqual([
+      "lobster",
+      DEFAULT_PLUGIN_TOOLS_ALLOWLIST_ENTRY,
+    ]);
   });
 
   it("passes explicit denylist entries to OpenClaw tool factory planning", () => {
@@ -308,11 +321,8 @@ describe("createOpenClawCodingTools", () => {
       config: { tools: { deny: ["pdf"] } },
     });
 
-    expect(createOpenClawToolsMock).toHaveBeenCalledWith(
-      expect.objectContaining({
-        pluginToolDenylist: expect.arrayContaining(["pdf"]),
-      }),
-    );
+    expect(createOpenClawToolsMock).toHaveBeenCalledTimes(1);
+    expectListIncludes(latestCreateOpenClawToolsOptions().pluginToolDenylist, ["pdf"]);
   });
 
   it("records core tool-prep stages for hot-path diagnostics", () => {
@@ -324,23 +334,21 @@ describe("createOpenClawCodingTools", () => {
       senderIsOwner: true,
     });
 
-    expect(stages).toEqual(
-      expect.arrayContaining([
-        "tool-policy",
-        "workspace-policy",
-        "base-coding-tools",
-        "shell-tools",
-        "openclaw-tools:test-helper",
-        "openclaw-tools",
-        "message-provider-policy",
-        "model-provider-policy",
-        "authorization-policy",
-        "schema-normalization",
-        "tool-hooks",
-        "abort-wrappers",
-        "deferred-followup-descriptions",
-      ]),
-    );
+    expectListIncludes(stages, [
+      "tool-policy",
+      "workspace-policy",
+      "base-coding-tools",
+      "shell-tools",
+      "openclaw-tools:test-helper",
+      "openclaw-tools",
+      "message-provider-policy",
+      "model-provider-policy",
+      "authorization-policy",
+      "schema-normalization",
+      "tool-hooks",
+      "abort-wrappers",
+      "deferred-followup-descriptions",
+    ]);
     expect(stages.indexOf("tool-policy")).toBeLessThan(stages.indexOf("workspace-policy"));
     expect(stages.indexOf("workspace-policy")).toBeLessThan(stages.indexOf("base-coding-tools"));
     expect(stages.indexOf("openclaw-tools:test-helper")).toBeLessThan(