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

package/bundle/{gemini-44W2QEZI.js → gemini-TU6PHHWE.js}

@@ -24,6 +24,7 @@ import {
   initializeApp,
   installSkill,
   isAlternateBufferEnabled,
+  isRecord,
   isSlashCommand,
   linkSkill,
   normalizeServerId,
@@ -42,18 +43,18 @@ import {
   updateAllUpdatableExtensions,
   updateExtension,
   validateAuthMethod
-} from "./chunk-GXRQOXQF.js";
+} from "./chunk-KUAEOA2Q.js";
 import {
   appEvents
 } from "./chunk-5PS3AYFU.js";
 import {
   startCommand,
   startServer
-} from "./chunk-33ANPP4S.js";
+} from "./chunk-RVU5Q4NB.js";
 import {
   exitCli,
   require_source
-} from "./chunk-WHIWQCI5.js";
+} from "./chunk-KKO2XSBY.js";
 import {
   DEFAULT_PORT,
   GEMMA_MODEL_NAME,
@@ -87,7 +88,7 @@ import {
   readServerProcessInfo,
   resolveGemmaConfig,
   saveModelChange
-} from "./chunk-4IJPDKI6.js";
+} from "./chunk-VUHGADMU.js";
 import {
   cleanupCheckpoints,
   registerCleanup,
@@ -96,7 +97,7 @@ import {
   runExitCleanup,
   runSyncCleanup,
   setupSignalHandlers
-} from "./chunk-MUGUV6RZ.js";
+} from "./chunk-B4NHGUNE.js";
 import {
   AuthType,
   ChatRecordingService,
@@ -183,7 +184,7 @@ import {
   updatePolicy,
   writeToStderr,
   writeToStdout
-} from "./chunk-RM43GNQQ.js";
+} from "./chunk-EEQGWBJU.js";
 import {
   ASK_USER_TOOL_NAME,
   DEFAULT_FILE_FILTERING_OPTIONS,
@@ -202,6 +203,7 @@ import {
   FatalSandboxError,
   FatalToolExecutionError,
   FatalTurnLimitedError,
+  FatalUntrustedWorkspaceError,
   GEMINI_DIR,
   GEMINI_MODEL_ALIAS_AUTO,
   PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL,
@@ -226,7 +228,7 @@ import {
   loadServerHierarchicalMemory,
   resolveToRealPath,
   setGeminiMdFilename
-} from "./chunk-2RHFUIH4.js";
+} from "./chunk-UHHRGNIO.js";
 import "./chunk-664ZODQF.js";
 import "./chunk-RJTRUG2J.js";
 import "./chunk-IUUIT4SU.js";
@@ -8164,6 +8166,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",
@@ -8285,9 +8291,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();
@@ -8297,8 +8310,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(
@@ -8329,7 +8347,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;
@@ -8358,7 +8376,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;
       }
@@ -8751,7 +8769,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) {
@@ -9890,9 +9908,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(
@@ -10257,7 +10295,7 @@ async function runNonInteractive({
       }
     });
     if (process.env["GEMINI_CLI_ACTIVITY_LOG_TARGET"]) {
-      const { setupInitialActivityLogger } = await import("./devtoolsService-6Y6YER6T.js");
+      const { setupInitialActivityLogger } = await import("./devtoolsService-XGIYIDBD.js");
       setupInitialActivityLogger(config);
     }
     const { stdout: workingStdout } = createWorkingStdio();
@@ -10708,7 +10746,7 @@ async function runNonInteractive2(params) {
       }
     });
     if (process.env["GEMINI_CLI_ACTIVITY_LOG_TARGET"]) {
-      const { setupInitialActivityLogger } = await import("./devtoolsService-6Y6YER6T.js");
+      const { setupInitialActivityLogger } = await import("./devtoolsService-XGIYIDBD.js");
       setupInitialActivityLogger(config);
     }
     const { stdout: workingStdout } = createWorkingStdio();
