@qduc/term2 0.6.0 → 0.6.1

package/dist/providers/openrouter/converters.test.js

@@ -0,0 +1,179 @@
+import test from 'ava';
+import { buildMessagesFromRequest } from './converters.js';
+import { LoggingService } from '../../services/logging-service.js';
+const logger = new LoggingService({ disableLogging: true });
+test('merges consecutive assistant messages with tool calls', (t) => {
+    const input = [
+        {
+            type: 'function_call',
+            id: 'call-1',
+            name: 'tool1',
+            arguments: '{}',
+            reasoning_details: [{ type: 'reasoning.text', text: 'thinking' }],
+        },
+        {
+            type: 'function_call',
+            id: 'call-2',
+            name: 'tool2',
+            arguments: '{}',
+            // Second one might not have reasoning details, or might have them
+        },
+    ];
+    const messages = buildMessagesFromRequest({
+        input: input,
+        tools: [],
+    }, 'model-id', logger);
+    t.is(messages.length, 1);
+    t.is(messages[0].role, 'assistant');
+    t.is(messages[0].tool_calls.length, 2);
+    t.is(messages[0].tool_calls[0].id, 'call-1');
+    t.is(messages[0].tool_calls[1].id, 'call-2');
+    t.deepEqual(messages[0].reasoning_details, [{ type: 'reasoning.text', text: 'thinking' }]);
+});
+test('merges consecutive assistant messages with tool calls and preserves reasoning from second if first missing', (t) => {
+    const input = [
+        {
+            type: 'function_call',
+            id: 'call-1',
+            name: 'tool1',
+            arguments: '{}',
+        },
+        {
+            type: 'function_call',
+            id: 'call-2',
+            name: 'tool2',
+            arguments: '{}',
+            reasoning_details: [{ type: 'reasoning.text', text: 'thinking' }],
+        },
+    ];
+    const messages = buildMessagesFromRequest({
+        input: input,
+        tools: [],
+    }, 'model-id', logger);
+    t.is(messages.length, 1);
+    t.is(messages[0].role, 'assistant');
+    t.is(messages[0].tool_calls.length, 2);
+    t.deepEqual(messages[0].reasoning_details, [{ type: 'reasoning.text', text: 'thinking' }]);
+});
+test('replays providerData reasoning_content on function calls', (t) => {
+    const input = [
+        {
+            type: 'function_call',
+            id: 'call-1',
+            name: 'tool1',
+            arguments: '{}',
+            providerData: {
+                reasoning_content: 'thinking before tool call',
+            },
+        },
+        {
+            type: 'function_call_result',
+            callId: 'call-1',
+            output: 'result',
+        },
+    ];
+    const messages = buildMessagesFromRequest({
+        input: input,
+        tools: [],
+    }, 'model-id', logger);
+    t.is(messages[0].role, 'assistant');
+    t.is(messages[0].reasoning_content, 'thinking before tool call');
+});
+test('does not merge if intervening message', (t) => {
+    const input = [
+        {
+            type: 'function_call',
+            id: 'call-1',
+            name: 'tool1',
+            arguments: '{}',
+        },
+        {
+            type: 'function_call_result',
+            callId: 'call-1',
+            output: 'result',
+        },
+        {
+            type: 'function_call',
+            id: 'call-2',
+            name: 'tool2',
+            arguments: '{}',
+        },
+    ];
+    const messages = buildMessagesFromRequest({
+        input: input,
+        tools: [],
+    }, 'model-id', logger);
+    // Should be: assistant(tool1), tool(result), assistant(tool2)
+    t.is(messages.length, 3);
+    t.is(messages[0].role, 'assistant');
+    t.is(messages[1].role, 'tool');
+    t.is(messages[2].role, 'assistant');
+});
+test('merges if the first assistant tool_calls message has content', (t) => {
+    const input = [
+        {
+            type: 'message',
+            role: 'assistant',
+            content: [{ type: 'output_text', text: 'Some text' }],
+            tool_calls: [
+                {
+                    id: 'call-1',
+                    type: 'function',
+                    function: { name: 'tool1', arguments: '{}' },
+                },
+            ],
+        },
+        {
+            type: 'function_call',
+            id: 'call-2',
+            name: 'tool2',
+            arguments: '{}',
+        },
+    ];
+    const messages = buildMessagesFromRequest({
+        input: input,
+        tools: [],
+    }, 'model-id', logger);
+    // Should merge tool calls into the text-bearing assistant message.
+    t.is(messages.length, 1);
+    t.is(messages[0].role, 'assistant');
+    t.is(messages[0].content, 'Some text');
+    t.true(Array.isArray(messages[0].tool_calls));
+    t.is(messages[0].tool_calls.length, 2);
+    t.is(messages[0].tool_calls[0].id, 'call-1');
+    t.is(messages[0].tool_calls[1].id, 'call-2');
+});
+test('merges if the second assistant tool_calls message has content', (t) => {
+    const input = [
+        {
+            type: 'function_call',
+            id: 'call-1',
+            name: 'tool1',
+            arguments: '{}',
+        },
+        {
+            type: 'message',
+            role: 'assistant',
+            content: [{ type: 'output_text', text: 'More text' }],
+            tool_calls: [
+                {
+                    id: 'call-2',
+                    type: 'function',
+                    function: { name: 'tool2', arguments: '{}' },
+                },
+            ],
+        },
+    ];
+    const messages = buildMessagesFromRequest({
+        input: input,
+        tools: [],
+    }, 'model-id', logger);
+    // Should merge.
+    t.is(messages.length, 1);
+    t.is(messages[0].role, 'assistant');
+    t.is(messages[0].content, 'More text');
+    t.is(messages[0].tool_calls.length, 2);
+    t.is(messages[0].tool_calls[0].id, 'call-1');
+    t.is(messages[0].tool_calls[1].id, 'call-2');
+});
+//# sourceMappingURL=converters.test.js.map

