@pellux/goodvibes-sdk 0.34.0 → 0.34.2

package/dist/platform/providers/model-limits.js

@@ -2,10 +2,10 @@ import { dirname, join } from 'node:path';
 import { mkdirSync, readFileSync, writeFileSync } from 'node:fs';
 import { logger } from '../utils/logger.js';
 import { summarizeError } from '../utils/error-display.js';
-import { instrumentedFetch } from '../utils/fetch-with-timeout.js';
+import { TTL_24H_MS, isTtlCacheStale, validateTtlCacheEnvelope } from './json-ttl-cache.js';
+import { instrumentedFetch, fetchWithTimeout } from '../utils/fetch-with-timeout.js';
 const OPENROUTER_MODELS_URL = 'https://openrouter.ai/api/v1/models';
 const FETCH_TIMEOUT_MS = 15_000;
-const CACHE_TTL_MS = 86_400_000;
 const DEFAULT_TOKEN_LIMITS = {
     maxOutputTokens: 8192,
     maxToolResultTokens: 50_000,
@@ -16,22 +16,7 @@ export function getModelLimitsCachePath(cacheDir) {
     return join(cacheDir, 'model-limits.json');
 }
 function validateModelLimitsCache(value) {
-    if (!value || typeof value !== 'object' || Array.isArray(value)) {
-        return { cache: null, reason: 'root value is not an object' };
-    }
-    const parsed = value;
-    if (parsed.version !== 1)
-        return { cache: null, reason: 'unsupported cache version' };
-    if (typeof parsed.fetchedAt !== 'number' || !Number.isFinite(parsed.fetchedAt)) {
-        return { cache: null, reason: 'fetchedAt must be a finite number' };
-    }
-    if (typeof parsed.ttlMs !== 'number' || !Number.isFinite(parsed.ttlMs)) {
-        return { cache: null, reason: 'ttlMs must be a finite number' };
-    }
-    if (!parsed.models || typeof parsed.models !== 'object' || Array.isArray(parsed.models)) {
-        return { cache: null, reason: 'models must be an object' };
-    }
-    return { cache: parsed };
+    return validateTtlCacheEnvelope(value, 'models', 'object');
 }
 function loadCachedLimits(cachePath) {
     try {
@@ -65,34 +50,25 @@ function saveCachedLimits(cache, cachePath) {
     }
 }
 function isCacheStale(cache) {
-    return Date.now() - cache.fetchedAt > cache.ttlMs;
+    return isTtlCacheStale(cache);
 }
 async function fetchOpenRouterModels() {
-    const controller = new AbortController();
-    const timer = setTimeout(() => controller.abort(), FETCH_TIMEOUT_MS);
-    timer.unref?.();
-    try {
-        const response = await instrumentedFetch(OPENROUTER_MODELS_URL, {
-            signal: controller.signal,
-            headers: { Accept: 'application/json' },
-        });
-        if (!response.ok) {
-            throw new Error(`OpenRouter API returned ${response.status}`);
-        }
-        const json = await response.json();
-        const map = new Map();
-        if (Array.isArray(json.data)) {
-            for (const model of json.data) {
-                if (typeof model.id === 'string') {
-                    map.set(model.id, model);
-                }
+    const response = await fetchWithTimeout(OPENROUTER_MODELS_URL, {
+        headers: { Accept: 'application/json' },
+    }, FETCH_TIMEOUT_MS, instrumentedFetch);
+    if (!response.ok) {
+        throw new Error(`OpenRouter API returned ${response.status}`);
+    }
+    const json = await response.json();
+    const map = new Map();
+    if (Array.isArray(json.data)) {
+        for (const model of json.data) {
+            if (typeof model.id === 'string') {
+                map.set(model.id, model);
             }
         }
-        return map;
-    }
-    finally {
-        clearTimeout(timer);
     }
+    return map;
 }
 function getModelStem(modelId) {
     return modelId
@@ -239,7 +215,7 @@ export class ModelLimitsService {
         const newCache = {
             version: 1,
             fetchedAt: Date.now(),
-            ttlMs: CACHE_TTL_MS,
+            ttlMs: TTL_24H_MS,
             models,
         };
         saveCachedLimits(newCache, this.options.cachePath);

package/dist/platform/providers/ollama.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ollama.d.ts","sourceRoot":"","sources":["../../../src/platform/providers/ollama.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,KAAK,EACV,WAAW,EACX,YAAY,EAEZ,WAAW,EAEX,wBAAwB,EACxB,uBAAuB,EAEvB,uBAAuB,EACvB,2BAA2B,EAC5B,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAwB,KAAK,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAMpF,KAAK,WAAW,GAAG,CACjB,KAAK,EAAE,WAAW,GAAG,GAAG,EACxB,IAAI,CAAC,EAAE,WAAW,KACf,OAAO,CAAC,QAAQ,CAAC,CAAC;AAqBvB,MAAM,WAAW,qBAAsB,SAAQ,mBAAmB;IAChE,WAAW,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;IACtC,cAAc,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;CAC1C;AAED,qBAAa,cAAe,YAAW,WAAW;IAChD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;IAC1B,QAAQ,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,GAAG,SAAS,CAAC;IAEhE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;IACtC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAS;IACxC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAc;IAC1C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAc;IAC7C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAoB;gBAEvC,IAAI,EAAE,qBAAqB;IAYvC,YAAY,IAAI,OAAO;IAIjB,IAAI,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC;IAmBhD,KAAK,CAAC,OAAO,EAAE,wBAAwB,GAAG,OAAO,CAAC,uBAAuB,CAAC;IAuC1E,eAAe,CAAC,IAAI,EAAE,2BAA2B,GAAG,OAAO,CAAC,uBAAuB,CAAC;YA4C5E,mBAAmB;CAmGlC"}
+{"version":3,"file":"ollama.d.ts","sourceRoot":"","sources":["../../../src/platform/providers/ollama.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,KAAK,EACV,WAAW,EACX,YAAY,EAEZ,WAAW,EAEX,wBAAwB,EACxB,uBAAuB,EAEvB,uBAAuB,EACvB,2BAA2B,EAC5B,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAwB,KAAK,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAOpF,KAAK,WAAW,GAAG,CACjB,KAAK,EAAE,WAAW,GAAG,GAAG,EACxB,IAAI,CAAC,EAAE,WAAW,KACf,OAAO,CAAC,QAAQ,CAAC,CAAC;AAqBvB,MAAM,WAAW,qBAAsB,SAAQ,mBAAmB;IAChE,WAAW,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;IACtC,cAAc,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;CAC1C;AAED,qBAAa,cAAe,YAAW,WAAW;IAChD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;IAC1B,QAAQ,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,GAAG,SAAS,CAAC;IAEhE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;IACtC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAS;IACxC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAc;IAC1C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAc;IAC7C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAoB;gBAEvC,IAAI,EAAE,qBAAqB;IAYvC,YAAY,IAAI,OAAO;IAIjB,IAAI,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC;IAmBhD,KAAK,CAAC,OAAO,EAAE,wBAAwB,GAAG,OAAO,CAAC,uBAAuB,CAAC;IAuC1E,eAAe,CAAC,IAAI,EAAE,2BAA2B,GAAG,OAAO,CAAC,uBAAuB,CAAC;YA4C5E,mBAAmB;CAmGlC"}

package/dist/platform/providers/ollama.js

@@ -3,7 +3,8 @@ import { instrumentedLlmCall } from '../runtime/llm-observability.js';
 import { ProviderError } from '../types/errors.js';
 import { OpenAICompatProvider } from './openai-compat.js';
 import { toOpenAITools } from './tool-formats.js';
-import { summarizeError, toProviderError } from '../utils/error-display.js';
+import { summarizeError } from '../utils/error-display.js';
+import { getErrorStatus, normalizeProviderError } from './provider-error.js';
 import { mapOllamaStopReason } from './stop-reason-maps.js';
 import { instrumentedFetch } from '../utils/fetch-with-timeout.js';
 export class OllamaProvider {
@@ -347,35 +348,13 @@ async function buildHttpError(prefix, response, provider, operation, phase) {
 }
 function shouldFallbackFromNative(err) {
     const status = getErrorStatus(err);
-    const message = getErrorMessage(err);
+    const message = summarizeError(err);
     if (status === 404 || status === 405 || status === 501)
         return true;
     if (status === 400 && /tool|messages|unsupported/i.test(message))
         return true;
     return /not implemented|unsupported|unknown endpoint/i.test(message);
 }
-function getErrorStatus(err) {
-    if (err && typeof err === 'object') {
-        const record = err;
-        if (typeof record.status === 'number')
-            return record.status;
-        if (typeof record.statusCode === 'number')
-            return record.statusCode;
-    }
-    return undefined;
-}
-function getErrorMessage(err) {
-    return summarizeError(err);
-}
-function normalizeProviderError(err, provider, operation, phase = 'request') {
-    const status = getErrorStatus(err);
-    return toProviderError(err, {
-        ...(status !== undefined ? { statusCode: status } : {}),
-        provider,
-        operation,
-        phase,
-    });
-}
 function toRecord(value) {
     return value && typeof value === 'object' ? value : {};
 }

package/dist/platform/providers/openai-codex.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"openai-codex.d.ts","sourceRoot":"","sources":["../../../src/platform/providers/openai-codex.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,WAAW,EACX,YAAY,EACZ,WAAW,EAGX,uBAAuB,EACvB,2BAA2B,EAC5B,MAAM,gBAAgB,CAAC;AAMxB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AA6ItE,wBAAsB,mBAAmB,CACvC,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,YAAY,CAAC,CA8PvB;AAED,qBAAa,mBAAoB,YAAW,WAAW;IAKnD,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IAJtC,QAAQ,CAAC,IAAI,uBAA8B;IAC3C,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,CAAM;gBAGZ,mBAAmB,EAAE,IAAI,CAAC,mBAAmB,EAAE,KAAK,GAAG,kBAAkB,GAAG,oBAAoB,CAAC;IAG9G,IAAI,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC;IAgBhD,eAAe,CAAC,IAAI,EAAE,2BAA2B,GAAG,OAAO,CAAC,uBAAuB,CAAC;CAgC3F"}
+{"version":3,"file":"openai-codex.d.ts","sourceRoot":"","sources":["../../../src/platform/providers/openai-codex.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,WAAW,EACX,YAAY,EACZ,WAAW,EAGX,uBAAuB,EACvB,2BAA2B,EAC5B,MAAM,gBAAgB,CAAC;AAMxB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AA8ItE,wBAAsB,mBAAmB,CACvC,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,YAAY,CAAC,CA2PvB;AAED,qBAAa,mBAAoB,YAAW,WAAW;IAKnD,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IAJtC,QAAQ,CAAC,IAAI,uBAA8B;IAC3C,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,CAAM;gBAGZ,mBAAmB,EAAE,IAAI,CAAC,mBAAmB,EAAE,KAAK,GAAG,kBAAkB,GAAG,oBAAoB,CAAC;IAG9G,IAAI,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC;IAgBhD,eAAe,CAAC,IAAI,EAAE,2BAA2B,GAAG,OAAO,CAAC,uBAAuB,CAAC;CAgC3F"}

package/dist/platform/providers/openai-codex.js

@@ -7,6 +7,7 @@ import { instrumentedLlmCall } from '../runtime/llm-observability.js';
 import { mapCodexStopReason } from './stop-reason-maps.js';
 import { instrumentedFetch } from '../utils/fetch-with-timeout.js';
 import { parseToolCallArguments } from './tool-formats.js';
+import { SseLineBuffer } from './sse-line-buffer.js';
 const OPENAI_CODEX_BASE_URL = 'https://chatgpt.com/backend-api';
 const OPENAI_CODEX_PROVIDER_NAME = 'openai-subscriber';
 function getOpenAICodexUserAgent() {
@@ -192,8 +193,7 @@ export async function chatWithOpenAICodex(accessToken, params) {
             });
         }
         try {
-            const decoder = new TextDecoder();
-            let buffer = '';
+            const sseBuffer = new SseLineBuffer();
             let text = '';
             const toolStarts = new Map();
             const toolItemIds = new Map();
@@ -346,10 +346,7 @@ export async function chatWithOpenAICodex(accessToken, params) {
                     break;
                 if (!value)
                     continue;
-                buffer += decoder.decode(value, { stream: true });
-                const lines = buffer.split(/\r?\n/);
-                buffer = lines.pop() ?? '';
-                for (const rawLine of lines) {
+                for (const rawLine of sseBuffer.feed(value)) {
                     const line = rawLine.trim();
                     if (!line.startsWith('data: '))
                         continue;
@@ -359,9 +356,11 @@ export async function chatWithOpenAICodex(accessToken, params) {
                     handleDataPayload(data);
                 }
             }
-            const trailing = buffer.trim();
-            if (trailing.startsWith('data: ')) {
-                const data = trailing.slice(6).trim();
+            for (const rawLine of sseBuffer.flush()) {
+                const line = rawLine.trim();
+                if (!line.startsWith('data: '))
+                    continue;
+                const data = line.slice(6).trim();
                 if (data && data !== '[DONE]') {
                     handleDataPayload(data);
                 }

package/dist/platform/providers/openai-compat.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"openai-compat.d.ts","sourceRoot":"","sources":["../../../src/platform/providers/openai-compat.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"openai-compat.d.ts","sourceRoot":"","sources":["../../../src/platform/providers/openai-compat.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,WAAW,EACX,WAAW,EACX,YAAY,EAEZ,wBAAwB,EACxB,uBAAuB,EACvB,uBAAuB,EACvB,2BAA2B,EAC5B,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAc5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AA0M3D,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,YAAY,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,GAAG,SAAS,CAAC;IACvD,4EAA4E;IAC5E,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC;IACpD,kEAAkE;IAClE,eAAe,CAAC,EAAE,SAAS,GAAG,YAAY,GAAG,UAAU,GAAG,MAAM,GAAG,SAAS,CAAC;IAC7E,wFAAwF;IACxF,WAAW,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAC;IAC5C,gFAAgF;IAChF,YAAY,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAC;IAC7C,iGAAiG;IACjG,sBAAsB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5C,8FAA8F;IAC9F,2BAA2B,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAC;IAC5D,uEAAuE;IACvE,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAC;IACxC,+DAA+D;IAC/D,cAAc,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,+CAA+C;IAC/C,cAAc,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACrC,mBAAmB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC1C,eAAe,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,sFAAsF;IACtF,cAAc,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACrC,mEAAmE;IACnE,eAAe,CAAC,EAAE,IAAI,CAAC,eAAe,EAAE,YAAY,CAAC,GAAG,SAAS,CAAC;CACnE;AAED;;;;GAIG;AACH,qBAAa,oBAAqB,YAAW,WAAW;IACtD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;IAC1B,QAAQ,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,GAAG,SAAS,CAAC;IAEhE,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAU;IACrC,OAAO,CAAC,eAAe,CAAiD;IACxE,OAAO,CAAC,eAAe,CAA0B;IACjD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAoB;IAChD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAoB;IACjD,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAqB;IAC7D,OAAO,CAAC,QAAQ,CAAC,2BAA2B,CAAoB;IAChE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAoB;IAC5C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAqB;IACrD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAU;IACzC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAU;IAC9C,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAqB;IACtD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAsC;IACtE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;gBAE1B,IAAI,EAAE,mBAAmB;IAkCrC,YAAY,IAAI,OAAO;IAIjB,IAAI,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC;IAwMhD,KAAK,CAAC,OAAO,EAAE,wBAAwB,GAAG,OAAO,CAAC,uBAAuB,CAAC;IA8B1E,eAAe,CAAC,IAAI,EAAE,2BAA2B,GAAG,OAAO,CAAC,uBAAuB,CAAC;CAmD3F"}

package/dist/platform/providers/openai-compat.js

@@ -2,7 +2,9 @@ import OpenAI from 'openai';
 import { ProviderError } from '../types/errors.js';
 import { withRetry } from '../utils/retry.js';
 import { instrumentedLlmCall } from '../runtime/llm-observability.js';
-import { toOpenAITools, toOpenAIMessages, fromOpenAIToolCalls, extractTextToolCalls, } from './tool-formats.js';
+import { toOpenAITools, toOpenAIMessages, } from './tool-formats.js';
+import { accumOpenAIToolCall, finalizeOpenAIToolCalls, applyOpenAIChunkUsage, resolveOpenAIToolCallsAndFallback } from './openai-stream-helpers.js';
+import { resolveCompletedStopReason, withProviderStopReason } from './provider-stop-reason.js';
 import { getCacheCapability } from './cache-capability.js';
 import { extractOpenAIStreamTextDelta } from './openai-stream-delta.js';
 import { logger } from '../utils/logger.js';
@@ -324,20 +326,7 @@ export class OpenAICompatProvider {
                     // Accumulate streaming tool_calls deltas
                     if (delta?.tool_calls) {
                         for (const tc of delta.tool_calls) {
-                            const idx = tc.index;
-                            if (!accToolCalls.has(idx)) {
-                                accToolCalls.set(idx, { id: tc.id ?? '', name: tc.function?.name ?? '', args: '' });
-                            }
-                            const entry = accToolCalls.get(idx);
-                            if (tc.id)
-                                entry.id = tc.id;
-                            if (tc.function?.name)
-                                entry.name = tc.function.name;
-                            if (tc.function?.arguments)
-                                entry.args += tc.function.arguments;
-                            if (onDelta) {
-                                onDelta({ toolCalls: [{ index: idx, id: tc.id, name: tc.function?.name, arguments: tc.function?.arguments }] });
-                            }
+                            accumOpenAIToolCall(accToolCalls, tc, onDelta);
                         }
                     }
                     const finishReason = raw.choices[0]?.finish_reason;
@@ -345,20 +334,9 @@ export class OpenAICompatProvider {
                         rawStopReason = finishReason;
                         stopReason = mapOpenAIStopReason(finishReason);
                     }
-                    if (raw.usage) {
-                        const rawUsage = raw.usage;
-                        inputTokens = rawUsage.prompt_tokens ?? 0;
-                        outputTokens = rawUsage.completion_tokens ?? 0;
-                        cacheReadTokens = rawUsage.prompt_tokens_details?.cached_tokens ?? cacheReadTokens;
-                    }
-                }
-                for (const [, tc] of [...accToolCalls.entries()].sort(([a], [b]) => a - b)) {
-                    rawToolCalls.push({
-                        id: tc.id,
-                        type: 'function',
-                        function: { name: tc.name, arguments: tc.args },
-                    });
+                    ({ inputTokens, outputTokens, cacheReadTokens } = applyOpenAIChunkUsage(raw.usage, { inputTokens, outputTokens, cacheReadTokens }));
                 }
+                rawToolCalls = finalizeOpenAIToolCalls(accToolCalls);
             }
             catch (err) {
                 const diagnostic = extractOpenAICompatErrorDiagnostic(err);
@@ -393,16 +371,11 @@ export class OpenAICompatProvider {
             // Some models (e.g. kimi-k2-thinking via ollama-cloud) emit tool calls as
             // raw text tokens instead of the OpenAI function-calling wire format.
             // Fall back to text extraction when no structured tool calls were found.
-            let toolCalls = rawToolCalls.length > 0 ? fromOpenAIToolCalls(rawToolCalls) : [];
-            if (toolCalls.length === 0 && (responseText.includes('<|toolcallbegin|>') || responseText.includes('<|tool_call_begin|>'))) {
-                const extracted = extractTextToolCalls(responseText);
-                if (extracted.toolCalls.length > 0) {
-                    toolCalls = extracted.toolCalls;
-                    responseText = extracted.cleanedContent;
-                    stopReason = 'tool_call';
-                    rawStopReason = rawStopReason ?? 'tool_calls';
-                }
-            }
+            const resolved = resolveOpenAIToolCallsAndFallback(rawToolCalls, responseText, stopReason, rawStopReason);
+            const toolCalls = resolved.toolCalls;
+            responseText = resolved.responseText;
+            stopReason = resolved.stopReason;
+            rawStopReason = resolved.rawStopReason;
             const response = {
                 content: responseText,
                 toolCalls,
@@ -411,8 +384,8 @@ export class OpenAICompatProvider {
                     outputTokens,
                     ...(cacheReadTokens > 0 ? { cacheReadTokens } : {}),
                 },
-                stopReason: stopReason === 'unknown' && responseText ? 'completed' : stopReason,
-                ...(rawStopReason !== undefined ? { providerStopReason: rawStopReason } : {}),
+                stopReason: resolveCompletedStopReason(stopReason, responseText),
+                ...withProviderStopReason(rawStopReason),
             };
             if (reasoningSummaryText) {
                 response.reasoningSummary = reasoningSummaryText;

package/dist/platform/providers/openai-stream-helpers.d.ts

@@ -0,0 +1,62 @@
+import type { ChatStopReason, StreamDelta } from './interface.js';
+import type { OpenAIToolCall } from './tool-formats.js';
+import { fromOpenAIToolCalls } from './tool-formats.js';
+/** Accumulated state for one streaming tool-call slot. */
+export interface OpenAIToolCallSlot {
+    id: string;
+    name: string;
+    args: string;
+}
+/** Usage fields found on OpenAI streaming chunks. */
+export interface OpenAIChunkUsage {
+    prompt_tokens?: number | undefined;
+    completion_tokens?: number | undefined;
+    prompt_tokens_details?: {
+        cached_tokens?: number;
+    } | undefined;
+}
+/**
+ * Update the tool-call accumulator map with one streaming tool_call delta.
+ * Fires onDelta if provided.
+ */
+export declare function accumOpenAIToolCall(acc: Map<number, OpenAIToolCallSlot>, tc: {
+    index: number;
+    id?: string | undefined;
+    function?: {
+        name?: string | undefined;
+        arguments?: string | undefined;
+    } | undefined;
+}, onDelta: ((delta: StreamDelta) => void) | undefined): void;
+/**
+ * Finalise accumulated tool-call slots into the raw OpenAI wire format,
+ * sorted by stream index.
+ */
+export declare function finalizeOpenAIToolCalls(acc: Map<number, OpenAIToolCallSlot>): OpenAIToolCall[];
+/**
+ * Apply token counts from a streaming chunk's usage field.
+ * Absent fields keep the value from current (so initial 0 stays 0
+ * if the provider never sends those fields).
+ */
+export declare function applyOpenAIChunkUsage(usage: OpenAIChunkUsage | null | undefined, current: {
+    inputTokens: number;
+    outputTokens: number;
+    cacheReadTokens: number;
+}): {
+    inputTokens: number;
+    outputTokens: number;
+    cacheReadTokens: number;
+};
+/**
+ * Convert finalized raw tool-calls to canonical form and apply the text-based
+ * tool-call fallback for models that emit tool calls as raw text tokens.
+ *
+ * Returns the final toolCalls list plus (possibly mutated) response text,
+ * stop reason, and raw stop reason.
+ */
+export declare function resolveOpenAIToolCallsAndFallback(rawToolCalls: OpenAIToolCall[], responseText: string, stopReason: ChatStopReason, rawStopReason: string | undefined): {
+    toolCalls: ReturnType<typeof fromOpenAIToolCalls>;
+    responseText: string;
+    stopReason: ChatStopReason;
+    rawStopReason: string | undefined;
+};
+//# sourceMappingURL=openai-stream-helpers.d.ts.map

package/dist/platform/providers/openai-stream-helpers.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"openai-stream-helpers.d.ts","sourceRoot":"","sources":["../../../src/platform/providers/openai-stream-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAClE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAwB,MAAM,mBAAmB,CAAC;AAE9E,0DAA0D;AAC1D,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,qDAAqD;AACrD,MAAM,WAAW,gBAAgB;IAC/B,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,iBAAiB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACvC,qBAAqB,CAAC,EAAE;QAAE,aAAa,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,CAAC;CAChE;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,EACpC,EAAE,EAAE;IACF,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACxB,QAAQ,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,GAAG,SAAS,CAAC;CACtF,EACD,OAAO,EAAE,CAAC,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC,GAAG,SAAS,GAClD,IAAI,CAcN;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,GAAG,cAAc,EAAE,CAU9F;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,gBAAgB,GAAG,IAAI,GAAG,SAAS,EAC1C,OAAO,EAAE;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,MAAM,CAAA;CAAE,GAC9E;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,MAAM,CAAA;CAAE,CAOxE;AAED;;;;;;GAMG;AACH,wBAAgB,iCAAiC,CAC/C,YAAY,EAAE,cAAc,EAAE,EAC9B,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,cAAc,EAC1B,aAAa,EAAE,MAAM,GAAG,SAAS,GAChC;IACD,SAAS,EAAE,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAC;IAClD,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,cAAc,CAAC;IAC3B,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;CACnC,CAeA"}

package/dist/platform/providers/openai-stream-helpers.js

@@ -0,0 +1,73 @@
+import { fromOpenAIToolCalls, extractTextToolCalls } from './tool-formats.js';
+/**
+ * Update the tool-call accumulator map with one streaming tool_call delta.
+ * Fires onDelta if provided.
+ */
+export function accumOpenAIToolCall(acc, tc, onDelta) {
+    const idx = tc.index;
+    if (!acc.has(idx)) {
+        acc.set(idx, { id: tc.id ?? '', name: tc.function?.name ?? '', args: '' });
+    }
+    const entry = acc.get(idx);
+    if (tc.id)
+        entry.id = tc.id;
+    if (tc.function?.name)
+        entry.name = tc.function.name;
+    if (tc.function?.arguments)
+        entry.args += tc.function.arguments;
+    if (onDelta) {
+        onDelta({
+            toolCalls: [{ index: idx, id: tc.id, name: tc.function?.name, arguments: tc.function?.arguments }],
+        });
+    }
+}
+/**
+ * Finalise accumulated tool-call slots into the raw OpenAI wire format,
+ * sorted by stream index.
+ */
+export function finalizeOpenAIToolCalls(acc) {
+    const result = [];
+    for (const [, tc] of [...acc.entries()].sort(([a], [b]) => a - b)) {
+        result.push({
+            id: tc.id,
+            type: 'function',
+            function: { name: tc.name, arguments: tc.args },
+        });
+    }
+    return result;
+}
+/**
+ * Apply token counts from a streaming chunk's usage field.
+ * Absent fields keep the value from current (so initial 0 stays 0
+ * if the provider never sends those fields).
+ */
+export function applyOpenAIChunkUsage(usage, current) {
+    if (!usage)
+        return current;
+    return {
+        inputTokens: usage.prompt_tokens ?? current.inputTokens,
+        outputTokens: usage.completion_tokens ?? current.outputTokens,
+        cacheReadTokens: usage.prompt_tokens_details?.cached_tokens ?? current.cacheReadTokens,
+    };
+}
+/**
+ * Convert finalized raw tool-calls to canonical form and apply the text-based
+ * tool-call fallback for models that emit tool calls as raw text tokens.
+ *
+ * Returns the final toolCalls list plus (possibly mutated) response text,
+ * stop reason, and raw stop reason.
+ */
+export function resolveOpenAIToolCallsAndFallback(rawToolCalls, responseText, stopReason, rawStopReason) {
+    let toolCalls = rawToolCalls.length > 0 ? fromOpenAIToolCalls(rawToolCalls) : [];
+    if (toolCalls.length === 0 &&
+        (responseText.includes('<|toolcallbegin|>') || responseText.includes('<|tool_call_begin|>'))) {
+        const extracted = extractTextToolCalls(responseText);
+        if (extracted.toolCalls.length > 0) {
+            toolCalls = extracted.toolCalls;
+            responseText = extracted.cleanedContent;
+            stopReason = 'tool_call';
+            rawStopReason = rawStopReason ?? 'tool_calls';
+        }
+    }
+    return { toolCalls, responseText, stopReason, rawStopReason };
+}

package/dist/platform/providers/openai.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../../../src/platform/providers/openai.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,WAAW,EACX,WAAW,EACX,YAAY,EAEZ,wBAAwB,EACxB,uBAAuB,EACvB,oBAAoB,EAKpB,uBAAuB,EACvB,2BAA2B,EAC5B,MAAM,gBAAgB,CAAC;AAYxB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAQ3D;;;GAGG;AACH,qBAAa,cAAe,YAAW,WAAW;IAChD,QAAQ,CAAC,IAAI,YAAY;IACzB,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,CAAM;IAC/B,QAAQ,CAAC,KAAK,EAAE,oBAAoB,CAAC;IAErC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA4B;IAC3D,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAsC;gBAE1D,MAAM,EAAE,MAAM,EAAE,eAAe,GAAE,IAAI,CAAC,eAAe,EAAE,YAAY,CAA0B;IAcnG,IAAI,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC;IA8HhD,KAAK,CAAC,OAAO,EAAE,wBAAwB,GAAG,OAAO,CAAC,uBAAuB,CAAC;IA8BhF,YAAY,IAAI,OAAO;IAIjB,eAAe,CAAC,IAAI,EAAE,2BAA2B,GAAG,OAAO,CAAC,uBAAuB,CAAC;YA+C5E,eAAe;YAyBf,aAAa;YAUb,WAAW;YAUX,eAAe;IAY7B,OAAO,CAAC,qBAAqB;IAY7B,OAAO,CAAC,oBAAoB;YASd,yBAAyB;IAuBvC,OAAO,CAAC,sBAAsB;IA2B9B,OAAO,CAAC,6BAA6B;CAkCtC"}
+{"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../../../src/platform/providers/openai.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,WAAW,EACX,WAAW,EACX,YAAY,EAEZ,wBAAwB,EACxB,uBAAuB,EACvB,oBAAoB,EAKpB,uBAAuB,EACvB,2BAA2B,EAC5B,MAAM,gBAAgB,CAAC;AAaxB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAQ3D;;;GAGG;AACH,qBAAa,cAAe,YAAW,WAAW;IAChD,QAAQ,CAAC,IAAI,YAAY;IACzB,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,CAAM;IAC/B,QAAQ,CAAC,KAAK,EAAE,oBAAoB,CAAC;IAErC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA4B;IAC3D,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAsC;gBAE1D,MAAM,EAAE,MAAM,EAAE,eAAe,GAAE,IAAI,CAAC,eAAe,EAAE,YAAY,CAA0B;IAcnG,IAAI,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC;IAsGhD,KAAK,CAAC,OAAO,EAAE,wBAAwB,GAAG,OAAO,CAAC,uBAAuB,CAAC;IA8BhF,YAAY,IAAI,OAAO;IAIjB,eAAe,CAAC,IAAI,EAAE,2BAA2B,GAAG,OAAO,CAAC,uBAAuB,CAAC;YA+C5E,eAAe;YAyBf,aAAa;YAUb,WAAW;YAUX,eAAe;IAY7B,OAAO,CAAC,qBAAqB;IAY7B,OAAO,CAAC,oBAAoB;YASd,yBAAyB;IAuBvC,OAAO,CAAC,sBAAsB;IA2B9B,OAAO,CAAC,6BAA6B;CAkCtC"}

package/dist/platform/providers/openai.js

@@ -2,7 +2,9 @@ import OpenAI, { toFile } from 'openai';
 import { mapOpenAIStopReason } from './stop-reason-maps.js';
 import { ProviderError } from '../types/errors.js';
 import { withRetry } from '../utils/retry.js';
-import { toOpenAITools, toOpenAIMessages, fromOpenAIToolCalls, extractTextToolCalls, } from './tool-formats.js';
+import { toOpenAITools, toOpenAIMessages, fromOpenAIToolCalls, } from './tool-formats.js';
+import { accumOpenAIToolCall, finalizeOpenAIToolCalls, applyOpenAIChunkUsage, resolveOpenAIToolCallsAndFallback } from './openai-stream-helpers.js';
+import { resolveCompletedStopReason, withProviderStopReason } from './provider-stop-reason.js';
 import { extractOpenAIStreamTextDelta } from './openai-stream-delta.js';
 import { summarizeError, toProviderError } from '../utils/error-display.js';
 const NOOP_CACHE_HIT_TRACKER = {
@@ -71,20 +73,7 @@ export class OpenAIProvider {
                     // Accumulate streaming tool_calls deltas
                     if (delta?.tool_calls) {
                         for (const tc of delta.tool_calls) {
-                            const idx = tc.index;
-                            if (!accToolCalls.has(idx)) {
-                                accToolCalls.set(idx, { id: tc.id ?? '', name: tc.function?.name ?? '', args: '' });
-                            }
-                            const entry = accToolCalls.get(idx);
-                            if (tc.id)
-                                entry.id = tc.id;
-                            if (tc.function?.name)
-                                entry.name = tc.function.name;
-                            if (tc.function?.arguments)
-                                entry.args += tc.function.arguments;
-                            if (onDelta) {
-                                onDelta({ toolCalls: [{ index: idx, id: tc.id, name: tc.function?.name, arguments: tc.function?.arguments }] });
-                            }
+                            accumOpenAIToolCall(accToolCalls, tc, onDelta);
                         }
                     }
                     const finishReason = chunk.choices[0]?.finish_reason;
@@ -92,21 +81,9 @@ export class OpenAIProvider {
                         rawStopReason = finishReason;
                         stopReason = mapOpenAIStopReason(finishReason);
                     }
-                    const usage = chunk.usage;
-                    if (usage) {
-                        inputTokens = usage.prompt_tokens ?? 0;
-                        outputTokens = usage.completion_tokens ?? 0;
-                        cacheReadTokens = usage.prompt_tokens_details?.cached_tokens ?? cacheReadTokens;
-                    }
-                }
-                // Finalise accumulated tool calls
-                for (const [, tc] of [...accToolCalls.entries()].sort(([a], [b]) => a - b)) {
-                    rawToolCalls.push({
-                        id: tc.id,
-                        type: 'function',
-                        function: { name: tc.name, arguments: tc.args },
-                    });
+                    ({ inputTokens, outputTokens, cacheReadTokens } = applyOpenAIChunkUsage(chunk.usage, { inputTokens, outputTokens, cacheReadTokens }));
                 }
+                rawToolCalls = finalizeOpenAIToolCalls(accToolCalls);
             }
             catch (err) {
                 const { hasStatus } = await import('../utils/retry.js');
@@ -120,16 +97,11 @@ export class OpenAIProvider {
             }
             // Some models may emit tool calls as raw text tokens instead of the
             // OpenAI function-calling wire format. Fall back to text extraction.
-            let toolCalls = rawToolCalls.length > 0 ? fromOpenAIToolCalls(rawToolCalls) : [];
-            if (toolCalls.length === 0 && (responseText.includes('<|toolcallbegin|>') || responseText.includes('<|tool_call_begin|>'))) {
-                const extracted = extractTextToolCalls(responseText);
-                if (extracted.toolCalls.length > 0) {
-                    toolCalls = extracted.toolCalls;
-                    responseText = extracted.cleanedContent;
-                    stopReason = 'tool_call';
-                    rawStopReason = rawStopReason ?? 'tool_calls';
-                }
-            }
+            const resolved = resolveOpenAIToolCallsAndFallback(rawToolCalls, responseText, stopReason, rawStopReason);
+            const toolCalls = resolved.toolCalls;
+            responseText = resolved.responseText;
+            stopReason = resolved.stopReason;
+            rawStopReason = resolved.rawStopReason;
             this.cacheHitTracker.recordTurn({
                 inputTokens,
                 cacheReadTokens,
@@ -142,8 +114,8 @@ export class OpenAIProvider {
                     outputTokens,
                     ...(cacheReadTokens > 0 ? { cacheReadTokens } : {}),
                 },
-                stopReason: stopReason === 'unknown' && responseText ? 'completed' : stopReason,
-                ...(rawStopReason !== undefined ? { providerStopReason: rawStopReason } : {}),
+                stopReason: resolveCompletedStopReason(stopReason, responseText),
+                ...withProviderStopReason(rawStopReason),
             };
         });
     }

package/dist/platform/providers/provider-error.d.ts

@@ -0,0 +1,17 @@
+/**
+ * Shared provider-error helpers.
+ *
+ * Consolidated from three verbatim copies in lm-studio-helpers.ts,
+ * llama-cpp.ts, and ollama.ts into a single definition.
+ */
+import type { ProviderError } from '../types/errors.js';
+/**
+ * Extract an HTTP status code from an error object.
+ * Checks `.status` before `.statusCode` to preserve provider-error convention.
+ */
+export declare function getErrorStatus(err: unknown): number | undefined;
+/**
+ * Wrap an error into a ProviderError, attaching the HTTP status if present.
+ */
+export declare function normalizeProviderError(err: unknown, provider: string, operation: string, phase?: string): ProviderError;
+//# sourceMappingURL=provider-error.d.ts.map

package/dist/platform/providers/provider-error.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"provider-error.d.ts","sourceRoot":"","sources":["../../../src/platform/providers/provider-error.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAExD;;;GAGG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAO/D;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,OAAO,EACZ,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,KAAK,SAAY,GAChB,aAAa,CAQf"}

package/dist/platform/providers/provider-error.js

@@ -0,0 +1,33 @@
+/**
+ * Shared provider-error helpers.
+ *
+ * Consolidated from three verbatim copies in lm-studio-helpers.ts,
+ * llama-cpp.ts, and ollama.ts into a single definition.
+ */
+import { toProviderError } from '../utils/error-display.js';
+/**
+ * Extract an HTTP status code from an error object.
+ * Checks `.status` before `.statusCode` to preserve provider-error convention.
+ */
+export function getErrorStatus(err) {
+    if (err && typeof err === 'object') {
+        const record = err;
+        if (typeof record.status === 'number')
+            return record.status;
+        if (typeof record.statusCode === 'number')
+            return record.statusCode;
+    }
+    return undefined;
+}
+/**
+ * Wrap an error into a ProviderError, attaching the HTTP status if present.
+ */
+export function normalizeProviderError(err, provider, operation, phase = 'request') {
+    const status = getErrorStatus(err);
+    return toProviderError(err, {
+        ...(status !== undefined ? { statusCode: status } : {}),
+        provider,
+        operation,
+        phase,
+    });
+}

package/dist/platform/providers/provider-stop-reason.d.ts

@@ -0,0 +1,15 @@
+import type { ChatStopReason } from './interface.js';
+/**
+ * Resolve an 'unknown' stop reason to 'completed' when the model produced text.
+ * Providers use this when the stream ended without an explicit finish reason
+ * but content was generated.
+ */
+export declare function resolveCompletedStopReason(stopReason: ChatStopReason, content: string | undefined): ChatStopReason;
+/**
+ * Build the providerStopReason spread for ChatResponse.
+ * Returns { providerStopReason } when the raw value is known, otherwise {}.
+ */
+export declare function withProviderStopReason(rawStopReason: string | undefined): {
+    providerStopReason?: string;
+};
+//# sourceMappingURL=provider-stop-reason.d.ts.map

package/dist/platform/providers/provider-stop-reason.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"provider-stop-reason.d.ts","sourceRoot":"","sources":["../../../src/platform/providers/provider-stop-reason.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAErD;;;;GAIG;AACH,wBAAgB,0BAA0B,CACxC,UAAU,EAAE,cAAc,EAC1B,OAAO,EAAE,MAAM,GAAG,SAAS,GAC1B,cAAc,CAEhB;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CACpC,aAAa,EAAE,MAAM,GAAG,SAAS,GAChC;IAAE,kBAAkB,CAAC,EAAE,MAAM,CAAA;CAAE,CAEjC"}

package/dist/platform/providers/provider-stop-reason.js

@@ -0,0 +1,15 @@
+/**
+ * Resolve an 'unknown' stop reason to 'completed' when the model produced text.
+ * Providers use this when the stream ended without an explicit finish reason
+ * but content was generated.
+ */
+export function resolveCompletedStopReason(stopReason, content) {
+    return stopReason === 'unknown' && content ? 'completed' : stopReason;
+}
+/**
+ * Build the providerStopReason spread for ChatResponse.
+ * Returns { providerStopReason } when the raw value is known, otherwise {}.
+ */
+export function withProviderStopReason(rawStopReason) {
+    return rawStopReason !== undefined ? { providerStopReason: rawStopReason } : {};
+}