@@ -15557,7 +15595,7 @@ async function resolveSessionId(resumeArg) {
   }
 }
 async function startInteractiveUI(config, settings, startupWarnings, workspaceRoot = process.cwd(), resumedSessionData, initializationResult) {
-  const { startInteractiveUI: doStartUI } = await import("./interactiveCli-5B3X6RNB.js");
+  const { startInteractiveUI: doStartUI } = await import("./interactiveCli-374EDFUA.js");
   await doStartUI(
     config,
     settings,
@@ -15759,7 +15797,7 @@ ${finalArgs[promptIndex + 1]}`;
     await config.storage.initialize();
     adminControlsListner.setConfig(config);
     if (config.isInteractive() && settings.merged.general.devtools) {
-      const { setupInitialActivityLogger } = await import("./devtoolsService-6Y6YER6T.js");
+      const { setupInitialActivityLogger } = await import("./devtoolsService-XGIYIDBD.js");
       setupInitialActivityLogger(config);
     }
     registerTelemetryConfig(config);
@@ -15815,7 +15853,7 @@ ${finalArgs[promptIndex + 1]}`;
     const initAppHandle = startupProfiler.start("initialize_app");
     const initializationResult = await initializeApp(config, settings);
     initAppHandle?.end();
-    import("./liteRtServerManager-WQMDPACQ.js").then(({ LiteRtServerManager }) => {
+    import("./liteRtServerManager-46V57ROR.js").then(({ LiteRtServerManager }) => {
       const mergedGemma = settings.merged.experimental?.gemmaModelRouter;
       if (!mergedGemma) return;
       const userGemma = settings.forScope("User" /* User */).settings.experimental?.gemmaModelRouter;
@@ -15848,6 +15886,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.js

@@ -103,9 +103,9 @@ ${error instanceof Error ? error.stack ?? error.message : String(error)}
       }
     }
   } else {
-    const { main } = await import("./gemini-ID44Z5SV.js");
-    const { FatalError, writeToStderr } = await import("./dist-UIXQETMC.js");
-    const { runExitCleanup } = await import("./cleanup-A7WXWAMI.js");
+    const { main } = await import("./gemini-IRPF2U4N.js");
+    const { FatalError, writeToStderr } = await import("./dist-QHCXV4N4.js");
+    const { runExitCleanup } = await import("./cleanup-F6XR3KDW.js");
     main().catch(async (error) => {
       const cleanupTimeout = setTimeout(() => {
         writeToStderr("Cleanup timed out, forcing exit...\n");

package/bundle/{interactiveCli-5MTJDFYC.js → interactiveCli-374EDFUA.js}

@@ -70,8 +70,15 @@ import {
   formatDuration,
   formatResetTime,
   getBoundingBox,
+  getDialogRestartRequiredSettings,
+  getDialogSettingKeys,
+  getDisplayValue,
+  getEditValue,
+  getEffectiveValue,
   getFileExtension,
   getFormattedSettingValue,
+  getNestedValue,
+  getSettingDefinition,
   getStatusColor,
   getTransformUnderCursor,
   getUsedStatusColor,
@@ -83,8 +90,10 @@ import {
   isBrowser,
   isContextUsageHigh,
   isDevelopment,
+  isInSettingsScope,
   isNarrowWidth,
   isNewFile,
+  isRecord,
   isSlashCommand,
   isUltraTier,
   loadKeyMatchers,
@@ -93,6 +102,7 @@ import {
   openFileInEditor,
   parseColor,
   parseDiffWithLineNumbers,
+  parseEditedValue,
   parseSlashCommand,
   persistentState,
   profiler,
@@ -144,13 +154,13 @@ import {
   widestLineFromStyledChars,
   wordBreakStyledChars,
   wrapStyledChars
-} from "./chunk-PLUWJHZZ.js";
+} from "./chunk-KUAEOA2Q.js";
 import {
   appEvents
 } from "./chunk-5PS3AYFU.js";
 import {
   require_source
-} from "./chunk-TDW6FM3A.js";
+} from "./chunk-KKO2XSBY.js";
 import {
   ACTIVE_SHELL_MAX_LINES,
   COMPACT_TOOL_SUBVIEW_MAX_LINES,
@@ -188,7 +198,6 @@ import {
   getCachedStringWidth,
   getLuminance,
   getSessionFiles,
-  getSettingsSchema,
   interpolateColor,
   isLoadableSettingScope,
   isTodoList,
@@ -204,13 +213,13 @@ import {
   stringWidth,
   stripUnsafeCharacters,
   toCodePoints
-} from "./chunk-NIVCRM5L.js";
+} from "./chunk-VUHGADMU.js";
 import {
   registerCleanup,
   removeCleanup,
   runExitCleanup,
   setupTtyCheck
-} from "./chunk-IUVLJUOL.js";
+} from "./chunk-B4NHGUNE.js";
 import {
   ApiKeyUpdatedEvent,
   AsyncFzf,
@@ -327,7 +336,7 @@ import {
   validatePlanContent,
   validatePlanPath,
   writeToStdout
-} from "./chunk-NO7STVVM.js";
+} from "./chunk-EEQGWBJU.js";
 import {
   ACTIVATE_SKILL_TOOL_NAME,
   AGENT_TOOL_NAME,
@@ -385,7 +394,7 @@ import {
   safeJsonToMarkdown,
   shortenPath,
   tildeifyPath
-} from "./chunk-2RHFUIH4.js";
+} from "./chunk-UHHRGNIO.js";
 import "./chunk-664ZODQF.js";
 import "./chunk-RJTRUG2J.js";
 import "./chunk-IUUIT4SU.js";
@@ -13514,165 +13523,6 @@ var ConsentPrompt = (props) => {
 // packages/cli/src/ui/components/ThemeDialog.tsx
 var import_react47 = __toESM(require_react(), 1);
 
-// packages/cli/src/utils/settingsUtils.ts
-function flattenSchema(schema, prefix = "") {
-  let result = {};
-  for (const key in schema) {
-    const newKey = prefix ? `${prefix}.${key}` : key;
-    const definition = schema[key];
-    result[newKey] = { ...definition, key: newKey };
-    if (definition.properties) {
-      result = { ...result, ...flattenSchema(definition.properties, newKey) };
-    }
-  }
-  return result;
-}
-var _FLATTENED_SCHEMA;
-function getFlattenedSchema() {
-  return _FLATTENED_SCHEMA ?? (_FLATTENED_SCHEMA = flattenSchema(getSettingsSchema()));
-}
-function getSettingDefinition(key) {
-  return getFlattenedSchema()[key];
-}
-function getDefaultValue(key) {
-  return getFlattenedSchema()[key]?.default;
-}
-function getDialogRestartRequiredSettings() {
-  return Object.values(getFlattenedSchema()).filter(
-    (definition) => definition.requiresRestart && definition.showInDialog !== false
-  ).map((definition) => definition.key);
-}
-function isRecord(value) {
-  return typeof value === "object" && value !== null;
-}
-function isSettingsValue(value) {
-  if (value === void 0) return true;
-  if (value === null) return false;
-  const type = typeof value;
-  return type === "string" || type === "number" || type === "boolean" || type === "object";
-}
-function getNestedValue(obj, path15) {
-  let current = obj;
-  for (const key of path15) {
-    if (!isRecord(current) || !(key in current)) {
-      return void 0;
-    }
-    current = current[key];
-  }
-  return current;
-}
-function getEffectiveValue(key, settings) {
-  const definition = getSettingDefinition(key);
-  if (!definition) {
-    return void 0;
-  }
-  const path15 = key.split(".");
-  const value = getNestedValue(settings, path15);
-  if (value !== void 0 && isSettingsValue(value)) {
-    return value;
-  }
-  return definition.default;
-}
-function getDialogSettingKeys() {
-  return Object.values(getFlattenedSchema()).filter((definition) => definition.showInDialog !== false).map((definition) => definition.key);
-}
-function isInSettingsScope(key, scopeSettings) {
-  const path15 = key.split(".");
-  const value = getNestedValue(scopeSettings, path15);
-  return value !== void 0;
-}
-function getDisplayValue(key, scopeSettings, _mergedSettings) {
-  const definition = getSettingDefinition(key);
-  const existsInScope = isInSettingsScope(key, scopeSettings);
-  let value;
-  if (existsInScope) {
-    value = getEffectiveValue(key, scopeSettings);
-  } else {
-    value = getDefaultValue(key);
-  }
-  let valueString = String(value);
-  if (definition?.type === "object" && value !== null && typeof value === "object") {
-    valueString = JSON.stringify(value);
-  } else if (definition?.type === "enum" && definition.options) {
-    const option = definition.options?.find((option2) => option2.value === value);
-    valueString = option?.label ?? `${value}`;
-  }
-  if (definition?.unit === "%" && typeof value === "number") {
-    valueString = `${value} (${Math.round(value * 100)}%)`;
-  } else if (definition?.unit) {
-    valueString = `${valueString}${definition.unit}`;
-  }
-  if (existsInScope) {
-    return `${valueString}*`;
-  }
-  return valueString;
-}
-function tryParseJsonStringArray(input) {
-  try {
-    const parsed = JSON.parse(input);
-    if (Array.isArray(parsed) && parsed.every((item) => typeof item === "string")) {
-      return parsed;
-    }
-    return null;
-  } catch {
-    return null;
-  }
-}
-function tryParseJsonObject(input) {
-  try {
-    const parsed = JSON.parse(input);
-    if (isRecord(parsed) && !Array.isArray(parsed)) {
-      return parsed;
-    }
-    return null;
-  } catch {
-    return null;
-  }
-}
-function parseStringArrayValue(input) {
-  const trimmed = input.trim();
-  if (trimmed === "") return [];
-  return tryParseJsonStringArray(trimmed) ?? input.split(",").map((p) => p.trim()).filter((p) => p.length > 0);
-}
-function parseObjectValue(input) {
-  const trimmed = input.trim();
-  if (trimmed === "") {
-    return null;
-  }
-  return tryParseJsonObject(trimmed);
-}
-function parseEditedValue(type, newValue) {
-  if (type === "number") {
-    if (newValue.trim() === "") {
-      return null;
-    }
-    const numParsed = Number(newValue.trim());
-    if (Number.isNaN(numParsed)) {
-      return null;
-    }
-    return numParsed;
-  }
-  if (type === "array") {
-    return parseStringArrayValue(newValue);
-  }
-  if (type === "object") {
-    return parseObjectValue(newValue);
-  }
-  return newValue;
-}
-function getEditValue(type, rawValue) {
-  if (rawValue === void 0) {
-    return void 0;
-  }
-  if (type === "array" && Array.isArray(rawValue)) {
-    return rawValue.join(", ");
-  }
-  if (type === "object" && rawValue !== null && typeof rawValue === "object") {
-    return JSON.stringify(rawValue);
-  }
-  return void 0;
-}
-
 // packages/cli/src/utils/dialogScopeUtils.ts
 var SCOPE_LABELS = {
   ["User" /* User */]: "User Settings",
@@ -33590,7 +33440,7 @@ ${queuedText}` : queuedText;
       if (keyMatchers["app.showErrorDetails" /* SHOW_ERROR_DETAILS */](key)) {
         if (settings.merged.general.devtools) {
           void (async () => {
-            const { toggleDevToolsPanel } = await import("./devtoolsService-2JXSALRU.js");
+            const { toggleDevToolsPanel } = await import("./devtoolsService-XGIYIDBD.js");
             await toggleDevToolsPanel(
               config,
               showErrorDetails,