@qduc/term2 0.7.3 → 0.9.0

package/dist/services/generation-guard.test.d.ts

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

package/dist/services/generation-guard.test.d.ts.map

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

package/dist/services/generation-guard.test.js

@@ -0,0 +1,404 @@
+import { it, expect } from 'vitest';
+import { GenerationGuard } from './generation-guard.js';
+import { createConversationSessionComposition } from './session/session-composition.js';
+import { TurnItemAccumulator } from './session/turn-item-accumulator.js';
+import { MockStream } from './test-helpers/mock-stream.js';
+it('capture returns a token and increments generation', () => {
+    const guard = new GenerationGuard();
+    const token = guard.capture();
+    expect(token).toBe(1);
+    expect(guard.currentGeneration).toBe(1);
+});
+it('isCurrent returns true for the latest token', () => {
+    const guard = new GenerationGuard();
+    const token = guard.capture();
+    expect(guard.isCurrent(token)).toBe(true);
+});
+it('isCurrent returns false for an older token', () => {
+    const guard = new GenerationGuard();
+    const token1 = guard.capture();
+    guard.capture();
+    expect(guard.isCurrent(token1)).toBe(false);
+});
+it('isCurrent returns true for zero token when generation is zero', () => {
+    const guard = new GenerationGuard();
+    expect(guard.isCurrent(0)).toBe(true);
+});
+it('invalidate bumps generation and invalidates prior tokens', () => {
+    const guard = new GenerationGuard();
+    const token1 = guard.capture();
+    guard.invalidate();
+    expect(guard.isCurrent(token1)).toBe(false);
+    expect(guard.currentGeneration).toBe(2);
+});
+it('runIfCurrent executes mutation when token is current', () => {
+    const guard = new GenerationGuard();
+    const token = guard.capture();
+    let called = false;
+    const result = guard.runIfCurrent(token, () => {
+        called = true;
+        return 'ok';
+    });
+    expect(called).toBe(true);
+    expect(result).toBe(true);
+});
+it('runIfCurrent skips mutation when token is stale', () => {
+    const guard = new GenerationGuard();
+    const token = guard.capture();
+    guard.invalidate();
+    let called = false;
+    const result = guard.runIfCurrent(token, () => {
+        called = true;
+    });
+    expect(called).toBe(false);
+    expect(result).toBe(false);
+});
+// ── Integration Tests for Invalidation Sources ────────────────────────────
+const mockLogger = {
+    info: () => { },
+    warn: () => { },
+    error: () => { },
+    debug: () => { },
+    security: () => { },
+    setCorrelationId: () => { },
+    getCorrelationId: () => undefined,
+    clearCorrelationId: () => { },
+};
+const createSessionContextService = () => {
+    let capturedContext = null;
+    return {
+        runWithContext: (context, fn) => {
+            capturedContext = context;
+            return fn();
+        },
+        getContext: () => capturedContext,
+    };
+};
+const createApprovalState = () => ({
+    approveCalls: [],
+    rejectCalls: [],
+    approve(interruption) {
+        this.approveCalls.push(interruption);
+    },
+    reject(interruption) {
+        this.rejectCalls.push(interruption);
+    },
+});
+const createShellInterruption = ({ callId, command }) => ({
+    name: 'shell',
+    agent: { name: 'CLI Agent' },
+    arguments: JSON.stringify({ command }),
+    ...(callId ? { callId } : {}),
+});
+function setupSession(mockClient) {
+    const composition = createConversationSessionComposition({
+        sessionId: 'test-session',
+        agentClient: mockClient,
+        deps: { logger: mockLogger, sessionContextService: createSessionContextService() },
+        turnAccumulator: new TurnItemAccumulator(),
+    });
+    return { turnCoordinator: composition.turnCoordinator, composition };
+}
+it('integration - undo during active stream work prevents mutation and aborts turn', async () => {
+    let releaseGate;
+    const gate = new Promise((resolve) => {
+        releaseGate = resolve;
+    });
+    class GatedStream extends MockStream {
+        async *[Symbol.asyncIterator]() {
+            yield { type: 'response.output_text.delta', delta: 'part 1' };
+            await gate;
+            yield { type: 'response.output_text.delta', delta: 'part 2' };
+        }
+    }
+    const mockClient = {
+        getProvider() {
+            return 'openai';
+        },
+        async startStream() {
+            const s = new GatedStream([]);
+            s.finalOutput = 'part 1part 2';
+            s.lastResponseId = 'resp-1';
+            return s;
+        },
+    };
+    const { turnCoordinator, composition } = setupSession(mockClient);
+    const runPromise = (async () => {
+        for await (const _ of turnCoordinator.start('hello')) {
+        }
+    })();
+    await new Promise((r) => setTimeout(r, 10));
+    // Trigger undo
+    composition.stateFacade.undoLastUserTurn();
+    releaseGate();
+    await runPromise;
+    // Assert mutation safety: history should not contain the assistant's response
+    const state = composition.stateFacade.exportState();
+    const assistantTurns = state.history.filter((h) => h.role === 'assistant');
+    expect(assistantTurns.length).toBe(0);
+    expect(composition.appState.statusMachine.current).toBe('idle');
+});
+it('integration - undo while approval is pending invalidates pending approval and prevents continuation', async () => {
+    const interruption = createShellInterruption({ callId: 'call-1', command: 'echo hello' });
+    const interruptedStream = new MockStream([]);
+    interruptedStream.interruptions = [interruption];
+    interruptedStream.state = createApprovalState();
+    const mockClient = {
+        async startStream() {
+            return interruptedStream;
+        },
+    };
+    const { turnCoordinator, composition } = setupSession(mockClient);
+    const emitted = [];
+    for await (const event of turnCoordinator.start('trigger tool call')) {
+        emitted.push(event);
+    }
+    expect(composition.appState.statusMachine.current).toBe('awaiting_approval');
+    expect(composition.approvalState.getPending()).toBeTruthy();
+    // Trigger undo
+    composition.stateFacade.undoLastUserTurn();
+    // Verify pending approval is cleared and status machine is idle
+    expect(composition.approvalState.getPending()).toBeNull();
+    expect(composition.appState.statusMachine.current).toBe('idle');
+    // Attempting to continue should fail
+    await expect(async () => {
+        for await (const _ of turnCoordinator.continueAfterApproval({ answer: 'y' })) {
+        }
+    }).rejects.toThrow('No pending approval to continue.');
+});
+it('integration - model change during active stream work prevents mutation and aborts turn', async () => {
+    let releaseGate;
+    const gate = new Promise((resolve) => {
+        releaseGate = resolve;
+    });
+    class GatedStream extends MockStream {
+        async *[Symbol.asyncIterator]() {
+            yield { type: 'response.output_text.delta', delta: 'part 1' };
+            await gate;
+            yield { type: 'response.output_text.delta', delta: 'part 2' };
+        }
+    }
+    const mockClient = {
+        getProvider() {
+            return 'openai';
+        },
+        setModel(_m) { },
+        async startStream() {
+            const s = new GatedStream([]);
+            s.finalOutput = 'part 1part 2';
+            s.lastResponseId = 'resp-1';
+            return s;
+        },
+    };
+    const { turnCoordinator, composition } = setupSession(mockClient);
+    const runPromise = (async () => {
+        for await (const _ of turnCoordinator.start('hello')) {
+        }
+    })();
+    await new Promise((r) => setTimeout(r, 10));
+    // Trigger model change
+    composition.runtimeController.setModel('gpt-next');
+    releaseGate();
+    await runPromise;
+    // Assert mutation safety
+    const state = composition.stateFacade.exportState();
+    const assistantTurns = state.history.filter((h) => h.role === 'assistant');
+    expect(assistantTurns.length).toBe(0);
+    expect(composition.appState.statusMachine.current).toBe('idle');
+});
+it('integration - import during active stream work prevents mutation and aborts turn', async () => {
+    let releaseGate;
+    const gate = new Promise((resolve) => {
+        releaseGate = resolve;
+    });
+    class GatedStream extends MockStream {
+        async *[Symbol.asyncIterator]() {
+            yield { type: 'response.output_text.delta', delta: 'part 1' };
+            await gate;
+            yield { type: 'response.output_text.delta', delta: 'part 2' };
+        }
+    }
+    const mockClient = {
+        getProvider() {
+            return 'openai';
+        },
+        async startStream() {
+            const s = new GatedStream([]);
+            s.finalOutput = 'part 1part 2';
+            s.lastResponseId = 'resp-1';
+            return s;
+        },
+    };
+    const { turnCoordinator, composition } = setupSession(mockClient);
+    const runPromise = (async () => {
+        for await (const _ of turnCoordinator.start('hello')) {
+        }
+    })();
+    await new Promise((r) => setTimeout(r, 10));
+    // Trigger import
+    composition.stateFacade.importState({
+        history: [],
+        previousResponseId: null,
+        toolLedger: [],
+    });
+    releaseGate();
+    await runPromise;
+    // Assert mutation safety
+    const state = composition.stateFacade.exportState();
+    const assistantTurns = state.history.filter((h) => h.role === 'assistant');
+    expect(assistantTurns.length).toBe(0);
+    expect(composition.appState.statusMachine.current).toBe('idle');
+});
+it('integration - session clear/reset during active stream work prevents mutation and aborts turn', async () => {
+    let releaseGate;
+    const gate = new Promise((resolve) => {
+        releaseGate = resolve;
+    });
+    class GatedStream extends MockStream {
+        async *[Symbol.asyncIterator]() {
+            yield { type: 'response.output_text.delta', delta: 'part 1' };
+            await gate;
+            yield { type: 'response.output_text.delta', delta: 'part 2' };
+        }
+    }
+    const mockClient = {
+        getProvider() {
+            return 'openai';
+        },
+        clearConversations() { },
+        async startStream() {
+            const s = new GatedStream([]);
+            s.finalOutput = 'part 1part 2';
+            s.lastResponseId = 'resp-1';
+            return s;
+        },
+    };
+    const { turnCoordinator, composition } = setupSession(mockClient);
+    const runPromise = (async () => {
+        for await (const _ of turnCoordinator.start('hello')) {
+        }
+    })();
+    await new Promise((r) => setTimeout(r, 10));
+    // Trigger reset/clear
+    composition.stateFacade.reset();
+    releaseGate();
+    await runPromise;
+    // Assert mutation safety
+    const state = composition.stateFacade.exportState();
+    const assistantTurns = state.history.filter((h) => h.role === 'assistant');
+    expect(assistantTurns.length).toBe(0);
+    expect(composition.appState.statusMachine.current).toBe('idle');
+});
+it('integration - disposal during active stream work prevents mutation and aborts turn', async () => {
+    let releaseGate;
+    const gate = new Promise((resolve) => {
+        releaseGate = resolve;
+    });
+    class GatedStream extends MockStream {
+        async *[Symbol.asyncIterator]() {
+            yield { type: 'response.output_text.delta', delta: 'part 1' };
+            await gate;
+            yield { type: 'response.output_text.delta', delta: 'part 2' };
+        }
+    }
+    const mockClient = {
+        getProvider() {
+            return 'openai';
+        },
+        abort() { },
+        async startStream() {
+            const s = new GatedStream([]);
+            s.finalOutput = 'part 1part 2';
+            s.lastResponseId = 'resp-1';
+            return s;
+        },
+    };
+    const { turnCoordinator, composition } = setupSession(mockClient);
+    const runPromise = (async () => {
+        for await (const _ of turnCoordinator.start('hello')) {
+        }
+    })();
+    await new Promise((r) => setTimeout(r, 10));
+    // Trigger disposal
+    composition.dispose();
+    releaseGate();
+    await runPromise;
+    // Assert mutation safety
+    const state = composition.stateFacade.exportState();
+    const assistantTurns = state.history.filter((h) => h.role === 'assistant');
+    expect(assistantTurns.length).toBe(0);
+    expect(composition.appState.statusMachine.current).toBe('idle');
+});
+it('integration - aborted-approval input with current token executes resolution continuation', async () => {
+    const interruptedStream = new MockStream([]);
+    interruptedStream.interruptions = [createShellInterruption({ callId: 'c1', command: 'echo hello' })];
+    interruptedStream.state = createApprovalState();
+    const finalStream = new MockStream([{ type: 'response.output_text.delta', delta: 'continuation reply' }]);
+    finalStream.finalOutput = 'continuation reply';
+    const mockClient = {
+        getProvider() {
+            return 'openai';
+        },
+        abort() { },
+        async startStream() {
+            return interruptedStream;
+        },
+        async continueRunStream() {
+            return finalStream;
+        },
+    };
+    const { turnCoordinator, composition } = setupSession(mockClient);
+    // Run a command that triggers approval requirement
+    const events1 = [];
+    for await (const ev of turnCoordinator.start('run command')) {
+        events1.push(ev);
+    }
+    expect(composition.appState.statusMachine.current).toBe('awaiting_approval');
+    // Verify pending approval context with a token is set
+    const pending = composition.approvalState.getPending();
+    expect(pending).toBeTruthy();
+    expect(pending.token).toBeTruthy();
+    // Abort it correctly via turnCoordinator.abort()
+    turnCoordinator.abort();
+    expect(composition.appState.statusMachine.current).toBe('idle');
+    // Send resolution user input with the current token (which is in the aborted context)
+    const events2 = [];
+    for await (const ev of turnCoordinator.start('resolution message')) {
+        events2.push(ev);
+    }
+    // The resolution continuation should be executed, yielding user_message_consumed_for_abort
+    expect(events2.some((e) => e.type === 'user_message_consumed_for_abort')).toBe(true);
+    expect(events2.some((e) => e.type === 'text_delta' && e.delta === 'continuation reply')).toBe(true);
+});
+it('integration - aborted-approval input with stale token is discarded without mutation', async () => {
+    const interruptedStream = new MockStream([]);
+    interruptedStream.interruptions = [createShellInterruption({ callId: 'c1', command: 'echo hello' })];
+    interruptedStream.state = createApprovalState();
+    const mockClient = {
+        getProvider() {
+            return 'openai';
+        },
+        abort() { },
+        async startStream() {
+            return interruptedStream;
+        },
+    };
+    const { turnCoordinator, composition } = setupSession(mockClient);
+    // Run a command that triggers approval requirement
+    for await (const _ of turnCoordinator.start('run command')) {
+    }
+    expect(composition.appState.statusMachine.current).toBe('awaiting_approval');
+    // Abort it correctly via turnCoordinator.abort()
+    turnCoordinator.abort();
+    // Invalidate generation directly
+    composition.generationGuard.invalidate();
+    // Send new input
+    const events = [];
+    for await (const ev of turnCoordinator.start('resolution message')) {
+        events.push(ev);
+    }
+    // It should be discarded immediately, yielding no events
+    expect(events.length).toBe(0);
+    expect(composition.appState.statusMachine.current).toBe('idle');
+});
+//# sourceMappingURL=generation-guard.test.js.map

