@sprucelabs/sprucebot-llm 16.0.0 → 17.0.0

package/build/.spruce/settings.json

@@ -11,7 +11,7 @@
     "error"
   ],
   "regressionproof": {
-    "enabled": false,
+    "enabled": true,
     "projectName": "sprucebot-llm"
   }
 }

package/build/bots/adapters/AnthropicAdapter.d.ts

@@ -1,7 +1,7 @@
 import { Schema } from '@sprucelabs/schema';
 import { Log } from '@sprucelabs/spruce-skill-utils';
 import Anthropic from '@anthropic-ai/sdk';
-import { LlmAdapter, SprucebotLlmBot, SendMessageOptions, LllmReasoningEffort } from '../../llm.types';
+import { LlmAdapter, SprucebotLlmBot, SendMessageOptions, LllmReasoningEffort, LmmTokenUsage } from '../../llm.types';
 export default class AnthropicAdapter implements LlmAdapter {
     static Class?: new (apiKey: string, options?: AnthropicAdapterOptions) => LlmAdapter;
     static Anthropic: typeof Anthropic;
@@ -12,6 +12,7 @@ export default class AnthropicAdapter implements LlmAdapter {
     private memoryLimit?;
     private isThinkingEnabled;
     private log?;
+    private usage;
     private constructor();
     static Adapter(apiKey: string, options: AnthropicAdapterOptions): LlmAdapter;
     sendMessage(bot: SprucebotLlmBot<Schema>, options?: SendMessageOptions): Promise<string>;
@@ -19,6 +20,7 @@ export default class AnthropicAdapter implements LlmAdapter {
     setModel(model: string): void;
     setReasoningEffort(effort: LllmReasoningEffort): void;
     setMemoryLimit(limit: number): void;
+    getTokenUsage(): LmmTokenUsage;
 }
 export interface AnthropicAdapterOptions {
     log?: Log;

package/build/bots/adapters/AnthropicAdapter.js

@@ -10,6 +10,13 @@ class AnthropicAdapter {
     constructor(apiKey, options) {
         this.model = 'claude-sonnet-4-5';
         this.isThinkingEnabled = false;
+        this.usage = {
+            inputTokens: 0,
+            outputTokens: 0,
+            totalTokens: 0,
+            cacheCreationTokens: 0,
+            cacheReadTokens: 0,
+        };
         (0, schema_1.assertOptions)({ apiKey, maxTokens: options?.maxTokens }, [
             'apiKey',
             'maxTokens',
@@ -68,6 +75,17 @@ class AnthropicAdapter {
         }, sendOptions);
         const { usage } = response;
         this.log?.info(`[TOKEN USAGE] input=${usage.input_tokens} cache_create=${usage.cache_creation_input_tokens ?? 0} cache_read=${usage.cache_read_input_tokens ?? 0} output=${usage.output_tokens}`);
+        this.usage = {
+            inputTokens: this.usage.inputTokens + usage.input_tokens,
+            outputTokens: this.usage.outputTokens + usage.output_tokens,
+            totalTokens: this.usage.totalTokens +
+                usage.input_tokens +
+                usage.output_tokens,
+            cacheCreationTokens: (this.usage.cacheCreationTokens ?? 0) +
+                (usage.cache_creation_input_tokens ?? 0),
+            cacheReadTokens: (this.usage.cacheReadTokens ?? 0) +
+                (usage.cache_read_input_tokens ?? 0),
+        };
         const text = response.content
             .filter((block) => block.type === 'text')
             ?.map((block) => block.text)
@@ -84,6 +102,9 @@ class AnthropicAdapter {
     setMemoryLimit(limit) {
         this.memoryLimit = limit;
     }
+    getTokenUsage() {
+        return this.usage;
+    }
 }
 AnthropicAdapter.Anthropic = sdk_1.default;
 exports.default = AnthropicAdapter;

package/build/bots/adapters/OllamaAdapter.d.ts

@@ -1,6 +1,6 @@
 import { Schema } from '@sprucelabs/schema';
 import { Log } from '@sprucelabs/spruce-skill-utils';
-import { LlmAdapter, SprucebotLlmBot, SendMessageOptions, LllmReasoningEffort } from '../../llm.types';
+import { LlmAdapter, SprucebotLlmBot, SendMessageOptions, LllmReasoningEffort, LmmTokenUsage } from '../../llm.types';
 export default class OllamaAdapter implements LlmAdapter {
     static Class?: new (apiKey: string, options?: OllamaAdapterOptions) => LlmAdapter;
     private openai;
@@ -11,6 +11,7 @@ export default class OllamaAdapter implements LlmAdapter {
     setModel(model: string): void;
     setReasoningEffort(effort: LllmReasoningEffort): void;
     setMemoryLimit(_limit: number): void;
+    getTokenUsage(): LmmTokenUsage;
 }
 export interface OllamaAdapterOptions {
     log?: Log;

package/build/bots/adapters/OllamaAdapter.js

@@ -28,5 +28,12 @@ class OllamaAdapter {
     setMemoryLimit(_limit) {
         throw new Error('Method not implemented.');
     }
+    getTokenUsage() {
+        return {
+            inputTokens: 0,
+            outputTokens: 0,
+            totalTokens: 0,
+        };
+    }
 }
 exports.default = OllamaAdapter;

package/build/bots/adapters/OpenAiAdapter.d.ts

@@ -1,7 +1,7 @@
 import { Log } from '@sprucelabs/spruce-skill-utils';
 import OpenAI from 'openai';
 import { ReasoningEffort } from 'openai/resources';
-import { LlmAdapter, SendMessageOptions, SprucebotLlmBot } from '../../llm.types';
+import { LlmAdapter, LmmTokenUsage, SendMessageOptions, SprucebotLlmBot } from '../../llm.types';
 export default class OpenAiAdapter implements LlmAdapter {
     static Class?: new (apiKey: string, options?: OpenAiAdapterOptions) => LlmAdapter;
     static OpenAI: typeof OpenAI;
@@ -18,6 +18,7 @@ export default class OpenAiAdapter implements LlmAdapter {
     setModel(model: string): void;
     setMemoryLimit(limit: number): void;
     setReasoningEffort(effort: ReasoningEffort): void;
+    getTokenUsage(): LmmTokenUsage;
 }
 export declare const MESSAGE_RESPONSE_ERROR_MESSAGE = "Oh no! Something went wrong and I can't talk right now!";
 export interface OpenAiAdapterOptions {

package/build/bots/adapters/OpenAiAdapter.js

@@ -48,6 +48,13 @@ class OpenAiAdapter {
     setReasoningEffort(effort) {
         this.reasoningEffort = effort;
     }
+    getTokenUsage() {
+        return {
+            inputTokens: 0,
+            outputTokens: 0,
+            totalTokens: 0,
+        };
+    }
 }
 OpenAiAdapter.OpenAI = openai_1.default;
 exports.default = OpenAiAdapter;

package/build/esm/bots/adapters/AnthropicAdapter.d.ts

@@ -1,7 +1,7 @@
 import { Schema } from '@sprucelabs/schema';
 import { Log } from '@sprucelabs/spruce-skill-utils';
 import Anthropic from '@anthropic-ai/sdk';
-import { LlmAdapter, SprucebotLlmBot, SendMessageOptions, LllmReasoningEffort } from '../../llm.types';
+import { LlmAdapter, SprucebotLlmBot, SendMessageOptions, LllmReasoningEffort, LmmTokenUsage } from '../../llm.types';
 export default class AnthropicAdapter implements LlmAdapter {
     static Class?: new (apiKey: string, options?: AnthropicAdapterOptions) => LlmAdapter;
     static Anthropic: typeof Anthropic;
@@ -12,6 +12,7 @@ export default class AnthropicAdapter implements LlmAdapter {
     private memoryLimit?;
     private isThinkingEnabled;
     private log?;
+    private usage;
     private constructor();
     static Adapter(apiKey: string, options: AnthropicAdapterOptions): LlmAdapter;
     sendMessage(bot: SprucebotLlmBot<Schema>, options?: SendMessageOptions): Promise<string>;
@@ -19,6 +20,7 @@ export default class AnthropicAdapter implements LlmAdapter {
     setModel(model: string): void;
     setReasoningEffort(effort: LllmReasoningEffort): void;
     setMemoryLimit(limit: number): void;
+    getTokenUsage(): LmmTokenUsage;
 }
 export interface AnthropicAdapterOptions {
     log?: Log;

package/build/esm/bots/adapters/AnthropicAdapter.js

@@ -14,6 +14,13 @@ class AnthropicAdapter {
     constructor(apiKey, options) {
         this.model = 'claude-sonnet-4-5';
         this.isThinkingEnabled = false;
+        this.usage = {
+            inputTokens: 0,
+            outputTokens: 0,
+            totalTokens: 0,
+            cacheCreationTokens: 0,
+            cacheReadTokens: 0,
+        };
         assertOptions({ apiKey, maxTokens: options === null || options === void 0 ? void 0 : options.maxTokens }, [
             'apiKey',
             'maxTokens',
@@ -39,7 +46,7 @@ class AnthropicAdapter {
     }
     sendHandler(params, sendOptions) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d;
+            var _a, _b, _c, _d, _e, _f, _g, _h;
             const { messages: openAiMessages, model } = params;
             const messages = [];
             const cacheMarkerIdx = openAiMessages.findIndex((msg) => msg.cache_marker);
@@ -73,8 +80,19 @@ class AnthropicAdapter {
             }, sendOptions);
             const { usage } = response;
             (_a = this.log) === null || _a === void 0 ? void 0 : _a.info(`[TOKEN USAGE] input=${usage.input_tokens} cache_create=${(_b = usage.cache_creation_input_tokens) !== null && _b !== void 0 ? _b : 0} cache_read=${(_c = usage.cache_read_input_tokens) !== null && _c !== void 0 ? _c : 0} output=${usage.output_tokens}`);
-            const text = (_d = response.content
-                .filter((block) => block.type === 'text')) === null || _d === void 0 ? void 0 : _d.map((block) => block.text).join('').trim();
+            this.usage = {
+                inputTokens: this.usage.inputTokens + usage.input_tokens,
+                outputTokens: this.usage.outputTokens + usage.output_tokens,
+                totalTokens: this.usage.totalTokens +
+                    usage.input_tokens +
+                    usage.output_tokens,
+                cacheCreationTokens: ((_d = this.usage.cacheCreationTokens) !== null && _d !== void 0 ? _d : 0) +
+                    ((_e = usage.cache_creation_input_tokens) !== null && _e !== void 0 ? _e : 0),
+                cacheReadTokens: ((_f = this.usage.cacheReadTokens) !== null && _f !== void 0 ? _f : 0) +
+                    ((_g = usage.cache_read_input_tokens) !== null && _g !== void 0 ? _g : 0),
+            };
+            const text = (_h = response.content
+                .filter((block) => block.type === 'text')) === null || _h === void 0 ? void 0 : _h.map((block) => block.text).join('').trim();
             return text;
         });
     }
@@ -87,6 +105,9 @@ class AnthropicAdapter {
     setMemoryLimit(limit) {
         this.memoryLimit = limit;
     }
+    getTokenUsage() {
+        return this.usage;
+    }
 }
 AnthropicAdapter.Anthropic = Anthropic;
 export default AnthropicAdapter;

package/build/esm/bots/adapters/OllamaAdapter.d.ts

@@ -1,6 +1,6 @@
 import { Schema } from '@sprucelabs/schema';
 import { Log } from '@sprucelabs/spruce-skill-utils';
-import { LlmAdapter, SprucebotLlmBot, SendMessageOptions, LllmReasoningEffort } from '../../llm.types';
+import { LlmAdapter, SprucebotLlmBot, SendMessageOptions, LllmReasoningEffort, LmmTokenUsage } from '../../llm.types';
 export default class OllamaAdapter implements LlmAdapter {
     static Class?: new (apiKey: string, options?: OllamaAdapterOptions) => LlmAdapter;
     private openai;
@@ -11,6 +11,7 @@ export default class OllamaAdapter implements LlmAdapter {
     setModel(model: string): void;
     setReasoningEffort(effort: LllmReasoningEffort): void;
     setMemoryLimit(_limit: number): void;
+    getTokenUsage(): LmmTokenUsage;
 }
 export interface OllamaAdapterOptions {
     log?: Log;

package/build/esm/bots/adapters/OllamaAdapter.js

@@ -33,4 +33,11 @@ export default class OllamaAdapter {
     setMemoryLimit(_limit) {
         throw new Error('Method not implemented.');
     }
+    getTokenUsage() {
+        return {
+            inputTokens: 0,
+            outputTokens: 0,
+            totalTokens: 0,
+        };
+    }
 }

package/build/esm/bots/adapters/OpenAiAdapter.d.ts

@@ -1,7 +1,7 @@
 import { Log } from '@sprucelabs/spruce-skill-utils';
 import OpenAI from 'openai';
 import { ReasoningEffort } from 'openai/resources';
-import { LlmAdapter, SendMessageOptions, SprucebotLlmBot } from '../../llm.types';
+import { LlmAdapter, LmmTokenUsage, SendMessageOptions, SprucebotLlmBot } from '../../llm.types';
 export default class OpenAiAdapter implements LlmAdapter {
     static Class?: new (apiKey: string, options?: OpenAiAdapterOptions) => LlmAdapter;
     static OpenAI: typeof OpenAI;
@@ -18,6 +18,7 @@ export default class OpenAiAdapter implements LlmAdapter {
     setModel(model: string): void;
     setMemoryLimit(limit: number): void;
     setReasoningEffort(effort: ReasoningEffort): void;
+    getTokenUsage(): LmmTokenUsage;
 }
 export declare const MESSAGE_RESPONSE_ERROR_MESSAGE = "Oh no! Something went wrong and I can't talk right now!";
 export interface OpenAiAdapterOptions {

package/build/esm/bots/adapters/OpenAiAdapter.js

@@ -53,6 +53,13 @@ class OpenAiAdapter {
     setReasoningEffort(effort) {
         this.reasoningEffort = effort;
     }
+    getTokenUsage() {
+        return {
+            inputTokens: 0,
+            outputTokens: 0,
+            totalTokens: 0,
+        };
+    }
 }
 OpenAiAdapter.OpenAI = OpenAI;
 export default OpenAiAdapter;

package/build/esm/llm.types.d.ts

@@ -21,6 +21,14 @@ export interface LlmAdapter {
     setModel(model: string): void;
     setReasoningEffort(effort: LllmReasoningEffort): void;
     setMemoryLimit(limit: number): void;
+    getTokenUsage(): LmmTokenUsage;
+}
+export interface LmmTokenUsage {
+    inputTokens: number;
+    outputTokens: number;
+    totalTokens: number;
+    cacheCreationTokens?: number;
+    cacheReadTokens?: number;
 }
 export interface PromptOptions<StateSchema extends Schema, State extends SchemaValues<StateSchema> = SchemaValues<StateSchema>> {
     /**

package/build/esm/tests/SpyAdapter.d.ts

@@ -1,5 +1,5 @@
 import { OpenAiAdapterOptions } from '../bots/adapters/OpenAiAdapter';
-import { LllmReasoningEffort, LlmAdapter, SendMessageOptions, SprucebotLlmBot } from '../llm.types';
+import { LllmReasoningEffort, LlmAdapter, LmmTokenUsage, SendMessageOptions, SprucebotLlmBot } from '../llm.types';
 export default class SpyLlmAdapter implements LlmAdapter {
     static instance: SpyLlmAdapter;
     lastSendMessageBot?: SprucebotLlmBot;
@@ -16,4 +16,5 @@ export default class SpyLlmAdapter implements LlmAdapter {
     setModel(model: string): void;
     setReasoningEffort(_effort: LllmReasoningEffort): void;
     setMemoryLimit(_limit: number): void;
+    getTokenUsage(): LmmTokenUsage;
 }

package/build/esm/tests/SpyAdapter.js

@@ -34,4 +34,11 @@ export default class SpyLlmAdapter {
     }
     setReasoningEffort(_effort) { }
     setMemoryLimit(_limit) { }
+    getTokenUsage() {
+        return {
+            inputTokens: 0,
+            outputTokens: 0,
+            totalTokens: 0,
+        };
+    }
 }

package/build/llm.types.d.ts

@@ -21,6 +21,14 @@ export interface LlmAdapter {
     setModel(model: string): void;
     setReasoningEffort(effort: LllmReasoningEffort): void;
     setMemoryLimit(limit: number): void;
+    getTokenUsage(): LmmTokenUsage;
+}
+export interface LmmTokenUsage {
+    inputTokens: number;
+    outputTokens: number;
+    totalTokens: number;
+    cacheCreationTokens?: number;
+    cacheReadTokens?: number;
 }
 export interface PromptOptions<StateSchema extends Schema, State extends SchemaValues<StateSchema> = SchemaValues<StateSchema>> {
     /**

package/build/tests/SpyAdapter.d.ts

@@ -1,5 +1,5 @@
 import { OpenAiAdapterOptions } from '../bots/adapters/OpenAiAdapter';
-import { LllmReasoningEffort, LlmAdapter, SendMessageOptions, SprucebotLlmBot } from '../llm.types';
+import { LllmReasoningEffort, LlmAdapter, LmmTokenUsage, SendMessageOptions, SprucebotLlmBot } from '../llm.types';
 export default class SpyLlmAdapter implements LlmAdapter {
     static instance: SpyLlmAdapter;
     lastSendMessageBot?: SprucebotLlmBot;
@@ -16,4 +16,5 @@ export default class SpyLlmAdapter implements LlmAdapter {
     setModel(model: string): void;
     setReasoningEffort(_effort: LllmReasoningEffort): void;
     setMemoryLimit(_limit: number): void;
+    getTokenUsage(): LmmTokenUsage;
 }

package/build/tests/SpyAdapter.js

@@ -25,5 +25,12 @@ class SpyLlmAdapter {
     }
     setReasoningEffort(_effort) { }
     setMemoryLimit(_limit) { }
+    getTokenUsage() {
+        return {
+            inputTokens: 0,
+            outputTokens: 0,
+            totalTokens: 0,
+        };
+    }
 }
 exports.default = SpyLlmAdapter;

package/package.json

@@ -8,7 +8,7 @@
       "eta"
     ]
   },
-  "version": "16.0.0",
+  "version": "17.0.0",
   "files": [
     "build"
   ],
@@ -65,14 +65,14 @@
     "chat.images": "node ./build/chatWithImages.js"
   },
   "dependencies": {
-    "@anthropic-ai/sdk": "^0.78.0",
-    "@sprucelabs/error": "^8.1.14",
-    "@sprucelabs/mercury-event-emitter": "^46.1.13",
-    "@sprucelabs/mercury-types": "^49.1.15",
-    "@sprucelabs/schema": "^34.0.2",
-    "@sprucelabs/spruce-skill-utils": "^34.0.21",
+    "@anthropic-ai/sdk": "^0.86.1",
+    "@sprucelabs/error": "^8.1.16",
+    "@sprucelabs/mercury-event-emitter": "^46.1.19",
+    "@sprucelabs/mercury-types": "^49.1.20",
+    "@sprucelabs/schema": "^34.0.7",
+    "@sprucelabs/spruce-skill-utils": "^34.0.26",
     "eta": "3.5.0",
-    "openai": "^6.27.0"
+    "openai": "^6.34.0"
   },
   "resolutions": {
     "eta": "3.5.0"
@@ -80,23 +80,23 @@
   "devDependencies": {
     "@regressionproof/cli": "^0.9.4",
     "@regressionproof/jest-reporter": "^0.9.4",
-    "@sprucelabs/esm-postbuild": "^9.0.23",
-    "@sprucelabs/jest-json-reporter": "^10.0.31",
-    "@sprucelabs/resolve-path-aliases": "^4.0.22",
+    "@sprucelabs/esm-postbuild": "^9.0.26",
+    "@sprucelabs/jest-json-reporter": "^10.0.33",
+    "@sprucelabs/resolve-path-aliases": "^4.0.26",
     "@sprucelabs/semantic-release": "^6.0.0",
-    "@sprucelabs/test": "^11.1.6",
-    "@sprucelabs/test-utils": "^7.2.17",
-    "@types/node": "^25.5.0",
+    "@sprucelabs/test": "^11.1.7",
+    "@sprucelabs/test-utils": "^7.2.20",
+    "@types/node": "^25.5.2",
     "chokidar-cli": "^3.0.0",
-    "dotenv": "^17.3.1",
-    "eslint": "^10.0.3",
+    "dotenv": "^17.4.1",
+    "eslint": "^10.2.0",
     "eslint-config-spruce": "^11.2.35",
     "jest": "^30.3.0",
     "jest-circus": "^30.3.0",
     "prettier": "^3.8.1",
     "ts-node": "^10.9.2",
     "tsc-watch": "^7.2.0",
-    "typescript": "^5.9.3"
+    "typescript": "^6.0.2"
   },
   "jest": {
     "testRunner": "jest-circus/runner",