@qduc/term2 0.3.1 → 0.5.0

package/dist/providers/ai-sdk-openai.provider.d.ts

@@ -0,0 +1,14 @@
+import { type OpenAIProviderSettings } from '@ai-sdk/openai';
+import { type ModelProvider, type Model } from '@openai/agents-core';
+export type AiSdkOpenAIConfig = Pick<OpenAIProviderSettings, 'baseURL' | 'apiKey' | 'headers' | 'fetch' | 'name'>;
+export type AiSdkOpenAIProviderFactory = (options: AiSdkOpenAIConfig) => (modelId: string) => any;
+export declare class AiSdkOpenAIProvider implements ModelProvider {
+    #private;
+    constructor(deps: {
+        defaultModel: string;
+        resolveConfig: () => AiSdkOpenAIConfig;
+        createProvider?: AiSdkOpenAIProviderFactory;
+    });
+    getModel(modelName?: string): Promise<Model> | Model;
+}
+//# sourceMappingURL=ai-sdk-openai.provider.d.ts.map

package/dist/providers/ai-sdk-openai.provider.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ai-sdk-openai.provider.d.ts","sourceRoot":"","sources":["../../source/providers/ai-sdk-openai.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAC3E,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAGrE,MAAM,MAAM,iBAAiB,GAAG,IAAI,CAAC,sBAAsB,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,GAAG,OAAO,GAAG,MAAM,CAAC,CAAC;AAElH,MAAM,MAAM,0BAA0B,GAAG,CAAC,OAAO,EAAE,iBAAiB,KAAK,CAAC,OAAO,EAAE,MAAM,KAAK,GAAG,CAAC;AAElG,qBAAa,mBAAoB,YAAW,aAAa;;gBAK3C,IAAI,EAAE;QAChB,YAAY,EAAE,MAAM,CAAC;QACrB,aAAa,EAAE,MAAM,iBAAiB,CAAC;QACvC,cAAc,CAAC,EAAE,0BAA0B,CAAC;KAC7C;IAMD,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,KAAK;CAMrD"}

package/dist/providers/ai-sdk-openai.provider.js

