@polka-codes/cli-shared 0.8.24 → 0.8.26

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++;
+    }
+  }
+  let status;
+  if (appliedCount === 0) {
+    status = "no_diff_applied";
+  } else if (appliedCount < totalCount) {
+    status = "some_diff_applied";
+  } else {
+    status = "all_diff_applied";
   }
-  return updatedFile;
+  return {
+    content: updatedFile,
+    status,
+    appliedCount,
+    totalCount
+  };
 };
 // ../core/src/tools/askFollowupQuestion.ts
 var toolInfo = {
@@ -37623,14 +37647,30 @@ 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">
+  <file_content path="${path}">${fileContent}</file_content>
+</replace_in_file_result>`
+    };
+  }
+  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}">
+  <file_content path="${path}">${result.content}</file_content>
+</replace_in_file_result>`
     };
   }
-  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) => {
@@ -38672,6 +38712,7 @@ class AgentBase {
   handlers;
   #messages = [];
   #policies;
+  #aborted = false;
   constructor(name, ai, config) {
     this.ai = ai;
     if (config.agents && config.agents.length > 0) {
@@ -38703,6 +38744,10 @@ ${instance.prompt}`;
     this.config = config;
     this.#policies = policies;
   }
+  abort() {
+    this.#aborted = true;
+    this.ai.abort();
+  }
   get parameters() {
     return this.ai.options.parameters;
   }
@@ -38731,11 +38776,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 });
@@ -38782,14 +38833,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({
@@ -39110,6 +39170,7 @@ class MultiAgent {
           case "Delegate" /* Delegate */:
             console.warn("Unexpected exit reason", delegateResult);
             break;
+          case "Aborted":
           case "Interrupted" /* Interrupted */:
             return delegateResult;
           case "Exit" /* Exit */:
@@ -39117,6 +39178,7 @@ class MultiAgent {
         }
         return delegateResult;
       }
+      case "Aborted":
       case "Interrupted" /* Interrupted */:
       case "Exit" /* Exit */:
         this.#agents.pop();
@@ -39149,6 +39211,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;
@@ -49595,11 +49662,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 ======
@@ -49616,7 +49685,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 ========
@@ -49648,12 +49738,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;
@@ -49699,6 +49804,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.24",
+  "version": "0.8.26",
   "license": "AGPL-3.0",
   "author": "github@polka.codes",
   "type": "module",