@zgsm/costrict-cli 0.21.0-nightly.20251213.977248e09

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

@@ -0,0 +1,122 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
+import os from 'node:os';
+import fs from 'node:fs';
+import { readFile } from 'node:fs/promises';
+import { getContainerPath, parseImageName, ports, entrypoint, shouldUseCurrentUserInSandbox, } from './sandboxUtils.js';
+vi.mock('node:os');
+vi.mock('node:fs');
+vi.mock('node:fs/promises');
+vi.mock('@google/gemini-cli-core', () => ({
+    debugLogger: {
+        log: vi.fn(),
+        warn: vi.fn(),
+    },
+    GEMINI_DIR: '.gemini',
+}));
+describe('sandboxUtils', () => {
+    const originalEnv = process.env;
+    beforeEach(() => {
+        vi.clearAllMocks();
+        process.env = { ...originalEnv };
+        // Clean up these env vars that might affect tests
+        delete process.env['NODE_ENV'];
+        delete process.env['DEBUG'];
+    });
+    afterEach(() => {
+        process.env = originalEnv;
+    });
+    describe('getContainerPath', () => {
+        it('should return same path on non-Windows', () => {
+            vi.mocked(os.platform).mockReturnValue('linux');
+            expect(getContainerPath('/home/user')).toBe('/home/user');
+        });
+        it('should convert Windows path to container path', () => {
+            vi.mocked(os.platform).mockReturnValue('win32');
+            expect(getContainerPath('C:\\Users\\user')).toBe('/c/Users/user');
+        });
+        it('should handle Windows path without drive letter', () => {
+            vi.mocked(os.platform).mockReturnValue('win32');
+            expect(getContainerPath('\\Users\\user')).toBe('/Users/user');
+        });
+    });
+    describe('parseImageName', () => {
+        it('should parse image name with tag', () => {
+            expect(parseImageName('my-image:latest')).toBe('my-image-latest');
+        });
+        it('should parse image name without tag', () => {
+            expect(parseImageName('my-image')).toBe('my-image');
+        });
+        it('should handle registry path', () => {
+            expect(parseImageName('gcr.io/my-project/my-image:v1')).toBe('my-image-v1');
+        });
+    });
+    describe('ports', () => {
+        it('should return empty array if SANDBOX_PORTS is not set', () => {
+            delete process.env['SANDBOX_PORTS'];
+            expect(ports()).toEqual([]);
+        });
+        it('should parse comma-separated ports', () => {
+            process.env['SANDBOX_PORTS'] = '8080, 3000 , 9000';
+            expect(ports()).toEqual(['8080', '3000', '9000']);
+        });
+    });
+    describe('entrypoint', () => {
+        beforeEach(() => {
+            vi.mocked(os.platform).mockReturnValue('linux');
+            vi.mocked(fs.existsSync).mockReturnValue(false);
+        });
+        it('should generate default entrypoint', () => {
+            const args = entrypoint('/work', ['node', 'gemini', 'arg1']);
+            expect(args).toEqual(['bash', '-c', 'gemini arg1']);
+        });
+        it('should include PATH and PYTHONPATH if set', () => {
+            process.env['PATH'] = '/work/bin:/usr/bin';
+            process.env['PYTHONPATH'] = '/work/lib';
+            const args = entrypoint('/work', ['node', 'gemini', 'arg1']);
+            expect(args[2]).toContain('export PATH="$PATH:/work/bin"');
+            expect(args[2]).toContain('export PYTHONPATH="$PYTHONPATH:/work/lib"');
+        });
+        it('should source sandbox.bashrc if exists', () => {
+            vi.mocked(fs.existsSync).mockReturnValue(true);
+            const args = entrypoint('/work', ['node', 'gemini', 'arg1']);
+            expect(args[2]).toContain('source .gemini/sandbox.bashrc');
+        });
+        it('should include socat commands for ports', () => {
+            process.env['SANDBOX_PORTS'] = '8080';
+            const args = entrypoint('/work', ['node', 'gemini', 'arg1']);
+            expect(args[2]).toContain('socat TCP4-LISTEN:8080');
+        });
+        it('should use development command if NODE_ENV is development', () => {
+            process.env['NODE_ENV'] = 'development';
+            const args = entrypoint('/work', ['node', 'gemini', 'arg1']);
+            expect(args[2]).toContain('npm rebuild && npm run start --');
+        });
+    });
+    describe('shouldUseCurrentUserInSandbox', () => {
+        it('should return true if SANDBOX_SET_UID_GID is 1', async () => {
+            process.env['SANDBOX_SET_UID_GID'] = '1';
+            expect(await shouldUseCurrentUserInSandbox()).toBe(true);
+        });
+        it('should return false if SANDBOX_SET_UID_GID is 0', async () => {
+            process.env['SANDBOX_SET_UID_GID'] = '0';
+            expect(await shouldUseCurrentUserInSandbox()).toBe(false);
+        });
+        it('should return true on Debian Linux', async () => {
+            delete process.env['SANDBOX_SET_UID_GID'];
+            vi.mocked(os.platform).mockReturnValue('linux');
+            vi.mocked(readFile).mockResolvedValue('ID=debian\n');
+            expect(await shouldUseCurrentUserInSandbox()).toBe(true);
+        });
+        it('should return false on non-Linux', async () => {
+            delete process.env['SANDBOX_SET_UID_GID'];
+            vi.mocked(os.platform).mockReturnValue('darwin');
+            expect(await shouldUseCurrentUserInSandbox()).toBe(false);
+        });
+    });
+});
+//# sourceMappingURL=sandboxUtils.test.js.map

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

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