@@ -0,0 +1,18 @@
+import { createOpenAI } from '@ai-sdk/openai';
+import { adaptAiSdkModelForAgents } from './ai-sdk-agents-adapter.js';
+export class AiSdkOpenAIProvider {
+    #defaultModel;
+    #resolveConfig;
+    #createProvider;
+    constructor(deps) {
+        this.#defaultModel = deps.defaultModel;
+        this.#resolveConfig = deps.resolveConfig;
+        this.#createProvider = deps.createProvider ?? createOpenAI;
+    }
+    getModel(modelName) {
+        const config = this.#resolveConfig();
+        const provider = this.#createProvider(config);
+        return adaptAiSdkModelForAgents(provider(modelName || this.#defaultModel), undefined, 'openai');
+    }
+}
+//# sourceMappingURL=ai-sdk-openai.provider.js.map

package/dist/providers/ai-sdk-openai.provider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ai-sdk-openai.provider.js","sourceRoot":"","sources":["../../source/providers/ai-sdk-openai.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAA+B,MAAM,gBAAgB,CAAC;AAE3E,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAMtE,MAAM,OAAO,mBAAmB;IAC9B,aAAa,CAAS;IACtB,cAAc,CAA0B;IACxC,eAAe,CAA6B;IAE5C,YAAY,IAIX;QACC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC;QACvC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC;QACzC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,cAAc,IAAK,YAA2C,CAAC;IAC7F,CAAC;IAED,QAAQ,CAAC,SAAkB;QACzB,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACrC,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QAE9C,OAAO,wBAAwB,CAAC,QAAQ,CAAC,SAAS,IAAI,IAAI,CAAC,aAAa,CAAC,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;IAClG,CAAC;CACF"}

package/dist/providers/ai-sdk-openrouter.provider.d.ts

@@ -1,6 +1,6 @@
 import { type OpenRouterProviderSettings } from '@openrouter/ai-sdk-provider';
 import { type ModelProvider, type Model } from '@openai/agents-core';
-export type AiSdkOpenRouterConfig = Pick<OpenRouterProviderSettings, 'baseURL' | 'apiKey' | 'headers' | 'appName' | 'appUrl'>;
+export type AiSdkOpenRouterConfig = Pick<OpenRouterProviderSettings, 'baseURL' | 'apiKey' | 'headers' | 'appName' | 'appUrl' | 'fetch'>;
 export type AiSdkOpenRouterProviderFactory = (options: AiSdkOpenRouterConfig & {
     compatibility?: 'strict' | 'compatible';
 }) => (modelId: string) => any;

package/dist/providers/ai-sdk-openrouter.provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ai-sdk-openrouter.provider.d.ts","sourceRoot":"","sources":["../../source/providers/ai-sdk-openrouter.provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAoB,KAAK,0BAA0B,EAAE,MAAM,6BAA6B,CAAC;AAChG,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAGrE,MAAM,MAAM,qBAAqB,GAAG,IAAI,CACtC,0BAA0B,EAC1B,SAAS,GAAG,QAAQ,GAAG,SAAS,GAAG,SAAS,GAAG,QAAQ,CACxD,CAAC;AAEF,MAAM,MAAM,8BAA8B,GAAG,CAC3C,OAAO,EAAE,qBAAqB,GAAG;IAAE,aAAa,CAAC,EAAE,QAAQ,GAAG,YAAY,CAAA;CAAE,KACzE,CAAC,OAAO,EAAE,MAAM,KAAK,GAAG,CAAC;AAE9B,qBAAa,uBAAwB,YAAW,aAAa;;gBAK/C,IAAI,EAAE;QAChB,YAAY,EAAE,MAAM,CAAC;QACrB,aAAa,EAAE,MAAM,qBAAqB,CAAC;QAC3C,cAAc,CAAC,EAAE,8BAA8B,CAAC;KACjD;IAMD,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,KAAK;CASrD"}
+{"version":3,"file":"ai-sdk-openrouter.provider.d.ts","sourceRoot":"","sources":["../../source/providers/ai-sdk-openrouter.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,KAAK,0BAA0B,EAAE,MAAM,6BAA6B,CAAC;AAChG,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAGrE,MAAM,MAAM,qBAAqB,GAAG,IAAI,CACtC,0BAA0B,EAC1B,SAAS,GAAG,QAAQ,GAAG,SAAS,GAAG,SAAS,GAAG,QAAQ,GAAG,OAAO,CAClE,CAAC;AAEF,MAAM,MAAM,8BAA8B,GAAG,CAC3C,OAAO,EAAE,qBAAqB,GAAG;IAAE,aAAa,CAAC,EAAE,QAAQ,GAAG,YAAY,CAAA;CAAE,KACzE,CAAC,OAAO,EAAE,MAAM,KAAK,GAAG,CAAC;AAE9B,qBAAa,uBAAwB,YAAW,aAAa;;gBAK/C,IAAI,EAAE;QAChB,YAAY,EAAE,MAAM,CAAC;QACrB,aAAa,EAAE,MAAM,qBAAqB,CAAC;QAC3C,cAAc,CAAC,EAAE,8BAA8B,CAAC;KACjD;IAMD,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,KAAK;CASrD"}

package/dist/providers/ai-sdk-openrouter.provider.js

@@ -1,6 +1,5 @@
-import { aisdk } from '@openai/agents-extensions/ai-sdk';
 import { createOpenRouter } from '@openrouter/ai-sdk-provider';
-import { withMergedAssistantReasoning } from './ai-sdk-message-normalizer.js';
+import { adaptAiSdkModelForAgents } from './ai-sdk-agents-adapter.js';
 export class AiSdkOpenRouterProvider {
     #defaultModel;
     #resolveConfig;
@@ -16,7 +15,7 @@ export class AiSdkOpenRouterProvider {
             ...config,
             compatibility: 'strict',
         });
-        return aisdk(withMergedAssistantReasoning(provider(modelName || this.#defaultModel)));
+        return adaptAiSdkModelForAgents(provider(modelName || this.#defaultModel));
     }
 }
 //# sourceMappingURL=ai-sdk-openrouter.provider.js.map

package/dist/providers/ai-sdk-openrouter.provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"ai-sdk-openrouter.provider.js","sourceRoot":"","sources":["../../source/providers/ai-sdk-openrouter.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,kCAAkC,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAmC,MAAM,6BAA6B,CAAC;AAEhG,OAAO,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAC;AAW9E,MAAM,OAAO,uBAAuB;IAClC,aAAa,CAAS;IACtB,cAAc,CAA8B;IAC5C,eAAe,CAAiC;IAEhD,YAAY,IAIX;QACC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC;QACvC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC;QACzC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,cAAc,IAAK,gBAAmD,CAAC;IACrG,CAAC;IAED,QAAQ,CAAC,SAAkB;QACzB,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACrC,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC;YACpC,GAAG,MAAM;YACT,aAAa,EAAE,QAAQ;SACxB,CAAC,CAAC;QAEH,OAAO,KAAK,CAAC,4BAA4B,CAAC,QAAQ,CAAC,SAAS,IAAI,IAAI,CAAC,aAAa,CAAC,CAAC,CAAqB,CAAC;IAC5G,CAAC;CACF"}
+{"version":3,"file":"ai-sdk-openrouter.provider.js","sourceRoot":"","sources":["../../source/providers/ai-sdk-openrouter.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAmC,MAAM,6BAA6B,CAAC;AAEhG,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAWtE,MAAM,OAAO,uBAAuB;IAClC,aAAa,CAAS;IACtB,cAAc,CAA8B;IAC5C,eAAe,CAAiC;IAEhD,YAAY,IAIX;QACC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC;QACvC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC;QACzC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,cAAc,IAAK,gBAAmD,CAAC;IACrG,CAAC;IAED,QAAQ,CAAC,SAAkB;QACzB,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACrC,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC;YACpC,GAAG,MAAM;YACT,aAAa,EAAE,QAAQ;SACxB,CAAC,CAAC;QAEH,OAAO,wBAAwB,CAAC,QAAQ,CAAC,SAAS,IAAI,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC;IAC7E,CAAC;CACF"}

package/dist/providers/ai-sdk-openrouter.provider.test.js

@@ -67,4 +67,27 @@ test('AiSdkOpenRouterProvider uses the default model when none is requested', (t
     provider.getModel();
     t.is(requestedModel, 'openrouter/auto');
 });
+test('AiSdkOpenRouterProvider passes configured fetch to OpenRouter provider', (t) => {
+    const fetchImpl = async () => new Response('{}');
+    const calls = [];
+    const provider = new AiSdkOpenRouterProvider({
+        defaultModel: 'openrouter/auto',
+        resolveConfig: () => ({
+            fetch: fetchImpl,
+        }),
+        createProvider: (options) => {
+            calls.push(options);
+            return (modelId) => ({
+                specificationVersion: 'v3',
+                provider: 'openrouter.chat',
+                modelId,
+                supportedUrls: {},
+                doGenerate: async () => ({}),
+                doStream: async () => ({ stream: [] }),
+            });
+        },
+    });
+    provider.getModel('selected-model');
+    t.is(calls[0].fetch, fetchImpl);
+});
 //# sourceMappingURL=ai-sdk-openrouter.provider.test.js.map

package/dist/providers/ai-sdk-openrouter.provider.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"ai-sdk-openrouter.provider.test.js","sourceRoot":"","sources":["../../source/providers/ai-sdk-openrouter.provider.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ai-sdk-openrouter.provider.test.js","sourceRoot":"","sources":["../../source/providers/ai-sdk-openrouter.provider.test.ts"],"names":[],"mappings":"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"}

package/dist/providers/common/openai-compatible-messages.d.ts

@@ -1,7 +1,6 @@
 import { type ModelRequest } from '@openai/agents-core';
 import type { ILoggingService } from '../../services/service-interfaces.js';
-export declare function addCacheControlToLastUserMessage(messages: any[]): void;
-export declare function addCacheControlToLastToolMessage(messages: any[]): void;
+export declare function addCacheControlToLastTwoMessages(messages: any[], modelId?: string): void;
 export declare function buildMessagesFromRequest(req: ModelRequest, modelId?: string, loggingService?: ILoggingService): any[];
 export declare function extractFunctionToolsFromRequest(req: ModelRequest): any[];
 export declare function extractModelSettingsForRequest(settings: any): any;

package/dist/providers/common/openai-compatible-messages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"openai-compatible-messages.d.ts","sourceRoot":"","sources":["../../../source/providers/common/openai-compatible-messages.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAwI5E,wBAAgB,gCAAgC,CAAC,QAAQ,EAAE,GAAG,EAAE,GAAG,IAAI,CAwBtE;AAED,wBAAgB,gCAAgC,CAAC,QAAQ,EAAE,GAAG,EAAE,GAAG,IAAI,CAwBtE;AAuBD,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,YAAY,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,eAAe,GAAG,GAAG,EAAE,CAmIrH;AAED,wBAAgB,+BAA+B,CAAC,GAAG,EAAE,YAAY,GAAG,GAAG,EAAE,CAsBxE;AAED,wBAAgB,8BAA8B,CAAC,QAAQ,EAAE,GAAG,GAAG,GAAG,CAiCjE"}
+{"version":3,"file":"openai-compatible-messages.d.ts","sourceRoot":"","sources":["../../../source/providers/common/openai-compatible-messages.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAkK5E,wBAAgB,gCAAgC,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CA8BxF;AAuBD,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,YAAY,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,eAAe,GAAG,GAAG,EAAE,CAkIrH;AAED,wBAAgB,+BAA+B,CAAC,GAAG,EAAE,YAAY,GAAG,GAAG,EAAE,CAsBxE;AAED,wBAAgB,8BAA8B,CAAC,QAAQ,EAAE,GAAG,GAAG,GAAG,CAiCjE"}

package/dist/providers/common/openai-compatible-messages.js

@@ -21,7 +21,7 @@ function convertAgentItemToOpenAICompatibleMessage(item, loggingService) {
         const message = { role: 'assistant' };
         if (Array.isArray(rawItem.content)) {
             const textContent = rawItem.content
-                .filter((c) => c?.type === 'output_text' && c?.text)
+                .filter((c) => (c?.type === 'output_text' || c?.type === 'text') && c?.text)
                 .map((c) => c.text)
                 .join('');
             if (textContent) {
@@ -112,54 +112,54 @@ function convertAgentItemToOpenAICompatibleMessage(item, loggingService) {
     }
     return null;
 }
-export function addCacheControlToLastUserMessage(messages) {
-    for (let i = messages.length - 1; i >= 0; i--) {
-        const msg = messages[i];
-        if (msg.role === 'user') {
-            if (typeof msg.content === 'string') {
-                msg.content = [
-                    {
-                        type: 'text',
-                        text: msg.content,
-                        cache_control: { type: 'ephemeral' },
-                    },
-                ];
-            }
-            else if (Array.isArray(msg.content) && msg.content.length > 0) {
-                for (let j = msg.content.length - 1; j >= 0; j--) {
-                    const item = msg.content[j];
-                    if (item.type === 'text') {
-                        item.cache_control = { type: 'ephemeral' };
-                        break;
-                    }
-                }
+function hasAssistantPayload(message) {
+    if (message?.role !== 'assistant') {
+        return true;
+    }
+    if (Array.isArray(message.tool_calls) && message.tool_calls.length > 0) {
+        return true;
+    }
+    return message.content !== null && message.content !== undefined && message.content !== '';
+}
+function applyCacheControlToMessage(msg) {
+    if (!msg)
+        return;
+    if (typeof msg.content === 'string') {
+        msg.content = [{ type: 'text', text: msg.content, cache_control: { type: 'ephemeral' } }];
+    }
+    else if (Array.isArray(msg.content) && msg.content.length > 0) {
+        for (let j = msg.content.length - 1; j >= 0; j--) {
+            if (msg.content[j].type === 'text') {
+                msg.content[j] = { ...msg.content[j], cache_control: { type: 'ephemeral' } };
+                break;
             }
-            break;
         }
     }
 }
-export function addCacheControlToLastToolMessage(messages) {
+export function addCacheControlToLastTwoMessages(messages, modelId) {
+    if (modelId) {
+        const lowerModelId = modelId.toLowerCase();
+        if (!lowerModelId.includes('anthropic') && !lowerModelId.includes('claude') && !lowerModelId.includes('qwen')) {
+            return;
+        }
+    }
+    // 1. Add cache control to all system messages (role == 'system')
+    for (const msg of messages) {
+        if (msg.role === 'system') {
+            applyCacheControlToMessage(msg);
+        }
+    }
+    // 2. Add cache control to last message that has role == 'user'
     for (let i = messages.length - 1; i >= 0; i--) {
-        const msg = messages[i];
-        if (msg.role === 'tool') {
-            if (typeof msg.content === 'string') {
-                msg.content = [
-                    {
-                        type: 'text',
-                        text: msg.content,
-                        cache_control: { type: 'ephemeral' },
-                    },
-                ];
-            }
-            else if (Array.isArray(msg.content) && msg.content.length > 0) {
-                for (let j = msg.content.length - 1; j >= 0; j--) {
-                    const item = msg.content[j];
-                    if (item.type === 'text') {
-                        item.cache_control = { type: 'ephemeral' };
-                        break;
-                    }
-                }
-            }
+        if (messages[i].role === 'user') {
+            applyCacheControlToMessage(messages[i]);
+            break;
+        }
+    }
+    // 3. Add cache control to last message that has role == 'tool'
+    for (let i = messages.length - 1; i >= 0; i--) {
+        if (messages[i].role === 'tool') {
+            applyCacheControlToMessage(messages[i]);
             break;
         }
     }
@@ -297,11 +297,10 @@ export function buildMessagesFromRequest(req, modelId, loggingService) {
             }
         }
     }
-    if (modelId && isAnthropicModel(modelId)) {
-        addCacheControlToLastUserMessage(messages);
-        addCacheControlToLastToolMessage(messages);
+    if (modelId && (isAnthropicModel(modelId) || modelId.toLowerCase().includes('qwen'))) {
+        addCacheControlToLastTwoMessages(messages, modelId);
     }
-    return messages;
+    return messages.filter(hasAssistantPayload);
 }
 export function extractFunctionToolsFromRequest(req) {
     if (!req.tools || req.tools.length === 0) {

package/dist/providers/common/openai-compatible-messages.js.map

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

package/dist/providers/common/openai-compatible-messages.test.js

@@ -1,5 +1,5 @@
 import test from 'ava';
-import { buildMessagesFromRequest } from './openai-compatible-messages.js';
+import { buildMessagesFromRequest, addCacheControlToLastTwoMessages } from './openai-compatible-messages.js';
 test('buildMessagesFromRequest() preserves user text and image content', (t) => {
     const messages = buildMessagesFromRequest({
         input: [
@@ -23,4 +23,137 @@ test('buildMessagesFromRequest() preserves user text and image content', (t) =>
         },
     ]);
 });
+test('buildMessagesFromRequest() extracts text from assistant content blocks with type=text (Responses API shape)', (t) => {
+    const messages = buildMessagesFromRequest({
+        input: [
+            {
+                role: 'assistant',
+                type: 'message',
+                content: [{ type: 'text', text: 'Hi! How can I help?', annotations: [] }],
+            },
+        ],
+    });
+    t.deepEqual(messages, [{ role: 'assistant', content: 'Hi! How can I help?' }]);
+});
+test('buildMessagesFromRequest() concatenates mixed output_text and text content blocks', (t) => {
+    const messages = buildMessagesFromRequest({
+        input: [
+            {
+                role: 'assistant',
+                type: 'message',
+                content: [
+                    { type: 'output_text', text: 'Part one.' },
+                    { type: 'text', text: ' Part two.', annotations: [] },
+                ],
+            },
+        ],
+    });
+    t.deepEqual(messages, [{ role: 'assistant', content: 'Part one. Part two.' }]);
+});
+test('addCacheControlToLastTwoMessages() adds cache control to system, last user, and last tool messages', (t) => {
+    const messages = [
+        { role: 'system', content: 'sys1' },
+        { role: 'user', content: 'user1' },
+        { role: 'tool', content: 'tool1' },
+        { role: 'user', content: 'user2' },
+    ];
+    addCacheControlToLastTwoMessages(messages);
+    t.deepEqual(messages[0].content, [{ type: 'text', text: 'sys1', cache_control: { type: 'ephemeral' } }]);
+    t.deepEqual(messages[1].content, 'user1'); // not last user
+    t.deepEqual(messages[2].content, [{ type: 'text', text: 'tool1', cache_control: { type: 'ephemeral' } }]); // last tool
+    t.deepEqual(messages[3].content, [{ type: 'text', text: 'user2', cache_control: { type: 'ephemeral' } }]); // last user
+});
+test('addCacheControlToLastTwoMessages() adds cache_control to last text block in array content', (t) => {
+    const messages = [
+        { role: 'user', content: [{ type: 'text', text: 'hello' }] },
+        { role: 'user', content: [{ type: 'text', text: 'world' }] },
+    ];
+    addCacheControlToLastTwoMessages(messages);
+    t.deepEqual(messages[0].content, [{ type: 'text', text: 'hello' }]); // not last user
+    t.deepEqual(messages[1].content, [{ type: 'text', text: 'world', cache_control: { type: 'ephemeral' } }]); // last user
+});
+test('addCacheControlToLastTwoMessages() leaves other messages untouched', (t) => {
+    const messages = [
+        { role: 'user', content: 'untouched' },
+        { role: 'user', content: 'untouched2' },
+        { role: 'assistant', content: 'assistant' },
+        { role: 'user', content: 'marked' },
+    ];
+    addCacheControlToLastTwoMessages(messages);
+    t.is(messages[0].content, 'untouched');
+    t.is(messages[1].content, 'untouched2');
+    t.is(messages[2].content, 'assistant');
+    t.deepEqual(messages[3].content, [{ type: 'text', text: 'marked', cache_control: { type: 'ephemeral' } }]);
+});
+test('addCacheControlToLastTwoMessages() does nothing on empty array', (t) => {
+    const messages = [];
+    t.notThrows(() => addCacheControlToLastTwoMessages(messages));
+    t.deepEqual(messages, []);
+});
+test('addCacheControlToLastTwoMessages() skips messages with no text content block', (t) => {
+    const messages = [
+        { role: 'tool', content: [{ type: 'image', data: 'abc' }] },
+        { role: 'user', content: [{ type: 'text', text: 'hi' }] },
+    ];
+    addCacheControlToLastTwoMessages(messages);
+    t.deepEqual(messages[0].content, [{ type: 'image', data: 'abc' }]);
+    t.deepEqual(messages[1].content, [{ type: 'text', text: 'hi', cache_control: { type: 'ephemeral' } }]);
+});
+test('buildMessagesFromRequest() omits assistant messages without content or tool calls', (t) => {
+    const messages = buildMessagesFromRequest({
+        input: [
+            { role: 'user', type: 'message', content: 'read package json' },
+            {
+                role: 'assistant',
+                type: 'message',
+                content: [],
+                reasoning_content: 'I should inspect the file.',
+            },
+            { role: 'user', type: 'message', content: 'retry after failed hallucinated tool call' },
+        ],
+    });
+    t.deepEqual(messages, [
+        { role: 'user', content: 'read package json' },
+        { role: 'user', content: 'retry after failed hallucinated tool call' },
+    ]);
+});
+test('addCacheControlToLastTwoMessages() filters by modelId correctly', (t) => {
+    const testCases = [
+        { modelId: 'anthropic/claude-3-5-sonnet', shouldCache: true },
+        { modelId: 'claude-3-5-haiku', shouldCache: true },
+        { modelId: 'qwen/qwen-2.5-coder-32b', shouldCache: true },
+        { modelId: 'gpt-4o', shouldCache: false },
+        { modelId: 'meta-llama/llama-3.1-405b', shouldCache: false },
+        { modelId: 'gemini-1.5-pro', shouldCache: false },
+    ];
+    for (const { modelId, shouldCache } of testCases) {
+        const messages = [
+            { role: 'user', content: 'hello' },
+            { role: 'assistant', content: 'world' },
+        ];
+        addCacheControlToLastTwoMessages(messages, modelId);
+        if (shouldCache) {
+            t.deepEqual(messages[0].content, [{ type: 'text', text: 'hello', cache_control: { type: 'ephemeral' } }]);
+            t.deepEqual(messages[1].content, 'world'); // assistant does not get cache control under new rules
+        }
+        else {
+            t.deepEqual(messages[0].content, 'hello');
+            t.deepEqual(messages[1].content, 'world');
+        }
+    }
+});
+test('buildMessagesFromRequest() adds cache control for Qwen models', (t) => {
+    const messages = buildMessagesFromRequest({
+        input: [
+            { role: 'user', type: 'message', content: 'hello' },
+            {
+                role: 'assistant',
+                type: 'message',
+                content: [{ type: 'text', text: 'hi' }],
+            },
+        ],
+    }, 'qwen/qwen-2.5-coder');
+    t.deepEqual(messages[0].content, [{ type: 'text', text: 'hello', cache_control: { type: 'ephemeral' } }]);
+    t.is(messages[1].content, 'hi');
+});
 //# sourceMappingURL=openai-compatible-messages.test.js.map

package/dist/providers/common/openai-compatible-messages.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"openai-compatible-messages.test.js","sourceRoot":"","sources":["../../../source/providers/common/openai-compatible-messages.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,KAAK,CAAC;AACvB,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAE3E,IAAI,CAAC,kEAAkE,EAAE,CAAC,CAAC,EAAE,EAAE;IAC7E,MAAM,QAAQ,GAAG,wBAAwB,CAAC;QACxC,KAAK,EAAE;YACL;gBACE,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE;oBACP,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,eAAe,EAAE;oBAC7C,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,8BAA8B,EAAE,MAAM,EAAE,MAAM,EAAE;iBAC/E;aACF;SACF;KACK,CAAC,CAAC;IAEV,CAAC,CAAC,SAAS,CAAC,QAAQ,EAAE;QACpB;YACE,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE;gBACP,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE;gBACvC,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,EAAE,GAAG,EAAE,8BAA8B,EAAE,EAAE;aAC1E;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"openai-compatible-messages.test.js","sourceRoot":"","sources":["../../../source/providers/common/openai-compatible-messages.test.ts"],"names":[],"mappings":"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"}

package/dist/providers/custom-provider-adapter.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=custom-provider-adapter.test.d.ts.map

package/dist/providers/custom-provider-adapter.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"custom-provider-adapter.test.d.ts","sourceRoot":"","sources":["../../source/providers/custom-provider-adapter.test.ts"],"names":[],"mappings":""}

package/dist/providers/custom-provider-adapter.test.js

@@ -0,0 +1,52 @@
+import test from 'ava';
+import { OpenAIProvider, OpenAIChatCompletionsModel, OpenAIResponsesModel } from '@openai/agents-openai';
+import { createCustomProviderModelProvider } from './openai-compatible.provider.js';
+import { AiSdkAnthropicProvider } from './ai-sdk-anthropic.provider.js';
+import { AiSdkGoogleProvider } from './ai-sdk-google.provider.js';
+const baseConfig = {
+    name: 'custom-provider',
+    baseUrl: 'https://example.test',
+    apiKey: 'test-key',
+};
+test('createCustomProviderModelProvider uses native chat-completions OpenAIProvider by default', async (t) => {
+    const provider = createCustomProviderModelProvider(baseConfig, {
+        defaultModel: 'model-a',
+        fetch: async () => new Response('{}'),
+    });
+    t.true(provider instanceof OpenAIProvider);
+    const model = await provider.getModel('model-a');
+    t.true(model instanceof OpenAIChatCompletionsModel, 'default branch must resolve to chat-completions, not responses');
+});
+test('createCustomProviderModelProvider uses native responses OpenAIProvider for openai type', async (t) => {
+    const provider = createCustomProviderModelProvider({
+        ...baseConfig,
+        type: 'openai',
+    }, {
+        defaultModel: 'model-a',
+        fetch: async () => new Response('{}'),
+    });
+    t.true(provider instanceof OpenAIProvider);
+    const model = await provider.getModel('model-a');
+    t.true(model instanceof OpenAIResponsesModel, 'openai type must use the Responses API');
+});
+test('createCustomProviderModelProvider uses Anthropic adapter for anthropic type', (t) => {
+    const provider = createCustomProviderModelProvider({
+        ...baseConfig,
+        type: 'anthropic',
+    }, {
+        defaultModel: 'claude-test',
+        fetch: async () => new Response('{}'),
+    });
+    t.true(provider instanceof AiSdkAnthropicProvider);
+});
+test('createCustomProviderModelProvider uses Google adapter for google type', (t) => {
+    const provider = createCustomProviderModelProvider({
+        ...baseConfig,
+        type: 'google',
+    }, {
+        defaultModel: 'gemini-test',
+        fetch: async () => new Response('{}'),
+    });
+    t.true(provider instanceof AiSdkGoogleProvider);
+});
+//# sourceMappingURL=custom-provider-adapter.test.js.map

package/dist/providers/custom-provider-adapter.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"custom-provider-adapter.test.js","sourceRoot":"","sources":["../../source/providers/custom-provider-adapter.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,KAAK,CAAC;AACvB,OAAO,EAAE,cAAc,EAAE,0BAA0B,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAEzG,OAAO,EAAE,iCAAiC,EAA6B,MAAM,iCAAiC,CAAC;AAC/G,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AACxE,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAElE,MAAM,UAAU,GAAG;IACjB,IAAI,EAAE,iBAAiB;IACvB,OAAO,EAAE,sBAAsB;IAC/B,MAAM,EAAE,UAAU;CACY,CAAC;AAEjC,IAAI,CAAC,0FAA0F,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IAC3G,MAAM,QAAQ,GAAG,iCAAiC,CAAC,UAAU,EAAE;QAC7D,YAAY,EAAE,SAAS;QACvB,KAAK,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,QAAQ,CAAC,IAAI,CAAC;KACtC,CAAC,CAAC;IAEH,CAAC,CAAC,IAAI,CAAC,QAAQ,YAAY,cAAc,CAAC,CAAC;IAC3C,MAAM,KAAK,GAAG,MAAO,QAA2B,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IACrE,CAAC,CAAC,IAAI,CAAC,KAAK,YAAY,0BAA0B,EAAE,gEAAgE,CAAC,CAAC;AACxH,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,wFAAwF,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IACzG,MAAM,QAAQ,GAAG,iCAAiC,CAChD;QACE,GAAG,UAAU;QACb,IAAI,EAAE,QAAQ;KACf,EACD;QACE,YAAY,EAAE,SAAS;QACvB,KAAK,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,QAAQ,CAAC,IAAI,CAAC;KACtC,CACF,CAAC;IAEF,CAAC,CAAC,IAAI,CAAC,QAAQ,YAAY,cAAc,CAAC,CAAC;IAC3C,MAAM,KAAK,GAAG,MAAO,QAA2B,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IACrE,CAAC,CAAC,IAAI,CAAC,KAAK,YAAY,oBAAoB,EAAE,wCAAwC,CAAC,CAAC;AAC1F,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,6EAA6E,EAAE,CAAC,CAAC,EAAE,EAAE;IACxF,MAAM,QAAQ,GAAG,iCAAiC,CAChD;QACE,GAAG,UAAU;QACb,IAAI,EAAE,WAAW;KAClB,EACD;QACE,YAAY,EAAE,aAAa;QAC3B,KAAK,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,QAAQ,CAAC,IAAI,CAAC;KACtC,CACF,CAAC;IAEF,CAAC,CAAC,IAAI,CAAC,QAAQ,YAAY,sBAAsB,CAAC,CAAC;AACrD,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,uEAAuE,EAAE,CAAC,CAAC,EAAE,EAAE;IAClF,MAAM,QAAQ,GAAG,iCAAiC,CAChD;QACE,GAAG,UAAU;QACb,IAAI,EAAE,QAAQ;KACf,EACD;QACE,YAAY,EAAE,aAAa;QAC3B,KAAK,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,QAAQ,CAAC,IAAI,CAAC;KACtC,CACF,CAAC;IAEF,CAAC,CAAC,IAAI,CAAC,QAAQ,YAAY,mBAAmB,CAAC,CAAC;AAClD,CAAC,CAAC,CAAC"}

package/dist/providers/github-copilot/converters.d.ts

@@ -0,0 +1,45 @@
+import type { ModelRequest } from '@openai/agents-core';
+import type { ILoggingService } from '../../services/service-interfaces.js';
+/**
+ * Copilot SDK message format
+ */
+export interface CopilotMessage {
+    role: 'system' | 'user' | 'assistant' | 'tool';
+    content: string;
+    name?: string;
+    tool_call_id?: string;
+    tool_calls?: Array<{
+        id: string;
+        type: 'function';
+        function: {
+            name: string;
+            arguments: string;
+        };
+    }>;
+}
+/**
+ * Convert SDK ModelRequest to Copilot SDK message format.
+ * Maps the conversation history from the SDK format to what Copilot expects.
+ */
+export declare function buildMessagesFromRequest(request: ModelRequest, modelId: string, loggingService: ILoggingService): CopilotMessage[];
+/**
+ * Extract function tools from the ModelRequest.
+ * Filters out SDK-specific tools and returns only function tools.
+ */
+export declare function extractFunctionToolsFromRequest(request: ModelRequest): Array<{
+    type: 'function';
+    function: {
+        name: string;
+        description: string;
+        parameters: unknown;
+    };
+}>;
+/**
+ * Normalize usage data to SDK format
+ */
+export declare function normalizeUsage(usage: any): {
+    inputTokens: number;
+    outputTokens: number;
+    totalTokens: number;
+};
+//# sourceMappingURL=converters.d.ts.map

package/dist/providers/github-copilot/converters.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"converters.d.ts","sourceRoot":"","sources":["../../../source/providers/github-copilot/converters.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAkC5E;;GAEG;AACH,MAAM,WAAW,cAAc;IAC3B,IAAI,EAAE,QAAQ,GAAG,MAAM,GAAG,WAAW,GAAG,MAAM,CAAC;IAC/C,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,KAAK,CAAC;QACf,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,UAAU,CAAC;QACjB,QAAQ,EAAE;YACN,IAAI,EAAE,MAAM,CAAC;YACb,SAAS,EAAE,MAAM,CAAC;SACrB,CAAC;KACL,CAAC,CAAC;CACN;AA8BD;;;GAGG;AACH,wBAAgB,wBAAwB,CACpC,OAAO,EAAE,YAAY,EACrB,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,eAAe,GAChC,cAAc,EAAE,CA+DlB;AAED;;;GAGG;AACH,wBAAgB,+BAA+B,CAC3C,OAAO,EAAE,YAAY,GACtB,KAAK,CAAC;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,QAAQ,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,OAAO,CAAA;KAAE,CAAA;CAAE,CAAC,CAenG;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,GAAG,GAAG;IACxC,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;CACvB,CAMA"}