@google/gemini-cli-core 0.23.0-preview.3 → 0.24.0-nightly.20251227.37be16243

package/dist/src/routing/strategies/overrideStrategy.js

@@ -3,7 +3,7 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { DEFAULT_GEMINI_MODEL_AUTO, getEffectiveModel, PREVIEW_GEMINI_MODEL_AUTO, } from '../../config/models.js';
+import { DEFAULT_GEMINI_MODEL_AUTO, PREVIEW_GEMINI_MODEL_AUTO, resolveModel, } from '../../config/models.js';
 /**
  * Handles cases where the user explicitly specifies a model (override).
  */
@@ -17,7 +17,7 @@ export class OverrideStrategy {
             return null;
         // Return the overridden model name.
         return {
-            model: getEffectiveModel(overrideModel, config.getPreviewFeatures()),
+            model: resolveModel(overrideModel, config.getPreviewFeatures()),
             metadata: {
                 source: this.name,
                 latencyMs: 0,

package/dist/src/routing/strategies/overrideStrategy.js.map

@@ -1 +1 @@
-{"version":3,"file":"overrideStrategy.js","sourceRoot":"","sources":["../../../../src/routing/strategies/overrideStrategy.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EACL,yBAAyB,EACzB,iBAAiB,EACjB,yBAAyB,GAC1B,MAAM,wBAAwB,CAAC;AAQhC;;GAEG;AACH,MAAM,OAAO,gBAAgB;IAClB,IAAI,GAAG,UAAU,CAAC;IAE3B,KAAK,CAAC,KAAK,CACT,QAAwB,EACxB,MAAc,EACd,cAA6B;QAE7B,MAAM,aAAa,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;QAExC,8DAA8D;QAC9D,IACE,aAAa,KAAK,yBAAyB;YAC3C,aAAa,KAAK,yBAAyB;YAE3C,OAAO,IAAI,CAAC;QAEd,oCAAoC;QACpC,OAAO;YACL,KAAK,EAAE,iBAAiB,CAAC,aAAa,EAAE,MAAM,CAAC,kBAAkB,EAAE,CAAC;YACpE,QAAQ,EAAE;gBACR,MAAM,EAAE,IAAI,CAAC,IAAI;gBACjB,SAAS,EAAE,CAAC;gBACZ,SAAS,EAAE,sDAAsD,aAAa,EAAE;aACjF;SACF,CAAC;IACJ,CAAC;CACF"}
+{"version":3,"file":"overrideStrategy.js","sourceRoot":"","sources":["../../../../src/routing/strategies/overrideStrategy.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EACL,yBAAyB,EACzB,yBAAyB,EACzB,YAAY,GACb,MAAM,wBAAwB,CAAC;AAQhC;;GAEG;AACH,MAAM,OAAO,gBAAgB;IAClB,IAAI,GAAG,UAAU,CAAC;IAE3B,KAAK,CAAC,KAAK,CACT,QAAwB,EACxB,MAAc,EACd,cAA6B;QAE7B,MAAM,aAAa,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;QAExC,8DAA8D;QAC9D,IACE,aAAa,KAAK,yBAAyB;YAC3C,aAAa,KAAK,yBAAyB;YAE3C,OAAO,IAAI,CAAC;QAEd,oCAAoC;QACpC,OAAO;YACL,KAAK,EAAE,YAAY,CAAC,aAAa,EAAE,MAAM,CAAC,kBAAkB,EAAE,CAAC;YAC/D,QAAQ,EAAE;gBACR,MAAM,EAAE,IAAI,CAAC,IAAI;gBACjB,SAAS,EAAE,CAAC;gBACZ,SAAS,EAAE,sDAAsD,aAAa,EAAE;aACjF;SACF,CAAC;IACJ,CAAC;CACF"}

package/dist/src/scheduler/types.d.ts

@@ -0,0 +1,95 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { Part } from '@google/genai';
+import type { AnyDeclarativeTool, AnyToolInvocation, ToolCallConfirmationDetails, ToolConfirmationOutcome, ToolResultDisplay } from '../tools/tools.js';
+import type { AnsiOutput } from '../utils/terminalSerializer.js';
+import type { ToolErrorType } from '../tools/tool-error.js';
+export interface ToolCallRequestInfo {
+    callId: string;
+    name: string;
+    args: Record<string, unknown>;
+    isClientInitiated: boolean;
+    prompt_id: string;
+    checkpoint?: string;
+    traceId?: string;
+}
+export interface ToolCallResponseInfo {
+    callId: string;
+    responseParts: Part[];
+    resultDisplay: ToolResultDisplay | undefined;
+    error: Error | undefined;
+    errorType: ToolErrorType | undefined;
+    outputFile?: string | undefined;
+    contentLength?: number;
+}
+export type ValidatingToolCall = {
+    status: 'validating';
+    request: ToolCallRequestInfo;
+    tool: AnyDeclarativeTool;
+    invocation: AnyToolInvocation;
+    startTime?: number;
+    outcome?: ToolConfirmationOutcome;
+};
+export type ScheduledToolCall = {
+    status: 'scheduled';
+    request: ToolCallRequestInfo;
+    tool: AnyDeclarativeTool;
+    invocation: AnyToolInvocation;
+    startTime?: number;
+    outcome?: ToolConfirmationOutcome;
+};
+export type ErroredToolCall = {
+    status: 'error';
+    request: ToolCallRequestInfo;
+    response: ToolCallResponseInfo;
+    tool?: AnyDeclarativeTool;
+    durationMs?: number;
+    outcome?: ToolConfirmationOutcome;
+};
+export type SuccessfulToolCall = {
+    status: 'success';
+    request: ToolCallRequestInfo;
+    tool: AnyDeclarativeTool;
+    response: ToolCallResponseInfo;
+    invocation: AnyToolInvocation;
+    durationMs?: number;
+    outcome?: ToolConfirmationOutcome;
+};
+export type ExecutingToolCall = {
+    status: 'executing';
+    request: ToolCallRequestInfo;
+    tool: AnyDeclarativeTool;
+    invocation: AnyToolInvocation;
+    liveOutput?: string | AnsiOutput;
+    startTime?: number;
+    outcome?: ToolConfirmationOutcome;
+    pid?: number;
+};
+export type CancelledToolCall = {
+    status: 'cancelled';
+    request: ToolCallRequestInfo;
+    response: ToolCallResponseInfo;
+    tool: AnyDeclarativeTool;
+    invocation: AnyToolInvocation;
+    durationMs?: number;
+    outcome?: ToolConfirmationOutcome;
+};
+export type WaitingToolCall = {
+    status: 'awaiting_approval';
+    request: ToolCallRequestInfo;
+    tool: AnyDeclarativeTool;
+    invocation: AnyToolInvocation;
+    confirmationDetails: ToolCallConfirmationDetails;
+    startTime?: number;
+    outcome?: ToolConfirmationOutcome;
+};
+export type Status = ToolCall['status'];
+export type ToolCall = ValidatingToolCall | ScheduledToolCall | ErroredToolCall | SuccessfulToolCall | ExecutingToolCall | CancelledToolCall | WaitingToolCall;
+export type CompletedToolCall = SuccessfulToolCall | CancelledToolCall | ErroredToolCall;
+export type ConfirmHandler = (toolCall: WaitingToolCall) => Promise<ToolConfirmationOutcome>;
+export type OutputUpdateHandler = (toolCallId: string, outputChunk: string | AnsiOutput) => void;
+export type AllToolCallsCompleteHandler = (completedToolCalls: CompletedToolCall[]) => Promise<void>;
+export type ToolCallsUpdateHandler = (toolCalls: ToolCall[]) => void;

package/dist/src/scheduler/types.js

@@ -0,0 +1,7 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};
+//# sourceMappingURL=types.js.map

package/dist/src/scheduler/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/scheduler/types.ts"],"names":[],"mappings":"AAAA;;;;GAIG"}

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

@@ -0,0 +1,15 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export type EnvironmentSanitizationConfig = {
+    allowedEnvironmentVariables: string[];
+    blockedEnvironmentVariables: string[];
+    enableEnvironmentVariableRedaction: boolean;
+};
+export declare function sanitizeEnvironment(processEnv: NodeJS.ProcessEnv, config: EnvironmentSanitizationConfig): NodeJS.ProcessEnv;
+export declare const ALWAYS_ALLOWED_ENVIRONMENT_VARIABLES: ReadonlySet<string>;
+export declare const NEVER_ALLOWED_ENVIRONMENT_VARIABLES: ReadonlySet<string>;
+export declare const NEVER_ALLOWED_NAME_PATTERNS: readonly [RegExp, RegExp, RegExp, RegExp, RegExp, RegExp, RegExp, RegExp, RegExp, RegExp];
+export declare const NEVER_ALLOWED_VALUE_PATTERNS: readonly [RegExp, RegExp, RegExp, RegExp, RegExp, RegExp, RegExp, RegExp, RegExp];

package/dist/src/services/environmentSanitization.js

@@ -0,0 +1,141 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export function sanitizeEnvironment(processEnv, config) {
+    if (!config.enableEnvironmentVariableRedaction) {
+        return { ...processEnv };
+    }
+    const results = {};
+    const allowedSet = new Set((config.allowedEnvironmentVariables || []).map((k) => k.toUpperCase()));
+    const blockedSet = new Set((config.blockedEnvironmentVariables || []).map((k) => k.toUpperCase()));
+    // Enable strict sanitization in GitHub actions.
+    const isStrictSanitization = !!processEnv['GITHUB_SHA'];
+    for (const key in processEnv) {
+        const value = processEnv[key];
+        if (!shouldRedactEnvironmentVariable(key, value, allowedSet, blockedSet, isStrictSanitization)) {
+            results[key] = value;
+        }
+    }
+    return results;
+}
+export const ALWAYS_ALLOWED_ENVIRONMENT_VARIABLES = new Set([
+    // Cross-platform
+    'PATH',
+    // Windows specific
+    'SYSTEMROOT',
+    'COMSPEC',
+    'PATHEXT',
+    'WINDIR',
+    'TEMP',
+    'TMP',
+    'USERPROFILE',
+    'SYSTEMDRIVE',
+    // Unix/Linux/macOS specific
+    'HOME',
+    'LANG',
+    'SHELL',
+    'TMPDIR',
+    'USER',
+    'LOGNAME',
+    // GitHub Action-related variables
+    'ADDITIONAL_CONTEXT',
+    'AVAILABLE_LABELS',
+    'BRANCH_NAME',
+    'DESCRIPTION',
+    'EVENT_NAME',
+    'GITHUB_ENV',
+    'IS_PULL_REQUEST',
+    'ISSUES_TO_TRIAGE',
+    'ISSUE_BODY',
+    'ISSUE_NUMBER',
+    'ISSUE_TITLE',
+    'PULL_REQUEST_NUMBER',
+    'REPOSITORY',
+    'TITLE',
+    'TRIGGERING_ACTOR',
+]);
+export const NEVER_ALLOWED_ENVIRONMENT_VARIABLES = new Set([
+    'CLIENT_ID',
+    'DB_URI',
+    'CONNECTION_STRING',
+    'AWS_DEFAULT_REGION',
+    'AZURE_CLIENT_ID',
+    'AZURE_TENANT_ID',
+    'SLACK_WEBHOOK_URL',
+    'TWILIO_ACCOUNT_SID',
+    'DATABASE_URL',
+    'GOOGLE_CLOUD_PROJECT',
+    'GOOGLE_CLOUD_ACCOUNT',
+    'FIREBASE_PROJECT_ID',
+]);
+export const NEVER_ALLOWED_NAME_PATTERNS = [
+    /TOKEN/i,
+    /SECRET/i,
+    /PASSWORD/i,
+    /PASSWD/i,
+    /KEY/i,
+    /AUTH/i,
+    /CREDENTIAL/i,
+    /CREDS/i,
+    /PRIVATE/i,
+    /CERT/i,
+];
+export const NEVER_ALLOWED_VALUE_PATTERNS = [
+    /-----BEGIN (RSA|OPENSSH|EC|PGP) PRIVATE KEY-----/i,
+    /-----BEGIN CERTIFICATE-----/i,
+    // Credentials in URL
+    /(https?|ftp|smtp):\/\/[^:]+:[^@]+@/i,
+    // GitHub tokens (classic, fine-grained, OAuth, etc.)
+    /(ghp|gho|ghu|ghs|ghr|github_pat)_[a-zA-Z0-9_]{36,}/i,
+    // Google API keys
+    /AIzaSy[a-zA-Z0-9_\\-]{33}/i,
+    // Amazon AWS Access Key ID
+    /AKIA[A-Z0-9]{16}/i,
+    // Generic OAuth/JWT tokens
+    /eyJ[a-zA-Z0-9_-]*\.[a-zA-Z0-9_-]*\.[a-zA-Z0-9_-]*/i,
+    // Stripe API keys
+    /(s|r)k_(live|test)_[0-9a-zA-Z]{24}/i,
+    // Slack tokens (bot, user, etc.)
+    /xox[abpr]-[a-zA-Z0-9-]+/i,
+];
+function shouldRedactEnvironmentVariable(key, value, allowedSet, blockedSet, isStrictSanitization = false) {
+    key = key.toUpperCase();
+    value = value?.toUpperCase();
+    // User overrides take precedence.
+    if (allowedSet?.has(key)) {
+        return false;
+    }
+    if (blockedSet?.has(key)) {
+        return true;
+    }
+    // These are never redacted.
+    if (ALWAYS_ALLOWED_ENVIRONMENT_VARIABLES.has(key) ||
+        key.startsWith('GEMINI_CLI_')) {
+        return false;
+    }
+    // These are always redacted.
+    if (NEVER_ALLOWED_ENVIRONMENT_VARIABLES.has(key)) {
+        return true;
+    }
+    // If in strict mode (e.g. GitHub Action), and not explicitly allowed, redact it.
+    if (isStrictSanitization) {
+        return true;
+    }
+    for (const pattern of NEVER_ALLOWED_NAME_PATTERNS) {
+        if (pattern.test(key)) {
+            return true;
+        }
+    }
+    // Redact if the value looks like a key/cert.
+    if (value) {
+        for (const pattern of NEVER_ALLOWED_VALUE_PATTERNS) {
+            if (pattern.test(value)) {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+//# sourceMappingURL=environmentSanitization.js.map

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

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

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

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

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

@@ -0,0 +1,284 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, expect, it } from 'vitest';
+import { ALWAYS_ALLOWED_ENVIRONMENT_VARIABLES, NEVER_ALLOWED_ENVIRONMENT_VARIABLES, NEVER_ALLOWED_NAME_PATTERNS, NEVER_ALLOWED_VALUE_PATTERNS, sanitizeEnvironment, } from './environmentSanitization.js';
+const EMPTY_OPTIONS = {
+    allowedEnvironmentVariables: [],
+    blockedEnvironmentVariables: [],
+    enableEnvironmentVariableRedaction: true,
+};
+describe('sanitizeEnvironment', () => {
+    it('should allow safe, common environment variables', () => {
+        const env = {
+            PATH: '/usr/bin',
+            HOME: '/home/user',
+            USER: 'user',
+            SystemRoot: 'C:\\Windows',
+            LANG: 'en_US.UTF-8',
+        };
+        const sanitized = sanitizeEnvironment(env, EMPTY_OPTIONS);
+        expect(sanitized).toEqual(env);
+    });
+    it('should allow variables prefixed with GEMINI_CLI_', () => {
+        const env = {
+            GEMINI_CLI_FOO: 'bar',
+            GEMINI_CLI_BAZ: 'qux',
+        };
+        const sanitized = sanitizeEnvironment(env, EMPTY_OPTIONS);
+        expect(sanitized).toEqual(env);
+    });
+    it('should redact variables with sensitive names from the denylist', () => {
+        const env = {
+            CLIENT_ID: 'sensitive-id',
+            DB_URI: 'sensitive-uri',
+            DATABASE_URL: 'sensitive-url',
+            SAFE_VAR: 'is-safe',
+        };
+        const sanitized = sanitizeEnvironment(env, EMPTY_OPTIONS);
+        expect(sanitized).toEqual({
+            SAFE_VAR: 'is-safe',
+        });
+    });
+    it('should redact variables with names matching all sensitive patterns (case-insensitive)', () => {
+        const env = {
+            // Patterns
+            MY_API_TOKEN: 'token-value',
+            AppSecret: 'secret-value',
+            db_password: 'password-value',
+            ORA_PASSWD: 'password-value',
+            ANOTHER_KEY: 'key-value',
+            some_auth_var: 'auth-value',
+            USER_CREDENTIAL: 'cred-value',
+            AWS_CREDS: 'creds-value',
+            PRIVATE_STUFF: 'private-value',
+            SSL_CERT: 'cert-value',
+            // Safe variable
+            USEFUL_INFO: 'is-ok',
+        };
+        const sanitized = sanitizeEnvironment(env, EMPTY_OPTIONS);
+        expect(sanitized).toEqual({
+            USEFUL_INFO: 'is-ok',
+        });
+    });
+    it('should redact variables with values matching all private key patterns', () => {
+        const env = {
+            RSA_KEY: '-----BEGIN RSA PRIVATE KEY-----...',
+            OPENSSH_KEY: '-----BEGIN OPENSSH PRIVATE KEY-----...',
+            EC_KEY: '-----BEGIN EC PRIVATE KEY-----...',
+            PGP_KEY: '-----BEGIN PGP PRIVATE KEY-----...',
+            CERTIFICATE: '-----BEGIN CERTIFICATE-----...',
+            SAFE_VAR: 'is-safe',
+        };
+        const sanitized = sanitizeEnvironment(env, EMPTY_OPTIONS);
+        expect(sanitized).toEqual({
+            SAFE_VAR: 'is-safe',
+        });
+    });
+    it('should redact variables with values matching all token and credential patterns', () => {
+        const env = {
+            // GitHub
+            GITHUB_TOKEN_GHP: 'ghp_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx',
+            GITHUB_TOKEN_GHO: 'gho_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx',
+            GITHUB_TOKEN_GHU: 'ghu_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx',
+            GITHUB_TOKEN_GHS: 'ghs_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx',
+            GITHUB_TOKEN_GHR: 'ghr_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx',
+            GITHUB_PAT: 'github_pat_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx',
+            // Google
+            GOOGLE_KEY: 'AIzaSyxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx',
+            // AWS
+            AWS_KEY: 'AKIAxxxxxxxxxxxxxxxx',
+            // JWT
+            JWT_TOKEN: 'eyJhbGciOiJIUzI1NiJ9.e30.ZRrHA157xAA_7962-a_3rA',
+            // Stripe
+            STRIPE_SK_LIVE: 'sk_live_xxxxxxxxxxxxxxxxxxxxxxxx',
+            STRIPE_RK_LIVE: 'rk_live_xxxxxxxxxxxxxxxxxxxxxxxx',
+            STRIPE_SK_TEST: 'sk_test_xxxxxxxxxxxxxxxxxxxxxxxx',
+            STRIPE_RK_TEST: 'rk_test_xxxxxxxxxxxxxxxxxxxxxxxx',
+            // Slack
+            SLACK_XOXB: 'xoxb-xxxxxxxxxxxx-xxxxxxxxxxxx-xxxxxxxx',
+            SLACK_XOXA: 'xoxa-xxxxxxxxxxxx-xxxxxxxxxxxx-xxxxxxxx',
+            SLACK_XOXP: 'xoxp-xxxxxxxxxxxx-xxxxxxxxxxxx-xxxxxxxx',
+            SLACK_XOXB_2: 'xoxr-xxxxxxxxxxxx-xxxxxxxxxxxx-xxxxxxxx',
+            // URL Credentials
+            CREDS_IN_HTTPS_URL: 'https://user:password@example.com',
+            CREDS_IN_HTTP_URL: 'http://user:password@example.com',
+            CREDS_IN_FTP_URL: 'ftp://user:password@example.com',
+            CREDS_IN_SMTP_URL: 'smtp://user:password@example.com',
+            // Safe variable
+            SAFE_VAR: 'is-safe',
+        };
+        const sanitized = sanitizeEnvironment(env, EMPTY_OPTIONS);
+        expect(sanitized).toEqual({
+            SAFE_VAR: 'is-safe',
+        });
+    });
+    it('should not redact variables that look similar to sensitive patterns', () => {
+        const env = {
+            // Not a credential in URL
+            SAFE_URL: 'https://example.com/foo/bar',
+            // Not a real JWT
+            NOT_A_JWT: 'this.is.not.a.jwt',
+            // Too short to be a token
+            ALMOST_A_TOKEN: 'ghp_12345',
+            // Contains a sensitive word, but in a safe context in the value
+            PUBLIC_KEY_INFO: 'This value describes a public key',
+            // Variable names that could be false positives
+            KEYNOTE_SPEAKER: 'Dr. Jane Goodall',
+            CERTIFIED_DIVER: 'true',
+            AUTHENTICATION_FLOW: 'oauth',
+            PRIVATE_JET_OWNER: 'false',
+        };
+        const sanitized = sanitizeEnvironment(env, EMPTY_OPTIONS);
+        expect(sanitized).toEqual({
+            SAFE_URL: 'https://example.com/foo/bar',
+            NOT_A_JWT: 'this.is.not.a.jwt',
+        });
+    });
+    it('should not redact variables with undefined or empty values if name is safe', () => {
+        const env = {
+            EMPTY_VAR: '',
+            UNDEFINED_VAR: undefined,
+            ANOTHER_SAFE_VAR: 'value',
+        };
+        const sanitized = sanitizeEnvironment(env, EMPTY_OPTIONS);
+        expect(sanitized).toEqual({
+            EMPTY_VAR: '',
+            ANOTHER_SAFE_VAR: 'value',
+        });
+    });
+    it('should allow variables that do not match any redaction rules', () => {
+        const env = {
+            NODE_ENV: 'development',
+            APP_VERSION: '1.0.0',
+        };
+        const sanitized = sanitizeEnvironment(env, EMPTY_OPTIONS);
+        expect(sanitized).toEqual(env);
+    });
+    it('should handle an empty environment', () => {
+        const env = {};
+        const sanitized = sanitizeEnvironment(env, EMPTY_OPTIONS);
+        expect(sanitized).toEqual({});
+    });
+    it('should handle a mixed environment with allowed and redacted variables', () => {
+        const env = {
+            // Allowed
+            PATH: '/usr/bin',
+            HOME: '/home/user',
+            GEMINI_CLI_VERSION: '1.2.3',
+            NODE_ENV: 'production',
+            // Redacted by name
+            API_KEY: 'should-be-redacted',
+            MY_SECRET: 'super-secret',
+            // Redacted by value
+            GH_TOKEN: 'ghp_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx',
+            JWT: 'eyJhbGciOiJIUzI1NiJ9.e30.ZRrHA157xAA_7962-a_3rA',
+            // Allowed by name but redacted by value
+            RANDOM_VAR: '-----BEGIN CERTIFICATE-----...',
+        };
+        const sanitized = sanitizeEnvironment(env, EMPTY_OPTIONS);
+        expect(sanitized).toEqual({
+            PATH: '/usr/bin',
+            HOME: '/home/user',
+            GEMINI_CLI_VERSION: '1.2.3',
+            NODE_ENV: 'production',
+        });
+    });
+    it('should ensure all names in the sets are capitalized', () => {
+        for (const name of ALWAYS_ALLOWED_ENVIRONMENT_VARIABLES) {
+            expect(name).toBe(name.toUpperCase());
+        }
+        for (const name of NEVER_ALLOWED_ENVIRONMENT_VARIABLES) {
+            expect(name).toBe(name.toUpperCase());
+        }
+    });
+    it('should ensure all of the regex in the patterns lists are case insensitive', () => {
+        for (const pattern of NEVER_ALLOWED_NAME_PATTERNS) {
+            expect(pattern.flags).toContain('i');
+        }
+        for (const pattern of NEVER_ALLOWED_VALUE_PATTERNS) {
+            expect(pattern.flags).toContain('i');
+        }
+    });
+    it('should allow variables specified in allowedEnvironmentVariables', () => {
+        const env = {
+            MY_TOKEN: 'secret-token',
+            OTHER_SECRET: 'another-secret',
+        };
+        const allowed = ['MY_TOKEN'];
+        const sanitized = sanitizeEnvironment(env, {
+            allowedEnvironmentVariables: allowed,
+            blockedEnvironmentVariables: [],
+            enableEnvironmentVariableRedaction: true,
+        });
+        expect(sanitized).toEqual({
+            MY_TOKEN: 'secret-token',
+        });
+    });
+    it('should block variables specified in blockedEnvironmentVariables', () => {
+        const env = {
+            SAFE_VAR: 'safe-value',
+            BLOCKED_VAR: 'blocked-value',
+        };
+        const blocked = ['BLOCKED_VAR'];
+        const sanitized = sanitizeEnvironment(env, {
+            allowedEnvironmentVariables: [],
+            blockedEnvironmentVariables: blocked,
+            enableEnvironmentVariableRedaction: true,
+        });
+        expect(sanitized).toEqual({
+            SAFE_VAR: 'safe-value',
+        });
+    });
+    it('should prioritize allowed over blocked if a variable is in both (though user configuration should avoid this)', () => {
+        const env = {
+            CONFLICT_VAR: 'value',
+        };
+        const allowed = ['CONFLICT_VAR'];
+        const blocked = ['CONFLICT_VAR'];
+        const sanitized = sanitizeEnvironment(env, {
+            allowedEnvironmentVariables: allowed,
+            blockedEnvironmentVariables: blocked,
+            enableEnvironmentVariableRedaction: true,
+        });
+        expect(sanitized).toEqual({
+            CONFLICT_VAR: 'value',
+        });
+    });
+    it('should be case insensitive for allowed and blocked lists', () => {
+        const env = {
+            MY_TOKEN: 'secret-token',
+            BLOCKED_VAR: 'blocked-value',
+        };
+        const allowed = ['my_token'];
+        const blocked = ['blocked_var'];
+        const sanitized = sanitizeEnvironment(env, {
+            allowedEnvironmentVariables: allowed,
+            blockedEnvironmentVariables: blocked,
+            enableEnvironmentVariableRedaction: true,
+        });
+        expect(sanitized).toEqual({
+            MY_TOKEN: 'secret-token',
+        });
+    });
+    it('should not perform any redaction if enableEnvironmentVariableRedaction is false', () => {
+        const env = {
+            MY_API_TOKEN: 'token-value',
+            AppSecret: 'secret-value',
+            db_password: 'password-value',
+            RSA_KEY: '-----BEGIN RSA PRIVATE KEY-----...',
+            GITHUB_TOKEN_GHP: 'ghp_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx',
+            SAFE_VAR: 'is-safe',
+        };
+        const options = {
+            allowedEnvironmentVariables: [],
+            blockedEnvironmentVariables: [],
+            enableEnvironmentVariableRedaction: false,
+        };
+        const sanitized = sanitizeEnvironment(env, options);
+        expect(sanitized).toEqual(env);
+    });
+});
+//# sourceMappingURL=environmentSanitization.test.js.map

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

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

package/dist/src/services/gitService.js

@@ -8,6 +8,7 @@ import * as path from 'node:path';
 import { isNodeError } from '../utils/errors.js';
 import { spawnAsync } from '../utils/shell-utils.js';
 import { simpleGit, CheckRepoActions } from 'simple-git';
+import { debugLogger } from '../utils/debugLogger.js';
 export class GitService {
     projectRoot;
     storage;
@@ -52,7 +53,15 @@ export class GitService {
         const gitConfigContent = '[user]\n  name = Gemini CLI\n  email = gemini-cli@google.com\n[commit]\n  gpgsign = false\n';
         await fs.writeFile(gitConfigPath, gitConfigContent);
         const repo = simpleGit(repoDir);
-        const isRepoDefined = await repo.checkIsRepo(CheckRepoActions.IS_REPO_ROOT);
+        let isRepoDefined = false;
+        try {
+            isRepoDefined = await repo.checkIsRepo(CheckRepoActions.IS_REPO_ROOT);
+        }
+        catch (error) {
+            // If checkIsRepo fails (e.g., on certain Git versions like macOS 2.39.5),
+            // log the error and assume repo is not defined, then proceed with initialization
+            debugLogger.debug(`checkIsRepo failed, will initialize repository: ${error instanceof Error ? error.message : String(error)}`);
+        }
         if (!isRepoDefined) {
             await repo.init(false, {
                 '--initial-branch': 'main',

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

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