@machina.ai/cell-cli 1.16.0-rc1 → 1.18.4-rc1

package/dist/src/utils/sessions.test.js

@@ -0,0 +1,516 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { ChatRecordingService } from '@google/gemini-cli-core';
+import { listSessions, deleteSession } from './sessions.js';
+import { SessionSelector } from './sessionUtils.js';
+// Mock the SessionSelector and ChatRecordingService
+vi.mock('./sessionUtils.js', () => ({
+    SessionSelector: vi.fn(),
+    formatRelativeTime: vi.fn(() => 'some time ago'),
+}));
+vi.mock('@google/gemini-cli-core', async () => {
+    const actual = await vi.importActual('@google/gemini-cli-core');
+    return {
+        ...actual,
+        ChatRecordingService: vi.fn(),
+    };
+});
+describe('listSessions', () => {
+    let mockConfig;
+    let mockListSessions;
+    let consoleLogSpy;
+    beforeEach(() => {
+        // Create mock config
+        mockConfig = {
+            storage: {
+                getProjectTempDir: vi.fn().mockReturnValue('/tmp/test-project'),
+            },
+            getSessionId: vi.fn().mockReturnValue('current-session-id'),
+        };
+        // Create mock listSessions method
+        mockListSessions = vi.fn();
+        // Mock SessionSelector constructor to return object with listSessions method
+        vi.mocked(SessionSelector).mockImplementation(() => ({
+            listSessions: mockListSessions,
+        }));
+        // Spy on console.log
+        consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => { });
+    });
+    afterEach(() => {
+        vi.clearAllMocks();
+        consoleLogSpy.mockRestore();
+    });
+    it('should display message when no previous sessions were found', async () => {
+        // Arrange: Return empty array from listSessions
+        mockListSessions.mockResolvedValue([]);
+        // Act
+        await listSessions(mockConfig);
+        // Assert
+        expect(mockListSessions).toHaveBeenCalledOnce();
+        expect(consoleLogSpy).toHaveBeenCalledWith('No previous sessions found for this project.');
+    });
+    it('should list sessions when sessions are found', async () => {
+        // Arrange: Create test sessions
+        const now = new Date('2025-01-20T12:00:00.000Z');
+        const oneHourAgo = new Date(now.getTime() - 60 * 60 * 1000);
+        const twoDaysAgo = new Date(now.getTime() - 2 * 24 * 60 * 60 * 1000);
+        const mockSessions = [
+            {
+                id: 'session-1',
+                file: 'session-2025-01-18T12-00-00-session-1',
+                fileName: 'session-2025-01-18T12-00-00-session-1.json',
+                startTime: twoDaysAgo.toISOString(),
+                lastUpdated: twoDaysAgo.toISOString(),
+                firstUserMessage: 'First user message',
+                isCurrentSession: false,
+                index: 1,
+            },
+            {
+                id: 'session-2',
+                file: 'session-2025-01-20T11-00-00-session-2',
+                fileName: 'session-2025-01-20T11-00-00-session-2.json',
+                startTime: oneHourAgo.toISOString(),
+                lastUpdated: oneHourAgo.toISOString(),
+                firstUserMessage: 'Second user message',
+                isCurrentSession: false,
+                index: 2,
+            },
+            {
+                id: 'current-session-id',
+                file: 'session-2025-01-20T12-00-00-current-s',
+                fileName: 'session-2025-01-20T12-00-00-current-s.json',
+                startTime: now.toISOString(),
+                lastUpdated: now.toISOString(),
+                firstUserMessage: 'Current session',
+                isCurrentSession: true,
+                index: 3,
+            },
+        ];
+        mockListSessions.mockResolvedValue(mockSessions);
+        // Act
+        await listSessions(mockConfig);
+        // Assert
+        expect(mockListSessions).toHaveBeenCalledOnce();
+        // Check that the header was displayed
+        expect(consoleLogSpy).toHaveBeenCalledWith('\nAvailable sessions for this project (3):\n');
+        // Check that each session was logged
+        expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining('1. First user message'));
+        expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining('[session-1]'));
+        expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining('2. Second user message'));
+        expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining('[session-2]'));
+        expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining('3. Current session'));
+        expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining(', current)'));
+        expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining('[current-session-id]'));
+    });
+    it('should sort sessions by start time (oldest first)', async () => {
+        // Arrange: Create sessions in non-chronological order
+        const session1Time = new Date('2025-01-18T12:00:00.000Z');
+        const session2Time = new Date('2025-01-19T12:00:00.000Z');
+        const session3Time = new Date('2025-01-20T12:00:00.000Z');
+        const mockSessions = [
+            {
+                id: 'session-2',
+                file: 'session-2',
+                fileName: 'session-2.json',
+                startTime: session2Time.toISOString(), // Middle
+                lastUpdated: session2Time.toISOString(),
+                firstUserMessage: 'Middle session',
+                isCurrentSession: false,
+                index: 2,
+            },
+            {
+                id: 'session-1',
+                file: 'session-1',
+                fileName: 'session-1.json',
+                startTime: session1Time.toISOString(), // Oldest
+                lastUpdated: session1Time.toISOString(),
+                firstUserMessage: 'Oldest session',
+                isCurrentSession: false,
+                index: 1,
+            },
+            {
+                id: 'session-3',
+                file: 'session-3',
+                fileName: 'session-3.json',
+                startTime: session3Time.toISOString(), // Newest
+                lastUpdated: session3Time.toISOString(),
+                firstUserMessage: 'Newest session',
+                isCurrentSession: false,
+                index: 3,
+            },
+        ];
+        mockListSessions.mockResolvedValue(mockSessions);
+        // Act
+        await listSessions(mockConfig);
+        // Assert
+        // Get all the session log calls (skip the header)
+        const sessionCalls = consoleLogSpy.mock.calls.filter((call) => typeof call[0] === 'string' &&
+            call[0].includes('[session-') &&
+            !call[0].includes('Available sessions'));
+        // Verify they are sorted by start time (oldest first)
+        expect(sessionCalls[0][0]).toContain('1. Oldest session');
+        expect(sessionCalls[1][0]).toContain('2. Middle session');
+        expect(sessionCalls[2][0]).toContain('3. Newest session');
+    });
+    it('should format session output with relative time and session ID', async () => {
+        // Arrange
+        const now = new Date('2025-01-20T12:00:00.000Z');
+        const mockSessions = [
+            {
+                id: 'abc123def456',
+                file: 'session-file',
+                fileName: 'session-file.json',
+                startTime: now.toISOString(),
+                lastUpdated: now.toISOString(),
+                firstUserMessage: 'Test message',
+                isCurrentSession: false,
+                index: 1,
+            },
+        ];
+        mockListSessions.mockResolvedValue(mockSessions);
+        // Act
+        await listSessions(mockConfig);
+        // Assert
+        expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining('1. Test message'));
+        expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining('some time ago'));
+        expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining('[abc123def456]'));
+    });
+    it('should handle single session', async () => {
+        // Arrange
+        const now = new Date('2025-01-20T12:00:00.000Z');
+        const mockSessions = [
+            {
+                id: 'single-session',
+                file: 'session-file',
+                fileName: 'session-file.json',
+                startTime: now.toISOString(),
+                lastUpdated: now.toISOString(),
+                firstUserMessage: 'Only session',
+                isCurrentSession: true,
+                index: 1,
+            },
+        ];
+        mockListSessions.mockResolvedValue(mockSessions);
+        // Act
+        await listSessions(mockConfig);
+        // Assert
+        expect(consoleLogSpy).toHaveBeenCalledWith('\nAvailable sessions for this project (1):\n');
+        expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining('1. Only session'));
+        expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining(', current)'));
+    });
+});
+describe('deleteSession', () => {
+    let mockConfig;
+    let mockListSessions;
+    let mockDeleteSession;
+    let consoleLogSpy;
+    let consoleErrorSpy;
+    beforeEach(() => {
+        // Create mock config
+        mockConfig = {
+            storage: {
+                getProjectTempDir: vi.fn().mockReturnValue('/tmp/test-project'),
+            },
+            getSessionId: vi.fn().mockReturnValue('current-session-id'),
+        };
+        // Create mock methods
+        mockListSessions = vi.fn();
+        mockDeleteSession = vi.fn();
+        // Mock SessionSelector constructor
+        vi.mocked(SessionSelector).mockImplementation(() => ({
+            listSessions: mockListSessions,
+        }));
+        // Mock ChatRecordingService
+        vi.mocked(ChatRecordingService).mockImplementation(() => ({
+            deleteSession: mockDeleteSession,
+        }));
+        // Spy on console methods
+        consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => { });
+        consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => { });
+    });
+    afterEach(() => {
+        vi.clearAllMocks();
+        consoleLogSpy.mockRestore();
+        consoleErrorSpy.mockRestore();
+    });
+    it('should display error when no sessions are found', async () => {
+        // Arrange
+        mockListSessions.mockResolvedValue([]);
+        // Act
+        await deleteSession(mockConfig, '1');
+        // Assert
+        expect(mockListSessions).toHaveBeenCalledOnce();
+        expect(consoleErrorSpy).toHaveBeenCalledWith('No sessions found for this project.');
+        expect(mockDeleteSession).not.toHaveBeenCalled();
+    });
+    it('should delete session by UUID', async () => {
+        // Arrange
+        const now = new Date('2025-01-20T12:00:00.000Z');
+        const mockSessions = [
+            {
+                id: 'session-uuid-123',
+                file: 'session-file-123',
+                fileName: 'session-file-123.json',
+                startTime: now.toISOString(),
+                lastUpdated: now.toISOString(),
+                firstUserMessage: 'Test session',
+                isCurrentSession: false,
+                index: 1,
+            },
+        ];
+        mockListSessions.mockResolvedValue(mockSessions);
+        mockDeleteSession.mockImplementation(() => { });
+        // Act
+        await deleteSession(mockConfig, 'session-uuid-123');
+        // Assert
+        expect(mockListSessions).toHaveBeenCalledOnce();
+        expect(mockDeleteSession).toHaveBeenCalledWith('session-file-123');
+        expect(consoleLogSpy).toHaveBeenCalledWith('Deleted session 1: Test session (some time ago)');
+        expect(consoleErrorSpy).not.toHaveBeenCalled();
+    });
+    it('should delete session by index', async () => {
+        // Arrange
+        const now = new Date('2025-01-20T12:00:00.000Z');
+        const oneHourAgo = new Date(now.getTime() - 60 * 60 * 1000);
+        const mockSessions = [
+            {
+                id: 'session-1',
+                file: 'session-file-1',
+                fileName: 'session-file-1.json',
+                startTime: oneHourAgo.toISOString(),
+                lastUpdated: oneHourAgo.toISOString(),
+                firstUserMessage: 'First session',
+                isCurrentSession: false,
+                index: 1,
+            },
+            {
+                id: 'session-2',
+                file: 'session-file-2',
+                fileName: 'session-file-2.json',
+                startTime: now.toISOString(),
+                lastUpdated: now.toISOString(),
+                firstUserMessage: 'Second session',
+                isCurrentSession: false,
+                index: 2,
+            },
+        ];
+        mockListSessions.mockResolvedValue(mockSessions);
+        mockDeleteSession.mockImplementation(() => { });
+        // Act
+        await deleteSession(mockConfig, '2');
+        // Assert
+        expect(mockListSessions).toHaveBeenCalledOnce();
+        expect(mockDeleteSession).toHaveBeenCalledWith('session-file-2');
+        expect(consoleLogSpy).toHaveBeenCalledWith('Deleted session 2: Second session (some time ago)');
+    });
+    it('should display error for invalid session identifier (non-numeric)', async () => {
+        // Arrange
+        const now = new Date('2025-01-20T12:00:00.000Z');
+        const mockSessions = [
+            {
+                id: 'session-1',
+                file: 'session-file-1',
+                fileName: 'session-file-1.json',
+                startTime: now.toISOString(),
+                lastUpdated: now.toISOString(),
+                firstUserMessage: 'Test session',
+                isCurrentSession: false,
+                index: 1,
+            },
+        ];
+        mockListSessions.mockResolvedValue(mockSessions);
+        // Act
+        await deleteSession(mockConfig, 'invalid-id');
+        // Assert
+        expect(consoleErrorSpy).toHaveBeenCalledWith('Invalid session identifier "invalid-id". Use --list-sessions to see available sessions.');
+        expect(mockDeleteSession).not.toHaveBeenCalled();
+    });
+    it('should display error for invalid session identifier (out of range)', async () => {
+        // Arrange
+        const now = new Date('2025-01-20T12:00:00.000Z');
+        const mockSessions = [
+            {
+                id: 'session-1',
+                file: 'session-file-1',
+                fileName: 'session-file-1.json',
+                startTime: now.toISOString(),
+                lastUpdated: now.toISOString(),
+                firstUserMessage: 'Test session',
+                isCurrentSession: false,
+                index: 1,
+            },
+        ];
+        mockListSessions.mockResolvedValue(mockSessions);
+        // Act
+        await deleteSession(mockConfig, '999');
+        // Assert
+        expect(consoleErrorSpy).toHaveBeenCalledWith('Invalid session identifier "999". Use --list-sessions to see available sessions.');
+        expect(mockDeleteSession).not.toHaveBeenCalled();
+    });
+    it('should display error for invalid session identifier (zero)', async () => {
+        // Arrange
+        const now = new Date('2025-01-20T12:00:00.000Z');
+        const mockSessions = [
+            {
+                id: 'session-1',
+                file: 'session-file-1',
+                fileName: 'session-file-1.json',
+                startTime: now.toISOString(),
+                lastUpdated: now.toISOString(),
+                firstUserMessage: 'Test session',
+                isCurrentSession: false,
+                index: 1,
+            },
+        ];
+        mockListSessions.mockResolvedValue(mockSessions);
+        // Act
+        await deleteSession(mockConfig, '0');
+        // Assert
+        expect(consoleErrorSpy).toHaveBeenCalledWith('Invalid session identifier "0". Use --list-sessions to see available sessions.');
+        expect(mockDeleteSession).not.toHaveBeenCalled();
+    });
+    it('should prevent deletion of current session', async () => {
+        // Arrange
+        const now = new Date('2025-01-20T12:00:00.000Z');
+        const mockSessions = [
+            {
+                id: 'current-session-id',
+                file: 'current-session-file',
+                fileName: 'current-session-file.json',
+                startTime: now.toISOString(),
+                lastUpdated: now.toISOString(),
+                firstUserMessage: 'Current session',
+                isCurrentSession: true,
+                index: 1,
+            },
+        ];
+        mockListSessions.mockResolvedValue(mockSessions);
+        // Act - try to delete by index
+        await deleteSession(mockConfig, '1');
+        // Assert
+        expect(consoleErrorSpy).toHaveBeenCalledWith('Cannot delete the current active session.');
+        expect(mockDeleteSession).not.toHaveBeenCalled();
+    });
+    it('should prevent deletion of current session by UUID', async () => {
+        // Arrange
+        const now = new Date('2025-01-20T12:00:00.000Z');
+        const mockSessions = [
+            {
+                id: 'current-session-id',
+                file: 'current-session-file',
+                fileName: 'current-session-file.json',
+                startTime: now.toISOString(),
+                lastUpdated: now.toISOString(),
+                firstUserMessage: 'Current session',
+                isCurrentSession: true,
+                index: 1,
+            },
+        ];
+        mockListSessions.mockResolvedValue(mockSessions);
+        // Act - try to delete by UUID
+        await deleteSession(mockConfig, 'current-session-id');
+        // Assert
+        expect(consoleErrorSpy).toHaveBeenCalledWith('Cannot delete the current active session.');
+        expect(mockDeleteSession).not.toHaveBeenCalled();
+    });
+    it('should handle deletion errors gracefully', async () => {
+        // Arrange
+        const now = new Date('2025-01-20T12:00:00.000Z');
+        const mockSessions = [
+            {
+                id: 'session-1',
+                file: 'session-file-1',
+                fileName: 'session-file-1.json',
+                startTime: now.toISOString(),
+                lastUpdated: now.toISOString(),
+                firstUserMessage: 'Test session',
+                isCurrentSession: false,
+                index: 1,
+            },
+        ];
+        mockListSessions.mockResolvedValue(mockSessions);
+        mockDeleteSession.mockImplementation(() => {
+            throw new Error('File deletion failed');
+        });
+        // Act
+        await deleteSession(mockConfig, '1');
+        // Assert
+        expect(mockDeleteSession).toHaveBeenCalledWith('session-file-1');
+        expect(consoleErrorSpy).toHaveBeenCalledWith('Failed to delete session: File deletion failed');
+    });
+    it('should handle non-Error deletion failures', async () => {
+        // Arrange
+        const now = new Date('2025-01-20T12:00:00.000Z');
+        const mockSessions = [
+            {
+                id: 'session-1',
+                file: 'session-file-1',
+                fileName: 'session-file-1.json',
+                startTime: now.toISOString(),
+                lastUpdated: now.toISOString(),
+                firstUserMessage: 'Test session',
+                isCurrentSession: false,
+                index: 1,
+            },
+        ];
+        mockListSessions.mockResolvedValue(mockSessions);
+        mockDeleteSession.mockImplementation(() => {
+            // eslint-disable-next-line no-restricted-syntax
+            throw 'Unknown error type';
+        });
+        // Act
+        await deleteSession(mockConfig, '1');
+        // Assert
+        expect(consoleErrorSpy).toHaveBeenCalledWith('Failed to delete session: Unknown error');
+    });
+    it('should sort sessions before finding by index', async () => {
+        // Arrange: Create sessions in non-chronological order
+        const session1Time = new Date('2025-01-18T12:00:00.000Z');
+        const session2Time = new Date('2025-01-19T12:00:00.000Z');
+        const session3Time = new Date('2025-01-20T12:00:00.000Z');
+        const mockSessions = [
+            {
+                id: 'session-3',
+                file: 'session-file-3',
+                fileName: 'session-file-3.json',
+                startTime: session3Time.toISOString(), // Newest
+                lastUpdated: session3Time.toISOString(),
+                firstUserMessage: 'Newest session',
+                isCurrentSession: false,
+                index: 3,
+            },
+            {
+                id: 'session-1',
+                file: 'session-file-1',
+                fileName: 'session-file-1.json',
+                startTime: session1Time.toISOString(), // Oldest
+                lastUpdated: session1Time.toISOString(),
+                firstUserMessage: 'Oldest session',
+                isCurrentSession: false,
+                index: 1,
+            },
+            {
+                id: 'session-2',
+                file: 'session-file-2',
+                fileName: 'session-file-2.json',
+                startTime: session2Time.toISOString(), // Middle
+                lastUpdated: session2Time.toISOString(),
+                firstUserMessage: 'Middle session',
+                isCurrentSession: false,
+                index: 2,
+            },
+        ];
+        mockListSessions.mockResolvedValue(mockSessions);
+        mockDeleteSession.mockImplementation(() => { });
+        // Act - delete index 1 (should be oldest session after sorting)
+        await deleteSession(mockConfig, '1');
+        // Assert
+        expect(mockDeleteSession).toHaveBeenCalledWith('session-file-1');
+        expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining('Oldest session'));
+    });
+});
+//# sourceMappingURL=sessions.test.js.map

