@qduc/term2 0.1.5 → 0.1.7

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

@@ -1,190 +1,156 @@
 import test from 'ava';
-import { ConversationService } from '../../dist/services/conversation-service.js';
+import { ConversationService } from './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 = '';
     }
-  }
-}
-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
-      });
+    async *[Symbol.asyncIterator]() {
+        for (const event of this.events) {
+            yield event;
+        }
     }
-  });
-  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 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('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 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('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('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('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, []);
+});
+//# sourceMappingURL=conversation-service.test.js.map

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

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

package/dist/services/conversation-session-reasoning.test.js

@@ -15,7 +15,7 @@ test('ConversationSession extracts reasoning_content from stream', async (t) =>
                                     delta: {
                                         reasoning_content: 'think',
                                     },
-                                }
+                                },
                             ],
                         },
                     },
@@ -29,7 +29,7 @@ test('ConversationSession extracts reasoning_content from stream', async (t) =>
                                     delta: {
                                         reasoning_content: 'ing',
                                     },
-                                }
+                                },
                             ],
                         },
                     },
@@ -53,7 +53,7 @@ test('ConversationSession extracts reasoning_content from stream', async (t) =>
     for await (const event of session.run('hi')) {
         events.push(event);
     }
-    const reasoningEvents = events.filter(e => e.type === 'reasoning_delta');
+    const reasoningEvents = events.filter((e) => e.type === 'reasoning_delta');
     t.is(reasoningEvents.length, 2);
     t.is(reasoningEvents[0].delta, 'think');
     t.is(reasoningEvents[1].delta, 'ing');

package/dist/services/conversation-session-reasoning.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"conversation-session-reasoning.test.js","sourceRoot":"","sources":["../../source/services/conversation-session-reasoning.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,KAAK,CAAC;AACvB,OAAO,EAAC,mBAAmB,EAAC,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAC,cAAc,EAAC,MAAM,sBAAsB,CAAC;AAEpD,MAAM,MAAM,GAAG,IAAI,cAAc,CAAC,EAAC,cAAc,EAAE,IAAI,EAAC,CAAC,CAAC;AAE1D,IAAI,CAAC,4DAA4D,EAAE,KAAK,EAAC,CAAC,EAAC,EAAE;IACzE,MAAM,eAAe,GAAQ;QACzB,WAAW,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC;YACtB,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,KAAK,SAAS,CAAC;gBACnC,MAAM;oBACF,IAAI,EAAE;wBACF,IAAI,EAAE,OAAO;wBACb,KAAK,EAAE;4BACH,OAAO,EAAE;gCACL;oCACI,KAAK,EAAE;wCACH,iBAAiB,EAAE,OAAO;qCAC7B;iCACJ;6BACJ;yBACJ;qBACJ;iBACJ,CAAC;gBACF,MAAM;oBACF,IAAI,EAAE;wBACF,IAAI,EAAE,OAAO;wBACb,KAAK,EAAE;4BACH,OAAO,EAAE;gCACL;oCACI,KAAK,EAAE;wCACH,iBAAiB,EAAE,KAAK;qCAC3B;iCACJ;6BACJ;yBACJ;qBACJ;iBACJ,CAAC;gBACF,MAAM;oBACF,IAAI,EAAE,YAAY;oBAClB,KAAK,EAAE,IAAI;iBACd,CAAC;gBACF,MAAM;oBACF,IAAI,EAAE,OAAO;iBAChB,CAAC;YACN,CAAC;YACD,cAAc,EAAE,QAAQ;SAC3B,CAAC;KACL,CAAC;IAEF,MAAM,OAAO,GAAG,IAAI,mBAAmB,CAAC,cAAc,EAAE;QACpD,WAAW,EAAE,eAAe;QAC5B,IAAI,EAAE,EAAC,MAAM,EAAC;KACV,CAAC,CAAC;IAEV,MAAM,MAAM,GAAU,EAAE,CAAC;IACzB,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;QAC1C,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC;IAED,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,iBAAiB,CAAC,CAAC;IACzE,CAAC,CAAC,EAAE,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAChC,CAAC,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACxC,CAAC,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IACtC,CAAC,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;AAClD,CAAC,CAAC,CAAC"}
+{"version":3,"file":"conversation-session-reasoning.test.js","sourceRoot":"","sources":["../../source/services/conversation-session-reasoning.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,KAAK,CAAC;AACvB,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,MAAM,MAAM,GAAG,IAAI,cAAc,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC;AAE5D,IAAI,CAAC,4DAA4D,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IAC7E,MAAM,eAAe,GAAQ;QAC3B,WAAW,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC;YACxB,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,KAAK,SAAS,CAAC;gBACrC,MAAM;oBACJ,IAAI,EAAE;wBACJ,IAAI,EAAE,OAAO;wBACb,KAAK,EAAE;4BACL,OAAO,EAAE;gCACP;oCACE,KAAK,EAAE;wCACL,iBAAiB,EAAE,OAAO;qCAC3B;iCACF;6BACF;yBACF;qBACF;iBACF,CAAC;gBACF,MAAM;oBACJ,IAAI,EAAE;wBACJ,IAAI,EAAE,OAAO;wBACb,KAAK,EAAE;4BACL,OAAO,EAAE;gCACP;oCACE,KAAK,EAAE;wCACL,iBAAiB,EAAE,KAAK;qCACzB;iCACF;6BACF;yBACF;qBACF;iBACF,CAAC;gBACF,MAAM;oBACJ,IAAI,EAAE,YAAY;oBAClB,KAAK,EAAE,IAAI;iBACZ,CAAC;gBACF,MAAM;oBACJ,IAAI,EAAE,OAAO;iBACd,CAAC;YACJ,CAAC;YACD,cAAc,EAAE,QAAQ;SACzB,CAAC;KACH,CAAC;IAEF,MAAM,OAAO,GAAG,IAAI,mBAAmB,CAAC,cAAc,EAAE;QACtD,WAAW,EAAE,eAAe;QAC5B,IAAI,EAAE,EAAE,MAAM,EAAE;KACV,CAAC,CAAC;IAEV,MAAM,MAAM,GAAU,EAAE,CAAC;IACzB,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;QAC5C,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACrB,CAAC;IAED,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,iBAAiB,CAAC,CAAC;IAC3E,CAAC,CAAC,EAAE,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAChC,CAAC,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACxC,CAAC,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IACtC,CAAC,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;AAChD,CAAC,CAAC,CAAC"}

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

@@ -1,7 +1,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';
+export type { CommandMessage };
 interface ApprovalResult {
     type: 'approval_required';
     approval: {
@@ -12,19 +14,6 @@ interface ApprovalResult {
         callId?: string;
     };
 }
-export interface CommandMessage {
-    id: string;
-    sender: 'command';
-    status: 'pending' | 'running' | 'completed' | 'failed';
-    command: string;
-    output: string;
-    success?: boolean;
-    failureReason?: string;
-    isApprovalRejection?: boolean;
-    callId?: string;
-    toolName?: string;
-    toolArgs?: any;
-}
 interface ResponseResult {
     type: 'response';
     commandMessages: CommandMessage[];
@@ -40,15 +29,15 @@ export declare class ConversationSession {
     private logger;
     private conversationStore;
     private previousResponseId;
-    private pendingApprovalContext;
-    private abortedApprovalContext;
+    private approvalState;
     private textDeltaCount;
     private reasoningDeltaCount;
     private toolCallArgumentsById;
     private lastEventType;
     private eventTypeCount;
+    private emittedInvalidToolCallPackets;
     private flushStreamEventLog;
-    constructor(id: string, { agentClient, deps, }: {
+    constructor(id: string, { agentClient, deps }: {
         agentClient: OpenAIAgentClient;
         deps: {
             logger: ILoggingService;
@@ -97,5 +86,4 @@ export declare class ConversationSession {
         onEvent?: (event: ConversationEvent) => void;
     }): Promise<ConversationResult | null>;
 }
-export {};
 //# sourceMappingURL=conversation-session.d.ts.map

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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"}