@polka-codes/cli 0.8.23 → 0.8.25

package/dist/index.js

@@ -38447,20 +38447,25 @@ var {
   Help
 } = import__.default;
 // package.json
-var version = "0.8.23";
+var version = "0.8.25";
 
 // ../core/src/AiService/AiServiceBase.ts
 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":
@@ -38473,7 +38478,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,
@@ -41978,7 +41984,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;
@@ -42036,7 +42042,7 @@ class AnthropicService extends AiServiceBase {
             return message;
           }),
           stream: true
-        });
+        }, { signal });
         break;
       }
       default: {
@@ -42047,7 +42053,7 @@ class AnthropicService extends AiServiceBase {
           system: [{ text: systemPrompt, type: "text" }],
           messages,
           stream: true
-        });
+        }, { signal });
         break;
       }
     }
@@ -47405,7 +47411,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)
@@ -47417,7 +47423,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) {
@@ -47461,7 +47467,7 @@ class OllamaService extends AiServiceBase {
       info: openAiModelInfoSaneDefaults
     };
   }
-  async* sendImpl(systemPrompt, messages) {
+  async* sendImpl(systemPrompt, messages, signal) {
     const openAiMessages = [
       { role: "system", content: systemPrompt },
       ...convertToOpenAiMessages(messages)
@@ -47471,7 +47477,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) {
@@ -47518,7 +47524,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)
@@ -47578,7 +47584,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) {
@@ -47851,7 +47857,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)) {
@@ -47896,14 +47902,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 = {
@@ -48598,14 +48622,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) => {
@@ -49012,7 +49048,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",
@@ -49063,7 +49099,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 */,
@@ -49622,12 +49661,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>
@@ -49645,6 +49699,7 @@ class AgentBase {
   handlers;
   #messages = [];
   #policies;
+  #aborted = false;
   constructor(name, ai, config) {
     this.ai = ai;
     if (config.agents && config.agents.length > 0) {
@@ -49676,6 +49731,10 @@ ${instance.prompt}`;
     this.config = config;
     this.#policies = policies;
   }
+  abort() {
+    this.#aborted = true;
+    this.ai.abort();
+  }
   get parameters() {
     return this.ai.options.parameters;
   }
@@ -49704,11 +49763,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 });
@@ -49755,14 +49820,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({
@@ -49791,23 +49865,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 };
@@ -49857,9 +49934,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) {
@@ -50438,6 +50513,7 @@ class MultiAgent {
           case "Delegate" /* Delegate */:
             console.warn("Unexpected exit reason", delegateResult);
             break;
+          case "Aborted":
           case "Interrupted" /* Interrupted */:
             return delegateResult;
           case "Exit" /* Exit */:
@@ -50445,6 +50521,7 @@ class MultiAgent {
         }
         return delegateResult;
       }
+      case "Aborted":
       case "Interrupted" /* Interrupted */:
       case "Exit" /* Exit */:
         this.#agents.pop();
@@ -50477,6 +50554,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;
@@ -54535,27 +54617,26 @@ var prompt = `
 You are equipped with **Knowledge Management** capabilities:
 
 1. **What to capture**
-   • Public API of each file (public classes, functions, methods, parameters, return types).
-   • High-level description of each file's purpose.
-   • Invariants and assumptions that must always hold.
-   • Project or directory-specific coding patterns, styles, and architectural conventions.
-   • Rules (commenting, testing, documentation, security, etc.).
-   • Any other insight that a future contributor would find crucial.
+   - Public API of each file (public classes, functions, methods, parameters, return types).
+   - High-level description of each file's purpose.
+   - Invariants and assumptions that must always hold.
+   - Project or directory-specific coding patterns, styles, and architectural conventions.
+   - Any other insight that a future contributor would find crucial.
 
 2. **Where to store it**
-   • Save knowledge in a YAML file named \`knowledge.ai.yml\`.
-   • **Create the file in the repository root if it does not yet exist.**
-   • One file per directory.
+   - Save knowledge in a YAML file named \`knowledge.ai.yml\`.
+   - **Create the file in the repository root if it does not yet exist.**
+   - One file per directory.
      - The repository root file records knowledge that applies project-wide (e.g., service responsibilities, global patterns).
      - Each sub-directory keeps only the knowledge relevant to that directory or package.
-   • Use clear top-level keys such as \`description\`, \`files\`, \`rules\`.
+   - Use clear top-level keys such as \`description\`, \`files\`, \`rules\`.
 
 3. **When to update**
-   • **Default behaviour:** only create / update knowledge for the files you actively read, create, or modify during the current task.
+   - **Default behaviour:** only create / update knowledge for the files you actively read, create, or modify during the current task.
      - Operate on other files **only if the user explicitly requests it**.
-   • **While working**: after reading, analysing, creating, or modifying code, immediately record any new or changed knowledge.
-   • **On refactor / deletion**: locate and delete or amend obsolete entries so that knowledge never drifts from the codebase.
-   • **Granularity**: update only the affected directory's \`knowledge.ai.yml\`, except when the change has global impact.
+   - **While working**: after reading, analysing, creating, or modifying code, immediately record any new or changed knowledge.
+   - **On refactor / deletion**: locate and delete or amend obsolete entries so that knowledge never drifts from the codebase.
+   - **Granularity**: update only the affected directory's \`knowledge.ai.yml\`, except when the change has global impact.
 
 4. **How to format (illustrative)**
 \`\`\`yaml
@@ -54565,19 +54646,14 @@ files:
     description: "Numeric helpers for currency calculations"
     api:
       functions:
-        1:
-          name: "add"
-          params:
-            1: { name: "a", type: "number" }
-            2: { name: "b", type: "number" }
-          returns: "number"
+        1: add(a: number, b: number): number
 rules:
   1: "rules that apply to all files in this directory"
 \`\`\`
 
 5. **Source of truth**
-   • **Never invent knowledge.** Everything you record must be *directly derived* from existing code, comments, commit messages, or explicit user instructions.
-   • If a section has no confirmed content, omit it rather than guessing.
+   - **Never invent knowledge.** Everything you record must be *directly derived* from existing code, comments, commit messages, or explicit user instructions.
+   - If a section has no confirmed content, omit it rather than guessing.
 
 6. **Automatic context**
    When you are asked to read or modify a file, the orchestration layer will supply any existing knowledge for that path automatically. Use it, refine it, and keep it accurate.
@@ -54586,11 +54662,11 @@ rules:
    You can use the \`updateKnowledge\` tool to efficiently update knowledge files with smart merging capabilities.
 
 8. **Dictionary-First Format**
-   • **Always prefer dictionaries** for structured data.
-   • The **\`files\` section must be a dictionary keyed by file path** (e.g., \`"math.ts": {...}\`).
-   • For other lists (rules, functions, etc.), use numbered dictionaries.
-   • Arrays are allowed only when strict ordering is essential and dictionaries cannot express it.
-   • When removing items, refer to them by their numeric key or index; gaps are fine.
+   - **Always prefer dictionaries** for structured data.
+   - The **\`files\` section must be a dictionary keyed by file path** (e.g., \`"math.ts": {...}\`).
+   - For other lists (rules, functions, etc.), use numbered dictionaries.
+   - Arrays are allowed only when strict ordering is essential and dictionaries cannot express it.
+   - When removing items, refer to them by their numeric key or index; gaps are fine.
 
 Your workflow **must**:
    1. Detect knowledge deltas.
@@ -55204,6 +55280,12 @@ Available commands:
       }
     });
     this.#rl.on("SIGINT", () => {
+      if (this.#busy) {
+        console.log(`
+Aborting request...`);
+        this.#options.onInterrupt?.();
+        return;
+      }
       if (this.#isMultilineMode) {
         this.#isMultilineMode = false;
         this.#multilineBuffer = [];
@@ -61351,11 +61433,13 @@ var chalkStderr = createChalk({ level: stderrColor ? stderrColor.level : 0 });
 var source_default = chalk;
 
 // ../cli-shared/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 ======
@@ -61372,7 +61456,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 ========
@@ -61404,12 +61509,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;
@@ -61455,6 +61575,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;
     }
   };
@@ -61659,6 +61797,9 @@ ${fileList.join(`
   async continueTask(message) {
     return await this.multiAgent.continueTask(message);
   }
+  abort() {
+    this.multiAgent.abort();
+  }
   get hasActiveAgent() {
     return this.multiAgent.hasActiveAgent;
   }
@@ -61901,6 +62042,9 @@ var runChat = async (opts, command) => {
       console.log();
       runner.printUsage();
       process.exit(0);
+    },
+    onInterrupt: () => {
+      runner.abort();
     }
   });
 };

package/package.json

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