@polka-codes/core 0.9.102 → 0.10.1

package/README.md

@@ -8,7 +8,7 @@ Core AI services and agent implementations for Polka Codes framework.
 
 ## Features
 
-- Multiple AI provider support (Anthropic, DeepSeek, GoogleVertex, Ollama, OpenAI, and OpenRouter)
+- Multiple AI provider support (Anthropic, DeepSeek, GoogleVertex, OpenAI, and OpenRouter)
 - Extensible agent architecture
 - Tool integration system with safety enhancements
 - Type-safe API

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

@@ -1,15 +1,17 @@
 import type { FilePart } from 'ai';
 import type { ImagePart } from 'ai';
 import type { JSONValue } from '@ai-sdk/provider';
-import type { LanguageModelV2 } from '@ai-sdk/provider';
-import type { LanguageModelV2ToolResultOutput } from '@ai-sdk/provider';
-import type { LanguageModelV2Usage } from '@ai-sdk/provider';
+import type { LanguageModelUsage } from 'ai';
+import type { LanguageModelV3 } from '@ai-sdk/provider';
+import type { LanguageModelV3ToolResultOutput } from '@ai-sdk/provider';
+import type { LanguageModelV3Usage } from '@ai-sdk/provider';
 import type { ModelMessage } from '@ai-sdk/provider-utils';
 import type { ProviderOptions } from '@ai-sdk/provider-utils';
 import type { ReasoningPart } from '@ai-sdk/provider-utils';
 import type { SystemModelMessage } from '@ai-sdk/provider-utils';
 import type { TextPart } from 'ai';
 import type { TextPart as TextPart_2 } from '@ai-sdk/provider-utils';
+import type { ToolApprovalRequest } from '@ai-sdk/provider-utils';
 import type { ToolModelMessage } from '@ai-sdk/provider-utils';
 import type { ToolResultPart } from '@ai-sdk/provider-utils';
 import { ToolSet } from 'ai';
@@ -1143,7 +1145,7 @@ export declare function join(...parts: string[]): string;
  Content of an assistant message.
  It can be a string or an array of text, image, reasoning, redacted reasoning, and tool call parts.
  */
-declare type JsonAssistantContent = string | Array<TextPart_2 | JsonFilePart | ReasoningPart | JsonToolCallPart | ToolResultPart>;
+declare type JsonAssistantContent = string | Array<TextPart_2 | JsonFilePart | ReasoningPart | JsonToolCallPart | ToolResultPart | ToolApprovalRequest>;
 
 /**
  An assistant message. It can contain text, tool calls, or a combination of text and tool calls.
@@ -1777,7 +1779,7 @@ export { providerConfigSchema as providerConfigSchema_alias_2 }
 declare type ProviderMetadataEntry = {
     provider: string;
     model: string;
-    metadata: any;
+    metadata: Record<string, unknown>;
     timestamp: number;
 };
 
@@ -1904,7 +1906,7 @@ 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 requireUseToolNative: "Error: No tool use detected. You MUST use a tool before proceeding.\n";
-    readonly toolResults: (tool: string, result: LanguageModelV2ToolResultOutput) => Array<TextPart | ImagePart | FilePart>;
+    readonly toolResults: (tool: string, result: LanguageModelV3ToolResultOutput) => Array<TextPart | ImagePart | FilePart>;
     readonly commandResult: (command: string, exitCode: number, stdout: string, stderr: string) => string;
 };
 export { responsePrompts }
@@ -2689,12 +2691,15 @@ declare class UsageMeter {
         maxCost?: number;
         pricingService?: PricingService;
     });
-    addUsage(llm: LanguageModelV2, resp: {
-        usage: LanguageModelV2Usage;
-        providerMetadata?: any;
+    addUsage(llm: LanguageModelV3, resp: {
+        usage: LanguageModelV3Usage;
+        providerMetadata?: Record<string, unknown>;
     } | {
-        totalUsage: LanguageModelV2Usage;
-        providerMetadata?: any;
+        totalUsage: LanguageModelV3Usage;
+        providerMetadata?: Record<string, unknown>;
+    } | {
+        totalUsage: LanguageModelUsage;
+        providerMetadata?: Record<string, unknown>;
     }, options?: {
         modelInfo?: ModelInfo;
     }): Promise<void>;
@@ -2741,9 +2746,12 @@ declare class UsageMeter {
     /** Wait for all pending usage updates to complete. */
     waitForPending(): Promise<void>;
     getUsageText(): string;
