@routstr/sdk 0.3.10 → 0.3.11

package/dist/{bunSqlite-BMTseLIz.d.ts → bunSqlite-BmXWNc25.d.ts}

@@ -1,4 +1,4 @@
-import { a as StorageDriver, U as UsageTrackingDriver } from './store-C8MZlfuz.js';
+import { a as StorageDriver, c as UsageTrackingDriver } from './store-CAQLSbEj.js';
 import { S as SdkLogger } from './types-_21yYFZG.js';
 
 declare function createBunSqliteDriver(dbPath: string, options?: {

package/dist/{bunSqlite-D6AreVE2.d.mts → bunSqlite-Bro9efsl.d.mts}

@@ -1,4 +1,4 @@
-import { a as StorageDriver, U as UsageTrackingDriver } from './store-BiuM2V9N.mjs';
+import { a as StorageDriver, c as UsageTrackingDriver } from './store-CuXwe5Rg.mjs';
 import { S as SdkLogger } from './types-_21yYFZG.mjs';
 
 declare function createBunSqliteDriver(dbPath: string, options?: {

package/dist/client/index.d.mts

@@ -1,6 +1,6 @@
-import { e as Model, S as SdkLogger, m as StreamingResult, M as Message, n as TransactionHistory } from '../types-_21yYFZG.mjs';
+import { e as Model, S as SdkLogger, m as StreamingResult, U as UsageStats, M as Message, n as TransactionHistory } from '../types-_21yYFZG.mjs';
 import { P as ProviderRegistry, W as WalletAdapter, S as StorageAdapter, a as StreamingCallbacks } from '../interfaces-Csn8Uq04.mjs';
-import { S as SdkStore, U as UsageTrackingDriver } from '../store-BiuM2V9N.mjs';
+import { S as SdkStore, c as UsageTrackingDriver } from '../store-CuXwe5Rg.mjs';
 import { CashuSpender, BalanceManager } from '../wallet/index.mjs';
 import { Transform } from 'stream';
 import 'zustand/vanilla';
@@ -181,6 +181,23 @@ interface RouteRequestParams {
     modelId?: string;
     clientApiKey?: string;
 }
+interface RequestResponseLogRequestInput {
+    method: string;
+    url: string;
+    path: string;
+    baseUrl: string;
+    headers: Record<string, string>;
+    body?: unknown;
+    rawBody?: string;
+}
+interface RequestResponseLogSink {
+    logRequest?(input: RequestResponseLogRequestInput): string | undefined | Promise<string | undefined>;
+    logResponseStart?(id: string | undefined, response: Response): void | Promise<void>;
+    logResponseChunk?(id: string | undefined, sequence: number, text: string): void | Promise<void>;
+    logResponseEnd?(id: string | undefined): void | Promise<void>;
+    logResponseError?(id: string | undefined, error: unknown): void | Promise<void>;
+    logResponseBody?(id: string | undefined, response: Response): void | Promise<void>;
+}
 interface RoutstrClientConfig {
     usageTrackingDriver?: UsageTrackingDriver;
     sdkStore?: SdkStore;
@@ -188,6 +205,8 @@ interface RoutstrClientConfig {
     providerManager?: ProviderManager;
     /** Optional: injectable logger (defaults to consoleLogger) */
     logger?: SdkLogger;
+    /** Optional: raw request/response logging callbacks supplied by the runtime/app. */
+    requestResponseLogSink?: RequestResponseLogSink;
 }
 declare class RoutstrClient {
     private walletAdapter;
@@ -202,6 +221,7 @@ declare class RoutstrClient {
     private usageTrackingDriver?;
     private sdkStore?;
     private logger;
+    private requestResponseLogSink?;
     constructor(walletAdapter: WalletAdapter, storageAdapter: StorageAdapter, providerRegistry: ProviderRegistry, alertLevel: AlertLevel, mode?: RoutstrClientMode, options?: RoutstrClientConfig);
     /**
      * Get the current client mode
@@ -349,6 +369,10 @@ interface UsageTrackingData {
     cacheCreationMsats?: number;
     remainingBalanceMsats?: number;
 }
+declare function extractUsageFromResponseBody(body: unknown, fallbackSatsCost?: number): UsageTrackingData | null;
+declare function extractResponseId(body: unknown): string | undefined;
+declare function extractUsageFromSSEJson(parsed: any, fallbackSatsCost?: number): UsageTrackingData | null;
+declare function toUsageStats(usage: UsageTrackingData | null | undefined): UsageStats | undefined;
 
 /**
  * Inspect a Web `ReadableStream<Uint8Array>` of SSE bytes for `usage` and
@@ -363,7 +387,10 @@ interface UsageTrackingData {
  * The returned Promise resolves with the final captured values once the
  * stream ends (or is cancelled / errors out).
  */
-declare function inspectSSEWebStream(stream: ReadableStream<Uint8Array>, onUsage: (usage: UsageTrackingData) => void, onResponseId?: (responseId: string) => void): Promise<{
+declare function inspectSSEWebStream(stream: ReadableStream<Uint8Array>, onUsage: (usage: UsageTrackingData) => void, onResponseId?: (responseId: string) => void, options?: {
+    /** Called with each raw chunk read from the tee'd inspection branch. */
+    onRawChunk?: (chunk: Uint8Array, sequence: number, text: string) => void | Promise<void>;
+}): Promise<{
     capturedUsage?: UsageTrackingData;
     capturedResponseId?: string;
 }>;
@@ -409,16 +436,10 @@ interface FetchAIResponseClient {
         mintUrl: string;
         modelId?: string;
     }): Promise<Response>;
-    getProviderManager(): {
-        getModelForProvider(baseUrl: string, modelId: string): Promise<{
-            id: string;
-        } | null>;
-    };
     getMode(): RoutstrClientMode;
 }
 interface FetchAIResponseDeps {
     client: FetchAIResponseClient;
-    providerRegistry: ProviderRegistry;
     alertLevel: AlertLevel;
     logger: SdkLogger;
     getPendingCashuTokenAmount?: () => number;
@@ -430,4 +451,4 @@ interface FetchAIResponseDeps {
  */
 declare function fetchAIResponse(options: FetchOptions, callbacks: StreamingCallbacks, deps: FetchAIResponseDeps): Promise<void>;
 
-export { type AlertLevel, type DebugLevel, type FetchAIResponseDeps, type ModelProviderPrice, ProviderManager, type RouteRequestParams, RoutstrClient, type RoutstrClientConfig, type RoutstrClientMode, type StreamCallbacks, StreamProcessor, createSSEParserTransform, fetchAIResponse, inspectSSEWebStream };
+export { type AlertLevel, type DebugLevel, type FetchAIResponseDeps, type ModelProviderPrice, ProviderManager, type RequestResponseLogRequestInput, type RequestResponseLogSink, type RouteRequestParams, RoutstrClient, type RoutstrClientConfig, type RoutstrClientMode, type StreamCallbacks, StreamProcessor, type UsageTrackingData, createSSEParserTransform, extractResponseId, extractUsageFromResponseBody, extractUsageFromSSEJson, fetchAIResponse, inspectSSEWebStream, toUsageStats };

package/dist/client/index.d.ts

@@ -1,6 +1,6 @@
-import { e as Model, S as SdkLogger, m as StreamingResult, M as Message, n as TransactionHistory } from '../types-_21yYFZG.js';
+import { e as Model, S as SdkLogger, m as StreamingResult, U as UsageStats, M as Message, n as TransactionHistory } from '../types-_21yYFZG.js';
 import { P as ProviderRegistry, W as WalletAdapter, S as StorageAdapter, a as StreamingCallbacks } from '../interfaces-C-DYd9Jy.js';
-import { S as SdkStore, U as UsageTrackingDriver } from '../store-C8MZlfuz.js';
+import { S as SdkStore, c as UsageTrackingDriver } from '../store-CAQLSbEj.js';
 import { CashuSpender, BalanceManager } from '../wallet/index.js';
 import { Transform } from 'stream';
 import 'zustand/vanilla';
@@ -181,6 +181,23 @@ interface RouteRequestParams {
     modelId?: string;
     clientApiKey?: string;
 }
+interface RequestResponseLogRequestInput {
+    method: string;
+    url: string;
+    path: string;
+    baseUrl: string;
+    headers: Record<string, string>;
+    body?: unknown;
+    rawBody?: string;
+}
+interface RequestResponseLogSink {
+    logRequest?(input: RequestResponseLogRequestInput): string | undefined | Promise<string | undefined>;
+    logResponseStart?(id: string | undefined, response: Response): void | Promise<void>;
+    logResponseChunk?(id: string | undefined, sequence: number, text: string): void | Promise<void>;
+    logResponseEnd?(id: string | undefined): void | Promise<void>;
+    logResponseError?(id: string | undefined, error: unknown): void | Promise<void>;
+    logResponseBody?(id: string | undefined, response: Response): void | Promise<void>;
+}
 interface RoutstrClientConfig {
     usageTrackingDriver?: UsageTrackingDriver;
     sdkStore?: SdkStore;
@@ -188,6 +205,8 @@ interface RoutstrClientConfig {
     providerManager?: ProviderManager;
     /** Optional: injectable logger (defaults to consoleLogger) */
     logger?: SdkLogger;
+    /** Optional: raw request/response logging callbacks supplied by the runtime/app. */
+    requestResponseLogSink?: RequestResponseLogSink;
 }
 declare class RoutstrClient {
     private walletAdapter;
@@ -202,6 +221,7 @@ declare class RoutstrClient {
     private usageTrackingDriver?;
     private sdkStore?;
     private logger;
+    private requestResponseLogSink?;
     constructor(walletAdapter: WalletAdapter, storageAdapter: StorageAdapter, providerRegistry: ProviderRegistry, alertLevel: AlertLevel, mode?: RoutstrClientMode, options?: RoutstrClientConfig);
     /**
      * Get the current client mode
@@ -349,6 +369,10 @@ interface UsageTrackingData {
     cacheCreationMsats?: number;
     remainingBalanceMsats?: number;
 }
+declare function extractUsageFromResponseBody(body: unknown, fallbackSatsCost?: number): UsageTrackingData | null;
+declare function extractResponseId(body: unknown): string | undefined;
+declare function extractUsageFromSSEJson(parsed: any, fallbackSatsCost?: number): UsageTrackingData | null;
+declare function toUsageStats(usage: UsageTrackingData | null | undefined): UsageStats | undefined;
 
 /**
  * Inspect a Web `ReadableStream<Uint8Array>` of SSE bytes for `usage` and
@@ -363,7 +387,10 @@ interface UsageTrackingData {
  * The returned Promise resolves with the final captured values once the
  * stream ends (or is cancelled / errors out).
  */
-declare function inspectSSEWebStream(stream: ReadableStream<Uint8Array>, onUsage: (usage: UsageTrackingData) => void, onResponseId?: (responseId: string) => void): Promise<{
+declare function inspectSSEWebStream(stream: ReadableStream<Uint8Array>, onUsage: (usage: UsageTrackingData) => void, onResponseId?: (responseId: string) => void, options?: {
+    /** Called with each raw chunk read from the tee'd inspection branch. */
+    onRawChunk?: (chunk: Uint8Array, sequence: number, text: string) => void | Promise<void>;
+}): Promise<{
     capturedUsage?: UsageTrackingData;
     capturedResponseId?: string;
 }>;
@@ -409,16 +436,10 @@ interface FetchAIResponseClient {
         mintUrl: string;
         modelId?: string;
     }): Promise<Response>;
-    getProviderManager(): {
-        getModelForProvider(baseUrl: string, modelId: string): Promise<{
-            id: string;
-        } | null>;
-    };
     getMode(): RoutstrClientMode;
 }
 interface FetchAIResponseDeps {
     client: FetchAIResponseClient;
-    providerRegistry: ProviderRegistry;
     alertLevel: AlertLevel;
     logger: SdkLogger;
     getPendingCashuTokenAmount?: () => number;
@@ -430,4 +451,4 @@ interface FetchAIResponseDeps {
  */
 declare function fetchAIResponse(options: FetchOptions, callbacks: StreamingCallbacks, deps: FetchAIResponseDeps): Promise<void>;
 
-export { type AlertLevel, type DebugLevel, type FetchAIResponseDeps, type ModelProviderPrice, ProviderManager, type RouteRequestParams, RoutstrClient, type RoutstrClientConfig, type RoutstrClientMode, type StreamCallbacks, StreamProcessor, createSSEParserTransform, fetchAIResponse, inspectSSEWebStream };
+export { type AlertLevel, type DebugLevel, type FetchAIResponseDeps, type ModelProviderPrice, ProviderManager, type RequestResponseLogRequestInput, type RequestResponseLogSink, type RouteRequestParams, RoutstrClient, type RoutstrClientConfig, type RoutstrClientMode, type StreamCallbacks, StreamProcessor, type UsageTrackingData, createSSEParserTransform, extractResponseId, extractUsageFromResponseBody, extractUsageFromSSEJson, fetchAIResponse, inspectSSEWebStream, toUsageStats };

package/dist/client/index.js

@@ -1061,8 +1061,8 @@ var BalanceManager = class _BalanceManager {
     const refundableProviderBalance = Object.entries(
       balanceState.providerBalances
     ).filter(([providerBaseUrl]) => providerBaseUrl !== baseUrl).reduce((sum, [, value]) => sum + value, 0);
-    if (totalMintBalance + targetProviderBalance < adjustedAmount && totalMintBalance + targetProviderBalance + refundableProviderBalance >= adjustedAmount && retryCount < 2) {
-      await this._refundOtherProvidersForTopUp(baseUrl, mintUrl, retryCount);
+    if (totalMintBalance + targetProviderBalance < adjustedAmount && totalMintBalance + targetProviderBalance + refundableProviderBalance >= adjustedAmount && retryCount < 3) {
+      await this._refundOtherProvidersForTopUp(baseUrl, mintUrl, retryCount, adjustedAmount);
       return this.createProviderToken({
         ...options,
         retryCount: retryCount + 1
@@ -1201,33 +1201,47 @@ var BalanceManager = class _BalanceManager {
     }
     return candidates;
   }
-  async _refundOtherProvidersForTopUp(baseUrl, mintUrl, retryCount) {
+  async _refundOtherProvidersForTopUp(baseUrl, mintUrl, retryCount, requiredAmount) {
     const apiKeyDistribution = this.storageAdapter.getApiKeyDistribution();
     const forceRefund = retryCount >= 2;
-    const apiKeysToRefund = apiKeyDistribution.filter(
-      (apiKey) => apiKey.baseUrl !== baseUrl && apiKey.amount > 0
-    );
-    const apiKeyRefundResults = await Promise.allSettled(
-      apiKeysToRefund.map(async (apiKeyEntry) => {
-        const fullApiKeyEntry = this.storageAdapter.getApiKey(
-          apiKeyEntry.baseUrl
-        );
-        if (!fullApiKeyEntry) {
-          return { baseUrl: apiKeyEntry.baseUrl, success: false };
-        }
-        const result = await this.refundApiKey({
+    const candidates = apiKeyDistribution.filter((apiKey) => apiKey.baseUrl !== baseUrl && apiKey.amount > 0).map((apiKey) => {
+      const full = this.storageAdapter.getApiKey(apiKey.baseUrl);
+      return {
+        baseUrl: apiKey.baseUrl,
+        amount: apiKey.amount,
+        lastUsed: full?.lastUsed ?? 0,
+        key: full?.key
+      };
+    }).filter((c) => c.key != null).sort((a, b) => a.lastUsed - b.lastUsed);
+    if (candidates.length === 0) return;
+    if (forceRefund) {
+      for (const candidate of candidates) {
+        await this.refundApiKey({
           mintUrl,
-          baseUrl: apiKeyEntry.baseUrl,
-          apiKey: fullApiKeyEntry.key,
-          forceRefund
+          baseUrl: candidate.baseUrl,
+          apiKey: candidate.key,
+          forceRefund: true
         });
-        return { baseUrl: apiKeyEntry.baseUrl, success: result.success };
-      })
-    );
-    for (const result of apiKeyRefundResults) {
-      if (result.status === "fulfilled" && result.value.success) {
-        this.storageAdapter.updateApiKeyBalance(result.value.baseUrl, 0);
+        const newState = await this.getBalanceState();
+        const newAvailable = (newState.mintBalances[mintUrl] || 0) + (newState.providerBalances[baseUrl] || 0);
+        if (newAvailable >= requiredAmount) {
+          this.logger.log(
+            `_refundOtherProvidersForTopUp: freed enough balance (${newAvailable} >= ${requiredAmount}), stopping early`
+          );
+          return;
+        }
       }
+    } else {
+      await Promise.allSettled(
+        candidates.map(
+          (candidate) => this.refundApiKey({
+            mintUrl,
+            baseUrl: candidate.baseUrl,
+            apiKey: candidate.key,
+            forceRefund: false
+          })
+        )
+      );
     }
   }
   /**
@@ -2052,6 +2066,91 @@ var SDK_STORAGE_KEYS = {
   PROVIDERS_ON_COOLDOWN: "providers_on_cooldown"
 };
 
+// storage/usageTracking/aggregate.ts
+var pad2 = (n) => String(n).padStart(2, "0");
+var jsGroupKey = (entry, groupBy, tzOffsetMinutes) => {
+  switch (groupBy) {
+    case "modelId":
+      return entry.modelId ?? null;
+    case "baseUrl":
+      return entry.baseUrl ?? null;
+    case "client":
+      return entry.client ?? null;
+    case "sessionId":
+      return entry.sessionId ?? null;
+    case "provider":
+      return entry.provider ?? null;
+    case "day": {
+      const d = new Date(entry.timestamp - tzOffsetMinutes * 6e4);
+      return `${d.getUTCFullYear()}-${pad2(d.getUTCMonth() + 1)}-${pad2(d.getUTCDate())}`;
+    }
+    case "hour": {
+      const d = new Date(entry.timestamp - tzOffsetMinutes * 6e4);
+      return pad2(d.getUTCHours());
+    }
+  }
+};
+var reduceAggregate = (entries, options = {}) => {
+  const emptyRow = (group) => ({
+    group,
+    requests: 0,
+    promptTokens: 0,
+    completionTokens: 0,
+    totalTokens: 0,
+    cost: 0,
+    satsCost: 0,
+    baseMsats: 0,
+    inputMsats: 0,
+    outputMsats: 0,
+    totalMsats: 0,
+    totalUsd: 0,
+    cacheReadInputTokens: 0,
+    cacheCreationInputTokens: 0,
+    cacheReadMsats: 0,
+    cacheCreationMsats: 0
+  });
+  const accumulate = (row, entry) => {
+    row.requests += 1;
+    row.promptTokens += entry.promptTokens;
+    row.completionTokens += entry.completionTokens;
+    row.totalTokens += entry.totalTokens;
+    row.cost += entry.cost;
+    row.satsCost += entry.satsCost;
+    row.baseMsats += entry.baseMsats ?? 0;
+    row.inputMsats += entry.inputMsats ?? 0;
+    row.outputMsats += entry.outputMsats ?? 0;
+    row.totalMsats += entry.totalMsats ?? 0;
+    row.totalUsd += entry.totalUsd ?? 0;
+    row.cacheReadInputTokens += entry.cacheReadInputTokens ?? 0;
+    row.cacheCreationInputTokens += entry.cacheCreationInputTokens ?? 0;
+    row.cacheReadMsats += entry.cacheReadMsats ?? 0;
+    row.cacheCreationMsats += entry.cacheCreationMsats ?? 0;
+  };
+  if (!options.groupBy) {
+    const total = emptyRow(null);
+    for (const entry of entries) accumulate(total, entry);
+    return [total];
+  }
+  const tz = options.tzOffsetMinutes ?? 0;
+  const groups = /* @__PURE__ */ new Map();
+  for (const entry of entries) {
+    const key = jsGroupKey(entry, options.groupBy, tz);
+    let row = groups.get(key);
+    if (!row) {
+      row = emptyRow(key);
+      groups.set(key, row);
+    }
+    accumulate(row, entry);
+  }
+  const rows = [...groups.values()];
+  if (options.groupBy === "day" || options.groupBy === "hour") {
+    rows.sort((a, b) => (a.group ?? "").localeCompare(b.group ?? ""));
+  } else {
+    rows.sort((a, b) => b.satsCost - a.satsCost);
+  }
+  return rows;
+};
+
 // storage/usageTracking/indexedDB.ts
 var DEFAULT_DB_NAME = "routstr-sdk";
 var DEFAULT_STORE_NAME = "usage_tracking";
@@ -2114,6 +2213,9 @@ var matchesFilters = (entry, options = {}) => {
   if (options.client && entry.client !== options.client) {
     return false;
   }
+  if (options.clients && options.clients.length > 0 && (entry.client == null || !options.clients.includes(entry.client))) {
+    return false;
+  }
   if (options.provider && entry.provider !== options.provider) {
     return false;
   }
@@ -2212,6 +2314,10 @@ var createIndexedDBUsageTrackingDriver = (options = {}) => {
       const results = await this.list(options2);
       return results.length;
     },
+    async aggregate(options2 = {}) {
+      const entries = await this.list(options2);
+      return reduceAggregate(entries, options2);
+    },
     async deleteOlderThan(timestamp) {
       await ensureMigrated();
       const db = await getDb();
@@ -2269,6 +2375,9 @@ var matchesFilters2 = (entry, options = {}) => {
   if (options.client && entry.client !== options.client) {
     return false;
   }
+  if (options.clients && options.clients.length > 0 && (entry.client == null || !options.clients.includes(entry.client))) {
+    return false;
+  }
   if (options.provider && entry.provider !== options.provider) {
     return false;
   }
@@ -2301,6 +2410,10 @@ var createMemoryUsageTrackingDriver = (seed = []) => {
     async count(options = {}) {
       return (await this.list(options)).length;
     },
+    async aggregate(options = {}) {
+      const entries = [...store.values()].filter((entry) => matchesFilters2(entry, options));
+      return reduceAggregate(entries, options);
+    },
     async deleteOlderThan(timestamp) {
       let deleted = 0;
       for (const [id, entry] of store.entries()) {
@@ -2923,13 +3036,14 @@ function hasUsageChanged(previous, next) {
 function isInspectionComplete(responseIdCaptured, usage) {
   return responseIdCaptured && !!usage && usage.totalTokens > 0 && typeof usage.totalMsats === "number" && !!usage.provider;
 }
-async function inspectSSEWebStream(stream, onUsage, onResponseId) {
+async function inspectSSEWebStream(stream, onUsage, onResponseId, options) {
   const reader = stream.getReader();
   const decoder = new TextDecoder("utf-8");
   let buffer = "";
   let capturedUsage = null;
   let capturedResponseId;
   let responseIdCaptured = false;
+  let rawChunkSequence = 0;
   const inspectDataPayload = (jsonText) => {
     const trimmed = jsonText.trim();
     if (!trimmed || trimmed === "[DONE]") {
@@ -3000,7 +3114,9 @@ async function inspectSSEWebStream(stream, onUsage, onResponseId) {
       const { value, done } = await reader.read();
       if (done) break;
       if (value && value.byteLength > 0) {
-        buffer += decoder.decode(value, { stream: true });
+        const text = decoder.decode(value, { stream: true });
+        void options?.onRawChunk?.(value, rawChunkSequence++, text);
+        buffer += text;
         drainBufferedEvents();
       }
     }
@@ -3145,6 +3261,7 @@ var RoutstrClient = class {
     this.mode = mode;
     this.usageTrackingDriver = options.usageTrackingDriver;
     this.sdkStore = options.sdkStore;
+    this.requestResponseLogSink = options.requestResponseLogSink;
     this.providerManager = options.providerManager ?? new ProviderManager(providerRegistry, this.sdkStore, this.logger);
   }
   walletAdapter;
@@ -3159,6 +3276,7 @@ var RoutstrClient = class {
   usageTrackingDriver;
   sdkStore;
   logger;
+  requestResponseLogSink;
   /**
    * Get the current client mode
    */
@@ -3349,6 +3467,7 @@ var RoutstrClient = class {
     let usagePromise = Promise.resolve({});
     if (contentType.includes("text/event-stream") && response.body) {
       const [clientStream, inspectStream] = response.body.tee();
+      const requestResponseLogId = response.requestResponseLogId;
       processedResponse = new Response(clientStream, {
         status: response.status,
         statusText: response.statusText,
@@ -3356,6 +3475,7 @@ var RoutstrClient = class {
       });
       processedResponse.baseUrl = response.baseUrl;
       processedResponse.token = response.token;
+      processedResponse.requestResponseLogId = requestResponseLogId;
       usagePromise = inspectSSEWebStream(
         inspectStream,
         (usage) => {
@@ -3365,8 +3485,23 @@ var RoutstrClient = class {
         (responseId) => {
           capturedResponseId = responseId;
           processedResponse.requestId = responseId;
+        },
+        {
+          onRawChunk: (_chunk, sequence, text) => {
+            void this.requestResponseLogSink?.logResponseChunk?.(
+              requestResponseLogId,
+              sequence,
+              text
+            );
+          }
         }
-      );
+      ).then(async (result) => {
+        await this.requestResponseLogSink?.logResponseEnd?.(requestResponseLogId);
+        return result;
+      }).catch(async (error) => {
+        await this.requestResponseLogSink?.logResponseError?.(requestResponseLogId, error);
+        throw error;
+      });
       processedResponse.usagePromise = usagePromise;
     }
     return {
@@ -3400,16 +3535,30 @@ var RoutstrClient = class {
     const { path, method, body, baseUrl, token, headers } = params;
     try {
       const url = `${baseUrl.replace(/\/$/, "")}${path}`;
+      const requestBodyText = body === void 0 || method === "GET" ? void 0 : JSON.stringify(body);
+      const requestLogId = await this.requestResponseLogSink?.logRequest?.({
+        method,
+        url,
+        path,
+        baseUrl,
+        headers,
+        body,
+        rawBody: requestBodyText
+      });
       if (this.mode === "xcashu") this._log("DEBUG", "HEADERS,", headers);
       const response = await fetch(url, {
         method,
         headers,
-        body: body === void 0 || method === "GET" ? void 0 : JSON.stringify(body)
+        body: requestBodyText
       });
       if (this.mode === "xcashu") this._log("DEBUG", "response,", response);
       response.baseUrl = baseUrl;
       response.token = token;
+      response.requestResponseLogId = requestLogId;
+      await this.requestResponseLogSink?.logResponseStart?.(requestLogId, response);
+      const contentType = response.headers.get("content-type") || "";
       if (!response.ok) {
+        void this.requestResponseLogSink?.logResponseBody?.(requestLogId, response.clone());
         const requestId = response.headers.get("x-routstr-request-id") || void 0;
         let bodyText;
         try {
@@ -3427,6 +3576,9 @@ var RoutstrClient = class {
           params.retryCount ?? 0
         );
       }
+      if (!contentType.includes("text/event-stream")) {
+        void this.requestResponseLogSink?.logResponseBody?.(requestLogId, response.clone());
+      }
       return response;
     } catch (error) {
       if (isNetworkErrorMessage(error?.message || "")) {
@@ -4316,15 +4468,8 @@ async function fetchAIResponse(options, callbacks, deps) {
     const apiMessages = await convertMessages(messageHistory);
     callbacks.onPaymentProcessing?.(true);
     callbacks.onTokenCreated?.(deps.getPendingCashuTokenAmount?.() ?? 0);
-    const providerInfo = await deps.providerRegistry.getProviderInfo(baseUrl);
-    const providerVersion = providerInfo?.version ?? "";
-    let modelIdForRequest = selectedModel.id;
-    if (/^0\.1\./.test(providerVersion)) {
-      const newModel = await deps.client.getProviderManager().getModelForProvider(baseUrl, selectedModel.id);
-      modelIdForRequest = newModel?.id ?? selectedModel.id;
-    }
     const body = {
-      model: modelIdForRequest,
+      model: selectedModel.id,
       messages: apiMessages,
       stream: true
     };
@@ -4442,7 +4587,11 @@ exports.ProviderManager = ProviderManager;
 exports.RoutstrClient = RoutstrClient;
 exports.StreamProcessor = StreamProcessor;
 exports.createSSEParserTransform = createSSEParserTransform;
+exports.extractResponseId = extractResponseId;
+exports.extractUsageFromResponseBody = extractUsageFromResponseBody;
+exports.extractUsageFromSSEJson = extractUsageFromSSEJson;
 exports.fetchAIResponse = fetchAIResponse;
 exports.inspectSSEWebStream = inspectSSEWebStream;
+exports.toUsageStats = toUsageStats;
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map