@polka-codes/cli-shared 0.8.23 → 0.8.25

package/dist/index.js

@@ -27497,14 +27497,19 @@ import { join as join2 } from "node:path";
 class AiServiceBase {
   usageMeter;
   options;
+  #abortController;
   constructor(options) {
     this.options = options;
     this.usageMeter = options.usageMeter;
   }
+  abort() {
+    this.#abortController?.abort();
+  }
   async* send(systemPrompt, messages) {
     this.usageMeter.checkLimit();
     this.usageMeter.incrementMessageCount();
-    const stream = this.sendImpl(systemPrompt, messages);
+    this.#abortController = new AbortController;
+    const stream = this.sendImpl(systemPrompt, messages, this.#abortController.signal);
     for await (const chunk of stream) {
       switch (chunk.type) {
         case "usage":
@@ -27517,7 +27522,8 @@ class AiServiceBase {
   async request(systemPrompt, messages) {
     this.usageMeter.checkLimit();
     this.usageMeter.incrementMessageCount();
-    const stream = this.sendImpl(systemPrompt, messages);
+    this.#abortController = new AbortController;
+    const stream = this.sendImpl(systemPrompt, messages, this.#abortController.signal);
     const usage = {
       inputTokens: 0,
       outputTokens: 0,
@@ -31022,7 +31028,7 @@ class AnthropicService extends AiServiceBase {
       info: anthropicModels[id] ?? anthropicModels[anthropicDefaultModelId]
     };
   }
-  async* sendImpl(systemPrompt, messages) {
+  async* sendImpl(systemPrompt, messages, signal) {
     let stream;
     const modelId = this.model.id;
     const cacheControl = this.#options.enableCache ? { type: "ephemeral" } : undefined;
@@ -31080,7 +31086,7 @@ class AnthropicService extends AiServiceBase {
             return message;
           }),
           stream: true
-        });
+        }, { signal });
         break;
       }
       default: {
@@ -31091,7 +31097,7 @@ class AnthropicService extends AiServiceBase {
           system: [{ text: systemPrompt, type: "text" }],
           messages,
           stream: true
-        });
+        }, { signal });
         break;
       }
     }
@@ -36449,7 +36455,7 @@ class DeepSeekService extends AiServiceBase {
       info: deepSeekModels[id] ?? deepSeekModels[deepSeekDefaultModelId]
     };
   }
