@qduc/term2 0.7.3 → 0.9.0

package/dist/utils/conversation/message-buffer.js

@@ -0,0 +1,15 @@
+export function appendMessagesCapped(existing, additions, maxMessages) {
+    if (maxMessages <= 0)
+        return [];
+    if (additions.length === 0 && existing.length <= maxMessages) {
+        return existing.slice();
+    }
+    const combinedLength = existing.length + additions.length;
+    if (combinedLength <= maxMessages) {
+        return [...existing, ...additions];
+    }
+    const start = combinedLength - maxMessages;
+    const trimmedExisting = existing.slice(Math.max(0, start - additions.length));
+    return [...trimmedExisting, ...additions].slice(-maxMessages);
+}
+//# sourceMappingURL=message-buffer.js.map

package/dist/utils/conversation/message-buffer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"message-buffer.js","sourceRoot":"","sources":["../../../source/utils/conversation/message-buffer.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,oBAAoB,CAAI,QAAsB,EAAE,SAAuB,EAAE,WAAmB;IAC1G,IAAI,WAAW,IAAI,CAAC;QAAE,OAAO,EAAE,CAAC;IAEhC,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,IAAI,QAAQ,CAAC,MAAM,IAAI,WAAW,EAAE,CAAC;QAC7D,OAAO,QAAQ,CAAC,KAAK,EAAE,CAAC;IAC1B,CAAC;IAED,MAAM,cAAc,GAAG,QAAQ,CAAC,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;IAC1D,IAAI,cAAc,IAAI,WAAW,EAAE,CAAC;QAClC,OAAO,CAAC,GAAG,QAAQ,EAAE,GAAG,SAAS,CAAC,CAAC;IACrC,CAAC;IAED,MAAM,KAAK,GAAG,cAAc,GAAG,WAAW,CAAC;IAC3C,MAAM,eAAe,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;IAC9E,OAAO,CAAC,GAAG,eAAe,EAAE,GAAG,SAAS,CAAC,CAAC,KAAK,CAAC,CAAC,WAAW,CAAC,CAAC;AAChE,CAAC"}

package/dist/utils/conversation/message-buffer.test.d.ts

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

package/dist/utils/conversation/message-buffer.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"message-buffer.test.d.ts","sourceRoot":"","sources":["../../../source/utils/conversation/message-buffer.test.ts"],"names":[],"mappings":""}

package/dist/utils/conversation/message-buffer.test.js

@@ -0,0 +1,17 @@
+import { it, expect } from 'vitest';
+import { appendMessagesCapped } from './message-buffer.js';
+const makeMessages = (count, prefix = 'm') => Array.from({ length: count }, (_, i) => ({ id: i, text: `${prefix}${i}` }));
+it('appendMessagesCapped keeps only the newest messages up to the cap', () => {
+    const prev = makeMessages(3);
+    const next = makeMessages(3, 'n');
+    const result = appendMessagesCapped(prev, next, 4);
+    expect(result.length).toBe(4);
+    expect(result.map((m) => m.text)).toEqual(['m2', 'n0', 'n1', 'n2']);
+});
+it('appendMessagesCapped returns additions when cap is small', () => {
+    const prev = makeMessages(2);
+    const next = makeMessages(2, 'n');
+    const result = appendMessagesCapped(prev, next, 2);
+    expect(result.map((m) => m.text)).toEqual(['n0', 'n1']);
+});
+//# sourceMappingURL=message-buffer.test.js.map

package/dist/utils/conversation/message-buffer.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"message-buffer.test.js","sourceRoot":"","sources":["../../../source/utils/conversation/message-buffer.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAE3D,MAAM,YAAY,GAAG,CAAC,KAAa,EAAE,MAAM,GAAG,GAAG,EAAE,EAAE,CACnD,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,GAAG,MAAM,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;AAE9E,EAAE,CAAC,mEAAmE,EAAE,GAAG,EAAE;IAC3E,MAAM,IAAI,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;IAC7B,MAAM,IAAI,GAAG,YAAY,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAElC,MAAM,MAAM,GAAG,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAEnD,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC9B,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;AACtE,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,0DAA0D,EAAE,GAAG,EAAE;IAClE,MAAM,IAAI,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;IAC7B,MAAM,IAAI,GAAG,YAAY,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAElC,MAAM,MAAM,GAAG,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAEnD,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;AAC1D,CAAC,CAAC,CAAC"}

