@node-llm/core 1.8.0 → 1.9.0

package/dist/providers/openai/Streaming.js

@@ -50,6 +50,7 @@ export class OpenAIStreaming {
         if (request.thinking?.effort && request.thinking.effort !== "none") {
             body.reasoning_effort = request.thinking.effort;
         }
+        body.stream_options = { include_usage: true };
         let done = false;
         // Track tool calls being built across chunks
         const toolCallsMap = new Map();
@@ -154,6 +155,15 @@ export class OpenAIStreaming {
                                 }
                             }
                         }
+                        // Handle usage (usually in the special chunk when stream_options.include_usage: true)
+                        if (json.usage) {
+                            const usage = {
+                                input_tokens: json.usage.prompt_tokens,
+                                output_tokens: json.usage.completion_tokens,
+                                total_tokens: json.usage.total_tokens
+                            };
+                            yield { content: "", usage };
+                        }
                     }
                     catch (e) {
                         // Re-throw APIError

package/dist/providers/openrouter/OpenRouterProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OpenRouterProvider.d.ts","sourceRoot":"","sources":["../../../src/providers/openrouter/OpenRouterProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAG7D,MAAM,WAAW,yBAAyB;IACxC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,kBAAmB,SAAQ,cAAc;IAC7C,YAAY;gCACO,MAAM;+BACP,MAAM;0CACK,MAAM;oCAEZ,MAAM;yCACD,MAAM;uCAER,MAAM;oCACT,MAAM;mCACP,MAAM;wCACD,MAAM;kCACZ,MAAM;MAChC;gBAEU,OAAO,EAAE,yBAAyB;IAO9C,SAAS,CAAC,YAAY,IAAI,MAAM;CAGjC"}
+{"version":3,"file":"OpenRouterProvider.d.ts","sourceRoot":"","sources":["../../../src/providers/openrouter/OpenRouterProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAI7D,MAAM,WAAW,yBAAyB;IACxC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,kBAAmB,SAAQ,cAAc;IAC7C,YAAY;gCACO,MAAM;+BACP,MAAM;0CACK,MAAM;oCAEZ,MAAM;yCACD,MAAM;uCAER,MAAM;oCACT,MAAM;mCACP,MAAM;wCACD,MAAM;kCACZ,MAAM;MAChC;gBAEU,OAAO,EAAE,yBAAyB;IAO9C,SAAS,CAAC,YAAY,IAAI,MAAM;CAGjC"}

package/dist/providers/openrouter/OpenRouterProvider.js

@@ -1,4 +1,5 @@
 import { OpenAIProvider } from "../openai/OpenAIProvider.js";
+import { DEFAULT_OPENROUTER_BASE_URL } from "../../constants.js";
 import { OpenRouterCapabilities } from "./Capabilities.js";
 export class OpenRouterProvider extends OpenAIProvider {
     capabilities = {
@@ -16,7 +17,7 @@ export class OpenRouterProvider extends OpenAIProvider {
     constructor(options) {
         super({
             apiKey: options.apiKey,
-            baseUrl: options.baseUrl || "https://openrouter.ai/api/v1"
+            baseUrl: options.baseUrl || DEFAULT_OPENROUTER_BASE_URL
         });
     }
     providerName() {

package/dist/providers/registry.d.ts

@@ -8,8 +8,11 @@ import { registerOpenRouterProvider } from "./openrouter/index.js";
 import { registerBedrockProvider } from "./bedrock/index.js";
 import { NodeLLMConfig } from "../config.js";
 type ProviderFactory = (config?: NodeLLMConfig) => Provider;
+export type ProviderInterceptor = (provider: Provider) => Provider;
 declare class ProviderRegistry {
     private providers;
+    private globalInterceptor?;
+    setInterceptor(interceptor: ProviderInterceptor | undefined): void;
     /**
      * Register a provider factory
      */

package/dist/providers/registry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/providers/registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,0BAA0B,EAAE,MAAM,uBAAuB,CAAC;AACnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAE7D,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,KAAK,eAAe,GAAG,CAAC,MAAM,CAAC,EAAE,aAAa,KAAK,QAAQ,CAAC;AAE5D,cAAM,gBAAgB;IACpB,OAAO,CAAC,SAAS,CAAsC;IAEvD;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,GAAG,IAAI;IAQtD;;OAEG;IACH,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,aAAa,GAAG,QAAQ;IAUvD;;OAEG;IACH,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAI1B;;OAEG;IACH,IAAI,IAAI,MAAM,EAAE;CAGjB;AAED;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,gBAAgB,kBAAyB,CAAC;AAGvD,OAAO,EACL,sBAAsB,IAAI,sBAAsB,EAChD,sBAAsB,EACtB,yBAAyB,EACzB,sBAAsB,EACtB,wBAAwB,EACxB,sBAAsB,EACtB,0BAA0B,EAC1B,uBAAuB,EACxB,CAAC"}
+{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/providers/registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,0BAA0B,EAAE,MAAM,uBAAuB,CAAC;AACnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAE7D,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,KAAK,eAAe,GAAG,CAAC,MAAM,CAAC,EAAE,aAAa,KAAK,QAAQ,CAAC;AAC5D,MAAM,MAAM,mBAAmB,GAAG,CAAC,QAAQ,EAAE,QAAQ,KAAK,QAAQ,CAAC;AAEnE,cAAM,gBAAgB;IACpB,OAAO,CAAC,SAAS,CAAsC;IACvD,OAAO,CAAC,iBAAiB,CAAC,CAAsB;IAEzC,cAAc,CAAC,WAAW,EAAE,mBAAmB,GAAG,SAAS;IAIlE;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe;IAO/C;;OAEG;IACH,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,aAAa,GAAG,QAAQ;IAgBvD;;OAEG;IACH,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAI1B;;OAEG;IACH,IAAI,IAAI,MAAM,EAAE;CAGjB;AAED;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,gBAAgB,kBAAyB,CAAC;AAGvD,OAAO,EACL,sBAAsB,IAAI,sBAAsB,EAChD,sBAAsB,EACtB,yBAAyB,EACzB,sBAAsB,EACtB,wBAAwB,EACxB,sBAAsB,EACtB,0BAA0B,EAC1B,uBAAuB,EACxB,CAAC"}

package/dist/providers/registry.js

@@ -7,6 +7,10 @@ import { registerOpenRouterProvider } from "./openrouter/index.js";
 import { registerBedrockProvider } from "./bedrock/index.js";
 class ProviderRegistry {
     providers = new Map();
+    globalInterceptor;
+    setInterceptor(interceptor) {
+        this.globalInterceptor = interceptor;
+    }
     /**
      * Register a provider factory
      */
@@ -22,9 +26,13 @@ class ProviderRegistry {
     resolve(name, config) {
         const factory = this.providers.get(name);
         if (!factory) {
-            throw new Error(`Unknown LLM provider '${name}'`);
+            throw new Error(`Provider ${name} not registered`);
+        }
+        let provider = factory(config);
+        if (this.globalInterceptor) {
+            provider = this.globalInterceptor(provider);
         }
-        return factory(config);
+        return provider;
     }
     /**
      * Check if a provider is registered

package/dist/utils/json.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Boring, standard JSON extraction logic.
+ * Avoids cleverness in favor of predictable industry-standard patterns.
+ */
+export declare function extractJson(text: string): string;
+//# sourceMappingURL=json.d.ts.map

package/dist/utils/json.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"json.d.ts","sourceRoot":"","sources":["../../src/utils/json.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAwChD"}

package/dist/utils/json.js

@@ -0,0 +1,43 @@
+/**
+ * Boring, standard JSON extraction logic.
+ * Avoids cleverness in favor of predictable industry-standard patterns.
+ */
+export function extractJson(text) {
+    const cleaned = text.trim();
+    // 1. Fast path: The string is already just JSON
+    try {
+        JSON.parse(cleaned);
+        return cleaned;
+    }
+    catch {
+        // Continue extraction
+    }
+    // 2. Handle Markdown blocks (the most common LLM artifact)
+    const markdownMatch = cleaned.match(/```(?:json)?\s*([\s\S]*?)```/);
+    if (markdownMatch?.[1]) {
+        const candidate = markdownMatch[1].trim();
+        try {
+            JSON.parse(candidate);
+            return candidate;
+        }
+        catch {
+            // Invalid JSON inside backticks, fall through
+        }
+    }
+    // 3. Last resort: Find the first '{' and last '}'
+    // This handles conversational filler like "Here is your data: { ... }"
+    const firstBrace = cleaned.indexOf("{");
+    const lastBrace = cleaned.lastIndexOf("}");
+    if (firstBrace !== -1 && lastBrace !== -1 && lastBrace > firstBrace) {
+        const candidate = cleaned.substring(firstBrace, lastBrace + 1);
+        try {
+            JSON.parse(candidate);
+            return candidate;
+        }
+        catch {
+            // Not valid JSON
+        }
+    }
+    // 4. Return as-is and let the final JSON.parse() fail loudly
+    return cleaned;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@node-llm/core",
-  "version": "1.8.0",
+  "version": "1.9.0",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",