@polka-codes/cli-shared 0.9.8 → 0.9.10

package/dist/index.js

@@ -50694,7 +50694,17 @@ ${Object.entries(example.input).map(([name17, value]) => renderParameterValue(na
 `)}
 </${toolNamePrefix}${tool.name}>
 `;
-var toolUsePrompt = (tools, toolNamePrefix) => {
+var toolUsePrompt = (useNativeTool, tools, toolNamePrefix) => {
+  if (useNativeTool) {
+    return `
+====
+
+TOOL USE
+
+- You MUST use a tool.
+- Batch tool use when feasible; avoid redundant calls.
+`;
+  }
   if (tools.length === 0) {
     return "";
   }
@@ -51045,7 +51055,8 @@ ${instance.prompt}`;
         }
         if (requestTimeoutSeconds > 0 && requestAbortController) {
           timeout = setTimeout(() => {
-            console.debug(`Request timeout after ${requestTimeoutSeconds} seconds. Canceling current request attempt ${i + 1}/${retryCount}.`);
+            console.debug(`
+Request timeout after ${requestTimeoutSeconds} seconds. Canceling current request attempt ${i + 1}/${retryCount}.`);
             requestAbortController?.abort();
           }, requestTimeoutSeconds * 1000);
         }
@@ -51106,7 +51117,15 @@ ${instance.prompt}`;
         }
       }
       if (this.config.toolFormat === "native") {
-        if (respMessages.some((m) => m.role === "tool")) {
+        if (respMessages.some((m) => {
+          if (m.role === "tool") {
+            return true;
+          }
+          if (typeof m.content === "string") {
+            return true;
+          }
+          return m.content.some((part) => part.type === "tool-call" || part.type === "tool-result" || part.type === "text");
+        })) {
           break;
         }
       } else {
@@ -51118,7 +51137,8 @@ ${instance.prompt}`;
         break;
       }
       if (i < retryCount - 1) {
-        console.debug(`Retrying request ${i + 2} of ${retryCount}`);
+        console.debug(`
+Retrying request ${i + 2} of ${retryCount}`);
       }
     }
     if (respMessages.length === 0) {
@@ -51356,7 +51376,7 @@ You are the **Analyzer** agent, responsible for:
 5. **Documentation Assessment**: Review documentation quality and completeness.
 6. **Non-Modification**: Never modify code or files - focus solely on analysis.
 
-${useNativeTool ? "" : toolUsePrompt(tools, toolNamePrefix)}
+${toolUsePrompt(useNativeTool, tools, toolNamePrefix)}
 ${capabilities(toolNamePrefix)}
 ${systemInformation(info)}
 ${customInstructions(instructions)}
@@ -51477,7 +51497,7 @@ RETRY GUIDELINES
    - Report any partial improvements`;
 var fullSystemPrompt3 = (info, tools, toolNamePrefix, instructions, scripts, _interactive, useNativeTool) => `
 ${basePrompt}
-${useNativeTool ? "" : toolUsePrompt(tools, toolNamePrefix)}
+${toolUsePrompt(useNativeTool, tools, toolNamePrefix)}
 ${codeFixingStrategies}
 ${retryGuidelines}
 ${capabilities(toolNamePrefix)}
@@ -51676,7 +51696,7 @@ You solve the user's task by working in small, verifiable steps.
 `;
 var fullSystemPrompt4 = (info, tools, toolNamePrefix, instructions, scripts, useNativeTool) => `
 ${basePrompt2}
-${useNativeTool ? "" : toolUsePrompt(tools, toolNamePrefix)}
+${toolUsePrompt(useNativeTool, tools, toolNamePrefix)}
 ${editingFilesPrompt(toolNamePrefix)}
 ${capabilities(toolNamePrefix)}
 ${rules(toolNamePrefix)}
@@ -58494,54 +58514,54 @@ var source_default = chalk;
 
 // src/utils/eventHandler.ts
 var toolCallStats = new Map;
-var printEvent = (verbose, usageMeter) => {
+var printEvent = (verbose, usageMeter, customConsole = console) => {
   let hadReasoning = false;
   return (event) => {
     switch (event.kind) {
       case "StartTask" /* StartTask */:
         toolCallStats.clear();
         if (verbose > 1) {
-          console.log(`
+          customConsole.log(`
 ====== System Prompt ======
 ${event.systemPrompt}`);
-          console.log(`
+          customConsole.log(`
 
 ================
 `);
         }
         break;
       case "StartRequest" /* StartRequest */:
-        console.log(`
+        customConsole.log(`
 
 ======== New Request ========
 `);
         if (verbose) {
           const userMessage = event.userMessage.content;
           if (typeof userMessage === "string") {
-            console.log(userMessage);
+            customConsole.log(userMessage);
           } else {
             for (const content of userMessage) {
               switch (content.type) {
                 case "text":
-                  console.log(content.text);
+                  customConsole.log(content.text);
                   break;
                 case "image":
                   if (content.image instanceof URL) {
-                    console.log(source_default.yellow(`[Image content from URL: ${content.image}]`));
+                    customConsole.log(source_default.yellow(`[Image content from URL: ${content.image}]`));
                   } else {
-                    console.log(source_default.yellow(`[Image content: ${content.mediaType}]`));
+                    customConsole.log(source_default.yellow(`[Image content: ${content.mediaType}]`));
                   }
                   break;
                 case "file":
-                  console.log(source_default.yellow(`[File name: ${content.filename}, type: ${content.mediaType}]`));
+                  customConsole.log(source_default.yellow(`[File name: ${content.filename}, type: ${content.mediaType}]`));
                   break;
                 case "tool-call":
-                  console.log(source_default.yellow(`[Tool call: ${content.toolName}]`));
+                  customConsole.log(source_default.yellow(`[Tool call: ${content.toolName}]`));
                   break;
                 case "tool-result":
-                  console.log(source_default.yellow(`[Tool result: ${content.toolName}]`));
+                  customConsole.log(source_default.yellow(`[Tool result: ${content.toolName}]`));
                   if (verbose > 0) {
-                    console.log(content.output);
+                    customConsole.log(content.output);
                   }
                   break;
                 case "reasoning":
@@ -58549,14 +58569,14 @@ ${event.systemPrompt}`);
               }
             }
           }
-          console.log(`
+          customConsole.log(`
 
 ======== Request Message Ended ========
 `);
         }
         break;
       case "EndRequest" /* EndRequest */:
-        console.log(`
+        customConsole.log(`
 
 ======== Request Ended ========
 `);
@@ -58567,6 +58587,9 @@ ${event.systemPrompt}`);
       case "Usage" /* Usage */:
         break;
       case "Text" /* Text */:
+        if (customConsole !== console) {
+          break;
+        }
         if (hadReasoning) {
           process.stdout.write(`
 
@@ -58576,11 +58599,14 @@ ${event.systemPrompt}`);
         process.stdout.write(event.newText);
         break;
       case "Reasoning" /* Reasoning */:
+        if (customConsole !== console) {
+          break;
+        }
         process.stdout.write(source_default.dim(event.newText));
         hadReasoning = true;
         break;
       case "ToolUse" /* ToolUse */: {
-        console.log(source_default.yellow(`
+        customConsole.log(source_default.yellow(`
 
 Tool use:`, event.tool), event.content);
         const stats = toolCallStats.get(event.tool) ?? { calls: 0, success: 0, errors: 0 };
@@ -58597,10 +58623,10 @@ Tool use:`, event.tool), event.content);
       case "ToolInvalid" /* ToolInvalid */:
         break;
       case "ToolError" /* ToolError */: {
-        console.error(source_default.red(`
+        customConsole.error(source_default.red(`
 
 Tool error:`, event.tool));
-        console.error(source_default.red(event.content));
+        customConsole.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);
@@ -58609,48 +58635,48 @@ Tool error:`, event.tool));
       case "ToolInterrupted" /* ToolInterrupted */:
         break;
       case "ToolHandOver" /* ToolHandOver */:
-        console.log(`
+        customConsole.log(`
 
 ======== Task Handed Over ========
 `);
-        console.log("Agent:", event.agentName);
-        console.log("Task:", event.task);
-        console.log("Context:", event.context);
-        console.log("Files:", event.files);
-        console.log();
+        customConsole.log("Agent:", event.agentName);
+        customConsole.log("Task:", event.task);
+        customConsole.log("Context:", event.context);
+        customConsole.log("Files:", event.files);
+        customConsole.log();
         break;
       case "ToolDelegate" /* ToolDelegate */:
-        console.log(`
+        customConsole.log(`
 
 ======== Task Delegated ========
 `);
-        console.log("Agent:", event.agentName);
-        console.log("Task:", event.task);
-        console.log("Context:", event.context);
-        console.log("Files:", event.files);
-        console.log();
+        customConsole.log("Agent:", event.agentName);
+        customConsole.log("Task:", event.task);
+        customConsole.log("Context:", event.context);
+        customConsole.log("Files:", event.files);
+        customConsole.log();
         break;
       case "UsageExceeded" /* UsageExceeded */:
-        console.log(`
+        customConsole.log(`
 
 ======= Usage Exceeded ========
 `);
         break;
       case "EndTask" /* EndTask */:
-        console.log(`
+        customConsole.log(`
 
 ======== Task Ended ========
 `);
-        console.log("Reason:", event.exitReason.type);
+        customConsole.log("Reason:", event.exitReason.type);
         switch (event.exitReason.type) {
           case "Exit" /* Exit */:
-            console.log("Exit Message:", event.exitReason.message);
+            customConsole.log("Exit Message:", event.exitReason.message);
             break;
           case "Interrupted" /* Interrupted */:
-            console.log("Interrupted Message:", event.exitReason.message);
+            customConsole.log("Interrupted Message:", event.exitReason.message);
             break;
         }
-        console.log(`
+        customConsole.log(`
 
 ======== Tool Call Stats ========`);
         if (toolCallStats.size > 0) {
@@ -58664,9 +58690,9 @@ Tool error:`, event.tool));
               "Success Rate": `${successRate.toFixed(2)}%`
             };
           });
-          console.table(tableData);
+          customConsole.table(tableData);
         } else {
-          console.log("No tools were called.");
+          customConsole.log("No tools were called.");
         }
         break;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polka-codes/cli-shared",
-  "version": "0.9.8",
+  "version": "0.9.10",
   "license": "AGPL-3.0",
   "author": "github@polka.codes",
   "type": "module",
@@ -17,7 +17,7 @@
     "build": "bun build src/index.ts --outdir dist --target node"
   },
   "dependencies": {
-    "@polka-codes/core": "0.9.6",
+    "@polka-codes/core": "0.9.8",
     "ignore": "^7.0.3",
     "lodash": "^4.17.21",
     "yaml": "^2.7.0",