package/dist/utils/conversation/message-utils.d.ts

@@ -0,0 +1,36 @@
+import type { CommandMessage } from '../../tools/types.js';
+import type { Message } from '../../types/message.js';
+/**
+ * Get the text content of the final assistant response, combining contiguous
+ * bot messages into a single string. Returns null if no bot messages exist.
+ */
+export declare function getLastFinalAssistantText(messages: Message[]): string | null;
+/**
+ * Deduplicate new command messages against existing UI messages and clean up
+ * stale running/pending messages that are about to be replaced by completed ones.
+ *
+ * Two phases:
+ * 1. Filter newCommands to exclude any whose callId already appears in prev
+ *    (streaming replaces the running message in place, so those are already shown).
+ * 2. Remove stale running/pending messages from prev whose callId matches a
+ *    completed command in newCommands (e.g. after a denied tool where a "running"
+ *    message was shown during streaming but the final result never cleaned it up).
+ */
+export declare function mergeCommandMessages(prev: Message[], newCommands: CommandMessage[]): Message[];
+/**
+ * Find the index of the last user message that was not consumed for abort.
+ * Returns -1 if no undoable user message exists.
+ */
+export declare function findLastUndoableUserMessage(messages: Message[]): number;
+/**
+ * Count how many undoable user turns exist at or after startIndex.
+ */
+export declare function countUndoableUserTurnsFrom(messages: Message[], startIndex: number): number;
+/**
+ * Return all undoable user messages with their UI indices and text.
+ */
+export declare function getUserMessageEntries(messages: Message[]): Array<{
+    uiIndex: number;
+    text: string;
+}>;
+//# sourceMappingURL=message-utils.d.ts.map

package/dist/utils/conversation/message-utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"message-utils.d.ts","sourceRoot":"","sources":["../../../source/utils/conversation/message-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAGtD;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,MAAM,GAAG,IAAI,CA2B5E;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,WAAW,EAAE,cAAc,EAAE,GAAG,OAAO,EAAE,CAsB9F;AAED;;;GAGG;AACH,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,MAAM,CAQvE;AAED;;GAEG;AACH,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAS1F;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CASnG"}

package/dist/utils/conversation/message-utils.js

