@polka-codes/core 0.9.101 → 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';
@@ -364,6 +366,12 @@ export { convertJsonSchemaToZod }
 export { convertJsonSchemaToZod as convertJsonSchemaToZod_alias_1 }
 export { convertJsonSchemaToZod as convertJsonSchemaToZod_alias_2 }
 
+/**
+ * Convert Portkey pricing (cents per token) to ModelInfo (USD per 1M tokens)
+ * Formula: cents_per_token * 10 = usd_per_1M_tokens
+ */
+export declare function convertPortkeyToModelInfo(portkey: PortkeyPricingResponse): ModelInfo;
+
 declare function createContext<TTools extends ToolRegistry>(tools: WorkflowTools<TTools>, stepFn?: StepFn, logger?: Logger): WorkflowContext<TTools>;
 export { createContext }
 export { createContext as createContext_alias_1 }
@@ -890,6 +898,8 @@ export { ExitReason }
 export { ExitReason as ExitReason_alias_1 }
 export { ExitReason as ExitReason_alias_2 }
 
+export declare function fetchPricing(provider: string, model: string): Promise<PortkeyPricingResponse | null>;
+
 /**
  * File statistics
  */
@@ -1135,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.
@@ -1655,6 +1665,8 @@ declare type ModelInfo = {
 };
 export { ModelInfo }
 export { ModelInfo as ModelInfo_alias_1 }
+export { ModelInfo as ModelInfo_alias_2 }
+export { ModelInfo as ModelInfo_alias_3 }
 
 /**
  * Node.js file system provider implementation
@@ -1696,12 +1708,51 @@ export { ParseOutputResult }
 export { ParseOutputResult as ParseOutputResult_alias_1 }
 export { ParseOutputResult as ParseOutputResult_alias_2 }
 
+declare interface PortkeyPricingConfig {
+    provider: string;
+    model: string;
+    pricing: PortkeyPricingResponse;
+}
+export { PortkeyPricingConfig }
+export { PortkeyPricingConfig as PortkeyPricingConfig_alias_1 }
+export { PortkeyPricingConfig as PortkeyPricingConfig_alias_2 }
+
+declare interface PortkeyPricingResponse {
+    request_token?: {
+        price: number;
+    };
+    response_token?: {
+        price: number;
+    };
+    cache_write_input_token?: {
+        price: number;
+    };
+    cache_read_input_token?: {
+        price: number;
+    };
+    additional_units?: Record<string, {
+        price: number;
+    }>;
+}
+export { PortkeyPricingResponse }
+export { PortkeyPricingResponse as PortkeyPricingResponse_alias_1 }
+export { PortkeyPricingResponse as PortkeyPricingResponse_alias_2 }
+
 /**
  * Simplify boolean string preprocessing
  * Converts 'true'/'false' strings to actual booleans
  */
 export declare function preprocessBoolean(val: unknown): unknown;
 
+declare class PricingService {
+    #private;
+    constructor(fallbackPrices?: Record<string, Record<string, Partial<ModelInfo>>>);
+    getPricing(provider: string, model: string): Promise<ModelInfo>;
+}
+export { PricingService }
+export { PricingService as PricingService_alias_1 }
+export { PricingService as PricingService_alias_2 }
+
 declare type ProviderConfig = z.infer<typeof providerConfigSchema>;
 export { ProviderConfig }
 export { ProviderConfig as ProviderConfig_alias_1 }
@@ -1728,7 +1779,7 @@ export { providerConfigSchema as providerConfigSchema_alias_2 }
 declare type ProviderMetadataEntry = {
     provider: string;
     model: string;
-    metadata: any;
+    metadata: Record<string, unknown>;
     timestamp: number;
 };
 
