@google/gemini-cli-core 0.34.0-preview.1 → 0.35.0-nightly.20260313.bb060d7a9

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;
     /**