@@ -0,0 +1,105 @@
+import { isCommandMessage, isUserMessage } from '../../types/message.js';
+/**
+ * Get the text content of the final assistant response, combining contiguous
+ * bot messages into a single string. Returns null if no bot messages exist.
+ */
+export function getLastFinalAssistantText(messages) {
+    let lastBotIndex = -1;
+    for (let index = messages.length - 1; index >= 0; index--) {
+        const message = messages[index];
+        if (message?.sender === 'bot' && typeof message.text === 'string' && message.text.length > 0) {
+            lastBotIndex = index;
+            break;
+        }
+    }
+    if (lastBotIndex === -1) {
+        return null;
+    }
+    const texts = [];
+    for (let index = lastBotIndex; index >= 0; index--) {
+        const message = messages[index];
+        if (message?.sender === 'bot') {
+            if (typeof message.text === 'string') {
+                texts.unshift(message.text);
+            }
+        }
+        else {
+            break;
+        }
+    }
+    return texts.join('').trim() || null;
+}
+/**
+ * Deduplicate new command messages against existing UI messages and clean up
+ * stale running/pending messages that are about to be replaced by completed ones.
+ *
+ * Two phases:
+ * 1. Filter newCommands to exclude any whose callId already appears in prev
+ *    (streaming replaces the running message in place, so those are already shown).
+ * 2. Remove stale running/pending messages from prev whose callId matches a
+ *    completed command in newCommands (e.g. after a denied tool where a "running"
+ *    message was shown during streaming but the final result never cleaned it up).
+ */
+export function mergeCommandMessages(prev, newCommands) {
+    // Phase 1: collect callIds already shown in the UI
+    const existingCommandCallIds = new Set();
+    for (const msg of prev) {
+        if (isCommandMessage(msg) && msg.callId) {
+            existingCommandCallIds.add(msg.callId);
+        }
+    }
+    const deduped = newCommands.filter((msg) => !msg.callId || !existingCommandCallIds.has(msg.callId));
+    // Phase 2: remove stale running/pending messages that will be replaced
+    const completedCallIds = new Set(deduped.filter((m) => m.callId).map((m) => m.callId));
+    if (completedCallIds.size === 0) {
+        return [...prev, ...deduped];
+    }
+    const cleaned = prev.filter((msg) => {
+        if (!isCommandMessage(msg))
+            return true;
+        if (msg.status !== 'running' && msg.status !== 'pending')
+            return true;
+        return !msg.callId || !completedCallIds.has(msg.callId);
+    });
+    return [...cleaned, ...deduped];
+}
+/**
+ * Find the index of the last user message that was not consumed for abort.
+ * Returns -1 if no undoable user message exists.
+ */
+export function findLastUndoableUserMessage(messages) {
+    for (let i = messages.length - 1; i >= 0; i--) {
+        const m = messages[i];
+        if (isUserMessage(m) && !m.consumedForAbort) {
+            return i;
+        }
+    }
+    return -1;
+}
+/**
+ * Count how many undoable user turns exist at or after startIndex.
+ */
+export function countUndoableUserTurnsFrom(messages, startIndex) {
+    let count = 0;
+    for (let i = startIndex; i < messages.length; i++) {
+        const m = messages[i];
+        if (isUserMessage(m) && !m.consumedForAbort) {
+            count++;
+        }
+    }
+    return count;
+}
+/**
+ * Return all undoable user messages with their UI indices and text.
+ */
+export function getUserMessageEntries(messages) {
+    const result = [];
+    for (let i = 0; i < messages.length; i++) {
+        const m = messages[i];
+        if (isUserMessage(m) && !m.consumedForAbort) {
+            result.push({ uiIndex: i, text: m.text });
+        }
+    }
+    return result;
+}
+//# sourceMappingURL=message-utils.js.map

package/dist/utils/conversation/message-utils.js.map

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

package/dist/utils/conversation/message-utils.test.d.ts

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

package/dist/utils/conversation/message-utils.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"message-utils.test.d.ts","sourceRoot":"","sources":["../../../source/utils/conversation/message-utils.test.ts"],"names":[],"mappings":""}

package/dist/utils/conversation/message-utils.test.js

