@polka-codes/core 0.8.23 → 0.8.25

package/dist/_tsup-dts-rollup.d.ts

@@ -8,19 +8,20 @@ declare abstract class AgentBase {
     protected readonly config: Readonly<AgentBaseConfig>;
     protected readonly handlers: Record<string, FullToolInfo>;
     constructor(name: string, ai: AiServiceBase, config: AgentBaseConfig);
+    abort(): void;
     get parameters(): Readonly<any>;
     get messages(): Readonly<MessageParam[]>;
     setMessages(messages: Readonly<MessageParam[]>): void;
-    start(prompt: string): Promise<ExitReason>;
-    step(prompt: string): Promise<AssistantMessageContent[]>;
+    start(prompt: UserContent): Promise<ExitReason>;
+    step(prompt: UserContent): Promise<AssistantMessageContent[]>;
     handleStepResponse(response: AssistantMessageContent[]): Promise<{
         type: "reply";
-        message: string;
+        message: UserContent;
     } | {
         type: "exit";
         reason: ExitReason;
     }>;
-    continueTask(userMessage: string): Promise<ExitReason>;
+    continueTask(userMessage: UserContent): Promise<ExitReason>;
     protected abstract onBeforeInvokeTool(name: string, args: Record<string, string>): Promise<ToolResponse | undefined>;
     get model(): {
         provider: string;
@@ -93,6 +94,7 @@ export { agentsPrompt as agentsPrompt_alias_1 }
 export { agentsPrompt as agentsPrompt_alias_2 }
 
 declare abstract class AiServiceBase {
+    #private;
     readonly usageMeter: UsageMeter;
     readonly options: AiServiceOptions;
     constructor(options: AiServiceOptions);
@@ -101,7 +103,8 @@ declare abstract class AiServiceBase {
         id: string;
         info: ModelInfo;
     };
-    abstract sendImpl(systemPrompt: string, messages: MessageParam[]): ApiStream;
+    abstract sendImpl(systemPrompt: string, messages: MessageParam[], signal: AbortSignal): ApiStream;
+    abort(): void;
     send(systemPrompt: string, messages: MessageParam[]): ApiStream;
     request(systemPrompt: string, messages: MessageParam[]): Promise<{
         response: string;
@@ -300,7 +303,7 @@ export declare class AnthropicService extends AiServiceBase {
         info: ModelInfo;
     };
     constructor(options: AiServiceOptions);
-    sendImpl(systemPrompt: string, messages: MessageParam[]): ApiStream;
+    sendImpl(systemPrompt: string, messages: MessageParam[], signal: AbortSignal): ApiStream;
 }
 
 declare type ApiStream = AsyncGenerator<ApiStreamChunk>;
@@ -795,7 +798,7 @@ export declare class DeepSeekService extends AiServiceBase {
         info: ModelInfo;
     };
     constructor(options: AiServiceOptions);
-    sendImpl(systemPrompt: string, messages: MessageParam[]): ApiStream;
+    sendImpl(systemPrompt: string, messages: MessageParam[], signal: AbortSignal): ApiStream;
 }
 
 declare const _default: {
@@ -1061,7 +1064,7 @@ export { _default_10 as updateKnowledge_alias_2 }
 declare const _default_11: {
     handler: ToolHandler<{
         readonly name: "write_to_file";
-        readonly 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;`.";
+        readonly 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.";
         readonly parameters: [{
             readonly name: "path";
             readonly description: "The path of the file to write to";
@@ -1087,7 +1090,7 @@ declare const _default_11: {
     }, FilesystemProvider>;
     isAvailable: (provider: FilesystemProvider) => boolean;
     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: [{
         readonly name: "path";
         readonly description: "The path of the file to write to";
@@ -1945,6 +1948,8 @@ declare type ExitReason = {
     type: 'UsageExceeded';
 } | {
     type: 'WaitForUserInput';
+} | {
+    type: 'Aborted';
 } | ToolResponseExit | ToolResponseInterrupted | ToolResponseHandOver | ToolResponseDelegate | {
     type: 'Pause';
     responses: ToolResponseOrToolPause[];
@@ -2111,6 +2116,8 @@ export declare const handler_alias_8: ToolHandler<typeof toolInfo_alias_8, Files
 
 export declare const handler_alias_9: ToolHandler<typeof toolInfo_alias_9, FilesystemProvider>;
 
+export declare type ImageBlockParam = Anthropic.Messages.ImageBlockParam;
+
 declare type Input = {
     commitMessages: string;
     commitDiff: string;
@@ -2470,6 +2477,7 @@ declare class MultiAgent {
     }): Promise<ExitReason>;
     continueTask(userMessage: string): Promise<ExitReason>;
     get hasActiveAgent(): boolean;
+    abort(): void;
 }
 export { MultiAgent }
 export { MultiAgent as MultiAgent_alias_1 }
@@ -2493,7 +2501,7 @@ export declare class OllamaService extends AiServiceBase {
         info: ModelInfo;
     };
     constructor(options: AiServiceOptions);
-    sendImpl(systemPrompt: string, messages: MessageParam[]): ApiStream;
+    sendImpl(systemPrompt: string, messages: MessageParam[], signal: AbortSignal): ApiStream;
 }
 
 declare const openAiModelInfoSaneDefaults: {
@@ -2515,7 +2523,7 @@ export declare class OpenRouterService extends AiServiceBase {
         info: ModelInfo;
     };
     constructor(options: AiServiceOptions);
-    sendImpl(systemPrompt: string, messages: MessageParam[]): ApiStream;
+    sendImpl(systemPrompt: string, messages: MessageParam[], signal: AbortSignal): ApiStream;
 }
 
 declare type Output = {
@@ -2605,15 +2613,24 @@ declare enum Policies {
 export { Policies }
 export { Policies as Policies_alias_1 }
 
-declare const replaceInFile_2: (fileContent: string, diff: string) => Promise<string>;
+declare const replaceInFile_2: (fileContent: string, diff: string) => ReplaceResult;
 export { replaceInFile_2 as replaceInFileHelper }
 export { replaceInFile_2 as replaceInFile_alias_3 }
 export { replaceInFile_2 as replaceInFile_alias_4 }
 
+declare type ReplaceResult = {
+    content: string;
+    status: 'no_diff_applied' | 'some_diff_applied' | 'all_diff_applied';
+    appliedCount: number;
+    totalCount: number;
+};
+export { ReplaceResult }
+export { ReplaceResult as ReplaceResult_alias_1 }
+
 declare const responsePrompts: {
     readonly errorInvokeTool: (tool: string, error: unknown) => string;
     readonly requireUseTool: "Error: No tool use detected. You MUST use a tool before proceeding.\ne.g. <tool_tool_name>tool_name</tool_tool_name>\n\nEnsure the opening and closing tags are correctly nested and closed, and that you are using the correct tool name.\nAvoid unnecessary text or symbols before or after the tool use.\nAvoid unnecessary escape characters or special characters.\n";
-    readonly toolResults: (tool: string, result: string) => string;
+    readonly toolResults: (tool: string, result: UserContent) => (TextBlockParam | ImageBlockParam)[];
     readonly commandResult: (command: string, exitCode: number, stdout: string, stderr: string) => string;
 };
 export { responsePrompts }
@@ -2726,7 +2743,7 @@ export { TaskEventKind as TaskEventKind_alias_2 }
  */
 declare interface TaskEventStartRequest extends TaskEventBase {
     kind: TaskEventKind.StartRequest;
-    userMessage: string;
+    userMessage: UserContent;
 }
 export { TaskEventStartRequest }
 export { TaskEventStartRequest as TaskEventStartRequest_alias_1 }
@@ -2809,6 +2826,8 @@ export { TaskEventUsageExceeded }
 export { TaskEventUsageExceeded as TaskEventUsageExceeded_alias_1 }
 export { TaskEventUsageExceeded as TaskEventUsageExceeded_alias_2 }
 
+export declare type TextBlockParam = Anthropic.Messages.TextBlockParam;
+
 declare interface TextContent {
     type: 'text';
     content: string;
@@ -3077,7 +3096,7 @@ export declare const toolInfo_alias_12: {
 
 export declare const toolInfo_alias_13: {
     readonly name: "write_to_file";
-    readonly 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;`.";
+    readonly 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.";
     readonly parameters: [{
         readonly name: "path";
         readonly description: "The path of the file to write to";
@@ -3427,7 +3446,7 @@ export { ToolResponseInvalid as ToolResponseInvalid_alias_1 }
 declare type ToolResponseOrToolPause = {
     type: 'response';
     tool: string;
-    response: string;
+    response: UserContent;
 } | {
     type: 'pause';
     tool: string;
@@ -3446,7 +3465,7 @@ export { ToolResponsePause as ToolResponsePause_alias_1 }
 
 declare type ToolResponseReply = {
     type: ToolResponseType.Reply;
-    message: string;
+    message: UserContent;
 };
 export { ToolResponseReply }
 export { ToolResponseReply as ToolResponseReply_alias_1 }
@@ -3530,6 +3549,11 @@ export { UsageMeter }
 export { UsageMeter as UsageMeter_alias_1 }
 export { UsageMeter as UsageMeter_alias_2 }
 
+declare type UserContent = string | (TextBlockParam | ImageBlockParam)[];
+export { UserContent }
+export { UserContent as UserContent_alias_1 }
+export { UserContent as UserContent_alias_2 }
+
 declare type WebProvider = {
     fetchUrl?: (url: string) => Promise<string>;
 };

package/dist/index.d.ts

@@ -4,6 +4,7 @@ export { defaultModels } from './_tsup-dts-rollup.js';
 export { createService } from './_tsup-dts-rollup.js';
 export { UsageMeter } from './_tsup-dts-rollup.js';
 export { AiServiceBase } from './_tsup-dts-rollup.js';
+export { UserContent } from './_tsup-dts-rollup.js';
 export { MessageParam } from './_tsup-dts-rollup.js';
 export { AiServiceOptions } from './_tsup-dts-rollup.js';
 export { ModelInfo } from './_tsup-dts-rollup.js';

package/dist/index.js

@@ -8,14 +8,19 @@ var __export = (target, all) => {
 var AiServiceBase = class {
   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":
@@ -28,7 +33,8 @@ var AiServiceBase = class {
   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,
@@ -208,7 +214,7 @@ var AnthropicService = class 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" } : void 0;
@@ -236,52 +242,58 @@ var AnthropicService = class extends AiServiceBase {
         }, []);
         const lastUserMsgIndex = userMsgIndices[userMsgIndices.length - 1] ?? -1;
         const secondLastMsgUserIndex = userMsgIndices[userMsgIndices.length - 2] ?? -1;
-        stream = await this.#client.messages.create({
-          model: modelId,
-          max_tokens: this.model.info.maxTokens || 8192,
-          thinking: thinkingBudgetTokens ? { type: "enabled", budget_tokens: thinkingBudgetTokens } : void 0,
-          temperature,
-          system: [
-            {
-              text: systemPrompt,
-              type: "text",
-              cache_control: cacheControl
-            }
-          ],
-          // setting cache breakpoint for system prompt so new tasks can reuse it
-          messages: messages.map((message, index) => {
-            if (index === lastUserMsgIndex || index === secondLastMsgUserIndex) {
-              return {
-                ...message,
-                content: typeof message.content === "string" ? [
-                  {
-                    type: "text",
-                    text: message.content,
-                    cache_control: cacheControl
-                  }
-                ] : message.content.map(
-                  (content, contentIndex) => contentIndex === message.content.length - 1 ? {
-                    ...content,
-                    cache_control: cacheControl
-                  } : content
-                )
-              };
-            }
-            return message;
-          }),
-          stream: true
-        });
+        stream = await this.#client.messages.create(
+          {
+            model: modelId,
+            max_tokens: this.model.info.maxTokens || 8192,
+            thinking: thinkingBudgetTokens ? { type: "enabled", budget_tokens: thinkingBudgetTokens } : void 0,
+            temperature,
+            system: [
+              {
+                text: systemPrompt,
+                type: "text",
+                cache_control: cacheControl
+              }
+            ],
+            // setting cache breakpoint for system prompt so new tasks can reuse it
+            messages: messages.map((message, index) => {
+              if (index === lastUserMsgIndex || index === secondLastMsgUserIndex) {
+                return {
+                  ...message,
+                  content: typeof message.content === "string" ? [
+                    {
+                      type: "text",
+                      text: message.content,
+                      cache_control: cacheControl
+                    }
+                  ] : message.content.map(
+                    (content, contentIndex) => contentIndex === message.content.length - 1 ? {
+                      ...content,
+                      cache_control: cacheControl
+                    } : content
+                  )
+                };
+              }
+              return message;
+            }),
+            stream: true
+          },
+          { signal }
+        );
         break;
       }
       default: {
-        stream = await this.#client.messages.create({
-          model: modelId,
-          max_tokens: this.model.info.maxTokens || 8192,
-          temperature: 0,
-          system: [{ text: systemPrompt, type: "text" }],
-          messages,
-          stream: true
-        });
+        stream = await this.#client.messages.create(
+          {
+            model: modelId,
+            max_tokens: this.model.info.maxTokens || 8192,
+            temperature: 0,
+            system: [{ text: systemPrompt, type: "text" }],
+            messages,
+            stream: true
+          },
+          { signal }
+        );
         break;
       }
     }
@@ -487,19 +499,22 @@ var DeepSeekService = class extends AiServiceBase {
       info: deepSeekModels[id] ?? deepSeekModels[deepSeekDefaultModelId]
     };
   }
-  async *sendImpl(systemPrompt, messages) {
+  async *sendImpl(systemPrompt, messages, signal) {
     const openAiMessages = [
       { role: "system", content: systemPrompt },
       ...convertToOpenAiMessages(messages)
     ];
-    const stream = await this.#client.chat.completions.create({
-      model: this.model.id,
-      max_completion_tokens: this.model.info.maxTokens,
-      messages: openAiMessages,
-      temperature: 0,
-      stream: true,
-      stream_options: { include_usage: true }
-    });
+    const stream = await this.#client.chat.completions.create(
+      {
+        model: this.model.id,
+        max_completion_tokens: this.model.info.maxTokens,
+        messages: openAiMessages,
+        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) {
@@ -549,17 +564,20 @@ var OllamaService = class extends AiServiceBase {
       info: openAiModelInfoSaneDefaults
     };
   }
-  async *sendImpl(systemPrompt, messages) {
+  async *sendImpl(systemPrompt, messages, signal) {
     const openAiMessages = [
       { role: "system", content: systemPrompt },
       ...convertToOpenAiMessages(messages)
     ];
-    const stream = await this.#client.chat.completions.create({
-      model: this.model.id,
-      messages: openAiMessages,
-      temperature: 0,
-      stream: true
-    });
+    const stream = await this.#client.chat.completions.create(
+      {
+        model: this.model.id,
+        messages: openAiMessages,
+        temperature: 0,
+        stream: true
+      },
+      { signal }
+    );
     for await (const chunk of stream) {
       const delta = chunk.choices[0]?.delta;
       if (delta?.content) {
@@ -609,7 +627,7 @@ var OpenRouterService = class extends AiServiceBase {
       this.#modelProviderInfo = data.data;
     });
   }
