@standardagents/builder 0.24.4 → 0.24.6

package/dist/runtime.d.ts

@@ -1,5 +1,5 @@
-import { e as ThreadEnv, A as Agent, h as ThreadMetadata, i as ToolResult, M as Message, l as FileRecord, F as FlowState, n as FileStats, G as GrepResult, m as AttachmentRef, r as MessageContent, E as Env, g as ThreadInstance } from './index-jDKWlMKG.js';
-export { f as BuilderThreadEndpointHandler, B as Controller, a as ControllerContext, j as FlowResult, p as ImageContentPart, I as ImageMetadata, L as LLMResponse, q as MultimodalContent, R as RequestContext, S as StorageBackend, k as TelemetryEvent, o as TextContentPart, b as ThreadEndpointContext, T as ToolCall, c as createThreadEndpointHandler, d as defineController } from './index-jDKWlMKG.js';
+import { e as ThreadEnv, A as Agent, h as ThreadMetadata, i as ToolResult, M as Message, l as FileRecord, F as FlowState, n as FileStats, G as GrepResult, m as AttachmentRef, r as MessageContent, E as Env, g as ThreadInstance } from './index-D3FNNQWC.js';
+export { f as BuilderThreadEndpointHandler, B as Controller, a as ControllerContext, j as FlowResult, p as ImageContentPart, I as ImageMetadata, L as LLMResponse, q as MultimodalContent, R as RequestContext, S as StorageBackend, k as TelemetryEvent, o as TextContentPart, b as ThreadEndpointContext, T as ToolCall, c as createThreadEndpointHandler, d as defineController } from './index-D3FNNQWC.js';
 import { CodeExecutionOptions, CodeExecutionResult, SubagentRegistryEntry, InjectMessageInput, QueueMessageInput, ClientToolRequest, ClientToolResponse, SkillMetadata, SkillFileInput, ModelDefinition as ModelDefinition$1, ToolArgs, PromptTextPart, PromptEnvPart, VariableDefinition, SubpromptConfig as SubpromptConfig$1, PromptToolConfig as PromptToolConfig$1, SubagentToolConfig as SubagentToolConfig$1, ReasoningConfig, SideConfig as SideConfig$1, LLMProviderInterface, ContentPart, TextPart, ImagePart, FilePart, NamespaceContext, DefinitionLoader } from '@standardagents/spec';
 export { AgentType, DefinitionLoader, GlobalNamespaceContext, HookSignatures, ImageContent, ModelCapabilities, ModelProvider, NamespaceContext, PackageSignature, PackedExports, PackedMeta, PackedMetadata, PackedNamespaceContext, PromptInput, PromptTextPart, ProviderAssistantMessage, ProviderError, ProviderErrorCode, ProviderFactory, ProviderFactoryConfig, ProviderFinishReason, ProviderGeneratedImage, ProviderMessage, ProviderMessageContent, ModelCapabilities as ProviderModelCapabilities, ProviderReasoningDetail, ProviderRequest, ProviderResponse, ProviderStreamChunk, ProviderSystemMessage, ProviderTool, ProviderToolCallPart, ProviderToolMessage, ProviderToolResultContent, ProviderUsage, ProviderUserMessage, ReasoningConfig, StructuredPrompt, TextContent, Tool, ToolArgs, ToolArgsNode, ToolArgsRawShape, ToolContent, belongsToPackage, defineAgent, defineHook, defineModel, definePrompt, defineTool, isPacked, isVisibleInNamespace, mapReasoningLevel } from '@standardagents/spec';
 import { DurableObject, WorkerEntrypoint } from 'cloudflare:workers';
@@ -738,6 +738,7 @@ declare class DurableThread<Env extends ThreadEnv = ThreadEnv> extends DurableOb
             error: string | null;
             cost_total: number | null;
             input_tokens: number | null;
+            cached_tokens: number | null;
             output_tokens: number | null;
             total_tokens: number | null;
             is_complete: boolean;
@@ -755,10 +756,16 @@ declare class DurableThread<Env extends ThreadEnv = ThreadEnv> extends DurableOb
      */
     getCostSummary(): Promise<{
         totalCost: number;
+        inputCost: number;
+        cachedCost: number;
+        outputCost: number;
         requestCount: number;
         messageCount: number;
         byModel: Record<string, {
             totalCost: number;
+            inputCost: number;
+            cachedCost: number;
+            outputCost: number;
             count: number;
         }>;
     }>;