@@ -0,0 +1,167 @@
+import { it, expect } from 'vitest';
+import { countUndoableUserTurnsFrom, findLastUndoableUserMessage, getLastFinalAssistantText, getUserMessageEntries, mergeCommandMessages, } from './message-utils.js';
+// ---------------------------------------------------------------------------
+// getLastFinalAssistantText
+// ---------------------------------------------------------------------------
+it('getLastFinalAssistantText returns null for empty list', () => {
+    expect(getLastFinalAssistantText([])).toBe(null);
+});
+it('getLastFinalAssistantText returns last bot message text', () => {
+    const messages = [
+        { id: '1', sender: 'user', text: 'hello' },
+        { id: '2', sender: 'bot', text: 'world', status: 'finalized' },
+    ];
+    expect(getLastFinalAssistantText(messages)).toBe('world');
+});
+it('getLastFinalAssistantText combines contiguous bot messages', () => {
+    const messages = [
+        { id: '1', sender: 'bot', text: 'hello ', status: 'finalized' },
+        { id: '2', sender: 'bot', text: 'world', status: 'finalized' },
+    ];
+    expect(getLastFinalAssistantText(messages)).toBe('hello world');
+});
+// ---------------------------------------------------------------------------
+// mergeCommandMessages
+// ---------------------------------------------------------------------------
+function cmd(id, callId, status = 'completed') {
+    return {
+        id,
+        sender: 'command',
+        status,
+        command: `cmd-${id}`,
+        output: '',
+        callId,
+    };
+}
+function userMsg(id, text) {
+    return { id, sender: 'user', text };
+}
+function botMsg(id, text) {
+    return { id, sender: 'bot', text, status: 'finalized' };
+}
+it('mergeCommandMessages appends new commands when no overlap', () => {
+    const prev = [userMsg('u1', 'hi')];
+    const newCmds = [cmd('c1', 'call-1')];
+    const result = mergeCommandMessages(prev, newCmds);
+    expect(result.length).toBe(2);
+    expect(result[0].sender).toBe('user');
+    expect(result[1].sender).toBe('command');
+});
+it('mergeCommandMessages filters commands whose callId already exists in prev', () => {
+    const prev = [cmd('existing', 'call-1')];
+    const newCmds = [cmd('dup', 'call-1'), cmd('new', 'call-2')];
+    const result = mergeCommandMessages(prev, newCmds);
+    // existing stays, dup is filtered, new is added
+    const commands = result.filter((m) => m.sender === 'command');
+    expect(commands.length).toBe(2);
+    expect(commands[0].id).toBe('existing');
+    expect(commands[1].id).toBe('new');
+});
+it('mergeCommandMessages keeps running messages when new command has same callId (Phase 1 dedup)', () => {
+    // When a completed command has the same callId as an existing running message,
+    // Phase 1 filters out the new command (already shown), and Phase 2 only
+    // cleans stale messages whose callId matches commands that survived Phase 1.
+    const staleRunning = { ...cmd('stale', 'call-1', 'running') };
+    const prev = [userMsg('u1', 'hi'), staleRunning];
+    const newCmds = [cmd('done', 'call-1', 'completed')];
+    const result = mergeCommandMessages(prev, newCmds);
+    // stale running stays, completed filtered out by Phase 1
+    const commands = result.filter((m) => m.sender === 'command');
+    expect(commands.length).toBe(1);
+    expect(commands[0].id).toBe('stale');
+});
+it('mergeCommandMessages removes stale running messages when a different new command arrives', () => {
+    // Phase 2 removes stale running/pending messages from prev when a new
+    // command with a different callId arrives, cleaning up orphaned streaming messages.
+    const staleRunning = { ...cmd('stale', 'call-1', 'running') };
+    const prev = [userMsg('u1', 'hi'), staleRunning];
+    // new command has a different callId that doesn't exist in prev
+    const newCmds = [cmd('done', 'call-2', 'completed')];
+    const result = mergeCommandMessages(prev, newCmds);
+    const commands = result.filter((m) => m.sender === 'command');
+    // stale running stays because its callId 'call-1' is not in completedCallIds ('call-2')
+    expect(commands.length).toBe(2);
+});
+it('mergeCommandMessages does not remove completed/stale messages with different callIds', () => {
+    const other = { ...cmd('other', 'call-99', 'completed') };
+    const prev = [other];
+    const newCmds = [cmd('done', 'call-1', 'completed')];
+    const result = mergeCommandMessages(prev, newCmds);
+    const commands = result.filter((m) => m.sender === 'command');
+    expect(commands.length).toBe(2);
+});
+it('mergeCommandMessages handles commands without callId', () => {
+    const prev = [cmd('existing')]; // no callId
+    const newCmds = [cmd('new')]; // no callId
+    const result = mergeCommandMessages(prev, newCmds);
+    const commands = result.filter((m) => m.sender === 'command');
+    // Both kept since neither has a callId to dedup on
+    expect(commands.length).toBe(2);
+});
+// ---------------------------------------------------------------------------
+// findLastUndoableUserMessage
+// ---------------------------------------------------------------------------
+it('findLastUndoableUserMessage returns -1 for empty list', () => {
+    expect(findLastUndoableUserMessage([])).toBe(-1);
+});
+it('findLastUndoableUserMessage returns last user message index', () => {
+    const messages = [userMsg('u1', 'first'), botMsg('b1', 'reply'), userMsg('u2', 'second')];
+    expect(findLastUndoableUserMessage(messages)).toBe(2);
+});
+it('findLastUndoableUserMessage skips consumedForAbort messages', () => {
+    const messages = [
+        userMsg('u1', 'first'),
+        botMsg('b1', 'reply'),
+        { id: 'u2', sender: 'user', text: 'consumed', consumedForAbort: true },
+    ];
+    expect(findLastUndoableUserMessage(messages)).toBe(0);
+});
+it('findLastUndoableUserMessage returns -1 when all user messages are consumed', () => {
+    const messages = [
+        { id: 'u1', sender: 'user', text: 'consumed', consumedForAbort: true },
+        botMsg('b1', 'reply'),
+    ];
+    expect(findLastUndoableUserMessage(messages)).toBe(-1);
+});
+// ---------------------------------------------------------------------------
+// countUndoableUserTurnsFrom
+// ---------------------------------------------------------------------------
+it('countUndoableUserTurnsFrom counts from startIndex', () => {
+    const messages = [userMsg('u1', 'a'), userMsg('u2', 'b'), userMsg('u3', 'c')];
+    expect(countUndoableUserTurnsFrom(messages, 1)).toBe(2);
+    expect(countUndoableUserTurnsFrom(messages, 0)).toBe(3);
+});
+it('countUndoableUserTurnsFrom skips consumedForAbort', () => {
+    const messages = [
+        userMsg('u1', 'a'),
+        { id: 'u2', sender: 'user', text: 'consumed', consumedForAbort: true },
+        userMsg('u3', 'c'),
+    ];
+    expect(countUndoableUserTurnsFrom(messages, 0)).toBe(2);
+});
+it('countUndoableUserTurnsFrom returns 0 for empty range', () => {
+    expect(countUndoableUserTurnsFrom([], 0)).toBe(0);
+});
+// ---------------------------------------------------------------------------
+// getUserMessageEntries
+// ---------------------------------------------------------------------------
+it('getUserMessageEntries returns user messages with indices', () => {
+    const messages = [userMsg('u1', 'hello'), botMsg('b1', 'hi'), userMsg('u2', 'bye')];
+    const entries = getUserMessageEntries(messages);
+    expect(entries).toEqual([
+        { uiIndex: 0, text: 'hello' },
+        { uiIndex: 2, text: 'bye' },
+    ]);
+});
+it('getUserMessageEntries excludes consumedForAbort messages', () => {
+    const messages = [
+        userMsg('u1', 'hello'),
+        { id: 'u2', sender: 'user', text: 'consumed', consumedForAbort: true },
+    ];
+    const entries = getUserMessageEntries(messages);
+    expect(entries).toEqual([{ uiIndex: 0, text: 'hello' }]);
+});
+it('getUserMessageEntries returns empty array for no user messages', () => {
+    expect(getUserMessageEntries([botMsg('b1', 'hi')])).toEqual([]);
+});
+//# sourceMappingURL=message-utils.test.js.map

