fix(agents): validate extension tool names

vincentkoc · vincentkoc · commit f372abd07e42 · 2026-06-01T18:27:09.000+02:00
diff --git a/src/agents/sessions/extensions/loader.test.ts b/src/agents/sessions/extensions/loader.test.ts
@@ -43,4 +43,75 @@ export default async function(api) {
     expect(result.extensions).toHaveLength(1);
     expect(result.extensions[0]?.commands.has("sdk-subpath-probe")).toBe(true);
   });
+
+  it("rejects extension tools without a readable non-empty string name", async () => {
+    const dir = await mkdtemp(join(tmpdir(), "openclaw-extension-tool-name-"));
+    tempDirs.push(dir);
+    const extensionPath = join(dir, "extension.ts");
+    await writeFile(
+      extensionPath,
+      `
+export default async function(api) {
+  api.registerTool({
+    name: 123,
+    label: "Broken",
+    description: "broken",
+    parameters: { type: "object", properties: {} },
+    async execute() {
+      return { content: [], details: {} };
+    },
+  });
+}
+`,
+    );
+
+    const result = await loadExtensions([extensionPath], dir);
+
+    expect(result.extensions).toEqual([]);
+    expect(result.errors).toEqual([
+      {
+        path: extensionPath,
+        error:
+          "Failed to load extension: Extension tool registration requires a non-empty string name; received 123",
+      },
+    ]);
+  });
+
+  it("rejects extension tools whose name accessor throws", async () => {
+    const dir = await mkdtemp(join(tmpdir(), "openclaw-extension-tool-name-"));
+    tempDirs.push(dir);
+    const extensionPath = join(dir, "extension.ts");
+    await writeFile(
+      extensionPath,
+      `
+export default async function(api) {
+  const tool = {
+    label: "Broken",
+    description: "broken",
+    parameters: { type: "object", properties: {} },
+    async execute() {
+      return { content: [], details: {} };
+    },
+  };
+  Object.defineProperty(tool, "name", {
+    get() {
+      throw new Error("tool name getter exploded");
+    },
+  });
+  api.registerTool(tool);
+}
+`,
+    );
+
+    const result = await loadExtensions([extensionPath], dir);
+
+    expect(result.extensions).toEqual([]);
+    expect(result.errors).toEqual([
+      {
+        path: extensionPath,
+        error:
+          "Failed to load extension: Extension tool registration requires a readable tool name: tool name getter exploded",
+      },
+    ]);
+  });
 });
diff --git a/src/agents/sessions/extensions/loader.ts b/src/agents/sessions/extensions/loader.ts
@@ -148,6 +148,25 @@ function resolvePath(extPath: string, cwd: string): string {
 
 type HandlerFn = (...args: unknown[]) => Promise<unknown>;
 
+function readRegisteredToolName(tool: ToolDefinition): string {
+  let name: unknown;
+  try {
+    name = tool.name;
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    throw new Error(
+      `Extension tool registration requires a readable tool name: ${message || "unknown error"}`,
+      { cause: error },
+    );
+  }
+  if (typeof name !== "string" || name.trim().length === 0) {
+    throw new Error(
+      `Extension tool registration requires a non-empty string name; received ${JSON.stringify(name)}`,
+    );
+  }
+  return name;
+}
+
 /**
  * Create a runtime with throwing stubs for action methods.
  * Runner.bindCore() replaces these with real implementations.
@@ -226,7 +245,8 @@ function createExtensionAPI(
 
     registerTool(tool: ToolDefinition): void {
       runtime.assertActive();
-      extension.tools.set(tool.name, {
+      const name = readRegisteredToolName(tool);
+      extension.tools.set(name, {
         definition: tool,
         sourceInfo: extension.sourceInfo,
       });
