@polka-codes/cli-shared 0.9.23 → 0.9.25

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 });
@@ -62568,7 +62590,7 @@ var toolInfo15 = {
       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."),
+    file: exports_external.string().describe("Get the diff for a specific file."),
     contextLines: exports_external.coerce.number().optional().default(5).describe("Number of context lines to include around changes."),
     includeLineNumbers: exports_external.preprocess((val) => {
       if (typeof val === "string") {
@@ -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 {
@@ -62665,42 +62687,58 @@ var prompt5 = `
 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.
+- **ONLY review the actual changes shown in the diff.** Do not comment on existing code that wasn't modified.
+- **ONLY run git_diff on files that are reviewable source/config files** per the "File Selection for git_diff" rules below. Do not pass excluded files to git_diff.
+
+## File Selection for git_diff
+Use <file_status> to decide which files to diff. Include only files likely to contain human-authored source or meaningful configuration.
+
+Include (run git_diff):
+- Application/source code
+- UI/templates/assets code
+- Infra/config that affects behavior
+
+Exclude (do NOT run git_diff; do not review):
+- Lockfiles
+- Generated/build artifacts & deps
+- Test artifacts/snapshots
+- Data and fixtures
+- Binary/media/minified/maps
 
 ## 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 with contextLines: 5 and includeLineNumbers: true
-  - **Local changes**: diff staged or unstaged files using the git_diff tool with contextLines: 5 and includeLineNumbers: true
-- The diff will include line number annotations: [Line N] for additions and [Line N removed] for deletions
-- If a pull request is present you may receive:
+- For each included file, **use git_diff** to inspect the actual code changes:
+  - **Pull request:** use the provided commit range for the git_diff tool with contextLines: 5 and includeLineNumbers: true, but only surface and review the included files.
+  - **Local changes:** diff staged or unstaged included files using git_diff with contextLines: 5 and includeLineNumbers: true.
+- The diff will include line number annotations: [Line N] for additions and [Line N removed] for deletions.
+- 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.
+- Use <file_status> to understand which files were modified, added, deleted, or renamed and to apply the inclusion/exclusion rules above.
 
 ## Line Number Reporting
-- **IMPORTANT**: Use the line numbers from the annotations in the diff output
-- For additions: Look for [Line N] annotations after the + lines
-- For deletions: Look for [Line N removed] annotations after the - lines
-- For modifications: Report the line number of the new/current code (from [Line N] annotations)
-- Report single lines as "N" and ranges as "N-M"
+- Use the line numbers from the annotations in the diff output.
+- For additions: use the number from the [Line N] annotation after the + line.
+- For deletions: use the number from the [Line N removed] annotation after the - line.
+- For modifications: report the line number of the new/current code (from [Line N]).
+- Report single lines as "N" and ranges as "N-M".
 
 ## Review Guidelines
 Focus exclusively on the changed lines (+ additions, - deletions, modified lines):
-- **Specific issues**: Point to exact problems in the changed code with accurate line references from the annotations
-- **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
+- **Specific issues:** Point to exact problems in the changed code with accurate line references from the annotations.
+- **Actionable fixes:** Provide concrete solutions, not vague suggestions.
+- **Clear reasoning:** Explain why each issue matters and how to fix it.
+- **Avoid generic advice** unless directly tied to a specific problem visible 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
+- Files excluded by the "File Selection for git_diff" rules (do not diff or comment on them).
+- Existing unchanged code.
+- Overall project structure/architecture unless directly impacted by the 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.
+Do not include praise or positive feedback.
 Only include reviews for actual issues found in the changed code.
 
 Return your review as a JSON object inside a \`\`\`json block, wrapped like:
@@ -62708,7 +62746,7 @@ Return your review as a JSON object inside a \`\`\`json block, wrapped like:
 <tool_parameter_result>
 \`\`\`json
 {
-  "overview": "Summary of specific issues found in the diff changes, or 'No issues found' if the changes look good.",
+  "overview": "Summary of specific issues found in the diff changes, 'No issues found', or 'No reviewable changes' if all modified files were excluded.",
   "specificReviews": [
     {
       "file": "path/filename.ext",
@@ -69059,7 +69097,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 +69115,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.25",
   "license": "AGPL-3.0",
   "author": "github@polka.codes",
   "type": "module",