-    onFinishHandler(llm: LanguageModelV2): (evt: {
-        totalUsage: LanguageModelV2Usage;
-        providerMetadata: any;
+    onFinishHandler(llm: LanguageModelV3): (evt: {
+        totalUsage: LanguageModelUsage;
+        providerMetadata?: Record<string, unknown>;
+    } | {
+        totalUsage: LanguageModelV3Usage;
+        providerMetadata?: Record<string, unknown>;
     }) => Promise<void>;
 }
 export { UsageMeter }

package/dist/index.js

@@ -29,6 +29,7 @@ var parseJsonFromMarkdown = (markdown) => {
 };
 
 // src/Agent/prompts.ts
+var NO_REASON_PROVIDED = "No reason provided";
 var responsePrompts = {
   errorInvokeTool: (tool, error) => `An error occurred while invoking the tool "${tool}": ${error}`,
   requireUseTool: `Error: No tool use detected. You MUST use a tool before proceeding.
@@ -80,17 +81,23 @@ Avoid unnecessary escape characters or special characters.
             if (part.type === "text") {
               return part;
             }
-            if (part.mediaType.startsWith("image/")) {
+            if ("mediaType" in part && "data" in part && part.mediaType.startsWith("image/")) {
               return {
                 type: "image",
                 mediaType: part.mediaType,
                 image: part.data
               };
             }
+            if ("mediaType" in part && "data" in part) {
+              return {
+                type: "file",
+                mediaType: part.mediaType,
+                data: part.data
+              };
+            }
             return {
-              type: "file",
-              mediaType: part.mediaType,
-              data: part.data
+              type: "text",
+              text: JSON.stringify(part)
             };
           }),
           {
@@ -98,6 +105,21 @@ Avoid unnecessary escape characters or special characters.
             text: "</tool_response>"
           }
         ];
+      case "execution-denied":
+        return [
+          {
+            type: "text",
+            text: `<tool_response_error name=${tool}>Execution denied: ${result.reason ?? NO_REASON_PROVIDED}</tool_response_error>`
+          }
+        ];
+      default: {
+        return [
+          {
+            type: "text",
+            text: `<tool_response_error name=${tool}>Unknown result type: ${JSON.stringify(result)}</tool_response_error>`
+          }
+        ];
+      }
     }
   },
   commandResult: (command, exitCode, stdout, stderr) => `<command>${command}</command>
@@ -2441,6 +2463,14 @@ var writeToFile_default = {
 };
 
 // src/UsageMeter.ts
+var ZERO_PRICING = {
+  inputPrice: 0,
+  outputPrice: 0,
+  cacheWritesPrice: 0,
+  cacheReadsPrice: 0
+};
+var TOKENS_PER_UNIT = 1e6;
+var MAX_METADATA_ENTRIES = 1e3;
 var UsageMeter = class {
   #totals = { input: 0, output: 0, cachedRead: 0, cost: 0, messageCount: 0 };
   #providerMetadataEntries = [];
@@ -2466,50 +2496,72 @@ var UsageMeter = class {
     this.#maxCost = opts.maxCost ?? 100;
     this.#pricingService = opts.pricingService;
   }
-  #calculateUsage(usage, providerMetadata, modelInfo) {
+  #calculateUsageV3(usage, providerMetadata, modelInfo) {
+    if (!usage?.inputTokens || !usage?.outputTokens) {
+      return { input: 0, output: 0, cachedRead: 0, cost: 0 };
+    }
+    const providerMetadataKey = Object.keys(providerMetadata ?? {})[0];
+    const metadata = providerMetadata?.[providerMetadataKey] ?? {};
+    const inputTokens = usage.inputTokens.noCache ?? usage.inputTokens.total ?? 0;
+    const cachedReadTokens = usage.inputTokens.cacheRead ?? 0;
+    const cachedWriteTokens = usage.inputTokens.cacheWrite ?? 0;
+    const outputTokens = usage.outputTokens.total ?? usage.outputTokens.text ?? 0;
+    return this.#calculateCost(inputTokens, outputTokens, cachedReadTokens, cachedWriteTokens, providerMetadataKey, metadata, modelInfo);
+  }
+  #calculateUsageAiPackage(usage, providerMetadata, modelInfo) {
+    if (!usage?.inputTokens || !usage?.outputTokens) {
+      return { input: 0, output: 0, cachedRead: 0, cost: 0 };
+    }
     const providerMetadataKey = Object.keys(providerMetadata ?? {})[0];
     const metadata = providerMetadata?.[providerMetadataKey] ?? {};
+    const details = usage.inputTokenDetails;
+    const outputDetails = usage.outputTokenDetails;
+    const inputTokens = details?.noCacheTokens ?? usage.inputTokens ?? 0;
+    const cachedReadTokens = details?.cacheReadTokens ?? 0;
+    const cachedWriteTokens = details?.cacheWriteTokens ?? 0;
+    const outputTokens = outputDetails?.textTokens ?? usage.outputTokens ?? 0;
+    return this.#calculateCost(inputTokens, outputTokens, cachedReadTokens, cachedWriteTokens, providerMetadataKey, metadata, modelInfo);
+  }
+  #calculateCost(inputTokens, outputTokens, cachedReadTokens, cachedWriteTokens, providerMetadataKey, metadata, modelInfo) {
+    const getNumber = (obj, key) => {
+      const value = obj[key];
+      return typeof value === "number" ? value : void 0;
+    };
     switch (providerMetadataKey) {
-      case "openrouter":
+      case "openrouter": {
+        const usage = metadata.usage;
+        const cost = typeof usage === "object" && usage !== null && "cost" in usage && typeof usage.cost === "number" ? usage.cost : 0;
         return {
-          input: usage.inputTokens ?? 0,
-          output: usage.outputTokens ?? 0,
-          cachedRead: usage.cachedInputTokens ?? 0,
-          cost: metadata.usage?.cost ?? 0
+          input: inputTokens,
+          output: outputTokens,
+          cachedRead: cachedReadTokens,
+          cost
         };
+      }
       case "anthropic": {
-        const cachedRead = usage.cachedInputTokens ?? 0;
-        const cacheWrite = metadata?.promptCacheMissTokens ?? 0;
-        const input = usage.inputTokens ?? 0;
-        const output = usage.outputTokens ?? 0;
+        const cacheWrite = getNumber(metadata, "promptCacheMissTokens") ?? cachedWriteTokens;
         return {
-          input: input + cacheWrite + cachedRead,
-          output,
-          cachedRead,
-          cost: (input * modelInfo.inputPrice + output * modelInfo.outputPrice + cacheWrite * modelInfo.cacheWritesPrice + cachedRead * modelInfo.cacheReadsPrice) / 1e6
+          input: inputTokens + cacheWrite + cachedReadTokens,
+          output: outputTokens,
+          cachedRead: cachedReadTokens,
+          cost: (inputTokens * modelInfo.inputPrice + outputTokens * modelInfo.outputPrice + cacheWrite * modelInfo.cacheWritesPrice + cachedReadTokens * modelInfo.cacheReadsPrice) / TOKENS_PER_UNIT
         };
       }
       case "deepseek": {
-        const cachedRead = usage.cachedInputTokens ?? 0;
-        const cacheWrite = metadata.promptCacheMissTokens ?? 0;
-        const input = usage.inputTokens ?? 0;
-        const output = usage.outputTokens ?? 0;
+        const cacheWrite = getNumber(metadata, "promptCacheMissTokens") ?? cachedWriteTokens;
         return {
-          input,
-          output,
-          cachedRead,
-          cost: (output * modelInfo.outputPrice + cacheWrite * modelInfo.inputPrice + cachedRead * modelInfo.cacheReadsPrice) / 1e6
+          input: inputTokens,
+          output: outputTokens,
+          cachedRead: cachedReadTokens,
+          cost: (outputTokens * modelInfo.outputPrice + cacheWrite * modelInfo.inputPrice + cachedReadTokens * modelInfo.cacheReadsPrice) / TOKENS_PER_UNIT
         };
       }
       default: {
-        const cachedRead = usage.cachedInputTokens ?? 0;
-        const input = usage.inputTokens ?? 0;
-        const output = usage.outputTokens ?? 0;
         return {
-          input,
-          output,
-          cachedRead,
-          cost: (input * modelInfo.inputPrice + output * modelInfo.outputPrice) / 1e6
+          input: inputTokens,
+          output: outputTokens,
+          cachedRead: cachedReadTokens,
+          cost: (inputTokens * modelInfo.inputPrice + outputTokens * modelInfo.outputPrice) / TOKENS_PER_UNIT
         };
       }
     }
@@ -2526,34 +2578,35 @@ var UsageMeter = class {
           this.#modelInfos[key] = modelInfo;
         }
       } catch {
-        modelInfo = {
-          inputPrice: 0,
-          outputPrice: 0,
-          cacheWritesPrice: 0,
-          cacheReadsPrice: 0
-        };
+        modelInfo = ZERO_PRICING;
       }