package/dist/src/utils/sessionCleanup.d.ts

@@ -0,0 +1,22 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { type Config } from '@google/gemini-cli-core';
+import type { Settings } from '../config/settings.js';
+export declare const DEFAULT_MIN_RETENTION: string;
+/**
+ * Result of session cleanup operation
+ */
+export interface CleanupResult {
+    disabled: boolean;
+    scanned: number;
+    deleted: number;
+    skipped: number;
+    failed: number;
+}
+/**
+ * Main entry point for session cleanup during CLI startup
+ */
+export declare function cleanupExpiredSessions(config: Config, settings: Settings): Promise<CleanupResult>;

package/dist/src/utils/sessionCleanup.integration.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};

package/dist/src/utils/sessionCleanup.integration.test.js

@@ -0,0 +1,182 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi } from 'vitest';
+import { cleanupExpiredSessions } from './sessionCleanup.js';
+import { SESSION_FILE_PREFIX } from '@google/gemini-cli-core';
+// Create a mock config for integration testing
+function createTestConfig() {
+    return {
+        storage: {
+            getProjectTempDir: () => '/tmp/nonexistent-test-dir',
+        },
+        getSessionId: () => 'test-session-id',
+        getDebugMode: () => false,
+        initialize: async () => undefined,
+    };
+}
+describe('Session Cleanup Integration', () => {
+    it('should gracefully handle non-existent directories', async () => {
+        const config = createTestConfig();
+        const settings = {
+            general: {
+                sessionRetention: {
+                    enabled: true,
+                    maxAge: '30d',
+                },
+            },
+        };
+        const result = await cleanupExpiredSessions(config, settings);
+        // Should return empty result for non-existent directory
+        expect(result.disabled).toBe(false);
+        expect(result.scanned).toBe(0);
+        expect(result.deleted).toBe(0);
+        expect(result.skipped).toBe(0);
+        expect(result.failed).toBe(0);
+    });
+    it('should not impact startup when disabled', async () => {
+        const config = createTestConfig();
+        const settings = {
+            general: {
+                sessionRetention: {
+                    enabled: false,
+                },
+            },
+        };
+        const result = await cleanupExpiredSessions(config, settings);
+        expect(result.disabled).toBe(true);
+        expect(result.scanned).toBe(0);
+        expect(result.deleted).toBe(0);
+        expect(result.skipped).toBe(0);
+        expect(result.failed).toBe(0);
+    });
+    it('should handle missing sessionRetention configuration', async () => {
+        // Create test session files to verify they are NOT deleted when config is missing
+        const fs = await import('node:fs/promises');
+        const path = await import('node:path');
+        const os = await import('node:os');
+        const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), 'gemini-test-'));
+        const chatsDir = path.join(tempDir, 'chats');
+        await fs.mkdir(chatsDir, { recursive: true });
+        // Create an old session file that would normally be deleted
+        const oldDate = new Date(Date.now() - 60 * 24 * 60 * 60 * 1000); // 60 days ago
+        const sessionFile = path.join(chatsDir, `${SESSION_FILE_PREFIX}2024-01-01T10-00-00-test123.json`);
+        await fs.writeFile(sessionFile, JSON.stringify({
+            sessionId: 'test123',
+            messages: [],
+            startTime: oldDate.toISOString(),
+            lastUpdated: oldDate.toISOString(),
+        }));
+        const config = createTestConfig();
+        config.storage.getProjectTempDir = vi.fn().mockReturnValue(tempDir);
+        const settings = {};
+        const result = await cleanupExpiredSessions(config, settings);
+        expect(result.disabled).toBe(true);
+        expect(result.scanned).toBe(0); // Should not even scan when config is missing
+        expect(result.deleted).toBe(0);
+        expect(result.skipped).toBe(0);
+        expect(result.failed).toBe(0);
+        // Verify the session file still exists (was not deleted)
+        const filesAfter = await fs.readdir(chatsDir);
+        expect(filesAfter).toContain(`${SESSION_FILE_PREFIX}2024-01-01T10-00-00-test123.json`);
+        // Cleanup
+        await fs.rm(tempDir, { recursive: true });
+    });
+    it('should validate configuration and fail gracefully', async () => {
+        const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => { });
+        const config = createTestConfig();
+        const settings = {
+            general: {
+                sessionRetention: {
+                    enabled: true,
+                    maxAge: 'invalid-format',
+                },
+            },
+        };
+        const result = await cleanupExpiredSessions(config, settings);
+        expect(result.disabled).toBe(true);
+        expect(result.scanned).toBe(0);
+        expect(result.deleted).toBe(0);
+        expect(result.skipped).toBe(0);
+        expect(result.failed).toBe(0);
+        // Verify error logging provides visibility into the validation failure
+        expect(errorSpy).toHaveBeenCalledWith(expect.stringContaining('Session cleanup disabled: Error: Invalid retention period format'));
+        errorSpy.mockRestore();
+    });
+    it('should clean up expired sessions when they exist', async () => {
+        // Create a temporary directory with test sessions
+        const fs = await import('node:fs/promises');
+        const path = await import('node:path');
+        const os = await import('node:os');
+        const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), 'gemini-test-'));
+        const chatsDir = path.join(tempDir, 'chats');
+        await fs.mkdir(chatsDir, { recursive: true });
+        // Create test session files with different ages
+        const now = new Date();
+        const oldDate = new Date(now.getTime() - 35 * 24 * 60 * 60 * 1000); // 35 days ago
+        const recentDate = new Date(now.getTime() - 5 * 24 * 60 * 60 * 1000); // 5 days ago
+        // Create an old session file that should be deleted
+        const oldSessionFile = path.join(chatsDir, `${SESSION_FILE_PREFIX}2024-12-01T10-00-00-old12345.json`);
+        await fs.writeFile(oldSessionFile, JSON.stringify({
+            sessionId: 'old12345',
+            messages: [{ type: 'user', content: 'test message' }],
+            startTime: oldDate.toISOString(),
+            lastUpdated: oldDate.toISOString(),
+        }));
+        // Create a recent session file that should be kept
+        const recentSessionFile = path.join(chatsDir, `${SESSION_FILE_PREFIX}2025-01-15T10-00-00-recent789.json`);
+        await fs.writeFile(recentSessionFile, JSON.stringify({
+            sessionId: 'recent789',
+            messages: [{ type: 'user', content: 'test message' }],
+            startTime: recentDate.toISOString(),
+            lastUpdated: recentDate.toISOString(),
+        }));
+        // Create a current session file that should always be kept
+        const currentSessionFile = path.join(chatsDir, `${SESSION_FILE_PREFIX}2025-01-20T10-00-00-current123.json`);
+        await fs.writeFile(currentSessionFile, JSON.stringify({
+            sessionId: 'current123',
+            messages: [{ type: 'user', content: 'test message' }],
+            startTime: now.toISOString(),
+            lastUpdated: now.toISOString(),
+        }));
+        // Configure test with real temp directory
+        const config = {
+            storage: {
+                getProjectTempDir: () => tempDir,
+            },
+            getSessionId: () => 'current123',
+            getDebugMode: () => false,
+            initialize: async () => undefined,
+        };
+        const settings = {
+            general: {
+                sessionRetention: {
+                    enabled: true,
+                    maxAge: '30d', // Keep sessions for 30 days
+                },
+            },
+        };
+        try {
+            const result = await cleanupExpiredSessions(config, settings);
+            // Verify the result
+            expect(result.disabled).toBe(false);
+            expect(result.scanned).toBe(3); // Should scan all 3 sessions
+            expect(result.deleted).toBe(1); // Should delete the old session (35 days old)
+            expect(result.skipped).toBe(2); // Should keep recent and current sessions
+            expect(result.failed).toBe(0);
+            // Verify files on disk
+            const remainingFiles = await fs.readdir(chatsDir);
+            expect(remainingFiles).toHaveLength(2); // Only 2 files should remain
+            expect(remainingFiles).toContain(`${SESSION_FILE_PREFIX}2025-01-15T10-00-00-recent789.json`);
+            expect(remainingFiles).toContain(`${SESSION_FILE_PREFIX}2025-01-20T10-00-00-current123.json`);
+            expect(remainingFiles).not.toContain(`${SESSION_FILE_PREFIX}2024-12-01T10-00-00-old12345.json`);
+        }
+        finally {
+            // Clean up test directory
+            await fs.rm(tempDir, { recursive: true, force: true });
+        }
+    });
+});
+//# sourceMappingURL=sessionCleanup.integration.test.js.map