package/dist/src/utils/sessions.test.js.map

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

package/dist/src/validateNonInterActiveAuth.js

@@ -8,6 +8,7 @@ import { USER_SETTINGS_PATH } from './config/settings.js';
 import { validateAuthMethod } from './config/auth.js';
 import {} from './config/settings.js';
 import { handleError } from './utils/errors.js';
+import { runExitCleanup } from './utils/cleanup.js';
 function getAuthTypeFromEnv() {
     if (process.env['GOOGLE_GENAI_USE_GCA'] === 'true') {
         return AuthType.LOGIN_WITH_GOOGLE;
@@ -50,6 +51,7 @@ export async function validateNonInteractiveAuth(configuredAuthType, useExternal
         }
         else {
             debugLogger.error(error instanceof Error ? error.message : String(error));
+            await runExitCleanup();
             process.exit(1);
         }
     }

package/dist/src/validateNonInterActiveAuth.js.map

@@ -1 +1 @@
-{"version":3,"file":"validateNonInterActiveAuth.js","sourceRoot":"","sources":["../../src/validateNonInterActiveAuth.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC9E,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAuB,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,SAAS,kBAAkB;IACzB,IAAI,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,KAAK,MAAM,EAAE,CAAC;QACnD,OAAO,QAAQ,CAAC,iBAAiB,CAAC;IACpC,CAAC;IACD,IAAI,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC,KAAK,MAAM,EAAE,CAAC;QACxD,OAAO,QAAQ,CAAC,aAAa,CAAC;IAChC,CAAC;IACD,IAAI,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE,CAAC;QAClC,OAAO,QAAQ,CAAC,UAAU,CAAC;IAC7B,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,kBAAwC,EACxC,eAAoC,EACpC,oBAA4B,EAC5B,QAAwB;IAExB,IAAI,CAAC;QACH,MAAM,iBAAiB,GAAG,kBAAkB,IAAI,kBAAkB,EAAE,CAAC;QAErE,MAAM,YAAY,GAAG,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,EAAE,YAAY,CAAC;QAClE,IAAI,YAAY,IAAI,iBAAiB,KAAK,YAAY,EAAE,CAAC;YACvD,MAAM,OAAO,GAAG,iBAAiB;gBAC/B,CAAC,CAAC,wCAAwC,YAAY,+BAA+B,iBAAiB,kDAAkD;gBACxJ,CAAC,CAAC,kBAAkB,YAAY,qDAAqD,CAAC;YACxF,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;QAC3B,CAAC;QAED,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvB,MAAM,OAAO,GAAG,qCAAqC,kBAAkB,wIAAwI,CAAC;YAChN,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;QAC3B,CAAC;QAED,MAAM,QAAQ,GAAa,iBAA6B,CAAC;QAEzD,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,MAAM,GAAG,GAAG,kBAAkB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;YACjD,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;gBAChB,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC;YACvB,CAAC;QACH,CAAC;QAED,MAAM,oBAAoB,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QACjD,OAAO,oBAAoB,CAAC;IAC9B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,oBAAoB,CAAC,eAAe,EAAE,KAAK,YAAY,CAAC,IAAI,EAAE,CAAC;YACjE,WAAW,CACT,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EACzD,oBAAoB,EACpB,CAAC,CACF,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,WAAW,CAAC,KAAK,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;YAC1E,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;AACH,CAAC"}
+{"version":3,"file":"validateNonInterActiveAuth.js","sourceRoot":"","sources":["../../src/validateNonInterActiveAuth.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC9E,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAuB,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD,SAAS,kBAAkB;IACzB,IAAI,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,KAAK,MAAM,EAAE,CAAC;QACnD,OAAO,QAAQ,CAAC,iBAAiB,CAAC;IACpC,CAAC;IACD,IAAI,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC,KAAK,MAAM,EAAE,CAAC;QACxD,OAAO,QAAQ,CAAC,aAAa,CAAC;IAChC,CAAC;IACD,IAAI,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE,CAAC;QAClC,OAAO,QAAQ,CAAC,UAAU,CAAC;IAC7B,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,kBAAwC,EACxC,eAAoC,EACpC,oBAA4B,EAC5B,QAAwB;IAExB,IAAI,CAAC;QACH,MAAM,iBAAiB,GAAG,kBAAkB,IAAI,kBAAkB,EAAE,CAAC;QAErE,MAAM,YAAY,GAAG,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,EAAE,YAAY,CAAC;QAClE,IAAI,YAAY,IAAI,iBAAiB,KAAK,YAAY,EAAE,CAAC;YACvD,MAAM,OAAO,GAAG,iBAAiB;gBAC/B,CAAC,CAAC,wCAAwC,YAAY,+BAA+B,iBAAiB,kDAAkD;gBACxJ,CAAC,CAAC,kBAAkB,YAAY,qDAAqD,CAAC;YACxF,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;QAC3B,CAAC;QAED,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvB,MAAM,OAAO,GAAG,qCAAqC,kBAAkB,wIAAwI,CAAC;YAChN,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;QAC3B,CAAC;QAED,MAAM,QAAQ,GAAa,iBAA6B,CAAC;QAEzD,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,MAAM,GAAG,GAAG,kBAAkB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;YACjD,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;gBAChB,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC;YACvB,CAAC;QACH,CAAC;QAED,MAAM,oBAAoB,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QACjD,OAAO,oBAAoB,CAAC;IAC9B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,oBAAoB,CAAC,eAAe,EAAE,KAAK,YAAY,CAAC,IAAI,EAAE,CAAC;YACjE,WAAW,CACT,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EACzD,oBAAoB,EACpB,CAAC,CACF,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,WAAW,CAAC,KAAK,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;YAC1E,MAAM,cAAc,EAAE,CAAC;YACvB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;AACH,CAAC"}

package/dist/src/zed-integration/acp.d.ts

@@ -6,6 +6,8 @@
 import * as schema from './schema.js';
 export * from './schema.js';
 import type { WritableStream, ReadableStream } from 'node:stream/web';
+import { RequestError } from './connection.js';
+export { RequestError };
 export declare class AgentSideConnection implements Client {
     #private;
     constructor(toAgent: (conn: Client) => Agent, input: WritableStream<Uint8Array>, output: ReadableStream<Uint8Array>);
@@ -23,30 +25,6 @@ export declare class AgentSideConnection implements Client {
     readTextFile(params: schema.ReadTextFileRequest): Promise<schema.ReadTextFileResponse>;
     writeTextFile(params: schema.WriteTextFileRequest): Promise<schema.WriteTextFileResponse>;
 }
-type Result<T> = {
-    result: T;
-} | {
-    error: ErrorResponse;
-};
-type ErrorResponse = {
-    code: number;
-    message: string;
-    data?: unknown;
-};
-export declare class RequestError extends Error {
-    code: number;
-    data?: {
-        details?: string;
-    };
-    constructor(code: number, message: string, details?: string);
-    static parseError(details?: string): RequestError;
-    static invalidRequest(details?: string): RequestError;
-    static methodNotFound(details?: string): RequestError;
-    static invalidParams(details?: string): RequestError;
-    static internalError(details?: string): RequestError;
-    static authRequired(details?: string): RequestError;
-    toResult<T>(): Result<T>;
-}
 export interface Client {
     requestPermission(params: schema.RequestPermissionRequest): Promise<schema.RequestPermissionResponse>;
     sessionUpdate(params: schema.SessionNotification): Promise<void>;