-  async* sendImpl(systemPrompt, messages) {
+  async* sendImpl(systemPrompt, messages, signal) {
     const openAiMessages = [
       { role: "system", content: systemPrompt },
       ...convertToOpenAiMessages(messages)
@@ -36461,7 +36467,7 @@ class DeepSeekService extends AiServiceBase {
       temperature: 0,
       stream: true,
       stream_options: { include_usage: true }
-    });
+    }, { signal });
     for await (const chunk of stream) {
       const delta = chunk.choices[0]?.delta;
       if (delta?.reasoning_content) {
@@ -36505,7 +36511,7 @@ class OllamaService extends AiServiceBase {
       info: openAiModelInfoSaneDefaults
     };
   }
-  async* sendImpl(systemPrompt, messages) {
+  async* sendImpl(systemPrompt, messages, signal) {
     const openAiMessages = [
       { role: "system", content: systemPrompt },
       ...convertToOpenAiMessages(messages)
@@ -36515,7 +36521,7 @@ class OllamaService extends AiServiceBase {
       messages: openAiMessages,
       temperature: 0,
       stream: true
-    });
+    }, { signal });
     for await (const chunk of stream) {
       const delta = chunk.choices[0]?.delta;
       if (delta?.content) {
@@ -36562,7 +36568,7 @@ class OpenRouterService extends AiServiceBase {
       this.#modelProviderInfo = data.data;
     });
   }
-  async* sendImpl(systemPrompt, messages) {
+  async* sendImpl(systemPrompt, messages, signal) {
     const openAiMessages = [
       { role: "system", content: systemPrompt },
       ...convertToOpenAiMessages(messages)
@@ -36622,7 +36628,7 @@ class OpenRouterService extends AiServiceBase {
       transforms: shouldApplyMiddleOutTransform ? ["middle-out"] : undefined,
       include_reasoning: true,
       ...reasoning
-    });
+    }, { signal });
     let genId;
     for await (const chunk of stream) {
       if ("error" in chunk) {
@@ -36876,7 +36882,7 @@ var getArray = (args, name, defaultValue) => {
   return [ret];
 };
 // ../core/src/tools/utils/replaceInFile.ts
-var replaceInFile = async (fileContent, diff) => {
+var replaceInFile = (fileContent, diff) => {
   const blockPattern = /<<<<<+ SEARCH>?\s*\r?\n([\s\S]*?)\r?\n=======[ \t]*\r?\n([\s\S]*?)\r?\n?>>>>>+ REPLACE/g;
   const blocks = [];
   for (let match = blockPattern.exec(diff);match !== null; match = blockPattern.exec(diff)) {
@@ -36921,14 +36927,32 @@ var replaceInFile = async (fileContent, diff) => {
       const startPos = endPos - strippedSearch.length;
       return content.slice(0, startPos) + replace + content.slice(endPos);
     }
-    throw new Error(`Could not find the following text in file:
-${search}`);
+    return null;
   };
   let updatedFile = fileContent;
+  let appliedCount = 0;
+  const totalCount = blocks.length;
   for (const { search, replace } of blocks) {
-    updatedFile = findAndReplace(updatedFile, search, replace);
+    const result = findAndReplace(updatedFile, search, replace);
+    if (result !== null) {
+      updatedFile = result;
+      appliedCount++;
+    }
   }
-  return updatedFile;
+  let status;
+  if (appliedCount === 0) {
+    status = "no_diff_applied";
+  } else if (appliedCount < totalCount) {
+    status = "some_diff_applied";
+  } else {
+    status = "all_diff_applied";
+  }
+  return {
+    content: updatedFile,
+    status,
+    appliedCount,
+    totalCount
+  };
 };
 // ../core/src/tools/askFollowupQuestion.ts
 var toolInfo = {
@@ -37623,14 +37647,26 @@ var handler8 = async (provider, args) => {
   if (fileContent == null) {
     return {
       type: "Error" /* Error */,
-      message: `<error><replace_in_file_path>${path}</replace_in_file_path><error_message>File not found</error_message></error>`
+      message: `<replace_in_file_result path="${path}" status="failed" message="File not found" />`
+    };
+  }
+  const result = replaceInFile(fileContent, diff);
+  if (result.status === "no_diff_applied") {
+    return {
+      type: "Error" /* Error */,
+      message: `<replace_in_file_result path="${path}" status="failed" message="Unable to apply changes" />`
+    };
+  }
+  await provider.writeFile(path, result.content);
+  if (result.status === "some_diff_applied") {
+    return {
+      type: "Reply" /* Reply */,
+      message: `<replace_in_file_result path="${path}" status="some_diff_applied" applied_count="${result.appliedCount}" total_count="${result.totalCount}" />`
     };
   }
-  const result = await replaceInFile(fileContent, diff);
-  await provider.writeFile(path, result);
   return {
     type: "Reply" /* Reply */,
-    message: `<replace_in_file_path>${path}</replace_in_file_path>`
+    message: `<replace_in_file_result path="${path}" status="all_diff_applied" />`
   };
 };
 var isAvailable8 = (provider) => {
@@ -38021,7 +38057,7 @@ var updateKnowledge_default = {
 // ../core/src/tools/writeToFile.ts
 var toolInfo11 = {
   name: "write_to_file",
-  description: "Request to write content to a file at the specified path. If the file exists, it will be overwritten with the provided content. If the file doesn't exist, it will be created. This tool will automatically create any directories needed to write the file. Ensure that the output content does not include incorrect escaped character patterns such as `&lt;` and `&gt;`.",
+  description: "Request to write content to a file at the specified path. If the file exists, it will be overwritten with the provided content. If the file doesn't exist, it will be created. This tool will automatically create any directories needed to write the file. Ensure that the output content does not include incorrect escaped character patterns such as `&lt;`, `&gt;`, or `&amp;`. Also ensure there is no unwanted CDATA tags in the content.",
   parameters: [
     {
       name: "path",
@@ -38072,7 +38108,10 @@ var handler11 = async (provider, args) => {
     };
   }
   const path = getString(args, "path");
-  const content = getString(args, "content");
+  let content = getString(args, "content");
+  const trimmedContent = content.trim();
+  if (trimmedContent.startsWith("<![CDATA[") && content.endsWith("]]>"))
+    content = trimmedContent.slice(9, -3);
   await provider.writeFile(path, content);
   return {
     type: "Reply" /* Reply */,
@@ -38631,12 +38670,27 @@ Ensure the opening and closing tags are correctly nested and closed, and that yo
 Avoid unnecessary text or symbols before or after the tool use.
 Avoid unnecessary escape characters or special characters.
 `,
-  toolResults: (tool, result) => `<tool_response>
-<tool_name>${tool}</tool_name>
-<tool_result>
-${result}
-</tool_result>
-</tool_response>`,
+  toolResults: (tool, result) => {
+    if (typeof result === "string") {
+      return [
+        {
+          type: "text",
+          text: `<tool_response name=${tool}>${result}</tool_response>`
+        }
+      ];
+    }
+    return [
+      {
+        type: "text",
+        text: `<tool_response name=${tool}>`
+      },
+      ...result,
+      {
+        type: "text",
+        text: "</tool_response>"
+      }
+    ];
+  },
   commandResult: (command, exitCode, stdout, stderr) => `<command>${command}</command>
 <command_exit_code>${exitCode}</command_exit_code>
 <command_stdout>
@@ -38654,6 +38708,7 @@ class AgentBase {
   handlers;
   #messages = [];
   #policies;
+  #aborted = false;
   constructor(name, ai, config) {
     this.ai = ai;
     if (config.agents && config.agents.length > 0) {
@@ -38685,6 +38740,10 @@ ${instance.prompt}`;
     this.config = config;
     this.#policies = policies;
   }
+  abort() {
+    this.#aborted = true;
+    this.ai.abort();
+  }
   get parameters() {
     return this.ai.options.parameters;
   }
@@ -38713,11 +38772,17 @@ ${instance.prompt}`;
   async#processLoop(userMessage) {
     let nextRequest = userMessage;
     while (true) {
+      if (this.#aborted) {
+        return { type: "Aborted" };
+      }
       if (this.ai.usageMeter.isLimitExceeded().result) {
         this.#callback({ kind: "UsageExceeded" /* UsageExceeded */, agent: this });
         return { type: "UsageExceeded" };
       }
       const response = await this.#request(nextRequest);
+      if (this.#aborted) {
+        return { type: "Aborted" };
+      }
       const resp = await this.#handleResponse(response);
       if (resp.type === "exit") {
         this.#callback({ kind: "EndTask" /* EndTask */, agent: this, exitReason: resp.reason });
@@ -38764,14 +38829,23 @@ ${instance.prompt}`;
           }
         }
       } catch (error) {
+        if (error instanceof Error && error.name === "AbortError") {
+          break;
+        }
         console.error("Error in stream:", error);
       }
       if (currentAssistantMessage) {
         break;
       }
+      if (this.#aborted) {
+        break;
+      }
       console.debug(`Retrying request ${i2 + 1} of ${retryCount}`);
     }
     if (!currentAssistantMessage) {
+      if (this.#aborted) {
+        return [];
+      }
       throw new Error("No assistant message received");
     }
     this.#messages.push({
@@ -38800,23 +38874,26 @@ ${instance.prompt}`;
             await this.#callback({ kind: "ToolUse" /* ToolUse */, agent: this, tool: content.name });
             const toolResp = await this.#invokeTool(content.name, content.params);
             switch (toolResp.type) {
-              case "Reply" /* Reply */:
+              case "Reply" /* Reply */: {
                 await this.#callback({ kind: "ToolReply" /* ToolReply */, agent: this, tool: content.name });
                 toolResponses.push({ type: "response", tool: content.name, response: toolResp.message });
                 break;
+              }
               case "Exit" /* Exit */:
                 if (toolResponses.length > 0) {
                   break outer;
                 }
                 return { type: "exit", reason: toolResp };
-              case "Invalid" /* Invalid */:
+              case "Invalid" /* Invalid */: {
                 await this.#callback({ kind: "ToolInvalid" /* ToolInvalid */, agent: this, tool: content.name });
                 toolResponses.push({ type: "response", tool: content.name, response: toolResp.message });
                 break outer;
-              case "Error" /* Error */:
+              }
+              case "Error" /* Error */: {
                 await this.#callback({ kind: "ToolError" /* ToolError */, agent: this, tool: content.name });
                 toolResponses.push({ type: "response", tool: content.name, response: toolResp.message });
                 break outer;
+              }
               case "Interrupted" /* Interrupted */:
                 await this.#callback({ kind: "ToolInterrupted" /* ToolInterrupted */, agent: this, tool: content.name });
                 return { type: "exit", reason: toolResp };
@@ -38866,9 +38943,7 @@ ${instance.prompt}`;
     if (toolResponses.length === 0) {
       return { type: "reply", message: responsePrompts.requireUseTool };
     }
-    const finalResp = toolResponses.filter((resp) => resp.type === "response").map(({ tool, response: response2 }) => responsePrompts.toolResults(tool, response2)).join(`
-
-`);
+    const finalResp = toolResponses.filter((resp) => resp.type === "response").flatMap(({ tool, response: response2 }) => responsePrompts.toolResults(tool, response2));
     return { type: "reply", message: finalResp };
   }
   async#invokeTool(name, args) {
@@ -39091,6 +39166,7 @@ class MultiAgent {
           case "Delegate" /* Delegate */:
             console.warn("Unexpected exit reason", delegateResult);
             break;
+          case "Aborted":
           case "Interrupted" /* Interrupted */:
             return delegateResult;
           case "Exit" /* Exit */:
@@ -39098,6 +39174,7 @@ class MultiAgent {
         }
         return delegateResult;
       }
+      case "Aborted":
       case "Interrupted" /* Interrupted */:
       case "Exit" /* Exit */:
         this.#agents.pop();
@@ -39130,6 +39207,11 @@ class MultiAgent {
   get hasActiveAgent() {
     return this.#agents.length > 0;
   }
+  abort() {
+    if (this.hasActiveAgent) {
+      this.#agents[this.#agents.length - 1].abort();
+    }
+  }
 }
 // ../core/node_modules/zod/lib/index.mjs
 var util;
@@ -49576,11 +49658,13 @@ var chalkStderr = createChalk({ level: stderrColor ? stderrColor.level : 0 });
 var source_default = chalk;
 
 // src/utils/eventHandler.ts
+var toolCallStats = new Map;
 var printEvent = (verbose, usageMeter) => {
   let hadReasoning = false;
   return (event) => {
     switch (event.kind) {
       case "StartTask" /* StartTask */:
+        toolCallStats.clear();
         if (verbose > 1) {
           console.log(`
 ====== System Prompt ======
@@ -49597,7 +49681,28 @@ ${event.systemPrompt}`);
 ======== New Request ========
 `);
         if (verbose) {
-          console.log(event.userMessage);
+          const { userMessage } = event;
+          if (typeof userMessage === "string") {
+            console.log(userMessage);
+          } else {
+            for (const content of userMessage) {
+              if (content.type === "text") {
+                console.log(content.text);
+              } else if (content.type === "image") {
+                if (content.source.type === "base64") {
+                  console.log(source_default.yellow(`[Image content: ${content.source.media_type}]`));
+                } else if (content.source.type === "url") {
+                  console.log(source_default.yellow(`[Image content from URL: ${content.source.url}]`));
+                } else {
+                  console.log(source_default.red("[Unknown image source type]"));
+                  console.log(content.source);
+                }
+              } else {
+                console.log(source_default.red("[Unknown content type]"));
+                console.log(content);
+              }
+            }
+          }
           console.log(`
 
 ======== Request Message Ended ========
@@ -49629,12 +49734,27 @@ ${event.systemPrompt}`);
         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);
+        }
         break;
       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);
+        }
         break;
       case "ToolInterrupted" /* ToolInterrupted */:
         break;
@@ -49680,6 +49800,24 @@ ${event.systemPrompt}`);
             console.log("Interrupted Message:", event.exitReason.message);
             break;
         }
+        console.log(`
+
+======== Tool Call Stats ========`);
+        if (toolCallStats.size > 0) {
+          const tableData = [...toolCallStats.entries()].map(([tool2, stats]) => {
+            const successRate = stats.calls > 0 ? stats.success / stats.calls * 100 : 0;
+            return {
+              "Tool Name": tool2,
+              Calls: stats.calls,
+              Success: stats.success,
+              Errors: stats.errors,
+              "Success Rate": `${successRate.toFixed(2)}%`
+            };
+          });
+          console.table(tableData);
+        } else {
+          console.log("No tools were called.");
+        }
         break;
     }
   };

package/package.json

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