-  async *sendImpl(systemPrompt, messages) {
+  async *sendImpl(systemPrompt, messages, signal) {
     const openAiMessages = [
       { role: "system", content: systemPrompt },
       ...convertToOpenAiMessages(messages)
@@ -662,15 +680,18 @@ var OpenRouterService = class extends AiServiceBase {
     if (this.model.id === "deepseek/deepseek-chat") {
       shouldApplyMiddleOutTransform = true;
     }
-    const stream = await this.#client.chat.completions.create({
-      model: this.model.id,
-      messages: openAiMessages,
-      temperature: 0,
-      stream: true,
-      transforms: shouldApplyMiddleOutTransform ? ["middle-out"] : void 0,
-      include_reasoning: true,
-      ...reasoning
-    });
+    const stream = await this.#client.chat.completions.create(
+      {
+        model: this.model.id,
+        messages: openAiMessages,
+        temperature: 0,
+        stream: true,
+        transforms: shouldApplyMiddleOutTransform ? ["middle-out"] : void 0,
+        include_reasoning: true,
+        ...reasoning
+      },
+      { signal }
+    );
     let genId;
     for await (const chunk of stream) {
       if ("error" in chunk) {
@@ -1008,7 +1029,7 @@ var getArray = (args, name, defaultValue) => {
 };
 
 // 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)) {
@@ -1053,14 +1074,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
+  };
 };
 
 // src/tools/askFollowupQuestion.ts
@@ -1759,14 +1798,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) => {
@@ -2166,7 +2217,7 @@ var updateKnowledge_default = {
 // 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",
@@ -2217,7 +2268,9 @@ 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 */,
@@ -2773,12 +2826,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>
@@ -2815,6 +2883,7 @@ var AgentBase = class {
   handlers;
   #messages = [];
   #policies;
+  #aborted = false;
   constructor(name, ai, config) {
     this.ai = ai;
     if (config.agents && config.agents.length > 0) {
@@ -2846,6 +2915,10 @@ ${instance.prompt}`;
     this.config = config;
     this.#policies = policies;
   }
+  abort() {
+    this.#aborted = true;
+    this.ai.abort();
+  }
   get parameters() {
     return this.ai.options.parameters;
   }
@@ -2874,11 +2947,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 });
@@ -2925,14 +3004,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 ${i + 1} of ${retryCount}`);
     }
     if (!currentAssistantMessage) {
+      if (this.#aborted) {
+        return [];
+      }
       throw new Error("No assistant message received");
     }
     this.#messages.push({
@@ -2960,23 +3048,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 };
@@ -3026,7 +3117,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("\n\n");
+    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) {
@@ -3643,6 +3734,7 @@ var MultiAgent = class {
           case "Delegate" /* Delegate */:
             console.warn("Unexpected exit reason", delegateResult);
             break;
+          case "Aborted":
           case "Interrupted" /* Interrupted */:
             return delegateResult;
           case "Exit" /* Exit */:
@@ -3650,6 +3742,7 @@ var MultiAgent = class {
         }
         return delegateResult;
       }
+      case "Aborted":
       case "Interrupted" /* Interrupted */:
       case "Exit" /* Exit */:
         this.#agents.pop();
@@ -3682,6 +3775,11 @@ var MultiAgent = class {
   get hasActiveAgent() {
     return this.#agents.length > 0;
   }
+  abort() {
+    if (this.hasActiveAgent) {
+      this.#agents[this.#agents.length - 1].abort();
+    }
+  }
 };
 
 // src/config.ts
@@ -3758,27 +3856,26 @@ var prompt = `
 You are equipped with **Knowledge Management** capabilities:
 
 1. **What to capture**
-   \u2022 Public API of each file (public classes, functions, methods, parameters, return types).
-   \u2022 High-level description of each file's purpose.
-   \u2022 Invariants and assumptions that must always hold.
-   \u2022 Project or directory-specific coding patterns, styles, and architectural conventions.
-   \u2022 Rules (commenting, testing, documentation, security, etc.).
-   \u2022 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**
-   \u2022 Save knowledge in a YAML file named \`knowledge.ai.yml\`.
-   \u2022 **Create the file in the repository root if it does not yet exist.**
-   \u2022 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.
-   \u2022 Use clear top-level keys such as \`description\`, \`files\`, \`rules\`.
+   - Use clear top-level keys such as \`description\`, \`files\`, \`rules\`.
 
 3. **When to update**
-   \u2022 **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**.
-   \u2022 **While working**: after reading, analysing, creating, or modifying code, immediately record any new or changed knowledge.
-   \u2022 **On refactor / deletion**: locate and delete or amend obsolete entries so that knowledge never drifts from the codebase.
-   \u2022 **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
@@ -3788,19 +3885,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**
-   \u2022 **Never invent knowledge.** Everything you record must be *directly derived* from existing code, comments, commit messages, or explicit user instructions.
-   \u2022 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.
@@ -3809,11 +3901,11 @@ rules:
    You can use the \`updateKnowledge\` tool to efficiently update knowledge files with smart merging capabilities.
 
 8. **Dictionary-First Format**
-   \u2022 **Always prefer dictionaries** for structured data.
-   \u2022 The **\`files\` section must be a dictionary keyed by file path** (e.g., \`"math.ts": {...}\`).
-   \u2022 For other lists (rules, functions, etc.), use numbered dictionaries.
-   \u2022 Arrays are allowed only when strict ordering is essential and dictionaries cannot express it.
-   \u2022 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.

package/package.json

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