@polka-codes/cli-shared 0.9.23 → 0.9.24

package/dist/index.js

@@ -61403,13 +61403,14 @@ Retrying request ${i + 2} of ${retryCount}`);
       return resp;
     };
     let hasPause = false;
+    const toolUseContents = response.filter((c) => c.type === "tool_use");
     outer:
       for (const content of response) {
         switch (content.type) {
           case "text":
             break;
           case "tool_use": {
-            await this.#callback({ kind: "ToolUse" /* ToolUse */, agent: this, tool: content.name, content: content.params });
+            await this.#callback({ kind: "ToolUse" /* ToolUse */, agent: this, tool: content.name, params: content.params });
             const toolResp = await this.#invokeTool(content.name, content.params);
             switch (toolResp.type) {
               case "Reply" /* Reply */: {
@@ -61418,52 +61419,73 @@ Retrying request ${i + 2} of ${retryCount}`);
                 break;
               }
               case "Exit" /* Exit */:
+              case "HandOver" /* HandOver */:
+              case "Delegate" /* Delegate */: {
+                if (this.config.toolFormat === "native" && toolUseContents.length > 1) {
+                  const message = {
+                    type: "Error" /* Error */,
+                    message: {
+                      type: "error-text",
+                      value: `Error: The tool '${content.name}' must be called alone, but it was called with other tools.`
+                    },
+                    canRetry: false
+                  };
+                  await this.#callback({ kind: "ToolError" /* ToolError */, agent: this, tool: content.name, error: message });
+                  toolResponses.push({
+                    type: "response",
+                    tool: content.name,
+                    response: processResponse(message.message),
+                    id: content.id
+                  });
+                  break;
+                }
                 if (toolResponses.length > 0) {
                   break outer;
                 }
-                return { type: "exit", reason: toolResp };
+                if (toolResp.type === "Exit" /* Exit */) {
+                  return { type: "exit", reason: toolResp };
+                }
+                if (toolResp.type === "HandOver" /* HandOver */) {
+                  await this.#callback({
+                    kind: "ToolHandOver" /* ToolHandOver */,
+                    agent: this,
+                    tool: content.name,
+                    agentName: toolResp.agentName,
+                    task: toolResp.task,
+                    context: toolResp.context,
+                    files: toolResp.files
+                  });
+                  return { type: "exit", reason: toolResp };
+                }
+                if (toolResp.type === "Delegate" /* Delegate */) {
+                  await this.#callback({
+                    kind: "ToolDelegate" /* ToolDelegate */,
+                    agent: this,
+                    tool: content.name,
+                    agentName: toolResp.agentName,
+                    task: toolResp.task,
+                    context: toolResp.context,
+                    files: toolResp.files
+                  });
+                  return { type: "exit", reason: toolResp };
+                }
+                break;
+              }
               case "Invalid" /* Invalid */: {
                 await this.#callback({ kind: "ToolInvalid" /* ToolInvalid */, agent: this, tool: content.name, content: toolResp.message });
                 toolResponses.push({ type: "response", tool: content.name, response: processResponse(toolResp.message), id: content.id });
-                break outer;
-              }
-              case "Error" /* Error */: {
-                await this.#callback({ kind: "ToolError" /* ToolError */, agent: this, tool: content.name, content: toolResp.message });
-                toolResponses.push({ type: "response", tool: content.name, response: processResponse(toolResp.message), id: content.id });
-                break outer;
-              }
-              case "Interrupted" /* Interrupted */:
-                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) {
+                if (this.config.toolFormat !== "native") {
                   break outer;
                 }
-                await this.#callback({
-                  kind: "ToolHandOver" /* ToolHandOver */,
-                  agent: this,
-                  tool: content.name,
-                  agentName: toolResp.agentName,
-                  task: toolResp.task,
-                  context: toolResp.context,
-                  files: toolResp.files
-                });
-                return { type: "exit", reason: toolResp };
+                break;
               }
-              case "Delegate" /* Delegate */: {
-                if (toolResponses.length > 0) {
+              case "Error" /* Error */: {
+                await this.#callback({ kind: "ToolError" /* ToolError */, agent: this, tool: content.name, error: toolResp.message });
+                toolResponses.push({ type: "response", tool: content.name, response: processResponse(toolResp.message), id: content.id });
+                if (this.config.toolFormat !== "native") {
                   break outer;
                 }
-                await this.#callback({
-                  kind: "ToolDelegate" /* ToolDelegate */,
-                  agent: this,
-                  tool: content.name,
-                  agentName: toolResp.agentName,
-                  task: toolResp.task,
-                  context: toolResp.context,
-                  files: toolResp.files
-                });
-                return { type: "exit", reason: toolResp };
+                break;
               }
               case "Pause" /* Pause */: {
                 await this.#callback({ kind: "ToolPause" /* ToolPause */, agent: this, tool: content.name, object: toolResp.object });
@@ -62602,7 +62624,7 @@ var handler15 = async (provider2, args) => {
     commandParts.push(commitRange);
   }
   if (file3) {
-    commandParts.push("--", file3);
+    commandParts.push("--", `'${file3}'`);
   }
   const command = commandParts.join(" ");
   try {
@@ -69059,7 +69081,7 @@ ${event.systemPrompt}`);
       case "ToolUse" /* ToolUse */: {
         customConsole.log(source_default.yellow(`
 
-Tool use:`, event.tool), event.content);
+Tool use:`, event.tool), event.params);
         const stats = toolCallStats.get(event.tool) ?? { calls: 0, success: 0, errors: 0 };
         stats.calls++;
         toolCallStats.set(event.tool, stats);
@@ -69077,7 +69099,7 @@ Tool use:`, event.tool), event.content);
         customConsole.error(source_default.red(`
 
 Tool error:`, event.tool));
-        customConsole.error(source_default.red(event.content));
+        customConsole.error(event.error);
         const stats = toolCallStats.get(event.tool) ?? { calls: 0, success: 0, errors: 0 };
         stats.errors++;
         toolCallStats.set(event.tool, stats);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polka-codes/cli-shared",
-  "version": "0.9.23",
+  "version": "0.9.24",
   "license": "AGPL-3.0",
   "author": "github@polka.codes",
   "type": "module",