agentic-kit 1.2.0 → 1.3.1

package/esm/index.js

@@ -2,7 +2,7 @@ import { ANTHROPIC_MODELS, AnthropicAdapter } from '@agentic-kit/anthropic';
 import { OLLAMA_MODELS, OllamaAdapter, OllamaClient } from '@agentic-kit/ollama';
 import { OPENAI_COMPATIBLE_MODELS, OpenAIAdapter, } from '@agentic-kit/openai';
 import { createAssistantMessageEventStream, EventStream } from './event-stream.js';
-import { getMessageText, normalizeContext } from './messages.js';
+import { createEmptyUsage, getMessageText, normalizeContext } from './messages.js';
 import { clearModels, getModel, getModels, getProviders as getModelProviders, registerModel, registerModels, } from './model-registry.js';
 import { clearProviders, getProvider as getRegisteredProvider, getProviders as getRegisteredProviders, registerProvider, unregisterProviders, } from './provider-registry.js';
 import { transformMessages } from './transform-messages.js';
@@ -128,14 +128,7 @@ function legacyInputToContext(input) {
                 provider: 'legacy',
                 model: input.model,
                 content: [{ type: 'text', text: message.content }],
-                usage: {
-                    input: 0,
-                    output: 0,
-                    cacheRead: 0,
-                    cacheWrite: 0,
-                    totalTokens: 0,
-                    cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 },
-                },
+                usage: createEmptyUsage(),
                 stopReason: 'stop',
                 timestamp: Date.now(),
             }

package/esm/messages.js

@@ -2,6 +2,7 @@ export function createEmptyUsage() {
     return {
         input: 0,
         output: 0,
+        reasoning: 0,
         cacheRead: 0,
         cacheWrite: 0,
         totalTokens: 0,
@@ -22,7 +23,23 @@ export function calculateUsageCost(model, usage) {
     usage.cost.cacheWrite = ((schedule?.cacheWrite ?? 0) / 1_000_000) * usage.cacheWrite;
     usage.cost.total =
         usage.cost.input + usage.cost.output + usage.cost.cacheRead + usage.cost.cacheWrite;
-    return usage.cost;
+}
+export function snapshotUsage(usage) {
+    return { ...usage, cost: { ...usage.cost } };
+}
+export function addUsage(target, delta) {
+    target.input += delta.input;
+    target.output += delta.output;
+    target.reasoning += delta.reasoning;
+    target.cacheRead += delta.cacheRead;
+    target.cacheWrite += delta.cacheWrite;
+    target.totalTokens += delta.totalTokens;
+    target.cost.input += delta.cost.input;
+    target.cost.output += delta.cost.output;
+    target.cost.cacheRead += delta.cost.cacheRead;
+    target.cost.cacheWrite += delta.cost.cacheWrite;
+    target.cost.total += delta.cost.total;
+    return target;
 }
 export function createAssistantMessage(model) {
     return {

package/index.js

@@ -167,14 +167,7 @@ function legacyInputToContext(input) {
                 provider: 'legacy',
                 model: input.model,
                 content: [{ type: 'text', text: message.content }],
-                usage: {
-                    input: 0,
-                    output: 0,
-                    cacheRead: 0,
-                    cacheWrite: 0,
-                    totalTokens: 0,
-                    cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 },
-                },
+                usage: (0, messages_js_1.createEmptyUsage)(),
                 stopReason: 'stop',
                 timestamp: Date.now(),
             }

package/messages.d.ts

@@ -1,6 +1,8 @@
 import type { AssistantMessage, Context, ImageContent, Message, ModelDescriptor, TextContent, ToolCallContent, ToolResultMessage, Usage, UserMessage } from './types.js';
 export declare function createEmptyUsage(): Usage;
-export declare function calculateUsageCost(model: ModelDescriptor, usage: Usage): Usage['cost'];
+export declare function calculateUsageCost(model: ModelDescriptor, usage: Usage): void;
+export declare function snapshotUsage(usage: Usage): Usage;
+export declare function addUsage(target: Usage, delta: Usage): Usage;
 export declare function createAssistantMessage(model: ModelDescriptor): AssistantMessage;
 export declare function createTextContent(text?: string): TextContent;
 export declare function createImageContent(data: string, mimeType: string): ImageContent;

package/messages.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createEmptyUsage = createEmptyUsage;
 exports.calculateUsageCost = calculateUsageCost;
+exports.snapshotUsage = snapshotUsage;
+exports.addUsage = addUsage;
 exports.createAssistantMessage = createAssistantMessage;
 exports.createTextContent = createTextContent;
 exports.createImageContent = createImageContent;
@@ -16,6 +18,7 @@ function createEmptyUsage() {
     return {
         input: 0,
         output: 0,
+        reasoning: 0,
         cacheRead: 0,
         cacheWrite: 0,
         totalTokens: 0,
@@ -36,7 +39,23 @@ function calculateUsageCost(model, usage) {
     usage.cost.cacheWrite = ((schedule?.cacheWrite ?? 0) / 1_000_000) * usage.cacheWrite;
     usage.cost.total =
         usage.cost.input + usage.cost.output + usage.cost.cacheRead + usage.cost.cacheWrite;
-    return usage.cost;
+}
+function snapshotUsage(usage) {
+    return { ...usage, cost: { ...usage.cost } };
+}
+function addUsage(target, delta) {
+    target.input += delta.input;
+    target.output += delta.output;
+    target.reasoning += delta.reasoning;
+    target.cacheRead += delta.cacheRead;
+    target.cacheWrite += delta.cacheWrite;
+    target.totalTokens += delta.totalTokens;
+    target.cost.input += delta.cost.input;
+    target.cost.output += delta.cost.output;
+    target.cost.cacheRead += delta.cost.cacheRead;
+    target.cost.cacheWrite += delta.cost.cacheWrite;
+    target.cost.total += delta.cost.total;
+    return target;
 }
 function createAssistantMessage(model) {
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentic-kit",
-  "version": "1.2.0",
+  "version": "1.3.1",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "description": "Provider-agnostic LLM adapter with streaming and multi-turn support",
   "main": "index.js",
@@ -37,10 +37,10 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@agentic-kit/anthropic": "1.2.0",
-    "@agentic-kit/ollama": "1.2.0",
-    "@agentic-kit/openai": "1.2.0"
+    "@agentic-kit/anthropic": "1.2.1",
+    "@agentic-kit/ollama": "2.0.0",
+    "@agentic-kit/openai": "1.2.1"
   },
   "keywords": [],
-  "gitHead": "d4f3f660be621267efe12671c22db202ccdb3f0b"
+  "gitHead": "c2b13e65b26f14c9983e9b7cc4eafbe4919b13d4"
 }

package/types.d.ts

@@ -84,6 +84,7 @@ export interface ToolCallContent {
 export interface Usage {
     input: number;
     output: number;
+    reasoning: number;
     cacheRead: number;
     cacheWrite: number;
     totalTokens: number;