@calliopelabs/cli 3.0.0 → 3.2.0

package/dist/providers/ollama.js

@@ -11,8 +11,9 @@
  * - Model fallback discovery when configured model isn't available
  * - Streaming support with proper tool call collection
  */
+import { cancellable, throwIfCancelled } from '../cancellation.js';
 import * as config from '../config.js';
-import { debugLog } from './types.js';
+import { normalizeFinishReason, debugLog, limitOutputTokens } from './types.js';
 import { getOllamaFallbackModel } from '../model-detection.js';
 // Track which models don't support tools — expires after 10 calls to allow recovery
 const toolUnsupportedModels = new Map(); // model -> remaining skip count
@@ -142,9 +143,13 @@ function isToolError(errText) {
 // Chat Function
 // ============================================================================
 export async function chatOllama(messages, tools, model, onToken, options) {
+    if (options?.maxOutputTokens !== undefined)
+        limitOutputTokens(options.maxOutputTokens, options.maxOutputTokens);
+    if (options?.bounded && options.maxOutputTokens === undefined)
+        throw new Error('Bounded Ollama calls require an output limit.');
     const baseUrl = getBaseUrl();
     const skipCount = toolUnsupportedModels.get(model) ?? 0;
-    const skipTools = skipCount > 0;
+    const skipTools = !options?.bounded && skipCount > 0;
     if (skipTools) {
         // Decrement counter — eventually we'll retry with tools
         toolUnsupportedModels.set(model, skipCount - 1);
@@ -158,47 +163,54 @@ export async function chatOllama(messages, tools, model, onToken, options) {
     }
     debugLog(`ollama native request: model=${model}, tools=${ollamaTools.length}, stream=${!!onToken}, format=${!!options?.format}`);
     try {
-        return await doChat(baseUrl, model, ollamaMessages, ollamaTools, onToken, options?.format);
+        return await doChat(baseUrl, model, ollamaMessages, ollamaTools, onToken, options?.format, options?.signal, options);
     }
     catch (error) {
+        throwIfCancelled(options?.signal);
+        if (options?.bounded)
+            throw error;
         const errMsg = error instanceof Error ? error.message : String(error);
         // Model not found — try fallback
         if (errMsg.includes('not found') || errMsg.includes('404')) {
-            return tryFallback(baseUrl, model, ollamaMessages, ollamaTools, onToken);
+            return tryFallback(baseUrl, model, ollamaMessages, ollamaTools, onToken, options?.signal);
         }
         // Tool-related error (400) — retry without tools
         if (ollamaTools.length > 0 && isToolError(errMsg)) {
             debugLog(`ollama: model "${model}" rejected tools, retrying without tools (will retry in ${TOOL_SKIP_COUNT} calls)`);
             toolUnsupportedModels.set(model, TOOL_SKIP_COUNT);
             const cleanMessages = toOllamaMessages(messages, true);
-            return doChat(baseUrl, model, cleanMessages, [], onToken);
+            return doChat(baseUrl, model, cleanMessages, [], onToken, undefined, options?.signal);
         }
         throw error;
     }
 }
-async function doChat(baseUrl, model, messages, tools, onToken, format) {
+async function doChat(baseUrl, model, messages, tools, onToken, format, signal, limits) {
+    throwIfCancelled(signal);
     const requestBody = {
         model,
         messages,
         tools: tools.length > 0 ? tools : undefined,
         stream: !!onToken,
         ...(format !== undefined ? { format } : {}),
+        ...(limits?.maxOutputTokens !== undefined ? { options: { num_predict: limits.maxOutputTokens } } : {}),
     };
     let response = await fetch(`${baseUrl}/api/chat`, {
         method: 'POST',
+        ...(signal ? { signal } : {}),
         headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify(requestBody),
     });
     // Grammar-constrained `format` is best-effort: if this Ollama build rejects
     // the schema (older versions, or a server that doesn't implement it), degrade
     // silently and retry the same request without it rather than failing the call.
-    if (!response.ok && format !== undefined) {
+    if (!limits?.bounded && !response.ok && format !== undefined) {
         const peek = await response.clone().text().catch(() => '');
         if (response.status === 400 || /format/i.test(peek)) {
             debugLog(`ollama: format param rejected (${response.status}), retrying without it`);
             const { format: _dropped, ...withoutFormat } = requestBody;
             response = await fetch(`${baseUrl}/api/chat`, {
                 method: 'POST',
+                ...(signal ? { signal } : {}),
                 headers: { 'Content-Type': 'application/json' },
                 body: JSON.stringify(withoutFormat),
             });
@@ -209,9 +221,11 @@ async function doChat(baseUrl, model, messages, tools, onToken, format) {
         throw new Error(`Ollama API error ${response.status}: ${errText}`);
     }
     if (onToken) {
-        return streamResponse(response, onToken);
+        return streamResponse(response, onToken, limits?.bounded, signal);
     }
     const data = await response.json();
+    if (data.error)
+        throw new Error(`Ollama API error: ${data.error}`);
     if (data.load_duration && data.load_duration > 10_000_000_000) {
         debugLog(`ollama: cold start for ${model} took ${Math.round(data.load_duration / 1_000_000_000)}s`);
     }
@@ -229,14 +243,14 @@ async function doChat(baseUrl, model, messages, tools, onToken, format) {
     return {
         content: responseContent,
         toolCalls: toolCalls.length > 0 ? toolCalls : undefined,
-        finishReason: toolCalls.length > 0 ? 'tool_use' : 'stop',
-        usage: {
+        finishReason: normalizeFinishReason(data.done_reason, toolCalls.length > 0),
+        usage: limits?.bounded && (typeof data.prompt_eval_count !== 'number' || typeof data.eval_count !== 'number') ? undefined : {
             inputTokens: data.prompt_eval_count || 0,
             outputTokens: data.eval_count || 0,
         },
     };
 }
-async function streamResponse(response, onToken) {
+async function streamResponse(response, onToken, bounded = false, signal) {
     const reader = response.body?.getReader();
     if (!reader)
         throw new Error('No response body from Ollama');
@@ -245,36 +259,56 @@ async function streamResponse(response, onToken) {
     let allToolCalls = [];
     let promptTokens = 0;
     let completionTokens = 0;
-    while (true) {
-        const { done, value } = await reader.read();
-        if (done)
-            break;
-        const text = decoder.decode(value, { stream: true });
-        const lines = text.split('\n').filter(l => l.trim());
-        for (const line of lines) {
-            let chunk;
-            try {
-                chunk = JSON.parse(line);
-            }
-            catch {
-                continue;
-            }
-            if (chunk.message?.content) {
-                content += chunk.message.content;
-                onToken(chunk.message.content);
-            }
-            if (chunk.message?.tool_calls) {
-                const parsed = parseOllamaToolCalls(chunk.message.tool_calls);
-                allToolCalls.push(...parsed);
-            }
-            if (chunk.done) {
-                if (chunk.prompt_eval_count)
-                    promptTokens = chunk.prompt_eval_count;
-                if (chunk.eval_count)
-                    completionTokens = chunk.eval_count;
+    let finishReason = 'stop';
+    let pending = '';
+    let receivedDone = false, usageSeen = false;
+    try {
+        while (true) {
+            const { done, value } = await reader.read();
+            pending += done ? decoder.decode() : decoder.decode(value, { stream: true });
+            const lines = pending.split('\n');
+            pending = done ? '' : lines.pop();
+            for (const line of lines) {
+                if (!line.trim())
+                    continue;
+                let chunk;
+                try {
+                    chunk = JSON.parse(line);
+                }
+                catch {
+                    throw new Error('Malformed JSON in Ollama response stream');
+                }
+                if (chunk.error)
+                    throw new Error(`Ollama stream error: ${chunk.error}`);
+                if (chunk.message?.content) {
+                    content += chunk.message.content;
+                    onToken(chunk.message.content);
+                }
+                if (chunk.message?.tool_calls) {
+                    const parsed = parseOllamaToolCalls(chunk.message.tool_calls);
+                    allToolCalls.push(...parsed);
+                }
+                if (chunk.done) {
+                    receivedDone = true;
+                    usageSeen = typeof chunk.prompt_eval_count === 'number' && typeof chunk.eval_count === 'number';
+                    finishReason = normalizeFinishReason(chunk.done_reason);
+                    if (chunk.prompt_eval_count)
+                        promptTokens = chunk.prompt_eval_count;
+                    if (chunk.eval_count)
+                        completionTokens = chunk.eval_count;
+                }
             }
+            if (done)
+                break;
         }
     }
+    finally {
+        await reader.cancel().catch(() => { });
+        reader.releaseLock();
+    }
+    throwIfCancelled(signal);
+    if (!receivedDone)
+        throw new Error('Ollama stream ended before its completion frame');
     // Fallback: parse text-based tool calls from streamed content
     if (allToolCalls.length === 0 && content.includes('<function=')) {
         const parsed = parseTextToolCalls(content);
@@ -287,15 +321,17 @@ async function streamResponse(response, onToken) {
     return {
         content,
         toolCalls: allToolCalls.length > 0 ? allToolCalls : undefined,
-        finishReason: allToolCalls.length > 0 ? 'tool_use' : 'stop',
-        usage: {
+        finishReason: normalizeFinishReason(finishReason, allToolCalls.length > 0),
+        usage: bounded && !usageSeen ? undefined : {
             inputTokens: promptTokens,
             outputTokens: completionTokens,
         },
     };
 }
-async function tryFallback(baseUrl, originalModel, messages, tools, onToken) {
-    const fallback = await getOllamaFallbackModel();
+async function tryFallback(baseUrl, originalModel, messages, tools, onToken, signal) {
+    throwIfCancelled(signal);
+    const fallback = await cancellable(getOllamaFallbackModel(), signal);
+    throwIfCancelled(signal);
     if (!fallback || fallback === originalModel) {
         throw new Error(`Ollama model "${originalModel}" not found. Pull it with: ollama pull ${originalModel}`);
     }
@@ -303,7 +339,7 @@ async function tryFallback(baseUrl, originalModel, messages, tools, onToken) {
     // Substituting the model is a decision the user must see, not a silent swap
     // (#217): attach a warning the TUI/headless surface, don't hide it.
     const warning = `ollama: model "${originalModel}" not found — using "${fallback}" (ollama pull ${originalModel} to use it)`;
-    const response = await doChat(baseUrl, fallback, messages, tools, onToken);
+    const response = await doChat(baseUrl, fallback, messages, tools, onToken, undefined, signal);
     return { ...response, warnings: [warning, ...(response.warnings ?? [])] };
 }
 //# sourceMappingURL=ollama.js.map

package/dist/providers/ollama.js.map

@@ -1 +1 @@
-{"version":3,"file":"ollama.js","sourceRoot":"","sources":["../../src/providers/ollama.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ollama.js","sourceRoot":"","sources":["../../src/providers/ollama.ts"],"names":[],"mappings":"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"}

package/dist/providers/openai.d.ts

@@ -8,7 +8,7 @@
  */
 import OpenAI from 'openai';
 import type { Message, Tool, LLMResponse, ToolCall, MessageContent } from '../types.js';
-import { type StreamCallback } from './types.js';
+import { type StreamCallback, type AdapterLimits } from './types.js';
 /**
  * Convert MessageContent to OpenAI content format
  */
@@ -17,43 +17,43 @@ export declare function toOpenAIContent(content: MessageContent): string | OpenA
  * Convert messages to OpenAI format
  */
 export declare function toOpenAIMessages(messages: Message[]): ({
-    role: "tool";
+    role: 'tool';
     tool_call_id: string;
     content: string;
     tool_calls?: undefined;
 } | {
-    role: "assistant";
+    tool_call_id?: undefined;
+    role: 'assistant';
     content: string | null;
     tool_calls: {
         id: string;
-        type: "function";
+        type: 'function';
         function: {
             name: string;
             arguments: string;
         };
     }[];
-    tool_call_id?: undefined;
 } | {
-    role: "user";
-    content: string | OpenAI.Chat.Completions.ChatCompletionContentPart[];
     tool_call_id?: undefined;
     tool_calls?: undefined;
+    role: 'user';
+    content: string | OpenAI.ChatCompletionContentPart[];
 } | {
-    role: "system" | "user" | "assistant";
-    content: string;
     tool_call_id?: undefined;
     tool_calls?: undefined;
+    role: 'system' | 'user' | 'assistant';
+    content: string;
 })[];
 /**
  * Convert tools to OpenAI format
  */
 export declare function toOpenAITools(tools: Tool[]): {
-    type: "function";
+    type: 'function';
     function: {
         name: string;
         description: string;
         parameters: {
-            type: "object";
+            type: 'object';
             properties: Record<string, {
                 type: string;
                 description: string;
@@ -116,6 +116,6 @@ export declare function toResponsesTools(tools: Tool[]): ResponsesTool[];
 /**
  * Chat with OpenAI
  */
-export declare function chatOpenAI(messages: Message[], tools: Tool[], model: string, onToken?: StreamCallback): Promise<LLMResponse>;
+export declare function chatOpenAI(messages: Message[], tools: Tool[], model: string, onToken?: StreamCallback, signal?: AbortSignal, limits?: AdapterLimits): Promise<LLMResponse>;
 export {};
 //# sourceMappingURL=openai.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../../src/providers/openai.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAe,cAAc,EAAE,MAAM,aAAa,CAAC;AACrG,OAAO,EAAgC,KAAK,cAAc,EAAE,MAAM,YAAY,CAAC;AAM/E;;GAEG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,cAAc,GAAG,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,yBAAyB,EAAE,CAkBrH;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,OAAO,EAAE;;;;;;;;;;;;;;;;;;;;;;;UAkC9B,QAAQ,GAAG,MAAM,GAAG,WAAW;;;;KAIpD;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,IAAI,EAAE;;;;;;;;;;oBArCmB,CAAC;qBAAuB,CAAC;;;;;;;IA8CtF;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,6BAA6B,EAAE,GAAG,SAAS,GAAG,QAAQ,EAAE,CAmB/H;AAMD,4CAA4C;AAC5C,KAAK,kBAAkB,GACnB;IAAE,IAAI,EAAE,WAAW,GAAG,MAAM,GAAG,WAAW,CAAC;IAAC,OAAO,EAAE,MAAM,GAAG,oBAAoB,EAAE,CAAA;CAAE,GACtF;IAAE,IAAI,EAAE,eAAe,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GAC3E;IAAE,IAAI,EAAE,sBAAsB,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtE,KAAK,oBAAoB,GACrB;IAAE,IAAI,EAAE,YAAY,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GACpC;IAAE,IAAI,EAAE,aAAa,CAAC;IAAC,SAAS,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,CAAC;AAExD,wCAAwC;AACxC,UAAU,aAAa;IACrB,IAAI,EAAE,UAAU,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpC,MAAM,EAAE,OAAO,CAAC;CACjB;AAsED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAE3D;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,kBAAkB,EAAE,CAqE1E;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,aAAa,EAAE,CAQ/D;AA6JD;;GAEG;AACH,wBAAsB,UAAU,CAC9B,QAAQ,EAAE,OAAO,EAAE,EACnB,KAAK,EAAE,IAAI,EAAE,EACb,KAAK,EAAE,MAAM,EACb,OAAO,CAAC,EAAE,cAAc,GACvB,OAAO,CAAC,WAAW,CAAC,CAsItB"}
+{"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../../src/providers/openai.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,MAAM,MAAM,QAAQ,CAAC;AAG5B,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAe,cAAc,EAAE,MAAM,aAAa,CAAC;AACrG,OAAO,EAA0E,KAAK,cAAc,EAAE,KAAK,aAAa,EAAE,MAAM,YAAY,CAAC;AAM7I;;GAEG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,cAAc,GAAG,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,yBAAyB,EAAE,CAkBrH;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,OAAO,EAAE;UAItC,MAAM;;;;;;UAQN,WAAW;;;;cAIT,UAAU;;YAEd,IAAI;YACJ,SAAS;;;;;;UASP,MAAM;;;;;UAME,QAAQ,GAAG,MAAM,GAAG,WAAW;;KAIpD;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,IAAI,EAAE;UAEjC,UAAU;;QAEd,IAAI;QACJ,WAAW;QACX,UAAU;;;;;;;;;;;;;IAGf;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,6BAA6B,EAAE,GAAG,SAAS,GAAG,QAAQ,EAAE,CAuB/H;AAMD,4CAA4C;AAC5C,KAAK,kBAAkB,GACnB;IAAE,IAAI,EAAE,WAAW,GAAG,MAAM,GAAG,WAAW,CAAC;IAAC,OAAO,EAAE,MAAM,GAAG,oBAAoB,EAAE,CAAA;CAAE,GACtF;IAAE,IAAI,EAAE,eAAe,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GAC3E;IAAE,IAAI,EAAE,sBAAsB,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtE,KAAK,oBAAoB,GACrB;IAAE,IAAI,EAAE,YAAY,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GACpC;IAAE,IAAI,EAAE,aAAa,CAAC;IAAC,SAAS,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,CAAC;AAExD,wCAAwC;AACxC,UAAU,aAAa;IACrB,IAAI,EAAE,UAAU,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpC,MAAM,EAAE,OAAO,CAAC;CACjB;AA0ED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAE3D;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,kBAAkB,EAAE,CAqE1E;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,aAAa,EAAE,CAQ/D;AAgKD;;GAEG;AACH,wBAAsB,UAAU,CAC9B,QAAQ,EAAE,OAAO,EAAE,EACnB,KAAK,EAAE,IAAI,EAAE,EACb,KAAK,EAAE,MAAM,EACb,OAAO,CAAC,EAAE,cAAc,EACxB,MAAM,CAAC,EAAE,WAAW,EACpB,MAAM,CAAC,EAAE,aAAa,GACrB,OAAO,CAAC,WAAW,CAAC,CAmItB"}

package/dist/providers/openai.js

@@ -7,8 +7,9 @@
  * Also exports shared OpenAI format converters used by the compat provider.
  */
 import OpenAI from 'openai';
+import { isCancellation, throwIfCancelled } from '../cancellation.js';
 import * as config from '../config.js';
-import { calculateMaxTokens, debugLog } from './types.js';
+import { normalizeFinishReason, calculateMaxTokens, limitOutputTokens, debugLog } from './types.js';
 // ============================================================================
 // Shared OpenAI Format Converters (also used by compat provider)
 // ============================================================================
@@ -94,6 +95,10 @@ export function parseOpenAIToolCalls(toolCalls) {
         return [];
     const result = [];
     for (const tc of toolCalls) {
+        // The SDK models tool calls as a union; we only ever send function tools,
+        // so anything else (custom tools) is not ours to parse.
+        if (tc.type !== 'function')
+            continue;
         let parsedArgs = {};
         try {
             parsedArgs = JSON.parse(tc.function.arguments);
@@ -123,6 +128,10 @@ const RESPONSES_API_MODELS = [
     'o3-pro',
     'o4-mini',
     'gpt-5',
+    // GPT-6 Astra supports function tools with reasoning only through
+    // Responses; keeping it here also prevents accidental Chat Completions
+    // dispatch when the planner supplies the standard reasoning setting.
+    'gpt-6-astra',
 ];
 /**
  * Check if a model requires the Responses API
@@ -227,7 +236,7 @@ function isOutputItemDoneEvent(event) {
     return event.type === 'response.output_item.done';
 }
 function isCompletedEvent(event) {
-    return event.type === 'response.completed';
+    return ['response.completed', 'response.incomplete', 'response.failed'].includes(event.type);
 }
 function isFunctionCallOutput(item) {
     return item.type === 'function_call';
@@ -238,15 +247,15 @@ function isFunctionCallOutput(item) {
 /**
  * Chat with OpenAI using the Responses API (for o3, o4-mini, etc.)
  */
-async function chatOpenAIResponses(messages, tools, model, onToken) {
+async function chatOpenAIResponses(messages, tools, model, onToken, signal, limits) {
     const apiKey = config.getApiKey('openai');
     if (!apiKey)
         throw new Error('OpenAI API key not configured');
-    const client = new OpenAI({ apiKey });
+    const client = new OpenAI({ apiKey, baseURL: config.getBaseUrl('openai'), ...(limits?.bounded ? { maxRetries: 0 } : {}) });
     const responsesInput = toResponsesInput(messages);
     const responsesTools = toResponsesTools(tools);
     // Calculate dynamic max_tokens based on available context space
-    const dynamicMaxTokens = calculateMaxTokens('openai', model, messages, tools);
+    const dynamicMaxTokens = limitOutputTokens(calculateMaxTokens('openai', model, messages, tools), limits?.maxOutputTokens);
     debugLog(`OpenAI Responses API request: model=${model}, max_tokens=${dynamicMaxTokens}`);
     // Use streaming if callback provided
     if (onToken) {
@@ -255,6 +264,7 @@ async function chatOpenAIResponses(messages, tools, model, onToken) {
         let finishReason = 'stop';
         let inputTokens = 0;
         let outputTokens = 0;
+        let usageSeen = false;
         try {
             // Note: OpenAI SDK types don't fully match Responses API yet
             // We use our own type definitions and cast through unknown for SDK interop
@@ -263,8 +273,11 @@ async function chatOpenAIResponses(messages, tools, model, onToken) {
                 input: responsesInput,
                 tools: responsesTools.length > 0 ? responsesTools : undefined,
                 max_output_tokens: dynamicMaxTokens,
+                // Keep bounded probes and orchestration turns from spending the entire
+                // output budget on hidden reasoning before producing visible output.
+                ...(limits?.reasoningEffort ? { reasoning: { effort: limits.reasoningEffort } } : {}),
             };
-            const stream = client.responses.stream(streamParams);
+            const stream = client.responses.stream(streamParams, signal ? { signal } : undefined);
             for await (const event of stream) {
                 const typedEvent = event;
                 if (isTextDeltaEvent(typedEvent)) {
@@ -292,26 +305,28 @@ async function chatOpenAIResponses(messages, tools, model, onToken) {
                 else if (isCompletedEvent(typedEvent)) {
                     const response = typedEvent.response;
                     if (response?.usage) {
+                        usageSeen = typeof response.usage.input_tokens === 'number' && typeof response.usage.output_tokens === 'number';
                         inputTokens = response.usage.input_tokens || 0;
                         outputTokens = response.usage.output_tokens || 0;
                     }
-                    if (response?.status === 'incomplete') {
-                        finishReason = 'length';
-                    }
+                    finishReason = normalizeFinishReason(response?.status, toolCalls.length > 0);
                 }
             }
+            throwIfCancelled(signal);
             return {
                 content,
                 toolCalls: toolCalls.length > 0 ? toolCalls : undefined,
                 finishReason,
-                usage: { inputTokens, outputTokens },
+                usage: limits?.bounded && !usageSeen ? undefined : { inputTokens, outputTokens },
             };
         }
         catch (streamError) {
-            // Surface the streaming failure and re-throw so withRetry handles it
+            throwIfCancelled(signal);
+            if (isCancellation(streamError))
+                throw streamError;
+            // Keep diagnostics out of assistant tokens; shared retry handling owns errors.
             const errMsg = streamError instanceof Error ? streamError.message : String(streamError);
             debugLog('OpenAI Responses API streaming failed:', errMsg);
-            onToken(`\n[Streaming error: ${errMsg}]\n`);
             throw streamError;
         }
     }
@@ -321,8 +336,9 @@ async function chatOpenAIResponses(messages, tools, model, onToken) {
         input: responsesInput,
         tools: responsesTools.length > 0 ? responsesTools : undefined,
         max_output_tokens: dynamicMaxTokens,
+        ...(limits?.reasoningEffort ? { reasoning: { effort: limits.reasoningEffort } } : {}),
     };
-    const response = await client.responses.create(createParams);
+    const response = await client.responses.create(createParams, signal ? { signal } : undefined);
     // Extract content and tool calls from response
     let content = response.output_text || '';
     const toolCalls = [];
@@ -339,13 +355,7 @@ async function chatOpenAIResponses(messages, tools, model, onToken) {
         }
     }
     // Determine finish reason
-    let finishReason = 'stop';
-    if (toolCalls.length > 0) {
-        finishReason = 'tool_use';
-    }
-    else if (response.status === 'incomplete') {
-        finishReason = 'length';
-    }
+    const finishReason = normalizeFinishReason(response.status, toolCalls.length > 0);
     return {
         content,
         toolCalls: toolCalls.length > 0 ? toolCalls : undefined,
@@ -359,19 +369,19 @@ async function chatOpenAIResponses(messages, tools, model, onToken) {
 /**
  * Chat with OpenAI
  */
-export async function chatOpenAI(messages, tools, model, onToken) {
+export async function chatOpenAI(messages, tools, model, onToken, signal, limits) {
     // Route to Responses API for models that require it (o3, o4-mini, etc.)
     if (requiresResponsesAPI(model)) {
-        return chatOpenAIResponses(messages, tools, model, onToken);
+        return chatOpenAIResponses(messages, tools, model, onToken, signal, limits);
     }
     const apiKey = config.getApiKey('openai');
     if (!apiKey)
         throw new Error('OpenAI API key not configured');
-    const client = new OpenAI({ apiKey });
+    const client = new OpenAI({ apiKey, baseURL: config.getBaseUrl('openai'), ...(limits?.bounded ? { maxRetries: 0 } : {}) });
     const openaiMessages = toOpenAIMessages(messages);
     const openaiTools = toOpenAITools(tools);
     // Calculate dynamic max_tokens based on available context space
-    const dynamicMaxTokens = calculateMaxTokens('openai', model, messages, tools);
+    const dynamicMaxTokens = limitOutputTokens(calculateMaxTokens('openai', model, messages, tools), limits?.maxOutputTokens);
     debugLog(`OpenAI request: model=${model}, max_tokens=${dynamicMaxTokens}`);
     // Use streaming if callback provided
     // Stream text content while collecting tool calls
@@ -379,15 +389,19 @@ export async function chatOpenAI(messages, tools, model, onToken) {
         let content = '';
         let toolCallDeltas = {};
         let finishReason = 'stop';
+        let usage;
         try {
             const stream = await client.chat.completions.create({
                 model,
                 messages: openaiMessages,
                 tools: openaiTools.length > 0 ? openaiTools : undefined,
-                max_tokens: dynamicMaxTokens,
+                ...(limits?.bounded ? { max_completion_tokens: dynamicMaxTokens } : { max_tokens: dynamicMaxTokens }),
                 stream: true,
-            });
+                stream_options: { include_usage: true },
+            }, signal ? { signal } : undefined);
             for await (const chunk of stream) {
+                if (chunk.usage)
+                    usage = { inputTokens: chunk.usage.prompt_tokens, outputTokens: chunk.usage.completion_tokens };
                 const choice = chunk.choices[0];
                 if (!choice)
                     continue;
@@ -414,13 +428,11 @@ export async function chatOpenAI(messages, tools, model, onToken) {
                     }
                 }
                 // Track finish reason
-                if (choice.finish_reason === 'tool_calls') {
-                    finishReason = 'tool_use';
-                }
-                else if (choice.finish_reason === 'length') {
-                    finishReason = 'length';
-                }
+                if (choice.finish_reason)
+                    finishReason = normalizeFinishReason(choice.finish_reason);
             }
+            // The SDK's async iterator can end normally after an abort.
+            throwIfCancelled(signal);
             // Convert tool call deltas to tool calls
             const toolCalls = Object.values(toolCallDeltas)
                 .filter(tc => tc.id && tc.name)
@@ -438,20 +450,22 @@ export async function chatOpenAI(messages, tools, model, onToken) {
                     arguments: parsedArgs,
                 };
             });
-            if (toolCalls.length > 0) {
-                finishReason = 'tool_use';
-            }
+            finishReason = normalizeFinishReason(finishReason, toolCalls.length > 0);
             return {
                 content,
                 toolCalls: toolCalls.length > 0 ? toolCalls : undefined,
                 finishReason,
+                usage,
+                warnings: usage ? undefined : ['Streaming usage was not reported; token and cost totals are incomplete.'],
             };
         }
         catch (streamError) {
-            // Surface the streaming failure and re-throw so withRetry handles it
+            throwIfCancelled(signal);
+            if (isCancellation(streamError))
+                throw streamError;
+            // Keep diagnostics out of assistant tokens; shared retry handling owns errors.
             const errMsg = streamError instanceof Error ? streamError.message : String(streamError);
             debugLog('OpenAI streaming failed:', errMsg);
-            onToken(`\n[Streaming error: ${errMsg}]\n`);
             throw streamError;
         }
     }
@@ -460,8 +474,8 @@ export async function chatOpenAI(messages, tools, model, onToken) {
         model,
         messages: openaiMessages,
         tools: openaiTools.length > 0 ? openaiTools : undefined,
-        max_tokens: dynamicMaxTokens,
-    });
+        ...(limits?.bounded ? { max_completion_tokens: dynamicMaxTokens } : { max_tokens: dynamicMaxTokens }),
+    }, signal ? { signal } : undefined);
     if (!response.choices || response.choices.length === 0) {
         throw new Error('Empty response from OpenAI API');
     }
@@ -469,13 +483,7 @@ export async function chatOpenAI(messages, tools, model, onToken) {
     const message = choice.message;
     const toolCalls = parseOpenAIToolCalls(message.tool_calls);
     // Map OpenAI finish reasons
-    let finishReason = 'stop';
-    if (choice.finish_reason === 'tool_calls') {
-        finishReason = 'tool_use';
-    }
-    else if (choice.finish_reason === 'length') {
-        finishReason = 'length';
-    }
+    const finishReason = normalizeFinishReason(choice.finish_reason, toolCalls.length > 0);
     return {
         content: message.content || '',
         toolCalls: toolCalls.length > 0 ? toolCalls : undefined,