@polka-codes/cli-shared 0.9.2 → 0.9.4

package/dist/index.js

@@ -26789,35 +26789,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: exports_external.object({
     questions: exports_external.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?",
@@ -26825,21 +26817,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) => {
@@ -26884,18 +26873,16 @@ var toolInfo2 = {
   description: "Use this tool when you believe the user’s requested task is complete. Indicate that your work is finished, but acknowledge the user may still provide additional instructions or questions if they want to continue. This tool MUST NOT to be used with any other tool.",
   parameters: exports_external.object({
     result: exports_external.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) => {
@@ -26941,30 +26928,19 @@ var toolInfo3 = {
       const values = Array.isArray(val) ? val : [val];
       return values.flatMap((i) => typeof i === "string" ? i.split(",") : []).filter((s) => s.length > 0);
     }, exports_external.array(exports_external.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) => {
@@ -27008,16 +26984,17 @@ var toolInfo4 = {
       }
       return val;
     }, exports_external.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) => {
@@ -27075,36 +27052,28 @@ var toolInfo5 = {
       const values = Array.isArray(val) ? val : [val];
       return values.flatMap((i) => typeof i === "string" ? i.split(",") : []).filter((s) => s.length > 0);
     }, exports_external.array(exports_external.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) => {
@@ -27160,30 +27129,19 @@ var toolInfo6 = {
       const values = Array.isArray(val) ? val : [val];
       return values.flatMap((i) => typeof i === "string" ? i.split(",") : []).filter((s) => s.length > 0);
     }, exports_external.array(exports_external.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) => {
@@ -27228,22 +27186,17 @@ var toolInfo7 = {
       }
       return val;
     }, exports_external.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) => {
@@ -27284,27 +27237,22 @@ var toolInfo8 = {
       const values = Array.isArray(val) ? val : [val];
       return values.flatMap((i) => typeof i === "string" ? i.split(",") : []).filter((s) => s.length > 0);
     }, exports_external.array(exports_external.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) => {
@@ -27349,18 +27297,16 @@ var toolInfo9 = {
   description: "Request to remove a file at the specified path.",
   parameters: exports_external.object({
     path: exports_external.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) => {
@@ -27399,22 +27345,17 @@ var toolInfo10 = {
   parameters: exports_external.object({
     source_path: exports_external.string().describe("The current path of the file").meta({ usageValue: "Source file path here" }),
     target_path: exports_external.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) => {
@@ -27543,18 +27484,13 @@ Critical rules:
 4. Special operations:
     * 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';
@@ -27582,35 +27518,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() {
   // ...
 }
@@ -27624,18 +27548,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
 }
@@ -27643,9 +27561,9 @@ function oldFeature() {
 =======
 >>>>>>> REPLACE`
         }
-      ]
-    }
-  ],
+      }
+    ]
+  }),
   permissionLevel: 2 /* Write */
 };
 var handler11 = async (provider, args) => {
@@ -27713,26 +27631,18 @@ var toolInfo12 = {
     filePattern: exports_external.string().optional().describe('Comma-separated glob pattern to filter files (e.g., "*.ts" for TypeScript files or "*.ts,*.js" for both TypeScript and JavaScript files). If not provided, it will search all files (*).').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) => {
@@ -27778,18 +27688,13 @@ var toolInfo13 = {
   parameters: exports_external.object({
     path: exports_external.string().describe("The path of the file to write to").meta({ usageValue: "File path here" }),
     content: exports_external.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 (
@@ -27802,9 +27707,9 @@ function App() {
 export default App;
 `
         }
-      ]
-    }
-  ],
+      }
+    ]
+  }),
   permissionLevel: 2 /* Write */
 };
 var handler13 = async (provider, args) => {
@@ -27864,45 +27769,6 @@ var getAvailableTools = ({
   return tools;
 };
 
-// ../core/src/tool-v1-compat.ts
-function zodSchemaToParameters(schema) {
-  const parameters = [];
-  const { shape } = schema;
-  for (const name in shape) {
-    const def = shape[name];
-    const isOptional = def.safeParse(undefined).success;
-    const description = def.description || "";
-    const param = {
-      name,
-      description,
-      required: !isOptional
-    };
-    const usageValue = def.meta()?.usageValue;
-    if (usageValue) {
-      param.usageValue = usageValue;
-    }
-    if (def instanceof exports_external.ZodObject) {
-      param.children = zodSchemaToParameters(def);
-    } else if (def instanceof exports_external.ZodArray) {
-      param.allowMultiple = true;
-      const element = def.element;
-      if (element instanceof exports_external.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
-  };
-}
-
 // ../core/src/UsageMeter.ts
 class UsageMeter {
   #totals = { input: 0, output: 0, cachedRead: 0, cost: 0 };
@@ -50570,6 +50436,53 @@ var JSONRPCMessageSchema = exports_external2.union([
   JSONRPCErrorSchema
 ]);
 
+// ../core/src/Agent/AgentBase.ts
+var import_lodash = __toESM(require_lodash(), 1);
+
+// ../core/src/tool-v1-compat.ts
+function zodSchemaToParameters(schema) {
+  const parameters = [];
+  const { shape } = schema;
+  for (const name17 in shape) {
+    const def = shape[name17];
+    const isOptional = def.safeParse(undefined).success;
+    const description = def.description || "";
+    const param = {
+      name: name17,
+      description,
+      required: !isOptional
+    };
+    const usageValue = def.meta()?.usageValue;
+    if (usageValue) {
+      param.usageValue = usageValue;
+    }
+    if (def instanceof exports_external.ZodObject) {
+      param.children = zodSchemaToParameters(def);
+    } else if (def instanceof exports_external.ZodArray) {
+      param.allowMultiple = true;
+      const element = def.element;
+      if (element instanceof exports_external.ZodObject) {
+        param.children = zodSchemaToParameters(element);
+      }
+    }
+    parameters.push(param);
+  }
+  return parameters;
+}
+function toToolInfoV1(tool) {
+  const { parameters: zodSchema2, ...rest } = tool;
+  const v1Parameters = zodSchemaToParameters(zodSchema2);
+  const examples = zodSchema2.meta()?.examples;
+  const v1Tool = {
+    ...rest,
+    parameters: v1Parameters
+  };
+  if (examples) {
+    v1Tool.examples = examples;
+  }
+  return v1Tool;
+}
+
 // ../core/src/Agent/parseAssistantMessage.ts
 function parseNestedParameters(content, parameterPrefix, childrenParams) {
   const result = {};
@@ -50743,7 +50656,7 @@ var toolInfoExamplesPrompt = (tool, example, toolNamePrefix, parameterPrefix) =>
 ## Example: ${example.description}
 
 <${toolNamePrefix}${tool.name}>
-${example.parameters.map((param) => `${renderParameterValue(param.name, param.value, parameterPrefix)}`).join(`
+${Object.entries(example.input).map(([name17, value]) => renderParameterValue(name17, value, parameterPrefix)).join(`
 `)}
 </${toolNamePrefix}${tool.name}>
 `;
@@ -50752,6 +50665,7 @@ var toolUsePrompt = (tools, toolNamePrefix) => {
     return "";
   }
   const parameterPrefix = `${toolNamePrefix}parameter_`;
+  const v1Tools = tools.map(toToolInfoV1);
   return `
 ====
 
@@ -50810,11 +50724,11 @@ 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(`
+${v1Tools.map((tool) => toolInfoPrompt(tool, toolNamePrefix, parameterPrefix)).join(`
 `)}
 
 # Tool Use Examples
-${tools.map((tool) => {
+${v1Tools.map((tool) => {
     let promp = "";
     for (const example of tool.examples ?? []) {
       promp += toolInfoExamplesPrompt(tool, example, toolNamePrefix, parameterPrefix);
@@ -50907,6 +50821,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") {
@@ -50945,6 +50861,7 @@ class AgentBase {
   config;
   handlers;
   #policies;
+  #toolSet;
   #messages = [];
   #aborted = false;
   #abortController;
@@ -50982,6 +50899,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 = import_lodash.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;
@@ -51009,13 +50940,19 @@ ${instance.prompt}`;
     if (this.#messages.length === 0) {
       this.#callback({ kind: "StartTask" /* StartTask */, agent: this, systemPrompt: this.config.systemPrompt });
     }
-    return await this.#request(prompt);
+    return await this.#request({
+      role: "user",
+      content: prompt
+    });
   }
   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" };
@@ -51044,10 +50981,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);
@@ -51059,96 +50993,132 @@ ${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 * 1000);
         }
       };
-      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 (error81) => {
             console.error("Error in stream:", error81);
           },
-          abortSignal: this.#abortController.signal
+          abortSignal: requestAbortController.signal
+        };
+        if (this.config.toolFormat === "native") {
+          streamTextOptions.tools = this.#toolSet;
+        }
+        const stream = streamText(streamTextOptions);
+        await stream.consumeStream({
+          onError: (error81) => {
+            console.error("Error in stream:", error81);
+          }
         });
-        await stream.consumeStream();
+        const resp = await stream.response;
+        respMessages = resp.messages;
+        if (timeout) {
+          clearTimeout(timeout);
+          timeout = undefined;
+        }
       } catch (error81) {
         if (error81 instanceof Error && error81.name === "AbortError") {
-          break;
+          if (this.#aborted) {
+            break;
+          }
+          console.debug(`Request attempt ${i + 1} timed out, will retry`);
+        } else {
+          console.error("Error in stream:", error81);
         }
-        console.error("Error in stream:", error81);
       } 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");
     }
-    console.log("Assistant message:", currentAssistantMessage);
-    this.#messages.push({
-      role: "assistant",
-      content: currentAssistantMessage
-    });
+    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 [];
+      });
+    }
+    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(`
+`);
     const ret = parseAssistantMessage(currentAssistantMessage, this.config.tools.map(toToolInfoV1), this.config.toolNamePrefix);
     await this.#callback({ kind: "EndRequest" /* EndRequest */, agent: this, message: currentAssistantMessage });
     return ret;
@@ -51162,12 +51132,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 */:
@@ -51176,17 +51146,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) {
@@ -51220,7 +51190,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;
               }
             }
@@ -51232,10 +51202,49 @@ ${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(name17, args) {
     try {
@@ -51276,6 +51285,80 @@ ${instance.prompt}`;
   }
 }
 
+// ../core/src/Agent/AnalyzerAgent/prompts.ts
+var fullSystemPrompt = (info, tools, toolNamePrefix, instructions, scripts, useNativeTool) => `
+# Analyzer Agent
+
+## Role
+You are the **Analyzer** agent, responsible for:
+1. **Project Structure Analysis** – Understand codebase organization and architecture.
+2. **Code Pattern Analysis** – Identify common patterns, conventions, and best practices.
+3. **Dependency Analysis** – Examine project dependencies and their usage.
+4. **Workflow Analysis** – Understand development tools, scripts, and processes.
+5. **Documentation Review** – Analyze documentation and code comments.
+
+> **Note**: The **Analyzer** agent focuses on understanding and analyzing the codebase without making modifications. Your role is to provide insights and understanding that can inform development decisions.
+
+## Rules
+1. **Thoroughness**: Conduct comprehensive analysis of relevant project aspects.
+2. **Pattern Recognition**: Identify recurring patterns, conventions, and architectural decisions.
+3. **Dependency Mapping**: Track and understand relationships between components.
+4. **Workflow Understanding**: Analyze build processes, testing approaches, and development tools.
+5. **Documentation Assessment**: Review documentation quality and completeness.
+6. **Non-Modification**: Never modify code or files - focus solely on analysis.
+
+${useNativeTool ? "" : toolUsePrompt(tools, toolNamePrefix)}
+${capabilities(toolNamePrefix)}
+${systemInformation(info)}
+${customInstructions(instructions)}
+${customScripts(scripts)}
+`;
+
+// ../core/src/Agent/AnalyzerAgent/index.ts
+class AnalyzerAgent extends AgentBase {
+  constructor(options) {
+    const combinedTools = [...options.additionalTools ?? [], ...Object.values(exports_allTools)];
+    const tools = getAvailableTools({
+      provider: options.provider,
+      allTools: combinedTools,
+      hasAgent: (options.agents?.length ?? 0) > 0,
+      permissionLevel: 1 /* Read */,
+      interactive: true
+    });
+    const toolNamePrefix = options.toolFormat === "native" ? "" : "tool_";
+    const systemPrompt = fullSystemPrompt({
+      os: options.os
+    }, tools, toolNamePrefix, options.customInstructions ?? [], options.scripts ?? {}, options.toolFormat === "native");
+    super(analyzerAgentInfo.name, options.ai, {
+      systemPrompt,
+      tools,
+      toolNamePrefix,
+      provider: options.provider,
+      interactive: options.interactive,
+      agents: options.agents,
+      scripts: options.scripts,
+      callback: options.callback,
+      policies: options.policies,
+      toolFormat: options.toolFormat,
+      parameters: options.parameters ?? {},
+      usageMeter: options.usageMeter ?? new UsageMeter
+    });
+  }
+  onBeforeInvokeTool() {
+    return Promise.resolve(undefined);
+  }
+}
+var analyzerAgentInfo = {
+  name: "analyzer",
+  responsibilities: [
+    "Analyzing project structure and organization",
+    "Identifying key source code files and their relationships",
+    "Understanding common coding patterns and conventions",
+    "Examining development workflow and tooling",
+    "Analyzing dependencies and their usage patterns"
+  ]
+};
+
 // ../core/src/Agent/CodeFixerAgent/prompts.ts
 var basePrompt = `You are a highly skilled software engineer specializing in debugging and fixing code issues. You have extensive experience with:
 - Type systems and type checking
@@ -51365,10 +51448,10 @@ class CodeFixerAgent 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), toolNamePrefix, options.customInstructions ?? [], options.scripts ?? {}, options.interactive, options.toolFormat === "native");
+    }, tools, toolNamePrefix, options.customInstructions ?? [], options.scripts ?? {}, options.interactive, options.toolFormat === "native");
     super(codeFixerAgentInfo.name, options.ai, {
       systemPrompt,
       tools,
@@ -51614,23 +51697,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:**
@@ -51886,6 +51969,202 @@ var generateProjectConfig_default = {
   agent: "analyzer"
 };
 
+// ../core/src/AiTool/tools/gitDiff.ts
+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: exports_external.object({
+    staged: exports_external.preprocess((val) => {
+      if (typeof val === "string") {
+        const lower = val.toLowerCase();
+        if (lower === "false")
+          return false;
+        if (lower === "true")
+          return true;
+      }
+      return val;
+    }, exports_external.boolean().optional().default(false)).describe("Get staged changes instead of unstaged changes."),
+    commitRange: exports_external.string().optional().describe('The commit range to get the diff for (e.g., "main...HEAD").'),
+    file: exports_external.string().optional().describe("Get the diff for a specific file.")
+  }),
+  permissionLevel: 1 /* Read */
+};
+var handler14 = async (provider2, args) => {
+  if (!provider2.executeCommand) {
+    return {
+      type: "Error" /* Error */,
+      message: "Not possible to execute command. Abort."
+    };
+  }
+  const { staged, file: file3, commitRange } = toolInfo14.parameters.parse(args);
+  const commandParts = ["git", "diff", "--no-color"];
+  if (staged) {
+    commandParts.push("--staged");
+  }
+  if (commitRange) {
+    commandParts.push(commitRange);
+  }
+  if (file3) {
+    commandParts.push("--", file3);
+  }
+  const command = commandParts.join(" ");
+  try {
+    const result = await provider2.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="${file3 ?? "all"}">
+${result.stdout}
+</diff>`
+      };
+    }
+    return {
+      type: "Error" /* Error */,
+      message: `\`${command}\` exited with code ${result.exitCode}:
+${result.stderr}`
+    };
+  } catch (error81) {
+    return {
+      type: "Error" /* Error */,
+      message: error81 instanceof Error ? error81.message : String(error81)
+    };
+  }
+};
+var isAvailable14 = (provider2) => {
+  return !!provider2.executeCommand;
+};
+var gitDiff_default = {
+  ...toolInfo14,
+  handler: handler14,
+  isAvailable: isAvailable14
+};
+
+// ../core/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((file3) => `${file3.status}: ${file3.path}`).join(`
+`);
+      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(`
+`);
+  },
+  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 (error81) {
+      console.error("Error parsing JSON output:", error81);
+      return {
+        overview: `Could not parse review output. Raw output:
+${output}`,
+        specificReviews: []
+      };
+    }
+  },
+  agent: (options) => {
+    return new AnalyzerAgent({
+      ...options,
+      additionalTools: [gitDiff_default]
+    });
+  }
+};
+
 // ../core/src/AiTool/index.ts
 var executeTool = async (definition, ai, params, usageMeter) => {
   const resp = await generateText({
@@ -51901,10 +52180,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,
@@ -51915,22 +52191,38 @@ 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);
 // src/config.ts
-var import_lodash = __toESM(require_lodash(), 1);
+var import_lodash2 = __toESM(require_lodash(), 1);
 
 // node_modules/yaml/dist/index.js
 var composer = require_composer();
@@ -55841,7 +56133,7 @@ function mergeConfigs(configs) {
     return {};
   }
   const mergedConfig = configs.reduce((acc, config4) => {
-    const merged = import_lodash.merge({}, acc, config4);
+    const merged = import_lodash2.merge({}, acc, config4);
     let accRules = acc.rules ?? [];
     if (typeof accRules === "string") {
       accRules = [accRules];
@@ -56472,15 +56764,15 @@ function useKeypress(userHandler) {
   signal.current = userHandler;
   useEffect((rl) => {
     let ignore = false;
-    const handler14 = withUpdates((_input, event) => {
+    const handler15 = withUpdates((_input, event) => {
       if (ignore)
         return;
       signal.current(event, rl);
     });
-    rl.input.on("keypress", handler14);
+    rl.input.on("keypress", handler15);
     return () => {
       ignore = true;
-      rl.input.removeListener("keypress", handler14);
+      rl.input.removeListener("keypress", handler15);
     };
   }, []);
 }
@@ -56639,16 +56931,16 @@ class Emitter {
 
 class SignalExitBase {
 }
-var signalExitWrap = (handler14) => {
+var signalExitWrap = (handler15) => {
   return {
     onExit(cb, opts) {
-      return handler14.onExit(cb, opts);
+      return handler15.onExit(cb, opts);
     },
     load() {
-      return handler14.load();
+      return handler15.load();
     },
     unload() {
-      return handler14.unload();
+      return handler15.unload();
     }
   };
 };
@@ -56804,11 +57096,11 @@ class ScreenManager {
   render(content, bottomContent = "") {
     const promptLine = lastLine(content);
     const rawPromptLine = stripVTControlCharacters(promptLine);
-    let prompt5 = rawPromptLine;
+    let prompt6 = rawPromptLine;
     if (this.rl.line.length > 0) {
-      prompt5 = prompt5.slice(0, -this.rl.line.length);
+      prompt6 = prompt6.slice(0, -this.rl.line.length);
     }
-    this.rl.setPrompt(prompt5);
+    this.rl.setPrompt(prompt6);
     this.cursorPos = this.rl.getCursorPos();
     const width = readlineWidth();
     content = breakLines(content, width);
@@ -56878,7 +57170,7 @@ function getCallSites() {
 }
 function createPrompt(view) {
   const callSites = getCallSites();
-  const prompt5 = (config4, context = {}) => {
+  const prompt6 = (config4, context = {}) => {
     const { input = process.stdin, signal } = context;
     const cleanups = new Set;
     const output = new import_mute_stream.default;
@@ -56943,7 +57235,7 @@ function createPrompt(view) {
       }).then(() => promise4), { cancel });
     });
   };
-  return prompt5;
+  return prompt6;
 }
 // ../../node_modules/@inquirer/core/dist/esm/lib/Separator.js
 var import_yoctocolors_cjs2 = __toESM(require_yoctocolors_cjs(), 1);
@@ -57970,7 +58262,7 @@ ${event.systemPrompt}`);
 ======== New Request ========
 `);
         if (verbose) {
-          const { userMessage } = event;
+          const userMessage = event.userMessage.content;
           if (typeof userMessage === "string") {
             console.log(userMessage);
           } else {
@@ -57989,9 +58281,17 @@ ${event.systemPrompt}`);
                 case "file":
                   console.log(source_default.yellow(`[File name: ${content.filename}, type: ${content.mediaType}]`));
                   break;
-                default:
-                  console.log(source_default.red("[Unknown content type]"));
-                  console.log(content);
+                case "tool-call":
+                  console.log(source_default.yellow(`[Tool call: ${content.toolName}]`));
+                  break;
+                case "tool-result":
+                  console.log(source_default.yellow(`[Tool result: ${content.toolName}]`));
+                  if (verbose > 0) {
+                    console.log(content.output);
+                  }
+                  break;
+                case "reasoning":
+                  break;
               }
             }
           }
@@ -58025,29 +58325,33 @@ ${event.systemPrompt}`);
         process.stdout.write(source_default.dim(event.newText));
         hadReasoning = true;
         break;
-      case "ToolUse" /* ToolUse */:
-        {
-          const stats = toolCallStats.get(event.tool) ?? { calls: 0, success: 0, errors: 0 };
-          stats.calls++;
-          toolCallStats.set(event.tool, stats);
-        }
+      case "ToolUse" /* ToolUse */: {
+        console.log(source_default.yellow(`
+
+Tool use:`, event.tool), event.content);
+        const stats = toolCallStats.get(event.tool) ?? { calls: 0, success: 0, errors: 0 };
+        stats.calls++;
+        toolCallStats.set(event.tool, stats);
         break;
-      case "ToolReply" /* ToolReply */:
-        {
-          const stats = toolCallStats.get(event.tool) ?? { calls: 0, success: 0, errors: 0 };
-          stats.success++;
-          toolCallStats.set(event.tool, stats);
-        }
+      }
+      case "ToolReply" /* ToolReply */: {
+        const stats = toolCallStats.get(event.tool) ?? { calls: 0, success: 0, errors: 0 };
+        stats.success++;
+        toolCallStats.set(event.tool, stats);
         break;
+      }
       case "ToolInvalid" /* ToolInvalid */:
         break;
-      case "ToolError" /* ToolError */:
-        {
-          const stats = toolCallStats.get(event.tool) ?? { calls: 0, success: 0, errors: 0 };
-          stats.errors++;
-          toolCallStats.set(event.tool, stats);
-        }
+      case "ToolError" /* ToolError */: {
+        console.error(source_default.red(`
+
+Tool error:`, event.tool));
+        console.error(source_default.red(event.content));
+        const stats = toolCallStats.get(event.tool) ?? { calls: 0, success: 0, errors: 0 };
+        stats.errors++;
+        toolCallStats.set(event.tool, stats);
         break;
+      }
       case "ToolInterrupted" /* ToolInterrupted */:
         break;
       case "ToolHandOver" /* ToolHandOver */: