@qduc/term2 0.6.1 → 0.7.0

package/dist/providers/openai-compatible-response-normalizer.js

@@ -0,0 +1,58 @@
+function normalizeMessageField(target) {
+    if (target && typeof target.reasoning_content === 'string' && typeof target.reasoning !== 'string') {
+        target.reasoning = target.reasoning_content;
+    }
+}
+function createNormalizedReasoningStream(stream, loggingService) {
+    const iterator = stream[Symbol.asyncIterator]();
+    return {
+        [Symbol.asyncIterator]() {
+            return {
+                async next() {
+                    const result = await iterator.next();
+                    if (!result.done && result.value?.choices) {
+                        const choices = result.value.choices;
+                        const hasMultipleChoices = choices.length > 1;
+                        const hasNonZeroOrMissingIndex = choices.some((choice) => choice.index === undefined || choice.index !== 0);
+                        if (hasMultipleChoices || hasNonZeroOrMissingIndex) {
+                            const chunkStr = JSON.stringify(result.value, null, 2);
+                            const msg = `[DEBUG_MALFORMED_RESPONSE] Intercepted malformed response chunk: ${chunkStr}`;
+                            if (loggingService) {
+                                loggingService.warn(msg);
+                            }
+                        }
+                        if (choices.length === 1 && choices[0].index !== 0) {
+                            choices[0].index = 0;
+                        }
+                        for (const choice of choices) {
+                            normalizeMessageField(choice.delta);
+                        }
+                    }
+                    return result;
+                },
+            };
+        },
+    };
+}
+/**
+ * Normalizes `reasoning_content` -> `reasoning` on responses from the OpenAI client.
+ */
+export function applyClientResponseNormalization(client, loggingService) {
+    const originalCreate = client.chat.completions.create.bind(client.chat.completions);
+    client.chat.completions.create = async (...args) => {
+        const result = await originalCreate(...args);
+        if (!result || typeof result !== 'object')
+            return result;
+        if (Array.isArray(result.choices)) {
+            for (const choice of result.choices) {
+                normalizeMessageField(choice.message);
+            }
+            return result;
+        }
+        if (typeof result[Symbol.asyncIterator] === 'function') {
+            return createNormalizedReasoningStream(result, loggingService);
+        }
+        return result;
+    };
+}
+//# sourceMappingURL=openai-compatible-response-normalizer.js.map

package/dist/providers/openai-compatible-response-normalizer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"openai-compatible-response-normalizer.js","sourceRoot":"","sources":["../../source/providers/openai-compatible-response-normalizer.ts"],"names":[],"mappings":"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"}

package/dist/providers/openai-compatible.provider.d.ts

@@ -4,6 +4,7 @@ import type { ProviderDefinition } from './registry.js';
 import { AiSdkAnthropicProvider } from './ai-sdk-anthropic.provider.js';
 import { AiSdkGoogleProvider } from './ai-sdk-google.provider.js';
 import { type ModelProvider, type Model } from '@openai/agents-core';
+import { sanitizeResponsesApiBody } from './openai-compatible-middleware.js';
 export type CustomProviderConfig = {
     name: string;
     type?: string;
@@ -15,10 +16,12 @@ export type CustomProviderRuntimeDeps = {
     fetch?: typeof fetch;
     loggingService?: ILoggingService;
 };
-export declare function sanitizeResponsesApiBody(body: any): any;
+export { sanitizeResponsesApiBody };
 export declare class OpencodeMinimaxHybridProvider implements ModelProvider {
     private readonly config;
     private readonly deps;
+    private readonly fallbackSessionId;
+    private readonly models;
     constructor(config: CustomProviderConfig, deps: CustomProviderRuntimeDeps);
     getModel(modelName?: string): Promise<Model> | Model;
 }

package/dist/providers/openai-compatible.provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"openai-compatible.provider.d.ts","sourceRoot":"","sources":["../../source/providers/openai-compatible.provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAGvD,OAAO,KAAK,EAAoB,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAC3F,OAAO,KAAK,EAAE,kBAAkB,EAA+B,MAAM,eAAe,CAAC;AACrF,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AACxE,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAKlE,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAErE,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAcF,MAAM,MAAM,yBAAyB,GAAG;IACtC,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;IACrB,cAAc,CAAC,EAAE,eAAe,CAAC;CAClC,CAAC;AA6SF,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,GAAG,GAAG,GAAG,CA2BvD;AAmBD,qBAAa,6BAA8B,YAAW,aAAa;IACrD,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAwB,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAAnD,MAAM,EAAE,oBAAoB,EAAmB,IAAI,EAAE,yBAAyB;IAE3G,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,KAAK;CA8CrD;AAED,wBAAgB,iCAAiC,CAC/C,MAAM,EAAE,oBAAoB,EAC5B,IAAI,EAAE,yBAAyB,GAC9B,cAAc,GAAG,sBAAsB,GAAG,mBAAmB,GAAG,6BAA6B,CA8D/F;AAED,wBAAgB,wCAAwC,CAAC,MAAM,EAAE,oBAAoB,GAAG,kBAAkB,CAiGzG"}
+{"version":3,"file":"openai-compatible.provider.d.ts","sourceRoot":"","sources":["../../source/providers/openai-compatible.provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD,OAAO,KAAK,EAAoB,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAC3F,OAAO,KAAK,EAAE,kBAAkB,EAA+B,MAAM,eAAe,CAAC;AACrF,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AACxE,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAIlE,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAErE,OAAO,EAIL,wBAAwB,EACzB,MAAM,mCAAmC,CAAC;AAI3C,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAcF,MAAM,MAAM,yBAAyB,GAAG;IACtC,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;IACrB,cAAc,CAAC,EAAE,eAAe,CAAC;CAClC,CAAC;AAoBF,OAAO,EAAE,wBAAwB,EAAE,CAAC;AAuBpC,qBAAa,6BAA8B,YAAW,aAAa;IAIrD,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAwB,OAAO,CAAC,QAAQ,CAAC,IAAI;IAHhF,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAqB;IACvD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA6C;gBAEvC,MAAM,EAAE,oBAAoB,EAAmB,IAAI,EAAE,yBAAyB;IAK3G,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,KAAK;CAwDrD;AAED,wBAAgB,iCAAiC,CAC/C,MAAM,EAAE,oBAAoB,EAC5B,IAAI,EAAE,yBAAyB,GAC9B,cAAc,GAAG,sBAAsB,GAAG,mBAAmB,GAAG,6BAA6B,CAgE/F;AAED,wBAAgB,wCAAwC,CAAC,MAAM,EAAE,oBAAoB,GAAG,kBAAkB,CAyFzG"}

package/dist/providers/openai-compatible.provider.js

@@ -1,13 +1,14 @@
 import { Runner } from '@openai/agents';
 import { OpenAIProvider } from '@openai/agents-openai';
 import OpenAI from 'openai';
-import { randomBytes } from 'node:crypto';
 import { AiSdkAnthropicProvider } from './ai-sdk-anthropic.provider.js';
 import { AiSdkGoogleProvider } from './ai-sdk-google.provider.js';
-import { createAiSdkLoggingFetch } from './ai-sdk-logging-fetch.js';
-import { mergeAssistantMessages } from './ai-sdk-message-normalizer.js';
+import { createProviderFetch } from './fetch/composer.js';
 import { buildOpenAICompatibleUrl, normalizeBaseUrl } from './common/openai-compatible-utils.js';
-import { addCacheControlToLastTwoMessages } from './common/openai-compatible-messages.js';
+import { generateOpencodeSessionId, isOpencodeProvider, resolveOpencodeRuntimeConfig } from './opencode.provider.js';
+import { createCacheControlMiddleware, createOpenAICompatibleMiddleware, createOpenAIResponsesMiddleware, sanitizeResponsesApiBody, } from './openai-compatible-middleware.js';
+import { applyClientResponseNormalization } from './openai-compatible-response-normalizer.js';
+import { getModelListItems, mapModelListItem } from './openai-compatible-models.js';
 const DEFAULT_BASE_URLS = {
     anthropic: 'https://api.anthropic.com/v1',
     google: 'https://generativelanguage.googleapis.com/v1beta',
@@ -18,215 +19,6 @@ const DEFAULT_ENV_API_KEYS = {
     google: 'GOOGLE_GENERATIVE_AI_API_KEY',
     opencode: 'OPENCODE_API_KEY',
 };
-function applyLlamaCppReasoningControls(target, reasoningEffort) {
-    const budgets = {
-        low: 1024,
-        medium: 4096,
-        high: 8192,
-        xhigh: 16384,
-    };
-    if (reasoningEffort === 'none' || reasoningEffort === 'minimal') {
-        target.chat_template_kwargs = {
-            reasoning_effort: 'low',
-            enable_thinking: false,
-            thinking_mode: 'disabled',
-            reasoning_budget: 0,
-        };
-        return;
-    }
-    const templateEffort = reasoningEffort === 'xhigh' ? 'high' : reasoningEffort || 'medium';
-    target.chat_template_kwargs = {
-        reasoning_effort: templateEffort,
-        enable_thinking: true,
-        thinking_mode: templateEffort,
-        reasoning_budget: budgets[reasoningEffort || 'medium'] ?? budgets.medium,
-    };
-}
-function preserveReasoningContentForOpenAICompatibleMessages(messages) {
-    return messages.map((message) => {
-        if (message?.role !== 'assistant' || typeof message.reasoning !== 'string') {
-            return message;
-        }
-        const { reasoning, ...rest } = message;
-        return {
-            ...rest,
-            reasoning_content: typeof message.reasoning_content === 'string' ? message.reasoning_content : reasoning,
-        };
-    });
-}
-function normalizeMessageField(target) {
-    if (target && typeof target.reasoning_content === 'string' && typeof target.reasoning !== 'string') {
-        target.reasoning = target.reasoning_content;
-    }
-}
-/**
- * Normalizes `reasoning_content` → `reasoning` on responses from the OpenAI client,
- * after the HTTP response has been parsed. This is needed because the OpenAI Agents
- * SDK's `OpenAIChatCompletionsModel` checks for `reasoning` (not `reasoning_content`),
- * while many OpenAI-compatible providers return `reasoning_content` (the official
- * Chat Completions API field name).
- */
-function applyClientResponseNormalization(client, loggingService) {
-    const originalCreate = client.chat.completions.create.bind(client.chat.completions);
-    client.chat.completions.create = async (...args) => {
-        const result = await originalCreate(...args);
-        if (!result || typeof result !== 'object')
-            return result;
-        if (Array.isArray(result.choices)) {
-            // Non-streaming ChatCompletion
-            for (const choice of result.choices) {
-                normalizeMessageField(choice.message);
-            }
-            return result;
-        }
-        // Streaming (Stream<ChatCompletionChunk>)
-        if (typeof result[Symbol.asyncIterator] === 'function') {
-            return createNormalizedReasoningStream(result, loggingService);
-        }
-        return result;
-    };
-}
-function createNormalizedReasoningStream(stream, loggingService) {
-    const iterator = stream[Symbol.asyncIterator]();
-    return {
-        [Symbol.asyncIterator]() {
-            return {
-                async next() {
-                    const result = await iterator.next();
-                    if (!result.done && result.value?.choices) {
-                        const choices = result.value.choices;
-                        const hasMultipleChoices = choices.length > 1;
-                        const hasNonZeroOrMissingIndex = choices.some((choice) => choice.index === undefined || choice.index !== 0);
-                        if (hasMultipleChoices || hasNonZeroOrMissingIndex) {
-                            const chunkStr = JSON.stringify(result.value, null, 2);
-                            const msg = `[DEBUG_MALFORMED_RESPONSE] Intercepted malformed response chunk: ${chunkStr}`;
-                            if (loggingService) {
-                                loggingService.warn(msg);
-                            }
-                        }
-                        // Normalize any non-zero or missing index to 0 for single-choice responses to avoid SDK errors/warnings
-                        if (choices.length === 1 && choices[0].index !== 0) {
-                            choices[0].index = 0;
-                        }
-                        for (const choice of choices) {
-                            normalizeMessageField(choice.delta);
-                        }
-                    }
-                    return result;
-                },
-            };
-        },
-    };
-}
-function sanitizeOpenAICompatibleMessages(messages) {
-    return messages.map((message) => {
-        if (!message || typeof message !== 'object')
-            return message;
-        // `index` is a choice-level field in Chat Completions responses, never a
-        // valid message field. The OpenAI Agents SDK leaks it onto replayed
-        // assistant messages when a provider echoes it on tool_calls, which strict
-        // (extra=forbid) providers reject with "Extra inputs are not permitted".
-        const { index: _strayIndex, ...message_ } = message;
-        message = message_;
-        let newContent = message.content;
-        if (Array.isArray(message.content)) {
-            // Check if it's exclusively text parts
-            const isAllText = message.content.every((part) => part && part.type === 'text');
-            if (isAllText) {
-                newContent = message.content.map((part) => part.text || '').join('');
-            }
-            else {
-                // Strip annotations from parts
-                newContent = message.content.map((part) => {
-                    if (!part || typeof part !== 'object')
-                        return part;
-                    const { annotations, ...rest } = part;
-                    return rest;
-                });
-            }
-        }
-        return {
-            ...message,
-            content: newContent,
-        };
-    });
-}
-const BASE62_ALPHABET = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
-/**
- * Generates a session ID in the format `ses_<12_hex_timestamp><14_base62_random>`.
- * Total length: 30 characters.
- * Example: `ses_01944e8574766859367c346a09`
- */
-function generateOpencodeSessionId() {
-    const timestamp = Date.now().toString(16).padStart(12, '0').slice(0, 12);
-    const bytes = randomBytes(11);
-    let value = 0n;
-    for (let i = 0; i < bytes.length; i++) {
-        value = (value << 8n) + BigInt(bytes[i]);
-    }
-    let random = '';
-    for (let i = 0; i < 14; i++) {
-        random += BASE62_ALPHABET[Number(value % 62n)];
-        value /= 62n;
-    }
-    return `ses_${timestamp}${random}`;
-}
-function createOpenAICompatibleFetch(fetchImpl, providerType, baseUrl) {
-    if (!fetchImpl)
-        return undefined;
-    const isOpencode = providerType === 'opencode' || (typeof baseUrl === 'string' && baseUrl.toLowerCase().includes('opencode.ai'));
-    const sessionId = isOpencode ? generateOpencodeSessionId() : undefined;
-    return (async (input, init) => {
-        if (typeof init?.body === 'string') {
-            try {
-                const body = JSON.parse(init.body);
-                let changed = false;
-                if (Array.isArray(body?.messages)) {
-                    body.messages = sanitizeOpenAICompatibleMessages(preserveReasoningContentForOpenAICompatibleMessages(mergeAssistantMessages(body.messages)));
-                    addCacheControlToLastTwoMessages(body.messages, body.model);
-                    changed = true;
-                }
-                const reasoningEffort = typeof body.reasoning_effort === 'string' ? body.reasoning_effort : undefined;
-                if (providerType === 'llama.cpp' && reasoningEffort) {
-                    delete body.reasoning_effort;
-                    applyLlamaCppReasoningControls(body, reasoningEffort);
-                    changed = true;
-                }
-                if (isOpencode && sessionId) {
-                    changed = true;
-                }
-                if (changed) {
-                    let newInit = { ...init, body: JSON.stringify(body) };
-                    if (isOpencode && sessionId) {
-                        const existingHeaders = {};
-                        if (init.headers) {
-                            if (typeof init.headers.forEach === 'function') {
-                                init.headers.forEach((v, k) => {
-                                    existingHeaders[k] = v;
-                                });
-                            }
-                            else {
-                                Object.assign(existingHeaders, init.headers);
-                            }
-                        }
-                        newInit = {
-                            ...newInit,
-                            headers: {
-                                ...existingHeaders,
-                                'x-opencode-session': sessionId,
-                            },
-                        };
-                    }
-                    return fetchImpl(input, newInit);
-                }
-            }
-            catch {
-                return fetchImpl(input, init);
-            }
-        }
-        return fetchImpl(input, init);
-    });
-}
 function findConfigFromSettings(settingsService, providerId) {
     const list = settingsService?.get?.('providers');
     if (!Array.isArray(list))
@@ -244,125 +36,80 @@ function findConfigFromSettings(settingsService, providerId) {
 function toLabel(name) {
     return name;
 }
-function getModelListItems(providerType, body) {
-    if (providerType === 'google') {
-        return Array.isArray(body?.models) ? body.models : [];
-    }
-    return Array.isArray(body?.data) ? body.data : [];
-}
-function mapModelListItem(providerType, item) {
-    if (providerType === 'google') {
-        const id = item?.baseModelId || String(item?.name || '').replace(/^models\//, '');
-        const name = item?.displayName || item?.description;
-        return id ? { id, name } : null;
-    }
-    const id = item?.id || item?.model || '';
-    const name = item?.name || item?.display_name || item?.description;
-    return id ? { id, name } : null;
-}
-function createCacheControlFetch(fetchImpl) {
-    if (!fetchImpl)
-        return undefined;
-    return (async (input, init) => {
-        if (typeof init?.body === 'string') {
-            try {
-                const body = JSON.parse(init.body);
-                if (Array.isArray(body?.messages)) {
-                    addCacheControlToLastTwoMessages(body.messages, body.model);
-                    return fetchImpl(input, { ...init, body: JSON.stringify(body) });
-                }
-            }
-            catch {
-                /* fall through */
-            }
-        }
-        return fetchImpl(input, init);
-    });
-}
-export function sanitizeResponsesApiBody(body) {
-    if (!body || typeof body !== 'object' || !Array.isArray(body.input)) {
-        return body;
-    }
-    const sanitizedInput = body.input.filter((item) => {
-        const rawItem = item?.rawItem ?? item;
-        if (!rawItem || typeof rawItem !== 'object') {
-            return true;
-        }
-        const isMessage = rawItem.type === 'message' || (rawItem.role && rawItem.content !== undefined);
-        if (!isMessage) {
-            return true;
-        }
-        return !Array.isArray(rawItem.content) || rawItem.content.length > 0;
-    });
-    if (sanitizedInput.length === body.input.length) {
-        return body;
-    }
-    return {
-        ...body,
-        input: sanitizedInput,
-    };
-}
-function createOpenAIResponsesFetch(fetchImpl) {
-    if (!fetchImpl)
-        return undefined;
-    return (async (input, init) => {
-        if (typeof init?.body === 'string') {
-            try {
-                const body = sanitizeResponsesApiBody(JSON.parse(init.body));
-                return fetchImpl(input, { ...init, body: JSON.stringify(body) });
-            }
-            catch {
-                return fetchImpl(input, init);
-            }
-        }
-        return fetchImpl(input, init);
+export { sanitizeResponsesApiBody };
+function buildProviderFetch(config, deps, middlewares) {
+    return createProviderFetch({
+        providerId: config.name,
+        defaultModel: deps.defaultModel,
+        deps: {
+            loggingService: deps.loggingService || {
+                debug: () => { },
+                error: () => { },
+                getCorrelationId: () => undefined,
+                getTrafficContext: () => null,
+            },
+        },
+        middlewares,
+        fetchImpl: deps.fetch,
     });
 }
 export class OpencodeMinimaxHybridProvider {
     config;
     deps;
+    fallbackSessionId;
+    models = new Map();
     constructor(config, deps) {
         this.config = config;
         this.deps = deps;
+        const isOpencode = isOpencodeProvider(this.config);
+        this.fallbackSessionId = isOpencode ? generateOpencodeSessionId() : undefined;
     }
     getModel(modelName) {
         const resolvedModel = modelName || this.deps.defaultModel || '';
+        const cached = this.models.get(resolvedModel);
+        if (cached) {
+            return cached;
+        }
         if (resolvedModel.toLowerCase().includes('minimax')) {
-            const isOpencode = this.config.type === 'opencode' ||
-                this.config.name === 'opencode' ||
-                (typeof this.config.baseUrl === 'string' && this.config.baseUrl.toLowerCase().includes('opencode.ai'));
-            const effectiveBaseUrl = this.config.baseUrl ?? (isOpencode ? 'https://opencode.ai/v1' : '');
-            const effectiveApiKey = this.config.apiKey ?? (isOpencode ? process.env.OPENCODE_API_KEY : undefined);
+            const isOpencode = isOpencodeProvider(this.config);
+            const runtimeConfig = isOpencode
+                ? resolveOpencodeRuntimeConfig(this.config.baseUrl, this.config.apiKey)
+                : { baseUrl: this.config.baseUrl ?? '', apiKey: this.config.apiKey };
             const anthropicProvider = new AiSdkAnthropicProvider({
                 defaultModel: resolvedModel,
                 resolveConfig: () => ({
-                    baseURL: effectiveBaseUrl ? normalizeBaseUrl(effectiveBaseUrl) : undefined,
-                    apiKey: effectiveApiKey,
-                    fetch: createCacheControlFetch(this.deps.fetch),
+                    baseURL: runtimeConfig.baseUrl ? normalizeBaseUrl(runtimeConfig.baseUrl) : undefined,
+                    apiKey: runtimeConfig.apiKey,
+                    fetch: buildProviderFetch(this.config, this.deps, [createCacheControlMiddleware()]),
                     name: this.config.name,
                     headers: {
                         'anthropic-version': '2023-06-01',
                     },
                 }),
             });
-            return anthropicProvider.getModel(resolvedModel);
+            const model = anthropicProvider.getModel(resolvedModel);
+            this.models.set(resolvedModel, model);
+            return model;
         }
-        const isOpencode = this.config.type === 'opencode' ||
-            this.config.name === 'opencode' ||
-            (typeof this.config.baseUrl === 'string' && this.config.baseUrl.toLowerCase().includes('opencode.ai'));
-        const effectiveBaseUrl = this.config.baseUrl ?? (isOpencode ? 'https://opencode.ai/v1' : '');
-        const effectiveApiKey = this.config.apiKey ?? (isOpencode ? process.env.OPENCODE_API_KEY : undefined);
+        const isOpencode = isOpencodeProvider(this.config);
+        const runtimeConfig = isOpencode
+            ? resolveOpencodeRuntimeConfig(this.config.baseUrl, this.config.apiKey)
+            : { baseUrl: this.config.baseUrl ?? '', apiKey: this.config.apiKey };
         const openAIClient = new OpenAI({
-            baseURL: normalizeBaseUrl(effectiveBaseUrl),
-            apiKey: effectiveApiKey || 'no-key',
-            fetch: createOpenAICompatibleFetch(this.deps.fetch, this.config.type || 'opencode', effectiveBaseUrl),
+            baseURL: normalizeBaseUrl(runtimeConfig.baseUrl),
+            apiKey: runtimeConfig.apiKey || 'no-key',
+            fetch: buildProviderFetch(this.config, this.deps, [
+                createOpenAICompatibleMiddleware(this.config.type || 'opencode', runtimeConfig.baseUrl, this.deps.loggingService, this.fallbackSessionId),
+            ]),
         });
         applyClientResponseNormalization(openAIClient, this.deps.loggingService);
         const openaiProvider = new OpenAIProvider({
             openAIClient: openAIClient,
             useResponses: false,
         });
-        return openaiProvider.getModel(resolvedModel);
+        const model = openaiProvider.getModel(resolvedModel);
+        this.models.set(resolvedModel, model);
+        return model;
     }
 }
 export function createCustomProviderModelProvider(config, deps) {
@@ -378,7 +125,7 @@ export function createCustomProviderModelProvider(config, deps) {
             const openAIClient = new OpenAI({
                 apiKey: config.apiKey,
                 baseURL: config.baseUrl ? normalizeBaseUrl(config.baseUrl) : undefined,
-                fetch: createOpenAIResponsesFetch(deps.fetch),
+                fetch: buildProviderFetch(config, deps, [createOpenAIResponsesMiddleware()]),
             });
             return new OpenAIProvider({
                 openAIClient: openAIClient,
@@ -390,7 +137,7 @@ export function createCustomProviderModelProvider(config, deps) {
                 defaultModel: deps.defaultModel,
                 resolveConfig: () => ({
                     ...resolveConfig(),
-                    fetch: createCacheControlFetch(deps.fetch),
+                    fetch: buildProviderFetch(config, deps, [createCacheControlMiddleware()]),
                     headers: {
                         'anthropic-version': '2023-06-01',
                     },
@@ -399,22 +146,26 @@ export function createCustomProviderModelProvider(config, deps) {
         case 'google':
             return new AiSdkGoogleProvider({
                 defaultModel: deps.defaultModel,
-                resolveConfig,
+                resolveConfig: () => ({
+                    ...resolveConfig(),
+                    fetch: buildProviderFetch(config, deps, []),
+                }),
             });
         case 'opencode':
             return new OpencodeMinimaxHybridProvider(config, deps);
         case 'openai-compatible':
         case 'llama.cpp':
         default: {
-            const isOpencode = providerType === 'opencode' ||
-                config.name === 'opencode' ||
-                (typeof config.baseUrl === 'string' && config.baseUrl.toLowerCase().includes('opencode.ai'));
-            const effectiveBaseUrl = config.baseUrl ?? (isOpencode ? 'https://opencode.ai/v1' : '');
-            const effectiveApiKey = config.apiKey ?? (isOpencode ? process.env.OPENCODE_API_KEY : undefined);
+            const isOpencode = isOpencodeProvider({ type: providerType, name: config.name, baseUrl: config.baseUrl });
+            const runtimeConfig = isOpencode
+                ? resolveOpencodeRuntimeConfig(config.baseUrl, config.apiKey)
+                : { baseUrl: config.baseUrl ?? '', apiKey: config.apiKey };
             const openAIClient = new OpenAI({
-                baseURL: normalizeBaseUrl(effectiveBaseUrl),
-                apiKey: effectiveApiKey || 'no-key',
-                fetch: createOpenAICompatibleFetch(deps.fetch, providerType, effectiveBaseUrl),
+                baseURL: normalizeBaseUrl(runtimeConfig.baseUrl),
+                apiKey: runtimeConfig.apiKey || 'no-key',
+                fetch: buildProviderFetch(config, deps, [
+                    createOpenAICompatibleMiddleware(providerType, runtimeConfig.baseUrl, deps.loggingService),
+                ]),
             });
             applyClientResponseNormalization(openAIClient, deps.loggingService);
             return new OpenAIProvider({
@@ -444,11 +195,6 @@ export function createOpenAICompatibleProviderDefinition(config) {
                     }
                     return createCustomProviderModelProvider(resolved, {
                         defaultModel: settingsService.get('agent.model') || '',
-                        fetch: createAiSdkLoggingFetch({
-                            provider: providerId,
-                            model: settingsService.get('agent.model') || '',
-                            loggingService,
-                        }),
                         loggingService,
                     });
                 })(),
@@ -459,12 +205,10 @@ export function createOpenAICompatibleProviderDefinition(config) {
             if (!resolved) {
                 throw new Error(`Custom provider '${providerId}' is not configured in settings.json`);
             }
-            const isOpencode = resolved.type === 'opencode' ||
-                resolved.name === 'opencode' ||
-                (typeof resolved.baseUrl === 'string' && resolved.baseUrl.toLowerCase().includes('opencode.ai'));
+            const isOpencode = isOpencodeProvider(resolved);
             const effectiveBaseUrl = resolved.baseUrl ??
                 (resolved.type ? DEFAULT_BASE_URLS[resolved.type] : undefined) ??
-                (isOpencode ? 'https://opencode.ai/v1' : undefined);
+                (isOpencode ? resolveOpencodeRuntimeConfig().baseUrl : undefined);
             if (!effectiveBaseUrl) {
                 throw new Error(`Custom provider '${providerId}' requires a baseUrl to list models`);
             }
@@ -472,7 +216,7 @@ export function createOpenAICompatibleProviderDefinition(config) {
             const url = buildOpenAICompatibleUrl(baseUrl, '/models');
             const resolvedApiKey = resolved.apiKey ??
                 (resolved.type ? process.env[DEFAULT_ENV_API_KEYS[resolved.type] ?? ''] : undefined) ??
-                (isOpencode ? process.env.OPENCODE_API_KEY : undefined);
+                (isOpencode ? resolveOpencodeRuntimeConfig().apiKey : undefined);
             const headers = {
                 'Content-Type': 'application/json',
             };