@polka-codes/cli 0.7.13 → 0.7.15

package/dist/index.js

@@ -24629,7 +24629,7 @@ var {
   Help
 } = import__.default;
 // package.json
-var version = "0.7.13";
+var version = "0.7.15";
 
 // ../core/src/AiService/AiServiceBase.ts
 class AiServiceBase {
@@ -24638,6 +24638,7 @@ class AiServiceBase {
     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) {
@@ -24650,6 +24651,7 @@ class AiServiceBase {
     }
   }
   async request(systemPrompt, messages) {
+    this.usageMeter.checkLimit();
     this.usageMeter.incrementMessageCount();
     const stream = this.sendImpl(systemPrompt, messages);
     const usage = {
@@ -33344,6 +33346,16 @@ class UsageMeter {
     }
     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 !== undefined) {
+      this.#messageCount = messageCount;
+    }
+  }
   incrementMessageCount(count = 1) {
     this.#messageCount += count;
   }
@@ -33352,12 +33364,20 @@ class UsageMeter {
     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 usage() {
-    return { ...this.#usage };
+    return { ...this.#usage, messageCount: this.#messageCount };
   }
   printUsage() {
     const { inputTokens, outputTokens, cacheReadTokens, cacheWriteTokens } = this.#usage;
@@ -34674,10 +34694,10 @@ class AgentBase {
   ai;
   config;
   handlers;
-  messages;
+  #messages;
   constructor(name2, ai, config, messages = []) {
     this.ai = ai;
-    this.messages = messages;
+    this.#messages = messages;
     if (config.agents && config.agents.length > 0) {
       const agents = agentsPrompt(config.agents, name2);
       config.systemPrompt += `
@@ -34690,6 +34710,9 @@ ${agents}`;
     }
     this.handlers = handlers;
   }
+  get messages() {
+    return this.#messages;
+  }
   async#callback(event) {
     await this.config.callback?.(event);
   }
@@ -34697,17 +34720,19 @@ ${agents}`;
     this.#callback({ kind: "StartTask" /* StartTask */, agent: this, systemPrompt: this.config.systemPrompt });
     return await this.#processLoop(prompt);
   }
-  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) {
@@ -34734,7 +34759,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
     });
@@ -34742,7 +34767,7 @@ ${agents}`;
     const retryCount = 5;
     for (let i3 = 0;i3 < retryCount; i3++) {
       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) {
@@ -34769,7 +34794,7 @@ ${agents}`;
     if (!currentAssistantMessage) {
       throw new Error("No assistant message received");
     }
-    this.messages.push({
+    this.#messages.push({
       role: "assistant",
       content: currentAssistantMessage
     });

package/package.json

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