@@ -846,6 +853,7 @@ declare class DurableThread<Env extends ThreadEnv = ThreadEnv> extends DurableOb
         error: string | null;
         error_type: string | null;
         cost_input: number | null;
+        cost_cached: number | null;
         cost_output: number | null;
         cost_total: number | null;
         message_history_length: number | null;

package/dist/runtime.js

@@ -208,6 +208,18 @@ function getFallbackPricing(providerName, modelId) {
   const pricing = getProviderModelPricing(providerName, modelId);
   return pricing ? toResolvedModelPricing(pricing) : null;
 }
+function resolveUsageReportedPricing(usage) {
+  const pricing = usage.pricing;
+  if (!pricing || typeof pricing.inputPerMillion !== "number" || typeof pricing.outputPerMillion !== "number") {
+    return null;
+  }
+  return {
+    inputPrice: pricing.inputPerMillion,
+    outputPrice: pricing.outputPerMillion,
+    cachedPrice: pricing.cachedInputPerMillion,
+    source: "provider"
+  };
+}
 function resolveModelPricing(modelDef, providerName) {
   if (typeof modelDef.inputPrice === "number" && typeof modelDef.outputPrice === "number") {
     return {
@@ -236,14 +248,14 @@ function calculateUsageCost(usage, pricing) {
   const inputPrice = useLongContext ? pricing.longInputPrice ?? pricing.inputPrice : pricing.inputPrice;
   const outputPrice = useLongContext ? pricing.longOutputPrice ?? pricing.outputPrice : pricing.outputPrice;
   const cachedTokenPrice = useLongContext ? pricing.longCachedPrice ?? pricing.cachedPrice ?? pricing.inputPrice : pricing.cachedPrice ?? pricing.inputPrice;
-  const costInput = roundCost(
-    (uncachedPromptTokens * inputPrice + cachedTokens * cachedTokenPrice) / TOKENS_PER_MILLION
-  );
+  const costInput = roundCost(uncachedPromptTokens * inputPrice / TOKENS_PER_MILLION);
+  const costCached = roundCost(cachedTokens * cachedTokenPrice / TOKENS_PER_MILLION);
   const costOutput = roundCost(billableOutputTokens * outputPrice / TOKENS_PER_MILLION);
   return {
     costInput,
+    costCached,
     costOutput,
-    costTotal: roundCost(costInput + costOutput)
+    costTotal: roundCost(costInput + costCached + costOutput)
   };
 }
 var TOKENS_PER_MILLION;
@@ -1349,7 +1361,8 @@ function convertUsage(usage) {
     prompt_tokens_details: usage.cachedTokens ? { cached_tokens: usage.cachedTokens } : void 0,
     completion_tokens_details: usage.reasoningTokens ? { reasoning_tokens: usage.reasoningTokens } : void 0,
     cost: usage.cost,
-    provider: usage.provider
+    provider: usage.provider,
+    pricing: usage.pricing
   };
 }
 function inferProviderFromModelId(model) {
@@ -2044,7 +2057,7 @@ var init_LLMRequest = __esm({
           const toolsCalled = response.tool_calls ? JSON.stringify(response.tool_calls.map((tc) => tc.function.name)) : null;
           const providerName = response._provider?.name;
           const standardAgentsRouterUsed = response._viaPlatform === true || providerName === "platform";
-          const resolvedPricing = resolveModelPricing(modelDef, providerName);
+          const resolvedPricing = resolveModelPricing(modelDef) ?? resolveUsageReportedPricing(response.usage) ?? resolveModelPricing(modelDef, providerName);
           const calculatedCost = calculateUsageCost(response.usage, resolvedPricing);
           const providerReportedCost = typeof response.usage.cost === "number" ? response.usage.cost : typeof response.usage.cost === "string" ? parseFloat(response.usage.cost) : null;
           const cost_total = providerReportedCost != null && !Number.isNaN(providerReportedCost) ? providerReportedCost : calculatedCost?.costTotal ?? null;
@@ -2111,6 +2124,7 @@ var init_LLMRequest = __esm({
             reasoning_tokens: response.usage.completion_tokens_details?.reasoning_tokens || 0,
             total_tokens: response.usage.total_tokens,
             cost_input: calculatedCost?.costInput,
+            cost_cached: calculatedCost?.costCached,
             cost_output: calculatedCost?.costOutput,
             latency_ms: Date.now() - startTime,
             time_to_first_token_ms: timing?.latencyMs ?? void 0,
@@ -2140,19 +2154,20 @@ var init_LLMRequest = __esm({
               reasoning_tokens = ?5,
               total_tokens = ?6,
               cost_input = ?7,
-              cost_output = ?8,
-              latency_ms = ?9,
-              finish_reason = ?10,
-              tools_called = ?11,
-              cost_total = ?12,
-              is_complete = ?13,
-              reasoning_content = ?14,
-              provider_tools = ?15,
-              actual_provider = ?16,
-              standard_agents_router_used = ?17,
-              time_to_first_token_ms = ?18,
-              generation_ms = ?19
-            WHERE id = ?20
+              cost_cached = ?8,
+              cost_output = ?9,
+              latency_ms = ?10,
+              finish_reason = ?11,
+              tools_called = ?12,
+              cost_total = ?13,
+              is_complete = ?14,
+              reasoning_content = ?15,
+              provider_tools = ?16,
+              actual_provider = ?17,
+              standard_agents_router_used = ?18,
+              time_to_first_token_ms = ?19,
+              generation_ms = ?20
+            WHERE id = ?21
           `,
                 logData.response_body,
                 logData.input_tokens,
@@ -2161,6 +2176,7 @@ var init_LLMRequest = __esm({
                 logData.reasoning_tokens,
                 logData.total_tokens,
                 logData.cost_input ?? null,
+                logData.cost_cached ?? null,
                 logData.cost_output ?? null,
                 logData.latency_ms,
                 logData.finish_reason,
@@ -14671,8 +14687,23 @@ var migration31 = {
   }
 };
 
+// src/durable-objects/migrations/032_add_cost_cached.ts
+var migration32 = {
+  version: 32,
+  name: "add_cost_cached",
+  async up(sql) {
+    const tableInfo = sql.exec(`PRAGMA table_info(logs)`).toArray();
+    const hasCostCached = tableInfo.some((col) => col.name === "cost_cached");
+    if (!hasCostCached) {
+      await sql.exec(`
+        ALTER TABLE logs ADD COLUMN cost_cached REAL;
+      `);
+    }
+  }
+};
+
 // src/durable-objects/migrations/index.ts
-var migrations = [migration, migration2, migration3, migration4, migration5, migration6, migration7, migration8, migration9, migration10, migration11, migration12, migration13, migration14, migration15, migration16, migration17, migration18, migration19, migration20, migration21, migration22, migration23, migration24, migration25, migration26, migration27, migration28, migration29, migration30, migration31];
+var migrations = [migration, migration2, migration3, migration4, migration5, migration6, migration7, migration8, migration9, migration10, migration11, migration12, migration13, migration14, migration15, migration16, migration17, migration18, migration19, migration20, migration21, migration22, migration23, migration24, migration25, migration26, migration27, migration28, migration29, migration30, migration31, migration32];
 var LATEST_SCHEMA_VERSION = migrations.length;
 
 // src/durable-objects/DurableThread.ts
@@ -16152,8 +16183,10 @@ var DurableThread = class _DurableThread extends DurableObject {
   async setValue(key, value) {
     await this.ensureMigrated();
     this.assertValidThreadValueKey(key);
+    const updatedAt = Date.now() * 1e3;
     if (value === null || value === void 0) {
       await this.ctx.storage.sql.exec(`DELETE FROM thread_values WHERE key = ?`, key);
+      this.broadcastLog({ type: "kv_data", key, deleted: true, updated_at: updatedAt });
       return;
     }
     const serialized = this.serializeThreadValue(value);
@@ -16167,8 +16200,9 @@ var DurableThread = class _DurableThread extends DurableObject {
     `,
       key,
       serialized,
-      Date.now() * 1e3
+      updatedAt
     );
+    this.broadcastLog({ type: "kv_data", key, deleted: false, updated_at: updatedAt });
   }
   async listValues(options = {}) {
     await this.ensureMigrated();
@@ -16788,9 +16822,9 @@ var DurableThread = class _DurableThread extends DurableObject {
    * Each migration is run in order, starting from the current version + 1.
    */
   async runMigrations(fromVersion) {
-    for (const migration42 of migrations) {
-      if (migration42.version > fromVersion) {
-        await migration42.up(this.ctx.storage.sql);
+    for (const migration43 of migrations) {
+      if (migration43.version > fromVersion) {
+        await migration43.up(this.ctx.storage.sql);
       }
     }
   }
@@ -18224,7 +18258,7 @@ ${resultContent}${attachmentSummary}`;
         SELECT
           id, message_id, provider, actual_provider, standard_agents_router_used, model, model_name, prompt_name,
           tools_called, queued_tools, provider_tools, parent_log_id, retry_of_log_id, error, cost_total,
-          input_tokens, output_tokens, total_tokens,
+          input_tokens, cached_tokens, output_tokens, total_tokens,
           is_complete, created_at, request_body
         FROM logs
         ORDER BY created_at ${order}
@@ -18250,6 +18284,7 @@ ${resultContent}${attachmentSummary}`;
         error: row.error,
         cost_total: row.cost_total,
         input_tokens: row.input_tokens,
+        cached_tokens: row.cached_tokens,
         output_tokens: row.output_tokens,
         total_tokens: row.total_tokens,
         is_complete: row.is_complete === 1,
@@ -18273,11 +18308,17 @@ ${resultContent}${attachmentSummary}`;
     await this.ensureMigrated();
     const byModel = {};
     let totalCost = 0;
+    let inputCost = 0;
+    let cachedCost = 0;
+    let outputCost = 0;
     let requestCount = 0;
     const modelRows = await this.ctx.storage.sql.exec(
       `
       SELECT COALESCE(model_name, model, 'unknown') AS model_key,
              SUM(cost_total) AS total_cost,
+             SUM(CASE WHEN cost_cached IS NOT NULL THEN cost_input END) AS input_cost,
+             SUM(cost_cached) AS cached_cost,
+             SUM(cost_output) AS output_cost,
              COUNT(*) AS request_count
       FROM logs
       WHERE cost_total IS NOT NULL
@@ -18285,15 +18326,32 @@ ${resultContent}${attachmentSummary}`;
       `
     );
     for (const row of modelRows.toArray()) {
-      byModel[row.model_key] = { totalCost: row.total_cost, count: row.request_count };
+      byModel[row.model_key] = {
+        totalCost: row.total_cost,
+        inputCost: row.input_cost ?? 0,
+        cachedCost: row.cached_cost ?? 0,
+        outputCost: row.output_cost ?? 0,
+        count: row.request_count
+      };
       totalCost += row.total_cost;
+      inputCost += row.input_cost ?? 0;
+      cachedCost += row.cached_cost ?? 0;
+      outputCost += row.output_cost ?? 0;
       requestCount += row.request_count;
     }
     const messageRow = await this.ctx.storage.sql.exec(
       `SELECT COUNT(DISTINCT message_id) AS message_count FROM logs WHERE cost_total IS NOT NULL`
     );
     const messageCount = messageRow.one().message_count || 0;
-    return { totalCost, requestCount, messageCount, byModel };
+    return {
+      totalCost,
+      inputCost,
+      cachedCost,
+      outputCost,
+      requestCount,
+      messageCount,
+      byModel
+    };
   }
   /**
    * Get specific logs, optionally including all descendant logs.
@@ -18506,7 +18564,7 @@ ${resultContent}${attachmentSummary}`;
           l.request_body, l.request_headers, l.response_body, l.response_headers,
           l.status_code, l.reasoning_content, l.input_tokens, l.cached_tokens, l.output_tokens,
           l.reasoning_tokens, l.total_tokens, l.latency_ms, l.time_to_first_token_ms, l.generation_ms,
-          l.finish_reason, l.error, l.error_type, l.cost_input, l.cost_output, l.cost_total,
+          l.finish_reason, l.error, l.error_type, l.cost_input, l.cost_cached, l.cost_output, l.cost_total,
           l.message_history_length, l.tools_available, l.prompt_name, l.tools_called,
           l.queued_tools, l.provider_tools, l.parent_log_id, l.tools_schema, l.system_prompt,
           l.errors, l.retry_of_log_id, l.tool_results, l.is_complete, l.created_at,
@@ -18596,6 +18654,7 @@ ${resultContent}${attachmentSummary}`;
         error: row.error,
         error_type: row.error_type,
         cost_input: row.cost_input,
+        cost_cached: row.cost_cached,
         cost_output: row.cost_output,
         cost_total: row.cost_total,
         message_history_length: row.message_history_length,
@@ -19095,6 +19154,7 @@ ${resultContent}${attachmentSummary}`;
    * Broadcast a log record to all connected WebSocket clients
    */
   broadcastLog(log) {
+    if (!this.logSockets || this.logSockets.size === 0) return;
     const payload = JSON.stringify(log);
     for (const ws of Array.from(this.logSockets)) {
       try {
@@ -20498,7 +20558,7 @@ ${resultContent}${attachmentSummary}`;
 };
 
 // src/durable-objects/agentbuilder-migrations/0001_initial.ts
-var migration32 = {
+var migration33 = {
   version: 1,
   async up(sql) {
     sql.exec(`
@@ -20597,7 +20657,7 @@ var migration32 = {
 };
 
 // src/durable-objects/agentbuilder-migrations/0002_add_tenvs_properties.ts
-var migration33 = {
+var migration34 = {
   version: 2,
   async up(sql) {
     sql.exec(`ALTER TABLE threads ADD COLUMN tenvs TEXT`);
@@ -20609,7 +20669,7 @@ var migration33 = {
 };
 
 // src/durable-objects/agentbuilder-migrations/0003_add_parent_and_terminated.ts
-var migration34 = {
+var migration35 = {
   version: 3,
   async up(sql) {
     sql.exec(`ALTER TABLE threads ADD COLUMN parent TEXT REFERENCES threads(id)`);
@@ -20622,7 +20682,7 @@ var migration34 = {
 };
 
 // src/durable-objects/agentbuilder-migrations/0004_add_env_tables.ts
-var migration35 = {
+var migration36 = {
   version: 4,
   async up(sql) {
     sql.exec(`ALTER TABLE threads ADD COLUMN env TEXT`);
@@ -20646,7 +20706,7 @@ var migration35 = {
 };
 
 // src/durable-objects/agentbuilder-migrations/0005_add_pending_subagent_env_requests.ts
-var migration36 = {
+var migration37 = {
   version: 5,
   async up(sql) {
     sql.exec(`
@@ -20672,7 +20732,7 @@ var migration36 = {
 };
 
 // src/durable-objects/agentbuilder-migrations/0006_add_env_value_types.ts
-var migration37 = {
+var migration38 = {
   version: 6,
   async up(sql) {
     sql.exec(
@@ -20687,7 +20747,7 @@ var migration37 = {
 };
 
 // src/durable-objects/agentbuilder-migrations/0007_platform_identity_replica.ts
-var migration38 = {
+var migration39 = {
   version: 7,
   async up(sql) {
     sql.exec(`ALTER TABLE users ADD COLUMN platform_user_id TEXT`);
@@ -20716,7 +20776,7 @@ var migration38 = {
 };
 
 // src/durable-objects/agentbuilder-migrations/0008_add_skills.ts
-var migration39 = {
+var migration40 = {
   version: 8,
   async up(sql) {
     sql.exec(`
@@ -20747,7 +20807,7 @@ var migration39 = {
 };
 
 // src/durable-objects/agentbuilder-migrations/0009_add_user_permissions.ts
-var migration40 = {
+var migration41 = {
   version: 9,
   async up(sql) {
     sql.exec(`ALTER TABLE users ADD COLUMN permissions TEXT`);
@@ -20758,7 +20818,7 @@ var migration40 = {
 };
 
 // src/durable-objects/agentbuilder-migrations/0010_add_device_logins.ts
-var migration41 = {
+var migration42 = {
   version: 10,
   async up(sql) {
     sql.exec(`
@@ -20778,7 +20838,7 @@ var migration41 = {
 };
 
 // src/durable-objects/agentbuilder-migrations/index.ts
-var migrations2 = [migration32, migration33, migration34, migration35, migration36, migration37, migration38, migration39, migration40, migration41];
+var migrations2 = [migration33, migration34, migration35, migration36, migration37, migration38, migration39, migration40, migration41, migration42];
 var LATEST_SCHEMA_VERSION2 = 10;
 
 // src/utils/crypto.ts
@@ -21541,9 +21601,9 @@ ${result ?? error ?? "No result content."}${attachmentSummary}`;
     }
   }
   async runMigrations(fromVersion) {
-    for (const migration42 of migrations2) {
-      if (migration42.version > fromVersion) {
-        await migration42.up(this.ctx.storage.sql);
+    for (const migration43 of migrations2) {
+      if (migration43.version > fromVersion) {
+        await migration43.up(this.ctx.storage.sql);
       }
     }
   }