package/dist/utils/conversation/message-utils.test.js.map

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

package/dist/utils/conversation/test-helpers/event-handler-fixtures.d.ts

@@ -0,0 +1,31 @@
+import type { ConversationEventHandlerDeps } from '../conversation-event-handler.js';
+export interface MockDeps extends ConversationEventHandlerDeps {
+    botResponseUpdater: {
+        push: (text: string) => void;
+        cancel: () => void;
+        flush: () => void;
+    };
+    reasoningUpdater: {
+        push: (text: string) => void;
+        cancel: () => void;
+        flush: () => void;
+    };
+    appendMessages: (messages: any[]) => void;
+    setMessages: (updater: (prev: any[]) => any[]) => void;
+    createMessageId: () => string;
+    trimMessages: (messages: any[]) => any[];
+    annotateCommandMessage: (msg: any) => any;
+}
+export declare function createMockDeps(): MockDeps & {
+    calls: {
+        botResponsePushes: string[];
+        botResponseCancelled: boolean;
+        botResponseFlushed: boolean;
+        reasoningPushes: string[];
+        reasoningFlushed: boolean;
+        reasoningCancelled: boolean;
+        appendedMessages: any[][];
+        setMessagesCalls: Array<(prev: any[]) => any[]>;
+    };
+};
+//# sourceMappingURL=event-handler-fixtures.d.ts.map

