refactor: ♻️

Author: chezsmithy

extensions/cli/src/permissions/permissionChecker.ts

@@ -147,7 +147,9 @@ export function checkToolPermission(
   }
 
   // Check if tool has dynamic policy evaluation
-  const tool = ALL_BUILT_IN_TOOLS.find((t) => t.name === toolCall.name);
+  const tool = ALL_BUILT_IN_TOOLS.find(
+    (t) => t.function.name === toolCall.name,
+  );
   if (tool?.evaluateToolCallPolicy) {
     // Convert CLI permission to core policy
     const basePolicy = permissionPolicyToToolPolicy(basePermission);

extensions/cli/src/services/ToolPermissionService.ts

@@ -138,9 +138,9 @@ export class ToolPermissionService
       }));
       policies.push(...allowed);
       const specificBuiltInSet = new Set(specificBuiltIns);
-      const notMentioned = ALL_BUILT_IN_TOOLS.map((t) => t.name).filter(
-        (name) => !specificBuiltInSet.has(name),
-      );
+      const notMentioned = ALL_BUILT_IN_TOOLS.map(
+        (t) => t.function.name,
+      ).filter((name) => !specificBuiltInSet.has(name));
       const disallowed: ToolPermissionPolicy[] = notMentioned.map((tool) => ({
         tool,
         permission: "exclude",

extensions/cli/src/stream/streamChatResponse.helpers.ts

@@ -314,7 +314,9 @@ export async function preprocessStreamedToolCalls(
     const startTime = Date.now();
     try {
       const availableTools: Tool[] = await getAllAvailableTools(isHeadless);
-      const tool = availableTools.find((t) => t.name === toolCall.name);
+      const tool = availableTools.find(
+        (t) => t.function.name === toolCall.name,
+      );
       if (!tool) {
         throw new Error(`Tool ${toolCall.name} not found`);
       }

extensions/cli/src/tools/fetch.test.ts

@@ -136,14 +136,14 @@ describe("fetchTool", () => {
   });
 
   it("should have correct tool metadata", () => {
-    expect(fetchTool.name).toBe("Fetch");
-    expect(fetchTool.displayName).toBe("Fetch");
-    expect(fetchTool.description).toBe(
+    expect(fetchTool.function.name).toBe("Fetch");
+    expect(fetchTool.displayTitle).toBe("Fetch");
+    expect(fetchTool.function.description).toBe(
       "Fetches content from a URL, converts to markdown, and handles long content with truncation",
     );
     expect(fetchTool.readonly).toBe(true);
     expect(fetchTool.isBuiltIn).toBe(true);
-    expect(fetchTool.parameters).toEqual({
+    expect(fetchTool.function.parameters).toEqual({
       type: "object",
       required: ["url"],
       properties: {

extensions/cli/src/tools/writeChecklist.test.ts

@@ -12,12 +12,12 @@ describe("writeChecklistTool", () => {
   });
 
   it("should have correct tool properties", () => {
-    expect(writeChecklistTool.name).toBe("Checklist");
-    expect(writeChecklistTool.displayName).toBe("Checklist");
+    expect(writeChecklistTool.function.name).toBe("Checklist");
+    expect(writeChecklistTool.displayTitle).toBe("Checklist");
     expect(writeChecklistTool.readonly).toBe(false);
     expect(writeChecklistTool.isBuiltIn).toBe(true);
-    expect(writeChecklistTool.parameters.required?.includes("checklist")).toBe(
-      true,
-    );
+    expect(
+      writeChecklistTool.function.parameters?.required?.includes("checklist"),
+    ).toBe(true);
   });
 });