@google/gemini-cli 0.40.0-preview.2 → 0.40.0-preview.4

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

@@ -1467,6 +1467,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`
@@ -2156,6 +2162,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-ID44Z5SV.js → gemini-27FQ5BI4.js}

@@ -24,6 +24,7 @@ import {
   initializeApp,
   installSkill,
   isAlternateBufferEnabled,
+  isRecord,
   isSlashCommand,
   linkSkill,
   normalizeServerId,
@@ -42,18 +43,18 @@ import {
   updateAllUpdatableExtensions,
   updateExtension,
   validateAuthMethod
-} from "./chunk-3GU3LF3I.js";
+} from "./chunk-HF7X35D3.js";
 import {
   appEvents
 } from "./chunk-5PS3AYFU.js";
 import {
   startCommand,
   startServer
-} from "./chunk-EFCQXWIF.js";
+} from "./chunk-LMVZLINC.js";
 import {
   exitCli,
   require_source
-} from "./chunk-IMEC72NS.js";
+} from "./chunk-G356GKHH.js";
 import {
   DEFAULT_PORT,
   GEMMA_MODEL_NAME,
@@ -87,7 +88,7 @@ import {
   readServerProcessInfo,
   resolveGemmaConfig,
   saveModelChange
-} from "./chunk-HV36F4CL.js";
+} from "./chunk-CJQVVQSH.js";
 import {
   cleanupCheckpoints,
   registerCleanup,
@@ -96,7 +97,7 @@ import {
   runExitCleanup,
   runSyncCleanup,
   setupSignalHandlers
-} from "./chunk-WL5MCPV2.js";
+} from "./chunk-BV2W6YE6.js";
 import {
   AuthType,
   ChatRecordingService,
@@ -128,6 +129,7 @@ import {
   StreamEventType,
   StreamJsonFormatter,
   ToolCallEvent,
+  TrustLevel,
   UserAccountManager,
   UserPromptEvent,
   ValidationCancelledError,
@@ -194,7 +196,7 @@ import {
   updatePolicy,
   writeToStderr,
   writeToStdout
-} from "./chunk-QK7UWGBN.js";
+} from "./chunk-NV6UCR4K.js";
 import {
   ASK_USER_TOOL_NAME,
   ApprovalMode,
@@ -215,6 +217,7 @@ import {
   FatalSandboxError,
   FatalToolExecutionError,
   FatalTurnLimitedError,
+  FatalUntrustedWorkspaceError,
   GEMINI_DIR,
   GEMINI_MODEL_ALIAS_AUTO,
   Kind,
@@ -241,7 +244,7 @@ import {
   loadServerHierarchicalMemory,
   resolveToRealPath,
   setGeminiMdFilename
-} from "./chunk-VCGILCZV.js";
+} from "./chunk-F73F75XM.js";
 import "./chunk-664ZODQF.js";
 import "./chunk-RJTRUG2J.js";
 import "./chunk-IUUIT4SU.js";
@@ -5922,7 +5925,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.`
@@ -7967,7 +7970,7 @@ async function loadSandboxConfig(settings, argv) {
   }
   const command2 = getSandboxCommand(sandboxValue);
   const packageJson = await getPackageJson(__dirname3);
-  const image = process.env["GEMINI_SANDBOX_IMAGE"] ?? "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.40.0-preview.2" ?? customImage ?? packageJson?.config?.sandboxImageUri;
+  const image = process.env["GEMINI_SANDBOX_IMAGE"] ?? "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.40.0-preview.4" ?? customImage ?? packageJson?.config?.sandboxImageUri;
   const isNative = command2 === "windows-native" || command2 === "sandbox-exec" || command2 === "lxc";
   return command2 && (image || isNative) ? { enabled: true, allowedPaths, networkAccess, command: command2, image } : void 0;
 }
@@ -8179,6 +8182,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",
@@ -8300,9 +8307,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();
@@ -8312,8 +8326,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(
@@ -8344,7 +8363,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;
@@ -8373,7 +8392,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;
       }
@@ -8766,7 +8785,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) {
@@ -9905,9 +9924,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(
@@ -10272,7 +10311,7 @@ async function runNonInteractive({
       }
     });
     if (process.env["GEMINI_CLI_ACTIVITY_LOG_TARGET"]) {
-      const { setupInitialActivityLogger } = await import("./devtoolsService-B5VVZ752.js");
+      const { setupInitialActivityLogger } = await import("./devtoolsService-S2LBUUZU.js");
       setupInitialActivityLogger(config);
     }
     const { stdout: workingStdout } = createWorkingStdio();
@@ -10723,7 +10762,7 @@ async function runNonInteractive2(params) {
       }
     });
     if (process.env["GEMINI_CLI_ACTIVITY_LOG_TARGET"]) {
-      const { setupInitialActivityLogger } = await import("./devtoolsService-B5VVZ752.js");
+      const { setupInitialActivityLogger } = await import("./devtoolsService-S2LBUUZU.js");
       setupInitialActivityLogger(config);
     }
     const { stdout: workingStdout } = createWorkingStdio();
@@ -15572,7 +15611,7 @@ async function resolveSessionId(resumeArg) {
   }
 }
 async function startInteractiveUI(config, settings, startupWarnings, workspaceRoot = process.cwd(), resumedSessionData, initializationResult) {
-  const { startInteractiveUI: doStartUI } = await import("./interactiveCli-JFBPGMNM.js");
+  const { startInteractiveUI: doStartUI } = await import("./interactiveCli-FPHSBRV3.js");
   await doStartUI(
     config,
     settings,
@@ -15774,7 +15813,7 @@ ${finalArgs[promptIndex + 1]}`;
     await config.storage.initialize();
     adminControlsListner.setConfig(config);
     if (config.isInteractive() && settings.merged.general.devtools) {
-      const { setupInitialActivityLogger } = await import("./devtoolsService-B5VVZ752.js");
+      const { setupInitialActivityLogger } = await import("./devtoolsService-S2LBUUZU.js");
       setupInitialActivityLogger(config);
     }
     registerTelemetryConfig(config);
@@ -15830,7 +15869,7 @@ ${finalArgs[promptIndex + 1]}`;
     const initAppHandle = startupProfiler.start("initialize_app");
     const initializationResult = await initializeApp(config, settings);
     initAppHandle?.end();
-    import("./liteRtServerManager-6GJWEP5W.js").then(({ LiteRtServerManager }) => {
+    import("./liteRtServerManager-ORSW3R4F.js").then(({ LiteRtServerManager }) => {
       const mergedGemma = settings.merged.experimental?.gemmaModelRouter;
       if (!mergedGemma) return;
       const userGemma = settings.forScope("User" /* User */).settings.experimental?.gemmaModelRouter;
@@ -15863,6 +15902,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();