package/dist/utils/conversation/test-helpers/event-handler-fixtures.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"event-handler-fixtures.d.ts","sourceRoot":"","sources":["../../../../source/utils/conversation/test-helpers/event-handler-fixtures.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,kCAAkC,CAAC;AAErF,MAAM,WAAW,QAAS,SAAQ,4BAA4B;IAC5D,kBAAkB,EAAE;QAAE,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;QAAC,MAAM,EAAE,MAAM,IAAI,CAAC;QAAC,KAAK,EAAE,MAAM,IAAI,CAAA;KAAE,CAAC;IAC5F,gBAAgB,EAAE;QAAE,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;QAAC,MAAM,EAAE,MAAM,IAAI,CAAC;QAAC,KAAK,EAAE,MAAM,IAAI,CAAA;KAAE,CAAC;IAC1F,cAAc,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;IAC1C,WAAW,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,EAAE,KAAK,IAAI,CAAC;IACvD,eAAe,EAAE,MAAM,MAAM,CAAC;IAC9B,YAAY,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,KAAK,GAAG,EAAE,CAAC;IACzC,sBAAsB,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,GAAG,CAAC;CAC3C;AAED,wBAAgB,cAAc,IAAI,QAAQ,GAAG;IAC3C,KAAK,EAAE;QACL,iBAAiB,EAAE,MAAM,EAAE,CAAC;QAC5B,oBAAoB,EAAE,OAAO,CAAC;QAC9B,kBAAkB,EAAE,OAAO,CAAC;QAC5B,eAAe,EAAE,MAAM,EAAE,CAAC;QAC1B,gBAAgB,EAAE,OAAO,CAAC;QAC1B,kBAAkB,EAAE,OAAO,CAAC;QAC5B,gBAAgB,EAAE,GAAG,EAAE,EAAE,CAAC;QAC1B,gBAAgB,EAAE,KAAK,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,EAAE,CAAC,CAAC;KACjD,CAAC;CACH,CAyCA"}

package/dist/utils/conversation/test-helpers/event-handler-fixtures.js

@@ -0,0 +1,42 @@
+export function createMockDeps() {
+    const calls = {
+        botResponsePushes: [],
+        botResponseCancelled: false,
+        botResponseFlushed: false,
+        reasoningPushes: [],
+        reasoningFlushed: false,
+        reasoningCancelled: false,
+        appendedMessages: [],
+        setMessagesCalls: [],
+    };
+    return {
+        calls,
+        createMessageId: (() => {
+            let seq = 0;
+            return () => `msg-${seq++}`;
+        })(),
+        botResponseUpdater: {
+            push: (text) => calls.botResponsePushes.push(text),
+            cancel: () => {
+                calls.botResponseCancelled = true;
+            },
+            flush: () => {
+                calls.botResponseFlushed = true;
+            },
+        },
+        reasoningUpdater: {
+            push: (text) => calls.reasoningPushes.push(text),
+            cancel: () => {
+                calls.reasoningCancelled = true;
+            },
+            flush: () => {
+                calls.reasoningFlushed = true;
+            },
+        },
+        appendMessages: (messages) => calls.appendedMessages.push(messages),
+        setMessages: (updater) => calls.setMessagesCalls.push(updater),
+        trimMessages: (messages) => messages,
+        annotateCommandMessage: (msg) => ({ ...msg, annotated: true }),
+    };
+}
+//# sourceMappingURL=event-handler-fixtures.js.map

