@google/gemini-cli 0.39.0 → 0.39.1

package/bundle/docs/cli/cli-reference.md

@@ -52,6 +52,7 @@ These commands are available within the interactive REPL.
 | `--prompt-interactive`           | `-i`  | string  | -         | Execute prompt and continue in interactive mode                                                                                                                        |
 | `--worktree`                     | `-w`  | string  | -         | Start Gemini in a new git worktree. If no name is provided, one is generated automatically. Requires `experimental.worktrees: true` in settings.                       |
 | `--sandbox`                      | `-s`  | boolean | `false`   | Run in a sandboxed environment for safer execution                                                                                                                     |
+| `--skip-trust`                   | -     | boolean | `false`   | Trust the current workspace for this session, skipping the folder trust check.                                                                                         |
 | `--approval-mode`                | -     | string  | `default` | Approval mode for tool execution. Choices: `default`, `auto_edit`, `yolo`, `plan`                                                                                      |
 | `--yolo`                         | `-y`  | boolean | `false`   | **Deprecated.** Auto-approve all actions. Use `--approval-mode=yolo` instead.                                                                                          |
 | `--experimental-acp`             | -     | boolean | -         | Start in ACP (Agent Code Pilot) mode. **Experimental feature.**                                                                                                        |

package/bundle/docs/cli/trusted-folders.md

@@ -100,6 +100,34 @@ protect you. In this mode, the following features are disabled:
 Granting trust to a folder unlocks the full functionality of Gemini CLI for that
 workspace.
 
