@jsonstudio/rcc 0.89.2239 → 0.90.1

package/dist/server/runtime/http-server/executor/sse-error-handler.js

@@ -61,9 +61,16 @@ function normalizeSseWrapperErrorValue(value, depth) {
                 // fallback to raw string
             }
         }
+        const bracketCodeMatch = trimmed.match(/\[([^\]]+)\]/);
+        const bracketCode = bracketCodeMatch && bracketCodeMatch[1] ? bracketCodeMatch[1].trim() : '';
+        const parsedStatus = /^\d+$/.test(bracketCode) && Number(bracketCode) >= 100 && Number(bracketCode) <= 599
+            ? Number(bracketCode)
+            : undefined;
         return {
             message: trimmed,
-            retryable: isRetryableSseWrapperError(trimmed)
+            ...(bracketCode ? { errorCode: bracketCode } : {}),
+            ...(parsedStatus !== undefined ? { statusCode: parsedStatus } : {}),
+            retryable: isRetryableSseWrapperError(trimmed, bracketCode || undefined, parsedStatus)
         };
     }
     if (typeof value !== 'object' || Array.isArray(value)) {
@@ -92,11 +99,13 @@ function normalizeSseWrapperErrorValue(value, depth) {
             const nestedInfo = normalizeSseWrapperErrorValue(record[key], depth - 1);
             if (nestedInfo) {
                 const mergedCode = nestedInfo.errorCode ?? directCode;
+                const mergedStatus = nestedInfo.statusCode ?? directStatus;
                 const retryable = nestedInfo.retryable ||
-                    isRetryableSseWrapperError(nestedInfo.message, mergedCode, directStatus);
+                    isRetryableSseWrapperError(nestedInfo.message, mergedCode, mergedStatus);
                 return {
                     message: nestedInfo.message,
                     ...(mergedCode ? { errorCode: mergedCode } : {}),
+                    ...(mergedStatus !== undefined ? { statusCode: mergedStatus } : {}),
                     retryable
                 };
             }
@@ -106,6 +115,7 @@ function normalizeSseWrapperErrorValue(value, depth) {
         return {
             message: directMessage,
             ...(directCode ? { errorCode: directCode } : {}),
+            ...(directStatus !== undefined ? { statusCode: directStatus } : {}),
             retryable: isRetryableSseWrapperError(directMessage, directCode, directStatus)
         };
     }
@@ -115,6 +125,7 @@ function normalizeSseWrapperErrorValue(value, depth) {
             return {
                 message: serialized,
                 ...(directCode ? { errorCode: directCode } : {}),
+                ...(directStatus !== undefined ? { statusCode: directStatus } : {}),
                 retryable: isRetryableSseWrapperError(serialized, directCode, directStatus)
             };
         }

package/dist/server/runtime/http-server/executor/sse-error-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"sse-error-handler.js","sourceRoot":"","sources":["../../../../../src/server/runtime/http-server/executor/sse-error-handler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sse-error-handler.js","sourceRoot":"","sources":["../../../../../src/server/runtime/http-server/executor/sse-error-handler.ts"],"names":[],"mappings":"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"}

package/dist/server/runtime/http-server/executor/usage-aggregator.d.ts

@@ -17,18 +17,6 @@ export declare function extractUsageFromResult(result: {
  * Normalize usage metrics from various provider formats
  */
 export declare function normalizeUsage(value: unknown): UsageMetrics | undefined;
-/**
- * Extract estimated input tokens from metadata
- */
-export declare function extractEstimatedInputTokens(metadata?: Record<string, unknown>): number | undefined;
-/**
- * Reconcile upstream usage with local estimate
- */
-export declare function reconcileUsageWithEstimate(usage: UsageMetrics, estimatedInput?: number, candidate?: unknown): UsageMetrics;
-/**
- * Patch usage candidate object with reconciled values
- */
-export declare function patchUsageCandidate(candidate: unknown, prompt: number, completion: number, total: number): void;
 /**
  * Merge multiple usage metrics
  */

package/dist/server/runtime/http-server/executor/usage-aggregator.js

@@ -8,31 +8,71 @@ export {};
  * Extract usage metrics from provider response
  */
 export function extractUsageFromResult(result, metadata) {
-    const estimatedInput = extractEstimatedInputTokens(metadata);
+    void metadata;
     const candidates = [];
-    if (metadata && typeof metadata === 'object') {
-        const bag = metadata;
-        if (bag.usage) {
-            candidates.push(bag.usage);
-        }
-    }
     if (result.body && typeof result.body === 'object') {
         const body = result.body;
         if (body.usage) {
             candidates.push(body.usage);
         }
+        if (body.metadata && typeof body.metadata === 'object') {
+            const bodyMeta = body.metadata;
+            if (bodyMeta.usage) {
+                candidates.push(bodyMeta.usage);
+            }
+        }
+        if (body.data && typeof body.data === 'object') {
+            const bodyData = body.data;
+            if (bodyData.usage) {
+                candidates.push(bodyData.usage);
+            }
+            if (bodyData.metadata && typeof bodyData.metadata === 'object') {
+                const bodyDataMeta = bodyData.metadata;
+                if (bodyDataMeta.usage) {
+                    candidates.push(bodyDataMeta.usage);
+                }
+            }
+        }
         if (body.response && typeof body.response === 'object') {
             const responseNode = body.response;
             if (responseNode.usage) {
                 candidates.push(responseNode.usage);
             }
         }
+        if (body.payload && typeof body.payload === 'object') {
+            const payload = body.payload;
+            if (payload.usage) {
+                candidates.push(payload.usage);
+            }
+            if (payload.metadata && typeof payload.metadata === 'object') {
+                const payloadMeta = payload.metadata;
+                if (payloadMeta.usage) {
+                    candidates.push(payloadMeta.usage);
+                }
+            }
+            if (payload.response && typeof payload.response === 'object') {
+                const payloadResponse = payload.response;
+                if (payloadResponse.usage) {
+                    candidates.push(payloadResponse.usage);
+                }
+            }
+        }
+    }
+    if (result.headers && typeof result.headers === 'object') {
+        const usageHeader = (result.headers['x-usage'] || result.headers['X-Usage'] || result.headers['x-routecodex-usage']);
+        if (typeof usageHeader === 'string' && usageHeader.trim()) {
+            try {
+                candidates.push(JSON.parse(usageHeader));
+            }
+            catch {
+                // ignore non-json usage header
+            }
+        }
     }
     for (const candidate of candidates) {
         const normalized = normalizeUsage(candidate);
         if (normalized) {
-            const reconciled = reconcileUsageWithEstimate(normalized, estimatedInput, candidate);
-            return reconciled;
+            return normalized;
         }
     }
     return undefined;
@@ -45,27 +85,46 @@ export function normalizeUsage(value) {
         return undefined;
     }
     const record = value;
-    const basePrompt = typeof record.prompt_tokens === 'number'
-        ? record.prompt_tokens
-        : typeof record.input_tokens === 'number'
-            ? record.input_tokens
-            : undefined;
-    let cacheRead = typeof record.cache_read_input_tokens === 'number' ? record.cache_read_input_tokens : undefined;
-    if (cacheRead === undefined && record.input_tokens_details && typeof record.input_tokens_details === 'object') {
-        const details = record.input_tokens_details;
-        if (typeof details.cached_tokens === 'number') {
-            cacheRead = details.cached_tokens;
+    const usageRecord = record.usageMetadata && typeof record.usageMetadata === 'object'
+        ? record.usageMetadata
+        : record;
+    const readNumeric = (raw) => {
+        if (typeof raw === 'number' && Number.isFinite(raw)) {
+            return raw;
+        }
+        if (typeof raw === 'string' && raw.trim()) {
+            const parsed = Number(raw);
+            if (Number.isFinite(parsed)) {
+                return parsed;
+            }
+        }
+        return undefined;
+    };
+    const basePrompt = readNumeric(usageRecord.prompt_tokens) ??
+        readNumeric(usageRecord.input_tokens) ??
+        readNumeric(usageRecord.promptTokens) ??
+        readNumeric(usageRecord.inputTokens) ??
+        readNumeric(usageRecord.request_tokens) ??
+        readNumeric(usageRecord.requestTokens);
+    let cacheRead = readNumeric(usageRecord.cache_read_input_tokens);
+    if (cacheRead === undefined && usageRecord.input_tokens_details && typeof usageRecord.input_tokens_details === 'object') {
+        const details = usageRecord.input_tokens_details;
+        const cached = readNumeric(details.cached_tokens);
+        if (cached !== undefined) {
+            cacheRead = cached;
         }
     }
     const prompt = basePrompt !== undefined || cacheRead !== undefined
         ? (basePrompt ?? 0) + (cacheRead ?? 0)
         : undefined;
-    const completion = typeof record.completion_tokens === 'number'
-        ? record.completion_tokens
-        : typeof record.output_tokens === 'number'
-            ? record.output_tokens
-            : undefined;
-    let total = typeof record.total_tokens === 'number' ? record.total_tokens : undefined;
+    const completion = readNumeric(usageRecord.completion_tokens) ??
+        readNumeric(usageRecord.output_tokens) ??
+        readNumeric(usageRecord.completionTokens) ??
+        readNumeric(usageRecord.outputTokens) ??
+        readNumeric(usageRecord.response_tokens) ??
+        readNumeric(usageRecord.responseTokens);
+    let total = readNumeric(usageRecord.total_tokens) ??
+        readNumeric(usageRecord.totalTokens);
     if (total === undefined && prompt !== undefined && completion !== undefined) {
         total = prompt + completion;
     }
@@ -78,69 +137,6 @@ export function normalizeUsage(value) {
         total_tokens: total
     };
 }
-/**
- * Extract estimated input tokens from metadata
- */
-export function extractEstimatedInputTokens(metadata) {
-    if (!metadata || typeof metadata !== 'object') {
-        return undefined;
-    }
-    const bag = metadata;
-    const raw = bag.estimatedInputTokens ??
-        bag.estimated_tokens ??
-        bag.estimatedTokens;
-    const value = typeof raw === 'number' ? raw : Number(raw);
-    if (!Number.isFinite(value) || value <= 0) {
-        return undefined;
-    }
-    return value;
-}
-/**
- * Reconcile upstream usage with local estimate
- */
-export function reconcileUsageWithEstimate(usage, estimatedInput, candidate) {
-    if (!estimatedInput || !Number.isFinite(estimatedInput) || estimatedInput <= 0) {
-        return usage;
-    }
-    const upstreamPrompt = usage.prompt_tokens ?? usage.total_tokens ?? undefined;
-    const completion = usage.completion_tokens ?? 0;
-    // Use local estimate if upstream is missing
-    if (upstreamPrompt === undefined || upstreamPrompt <= 0) {
-        const total = estimatedInput + completion;
-        patchUsageCandidate(candidate, estimatedInput, completion, total);
-        return {
-            prompt_tokens: estimatedInput,
-            completion_tokens: completion,
-            total_tokens: total
-        };
-    }
-    const ratio = upstreamPrompt > 0 ? upstreamPrompt / estimatedInput : 1;
-    // Use local estimate if difference is too large
-    if (ratio > 5 || ratio < 0.2) {
-        const total = estimatedInput + completion;
-        patchUsageCandidate(candidate, estimatedInput, completion, total);
-        return {
-            prompt_tokens: estimatedInput,
-            completion_tokens: completion,
-            total_tokens: total
-        };
-    }
-    return usage;
-}
-/**
- * Patch usage candidate object with reconciled values
- */
-export function patchUsageCandidate(candidate, prompt, completion, total) {
-    if (!candidate || typeof candidate !== 'object') {
-        return;
-    }
-    const record = candidate;
-    record.prompt_tokens = prompt;
-    record.input_tokens = prompt;
-    record.completion_tokens = completion;
-    record.output_tokens = completion;
-    record.total_tokens = total;
-}
 /**
  * Merge multiple usage metrics
  */

package/dist/server/runtime/http-server/executor/usage-aggregator.js.map

@@ -1 +1 @@
-{"version":3,"file":"usage-aggregator.js","sourceRoot":"","sources":["../../../../../src/server/runtime/http-server/executor/usage-aggregator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"usage-aggregator.js","sourceRoot":"","sources":["../../../../../src/server/runtime/http-server/executor/usage-aggregator.ts"],"names":[],"mappings":"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"}