package/dist/utils/conversation/test-helpers/event-handler-fixtures.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"event-handler-fixtures.js","sourceRoot":"","sources":["../../../../source/utils/conversation/test-helpers/event-handler-fixtures.ts"],"names":[],"mappings":"AAYA,MAAM,UAAU,cAAc;IAY5B,MAAM,KAAK,GAAG;QACZ,iBAAiB,EAAE,EAAc;QACjC,oBAAoB,EAAE,KAAK;QAC3B,kBAAkB,EAAE,KAAK;QACzB,eAAe,EAAE,EAAc;QAC/B,gBAAgB,EAAE,KAAK;QACvB,kBAAkB,EAAE,KAAK;QACzB,gBAAgB,EAAE,EAAa;QAC/B,gBAAgB,EAAE,EAAmC;KACtD,CAAC;IAEF,OAAO;QACL,KAAK;QACL,eAAe,EAAE,CAAC,GAAG,EAAE;YACrB,IAAI,GAAG,GAAG,CAAC,CAAC;YACZ,OAAO,GAAG,EAAE,CAAC,OAAO,GAAG,EAAE,EAAE,CAAC;QAC9B,CAAC,CAAC,EAAE;QACJ,kBAAkB,EAAE;YAClB,IAAI,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,KAAK,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC;YAC1D,MAAM,EAAE,GAAG,EAAE;gBACX,KAAK,CAAC,oBAAoB,GAAG,IAAI,CAAC;YACpC,CAAC;YACD,KAAK,EAAE,GAAG,EAAE;gBACV,KAAK,CAAC,kBAAkB,GAAG,IAAI,CAAC;YAClC,CAAC;SACF;QACD,gBAAgB,EAAE;YAChB,IAAI,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC;YACxD,MAAM,EAAE,GAAG,EAAE;gBACX,KAAK,CAAC,kBAAkB,GAAG,IAAI,CAAC;YAClC,CAAC;YACD,KAAK,EAAE,GAAG,EAAE;gBACV,KAAK,CAAC,gBAAgB,GAAG,IAAI,CAAC;YAChC,CAAC;SACF;QACD,cAAc,EAAE,CAAC,QAAe,EAAE,EAAE,CAAC,KAAK,CAAC,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC;QAC1E,WAAW,EAAE,CAAC,OAA+B,EAAE,EAAE,CAAC,KAAK,CAAC,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC;QACtF,YAAY,EAAE,CAAC,QAAe,EAAE,EAAE,CAAC,QAAQ;QAC3C,sBAAsB,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;KACpE,CAAC;AACJ,CAAC"}

package/dist/utils/conversation-event-handler.d.ts

@@ -3,7 +3,7 @@
  * Extracted from use-conversation.ts to enable testing.
  */
 import type { ConversationEvent } from '../services/conversation-events.js';
-import type { CommandMessage } from '../tools/types.js';
+import type { CommandMessage, Message } from '../types/message.js';
 import { type StreamingState } from './conversation-utils.js';
 /**
  * Finds the last safe Markdown block boundary in the text after the search start index.
@@ -11,42 +11,7 @@ import { type StreamingState } from './conversation-utils.js';
  * while strictly avoiding breaking inside an open code block.
  */
 export declare function findLastSafeBoundary(fullText: string, searchStartIndex: number): number;