@@ -1855,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 }
@@ -2638,16 +2689,20 @@ declare class UsageMeter {
     constructor(modelInfos?: Record<string, Record<string, Partial<ModelInfo>>>, opts?: {
         maxMessages?: number;
         maxCost?: number;
+        pricingService?: PricingService;
     });
-    addUsage(llm: LanguageModelV2, resp: {
-        usage: LanguageModelV2Usage;
-        providerMetadata?: any;
+    addUsage(llm: LanguageModelV3, resp: {
+        usage: LanguageModelV3Usage;
+        providerMetadata?: Record<string, unknown>;
+    } | {
+        totalUsage: LanguageModelV3Usage;
+        providerMetadata?: Record<string, unknown>;
     } | {
-        totalUsage: LanguageModelV2Usage;
-        providerMetadata?: any;
+        totalUsage: LanguageModelUsage;
+        providerMetadata?: Record<string, unknown>;
     }, options?: {
         modelInfo?: ModelInfo;
-    }): void;
+    }): Promise<void>;
     /** Override the running totals (e.g., restore from saved state). */
     setUsage(newUsage: Partial<Totals>, options?: {
         clearMetadata?: boolean;
@@ -2688,11 +2743,16 @@ declare class UsageMeter {
     clearProviderMetadata(): void;
     /** Merge another UsageMeter's totals into this one. */
     merge(other: UsageMeter): void;
+    /** Wait for all pending usage updates to complete. */
+    waitForPending(): Promise<void>;
     getUsageText(): string;
-    onFinishHandler(llm: LanguageModelV2): (evt: {
-        totalUsage: LanguageModelV2Usage;
-        providerMetadata: any;
-    }) => void;
+    onFinishHandler(llm: LanguageModelV3): (evt: {
+        totalUsage: LanguageModelUsage;
+        providerMetadata?: Record<string, unknown>;
+    } | {
+        totalUsage: LanguageModelV3Usage;
+        providerMetadata?: Record<string, unknown>;
+    }) => Promise<void>;
 }
 export { UsageMeter }
 export { UsageMeter as UsageMeter_alias_1 }

package/dist/index.d.ts

@@ -40,6 +40,10 @@ export { MemoryOperation } from './_tsup-dts-rollup.js';
 export { DatabaseStats } from './_tsup-dts-rollup.js';
 export { IMemoryStore } from './_tsup-dts-rollup.js';
 export { MemoryStoreConfig } from './_tsup-dts-rollup.js';
+export { PricingService } from './_tsup-dts-rollup.js';
+export { ModelInfo_alias_1 as ModelInfo } from './_tsup-dts-rollup.js';
+export { PortkeyPricingConfig } from './_tsup-dts-rollup.js';
+export { PortkeyPricingResponse } from './_tsup-dts-rollup.js';
 export { SKILL_LIMITS } from './_tsup-dts-rollup.js';
 export { IGNORED_DIRECTORIES } from './_tsup-dts-rollup.js';
 export { SUSPICIOUS_PATTERNS } from './_tsup-dts-rollup.js';
@@ -117,7 +121,6 @@ export { UpdateTodoItemInputSchema } from './_tsup-dts-rollup.js';
 export { UpdateTodoItemInput } from './_tsup-dts-rollup.js';
 export { UpdateTodoItemOutputSchema } from './_tsup-dts-rollup.js';
 export { UpdateTodoItemOutput } from './_tsup-dts-rollup.js';
-export { ModelInfo_alias_1 as ModelInfo } from './_tsup-dts-rollup.js';
 export { UsageMeter_alias_1 as UsageMeter } from './_tsup-dts-rollup.js';
 export { deepMerge } from './_tsup-dts-rollup.js';
 export { AgentWorkflowInput } from './_tsup-dts-rollup.js';

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>
@@ -403,6 +425,179 @@ var NodeFileSystemProvider = class {
   }
 };
 
+// src/pricing/pricing-service.ts
+import { randomUUID } from "crypto";
+import { mkdir, readFile as readFile2, rename, writeFile } from "fs/promises";
+import { homedir } from "os";
+import { dirname, join as join2 } from "path";
+
+// src/pricing/converter.ts
+function convertPortkeyToModelInfo(portkey) {
+  return {
+    inputPrice: (portkey.request_token?.price ?? 0) * 10,
+    outputPrice: (portkey.response_token?.price ?? 0) * 10,
+    cacheWritesPrice: (portkey.cache_write_input_token?.price ?? 0) * 10,
+    cacheReadsPrice: (portkey.cache_read_input_token?.price ?? 0) * 10
+  };
+}
+
+// src/pricing/portkey-client.ts
+var PORTKEY_BASE_URL = "https://api.portkey.ai/model-configs/pricing";
+var TIMEOUT_MS = 5e3;
+var MAX_RETRIES = 2;
+async function fetchWithTimeout(url, timeoutMs) {
+  const controller = new AbortController();
+  const timeout = setTimeout(() => controller.abort(), timeoutMs);
+  try {
+    const response = await fetch(url, { signal: controller.signal });
+    return response;
+  } finally {
+    clearTimeout(timeout);
+  }
+}
+async function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+function shouldRetry(response, error) {
+  if (error) return true;
+  if (response.status >= 500) return true;
+  return false;
+}
+async function fetchPricing(provider, model) {
+  const url = `${PORTKEY_BASE_URL}/${provider}/${model}`;
+  for (let attempt = 0; attempt <= MAX_RETRIES; attempt++) {
+    try {
+      const response = await fetchWithTimeout(url, TIMEOUT_MS);
+      if (!response.ok) {
+        if (!shouldRetry(response, null)) {
+          return null;
+        }
+        if (attempt < MAX_RETRIES) {
+          await sleep(2 ** attempt * 1e3);
+          continue;
+        }
+        return null;
+      }
+      const data = await response.json();
+      return data;
+    } catch (error) {
+      if (attempt < MAX_RETRIES && shouldRetry(new Response(null, { status: 500 }), error)) {
+        await sleep(2 ** attempt * 1e3);
+        continue;
+      }
+      return null;
+    }
+  }
+  return null;
+}
+
+// src/pricing/pricing-service.ts
+var CACHE_TTL_MS = 7 * 24 * 60 * 60 * 1e3;
+var PricingService = class {
+  #fallbackPrices;
+  #cacheFile;
+  #cache = null;
+  #loadPromise = null;
+  constructor(fallbackPrices = {}) {
+    const normalized = {};
+    for (const [provider, providerInfo] of Object.entries(fallbackPrices)) {
+      const normalizedProvider = provider.split("-")[0];
+      normalized[normalizedProvider] = {};
+      for (const [model, modelInfo] of Object.entries(providerInfo)) {
+        const normalizedModel = model.replace(/[.-]/g, "");
+        normalized[normalizedProvider][normalizedModel] = {
+          inputPrice: modelInfo.inputPrice ?? 0,
+          outputPrice: modelInfo.outputPrice ?? 0,
+          cacheWritesPrice: modelInfo.cacheWritesPrice ?? 0,
+          cacheReadsPrice: modelInfo.cacheReadsPrice ?? 0
+        };
+      }
+    }
+    this.#fallbackPrices = normalized;
+    this.#cacheFile = join2(homedir(), ".config", "polkacodes", "pricing-cache.json");
+  }
+  async #load() {
+    if (this.#loadPromise) {
+      return this.#loadPromise;
+    }
+    this.#loadPromise = (async () => {
+      this.#cache = /* @__PURE__ */ new Map();
+      try {
+        const content = await readFile2(this.#cacheFile, "utf-8");
+        const data = JSON.parse(content);
+        for (const [key, value] of Object.entries(data)) {
+          this.#cache.set(key, value);
+        }
+      } catch {
+      }
+    })();
+    return this.#loadPromise;
+  }
+  async #get(provider, model) {
+    await this.#load();
+    const key = `${provider}:${model}`;
+    const entry = this.#cache?.get(key);
+    if (!entry) {
+      return null;
+    }
+    if (Date.now() - entry.timestamp > CACHE_TTL_MS) {
+      this.#cache?.delete(key);
+      return null;
+    }
+    return entry.pricing;
+  }
+  async #set(provider, model, pricing) {
+    await this.#load();
+    const key = `${provider}:${model}`;
+    this.#cache?.set(key, {
+      pricing,
+      timestamp: Date.now()
+    });
+    await this.#save();
+  }
+  async #save() {
+    if (!this.#cache) {
+      return;
+    }
+    try {
+      const dir = dirname(this.#cacheFile);
+      await mkdir(dir, { recursive: true });
+      const data = {};
+      for (const [key, value] of this.#cache.entries()) {
+        data[key] = value;
+      }
+      const tempFile = `${this.#cacheFile}.${randomUUID()}.tmp`;
+      await writeFile(tempFile, JSON.stringify(data, null, 2), "utf-8");
+      await rename(tempFile, this.#cacheFile);
+    } catch {
+    }
+  }
+  async getPricing(provider, model) {
+    const normalizedProvider = provider.split("-")[0];
+    const normalizedModel = model.replace(/[.-]/g, "");
+    const cached = await this.#get(normalizedProvider, normalizedModel);
+    if (cached) {
+      return cached;
+    }
+    const fallbackPrice = this.#fallbackPrices[normalizedProvider]?.[normalizedModel];
+    if (fallbackPrice) {
+      return fallbackPrice;
+    }
+    const portkeyPricing = await fetchPricing(normalizedProvider, model);
+    if (portkeyPricing) {
+      const modelInfo = convertPortkeyToModelInfo(portkeyPricing);
+      await this.#set(normalizedProvider, normalizedModel, modelInfo);
+      return modelInfo;
+    }
+    return {
+      inputPrice: 0,
+      outputPrice: 0,
+      cacheWritesPrice: 0,
+      cacheReadsPrice: 0
+    };
+  }
+};
+
 // src/skills/constants.ts
 var SKILL_LIMITS = {
   MAX_FILE_SIZE: 1024 * 1024,
@@ -456,7 +651,7 @@ var SOURCE_ICONS = {
 };
 
 // src/skills/discovery.ts
-import { homedir } from "os";
+import { homedir as homedir2 } from "os";
 import { parse } from "yaml";
 import { ZodError } from "zod";
 
@@ -546,7 +741,7 @@ var SkillDiscoveryService = class {
   pluginSkillsDirs;
   constructor(options) {
     this.fs = options.fs ?? new NodeFileSystemProvider();
-    this.personalSkillsDir = options.personalSkillsDir ?? this.fs.join(homedir(), ".claude", "skills");
+    this.personalSkillsDir = options.personalSkillsDir ?? this.fs.join(homedir2(), ".claude", "skills");
     this.projectSkillsDir = this.fs.join(options.cwd, ".claude", "skills");
     this.pluginSkillsDirs = options.pluginSkillsDirs ?? [];
   }
@@ -788,19 +983,19 @@ var SkillDiscoveryService = class {
 };
 
 // src/skills/validation.ts
-import { join as join2, normalize as normalize2 } from "path";
+import { join as join3, normalize as normalize2 } from "path";
 function validateSkillSecurity(skill) {
   const { MAX_FILE_SIZE, MAX_SKILL_SIZE } = SKILL_LIMITS;
   let totalSize = 0;
   const contentSize = Buffer.byteLength(skill.content, "utf8");
   if (contentSize > MAX_FILE_SIZE) {
-    throw new SkillValidationError(`SKILL.md content exceeds size limit (${contentSize} > ${MAX_FILE_SIZE})`, join2(skill.path, "SKILL.md"));
+    throw new SkillValidationError(`SKILL.md content exceeds size limit (${contentSize} > ${MAX_FILE_SIZE})`, join3(skill.path, "SKILL.md"));
   }
   totalSize += contentSize;
   for (const [filename, content] of skill.files) {
     const fileSize = Buffer.byteLength(content, "utf8");
     if (fileSize > MAX_FILE_SIZE) {
-      throw new SkillValidationError(`File ${filename} exceeds size limit (${fileSize} > ${MAX_FILE_SIZE})`, join2(skill.path, filename));
+      throw new SkillValidationError(`File ${filename} exceeds size limit (${fileSize} > ${MAX_FILE_SIZE})`, join3(skill.path, filename));
     }
     totalSize += fileSize;
   }
@@ -809,7 +1004,7 @@ function validateSkillSecurity(skill) {
   }
   validateContentSecurity(skill.content, skill.path);
   for (const [filename, content] of skill.files) {
-    validateContentSecurity(content, join2(skill.path, filename));
+    validateContentSecurity(content, join3(skill.path, filename));
   }
 }
 function validateContentSecurity(content, path) {
@@ -2268,12 +2463,22 @@ 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 = [];
+  #pendingUpdates = /* @__PURE__ */ new Set();
   #modelInfos;
   #maxMessages;
   #maxCost;
+  #pricingService;
   constructor(modelInfos = {}, opts = {}) {
     const infos = {};
     for (const [provider, providerInfo] of Object.entries(modelInfos)) {
@@ -2289,80 +2494,126 @@ var UsageMeter = class {
     this.#modelInfos = infos;
     this.#maxMessages = opts.maxMessages ?? 1e3;
     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
         };
       }
     }
   }
   addUsage(llm, resp, options = {}) {
-    const modelInfo = options.modelInfo ?? // make google.vertex.chat to google
-    // and anthropic.messages to anthropic
-    this.#modelInfos[`${llm.provider.split(".")[0]}:${llm.modelId.replace(/[.-]/g, "")}`] ?? {
-      inputPrice: 0,
-      outputPrice: 0,
-      cacheWritesPrice: 0,
-      cacheReadsPrice: 0
-    };
-    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;
-    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 provider = llm.provider.split(".")[0];
+    const normalizedModel = llm.modelId.replace(/[.-]/g, "");
+    const key = `${provider}:${normalizedModel}`;
+    let modelInfo = options.modelInfo ?? this.#modelInfos[key];
+    const updatePromise = (async () => {
+      try {
+        if (!modelInfo && this.#pricingService) {
+          modelInfo = await this.#pricingService.getPricing(provider, llm.modelId);
+          this.#modelInfos[key] = modelInfo;
+        }
+      } catch {
+        modelInfo = ZERO_PRICING;
+      }
+      modelInfo = modelInfo ?? ZERO_PRICING;
+      const usage = "totalUsage" in resp ? resp.totalUsage : resp.usage;
+      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] || 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);
+    updatePromise.finally(() => {
+      this.#pendingUpdates.delete(updatePromise);
+    });
+    return updatePromise;
   }
   /** Override the running totals (e.g., restore from saved state). */
   setUsage(newUsage, options = {}) {
@@ -2421,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++;
@@ -2453,13 +2705,18 @@ var UsageMeter = class {
     this.#totals.messageCount += otherUsage.messageCount;
     this.#providerMetadataEntries.push(...other.providerMetadata);
   }
+  /** Wait for all pending usage updates to complete. */
+  async waitForPending() {
+    const pending = Array.from(this.#pendingUpdates);
+    await Promise.allSettled(pending);
+  }
   getUsageText() {
     const u = this.usage;
     return `Usage - messages: ${u.messageCount}, input: ${u.input}, cached: ${u.cachedRead}, output: ${u.output}, cost: $${u.cost.toFixed(4)}`;
   }
   onFinishHandler(llm) {
-    return (evt) => {
-      this.addUsage(llm, evt);
+    return async (evt) => {
+      await this.addUsage(llm, evt);
     };
   }
 };
@@ -2497,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;
@@ -2610,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,
@@ -2621,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,
@@ -3776,6 +4042,7 @@ export {
   LoadSkillOutputSchema,
   MockProvider,
   NodeFileSystemProvider,
+  PricingService,
   ReadSkillFileInputSchema,
   ReadSkillFileOutputSchema,
   SKILL_ERROR_MESSAGES,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polka-codes/core",
-  "version": "0.9.101",
+  "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"
   }