@google/gemini-cli-core 0.34.0-preview.3 → 0.35.0-nightly.20260314.3038fdce2

package/dist/src/services/keychainService.test.js

@@ -3,27 +3,17 @@
  * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { describe, it, expect, vi, beforeEach, afterEach, } from 'vitest';
+import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { KeychainService } from './keychainService.js';
 import { coreEvents } from '../utils/events.js';
 import { debugLogger } from '../utils/debugLogger.js';
-import { FileKeychain } from './fileKeychain.js';
 const mockKeytar = {
     getPassword: vi.fn(),
     setPassword: vi.fn(),
     deletePassword: vi.fn(),
     findCredentials: vi.fn(),
 };
-const mockFileKeychain = {
-    getPassword: vi.fn(),
-    setPassword: vi.fn(),
-    deletePassword: vi.fn(),
-    findCredentials: vi.fn(),
-};
 vi.mock('keytar', () => ({ default: mockKeytar }));
-vi.mock('./fileKeychain.js', () => ({
-    FileKeychain: vi.fn(() => mockFileKeychain),
-}));
 vi.mock('../utils/events.js', () => ({
     coreEvents: { emitTelemetryKeychainAvailability: vi.fn() },
 }));
@@ -34,13 +24,11 @@ describe('KeychainService', () => {
     let service;
     const SERVICE_NAME = 'test-service';
     let passwords = {};
-    const originalEnv = process.env;
     beforeEach(() => {
         vi.clearAllMocks();
-        process.env = { ...originalEnv };
         service = new KeychainService(SERVICE_NAME);
         passwords = {};
-        // Stateful mock implementation for native keychain
+        // Stateful mock implementation to verify behavioral correctness
         mockKeytar.setPassword?.mockImplementation((_svc, acc, val) => {
             passwords[acc] = val;
             return Promise.resolve();
@@ -55,65 +43,35 @@ describe('KeychainService', () => {
             account,
             password,
         }))));
-        // Stateful mock implementation for fallback file keychain
-        mockFileKeychain.setPassword?.mockImplementation((_svc, acc, val) => {
-            passwords[acc] = val;
-            return Promise.resolve();
-        });
-        mockFileKeychain.getPassword?.mockImplementation((_svc, acc) => Promise.resolve(passwords[acc] ?? null));
-        mockFileKeychain.deletePassword?.mockImplementation((_svc, acc) => {
-            const exists = !!passwords[acc];
-            delete passwords[acc];
-            return Promise.resolve(exists);
-        });
-        mockFileKeychain.findCredentials?.mockImplementation(() => Promise.resolve(Object.entries(passwords).map(([account, password]) => ({
-            account,
-            password,
-        }))));
-    });
-    afterEach(() => {
-        process.env = originalEnv;
     });
     describe('isAvailable', () => {
-        it('should return true and emit telemetry on successful functional test with native keychain', async () => {
+        it('should return true and emit telemetry on successful functional test', async () => {
             const available = await service.isAvailable();
             expect(available).toBe(true);
             expect(mockKeytar.setPassword).toHaveBeenCalled();
             expect(coreEvents.emitTelemetryKeychainAvailability).toHaveBeenCalledWith(expect.objectContaining({ available: true }));
         });
-        it('should return true (via fallback), log error, and emit telemetry indicating native is unavailable on failed functional test', async () => {
+        it('should return false, log error, and emit telemetry on failed functional test', async () => {
             mockKeytar.setPassword?.mockRejectedValue(new Error('locked'));
             const available = await service.isAvailable();
-            // Because it falls back to FileKeychain, it is always available.
-            expect(available).toBe(true);
+            expect(available).toBe(false);
             expect(debugLogger.log).toHaveBeenCalledWith(expect.stringContaining('encountered an error'), 'locked');
             expect(coreEvents.emitTelemetryKeychainAvailability).toHaveBeenCalledWith(expect.objectContaining({ available: false }));
-            expect(debugLogger.log).toHaveBeenCalledWith(expect.stringContaining('Using FileKeychain fallback'));
-            expect(FileKeychain).toHaveBeenCalled();
         });
-        it('should return true (via fallback), log validation error, and emit telemetry on module load failure', async () => {
+        it('should return false, log validation error, and emit telemetry on module load failure', async () => {
             const originalMock = mockKeytar.getPassword;
             mockKeytar.getPassword = undefined; // Break schema
             const available = await service.isAvailable();
-            expect(available).toBe(true);
+            expect(available).toBe(false);
             expect(debugLogger.log).toHaveBeenCalledWith(expect.stringContaining('failed structural validation'), expect.objectContaining({ getPassword: expect.any(Array) }));
             expect(coreEvents.emitTelemetryKeychainAvailability).toHaveBeenCalledWith(expect.objectContaining({ available: false }));
-            expect(FileKeychain).toHaveBeenCalled();
             mockKeytar.getPassword = originalMock;
         });
-        it('should log failure if functional test cycle returns false, then fallback', async () => {
+        it('should log failure if functional test cycle returns false', async () => {
             mockKeytar.getPassword?.mockResolvedValue('wrong-password');
             const available = await service.isAvailable();
-            expect(available).toBe(true);
+            expect(available).toBe(false);
             expect(debugLogger.log).toHaveBeenCalledWith(expect.stringContaining('functional verification failed'));
-            expect(FileKeychain).toHaveBeenCalled();
-        });
-        it('should fallback to FileKeychain when GEMINI_FORCE_FILE_STORAGE is true', async () => {
-            process.env['GEMINI_FORCE_FILE_STORAGE'] = 'true';
-            const available = await service.isAvailable();
-            expect(available).toBe(true);
-            expect(FileKeychain).toHaveBeenCalled();
-            expect(coreEvents.emitTelemetryKeychainAvailability).toHaveBeenCalledWith(expect.objectContaining({ available: false }));
         });
         it('should cache the result and handle concurrent initialization attempts once', async () => {
             await Promise.all([
@@ -145,6 +103,18 @@ describe('KeychainService', () => {
             expect(await service.getPassword('missing')).toBeNull();
         });
     });
-    // Removing 'When Unavailable' tests since the service is always available via fallback
+    describe('When Unavailable', () => {
+        beforeEach(() => {
+            mockKeytar.setPassword?.mockRejectedValue(new Error('Unavailable'));
+        });
+        it.each([
+            { method: 'getPassword', args: ['acc'] },
+            { method: 'setPassword', args: ['acc', 'val'] },
+            { method: 'deletePassword', args: ['acc'] },
+            { method: 'findCredentials', args: [] },
+        ])('$method should throw a consistent error', async ({ method, args }) => {
+            await expect(service[method](...args)).rejects.toThrow('Keychain is not available');
+        });
+    });
 });
 //# sourceMappingURL=keychainService.test.js.map

package/dist/src/services/keychainService.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"keychainService.test.js","sourceRoot":"","sources":["../../../src/services/keychainService.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"keychainService.test.js","sourceRoot":"","sources":["../../../src/services/keychainService.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAa,MAAM,QAAQ,CAAC;AACzE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAStD,MAAM,UAAU,GAAiB;IAC/B,WAAW,EAAE,EAAE,CAAC,EAAE,EAAE;IACpB,WAAW,EAAE,EAAE,CAAC,EAAE,EAAE;IACpB,cAAc,EAAE,EAAE,CAAC,EAAE,EAAE;IACvB,eAAe,EAAE,EAAE,CAAC,EAAE,EAAE;CACzB,CAAC;AAEF,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;AAEnD,EAAE,CAAC,IAAI,CAAC,oBAAoB,EAAE,GAAG,EAAE,CAAC,CAAC;IACnC,UAAU,EAAE,EAAE,iCAAiC,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE;CAC3D,CAAC,CAAC,CAAC;AAEJ,EAAE,CAAC,IAAI,CAAC,yBAAyB,EAAE,GAAG,EAAE,CAAC,CAAC;IACxC,WAAW,EAAE,EAAE,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE;CAC9B,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC/B,IAAI,OAAwB,CAAC;IAC7B,MAAM,YAAY,GAAG,cAAc,CAAC;IACpC,IAAI,SAAS,GAA2B,EAAE,CAAC;IAE3C,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,aAAa,EAAE,CAAC;QACnB,OAAO,GAAG,IAAI,eAAe,CAAC,YAAY,CAAC,CAAC;QAC5C,SAAS,GAAG,EAAE,CAAC;QAEf,gEAAgE;QAChE,UAAU,CAAC,WAAW,EAAE,kBAAkB,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;YAC5D,SAAS,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;YACrB,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;QAC3B,CAAC,CAAC,CAAC;QACH,UAAU,CAAC,WAAW,EAAE,kBAAkB,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,CACvD,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,CACxC,CAAC;QACF,UAAU,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;YAC1D,MAAM,MAAM,GAAG,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;YAChC,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC;YACtB,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;QACH,UAAU,CAAC,eAAe,EAAE,kBAAkB,CAAC,GAAG,EAAE,CAClD,OAAO,CAAC,OAAO,CACb,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC;YACtD,OAAO;YACP,QAAQ;SACT,CAAC,CAAC,CACJ,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;QAC3B,EAAE,CAAC,qEAAqE,EAAE,KAAK,IAAI,EAAE;YACnF,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,WAAW,EAAE,CAAC;YAE9C,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC7B,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,gBAAgB,EAAE,CAAC;YAClD,MAAM,CAAC,UAAU,CAAC,iCAAiC,CAAC,CAAC,oBAAoB,CACvE,MAAM,CAAC,gBAAgB,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAC7C,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,8EAA8E,EAAE,KAAK,IAAI,EAAE;YAC5F,UAAU,CAAC,WAAW,EAAE,iBAAiB,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;YAE/D,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,WAAW,EAAE,CAAC;YAE9C,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC9B,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,oBAAoB,CAC1C,MAAM,CAAC,gBAAgB,CAAC,sBAAsB,CAAC,EAC/C,QAAQ,CACT,CAAC;YACF,MAAM,CAAC,UAAU,CAAC,iCAAiC,CAAC,CAAC,oBAAoB,CACvE,MAAM,CAAC,gBAAgB,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAC9C,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,sFAAsF,EAAE,KAAK,IAAI,EAAE;YACpG,MAAM,YAAY,GAAG,UAAU,CAAC,WAAW,CAAC;YAC5C,UAAU,CAAC,WAAW,GAAG,SAAS,CAAC,CAAC,eAAe;YAEnD,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,WAAW,EAAE,CAAC;YAE9C,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC9B,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,oBAAoB,CAC1C,MAAM,CAAC,gBAAgB,CAAC,8BAA8B,CAAC,EACvD,MAAM,CAAC,gBAAgB,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAC5D,CAAC;YACF,MAAM,CAAC,UAAU,CAAC,iCAAiC,CAAC,CAAC,oBAAoB,CACvE,MAAM,CAAC,gBAAgB,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAC9C,CAAC;YAEF,UAAU,CAAC,WAAW,GAAG,YAAY,CAAC;QACxC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,2DAA2D,EAAE,KAAK,IAAI,EAAE;YACzE,UAAU,CAAC,WAAW,EAAE,iBAAiB,CAAC,gBAAgB,CAAC,CAAC;YAE5D,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,WAAW,EAAE,CAAC;YAE9C,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC9B,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,oBAAoB,CAC1C,MAAM,CAAC,gBAAgB,CAAC,gCAAgC,CAAC,CAC1D,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,4EAA4E,EAAE,KAAK,IAAI,EAAE;YAC1F,MAAM,OAAO,CAAC,GAAG,CAAC;gBAChB,OAAO,CAAC,WAAW,EAAE;gBACrB,OAAO,CAAC,WAAW,EAAE;gBACrB,OAAO,CAAC,WAAW,EAAE;aACtB,CAAC,CAAC;YAEH,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAC1D,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;QACnC,UAAU,CAAC,KAAK,IAAI,EAAE;YACpB,MAAM,OAAO,CAAC,WAAW,EAAE,CAAC;YAC5B,EAAE,CAAC,aAAa,EAAE,CAAC;QACrB,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,wDAAwD,EAAE,KAAK,IAAI,EAAE;YACtE,MAAM,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;YAC7C,MAAM,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;YAE7C,MAAM,CAAC,MAAM,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC1D,MAAM,CAAC,MAAM,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAE1D,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,eAAe,EAAE,CAAC;YAC9C,MAAM,CAAC,KAAK,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;YAC9B,MAAM,CAAC,KAAK,CAAC,CAAC,cAAc,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,CAAC;YAEvE,MAAM,CAAC,MAAM,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACxD,MAAM,CAAC,MAAM,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;YACrD,MAAM,CAAC,MAAM,OAAO,CAAC,eAAe,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAC1D,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,kDAAkD,EAAE,KAAK,IAAI,EAAE;YAChE,MAAM,CAAC,MAAM,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC1D,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;QAChC,UAAU,CAAC,GAAG,EAAE;YACd,UAAU,CAAC,WAAW,EAAE,iBAAiB,CAAC,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC;QACtE,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,IAAI,CAAC;YACN,EAAE,MAAM,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,KAAK,CAAC,EAAE;YACxC,EAAE,MAAM,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE;YAC/C,EAAE,MAAM,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,KAAK,CAAC,EAAE;YAC3C,EAAE,MAAM,EAAE,iBAAiB,EAAE,IAAI,EAAE,EAAE,EAAE;SACxC,CAAC,CAAC,yCAAyC,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE;YACvE,MAAM,MAAM,CAER,OAID,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC,CACnB,CAAC,OAAO,CAAC,OAAO,CAAC,2BAA2B,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/src/services/sandboxManager.d.ts

@@ -0,0 +1,54 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { type EnvironmentSanitizationConfig } from './environmentSanitization.js';
+/**
+ * Request for preparing a command to run in a sandbox.
+ */
+export interface SandboxRequest {
+    /** The program to execute. */
+    command: string;
+    /** Arguments for the program. */
+    args: string[];
+    /** The working directory. */
+    cwd: string;
+    /** Environment variables to be passed to the program. */
+    env: NodeJS.ProcessEnv;
+    /** Optional sandbox-specific configuration. */
+    config?: {
+        sanitizationConfig?: Partial<EnvironmentSanitizationConfig>;
+    };
+}
+/**
+ * A command that has been prepared for sandboxed execution.
+ */
+export interface SandboxedCommand {
+    /** The program or wrapper to execute. */
+    program: string;
+    /** Final arguments for the program. */
+    args: string[];
+    /** Sanitized environment variables. */
+    env: NodeJS.ProcessEnv;
+}
+/**
+ * Interface for a service that prepares commands for sandboxed execution.
+ */
+export interface SandboxManager {
+    /**
+     * Prepares a command to run in a sandbox, including environment sanitization.
+     */
+    prepareCommand(req: SandboxRequest): Promise<SandboxedCommand>;
+}
+/**
+ * A no-op implementation of SandboxManager that silently passes commands
+ * through while applying environment sanitization.
+ */
+export declare class NoopSandboxManager implements SandboxManager {
+    /**
+     * Prepares a command by sanitizing the environment and passing through
+     * the original program and arguments.
+     */
+    prepareCommand(req: SandboxRequest): Promise<SandboxedCommand>;
+}

package/dist/src/services/sandboxManager.js

@@ -0,0 +1,30 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { sanitizeEnvironment, } from './environmentSanitization.js';
+/**
+ * A no-op implementation of SandboxManager that silently passes commands
+ * through while applying environment sanitization.
+ */
+export class NoopSandboxManager {
+    /**
+     * Prepares a command by sanitizing the environment and passing through
+     * the original program and arguments.
+     */
+    async prepareCommand(req) {
+        const sanitizationConfig = {
+            allowedEnvironmentVariables: req.config?.sanitizationConfig?.allowedEnvironmentVariables ?? [],
+            blockedEnvironmentVariables: req.config?.sanitizationConfig?.blockedEnvironmentVariables ?? [],
+            enableEnvironmentVariableRedaction: true, // Forced for safety
+        };
+        const sanitizedEnv = sanitizeEnvironment(req.env, sanitizationConfig);
+        return {
+            program: req.command,
+            args: req.args,
+            env: sanitizedEnv,
+        };
+    }
+}
+//# sourceMappingURL=sandboxManager.js.map

package/dist/src/services/sandboxManager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sandboxManager.js","sourceRoot":"","sources":["../../../src/services/sandboxManager.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,mBAAmB,GAEpB,MAAM,8BAA8B,CAAC;AA0CtC;;;GAGG;AACH,MAAM,OAAO,kBAAkB;IAC7B;;;OAGG;IACH,KAAK,CAAC,cAAc,CAAC,GAAmB;QACtC,MAAM,kBAAkB,GAAkC;YACxD,2BAA2B,EACzB,GAAG,CAAC,MAAM,EAAE,kBAAkB,EAAE,2BAA2B,IAAI,EAAE;YACnE,2BAA2B,EACzB,GAAG,CAAC,MAAM,EAAE,kBAAkB,EAAE,2BAA2B,IAAI,EAAE;YACnE,kCAAkC,EAAE,IAAI,EAAE,oBAAoB;SAC/D,CAAC;QAEF,MAAM,YAAY,GAAG,mBAAmB,CAAC,GAAG,CAAC,GAAG,EAAE,kBAAkB,CAAC,CAAC;QAEtE,OAAO;YACL,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,GAAG,EAAE,YAAY;SAClB,CAAC;IACJ,CAAC;CACF"}

package/dist/src/services/sandboxManager.test.d.ts

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

package/dist/src/services/sandboxManager.test.js

@@ -0,0 +1,95 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, expect, it } from 'vitest';
+import { NoopSandboxManager } from './sandboxManager.js';
+describe('NoopSandboxManager', () => {
+    const sandboxManager = new NoopSandboxManager();
+    it('should pass through the command and arguments unchanged', async () => {
+        const req = {
+            command: 'ls',
+            args: ['-la'],
+            cwd: '/tmp',
+            env: { PATH: '/usr/bin' },
+        };
+        const result = await sandboxManager.prepareCommand(req);
+        expect(result.program).toBe('ls');
+        expect(result.args).toEqual(['-la']);
+    });
+    it('should sanitize the environment variables', async () => {
+        const req = {
+            command: 'echo',
+            args: ['hello'],
+            cwd: '/tmp',
+            env: {
+                PATH: '/usr/bin',
+                GITHUB_TOKEN: 'ghp_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx',
+                MY_SECRET: 'super-secret',
+                SAFE_VAR: 'is-safe',
+            },
+        };
+        const result = await sandboxManager.prepareCommand(req);
+        expect(result.env['PATH']).toBe('/usr/bin');
+        expect(result.env['SAFE_VAR']).toBe('is-safe');
+        expect(result.env['GITHUB_TOKEN']).toBeUndefined();
+        expect(result.env['MY_SECRET']).toBeUndefined();
+    });
+    it('should force environment variable redaction even if not requested in config', async () => {
+        const req = {
+            command: 'echo',
+            args: ['hello'],
+            cwd: '/tmp',
+            env: {
+                API_KEY: 'sensitive-key',
+            },
+            config: {
+                sanitizationConfig: {
+                    enableEnvironmentVariableRedaction: false,
+                },
+            },
+        };
+        const result = await sandboxManager.prepareCommand(req);
+        expect(result.env['API_KEY']).toBeUndefined();
+    });
+    it('should respect allowedEnvironmentVariables in config', async () => {
+        const req = {
+            command: 'echo',
+            args: ['hello'],
+            cwd: '/tmp',
+            env: {
+                MY_TOKEN: 'secret-token',
+                OTHER_SECRET: 'another-secret',
+            },
+            config: {
+                sanitizationConfig: {
+                    allowedEnvironmentVariables: ['MY_TOKEN'],
+                },
+            },
+        };
+        const result = await sandboxManager.prepareCommand(req);
+        expect(result.env['MY_TOKEN']).toBe('secret-token');
+        expect(result.env['OTHER_SECRET']).toBeUndefined();
+    });
+    it('should respect blockedEnvironmentVariables in config', async () => {
+        const req = {
+            command: 'echo',
+            args: ['hello'],
+            cwd: '/tmp',
+            env: {
+                SAFE_VAR: 'safe-value',
+                BLOCKED_VAR: 'blocked-value',
+            },
+            config: {
+                sanitizationConfig: {
+                    blockedEnvironmentVariables: ['BLOCKED_VAR'],
+                },
+            },
+        };
+        const result = await sandboxManager.prepareCommand(req);
+        expect(result.env['SAFE_VAR']).toBe('safe-value');
+        expect(result.env['BLOCKED_VAR']).toBeUndefined();
+    });
+});
+//# sourceMappingURL=sandboxManager.test.js.map

package/dist/src/services/sandboxManager.test.js.map

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

package/dist/src/services/shellExecutionService.d.ts

@@ -3,8 +3,8 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { type AnsiOutput } from '../utils/terminalSerializer.js';
 import { type EnvironmentSanitizationConfig } from './environmentSanitization.js';
+import { type ExecutionHandle, type ExecutionOutputEvent, type ExecutionResult } from './executionLifecycleService.js';
 /**
  * An environment variable that is set for shell executions. This can be used
  * by downstream executables and scripts to identify that they were executed
@@ -17,33 +17,9 @@ export declare const GEMINI_CLI_IDENTIFICATION_ENV_VAR = "GEMINI_CLI";
 export declare const GEMINI_CLI_IDENTIFICATION_ENV_VAR_VALUE = "1";
 export declare const SCROLLBACK_LIMIT = 300000;
 /** A structured result from a shell command execution. */
-export interface ShellExecutionResult {
-    /** The raw, unprocessed output buffer. */
-    rawOutput: Buffer;
-    /** The combined, decoded output as a string. */
-    output: string;
-    /** The process exit code, or null if terminated by a signal. */
-    exitCode: number | null;
-    /** The signal that terminated the process, if any. */
-    signal: number | null;
-    /** An error object if the process failed to spawn. */
-    error: Error | null;
-    /** A boolean indicating if the command was aborted by the user. */
-    aborted: boolean;
-    /** The process ID of the spawned shell. */
-    pid: number | undefined;
-    /** The method used to execute the shell command. */
-    executionMethod: 'lydell-node-pty' | 'node-pty' | 'child_process' | 'none';
-    /** Whether the command was moved to the background. */
-    backgrounded?: boolean;
-}
+export type ShellExecutionResult = ExecutionResult;
 /** A handle for an ongoing shell execution. */
-export interface ShellExecutionHandle {
-    /** The process ID of the spawned shell. */
-    pid: number | undefined;
-    /** A promise that resolves with the complete execution result. */
-    result: Promise<ShellExecutionResult>;
-}
+export type ShellExecutionHandle = ExecutionHandle;
 export interface ShellExecutionConfig {
     terminalWidth?: number;
     terminalHeight?: number;
@@ -59,27 +35,7 @@ export interface ShellExecutionConfig {
 /**
  * Describes a structured event emitted during shell command execution.
  */
-export type ShellOutputEvent = {
-    /** The event contains a chunk of output data. */
-    type: 'data';
-    /** The decoded string chunk. */
-    chunk: string | AnsiOutput;
-} | {
-    /** Signals that the output stream has been identified as binary. */
-    type: 'binary_detected';
-} | {
-    /** Provides progress updates for a binary stream. */
-    type: 'binary_progress';
-    /** The total number of bytes received so far. */
-    bytesReceived: number;
-} | {
-    /** Signals that the process has exited. */
-    type: 'exit';
-    /** The exit code of the process, if any. */
-    exitCode: number | null;
-    /** The signal that terminated the process, if any. */
-    signal: number | null;
-};
+export type ShellOutputEvent = ExecutionOutputEvent;
 /**
  * A centralized service for executing shell commands with robust process
  * management, cross-platform compatibility, and streaming output capabilities.
@@ -90,13 +46,10 @@ export declare class ShellExecutionService {
     private static activeChildProcesses;
     private static backgroundLogPids;
     private static backgroundLogStreams;
-    private static exitedPtyInfo;
     static getLogDir(): string;
     static getLogFilePath(pid: number): string;
     private static syncBackgroundLog;
     private static cleanupLogStream;
-    private static activeResolvers;
-    private static activeListeners;
     /**
      * Executes a shell command using `node-pty`, capturing all output and lifecycle events.
      *
@@ -109,7 +62,6 @@ export declare class ShellExecutionService {
      */
     static execute(commandToExecute: string, cwd: string, onOutputEvent: (event: ShellOutputEvent) => void, abortSignal: AbortSignal, shouldUseNodePty: boolean, shellExecutionConfig: ShellExecutionConfig): Promise<ShellExecutionHandle>;
     private static appendAndTruncate;
-    private static emitEvent;
     private static childProcessFallback;
     private static executeWithPty;
     /**