+## Headless and automated environments
+
+When running Gemini CLI in a headless environment (for example, a CI/CD
+pipeline) where interactive prompts are not possible, the trust dialog cannot be
+displayed. If the folder is untrusted and the Folder Trust feature is enabled,
+the CLI will throw a `FatalUntrustedWorkspaceError` and exit.
+
+To proceed in these environments, you can bypass the trust check using one of
+the following methods:
+
+- **Command-line flag:** Run the CLI with the `--skip-trust` flag.
+- **Environment variable:** Set the `GEMINI_CLI_TRUST_WORKSPACE=true`
+  environment variable.
+
+These methods will trust the current workspace for the duration of the session
+without prompting.
+
+For detailed instructions on managing folder trust within CI/CD workflows,
+review the
+[Gemini CLI trust guidance for GitHub Actions](https://github.com/google-github-actions/run-gemini-cli/blob/main/docs/trust-guidance.md).
+
+## Overriding the trust file location
+
+By default, trust settings are saved to `~/.gemini/trustedFolders.json`. If you
+need to store this file in a different location, you can set the
+`GEMINI_CLI_TRUSTED_FOLDERS_PATH` environment variable to the desired absolute
+file path.
+
 ## Managing your trust settings
 
 If you need to change a decision or see all your settings, you have a couple of

package/bundle/docs/reference/configuration.md

@@ -1437,6 +1437,12 @@ their corresponding top-level category object in your `settings.json` file.
   - **Default:** `undefined`
   - **Requires restart:** Yes
 
+- **`tools.confirmationRequired`** (array):
+  - **Description:** Tool names that always require user confirmation. Takes
+    precedence over allowed tools and core tool allowlists.
+  - **Default:** `undefined`
+  - **Requires restart:** Yes
+
 - **`tools.exclude`** (array):
   - **Description:** Tool names to exclude from discovery.
   - **Default:** `undefined`
@@ -2099,6 +2105,14 @@ the `advanced.excludedEnvVars` setting in your `settings.json` file.
   - Overrides the hardcoded default
   - Example: `export GEMINI_MODEL="gemini-3-flash-preview"` (Windows PowerShell:
     `$env:GEMINI_MODEL="gemini-3-flash-preview"`)
+- **`GEMINI_CLI_TRUST_WORKSPACE`**:
+  - If set to `"true"`, trusts the current workspace for the duration of the
+    session, bypassing the folder trust check.
+  - Useful for headless environments (for example, CI/CD pipelines).
+- **`GEMINI_CLI_TRUSTED_FOLDERS_PATH`**:
+  - Overrides the default location for the `trustedFolders.json` file.
+  - Useful if you want to store this configuration in a custom location instead
+    of the default `~/.gemini/`.
 - **`GEMINI_CLI_IDE_PID`**:
   - Manually specifies the PID of the IDE process to use for integration. This
     is useful when running Gemini CLI in a standalone terminal while still

package/bundle/{gemini-BI2PCDUT.js → gemini-APY42TPN.js}

@@ -25,7 +25,6 @@ import {
   configureSpecificSetting,
   disableSkill,
   enableSkill,
-  execa,
   formatRelativeTime,
   getExtensionManager,
   getThemeTypeFromBackgroundColor,
@@ -35,6 +34,7 @@ import {
   installSkill,
   isAlternateBufferEnabled,
   isFolderTrustEnabled,
+  isRecord,
   isSlashCommand,
   isWorkspaceTrusted,
   isWorktreeEnabled,
@@ -58,7 +58,7 @@ import {
   updateAllUpdatableExtensions,
   updateExtension,
   validateAuthMethod
-} from "./chunk-NWD4JYMB.js";
+} from "./chunk-QPDKVNK5.js";
 import {
   appEvents
 } from "./chunk-5PS3AYFU.js";
@@ -70,7 +70,7 @@ import {
   runExitCleanup,
   runSyncCleanup,
   setupSignalHandlers
-} from "./chunk-BL3XXS2L.js";
+} from "./chunk-RVSGPQMZ.js";
 import {
   AuthType,
   ChatRecordingService,
@@ -102,6 +102,7 @@ import {
   StreamEventType,
   StreamJsonFormatter,
   ToolCallEvent,
+  TrustLevel,
   UserAccountManager,
   UserPromptEvent,
   ValidationCancelledError,
@@ -121,6 +122,7 @@ import {
   createWorktreeService,
   detectIdeFromEnv,
   displayContentToString,
+  execa,
   external_exports as external_exports2,
   geminiPartsToContentParts,
   generalistProfile,
@@ -167,7 +169,7 @@ import {
   updatePolicy,
   writeToStderr,
   writeToStdout
-} from "./chunk-UQGLVPZQ.js";
+} from "./chunk-UGFPG7AM.js";
 import {
   ASK_USER_TOOL_NAME,
   ApprovalMode,
@@ -188,6 +190,7 @@ import {
   FatalSandboxError,
   FatalToolExecutionError,
   FatalTurnLimitedError,
+  FatalUntrustedWorkspaceError,
   GEMINI_DIR,
   GEMINI_MODEL_ALIAS_AUTO,
   Kind,
@@ -214,7 +217,7 @@ import {
   loadServerHierarchicalMemory,
   resolveToRealPath,
   setGeminiMdFilename
-} from "./chunk-67TFD6HC.js";
+} from "./chunk-FNPZLVJU.js";
 import "./chunk-664ZODQF.js";
 import "./chunk-RJTRUG2J.js";
 import "./chunk-IUUIT4SU.js";
@@ -5901,7 +5904,7 @@ async function handleInstall(args) {
         );
         if (confirmed) {
           const trustedFolders = loadTrustedFolders();
-          await trustedFolders.setValue(realPath, "TRUST_FOLDER" /* TRUST_FOLDER */);
+          await trustedFolders.setValue(realPath, TrustLevel.TRUST_FOLDER);
         } else {
           throw new Error(
             `Installation aborted: Folder "${absolutePath}" is not trusted.`
@@ -7475,6 +7478,10 @@ async function parseArguments(settings) {
       type: "string",
       nargs: 1,
       description: "Execute the provided prompt and continue in interactive mode"
+    }).option("skip-trust", {
+      type: "boolean",
+      description: "Trust the current workspace for this session.",
+      default: false
     }).option("worktree", {
       alias: "w",
       type: "string",
@@ -7596,9 +7603,16 @@ async function parseArguments(settings) {
   yargsInstance.wrap(yargsInstance.terminalWidth());
   let result;
   try {
-    result = await yargsInstance.parse();
+    const parsed = await yargsInstance.parse();
+    if (!isRecord(parsed)) {
+      throw new Error("Failed to parse arguments");
+    }
+    result = parsed;
+    if (result["skip-trust"]) {
+      process3.env["GEMINI_CLI_TRUST_WORKSPACE"] = "true";
+    }
   } catch (e) {
-    const msg = e instanceof Error ? e.message : String(e);
+    const msg = getErrorMessage(e);
     debugLogger.error(msg);
     yargsInstance.showHelp();
     await runExitCleanup();
@@ -7608,8 +7622,13 @@ async function parseArguments(settings) {
     await runExitCleanup();
     process3.exit(0);
   }
-  const queryArg = result.query;
-  const q = Array.isArray(queryArg) ? queryArg.join(" ") : queryArg;
+  const queryArg = result["query"];
+  let q;
+  if (Array.isArray(queryArg)) {
+    q = queryArg.join(" ");
+  } else if (typeof queryArg === "string") {
+    q = queryArg;
+  }
   if (q && !result["prompt"]) {
     if (!isHeadlessMode()) {
       startupMessages.push(
@@ -7640,7 +7659,7 @@ async function loadCliConfig(settings, sessionId, argv, options = {}) {
   const includeDirectoryTree = settings.context?.includeDirectoryTree ?? true;
   const ideMode = settings.ide?.enabled ?? false;
   const folderTrust = process3.env["GEMINI_CLI_INTEGRATION_TEST"] === "true" || process3.env["VITEST"] === "true" ? false : settings.security?.folderTrust?.enabled ?? false;
-  const trustedFolder = isWorkspaceTrusted(settings, cwd, void 0, {
+  const trustedFolder = isWorkspaceTrusted(settings, cwd, {
     prompt: argv.prompt,
     query: argv.query
   })?.isTrusted ?? false;
@@ -7669,7 +7688,7 @@ async function loadCliConfig(settings, sessionId, argv, options = {}) {
         return resolveToRealPath(trimmedPath) !== realCwd;
       } catch (e) {
         debugLogger.debug(
-          `[IDE] Skipping inaccessible workspace folder: ${trimmedPath} (${e instanceof Error ? e.message : String(e)})`
+          `[IDE] Skipping inaccessible workspace folder: ${trimmedPath} (${getErrorMessage(e)})`
         );
         return false;
       }
@@ -8060,7 +8079,7 @@ async function resolveWorktreeSettings(cwd) {
     worktreeBaseSha = stdout.trim();
   } catch (e) {
     debugLogger.debug(
-      `Failed to resolve worktree base SHA at ${worktreePath}: ${e instanceof Error ? e.message : String(e)}`
+      `Failed to resolve worktree base SHA at ${worktreePath}: ${getErrorMessage(e)}`
     );
   }
   if (!worktreeBaseSha) {
@@ -9195,9 +9214,29 @@ var rootDirectoryCheck = {
     }
   }
 };
+var folderTrustCheck = {
+  id: "folder-trust",
+  priority: WarningPriority.High,
+  check: async (workspaceRoot, settings) => {
+    if (!isFolderTrustEnabled(settings)) {
+      return null;
+    }
+    const { isTrusted } = isWorkspaceTrusted(settings, workspaceRoot);
+    if (isTrusted === true) {
+      return null;
+    }
+    if (isHeadlessMode()) {
+      throw new FatalUntrustedWorkspaceError(
+        "Gemini CLI is not running in a trusted directory. To proceed, either use `--skip-trust`, set the `GEMINI_CLI_TRUST_WORKSPACE=true` environment variable, or trust this directory in interactive mode. For more details, see https://geminicli.com/docs/cli/trusted-folders/#headless-and-automated-environments"
+      );
+    }
+    return null;
+  }
+};
 var WARNING_CHECKS = [
   homeDirectoryCheck,
-  rootDirectoryCheck
+  rootDirectoryCheck,
+  folderTrustCheck
 ];
 async function getUserStartupWarnings(settings, workspaceRoot = process4.cwd(), options) {
   const results = await Promise.all(
@@ -9562,7 +9601,7 @@ async function runNonInteractive({
       }
     });
     if (process.env["GEMINI_CLI_ACTIVITY_LOG_TARGET"]) {
-      const { setupInitialActivityLogger } = await import("./devtoolsService-H64VB4IA.js");
+      const { setupInitialActivityLogger } = await import("./devtoolsService-OIMHTGLW.js");
       await setupInitialActivityLogger(config);
     }
     const { stdout: workingStdout } = createWorkingStdio();
@@ -10013,7 +10052,7 @@ async function runNonInteractive2(params) {
       }
     });
     if (process.env["GEMINI_CLI_ACTIVITY_LOG_TARGET"]) {
-      const { setupInitialActivityLogger } = await import("./devtoolsService-H64VB4IA.js");
+      const { setupInitialActivityLogger } = await import("./devtoolsService-OIMHTGLW.js");
       await setupInitialActivityLogger(config);
     }
     const { stdout: workingStdout } = createWorkingStdio();
@@ -14860,7 +14899,7 @@ async function resolveSessionId(resumeArg) {
   }
 }
 async function startInteractiveUI(config, settings, startupWarnings, workspaceRoot = process.cwd(), resumedSessionData, initializationResult) {
-  const { startInteractiveUI: doStartUI } = await import("./interactiveCli-P35Q3KZ2.js");
+  const { startInteractiveUI: doStartUI } = await import("./interactiveCli-MSV2JUI2.js");
   await doStartUI(
     config,
     settings,
@@ -15062,7 +15101,7 @@ ${finalArgs[promptIndex + 1]}`;
     await config.storage.initialize();
     adminControlsListner.setConfig(config);
     if (config.isInteractive() && settings.merged.general.devtools) {
-      const { setupInitialActivityLogger } = await import("./devtoolsService-H64VB4IA.js");
+      const { setupInitialActivityLogger } = await import("./devtoolsService-OIMHTGLW.js");
       await setupInitialActivityLogger(config);
     }
     registerTelemetryConfig(config);
@@ -15141,6 +15180,11 @@ ${finalArgs[promptIndex + 1]}`;
       })
     ];
     cliStartupHandle?.end();
+    if (!config.isInteractive()) {
+      for (const warning of startupWarnings) {
+        writeToStderr(warning.message + "\n");
+      }
+    }
     if (config.isInteractive()) {
       if (process.stdin.isTTY) {
         process.stdin.resume();

package/bundle/{gemini-CMXEUOSI.js → gemini-ASA6UVNB.js}

@@ -25,7 +25,6 @@ import {
   configureSpecificSetting,
   disableSkill,
   enableSkill,
-  execa,
   formatRelativeTime,
   getExtensionManager,
   getThemeTypeFromBackgroundColor,
@@ -35,6 +34,7 @@ import {
   installSkill,
   isAlternateBufferEnabled,
   isFolderTrustEnabled,
+  isRecord,
   isSlashCommand,
   isWorkspaceTrusted,
   isWorktreeEnabled,
@@ -58,7 +58,7 @@ import {
   updateAllUpdatableExtensions,
   updateExtension,
   validateAuthMethod
-} from "./chunk-6NW5RNNH.js";
+} from "./chunk-BEUOMVKF.js";
 import {
   appEvents
 } from "./chunk-5PS3AYFU.js";
@@ -70,7 +70,7 @@ import {
   runExitCleanup,
   runSyncCleanup,
   setupSignalHandlers
-} from "./chunk-LUWQB4AS.js";
+} from "./chunk-GRNHS2XR.js";
 import {
   AuthType,
   ChatRecordingService,
@@ -110,6 +110,7 @@ import {
   createWorktreeService,
   detectIdeFromEnv,
   displayContentToString,
+  execa,
   external_exports as external_exports2,
   geminiPartsToContentParts,
   generalistProfile,
@@ -156,7 +157,7 @@ import {
   updatePolicy,
   writeToStderr,
   writeToStdout
-} from "./chunk-RTKRL6Y5.js";
+} from "./chunk-WFCK2Z32.js";
 import {
   ASK_USER_TOOL_NAME,
   DEFAULT_FILE_FILTERING_OPTIONS,
@@ -175,6 +176,7 @@ import {
   FatalSandboxError,
   FatalToolExecutionError,
   FatalTurnLimitedError,
+  FatalUntrustedWorkspaceError,
   GEMINI_DIR,
   GEMINI_MODEL_ALIAS_AUTO,
   PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL,
@@ -199,7 +201,7 @@ import {
   loadServerHierarchicalMemory,
   resolveToRealPath,
   setGeminiMdFilename
-} from "./chunk-QM5IP3NK.js";
+} from "./chunk-R32ABRMT.js";
 import "./chunk-664ZODQF.js";
 import "./chunk-RJTRUG2J.js";
 import "./chunk-IUUIT4SU.js";
@@ -7460,6 +7462,10 @@ async function parseArguments(settings) {
       type: "string",
       nargs: 1,
       description: "Execute the provided prompt and continue in interactive mode"
+    }).option("skip-trust", {
+      type: "boolean",
+      description: "Trust the current workspace for this session.",
+      default: false
     }).option("worktree", {
       alias: "w",
       type: "string",
@@ -7581,9 +7587,16 @@ async function parseArguments(settings) {
   yargsInstance.wrap(yargsInstance.terminalWidth());
   let result;
   try {
-    result = await yargsInstance.parse();
+    const parsed = await yargsInstance.parse();
+    if (!isRecord(parsed)) {
+      throw new Error("Failed to parse arguments");
+    }
+    result = parsed;
+    if (result["skip-trust"]) {
+      process3.env["GEMINI_CLI_TRUST_WORKSPACE"] = "true";
+    }
   } catch (e) {
-    const msg = e instanceof Error ? e.message : String(e);
+    const msg = getErrorMessage(e);
     debugLogger.error(msg);
     yargsInstance.showHelp();
     await runExitCleanup();
@@ -7593,8 +7606,13 @@ async function parseArguments(settings) {
     await runExitCleanup();
     process3.exit(0);
   }
-  const queryArg = result.query;
-  const q = Array.isArray(queryArg) ? queryArg.join(" ") : queryArg;
+  const queryArg = result["query"];
+  let q;
+  if (Array.isArray(queryArg)) {
+    q = queryArg.join(" ");
+  } else if (typeof queryArg === "string") {
+    q = queryArg;
+  }
   if (q && !result["prompt"]) {
     if (!isHeadlessMode()) {
       startupMessages.push(
@@ -7625,7 +7643,7 @@ async function loadCliConfig(settings, sessionId, argv, options = {}) {
   const includeDirectoryTree = settings.context?.includeDirectoryTree ?? true;
   const ideMode = settings.ide?.enabled ?? false;
   const folderTrust = process3.env["GEMINI_CLI_INTEGRATION_TEST"] === "true" || process3.env["VITEST"] === "true" ? false : settings.security?.folderTrust?.enabled ?? false;
-  const trustedFolder = isWorkspaceTrusted(settings, cwd, void 0, {
+  const trustedFolder = isWorkspaceTrusted(settings, cwd, {
     prompt: argv.prompt,
     query: argv.query
   })?.isTrusted ?? false;
@@ -7654,7 +7672,7 @@ async function loadCliConfig(settings, sessionId, argv, options = {}) {
         return resolveToRealPath(trimmedPath) !== realCwd;
       } catch (e) {
         debugLogger.debug(
-          `[IDE] Skipping inaccessible workspace folder: ${trimmedPath} (${e instanceof Error ? e.message : String(e)})`
+          `[IDE] Skipping inaccessible workspace folder: ${trimmedPath} (${getErrorMessage(e)})`
         );
         return false;
       }
@@ -8045,7 +8063,7 @@ async function resolveWorktreeSettings(cwd) {
     worktreeBaseSha = stdout.trim();
   } catch (e) {
     debugLogger.debug(
-      `Failed to resolve worktree base SHA at ${worktreePath}: ${e instanceof Error ? e.message : String(e)}`
+      `Failed to resolve worktree base SHA at ${worktreePath}: ${getErrorMessage(e)}`
     );
   }
   if (!worktreeBaseSha) {
@@ -9180,9 +9198,29 @@ var rootDirectoryCheck = {
     }
   }
 };
+var folderTrustCheck = {
+  id: "folder-trust",
+  priority: "high" /* High */,
+  check: async (workspaceRoot, settings) => {
+    if (!isFolderTrustEnabled(settings)) {
+      return null;
+    }
+    const { isTrusted } = isWorkspaceTrusted(settings, workspaceRoot);
+    if (isTrusted === true) {
+      return null;
+    }
+    if (isHeadlessMode()) {
+      throw new FatalUntrustedWorkspaceError(
+        "Gemini CLI is not running in a trusted directory. To proceed, either use `--skip-trust`, set the `GEMINI_CLI_TRUST_WORKSPACE=true` environment variable, or trust this directory in interactive mode. For more details, see https://geminicli.com/docs/cli/trusted-folders/#headless-and-automated-environments"
+      );
+    }
+    return null;
+  }
+};
 var WARNING_CHECKS = [
   homeDirectoryCheck,
-  rootDirectoryCheck
+  rootDirectoryCheck,
+  folderTrustCheck
 ];
 async function getUserStartupWarnings(settings, workspaceRoot = process4.cwd(), options) {
   const results = await Promise.all(
@@ -9547,7 +9585,7 @@ async function runNonInteractive({
       }
     });
     if (process.env["GEMINI_CLI_ACTIVITY_LOG_TARGET"]) {
-      const { setupInitialActivityLogger } = await import("./devtoolsService-L5LFSMIR.js");
+      const { setupInitialActivityLogger } = await import("./devtoolsService-65SKYXJR.js");
       await setupInitialActivityLogger(config);
     }
     const { stdout: workingStdout } = createWorkingStdio();
@@ -9998,7 +10036,7 @@ async function runNonInteractive2(params) {
       }
     });
     if (process.env["GEMINI_CLI_ACTIVITY_LOG_TARGET"]) {
-      const { setupInitialActivityLogger } = await import("./devtoolsService-L5LFSMIR.js");
+      const { setupInitialActivityLogger } = await import("./devtoolsService-65SKYXJR.js");
       await setupInitialActivityLogger(config);
     }
     const { stdout: workingStdout } = createWorkingStdio();
@@ -14845,7 +14883,7 @@ async function resolveSessionId(resumeArg) {
   }
 }
 async function startInteractiveUI(config, settings, startupWarnings, workspaceRoot = process.cwd(), resumedSessionData, initializationResult) {
-  const { startInteractiveUI: doStartUI } = await import("./interactiveCli-C46TDPVW.js");
+  const { startInteractiveUI: doStartUI } = await import("./interactiveCli-7OEI5K4E.js");
   await doStartUI(
     config,
     settings,
@@ -15047,7 +15085,7 @@ ${finalArgs[promptIndex + 1]}`;
     await config.storage.initialize();
     adminControlsListner.setConfig(config);
     if (config.isInteractive() && settings.merged.general.devtools) {
-      const { setupInitialActivityLogger } = await import("./devtoolsService-L5LFSMIR.js");
+      const { setupInitialActivityLogger } = await import("./devtoolsService-65SKYXJR.js");
       await setupInitialActivityLogger(config);
     }
     registerTelemetryConfig(config);
@@ -15126,6 +15164,11 @@ ${finalArgs[promptIndex + 1]}`;
       })
     ];
     cliStartupHandle?.end();
+    if (!config.isInteractive()) {
+      for (const warning of startupWarnings) {
+        writeToStderr(warning.message + "\n");
+      }
+    }
     if (config.isInteractive()) {
       if (process.stdin.isTTY) {
         process.stdin.resume();