@polka-codes/core 0.9.2 → 0.9.4

package/dist/index.js

@@ -55,35 +55,27 @@ var toolInfo = {
   description: "Call this when vital details are missing. Pose each follow-up as one direct, unambiguous question. If it speeds the reply, add up to five short, mutually-exclusive answer options. Group any related questions in the same call to avoid a back-and-forth chain.",
   parameters: z.object({
     questions: z.array(questionObject).describe("One or more follow-up questions you need answered before you can continue.").meta({ usageValue: "questions here" })
-  }),
-  examples: [
-    {
-      description: "Single clarifying question (no options)",
-      parameters: [
-        {
-          name: "questions",
-          value: { prompt: "What is the target deployment environment?" }
+  }).meta({
+    examples: [
+      {
+        description: "Single clarifying question (no options)",
+        input: {
+          questions: { prompt: "What is the target deployment environment?" }
         }
-      ]
-    },
-    {
-      description: "Single question with multiple-choice options",
-      parameters: [
-        {
-          name: "questions",
-          value: {
+      },
+      {
+        description: "Single question with multiple-choice options",
+        input: {
+          questions: {
             prompt: "Which frontend framework are you using?",
             options: ["React", "Angular", "Vue", "Svelte"]
           }
         }
-      ]
-    },
-    {
-      description: "Two related questions in one call",
-      parameters: [
-        {
-          name: "questions",
-          value: [
+      },
+      {
+        description: "Two related questions in one call",
+        input: {
+          questions: [
             { prompt: "What type of application are you building?" },
             {
               prompt: "Preferred programming language?",
@@ -91,21 +83,18 @@ var toolInfo = {
             }
           ]
         }
-      ]
-    },
-    {
-      description: "Binary (yes/no) confirmation",
-      parameters: [
-        {
-          name: "questions",
-          value: {
+      },
+      {
+        description: "Binary (yes/no) confirmation",
+        input: {
+          questions: {
             prompt: "Is it acceptable to refactor existing tests to improve performance?",
             options: ["Yes", "No"]
           }
         }
-      ]
-    }
-  ],
+      }
+    ]
+  }),
   permissionLevel: 0 /* None */
 };
 var handler = async (provider, args) => {
@@ -124,9 +113,9 @@ var handler = async (provider, args) => {
   }
   const answers = [];
   for (const question of questions) {
-    const { prompt: prompt5, options } = question;
-    const answer = await provider.askFollowupQuestion(prompt5, options);
-    answers.push(`<ask_followup_question_answer question="${prompt5}">
+    const { prompt: prompt6, options } = question;
+    const answer = await provider.askFollowupQuestion(prompt6, options);
+    answers.push(`<ask_followup_question_answer question="${prompt6}">
 ${answer}
 </ask_followup_question_answer>`);
   }
@@ -153,18 +142,16 @@ var toolInfo2 = {
     result: z2.string().describe(
       "The result of the task. Formulate this result in a way that is final and does not require further input from the user. Don't end your result with questions or offers for further assistance."
     ).meta({ usageValue: "Your final result description here" })
-  }),
-  examples: [
-    {
-      description: "Request to present the result of the task",
-      parameters: [
-        {
-          name: "result",
-          value: "Your final result description here"
+  }).meta({
+    examples: [
+      {
+        description: "Request to present the result of the task",
+        input: {
+          result: "Your final result description here"
         }
-      ]
-    }
-  ],
+      }
+    ]
+  }),
   permissionLevel: 0 /* None */
 };
 var handler2 = async (provider, args) => {
@@ -211,30 +198,19 @@ var toolInfo3 = {
       const values = Array.isArray(val) ? val : [val];
       return values.flatMap((i) => typeof i === "string" ? i.split(",") : []).filter((s) => s.length > 0);
     }, z3.array(z3.string())).optional().describe("The files relevant to the task. Comma separated paths").meta({ usageValue: "Relevant files" })
-  }),
-  examples: [
-    {
-      description: "Delegate a code analysis task to the analyzer agent",
-      parameters: [
-        {
-          name: "agentName",
-          value: "analyzer"
-        },
-        {
-          name: "task",
-          value: "Analyze the authentication implementation"
-        },
-        {
-          name: "context",
-          value: "Need to understand the security implications of the current auth system"
-        },
-        {
-          name: "files",
-          value: "src/auth/login.ts,src/auth/types.ts"
+  }).meta({
+    examples: [
+      {
+        description: "Delegate a code analysis task to the analyzer agent",
+        input: {
+          agentName: "analyzer",
+          task: "Analyze the authentication implementation",
+          context: "Need to understand the security implications of the current auth system",
+          files: "src/auth/login.ts,src/auth/types.ts"
         }
-      ]
-    }
-  ],
+      }
+    ]
+  }),
   permissionLevel: 0 /* None */
 };
 var handler3 = async (_provider, args) => {
@@ -280,16 +256,17 @@ var toolInfo4 = {
     }, z4.boolean().optional().default(false)).describe(
       "Set to `true` for commands that install/uninstall software, modify or delete files, change system settings, perform network operations, or have other side effects. Use `false` for safe, read-only, or purely local development actions (e.g., listing files, make a build, running tests)."
     ).meta({ usageValue: "true | false" })
+  }).meta({
+    examples: [
+      {
+        description: "Make a build",
+        input: {
+          command: "npm run build",
+          requiresApproval: "false"
+        }
+      }
+    ]
   }),
-  examples: [
-    {
-      description: "Make a build",
-      parameters: [
-        { name: "command", value: "npm run build" },
-        { name: "requiresApproval", value: "false" }
-      ]
-    }
-  ],
   permissionLevel: 3 /* Arbitrary */
 };
 var handler4 = async (provider, args) => {
@@ -348,36 +325,28 @@ var toolInfo5 = {
       const values = Array.isArray(val) ? val : [val];
       return values.flatMap((i) => typeof i === "string" ? i.split(",") : []).filter((s) => s.length > 0);
     }, z5.array(z5.string())).describe("One or more URLs to fetch, separated by commas if multiple.").meta({ usageValue: "url" })
-  }),
-  examples: [
-    {
-      description: "Fetch a single webpage",
-      parameters: [
-        {
-          name: "url",
-          value: "https://example.com"
+  }).meta({
+    examples: [
+      {
+        description: "Fetch a single webpage",
+        input: {
+          url: "https://example.com"
         }
-      ]
-    },
-    {
-      description: "Fetch multiple webpages",
-      parameters: [
-        {
-          name: "url",
-          value: "https://example.com,https://developer.mozilla.org/en-US/docs/Web/HTTP"
+      },
+      {
+        description: "Fetch multiple webpages",
+        input: {
+          url: "https://example.com,https://developer.mozilla.org/en-US/docs/Web/HTTP"
         }
-      ]
-    },
-    {
-      description: "Fetch a raw file from GitHub",
-      parameters: [
-        {
-          name: "url",
-          value: "https://raw.githubusercontent.com/user/repo/main/README.md"
+      },
+      {
+        description: "Fetch a raw file from GitHub",
+        input: {
+          url: "https://raw.githubusercontent.com/user/repo/main/README.md"
         }
-      ]
-    }
-  ],
+      }
+    ]
+  }),
   permissionLevel: 1 /* Read */
 };
 var handler5 = async (provider, args) => {
@@ -433,30 +402,19 @@ var toolInfo6 = {
       const values = Array.isArray(val) ? val : [val];
       return values.flatMap((i) => typeof i === "string" ? i.split(",") : []).filter((s) => s.length > 0);
     }, z6.array(z6.string())).optional().describe("The files relevant to the task. Comma separated paths").meta({ usageValue: "Relevant files" })
-  }),
-  examples: [
-    {
-      description: "Hand over a coding task to the coder agent",
-      parameters: [
-        {
-          name: "agentName",
-          value: "coder"
-        },
-        {
-          name: "task",
-          value: "Implement the login feature"
-        },
-        {
-          name: "context",
-          value: "We need a secure login system with email and password"
-        },
-        {
-          name: "files",
-          value: "src/auth/login.ts,src/auth/types.ts"
+  }).meta({
+    examples: [
+      {
+        description: "Hand over a coding task to the coder agent",
+        input: {
+          agentName: "coder",
+          task: "Implement the login feature",
+          context: "We need a secure login system with email and password",
+          files: "src/auth/login.ts,src/auth/types.ts"
         }
-      ]
-    }
-  ],
+      }
+    ]
+  }),
   permissionLevel: 0 /* None */
 };
 var handler6 = async (_provider, args) => {
@@ -501,22 +459,17 @@ var toolInfo7 = {
       }
       return val;
     }, z7.boolean().optional().default(true)).describe("Whether to list files recursively. Use true for recursive listing, false or omit for top-level only.").meta({ usageValue: "true or false (optional)" })
-  }),
-  examples: [
-    {
-      description: "Request to list files",
-      parameters: [
-        {
-          name: "path",
-          value: "src"
-        },
-        {
-          name: "maxCount",
-          value: "100"
+  }).meta({
+    examples: [
+      {
+        description: "Request to list files",
+        input: {
+          path: "src",
+          maxCount: "100"
         }
-      ]
-    }
-  ],
+      }
+    ]
+  }),
   permissionLevel: 1 /* Read */
 };
 var handler7 = async (provider, args) => {
@@ -557,27 +510,22 @@ var toolInfo8 = {
       const values = Array.isArray(val) ? val : [val];
       return values.flatMap((i) => typeof i === "string" ? i.split(",") : []).filter((s) => s.length > 0);
     }, z8.array(z8.string())).describe("The path of the file to read").meta({ usageValue: "Comma separated paths here" })
-  }),
-  examples: [
-    {
-      description: "Request to read the contents of a file",
-      parameters: [
-        {
-          name: "path",
-          value: "src/main.js"
+  }).meta({
+    examples: [
+      {
+        description: "Request to read the contents of a file",
+        input: {
+          path: "src/main.js"
         }
-      ]
-    },
-    {
-      description: "Request to read multiple files",
-      parameters: [
-        {
-          name: "path",
-          value: "src/main.js,src/index.js"
+      },
+      {
+        description: "Request to read multiple files",
+        input: {
+          path: "src/main.js,src/index.js"
         }
-      ]
-    }
-  ],
+      }
+    ]
+  }),
   permissionLevel: 1 /* Read */
 };
 var handler8 = async (provider, args) => {
@@ -623,18 +571,16 @@ var toolInfo9 = {
   description: "Request to remove a file at the specified path.",
   parameters: z9.object({
     path: z9.string().describe("The path of the file to remove").meta({ usageValue: "File path here" })
-  }),
-  examples: [
-    {
-      description: "Request to remove a file",
-      parameters: [
-        {
-          name: "path",
-          value: "src/main.js"
+  }).meta({
+    examples: [
+      {
+        description: "Request to remove a file",
+        input: {
+          path: "src/main.js"
         }
-      ]
-    }
-  ],
+      }
+    ]
+  }),
   permissionLevel: 2 /* Write */
 };
 var handler9 = async (provider, args) => {
@@ -675,22 +621,17 @@ var toolInfo10 = {
   parameters: z10.object({
     source_path: z10.string().describe("The current path of the file").meta({ usageValue: "Source file path here" }),
     target_path: z10.string().describe("The new path for the file").meta({ usageValue: "Target file path here" })
-  }),
-  examples: [
-    {
-      description: "Request to rename a file",
-      parameters: [
-        {
-          name: "source_path",
-          value: "src/old-name.js"
-        },
-        {
-          name: "target_path",
-          value: "src/new-name.js"
+  }).meta({
+    examples: [
+      {
+        description: "Request to rename a file",
+        input: {
+          source_path: "src/old-name.js",
+          target_path: "src/new-name.js"
         }
-      ]
-    }
-  ],
+      }
+    ]
+  }),
   permissionLevel: 2 /* Write */
 };
 var handler10 = async (provider, args) => {
@@ -825,18 +766,13 @@ Critical rules:
     * To move code: Use two SEARCH/REPLACE blocks (one to delete from original + one to insert at new location)
     * To delete code: Use empty REPLACE section`
     ).meta({ usageValue: "Search and replace blocks here" })
-  }),
-  examples: [
-    {
-      description: "Request to replace sections of content in a file",
-      parameters: [
-        {
-          name: "path",
-          value: "src/main.js"
-        },
-        {
-          name: "diff",
-          value: `<<<<<<< SEARCH
+  }).meta({
+    examples: [
+      {
+        description: "Request to replace sections of content in a file",
+        input: {
+          path: "src/main.js",
+          diff: `<<<<<<< SEARCH
 import React from 'react';
 =======
 import React, { useState } from 'react';
@@ -864,35 +800,23 @@ return (
   <div>
 >>>>>>> REPLACE`
         }
-      ]
-    },
-    {
-      description: "Request to perform a simple, single-line replacement",
-      parameters: [
-        {
-          name: "path",
-          value: "src/config.js"
-        },
-        {
-          name: "diff",
-          value: `<<<<<<< SEARCH
+      },
+      {
+        description: "Request to perform a simple, single-line replacement",
+        input: {
+          path: "src/config.js",
+          diff: `<<<<<<< SEARCH
 const API_URL = 'https://api.example.com';
 =======
 const API_URL = 'https://api.staging.example.com';
 >>>>>>> REPLACE`
         }
-      ]
-    },
-    {
-      description: "Request to add a new function to a file",
-      parameters: [
-        {
-          name: "path",
-          value: "src/utils.js"
-        },
-        {
-          name: "diff",
-          value: `<<<<<<< SEARCH
+      },
+      {
+        description: "Request to add a new function to a file",
+        input: {
+          path: "src/utils.js",
+          diff: `<<<<<<< SEARCH
 function helperA() {
   // ...
 }
@@ -906,18 +830,12 @@ function newHelper() {
 }
 >>>>>>> REPLACE`
         }
-      ]
-    },
-    {
-      description: "Request to delete a block of code from a file",
-      parameters: [
-        {
-          name: "path",
-          value: "src/app.js"
-        },
-        {
-          name: "diff",
-          value: `<<<<<<< SEARCH
+      },
+      {
+        description: "Request to delete a block of code from a file",
+        input: {
+          path: "src/app.js",
+          diff: `<<<<<<< SEARCH
 function oldFeature() {
   // This is no longer needed
 }
@@ -925,9 +843,9 @@ function oldFeature() {
 =======
 >>>>>>> REPLACE`
         }
-      ]
-    }
-  ],
+      }
+    ]
+  }),
   permissionLevel: 2 /* Write */
 };
 var handler11 = async (provider, args) => {
@@ -1001,26 +919,18 @@ var toolInfo12 = {
     ).meta({
       usageValue: "file pattern here (optional)"
     })
-  }),
-  examples: [
-    {
-      description: "Request to perform a regex search across files",
-      parameters: [
-        {
-          name: "path",
-          value: "src"
-        },
-        {
-          name: "regex",
-          value: "^components/"
-        },
-        {
-          name: "filePattern",
-          value: "*.ts,*.tsx"
+  }).meta({
+    examples: [
+      {
+        description: "Request to perform a regex search across files",
+        input: {
+          path: "src",
+          regex: "^components/",
+          filePattern: "*.ts,*.tsx"
         }
-      ]
-    }
-  ],
+      }
+    ]
+  }),
   permissionLevel: 1 /* Read */
 };
 var handler12 = async (provider, args) => {
@@ -1069,18 +979,13 @@ var toolInfo13 = {
     content: z13.string().describe(
       "The content to write to the file. ALWAYS provide the COMPLETE intended content of the file, without any truncation or omissions. You MUST include ALL parts of the file, even if they haven't been modified."
     ).meta({ usageValue: "Your file content here" })
-  }),
-  examples: [
-    {
-      description: "Request to write content to a file",
-      parameters: [
-        {
-          name: "path",
-          value: "src/main.js"
-        },
-        {
-          name: "content",
-          value: `import React from 'react';
+  }).meta({
+    examples: [
+      {
+        description: "Request to write content to a file",
+        input: {
+          path: "src/main.js",
+          content: `import React from 'react';
 
 function App() {
   return (
@@ -1093,9 +998,9 @@ function App() {
 export default App;
 `
         }
-      ]
-    }
-  ],
+      }
+    ]
+  }),
   permissionLevel: 2 /* Write */
 };
 var handler13 = async (provider, args) => {
@@ -1186,46 +1091,6 @@ var getAvailableTools = ({
   return tools;
 };
 
-// src/tool-v1-compat.ts
-import { z as z14 } from "zod";
-function zodSchemaToParameters(schema) {
-  const parameters = [];
-  const { shape } = schema;
-  for (const name in shape) {
-    const def = shape[name];
-    const isOptional = def.safeParse(void 0).success;
-    const description = def.description || "";
-    const param = {
-      name,
-      description,
-      required: !isOptional
-    };
-    const usageValue = def.meta()?.usageValue;
-    if (usageValue) {
-      param.usageValue = usageValue;
-    }
-    if (def instanceof z14.ZodObject) {
-      param.children = zodSchemaToParameters(def);
-    } else if (def instanceof z14.ZodArray) {
-      param.allowMultiple = true;
-      const element = def.element;
-      if (element instanceof z14.ZodObject) {
-        param.children = zodSchemaToParameters(element);
-      }
-    }
-    parameters.push(param);
-  }
-  return parameters;
-}
-function toToolInfoV1(tool) {
-  const { parameters: zodSchema, ...rest } = tool;
-  const v1Parameters = zodSchemaToParameters(zodSchema);
-  return {
-    ...rest,
-    parameters: v1Parameters
-  };
-}
-
 // src/UsageMeter.ts
 var UsageMeter = class {
   #totals = { input: 0, output: 0, cachedRead: 0, cost: 0 };
@@ -1371,7 +1236,54 @@ var UsageMeter = class {
 };
 
 // src/Agent/AgentBase.ts
-import { streamText } from "ai";
+import { jsonSchema, streamText } from "ai";
+import { camelCase } from "lodash";
+import { toJSONSchema } from "zod";
+
+// src/tool-v1-compat.ts
+import { z as z14 } from "zod";
+function zodSchemaToParameters(schema) {
+  const parameters = [];
+  const { shape } = schema;
+  for (const name in shape) {
+    const def = shape[name];
+    const isOptional = def.safeParse(void 0).success;
+    const description = def.description || "";
+    const param = {
+      name,
+      description,
+      required: !isOptional
+    };
+    const usageValue = def.meta()?.usageValue;
+    if (usageValue) {
+      param.usageValue = usageValue;
+    }
+    if (def instanceof z14.ZodObject) {
+      param.children = zodSchemaToParameters(def);
+    } else if (def instanceof z14.ZodArray) {
+      param.allowMultiple = true;
+      const element = def.element;
+      if (element instanceof z14.ZodObject) {
+        param.children = zodSchemaToParameters(element);
+      }
+    }
+    parameters.push(param);
+  }
+  return parameters;
+}
+function toToolInfoV1(tool) {
+  const { parameters: zodSchema, ...rest } = tool;
+  const v1Parameters = zodSchemaToParameters(zodSchema);
+  const examples = zodSchema.meta()?.examples;
+  const v1Tool = {
+    ...rest,
+    parameters: v1Parameters
+  };
+  if (examples) {
+    v1Tool.examples = examples;
+  }
+  return v1Tool;
+}
 
 // src/Agent/parseAssistantMessage.ts
 function parseNestedParameters(content, parameterPrefix, childrenParams) {
@@ -1543,7 +1455,7 @@ var toolInfoExamplesPrompt = (tool, example, toolNamePrefix, parameterPrefix) =>
 ## Example: ${example.description}
 
 <${toolNamePrefix}${tool.name}>
-${example.parameters.map((param) => `${renderParameterValue(param.name, param.value, parameterPrefix)}`).join("\n")}
+${Object.entries(example.input).map(([name, value]) => renderParameterValue(name, value, parameterPrefix)).join("\n")}
 </${toolNamePrefix}${tool.name}>
 `;
 var toolUsePrompt = (tools, toolNamePrefix) => {
@@ -1551,6 +1463,7 @@ var toolUsePrompt = (tools, toolNamePrefix) => {
     return "";
   }
   const parameterPrefix = `${toolNamePrefix}parameter_`;
+  const v1Tools = tools.map(toToolInfoV1);
   return `
 ====
 
@@ -1609,10 +1522,10 @@ Always adhere to this format, ensuring every opening tag has a matching closing
 NEVER surround tool use with triple backticks (\`\`\`).
 
 # Tools
-${tools.map((tool) => toolInfoPrompt(tool, toolNamePrefix, parameterPrefix)).join("\n")}
+${v1Tools.map((tool) => toolInfoPrompt(tool, toolNamePrefix, parameterPrefix)).join("\n")}
 
 # Tool Use Examples
-${tools.map((tool) => {
+${v1Tools.map((tool) => {
     let promp = "";
     for (const example of tool.examples ?? []) {
       promp += toolInfoExamplesPrompt(tool, example, toolNamePrefix, parameterPrefix);
@@ -1703,6 +1616,8 @@ e.g. <tool_tool_name>tool_name</tool_tool_name>
 Ensure the opening and closing tags are correctly nested and closed, and that you are using the correct tool name.
 Avoid unnecessary text or symbols before or after the tool use.
 Avoid unnecessary escape characters or special characters.
+`,
+  requireUseToolNative: `Error: No tool use detected. You MUST use a tool before proceeding.
 `,
   toolResults: (tool, result) => {
     if (typeof result === "string") {
@@ -1760,6 +1675,7 @@ var AgentBase = class {
   config;
   handlers;
   #policies;
+  #toolSet;
   #messages = [];
   #aborted = false;
   #abortController;
@@ -1797,6 +1713,20 @@ ${instance.prompt}`;
       role: "system",
       content: this.config.systemPrompt
     });
+    if (this.config.toolFormat === "native") {
+      const tools = {};
+      for (const tool of Object.values(this.handlers)) {
+        const toolName = camelCase(tool.name);
+        tools[toolName] = {
+          description: tool.description,
+          inputSchema: jsonSchema(toJSONSchema(tool.parameters))
+        };
+        this.handlers[toolName] = tool;
+      }
+      this.#toolSet = tools;
+    } else {
+      this.#toolSet = {};
+    }
   }
   abort() {
     this.#aborted = true;
@@ -1816,21 +1746,27 @@ ${instance.prompt}`;
   async #callback(event) {
     await this.config.callback?.(event);
   }
-  async start(prompt5) {
+  async start(prompt6) {
     this.#callback({ kind: "StartTask" /* StartTask */, agent: this, systemPrompt: this.config.systemPrompt });
-    return await this.#processLoop(prompt5);
+    return await this.#processLoop(prompt6);
   }
-  async step(prompt5) {
+  async step(prompt6) {
     if (this.#messages.length === 0) {
       this.#callback({ kind: "StartTask" /* StartTask */, agent: this, systemPrompt: this.config.systemPrompt });
     }
-    return await this.#request(prompt5);
+    return await this.#request({
+      role: "user",
+      content: prompt6
+    });
   }
   async handleStepResponse(response) {
     return this.#handleResponse(response);
   }
   async #processLoop(userMessage) {
-    let nextRequest = userMessage;
+    let nextRequest = {
+      role: "user",
+      content: userMessage
+    };
     while (true) {
       if (this.#aborted) {
         return { type: "Aborted" };
@@ -1859,10 +1795,7 @@ ${instance.prompt}`;
       throw new Error("userMessage is missing");
     }
     await this.#callback({ kind: "StartRequest" /* StartRequest */, agent: this, userMessage });
-    this.#messages.push({
-      role: "user",
-      content: userMessage
-    });
+    this.#messages.push(userMessage);
     for (const instance of this.#policies) {
       if (instance.onBeforeRequest) {
         await instance.onBeforeRequest(this);
@@ -1874,96 +1807,133 @@ ${instance.prompt}`;
         messages = await instance.prepareMessages(this, messages);
       }
     }
-    let currentAssistantMessage = "";
     const retryCount = this.config.retryCount ?? 5;
-    const requestTimeoutSeconds = this.config.requestTimeoutSeconds ?? 10;
+    const requestTimeoutSeconds = this.config.requestTimeoutSeconds ?? 90;
+    let respMessages = [];
     for (let i = 0; i < retryCount; i++) {
-      currentAssistantMessage = "";
+      if (this.#aborted) {
+        break;
+      }
+      respMessages = [];
       let timeout;
+      let requestAbortController;
+      requestAbortController = new AbortController();
+      this.#abortController = requestAbortController;
       const resetTimeout = () => {
         if (timeout) {
           clearTimeout(timeout);
         }
-        if (requestTimeoutSeconds > 0) {
+        if (requestTimeoutSeconds > 0 && requestAbortController) {
           timeout = setTimeout(() => {
-            console.debug(`No data received for ${requestTimeoutSeconds} seconds. Aborting request.`);
-            this.abort();
+            console.debug(
+              `Request timeout after ${requestTimeoutSeconds} seconds. Canceling current request attempt ${i + 1}/${retryCount}.`
+            );
+            requestAbortController?.abort();
           }, requestTimeoutSeconds * 1e3);
         }
       };
-      this.#abortController = new AbortController();
-      const providerOptions = {};
-      const thinkingBudgetTokens = this.config.parameters?.thinkingBudgetTokens;
-      const enableThinking = thinkingBudgetTokens > 0;
-      if (enableThinking) {
-        providerOptions.anthropic = {
-          thinking: { type: "enabled", budgetTokens: thinkingBudgetTokens }
-        };
-        providerOptions.openrouter = {
-          reasoning: {
-            max_tokens: thinkingBudgetTokens
-          }
-        };
-        providerOptions.google = {
-          thinkingConfig: {
-            includeThoughts: true,
-            thinkingBudget: thinkingBudgetTokens
-          }
-        };
-      }
       try {
-        const stream = streamText({
+        resetTimeout();
+        const streamTextOptions = {
           model: this.ai,
           messages,
-          providerOptions,
+          providerOptions: this.config.parameters?.providerOptions,
           onChunk: async ({ chunk }) => {
             resetTimeout();
             switch (chunk.type) {
               case "text":
-                currentAssistantMessage += chunk.text;
                 await this.#callback({ kind: "Text" /* Text */, agent: this, newText: chunk.text });
                 break;
               case "reasoning":
                 await this.#callback({ kind: "Reasoning" /* Reasoning */, agent: this, newText: chunk.text });
                 break;
+              case "tool-call":
+                break;
             }
           },
           onFinish: this.config.usageMeter.onFinishHandler(this.ai),
           onError: async (error) => {
             console.error("Error in stream:", error);
           },
-          abortSignal: this.#abortController.signal
+          abortSignal: requestAbortController.signal
+        };
+        if (this.config.toolFormat === "native") {
+          streamTextOptions.tools = this.#toolSet;
+        }
+        const stream = streamText(streamTextOptions);
+        await stream.consumeStream({
+          onError: (error) => {
+            console.error("Error in stream:", error);
+          }
         });
-        await stream.consumeStream();
+        const resp = await stream.response;
+        respMessages = resp.messages;
+        if (timeout) {
+          clearTimeout(timeout);
+          timeout = void 0;
+        }
       } catch (error) {
         if (error instanceof Error && error.name === "AbortError") {
-          break;
+          if (this.#aborted) {
+            break;
+          }
+          console.debug(`Request attempt ${i + 1} timed out, will retry`);
+        } else {
+          console.error("Error in stream:", error);
         }
-        console.error("Error in stream:", error);
       } finally {
         if (timeout) {
           clearTimeout(timeout);
         }
       }
-      if (currentAssistantMessage) {
+      if (respMessages.length > 0) {
         break;
       }
       if (this.#aborted) {
         break;
       }
-      console.debug(`Retrying request ${i + 1} of ${retryCount}`);
+      if (i < retryCount - 1) {
+        console.debug(`Retrying request ${i + 2} of ${retryCount}`);
+      }
     }
-    if (!currentAssistantMessage) {
+    if (respMessages.length === 0) {
       if (this.#aborted) {
         return [];
       }
-      throw new Error("No assistant message received");
+      throw new Error("No assistant message received after all retry attempts");
+    }
+    this.#messages.push(...respMessages);
+    if (this.config.toolFormat === "native") {
+      return respMessages.flatMap((msg) => {
+        if (msg.role === "assistant") {
+          const content = msg.content;
+          if (typeof content === "string") {
+            return [{ type: "text", content }];
+          }
+          return content.flatMap((part) => {
+            if (part.type === "text" || part.type === "reasoning") {
+              return [{ type: "text", content: part.text }];
+            }
+            if (part.type === "tool-call") {
+              return [{ type: "tool_use", id: part.toolCallId, name: part.toolName, params: part.input }];
+            }
+            return [];
+          });
+        }
+        return [];
+      });
     }
-    console.log("Assistant message:", currentAssistantMessage);
-    this.#messages.push({
-      role: "assistant",
-      content: currentAssistantMessage
-    });
+    const currentAssistantMessage = respMessages.map((msg) => {
+      if (typeof msg.content === "string") {
+        return msg.content;
+      }
+      return msg.content.map((part) => {
+        if (part.type === "text") {
+          return part.text;
+        }
+        return "";
+      });
+    }).join("\n");
     const ret = parseAssistantMessage(currentAssistantMessage, this.config.tools.map(toToolInfoV1), this.config.toolNamePrefix);
     await this.#callback({ kind: "EndRequest" /* EndRequest */, agent: this, message: currentAssistantMessage });
     return ret;
@@ -1976,12 +1946,12 @@ ${instance.prompt}`;
         case "text":
           break;
         case "tool_use": {
-          await this.#callback({ kind: "ToolUse" /* ToolUse */, agent: this, tool: content.name });
+          await this.#callback({ kind: "ToolUse" /* ToolUse */, agent: this, tool: content.name, content: content.params });
           const toolResp = await this.#invokeTool(content.name, content.params);
           switch (toolResp.type) {
             case "Reply" /* Reply */: {
-              await this.#callback({ kind: "ToolReply" /* ToolReply */, agent: this, tool: content.name });
-              toolResponses.push({ type: "response", tool: content.name, response: toolResp.message });
+              await this.#callback({ kind: "ToolReply" /* ToolReply */, agent: this, tool: content.name, content: toolResp.message });
+              toolResponses.push({ type: "response", tool: content.name, response: toolResp.message, id: content.id });
               break;
             }
             case "Exit" /* Exit */:
@@ -1990,17 +1960,17 @@ ${instance.prompt}`;
               }
               return { type: "exit", reason: toolResp };
             case "Invalid" /* Invalid */: {
-              await this.#callback({ kind: "ToolInvalid" /* ToolInvalid */, agent: this, tool: content.name });
-              toolResponses.push({ type: "response", tool: content.name, response: toolResp.message });
+              await this.#callback({ kind: "ToolInvalid" /* ToolInvalid */, agent: this, tool: content.name, content: toolResp.message });
+              toolResponses.push({ type: "response", tool: content.name, response: toolResp.message, id: content.id });
               break outer;
             }
             case "Error" /* Error */: {
-              await this.#callback({ kind: "ToolError" /* ToolError */, agent: this, tool: content.name });
-              toolResponses.push({ type: "response", tool: content.name, response: toolResp.message });
+              await this.#callback({ kind: "ToolError" /* ToolError */, agent: this, tool: content.name, content: toolResp.message });
+              toolResponses.push({ type: "response", tool: content.name, response: toolResp.message, id: content.id });
               break outer;
             }
             case "Interrupted" /* Interrupted */:
-              await this.#callback({ kind: "ToolInterrupted" /* ToolInterrupted */, agent: this, tool: content.name });
+              await this.#callback({ kind: "ToolInterrupted" /* ToolInterrupted */, agent: this, tool: content.name, content: toolResp.message });
               return { type: "exit", reason: toolResp };
             case "HandOver" /* HandOver */: {
               if (toolResponses.length > 0) {
@@ -2034,7 +2004,7 @@ ${instance.prompt}`;
             }
             case "Pause" /* Pause */: {
               await this.#callback({ kind: "ToolPause" /* ToolPause */, agent: this, tool: content.name, object: toolResp.object });
-              toolResponses.push({ type: "pause", tool: content.name, object: toolResp.object });
+              toolResponses.push({ type: "pause", tool: content.name, object: toolResp.object, id: content.id });
               hasPause = true;
             }
           }
@@ -2046,15 +2016,56 @@ ${instance.prompt}`;
       return { type: "exit", reason: { type: "Pause", responses: toolResponses } };
     }
     if (toolResponses.length === 0) {
-      return { type: "reply", message: responsePrompts.requireUseTool };
+      return {
+        type: "reply",
+        message: {
+          role: "user",
+          content: responsePrompts.requireUseToolNative
+        }
+      };
+    }
+    if (this.config.toolFormat === "native") {
+      const toolResults = toolResponses.filter((resp) => resp.type === "response").map(
+        (resp) => ({
+          type: "tool-result",
+          toolCallId: resp.id,
+          toolName: resp.tool,
+          output: {
+            type: "text",
+            value: resp.response
+          }
+        })
+      );
+      return {
+        type: "reply",
+        message: {
+          role: "tool",
+          content: toolResults
+        }
+      };
+    }
+    if (toolResponses.length === 0) {
+      return {
+        type: "reply",
+        message: {
+          role: "user",
+          content: responsePrompts.requireUseTool
+        }
+      };
     }
     const finalResp = toolResponses.filter((resp) => resp.type === "response").flatMap(({ tool, response: response2 }) => responsePrompts.toolResults(tool, response2));
-    return { type: "reply", message: finalResp };
+    return {
+      type: "reply",
+      message: {
+        role: "user",
+        content: finalResp
+      }
+    };
   }
   async #invokeTool(name, args) {
     try {
-      const handler14 = this.handlers[name]?.handler;
-      if (!handler14) {
+      const handler15 = this.handlers[name]?.handler;
+      if (!handler15) {
         return {
           type: "Error" /* Error */,
           message: responsePrompts.errorInvokeTool(name, "Tool not found"),
@@ -2073,7 +2084,7 @@ ${instance.prompt}`;
       if (resp) {
         return resp;
       }
-      return await handler14(this.config.provider, args);
+      return await handler15(this.config.provider, args);
     } catch (error) {
       return {
         type: "Error" /* Error */,
@@ -2130,12 +2141,12 @@ var AnalyzerAgent = class extends AgentBase {
       permissionLevel: 1 /* Read */,
       interactive: true
     });
-    const toolNamePrefix = "tool_";
+    const toolNamePrefix = options.toolFormat === "native" ? "" : "tool_";
     const systemPrompt = fullSystemPrompt(
       {
         os: options.os
       },
-      tools.map(toToolInfoV1),
+      tools,
       toolNamePrefix,
       options.customInstructions ?? [],
       options.scripts ?? {},
@@ -2226,12 +2237,12 @@ var ArchitectAgent = class extends AgentBase {
       permissionLevel: 1 /* Read */,
       interactive: true
     });
-    const toolNamePrefix = "tool_";
+    const toolNamePrefix = options.toolFormat === "native" ? "" : "tool_";
     const systemPrompt = fullSystemPrompt2(
       {
         os: options.os
       },
-      tools.map(toToolInfoV1),
+      tools,
       toolNamePrefix,
       options.customInstructions ?? [],
       options.scripts ?? {},
@@ -2355,12 +2366,12 @@ var CodeFixerAgent = class extends AgentBase {
       permissionLevel: 3 /* Arbitrary */,
       interactive: true
     });
-    const toolNamePrefix = "tool_";
+    const toolNamePrefix = options.toolFormat === "native" ? "" : "tool_";
     const systemPrompt = fullSystemPrompt3(
       {
         os: options.os
       },
-      tools.map(toToolInfoV1),
+      tools,
       toolNamePrefix,
       options.customInstructions ?? [],
       options.scripts ?? {},
@@ -2561,12 +2572,12 @@ var CoderAgent = class extends AgentBase {
       permissionLevel: 3 /* Arbitrary */,
       interactive: true
     });
-    const toolNamePrefix = "tool_";
+    const toolNamePrefix = options.toolFormat === "native" ? "" : "tool_";
     const systemPrompt = fullSystemPrompt4(
       {
         os: options.os
       },
-      tools.map(toToolInfoV1),
+      tools,
       toolNamePrefix,
       options.customInstructions ?? [],
       options.scripts ?? {},
@@ -2658,24 +2669,24 @@ var MultiAgent = class {
     switch (exitReason.type) {
       case "HandOver" /* HandOver */: {
         this.#agents.pop();
-        const prompt5 = await this.#config.getPrompt?.(
+        const prompt6 = await this.#config.getPrompt?.(
           exitReason.agentName,
           exitReason.task,
           exitReason.context,
           exitReason.files,
           this.#originalTask
         ) ?? exitReason.task;
-        return await this.#startTask(exitReason.agentName, prompt5);
+        return await this.#startTask(exitReason.agentName, prompt6);
       }
       case "Delegate" /* Delegate */: {
-        const prompt5 = await this.#config.getPrompt?.(
+        const prompt6 = await this.#config.getPrompt?.(
           exitReason.agentName,
           exitReason.task,
           exitReason.context,
           exitReason.files,
           this.#originalTask
         ) ?? exitReason.task;
-        const delegateResult = await this.#startTask(exitReason.agentName, prompt5);
+        const delegateResult = await this.#startTask(exitReason.agentName, prompt6);
         switch (delegateResult.type) {
           case "HandOver" /* HandOver */:
           case "Delegate" /* Delegate */:
@@ -3014,23 +3025,23 @@ var prompt = `You are an AiTool designed to assist users in creating new project
    - Create a .gitattributes file with appropriate configurations:
      - Mark lock files as generated and exclude them from diffs
      - Example for different package managers:
-       
+
        # For Bun
        bun.lock linguist-generated=true
        bun.lock -diff
-       
+
        # For npm
        package-lock.json linguist-generated=true
        package-lock.json -diff
-       
+
        # For Yarn
        yarn.lock linguist-generated=true
        yarn.lock -diff
-       
+
        # For pnpm
        pnpm-lock.yaml linguist-generated=true
        pnpm-lock.yaml -diff
-       
+
      - Include other common configurations as needed based on project type
 
 6. **Handover to Coder Agent:**
@@ -3286,6 +3297,199 @@ var generateProjectConfig_default = {
   agent: "analyzer"
 };
 
+// src/AiTool/tools/gitDiff.ts
+import { z as z16 } from "zod";
+var toolInfo14 = {
+  name: "git_diff",
+  description: "Get the git diff for the current repository. Can be used to get staged changes, unstaged changes, or changes between commits. By default, it returns unstaged changes.",
+  parameters: z16.object({
+    staged: z16.preprocess((val) => {
+      if (typeof val === "string") {
+        const lower = val.toLowerCase();
+        if (lower === "false") return false;
+        if (lower === "true") return true;
+      }
+      return val;
+    }, z16.boolean().optional().default(false)).describe("Get staged changes instead of unstaged changes."),
+    commitRange: z16.string().optional().describe('The commit range to get the diff for (e.g., "main...HEAD").'),
+    file: z16.string().optional().describe("Get the diff for a specific file.")
+  }),
+  permissionLevel: 1 /* Read */
+};
+var handler14 = async (provider, args) => {
+  if (!provider.executeCommand) {
+    return {
+      type: "Error" /* Error */,
+      message: "Not possible to execute command. Abort."
+    };
+  }
+  const { staged, file, commitRange } = toolInfo14.parameters.parse(args);
+  const commandParts = ["git", "diff", "--no-color"];
+  if (staged) {
+    commandParts.push("--staged");
+  }
+  if (commitRange) {
+    commandParts.push(commitRange);
+  }
+  if (file) {
+    commandParts.push("--", file);
+  }
+  const command = commandParts.join(" ");
+  try {
+    const result = await provider.executeCommand(command, false);
+    if (result.exitCode === 0) {
+      if (!result.stdout.trim()) {
+        return {
+          type: "Reply" /* Reply */,
+          message: "No diff found."
+        };
+      }
+      return {
+        type: "Reply" /* Reply */,
+        message: `<diff file="${file ?? "all"}">
+${result.stdout}
+</diff>`
+      };
+    }
+    return {
+      type: "Error" /* Error */,
+      message: `\`${command}\` exited with code ${result.exitCode}:
+${result.stderr}`
+    };
+  } catch (error) {
+    return {
+      type: "Error" /* Error */,
+      message: error instanceof Error ? error.message : String(error)
+    };
+  }
+};
+var isAvailable14 = (provider) => {
+  return !!provider.executeCommand;
+};
+var gitDiff_default = {
+  ...toolInfo14,
+  handler: handler14,
+  isAvailable: isAvailable14
+};
+
+// src/AiTool/reviewDiff.ts
+var prompt5 = `
+# Code Review Prompt
+
+You are a senior software engineer reviewing code changes.
+
+## Critical Instructions
+**ONLY review the actual changes shown in the diff.** Do not comment on existing code that wasn't modified.
+
+## Viewing Changes
+- **Use git_diff** to inspect the actual code changes for each relevant file.
+  - **Pull request**: use the provided commit range for the git_diff tool.
+  - **Local changes**: diff staged or unstaged files using the git_diff tool.
+- If a pull request is present you may receive:
+  - <pr_title>
+  - <pr_description>
+  - <commit_messages>
+- A <review_instructions> tag tells you the focus of the review.
+- File status information is provided in <file_status> - use this to understand which files were modified, added, deleted, or renamed.
+
+## Review Guidelines
+Focus exclusively on the changed lines (+ additions, - deletions, modified lines):
+- **Specific issues**: Point to exact problems in the changed code with line references
+- **Actionable fixes**: Provide concrete solutions, not vague suggestions
+- **Clear reasoning**: Explain why each issue matters and how to fix it
+- **Avoid generic advice**: No generic suggestions like "add more tests", "improve documentation", or "follow best practices" unless directly related to a specific problem in the diff
+
+## What NOT to review
+- Existing unchanged code
+- Overall project structure or architecture (unless directly impacted by changes)
+- Generic best practices unrelated to the specific changes
+- Missing features or functionality not part of this diff
+
+## Output Format
+Do **not** include praise or positive feedback. Ignore generated files such as lock files.
+Only include reviews for actual issues found in the changed code.
+
+Return your review as a JSON object inside a \`\`\`json block, wrapped like:
+<tool_attempt_completion>
+<tool_parameter_result>
+\`\`\`json
+{
+  "overview": "Summary of specific issues found in the diff changes, or 'No issues found' if the changes look good.",
+  "specificReviews": [
+    {
+      "file": "path/filename.ext",
+      "lines": "N or N-M",
+      "review": "Specific issue with the changed code and exact actionable fix."
+    }
+  ]
+}
+\`\`\`
+</tool_parameter_result>
+</tool_attempt_completion>
+`;
+var reviewDiff_default = {
+  name: "reviewDiff",
+  description: "Reviews a git diff",
+  prompt: prompt5,
+  formatInput: (params) => {
+    const parts = [];
+    if (params.pullRequestTitle) {
+      parts.push(`<pr_title>
+${params.pullRequestTitle}
+</pr_title>`);
+    }
+    if (params.pullRequestDescription) {
+      parts.push(`<pr_description>
+${params.pullRequestDescription}
+</pr_description>`);
+    }
+    if (params.commitMessages) {
+      parts.push(`<commit_messages>
+${params.commitMessages}
+</commit_messages>`);
+    }
+    if (params.changedFiles && params.changedFiles.length > 0) {
+      const fileList = params.changedFiles.map((file) => `${file.status}: ${file.path}`).join("\n");
+      parts.push(`<file_status>
+${fileList}
+</file_status>`);
+    }
+    let instructions = "";
+    if (params.commitRange) {
+      instructions = `Review the pull request. Use the git_diff tool with commit range '${params.commitRange}' to inspect the actual code changes. File status information is already provided above.`;
+    } else if (params.staged) {
+      instructions = "Review the staged changes. Use the git_diff tool with staged: true to inspect the actual code changes. File status information is already provided above.";
+    } else {
+      instructions = "Review the unstaged changes. Use the git_diff tool to inspect the actual code changes. File status information is already provided above.";
+    }
+    parts.push(`<review_instructions>
+${instructions}
+</review_instructions>`);
+    return parts.join("\n");
+  },
+  parseOutput: (output) => {
+    const jsonBlockRegex = /```json\n([\s\S]*?)\n```/;
+    const match = output.match(jsonBlockRegex);
+    const content = match ? match[1] : output;
+    try {
+      return JSON.parse(content);
+    } catch (error) {
+      console.error("Error parsing JSON output:", error);
+      return {
+        overview: `Could not parse review output. Raw output:
+${output}`,
+        specificReviews: []
+      };
+    }
+  },
+  agent: (options) => {
+    return new AnalyzerAgent({
+      ...options,
+      additionalTools: [gitDiff_default]
+    });
+  }
+};
+
 // src/AiTool/index.ts
 var executeTool = async (definition, ai, params, usageMeter) => {
   const resp = await generateText({
@@ -3301,10 +3505,7 @@ var executeTool = async (definition, ai, params, usageMeter) => {
   usageMeter.addUsage(ai, resp);
   return definition.parseOutput(resp.text);
 };
-var executeAgentTool = async (definition, agent, params) => {
-  if (!definition.agent) {
-    throw new Error("Agent not specified");
-  }
+var executeMultiAgentTool = async (definition, agent, params) => {
   const exitReason = await agent.startTask({
     agentName: definition.agent,
     task: definition.prompt,
@@ -3315,20 +3516,36 @@ var executeAgentTool = async (definition, agent, params) => {
   }
   throw new Error(`Tool execution failed: ${exitReason.type}`);
 };
+var executeAgentTool = async (definition, options, params) => {
+  const agent = definition.agent(options);
+  const exitReason = await agent.start(`${definition.prompt}
+
+${definition.formatInput(params)}`);
+  if (exitReason.type === "Exit" /* Exit */) {
+    return definition.parseOutput(exitReason.message);
+  }
+  throw new Error(`Tool execution failed: ${exitReason.type}`);
+};
 var makeTool = (definition) => {
   return async (ai, params, usageMeter) => {
     return executeTool(definition, ai, params, usageMeter);
   };
 };
-var makeAgentTool = (definition) => {
+var makeMultiAgentTool = (definition) => {
   return async (agent, params) => {
-    return executeAgentTool(definition, agent, params);
+    return executeMultiAgentTool(definition, agent, params);
+  };
+};
+var makeAgentTool = (definition) => {
+  return async (options, params) => {
+    return executeAgentTool(definition, options, params);
   };
 };
 var generateGitCommitMessage = makeTool(generateGitCommitMessage_default);
 var generateGithubPullRequestDetails = makeTool(generateGithubPullRequestDetails_default);
-var generateProjectConfig = makeAgentTool(generateProjectConfig_default);
-var createNewProject = makeAgentTool(createNewProject_default);
+var reviewDiff = makeAgentTool(reviewDiff_default);
+var generateProjectConfig = makeMultiAgentTool(generateProjectConfig_default);
+var createNewProject = makeMultiAgentTool(createNewProject_default);
 export {
   AgentBase,
   AnalyzerAgent,
@@ -3361,6 +3578,7 @@ export {
   delegate_default as delegate,
   executeAgentTool,
   executeCommand_default as executeCommand,
+  executeMultiAgentTool,
   executeTool,
   fetchUrl_default as fetchUrl,
   generateGitCommitMessage,
@@ -3370,6 +3588,7 @@ export {
   handOver_default as handOver,
   listFiles_default as listFiles,
   makeAgentTool,
+  makeMultiAgentTool,
   makeTool,
   parseAssistantMessage,
   readFile_default as readFile,
@@ -3378,6 +3597,7 @@ export {
   replaceInFile_default as replaceInFile,
   replaceInFile as replaceInFileHelper,
   responsePrompts,
+  reviewDiff,
   searchFiles_default as searchFiles,
   systemInformation,
   toolUsePrompt,