@qduc/term2 0.1.7 → 0.1.8

package/dist/services/conversation-service.test.js

@@ -1,156 +1,190 @@
 import test from 'ava';
-import { ConversationService } from './conversation-service.js';
+import { ConversationService } from '../../dist/services/conversation-service.js';
 class MockStream {
-    constructor(events) {
-        this.events = events;
-        this.completed = Promise.resolve();
-        this.lastResponseId = 'resp_test';
-        this.interruptions = [];
-        this.state = {};
-        this.newItems = [];
-        this.history = [];
-        this.finalOutput = '';
-    }
-    async *[Symbol.asyncIterator]() {
-        for (const event of this.events) {
-            yield event;
-        }
+  constructor(events) {
+    this.events = events;
+    this.completed = Promise.resolve();
+    this.lastResponseId = 'resp_test';
+    this.interruptions = [];
+    this.state = {};
+    this.newItems = [];
+    this.history = [];
+    this.finalOutput = '';
+  }
+  async *[Symbol.asyncIterator]() {
+    for (const event of this.events) {
+      yield event;
     }
+  }
 }
-test('emits live text chunks for response.output_text.delta events', async (t) => {
-    t.plan(3);
-    const events = [
-        { type: 'response.output_text.delta', delta: 'Hello' },
-        { type: 'response.output_text.delta', delta: ' world' },
-    ];
-    const mockClient = {
-        async startStream() {
-            return new MockStream(events);
-        },
-    };
-    const chunks = [];
-    const service = new ConversationService({ agentClient: mockClient });
-    const result = await service.sendMessage('hi', {
-        onTextChunk(full, chunk) {
-            chunks.push({ full, chunk });
-        },
-    });
-    t.deepEqual(chunks, [
-        { full: 'Hello', chunk: 'Hello' },
-        { full: 'Hello world', chunk: ' world' },
-    ]);
-    t.is(result.type, 'response');
-    t.is(result.finalText, 'Hello world');
-});
-test('passes previous response ids into subsequent runs', async (t) => {
-    const streams = [new MockStream([]), new MockStream([])];
-    streams[0].lastResponseId = 'resp-1';
-    streams[0].finalOutput = 'First run done.';
-    streams[1].lastResponseId = 'resp-2';
-    streams[1].finalOutput = 'Second run done.';
-    const startCalls = [];
-    const mockClient = {
-        async startStream(text, options) {
-            const index = startCalls.length;
-            startCalls.push({ text, options });
-            return streams[index];
-        },
-    };
-    const service = new ConversationService({ agentClient: mockClient });
-    await service.sendMessage('first');
-    const secondResult = await service.sendMessage('second');
-    t.deepEqual(startCalls, [
-        { text: 'first', options: { previousResponseId: null } },
-        { text: 'second', options: { previousResponseId: 'resp-1' } },
-    ]);
-    t.is(secondResult.type, 'response');
-    t.is(secondResult.finalText, 'Second run done.');
+test('emits live text chunks for response.output_text.delta events', async t => {
+  t.plan(3);
+  const events = [{
+    type: 'response.output_text.delta',
+    delta: 'Hello'
+  }, {
+    type: 'response.output_text.delta',
+    delta: ' world'
+  }];
+  const mockClient = {
+    async startStream() {
+      return new MockStream(events);
+    }
+  };
+  const chunks = [];
+  const service = new ConversationService({
+    agentClient: mockClient
+  });
+  const result = await service.sendMessage('hi', {
+    onTextChunk(full, chunk) {
+      chunks.push({
+        full,
+        chunk
+      });
+    }
+  });
+  t.deepEqual(chunks, [{
+    full: 'Hello',
+    chunk: 'Hello'
+  }, {
+    full: 'Hello world',
+    chunk: ' world'
+  }]);
+  t.is(result.type, 'response');
+  t.is(result.finalText, 'Hello world');
 });
-test('emits approval interruptions and resumes after approval', async (t) => {
-    const interruption = {
-        name: 'bash',
-        agent: { name: 'CLI Agent' },
-        arguments: JSON.stringify({ command: 'echo hi' }),
-    };
-    const initialStream = new MockStream([]);
-    initialStream.interruptions = [interruption];
-    initialStream.state = {
-        approveCalls: [],
-        rejectCalls: [],
-        approve(arg) {
-            this.approveCalls.push(arg);
-        },
-        reject(arg) {
-            this.rejectCalls.push(arg);
-        },
-    };
-    const continuationStream = new MockStream([
-        { type: 'response.output_text.delta', delta: 'Approved run' },
-    ]);
-    continuationStream.finalOutput = 'Approved run';
-    const mockClient = {
-        async startStream() {
-            return initialStream;
-        },
-        async continueRunStream(state) {
-            t.is(state, initialStream.state);
-            return continuationStream;
-        },
-    };
-    const service = new ConversationService({ agentClient: mockClient });
-    const approvalResult = await service.sendMessage('run command');
-    t.is(approvalResult.type, 'approval_required');
-    t.is(approvalResult.approval.toolName, 'bash');
-    t.is(approvalResult.approval.argumentsText, 'echo hi');
-    const finalResult = await service.handleApprovalDecision('y');
-    t.truthy(finalResult);
-    t.is(finalResult.type, 'response');
-    t.is(finalResult.finalText, 'Approved run');
-    t.deepEqual(initialStream.state.approveCalls, [interruption]);
-    t.deepEqual(initialStream.state.rejectCalls, []);
+test('passes previous response ids into subsequent runs', async t => {
+  const streams = [new MockStream([]), new MockStream([])];
+  streams[0].lastResponseId = 'resp-1';
+  streams[0].finalOutput = 'First run done.';
+  streams[1].lastResponseId = 'resp-2';
+  streams[1].finalOutput = 'Second run done.';
+  const startCalls = [];
+  const mockClient = {
+    async startStream(text, options) {
+      const index = startCalls.length;
+      startCalls.push({
+        text,
+        options
+      });
+      return streams[index];
+    }
+  };
+  const service = new ConversationService({
+    agentClient: mockClient
+  });
+  await service.sendMessage('first');
+  const secondResult = await service.sendMessage('second');
+  t.deepEqual(startCalls, [{
+    text: 'first',
+    options: {
+      previousResponseId: null
+    }
+  }, {
+    text: 'second',
+    options: {
+      previousResponseId: 'resp-1'
+    }
+  }]);
+  t.is(secondResult.type, 'response');
+  t.is(secondResult.finalText, 'Second run done.');
 });
-test('dedupes command messages emitted live from run events', async (t) => {
-    const commandPayload = JSON.stringify({
-        command: 'ls',
-        stdout: 'file.txt',
-        success: true,
-    });
-    const rawItem = {
-        id: 'call-123',
-        type: 'function_call_result',
-        name: 'bash',
-        arguments: JSON.stringify({ command: 'ls' }),
-    };
-    const commandItem = {
-        type: 'tool_call_output_item',
-        name: 'bash',
-        output: commandPayload,
-        rawItem,
-    };
-    const events = [{ type: 'run_item_stream_event', item: commandItem }];
-    const stream = new MockStream(events);
-    stream.newItems = [commandItem];
-    const emitted = [];
-    const mockClient = {
-        async startStream() {
-            return stream;
-        },
-    };
-    const service = new ConversationService({ agentClient: mockClient });
-    const result = await service.sendMessage('run bash', {
-        onCommandMessage(message) {
-            emitted.push(message);
-        },
-    });
-    t.deepEqual(emitted, [
-        {
-            id: 'call-123',
-            sender: 'command',
-            command: 'ls',
-            output: 'file.txt',
-            success: true,
-        },
-    ]);
-    t.deepEqual(result.commandMessages, []);
+test('emits approval interruptions and resumes after approval', async t => {
+  const interruption = {
+    name: 'bash',
+    agent: {
+      name: 'CLI Agent'
+    },
+    arguments: JSON.stringify({
+      command: 'echo hi'
+    })
+  };
+  const initialStream = new MockStream([]);
+  initialStream.interruptions = [interruption];
+  initialStream.state = {
+    approveCalls: [],
+    rejectCalls: [],
+    approve(arg) {
+      this.approveCalls.push(arg);
+    },
+    reject(arg) {
+      this.rejectCalls.push(arg);
+    }
+  };
+  const continuationStream = new MockStream([{
+    type: 'response.output_text.delta',
+    delta: 'Approved run'
+  }]);
+  continuationStream.finalOutput = 'Approved run';
+  const mockClient = {
+    async startStream() {
+      return initialStream;
+    },
+    async continueRunStream(state) {
+      t.is(state, initialStream.state);
+      return continuationStream;
+    }
+  };
+  const service = new ConversationService({
+    agentClient: mockClient
+  });
+  const approvalResult = await service.sendMessage('run command');
+  t.is(approvalResult.type, 'approval_required');
+  t.is(approvalResult.approval.toolName, 'bash');
+  t.is(approvalResult.approval.argumentsText, 'echo hi');
+  const finalResult = await service.handleApprovalDecision('y');
+  t.truthy(finalResult);
+  t.is(finalResult.type, 'response');
+  t.is(finalResult.finalText, 'Approved run');
+  t.deepEqual(initialStream.state.approveCalls, [interruption]);
+  t.deepEqual(initialStream.state.rejectCalls, []);
 });
-//# sourceMappingURL=conversation-service.test.js.map
+test('dedupes command messages emitted live from run events', async t => {
+  const commandPayload = JSON.stringify({
+    command: 'ls',
+    stdout: 'file.txt',
+    success: true
+  });
+  const rawItem = {
+    id: 'call-123',
+    type: 'function_call_result',
+    name: 'bash',
+    arguments: JSON.stringify({
+      command: 'ls'
+    })
+  };
+  const commandItem = {
+    type: 'tool_call_output_item',
+    name: 'bash',
+    output: commandPayload,
+    rawItem
+  };
+  const events = [{
+    type: 'run_item_stream_event',
+    item: commandItem
+  }];
+  const stream = new MockStream(events);
+  stream.newItems = [commandItem];
+  const emitted = [];
+  const mockClient = {
+    async startStream() {
+      return stream;
+    }
+  };
+  const service = new ConversationService({
+    agentClient: mockClient
+  });
+  const result = await service.sendMessage('run bash', {
+    onCommandMessage(message) {
+      emitted.push(message);
+    }
+  });
+  t.deepEqual(emitted, [{
+    id: 'call-123',
+    sender: 'command',
+    command: 'ls',
+    output: 'file.txt',
+    success: true
+  }]);
+  t.deepEqual(result.commandMessages, []);
+});

package/dist/services/conversation-session.d.ts

@@ -2,26 +2,9 @@ import type { OpenAIAgentClient } from '../lib/openai-agent-client.js';
 import type { ILoggingService } from './service-interfaces.js';
 import type { ConversationEvent } from './conversation-events.js';
 import type { CommandMessage } from '../tools/types.js';
-import { type NormalizedUsage } from '../utils/token-usage.js';
+import type { ConversationTerminal, ReasoningEffortSetting } from '../contracts/conversation.js';
 export type { CommandMessage };
-interface ApprovalResult {
-    type: 'approval_required';
-    approval: {
-        agentName: string;
-        toolName: string;
-        argumentsText: string;
-        rawInterruption: any;
-        callId?: string;
-    };
-}
-interface ResponseResult {
-    type: 'response';
-    commandMessages: CommandMessage[];
-    finalText: string;
-    reasoningText?: string;
-    usage?: NormalizedUsage;
-}
-export type ConversationResult = ApprovalResult | ResponseResult;
+export type ConversationResult = ConversationTerminal;
 export declare class ConversationSession {
     #private;
     readonly id: string;
@@ -33,10 +16,7 @@ export declare class ConversationSession {
     private textDeltaCount;
     private reasoningDeltaCount;
     private toolCallArgumentsById;
-    private lastEventType;
-    private eventTypeCount;
     private emittedInvalidToolCallPackets;
-    private flushStreamEventLog;
     constructor(id: string, { agentClient, deps }: {
         agentClient: OpenAIAgentClient;
         deps: {
@@ -45,8 +25,8 @@ export declare class ConversationSession {
     });
     reset(): void;
     setModel(model: string): void;
-    setReasoningEffort(effort: any): void;
-    setTemperature(temperature: any): void;
+    setReasoningEffort(effort: ReasoningEffortSetting): void;
+    setTemperature(temperature?: number): void;
     setProvider(provider: string): void;
     setRetryCallback(callback: () => void): void;
     addShellContext(historyText: string): void;

package/dist/services/conversation-session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conversation-session.d.ts","sourceRoot":"","sources":["../../source/services/conversation-session.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"conversation-session.d.ts","sourceRoot":"","sources":["../../source/services/conversation-session.ts"],"names":[],"mappings":"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"}