package/dist/services/generation-guard.test.js.map

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

package/dist/services/history-service.d.ts

@@ -1,5 +1,5 @@
-import { LoggingService } from './logging-service.js';
-import { SettingsService } from './settings-service.js';
+import { LoggingService } from './logging/logging-service.js';
+import { SettingsService } from './settings/settings-service.js';
 import { type UserTurn } from '../types/user-turn.js';
 /**
  * Service for managing user input history.
@@ -40,5 +40,4 @@ export declare class HistoryService {
      */
     clear(): void;
 }
-export declare const historyService: HistoryService;
 //# sourceMappingURL=history-service.d.ts.map

package/dist/services/history-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"history-service.d.ts","sourceRoot":"","sources":["../../source/services/history-service.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAyC,KAAK,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAwC7F;;;GAGG;AACH,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAkB;IAClC,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,cAAc,CAAiB;gBAE3B,IAAI,EAAE;QAAE,cAAc,EAAE,cAAc,CAAC;QAAC,eAAe,EAAE,eAAe,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE;IAO5G;;OAEG;IACH,OAAO,CAAC,IAAI;IA2BZ;;OAEG;IACH,OAAO,CAAC,IAAI;IAsBZ;;OAEG;IACH,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI;IAuB5C;;OAEG;IACH,WAAW,IAAI,MAAM,EAAE;IAIvB;;OAEG;IACH,QAAQ,IAAI,QAAQ,EAAE;IAItB;;OAEG;IACH,KAAK,IAAI,IAAI;CAId;AAkCD,eAAO,MAAM,cAAc,gBA0BzB,CAAC"}
+{"version":3,"file":"history-service.d.ts","sourceRoot":"","sources":["../../source/services/history-service.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAyC,KAAK,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAwC7F;;;GAGG;AACH,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAkB;IAClC,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,cAAc,CAAiB;gBAE3B,IAAI,EAAE;QAAE,cAAc,EAAE,cAAc,CAAC;QAAC,eAAe,EAAE,eAAe,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE;IAO5G;;OAEG;IACH,OAAO,CAAC,IAAI;IA2BZ;;OAEG;IACH,OAAO,CAAC,IAAI;IAsBZ;;OAEG;IACH,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI;IAuB5C;;OAEG;IACH,WAAW,IAAI,MAAM,EAAE;IAIvB;;OAEG;IACH,QAAQ,IAAI,QAAQ,EAAE;IAItB;;OAEG;IACH,KAAK,IAAI,IAAI;CAId"}

package/dist/services/history-service.js

@@ -1,7 +1,6 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import envPaths from 'env-paths';
-import { LoggingService } from './logging-service.js';
 import { hasUserTurnContent, normalizeUserTurn } from '../types/user-turn.js';
 const paths = envPaths('term2');
 const cloneUserTurn = (turn) => ({
@@ -134,55 +133,4 @@ export class HistoryService {
         this.save();
     }
 }
-/**
- * @deprecated DO NOT USE - Singleton pattern is deprecated
- *
- * This singleton is deprecated and should not be used in application code.
- * Instead, pass the HistoryService instance via dependency injection:
- *
- * - In App component: Accept as prop from cli.tsx
- * - In services/tools: Accept via constructor deps parameter
- * - In hooks: Accept as parameter or use a context provider
- *
- * This export now throws an error when accessed to catch deprecated usage.
- * It's only allowed in test files for backwards compatibility.
- */
-const _historyServiceInstance = new HistoryService({
-    loggingService: new LoggingService(),
-    settingsService: new (class MockSettingsService {
-        get() {
-            return 1000;
-        } // Default history size
-    })(),
-});
-const isTestEnvironment = () => {
-    return (process.env.NODE_ENV === 'test' ||
-        process.env.VITEST !== undefined ||
-        process.env.AVA_PATH !== undefined ||
-        process.env.JEST_WORKER_ID !== undefined ||
-        process.env.TERM2_TEST_MODE === 'true');
-};
-export const historyService = new Proxy(_historyServiceInstance, {
-    get(target, prop) {
-        // Allow access in test environment for backwards compatibility
-        if (isTestEnvironment()) {
-            const value = target[prop];
-            // Bind methods to the original target to preserve 'this' context
-            if (typeof value === 'function') {
-                return value.bind(target);
-            }
-            return value;
-        }
-        // Get the caller's stack trace to show where the deprecated usage is
-        const stack = new Error().stack || '';
-        const callerLine = stack.split('\n')[2] || 'unknown location';
-        throw new Error(`DEPRECATED: Direct use of historyService singleton is not allowed.\n` +
-            `Called from: ${callerLine.trim()}\n\n` +
-            `Instead, pass HistoryService via dependency injection:\n` +
-            `  - In App component: Accept as prop from cli.tsx\n` +
-            `  - In services/tools: Accept via 'deps' constructor parameter\n` +
-            `  - In hooks: Accept as parameter or use a context provider\n\n` +
-            `The singleton pattern prevents proper testing and makes dependencies unclear.`);
-    },
-});
 //# sourceMappingURL=history-service.js.map

package/dist/services/history-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"history-service.js","sourceRoot":"","sources":["../../source/services/history-service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"history-service.js","sourceRoot":"","sources":["../../source/services/history-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,QAAQ,MAAM,WAAW,CAAC;AAGjC,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAiB,MAAM,uBAAuB,CAAC;AAE7F,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;AAMhC,MAAM,aAAa,GAAG,CAAC,IAAc,EAAY,EAAE,CAAC,CAAC;IACnD,IAAI,EAAE,IAAI,CAAC,IAAI;IACf,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM;QACrB,CAAC,CAAC;YACE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC;SACnD;QACH,CAAC,CAAC,EAAE,CAAC;CACR,CAAC,CAAC;AAEH,MAAM,qBAAqB,GAAG,CAAC,KAAwB,EAAY,EAAE,CAAC,aAAa,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC;AAE9G,MAAM,cAAc,GAAG,CAAC,CAAqB,EAAE,CAAqB,EAAW,EAAE;IAC/E,MAAM,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC;IACrB,MAAM,KAAK,GAAG,CAAC,IAAI,EAAE,CAAC;IAEtB,IAAI,IAAI,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM;QAAE,OAAO,KAAK,CAAC;IAE/C,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;QACjC,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;QAC3B,OAAO,CACL,KAAK,KAAK,SAAS;YACnB,KAAK,CAAC,EAAE,KAAK,KAAK,CAAC,EAAE;YACrB,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI;YACzB,KAAK,CAAC,QAAQ,KAAK,KAAK,CAAC,QAAQ;YACjC,KAAK,CAAC,QAAQ,KAAK,KAAK,CAAC,QAAQ;YACjC,KAAK,CAAC,aAAa,KAAK,KAAK,CAAC,aAAa,CAC5C,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,aAAa,GAAG,CAAC,CAAW,EAAE,CAAW,EAAW,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,IAAI,cAAc,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC;AAErH;;;GAGG;AACH,MAAM,OAAO,cAAc;IACjB,QAAQ,GAAe,EAAE,CAAC;IAC1B,WAAW,CAAS;IACpB,cAAc,CAAS;IACvB,cAAc,CAAiB;IAEvC,YAAY,IAAgG;QAC1G,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC;QAC1C,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;QAC5E,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;QACjE,IAAI,CAAC,IAAI,EAAE,CAAC;IACd,CAAC;IAED;;OAEG;IACK,IAAI;QACV,IAAI,CAAC;YACH,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;gBACpC,MAAM,IAAI,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;gBACxD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAY,CAAC;gBAC3C,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;oBACvC,CAAC,CAAC,MAAM;oBACR,CAAC,CAAC,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,IAAI,KAAK,CAAC,OAAO,CAAE,MAAiC,CAAC,QAAQ,CAAC;wBAC7G,CAAC,CAAE,MAAiD,CAAC,QAAQ,IAAI,EAAE;wBACnE,CAAC,CAAC,EAAE,CAAC;gBACP,IAAI,CAAC,QAAQ,GAAG,WAAW;qBACxB,MAAM,CACL,CAAC,OAAO,EAAgC,EAAE,CACxC,OAAO,OAAO,KAAK,QAAQ,IAAI,CAAC,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,KAAK,IAAI,CAAC,CACnF;qBACA,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC,CAAC;YACtD,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,mDAAmD;YACnD,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,wBAAwB,EAAE;gBAClD,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;gBAC7D,QAAQ,EAAE,IAAI,CAAC,WAAW;aAC3B,CAAC,CAAC;YACH,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QACrB,CAAC;IACH,CAAC;IAED;;OAEG;IACK,IAAI;QACV,IAAI,CAAC;YACH,0BAA0B;YAC1B,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAC3C,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;gBACxB,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YACzC,CAAC;YAED,MAAM,IAAI,GAAgB;gBACxB,QAAQ,EAAE,IAAI,CAAC,QAAQ;aACxB,CAAC;YAEF,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;QAC7E,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,wBAAwB,EAAE;gBAClD,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;gBAC7D,QAAQ,EAAE,IAAI,CAAC,WAAW;gBAC1B,YAAY,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM;aACnC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED;;OAEG;IACH,UAAU,CAAC,OAA0B;QACnC,MAAM,UAAU,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC;QAElD,wCAAwC;QACxC,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,EAAE,CAAC;YACpC,OAAO;QACT,CAAC;QAED,qEAAqE;QACrE,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,UAAU,CAAC,EAAE,CAAC;YACnG,OAAO;QACT,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAE/B,sCAAsC;QACtC,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;YAC/C,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC5D,CAAC;QAED,IAAI,CAAC,IAAI,EAAE,CAAC;IACd,CAAC;IAED;;OAEG;IACH,WAAW;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACtD,CAAC;IAED;;OAEG;IACH,QAAQ;QACN,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IAC1C,CAAC;IAED;;OAEG;IACH,KAAK;QACH,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QACnB,IAAI,CAAC,IAAI,EAAE,CAAC;IACd,CAAC;CACF"}

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

@@ -1,4 +1,4 @@
-import test from 'ava';
+import { it, expect } from 'vitest';
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
@@ -29,24 +29,24 @@ const image = {
     byteSize: 3,
     displayNumber: 1,
 };
-test('addMessage() stores multimodal turns and persists them', (t) => {
+it('addMessage() stores multimodal turns and persists them', () => {
     const { dir, historyFile } = createTempHistoryFile();
     try {
         const service = new HistoryService(createDeps(historyFile));
         const turn = { text: 'Describe this', images: [image] };
         service.addMessage(turn);
-        t.deepEqual(service.getTurns(), [turn]);
-        t.deepEqual(service.getMessages(), ['Describe this']);
+        expect(service.getTurns()).toEqual([turn]);
+        expect(service.getMessages()).toEqual(['Describe this']);
         const written = JSON.parse(fs.readFileSync(historyFile, 'utf-8'));
-        t.deepEqual(written.messages, [turn]);
+        expect(written.messages).toEqual([turn]);
         const reloaded = new HistoryService(createDeps(historyFile));
-        t.deepEqual(reloaded.getTurns(), [turn]);
+        expect(reloaded.getTurns()).toEqual([turn]);
     }
     finally {
         fs.rmSync(dir, { recursive: true, force: true });
     }
 });
-test('addMessage() stores image-only turns', (t) => {
+it('addMessage() stores image-only turns', () => {
     const { dir, historyFile } = createTempHistoryFile();
     try {
         const service = new HistoryService(createDeps(historyFile));
@@ -54,21 +54,21 @@ test('addMessage() stores image-only turns', (t) => {
             text: '',
             images: [image],
         });
-        t.is(service.getTurns().length, 1);
-        t.deepEqual(service.getTurns()[0], { text: '', images: [image] });
-        t.deepEqual(service.getMessages(), ['']);
+        expect(service.getTurns().length).toBe(1);
+        expect(service.getTurns()[0]).toEqual({ text: '', images: [image] });
+        expect(service.getMessages()).toEqual(['']);
     }
     finally {
         fs.rmSync(dir, { recursive: true, force: true });
     }
 });
-test('load() supports legacy string-only history files', (t) => {
+it('load() supports legacy string-only history files', () => {
     const { dir, historyFile } = createTempHistoryFile();
     try {
         fs.writeFileSync(historyFile, JSON.stringify({ messages: ['First', 'Second'] }, null, 2), 'utf-8');
         const service = new HistoryService(createDeps(historyFile));
-        t.deepEqual(service.getTurns(), [{ text: 'First' }, { text: 'Second' }]);
-        t.deepEqual(service.getMessages(), ['First', 'Second']);
+        expect(service.getTurns()).toEqual([{ text: 'First' }, { text: 'Second' }]);
+        expect(service.getMessages()).toEqual(['First', 'Second']);
     }
     finally {
         fs.rmSync(dir, { recursive: true, force: true });

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

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