@polka-codes/core 0.7.13 → 0.7.15

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

@@ -6,13 +6,11 @@ declare abstract class AgentBase {
     protected readonly ai: AiServiceBase;
     protected readonly config: Readonly<AgentBaseConfig>;
     protected readonly handlers: Record<string, FullToolInfo>;
-    protected readonly messages: MessageParam[];
     constructor(name: string, ai: AiServiceBase, config: AgentBaseConfig, messages?: MessageParam[]);
+    get messages(): Readonly<MessageParam[]>;
     start(prompt: string): Promise<ExitReason>;
-    step(promp: string): Promise<AssistantMessageContent[] | {
-        type: string;
-    }>;
-    handleStepResponse(response: AssistantMessageContent[]): Promise<{
+    step(promp: string, messages?: MessageParam[]): Promise<AssistantMessageContent[]>;
+    handleStepResponse(response: AssistantMessageContent[], messages?: MessageParam[]): Promise<{
         replay: string;
     } | {
         exit: ExitReason;
@@ -24,7 +22,14 @@ declare abstract class AgentBase {
         id: string;
         info: ModelInfo;
     };
-    get usage(): ApiUsage;
+    get usage(): {
+        messageCount: number;
+        inputTokens: number;
+        outputTokens: number;
+        cacheWriteTokens: number;
+        cacheReadTokens: number;
+        totalCost: number;
+    };
 }
 export { AgentBase }
 export { AgentBase as AgentBase_alias_1 }
@@ -305,7 +310,10 @@ export { ArchitectAgentOptions }
 export { ArchitectAgentOptions as ArchitectAgentOptions_alias_1 }
 export { ArchitectAgentOptions as ArchitectAgentOptions_alias_2 }
 
-export declare type AssistantMessageContent = TextContent | ToolUse;
+declare type AssistantMessageContent = TextContent | ToolUse;
+export { AssistantMessageContent }
+export { AssistantMessageContent as AssistantMessageContent_alias_1 }
+export { AssistantMessageContent as AssistantMessageContent_alias_2 }
 
 export declare const basePrompt = "You are a highly skilled software engineer specializing in debugging and fixing code issues. You have extensive experience with:\n- Type systems and type checking\n- Test frameworks and debugging test failures\n- Code quality tools and best practices\n- Systematic debugging approaches";
 
@@ -1753,7 +1761,10 @@ declare type Output = {
  * //   {type: "text", content: "Here are the results"}
  * // ]
  */
-export declare function parseAssistantMessage(assistantMessage: string, tools: ToolInfo[], toolNamePrefix: string): AssistantMessageContent[];
+declare function parseAssistantMessage(assistantMessage: string, tools: ToolInfo[], toolNamePrefix: string): AssistantMessageContent[];
+export { parseAssistantMessage }
+export { parseAssistantMessage as parseAssistantMessage_alias_1 }
+export { parseAssistantMessage as parseAssistantMessage_alias_2 }
 
 declare enum PermissionLevel {
     None = 0,
@@ -1956,10 +1967,13 @@ export { TaskEventUsageExceeded }
 export { TaskEventUsageExceeded as TaskEventUsageExceeded_alias_1 }
 export { TaskEventUsageExceeded as TaskEventUsageExceeded_alias_2 }
 
-export declare interface TextContent {
+declare interface TextContent {
     type: 'text';
     content: string;
 }
+export { TextContent }
+export { TextContent as TextContent_alias_1 }
+export { TextContent as TextContent_alias_2 }
 
 declare type ToolExample = {
     description: string;
@@ -2448,11 +2462,14 @@ declare enum ToolResponseType {
 export { ToolResponseType }
 export { ToolResponseType as ToolResponseType_alias_1 }
 
-export declare interface ToolUse {
+declare interface ToolUse {
     type: 'tool_use';
     name: string;
     params: Record<string, string>;
 }
+export { ToolUse }
+export { ToolUse as ToolUse_alias_1 }
+export { ToolUse as ToolUse_alias_2 }
 
 declare const toolUsePrompt: (tools: ToolInfo[], toolNamePrefix: string) => string;
 export { toolUsePrompt }
@@ -2475,16 +2492,27 @@ declare class UsageMeter {
         provider: string;
         id: string;
     }): void;
+    setUsage(usage: Partial<ApiUsage>, messageCount?: number): void;
     incrementMessageCount(count?: number): void;
     isLimitExceeded(): {
         messageCount: boolean;
+        maxMessageCount: number;
         cost: boolean;
+        maxCost: number;
         result: boolean;
     };
+    checkLimit(): void;
     /**
      * Get current usage totals
      */
-    get usage(): ApiUsage;
+    get usage(): {
+        messageCount: number;
+        inputTokens: number;
+        outputTokens: number;
+        cacheWriteTokens: number;
+        cacheReadTokens: number;
+        totalCost: number;
+    };
     printUsage(): void;
 }
 export { UsageMeter }

package/dist/index.d.ts

@@ -51,6 +51,10 @@ export { systemInformation } from './_tsup-dts-rollup.js';
 export { customInstructions } from './_tsup-dts-rollup.js';
 export { customScripts } from './_tsup-dts-rollup.js';
 export { responsePrompts } from './_tsup-dts-rollup.js';
+export { parseAssistantMessage } from './_tsup-dts-rollup.js';
+export { TextContent } from './_tsup-dts-rollup.js';
+export { ToolUse } from './_tsup-dts-rollup.js';
+export { AssistantMessageContent } from './_tsup-dts-rollup.js';
 export { allTools } from './_tsup-dts-rollup.js';
 export { FilesystemProvider } from './_tsup-dts-rollup.js';
 export { CommandProvider } from './_tsup-dts-rollup.js';

package/dist/index.js

@@ -11,6 +11,7 @@ var AiServiceBase = class {
     this.usageMeter = usageMeter;
   }
   async *send(systemPrompt, messages) {
+    this.usageMeter.checkLimit();
     this.usageMeter.incrementMessageCount();
     const stream = this.sendImpl(systemPrompt, messages);
     for await (const chunk of stream) {
@@ -23,6 +24,7 @@ var AiServiceBase = class {
     }
   }
   async request(systemPrompt, messages) {
+    this.usageMeter.checkLimit();
     this.usageMeter.incrementMessageCount();
     const stream = this.sendImpl(systemPrompt, messages);
     const usage = {
@@ -775,6 +777,16 @@ var UsageMeter = class {
     }
     this.#usage.totalCost += usage.totalCost ?? 0;
   }
+  setUsage(usage, messageCount) {
+    this.#usage.inputTokens = usage.inputTokens ?? this.#usage.inputTokens;
+    this.#usage.outputTokens = usage.outputTokens ?? this.#usage.outputTokens;
+    this.#usage.cacheWriteTokens = usage.cacheWriteTokens ?? this.#usage.cacheWriteTokens;
+    this.#usage.cacheReadTokens = usage.cacheReadTokens ?? this.#usage.cacheReadTokens;
+    this.#usage.totalCost = usage.totalCost ?? this.#usage.totalCost;
+    if (messageCount !== void 0) {
+      this.#messageCount = messageCount;
+    }
+  }
   incrementMessageCount(count = 1) {
     this.#messageCount += count;
   }
@@ -783,15 +795,25 @@ var UsageMeter = class {
     const cost = this.#usage.totalCost >= this.maxCost;
     return {
       messageCount,
+      maxMessageCount: this.maxMessageCount,
       cost,
+      maxCost: this.maxCost,
       result: messageCount || cost
     };
   }
+  checkLimit() {
+    const result = this.isLimitExceeded();
+    if (result.result) {
+      throw new Error(
+        `Usage limit exceeded. Message count: ${result.messageCount}/${result.maxMessageCount}, cost: ${result.cost}/${result.maxCost}`
+      );
+    }
+  }
   /**
    * Get current usage totals
    */
   get usage() {
-    return { ...this.#usage };
+    return { ...this.#usage, messageCount: this.#messageCount };
   }
   printUsage() {
     const { inputTokens, outputTokens, cacheReadTokens, cacheWriteTokens } = this.#usage;
@@ -2185,10 +2207,10 @@ var AgentBase = class {
   ai;
   config;
   handlers;
-  messages;
+  #messages;
   constructor(name, ai, config, messages = []) {
     this.ai = ai;
-    this.messages = messages;
+    this.#messages = messages;
     if (config.agents && config.agents.length > 0) {
       const agents = agentsPrompt(config.agents, name);
       config.systemPrompt += `
@@ -2201,6 +2223,9 @@ ${agents}`;
     }
     this.handlers = handlers;
   }
+  get messages() {
+    return this.#messages;
+  }
   async #callback(event) {
     await this.config.callback?.(event);
   }
@@ -2208,17 +2233,19 @@ ${agents}`;
     this.#callback({ kind: "StartTask" /* StartTask */, agent: this, systemPrompt: this.config.systemPrompt });
     return await this.#processLoop(prompt5);
   }
-  async step(promp) {
-    if (this.messages.length === 0) {
-      this.#callback({ kind: "StartTask" /* StartTask */, agent: this, systemPrompt: this.config.systemPrompt });
+  async step(promp, messages) {
+    if (messages) {
+      this.#messages = messages;
     }
-    if (this.ai.usageMeter.isLimitExceeded().result) {
-      this.#callback({ kind: "UsageExceeded" /* UsageExceeded */, agent: this });
-      return { type: "UsageExceeded" };
+    if (this.#messages.length === 0) {
+      this.#callback({ kind: "StartTask" /* StartTask */, agent: this, systemPrompt: this.config.systemPrompt });
     }
     return await this.#request(promp);
   }
-  async handleStepResponse(response) {
+  async handleStepResponse(response, messages) {
+    if (messages) {
+      this.#messages = messages;
+    }
     return this.#handleResponse(response);
   }
   async #processLoop(userMessage) {
@@ -2245,7 +2272,7 @@ ${agents}`;
       throw new Error("userMessage is missing");
     }
     await this.#callback({ kind: "StartRequest" /* StartRequest */, agent: this, userMessage });
-    this.messages.push({
+    this.#messages.push({
       role: "user",
       content: userMessage
     });
@@ -2253,7 +2280,7 @@ ${agents}`;
     const retryCount = 5;
     for (let i = 0; i < retryCount; i++) {
       currentAssistantMessage = "";
-      const stream = this.ai.send(this.config.systemPrompt, this.messages);
+      const stream = this.ai.send(this.config.systemPrompt, this.#messages);
       try {
         for await (const chunk of stream) {
           switch (chunk.type) {
@@ -2280,7 +2307,7 @@ ${agents}`;
     if (!currentAssistantMessage) {
       throw new Error("No assistant message received");
     }
-    this.messages.push({
+    this.#messages.push({
       role: "assistant",
       content: currentAssistantMessage
     });
@@ -3432,6 +3459,7 @@ export {
   makeTool,
   modelInfos,
   openAiModelInfoSaneDefaults,
+  parseAssistantMessage,
   readFile_default as readFile,
   removeFile_default as removeFile,
   renameFile_default as renameFile,

package/package.json

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