-      modelInfo = modelInfo ?? {
-        inputPrice: 0,
-        outputPrice: 0,
-        cacheWritesPrice: 0,
-        cacheReadsPrice: 0
-      };
+      modelInfo = modelInfo ?? ZERO_PRICING;
       const usage = "totalUsage" in resp ? resp.totalUsage : resp.usage;
-      const result = this.#calculateUsage(usage, resp.providerMetadata, modelInfo);
-      this.#totals.input += result.input || 0;
-      this.#totals.output += result.output || 0;
-      this.#totals.cachedRead += result.cachedRead || 0;
-      this.#totals.cost += result.cost || 0;
+      let result;
+      if ("inputTokenDetails" in usage || typeof usage.inputTokens === "number") {
+        result = this.#calculateUsageAiPackage(usage, resp.providerMetadata, modelInfo);
+      } else {
+        result = this.#calculateUsageV3(usage, resp.providerMetadata, modelInfo);
+      }
+      this.#totals.input += result.input;
+      this.#totals.output += result.output;
+      this.#totals.cachedRead += result.cachedRead;
+      this.#totals.cost += result.cost;
       this.#totals.messageCount += 1;
       if (resp.providerMetadata && Object.keys(resp.providerMetadata).length > 0) {
-        const providerKey = Object.keys(resp.providerMetadata)[0];
-        this.#providerMetadataEntries.push({
-          provider: providerKey || llm.provider,
-          model: llm.modelId,
-          metadata: resp.providerMetadata[providerKey] || resp.providerMetadata,
-          timestamp: Date.now()
-        });
+        const providerKey = Object.keys(resp.providerMetadata)[0] || llm.provider;
+        const metadata = resp.providerMetadata[providerKey];
+        if (typeof metadata === "object" && metadata !== null && !Array.isArray(metadata)) {
+          this.#providerMetadataEntries.push({
+            provider: providerKey,
+            model: llm.modelId,
+            metadata,
+            timestamp: Date.now()
+          });
+        }
+        if (this.#providerMetadataEntries.length > MAX_METADATA_ENTRIES) {
+          this.#providerMetadataEntries.splice(0, this.#providerMetadataEntries.length - MAX_METADATA_ENTRIES);
+        }
       }
     })();
     this.#pendingUpdates.add(updatePromise);