package/dist/src/utils/sessionCleanup.integration.test.js.map

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

package/dist/src/utils/sessionCleanup.js

@@ -0,0 +1,214 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as fs from 'node:fs/promises';
+import * as path from 'node:path';
+import { debugLogger } from '@google/gemini-cli-core';
+import { getAllSessionFiles } from './sessionUtils.js';
+// Constants
+export const DEFAULT_MIN_RETENTION = '1d';
+const MIN_MAX_COUNT = 1;
+const MULTIPLIERS = {
+    h: 60 * 60 * 1000, // hours to ms
+    d: 24 * 60 * 60 * 1000, // days to ms
+    w: 7 * 24 * 60 * 60 * 1000, // weeks to ms
+    m: 30 * 24 * 60 * 60 * 1000, // months (30 days) to ms
+};
+/**
+ * Main entry point for session cleanup during CLI startup
+ */
+export async function cleanupExpiredSessions(config, settings) {
+    const result = {
+        disabled: false,
+        scanned: 0,
+        deleted: 0,
+        skipped: 0,
+        failed: 0,
+    };
+    try {
+        // Early exit if cleanup is disabled
+        if (!settings.general?.sessionRetention?.enabled) {
+            return { ...result, disabled: true };
+        }
+        const retentionConfig = settings.general.sessionRetention;
+        const chatsDir = path.join(config.storage.getProjectTempDir(), 'chats');
+        // Validate retention configuration
+        const validationErrorMessage = validateRetentionConfig(config, retentionConfig);
+        if (validationErrorMessage) {
+            // Log validation errors to console for visibility
+            console.error(`Session cleanup disabled: ${validationErrorMessage}`);
+            return { ...result, disabled: true };
+        }
+        // Get all session files (including corrupted ones) for this project
+        const allFiles = await getAllSessionFiles(chatsDir, config.getSessionId());
+        result.scanned = allFiles.length;
+        if (allFiles.length === 0) {
+            return result;
+        }
+        // Determine which sessions to delete (corrupted and expired)
+        const sessionsToDelete = await identifySessionsToDelete(allFiles, retentionConfig);
+        // Delete all sessions that need to be deleted
+        for (const sessionToDelete of sessionsToDelete) {
+            try {
+                const sessionPath = path.join(chatsDir, sessionToDelete.fileName);
+                await fs.unlink(sessionPath);
+                if (config.getDebugMode()) {
+                    if (sessionToDelete.sessionInfo === null) {
+                        debugLogger.debug(`Deleted corrupted session file: ${sessionToDelete.fileName}`);
+                    }
+                    else {
+                        debugLogger.debug(`Deleted expired session: ${sessionToDelete.sessionInfo.id} (${sessionToDelete.sessionInfo.lastUpdated})`);
+                    }
+                }
+                result.deleted++;
+            }
+            catch (error) {
+                // Ignore ENOENT errors (file already deleted)
+                if (error instanceof Error &&
+                    'code' in error &&
+                    error.code === 'ENOENT') {
+                    // File already deleted, do nothing.
+                }
+                else {
+                    // Log error directly to console
+                    const sessionId = sessionToDelete.sessionInfo === null
+                        ? sessionToDelete.fileName
+                        : sessionToDelete.sessionInfo.id;
+                    const errorMessage = error instanceof Error ? error.message : 'Unknown error';
+                    console.error(`Failed to delete session ${sessionId}: ${errorMessage}`);
+                    result.failed++;
+                }
+            }
+        }
+        result.skipped = result.scanned - result.deleted - result.failed;
+        if (config.getDebugMode() && result.deleted > 0) {
+            debugLogger.debug(`Session cleanup: deleted ${result.deleted}, skipped ${result.skipped}, failed ${result.failed}`);
+        }
+    }
+    catch (error) {
+        // Global error handler - don't let cleanup failures break startup
+        const errorMessage = error instanceof Error ? error.message : 'Unknown error';
+        console.error(`Session cleanup failed: ${errorMessage}`);
+        result.failed++;
+    }
+    return result;
+}
+/**
+ * Identifies sessions that should be deleted (corrupted or expired based on retention policy)
+ */
+async function identifySessionsToDelete(allFiles, retentionConfig) {
+    const sessionsToDelete = [];
+    // All corrupted files should be deleted
+    sessionsToDelete.push(...allFiles.filter((entry) => entry.sessionInfo === null));
+    // Now handle valid sessions based on retention policy
+    const validSessions = allFiles.filter((entry) => entry.sessionInfo !== null);
+    if (validSessions.length === 0) {
+        return sessionsToDelete;
+    }
+    const now = new Date();
+    // Calculate cutoff date for age-based retention
+    let cutoffDate = null;
+    if (retentionConfig.maxAge) {
+        try {
+            const maxAgeMs = parseRetentionPeriod(retentionConfig.maxAge);
+            cutoffDate = new Date(now.getTime() - maxAgeMs);
+        }
+        catch {
+            // This should not happen as validation should have caught it,
+            // but handle gracefully just in case
+            cutoffDate = null;
+        }
+    }
+    // Sort valid sessions by lastUpdated (newest first) for count-based retention
+    const sortedValidSessions = [...validSessions].sort((a, b) => new Date(b.sessionInfo.lastUpdated).getTime() -
+        new Date(a.sessionInfo.lastUpdated).getTime());
+    // Separate deletable sessions from the active session
+    const deletableSessions = sortedValidSessions.filter((entry) => !entry.sessionInfo.isCurrentSession);
+    // Calculate how many deletable sessions to keep (accounting for the active session)
+    const hasActiveSession = sortedValidSessions.some((e) => e.sessionInfo.isCurrentSession);
+    const maxDeletableSessions = retentionConfig.maxCount && hasActiveSession
+        ? Math.max(0, retentionConfig.maxCount - 1)
+        : retentionConfig.maxCount;
+    for (let i = 0; i < deletableSessions.length; i++) {
+        const entry = deletableSessions[i];
+        const session = entry.sessionInfo;
+        let shouldDelete = false;
+        // Age-based retention check
+        if (cutoffDate && new Date(session.lastUpdated) < cutoffDate) {
+            shouldDelete = true;
+        }
+        // Count-based retention check (keep only N most recent deletable sessions)
+        if (maxDeletableSessions !== undefined && i >= maxDeletableSessions) {
+            shouldDelete = true;
+        }
+        if (shouldDelete) {
+            sessionsToDelete.push(entry);
+        }
+    }
+    return sessionsToDelete;
+}
+/**
+ * Parses retention period strings like "30d", "7d", "24h" into milliseconds
+ * @throws {Error} If the format is invalid
+ */
+function parseRetentionPeriod(period) {
+    const match = period.match(/^(\d+)([dhwm])$/);
+    if (!match) {
+        throw new Error(`Invalid retention period format: ${period}. Expected format: <number><unit> where unit is h, d, w, or m`);
+    }
+    const value = parseInt(match[1], 10);
+    const unit = match[2];
+    // Reject zero values as they're semantically invalid
+    if (value === 0) {
+        throw new Error(`Invalid retention period: ${period}. Value must be greater than 0`);
+    }
+    return value * MULTIPLIERS[unit];
+}
+/**
+ * Validates retention configuration
+ */
+function validateRetentionConfig(config, retentionConfig) {
+    if (!retentionConfig.enabled) {
+        return 'Retention not enabled';
+    }
+    // Validate maxAge if provided
+    if (retentionConfig.maxAge) {
+        let maxAgeMs;
+        try {
+            maxAgeMs = parseRetentionPeriod(retentionConfig.maxAge);
+        }
+        catch (error) {
+            return error.toString();
+        }
+        // Enforce minimum retention period
+        const minRetention = retentionConfig.minRetention || DEFAULT_MIN_RETENTION;
+        let minRetentionMs;
+        try {
+            minRetentionMs = parseRetentionPeriod(minRetention);
+        }
+        catch (error) {
+            // If minRetention format is invalid, fall back to default
+            if (config.getDebugMode()) {
+                console.error(`Failed to parse minRetention: ${error}`);
+            }
+            minRetentionMs = parseRetentionPeriod(DEFAULT_MIN_RETENTION);
+        }
+        if (maxAgeMs < minRetentionMs) {
+            return `maxAge cannot be less than minRetention (${minRetention})`;
+        }
+    }
+    // Validate maxCount if provided
+    if (retentionConfig.maxCount !== undefined) {
+        if (retentionConfig.maxCount < MIN_MAX_COUNT) {
+            return `maxCount must be at least ${MIN_MAX_COUNT}`;
+        }
+    }
+    // At least one retention method must be specified
+    if (!retentionConfig.maxAge && retentionConfig.maxCount === undefined) {
+        return 'Either maxAge or maxCount must be specified';
+    }
+    return null;
+}
+//# sourceMappingURL=sessionCleanup.js.map

package/dist/src/utils/sessionCleanup.js.map

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

package/dist/src/utils/sessionCleanup.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};