package/dist/providers/openrouter/converters.test.js.map

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

package/dist/providers/openrouter/index.d.ts

@@ -0,0 +1,4 @@
+export { OpenRouterError } from './api.js';
+export { OpenRouterModel } from './model.js';
+export { OpenRouterProvider, createOpenRouterProvider } from './provider.js';
+//# sourceMappingURL=index.d.ts.map

package/dist/providers/openrouter/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../source/providers/openrouter/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC"}

package/dist/providers/openrouter/index.js

@@ -0,0 +1,4 @@
+export { OpenRouterError } from './api.js';
+export { OpenRouterModel } from './model.js';
+export { OpenRouterProvider, createOpenRouterProvider } from './provider.js';
+//# sourceMappingURL=index.js.map

package/dist/providers/openrouter/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../source/providers/openrouter/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC"}

package/dist/providers/openrouter/model.d.ts

@@ -0,0 +1,14 @@
+import { type Model, type ModelRequest, type ModelResponse, type ResponseStreamEvent } from '@openai/agents-core';
+import type { ILoggingService, ISettingsService } from '../../services/service-interfaces.js';
+export declare class OpenRouterModel implements Model {
+    #private;
+    name: string;
+    constructor(deps: {
+        settingsService: ISettingsService;
+        loggingService: ILoggingService;
+        modelId?: string;
+    });
+    getResponse(request: ModelRequest): Promise<ModelResponse>;
+    getStreamedResponse(request: ModelRequest): AsyncIterable<ResponseStreamEvent>;
+}
+//# sourceMappingURL=model.d.ts.map

package/dist/providers/openrouter/model.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../source/providers/openrouter/model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,KAAK,EAAE,KAAK,YAAY,EAAE,KAAK,aAAa,EAAE,KAAK,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAElH,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AAK9F,qBAAa,eAAgB,YAAW,KAAK;;IAC3C,IAAI,EAAE,MAAM,CAAC;gBAKD,IAAI,EAAE;QAAE,eAAe,EAAE,gBAAgB,CAAC;QAAC,cAAc,EAAE,eAAe,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE;IAOpG,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,aAAa,CAAC;IAmJzD,mBAAmB,CAAC,OAAO,EAAE,YAAY,GAAG,aAAa,CAAC,mBAAmB,CAAC;CA+VtF"}