-/**
- * Message types used by the event handler.
- */
-export interface BotMessage {
-    id: string;
-    sender: 'bot';
-    text: string;
-    status?: 'streaming' | 'finalized';
-}
-export interface SystemMessage {
-    id: string;
-    sender: 'system';
-    text: string;
-}
-export interface ReasoningMessage {
-    id: string;
-    sender: 'reasoning';
-    text: string;
-    status?: 'finalized';
-}
-export interface SubagentActivityMessage {
-    id: string;
-    sender: 'subagent';
-    status: 'running' | 'completed' | 'failed' | 'cancelled';
-    agentId: string;
-    role: string;
-    task: string;
-    tools: string[];
-}
-export type UIMessage = {
-    id: string | number;
-    sender: string;
-    callId?: string;
-    status?: string;
-};
-export interface ConversationEventHandlerDeps<MessageT extends UIMessage = UIMessage, CommandMessageT extends CommandMessage = CommandMessage> {
+export interface ConversationEventHandlerDeps {
     botResponseUpdater: {
         push: (text: string) => void;
         cancel: () => void;
@@ -57,11 +22,12 @@ export interface ConversationEventHandlerDeps<MessageT extends UIMessage = UIMes
         cancel: () => void;
         flush: () => void;
     };
-    appendMessages: (messages: MessageT[]) => void;
-    setMessages: (updater: (prev: MessageT[]) => MessageT[]) => void;
+    appendMessages: (messages: Message[]) => void;
+    setMessages: (updater: (prev: Message[]) => Message[]) => void;
     createMessageId: () => string;
-    trimMessages: (messages: MessageT[]) => MessageT[];
-    annotateCommandMessage: (msg: CommandMessageT) => CommandMessageT;
+    trimMessages: (messages: Message[]) => Message[];
+    annotateCommandMessage: (msg: CommandMessage) => CommandMessage;
+    getMessages?: () => Message[];
 }
 /**
  * Create a conversation event handler that processes streaming events.
@@ -71,5 +37,5 @@ export interface ConversationEventHandlerDeps<MessageT extends UIMessage = UIMes
  * @param state - Mutable streaming state object
  * @returns Event handler function
  */
-export declare function createConversationEventHandler<MessageT extends UIMessage = UIMessage, CommandMessageT extends CommandMessage = CommandMessage>(deps: ConversationEventHandlerDeps<MessageT, CommandMessageT>, state: StreamingState): (event: ConversationEvent) => void;
+export declare function createConversationEventHandler(deps: ConversationEventHandlerDeps, state: StreamingState): (event: ConversationEvent) => void;
 //# sourceMappingURL=conversation-event-handler.d.ts.map

package/dist/utils/conversation-event-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conversation-event-handler.d.ts","sourceRoot":"","sources":["../../source/utils/conversation-event-handler.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAyC,KAAK,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAErG;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,GAAG,MAAM,CAsCvF;AAED;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,KAAK,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,WAAW,GAAG,WAAW,CAAC;CACpC;AAED,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,QAAQ,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,gBAAgB;IAC/B,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,WAAW,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED,MAAM,WAAW,uBAAuB;IACtC,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,UAAU,CAAC;IACnB,MAAM,EAAE,SAAS,GAAG,WAAW,GAAG,QAAQ,GAAG,WAAW,CAAC;IACzD,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,WAAW,4BAA4B,CAC3C,QAAQ,SAAS,SAAS,GAAG,SAAS,EACtC,eAAe,SAAS,cAAc,GAAG,cAAc;IAEvD,kBAAkB,EAAE;QAClB,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;QAC7B,MAAM,EAAE,MAAM,IAAI,CAAC;QACnB,KAAK,EAAE,MAAM,IAAI,CAAC;KACnB,CAAC;IACF,gBAAgB,EAAE;QAChB,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;QAC7B,MAAM,EAAE,MAAM,IAAI,CAAC;QACnB,KAAK,EAAE,MAAM,IAAI,CAAC;KACnB,CAAC;IACF,cAAc,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,IAAI,CAAC;IAC/C,WAAW,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,QAAQ,EAAE,KAAK,IAAI,CAAC;IACjE,eAAe,EAAE,MAAM,MAAM,CAAC;IAC9B,YAAY,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,QAAQ,EAAE,CAAC;IACnD,sBAAsB,EAAE,CAAC,GAAG,EAAE,eAAe,KAAK,eAAe,CAAC;CACnE;AAED;;;;;;;GAOG;AACH,wBAAgB,8BAA8B,CAC5C,QAAQ,SAAS,SAAS,GAAG,SAAS,EACtC,eAAe,SAAS,cAAc,GAAG,cAAc,EAEvD,IAAI,EAAE,4BAA4B,CAAC,QAAQ,EAAE,eAAe,CAAC,EAC7D,KAAK,EAAE,cAAc,GACpB,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAqZpC"}
+{"version":3,"file":"conversation-event-handler.d.ts","sourceRoot":"","sources":["../../source/utils/conversation-event-handler.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,KAAK,EAEV,cAAc,EACd,OAAO,EAIR,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAyC,KAAK,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAErG;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,GAAG,MAAM,CAsCvF;AAWD,MAAM,WAAW,4BAA4B;IAC3C,kBAAkB,EAAE;QAClB,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;QAC7B,MAAM,EAAE,MAAM,IAAI,CAAC;QACnB,KAAK,EAAE,MAAM,IAAI,CAAC;KACnB,CAAC;IACF,gBAAgB,EAAE;QAChB,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;QAC7B,MAAM,EAAE,MAAM,IAAI,CAAC;QACnB,KAAK,EAAE,MAAM,IAAI,CAAC;KACnB,CAAC;IACF,cAAc,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;IAC9C,WAAW,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,IAAI,CAAC;IAC/D,eAAe,EAAE,MAAM,MAAM,CAAC;IAC9B,YAAY,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,OAAO,EAAE,CAAC;IACjD,sBAAsB,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,cAAc,CAAC;IAChE,WAAW,CAAC,EAAE,MAAM,OAAO,EAAE,CAAC;CAC/B;AAED;;;;;;;GAOG;AACH,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,4BAA4B,EAClC,KAAK,EAAE,cAAc,GACpB,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CA0jBpC"}