@@ -2619,10 +2672,11 @@ var UsageMeter = class {
     let requestsWithCache = 0;
     for (const entry of entries) {
       const metadata = entry.metadata;
-      if (typeof metadata !== "object" || metadata === null) {
-        continue;
-      }
-      const cachedTokens = metadata.cachedPromptTokens ?? metadata.cacheReadTokens ?? metadata.prompt_cache_hit_tokens ?? 0;
+      const getValueAsNumber = (key) => {
+        const value = metadata[key];
+        return typeof value === "number" ? value : void 0;
+      };
+      const cachedTokens = getValueAsNumber("cachedPromptTokens") ?? getValueAsNumber("cacheReadTokens") ?? getValueAsNumber("prompt_cache_hit_tokens") ?? 0;
       if (cachedTokens > 0) {
         totalCachedTokens += cachedTokens;
         requestsWithCache++;
@@ -2700,6 +2754,9 @@ var TaskEventKind = /* @__PURE__ */ ((TaskEventKind2) => {
 })(TaskEventKind || {});
 
 // src/workflow/agent.workflow.ts
+function isValidToolResultOutput(value) {
+  return typeof value === "object" && value !== null && "type" in value && (value.type === "text" || value.type === "content" || value.type === "execution-denied");
+}
 var agentWorkflow = async (input, { step, tools, logger }) => {
   const event = (name, event2) => step(name, () => tools.taskEvent(event2));
   const { tools: toolInfo13, maxToolRoundTrips = 200 } = input;
@@ -2813,6 +2870,9 @@ var agentWorkflow = async (input, { step, tools, logger }) => {
           tool: toolCall.toolName,
           content: toolResponse.message
         });
+        if (!isValidToolResultOutput(toolResponse.message)) {
+          throw new Error(`Invalid tool result format from ${toolCall.toolName}`);
+        }
         toolResults.push({
           toolCallId: toolCall.toolCallId,
           toolName: toolCall.toolName,
@@ -2824,6 +2884,9 @@ var agentWorkflow = async (input, { step, tools, logger }) => {
           tool: toolCall.toolName,
           error: toolResponse.message ?? "Unknown error"
         });
+        if (!isValidToolResultOutput(toolResponse.message)) {
+          throw new Error(`Invalid tool result format from ${toolCall.toolName}`);
+        }
         toolResults.push({
           toolCallId: toolCall.toolCallId,
           toolName: toolCall.toolName,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polka-codes/core",
-  "version": "0.9.102",
+  "version": "0.10.1",
   "license": "AGPL-3.0",
   "author": "github@polka.codes",
   "type": "module",
@@ -17,9 +17,9 @@
     "build": "tsup src/index.ts --experimental-dts --format esm --clean"
   },
   "dependencies": {
-    "@ai-sdk/provider": "^2.0.1",
-    "@ai-sdk/provider-utils": "^3.0.20",
-    "ai": "^5.0.117",
+    "@ai-sdk/provider": "^3.0.8",
+    "@ai-sdk/provider-utils": "^4.0.19",
+    "ai": "^6.0.116",
     "yaml": "^2.8.2",
     "zod": "^4.3.5"
   }