@google/gemini-cli 0.36.0-preview.7 → 0.37.0-preview.0

package/bundle/gemini.js

@@ -16,7 +16,6 @@ import {
   SessionSelector,
   SettingScope,
   USER_SETTINGS_PATH,
-  appEvents,
   canLoadServer,
   checkForAllExtensionUpdates,
   checkForExtensionUpdate,
@@ -67,7 +66,7 @@ import {
   updateAllUpdatableExtensions,
   updateExtension,
   validateAuthMethod
-} from "./chunk-QTVUHTZR.js";
+} from "./chunk-ULC3DHVX.js";
 import {
   AuthType,
   ChatRecordingService,
@@ -79,6 +78,7 @@ import {
   FolderTrustDiscoveryService,
   GeminiEventType,
   IntegrityStatus,
+  InvalidStreamError,
   JsonFormatter,
   JsonStreamEventType,
   LlmRole,
@@ -139,6 +139,7 @@ import {
   patchStdio,
   performInit,
   performRestore,
+  processSingleFileContent,
   promptIdContext,
   recordToolCallInteractions,
   refreshMemory,
@@ -151,9 +152,10 @@ import {
   startupProfiler,
   stripAnsi,
   uiTelemetryService,
+  updatePolicy,
   writeToStderr,
   writeToStdout
-} from "./chunk-EHC7O4TG.js";
+} from "./chunk-LEK5YYAR.js";
 import {
   ASK_USER_TOOL_NAME,
   ApprovalMode,
@@ -177,6 +179,7 @@ import {
   GEMINI_MODEL_ALIAS_AUTO,
   Kind,
   PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL,
+  PREVIEW_GEMINI_3_1_FLASH_LITE_MODEL,
   PREVIEW_GEMINI_3_1_MODEL,
   PREVIEW_GEMINI_FLASH_MODEL,
   PREVIEW_GEMINI_MODEL,
@@ -191,15 +194,18 @@ import {
   getCurrentGeminiMdFilename,
   getDisplayString,
   getErrorMessage,
+  getErrorType,
   homedir,
   isFatalToolError,
   isNodeError,
   loadServerHierarchicalMemory,
-  resolveModel,
   resolveToRealPath,
   setGeminiMdFilename
-} from "./chunk-S2IQOR7T.js";
+} from "./chunk-7UZ4Y32N.js";
 import "./chunk-664ZODQF.js";
+import {
+  appEvents
+} from "./chunk-U4FACSVX.js";
 import "./chunk-RJTRUG2J.js";
 import "./chunk-IUUIT4SU.js";
 import {
@@ -7245,7 +7251,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.36.0-preview.7" ?? customImage ?? packageJson?.config?.sandboxImageUri;
+  const image = process.env["GEMINI_SANDBOX_IMAGE"] ?? "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.37.0-preview.0" ?? 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;
 }
@@ -7268,7 +7274,7 @@ function resolvePath(p) {
 // packages/cli/src/config/policy.ts
 var autoAcceptWorkspacePolicies = true;
 var disableWorkspacePolicies = true;
-async function createPolicyEngineConfig2(settings, approvalMode, workspacePoliciesDir) {
+async function createPolicyEngineConfig2(settings, approvalMode, workspacePoliciesDir, interactive = true) {
   const policySettings = {
     mcp: settings.mcp,
     tools: settings.tools,
@@ -7278,7 +7284,12 @@ async function createPolicyEngineConfig2(settings, approvalMode, workspacePolici
     workspacePoliciesDir,
     disableAlwaysAllow: settings.security?.disableAlwaysAllow || settings.admin?.secureModeEnabled
   };
-  return createPolicyEngineConfig(policySettings, approvalMode);
+  return createPolicyEngineConfig(
+    policySettings,
+    approvalMode,
+    void 0,
+    interactive
+  );
 }
 function createPolicyUpdater2(policyEngine, messageBus, storage) {
   return createPolicyUpdater(policyEngine, messageBus, storage);
@@ -7682,7 +7693,8 @@ async function loadCliConfig(settings, sessionId2, argv, options = {}) {
       trustedFolder,
       memoryImportFormat,
       memoryFileFiltering,
-      settings.context?.discoveryMaxDirs
+      settings.context?.discoveryMaxDirs,
+      settings.context?.memoryBoundaryMarkers
     );
     memoryContent = result.memoryContent;
     fileCount = result.fileCount;
@@ -7700,9 +7712,9 @@ async function loadCliConfig(settings, sessionId2, argv, options = {}) {
         approvalMode = ApprovalMode.AUTO_EDIT;
         break;
       case "plan":
-        if (!(settings.experimental?.plan ?? false)) {
+        if (!(settings.general?.plan?.enabled ?? true)) {
           debugLogger.warn(
-            'Approval mode "plan" is only available when experimental.plan is enabled. Falling back to "default".'
+            'Approval mode "plan" is disabled in your settings. Falling back to "default".'
           );
           approvalMode = ApprovalMode.DEFAULT;
         } else {
@@ -7799,9 +7811,9 @@ async function loadCliConfig(settings, sessionId2, argv, options = {}) {
   const policyEngineConfig = await createPolicyEngineConfig2(
     effectiveSettings,
     approvalMode,
-    workspacePoliciesDir
+    workspacePoliciesDir,
+    interactive
   );
-  policyEngineConfig.nonInteractive = !interactive;
   const defaultModel = PREVIEW_GEMINI_MODEL_AUTO;
   const specifiedModel = argv.model || process3.env["GEMINI_MODEL"] || settings.model?.name;
   const resolvedModel = specifiedModel === GEMINI_MODEL_ALIAS_AUTO ? defaultModel : specifiedModel || defaultModel;
@@ -7875,6 +7887,7 @@ async function loadCliConfig(settings, sessionId2, argv, options = {}) {
     includeDirectories,
     loadMemoryFromIncludeDirectories: settings.context?.loadMemoryFromIncludeDirectories || false,
     discoveryMaxDirs: settings.context?.discoveryMaxDirs,
+    memoryBoundaryMarkers: settings.context?.memoryBoundaryMarkers,
     importFormat: settings.context?.importFormat,
     debugMode,
     question,
@@ -7926,7 +7939,7 @@ async function loadCliConfig(settings, sessionId2, argv, options = {}) {
     extensionRegistryURI,
     enableExtensionReloading: settings.experimental?.extensionReloading,
     enableAgents: settings.experimental?.enableAgents,
-    plan: settings.experimental?.plan,
+    plan: settings.general?.plan?.enabled ?? true,
     tracker: settings.experimental?.taskTracker,
     directWebFetch: settings.experimental?.directWebFetch,
     planSettings: settings.general?.plan?.directory ? settings.general.plan : extensionPlanSettings ?? settings.general?.plan,
@@ -7935,9 +7948,12 @@ async function loadCliConfig(settings, sessionId2, argv, options = {}) {
     disabledSkills: settings.skills?.disabled,
     experimentalJitContext: settings.experimental?.jitContext,
     experimentalMemoryManager: settings.experimental?.memoryManager,
+    contextManagement: {
+      enabled: settings.experimental?.contextManagement,
+      ...settings?.contextManagement
+    },
     modelSteering: settings.experimental?.modelSteering,
     topicUpdateNarration: settings.experimental?.topicUpdateNarration,
-    toolOutputMasking: settings.experimental?.toolOutputMasking,
     noBrowser: !!process3.env["NO_BROWSER"],
     summarizeToolOutput: settings.model?.summarizeToolOutput,
     ideMode,
@@ -7950,6 +7966,7 @@ async function loadCliConfig(settings, sessionId2, argv, options = {}) {
     useAlternateBuffer: settings.ui?.useAlternateBuffer,
     useRipgrep: settings.tools?.useRipgrep,
     enableInteractiveShell: settings.tools?.shell?.enableInteractiveShell,
+    shellBackgroundCompletionBehavior: settings.tools?.shell?.backgroundCompletionBehavior,
     shellToolInactivityTimeout: settings.tools?.shell?.inactivityTimeout,
     enableShellOutputEfficiency: settings.tools?.shell?.enableShellOutputEfficiency ?? true,
     skipNextSpeakerCheck: settings.model?.skipNextSpeakerCheck,
@@ -9233,7 +9250,7 @@ function createNonInteractiveUI() {
     },
     removeComponent: () => {
     },
-    toggleBackgroundShell: () => {
+    toggleBackgroundTasks: () => {
     },
     toggleShortcutsHelp: () => {
     }
@@ -9335,7 +9352,7 @@ function handleError(error, config, customErrorCode) {
       timestamp: (/* @__PURE__ */ new Date()).toISOString(),
       status: "error",
       error: {
-        type: error instanceof Error ? error.constructor.name : "Error",
+        type: getErrorType(error),
         message: errorMessage
       },
       stats: streamFormatter.convertToStreamStats(metrics, 0)
@@ -9401,7 +9418,7 @@ function handleCancellationError(config) {
       timestamp: (/* @__PURE__ */ new Date()).toISOString(),
       status: "error",
       error: {
-        type: "FatalCancellationError",
+        type: getErrorType(cancellationError),
         message: cancellationError.message
       },
       stats: streamFormatter.convertToStreamStats(metrics, 0)
@@ -9436,7 +9453,7 @@ function handleMaxTurnsExceededError(config) {
       timestamp: (/* @__PURE__ */ new Date()).toISOString(),
       status: "error",
       error: {
-        type: "FatalTurnLimitedError",
+        type: getErrorType(maxTurnsError),
         message: maxTurnsError.message
       },
       stats: streamFormatter.convertToStreamStats(metrics, 0)
@@ -9515,13 +9532,14 @@ async function runNonInteractive({
   return promptIdContext.run(prompt_id, async () => {
     const consolePatcher = new ConsolePatcher({
       stderr: true,
+      interactive: false,
       debugMode: config.getDebugMode(),
       onNewMessage: (msg) => {
         coreEvents.emitConsoleLog(msg.type, msg.content);
       }
     });
     if (process.env["GEMINI_CLI_ACTIVITY_LOG_TARGET"]) {
-      const { setupInitialActivityLogger } = await import("./devtoolsService-4QGIZO5B.js");
+      const { setupInitialActivityLogger } = await import("./devtoolsService-TVWW3DBW.js");
       await setupInitialActivityLogger(config);
     }
     const { stdout: workingStdout } = createWorkingStdio();
@@ -12179,6 +12197,15 @@ var CommandHandler = class _CommandHandler {
 function hasMeta(obj) {
   return typeof obj === "object" && obj !== null && "_meta" in obj;
 }
+var RequestPermissionResponseSchema = external_exports.object({
+  outcome: external_exports.discriminatedUnion("outcome", [
+    external_exports.object({ outcome: external_exports.literal("cancelled") }),
+    external_exports.object({
+      outcome: external_exports.literal("selected"),
+      optionId: external_exports.string()
+    })
+  ])
+});
 async function runAcpClient(config, settings, argv) {
   const { stdout: workingStdout } = createWorkingStdio();
   const stdout = Writable.toWeb(workingStdout);
@@ -12515,6 +12542,11 @@ var GeminiAgent = class _GeminiAgent {
       mcpServers: mergedMcpServers
     };
     const config = await loadCliConfig(settings, sessionId2, this.argv, { cwd });
+    createPolicyUpdater2(
+      config.getPolicyEngine(),
+      config.messageBus,
+      config.storage
+    );
     return config;
   }
   async cancel(params) {
@@ -12697,10 +12729,17 @@ ${thought.description}`;
       }
       const functionCalls = [];
       try {
-        const model = resolveModel(
-          this.context.config.getModel(),
-          await this.context.config.getGemini31Launched?.() ?? false
-        );
+        const routingContext = {
+          history: chat.getHistory(
+            /*curated=*/
+            true
+          ),
+          request: nextMessage?.parts ?? [],
+          signal: pendingSend.signal,
+          requestedModel: this.context.config.getModel()
+        };
+        const router = this.context.config.getModelRouterService();
+        const { model } = await router.route(routingContext);
         const responseStream = await chat.sendMessageStream(
           { model },
           nextMessage?.parts ?? [],
@@ -12767,6 +12806,28 @@ ${thought.description}`;
         if (pendingSend.signal.aborted || error instanceof Error && error.name === "AbortError") {
           return { stopReason: CoreToolCallStatus.Cancelled };
         }
+        if (error instanceof InvalidStreamError || error && typeof error === "object" && "type" in error && error.type === "NO_RESPONSE_TEXT") {
+          return {
+            stopReason: "end_turn",
+            _meta: {
+              quota: {
+                token_count: {
+                  input_tokens: totalInputTokens,
+                  output_tokens: totalOutputTokens
+                },
+                model_usage: Array.from(modelUsageMap.entries()).map(
+                  ([modelName, counts]) => ({
+                    model: modelName,
+                    token_count: {
+                      input_tokens: counts.input,
+                      output_tokens: counts.output
+                    }
+                  })
+                )
+              }
+            }
+          };
+        }
         throw new RequestError(
           getErrorStatus(error) || 500,
           getAcpErrorMessage(error)
@@ -12892,7 +12953,8 @@ ${thought.description}`;
           sessionId: this.id,
           options: toPermissionOptions(
             confirmationDetails,
-            this.context.config
+            this.context.config,
+            this.settings.merged.security.enablePermanentToolApproval
           ),
           toolCall: {
             toolCallId: callId,
@@ -12903,9 +12965,19 @@ ${thought.description}`;
             kind: toAcpToolKind(tool.kind)
           }
         };
-        const output = await this.connection.requestPermission(params);
-        const outcome = output.outcome.outcome === CoreToolCallStatus.Cancelled ? ToolConfirmationOutcome.Cancel : external_exports.nativeEnum(ToolConfirmationOutcome).parse(output.outcome.optionId);
+        const output = RequestPermissionResponseSchema.parse(
+          await this.connection.requestPermission(params)
+        );
+        const outcome = output.outcome.outcome === "cancelled" ? ToolConfirmationOutcome.Cancel : external_exports.nativeEnum(ToolConfirmationOutcome).parse(output.outcome.optionId);
         await confirmationDetails.onConfirm(outcome);
+        await updatePolicy(
+          tool,
+          outcome,
+          confirmationDetails,
+          this.context,
+          this.context.messageBus,
+          invocation
+        );
         switch (outcome) {
           case ToolConfirmationOutcome.Cancel:
             return errorResponse(
@@ -13084,6 +13156,7 @@ ${thought.description}`;
     const pathSpecsToRead = [];
     const contentLabelsForDisplay = [];
     const ignoredPaths = [];
+    const directContents = [];
     const toolRegistry = this.context.toolRegistry;
     const readManyFilesTool = new ReadManyFilesTool(
       this.context.config,
@@ -13102,26 +13175,169 @@ ${thought.description}`;
       }
       let currentPathSpec = pathName;
       let resolvedSuccessfully = false;
+      let readDirectly = false;
       try {
         const absolutePath = path12.resolve(
           this.context.config.getTargetDir(),
           pathName
         );
-        if (isWithinRoot(absolutePath, this.context.config.getTargetDir())) {
-          const stats = await fs9.stat(absolutePath);
-          if (stats.isDirectory()) {
-            currentPathSpec = pathName.endsWith("/") ? `${pathName}**` : `${pathName}/**`;
+        let validationError = this.context.config.validatePathAccess(
+          absolutePath,
+          "read"
+        );
+        if (validationError && !isWithinRoot(absolutePath, this.context.config.getTargetDir())) {
+          try {
+            const stats = await fs9.stat(absolutePath);
+            if (stats.isFile()) {
+              const syntheticCallId = `resolve-prompt-${pathName}-${randomUUID()}`;
+              const params = {
+                sessionId: this.id,
+                options: [
+                  {
+                    optionId: ToolConfirmationOutcome.ProceedOnce,
+                    name: "Allow once",
+                    kind: "allow_once"
+                  },
+                  {
+                    optionId: ToolConfirmationOutcome.Cancel,
+                    name: "Deny",
+                    kind: "reject_once"
+                  }
+                ],
+                toolCall: {
+                  toolCallId: syntheticCallId,
+                  status: "pending",
+                  title: `Allow access to absolute path: ${pathName}`,
+                  content: [
+                    {
+                      type: "content",
+                      content: {
+                        type: "text",
+                        text: `The Agent needs access to read an attached file outside your workspace: ${pathName}`
+                      }
+                    }
+                  ],
+                  locations: [],
+                  kind: "read"
+                }
+              };
+              const output = RequestPermissionResponseSchema.parse(
+                await this.connection.requestPermission(params)
+              );
+              const outcome = output.outcome.outcome === "cancelled" ? ToolConfirmationOutcome.Cancel : external_exports.nativeEnum(ToolConfirmationOutcome).parse(output.outcome.optionId);
+              if (outcome === ToolConfirmationOutcome.ProceedOnce) {
+                this.context.config.getWorkspaceContext().addReadOnlyPath(absolutePath);
+                validationError = null;
+              } else {
+                this.debug(
+                  `Direct read authorization denied for absolute path ${pathName}`
+                );
+                directContents.push({
+                  spec: pathName,
+                  content: `[Warning: Access to absolute path \`${pathName}\` denied by user.]`
+                });
+                continue;
+              }
+            }
+          } catch (error) {
             this.debug(
-              `Path ${pathName} resolved to directory, using glob: ${currentPathSpec}`
+              `Failed to request permission for absolute attachment ${pathName}: ${getErrorMessage(error)}`
             );
-          } else {
-            this.debug(`Path ${pathName} resolved to file: ${currentPathSpec}`);
+            await this.sendUpdate({
+              sessionUpdate: "agent_thought_chunk",
+              content: {
+                type: "text",
+                text: `Warning: Failed to display permission dialog for \`${absolutePath}\`. Error: ${getErrorMessage(error)}`
+              }
+            });
+          }
+        }
+        if (!validationError) {
+          if ((path12.isAbsolute(pathName) || !isWithinRoot(
+            absolutePath,
+            this.context.config.getTargetDir()
+          )) && !readDirectly) {
+            try {
+              const stats = await fs9.stat(absolutePath);
+              if (stats.isFile()) {
+                const fileReadResult = await processSingleFileContent(
+                  absolutePath,
+                  this.context.config.getTargetDir(),
+                  this.context.config.getFileSystemService()
+                );
+                if (!fileReadResult.error) {
+                  if (typeof fileReadResult.llmContent === "object" && "inlineData" in fileReadResult.llmContent) {
+                    directContents.push({
+                      spec: pathName,
+                      part: fileReadResult.llmContent
+                    });
+                  } else if (typeof fileReadResult.llmContent === "string") {
+                    let contentToPush = fileReadResult.llmContent;
+                    if (fileReadResult.isTruncated) {
+                      contentToPush = `[WARNING: This file was truncated]
+
+${contentToPush}`;
+                    }
+                    directContents.push({
+                      spec: pathName,
+                      content: contentToPush
+                    });
+                  }
+                  readDirectly = true;
+                  resolvedSuccessfully = true;
+                } else {
+                  this.debug(
+                    `Direct read failed for absolute path ${pathName}: ${fileReadResult.error}`
+                  );
+                  await this.sendUpdate({
+                    sessionUpdate: "agent_thought_chunk",
+                    content: {
+                      type: "text",
+                      text: `Warning: file read failed for \`${pathName}\`. Reason: ${fileReadResult.error}`
+                    }
+                  });
+                  continue;
+                }
+              }
+            } catch (error) {
+              this.debug(
+                `File stat/access error for absolute path ${pathName}: ${getErrorMessage(error)}`
+              );
+              await this.sendUpdate({
+                sessionUpdate: "agent_thought_chunk",
+                content: {
+                  type: "text",
+                  text: `Warning: file access failed for \`${pathName}\`. Reason: ${getErrorMessage(error)}`
+                }
+              });
+              continue;
+            }
+          }
+          if (!readDirectly) {
+            const stats = await fs9.stat(absolutePath);
+            if (stats.isDirectory()) {
+              currentPathSpec = pathName.endsWith("/") ? `${pathName}**` : `${pathName}/**`;
+              this.debug(
+                `Path ${pathName} resolved to directory, using glob: ${currentPathSpec}`
+              );
+            } else {
+              this.debug(
+                `Path ${pathName} resolved to file: ${currentPathSpec}`
+              );
+            }
+            resolvedSuccessfully = true;
           }
-          resolvedSuccessfully = true;
         } else {
           this.debug(
-            `Path ${pathName} is outside the project directory. Skipping.`
+            `Path ${pathName} access disallowed: ${validationError}. Skipping.`
           );
+          await this.sendUpdate({
+            sessionUpdate: "agent_thought_chunk",
+            content: {
+              type: "text",
+              text: `Warning: skipping access to \`${pathName}\`. Reason: ${validationError}`
+            }
+          });
         }
       } catch (error) {
         if (isNodeError(error) && error.code === "ENOENT") {
@@ -13176,7 +13392,9 @@ ${thought.description}`;
         }
       }
       if (resolvedSuccessfully) {
-        pathSpecsToRead.push(currentPathSpec);
+        if (!readDirectly) {
+          pathSpecsToRead.push(currentPathSpec);
+        }
         atPathToResolvedSpecMap.set(pathName, currentPathSpec);
         contentLabelsForDisplay.push(pathName);
       }
@@ -13213,7 +13431,7 @@ ${thought.description}`;
       );
     }
     const processedQueryParts = [{ text: initialQueryText }];
-    if (pathSpecsToRead.length === 0 && embeddedContext.length === 0) {
+    if (pathSpecsToRead.length === 0 && embeddedContext.length === 0 && directContents.length === 0) {
       debugLogger.warn("No valid file paths found in @ commands to read.");
       return [{ text: initialQueryText }];
     }
@@ -13299,6 +13517,29 @@ Content from @${filePathSpecInContent}:
         throw error;
       }
     }
+    if (directContents.length > 0) {
+      const hasReferenceStart = processedQueryParts.some(
+        (p) => "text" in p && typeof p.text === "string" && p.text.includes(REFERENCE_CONTENT_START)
+      );
+      if (!hasReferenceStart) {
+        processedQueryParts.push({
+          text: `
+${REFERENCE_CONTENT_START}`
+        });
+      }
+      for (const item of directContents) {
+        processedQueryParts.push({
+          text: `
+Content from @${item.spec}:
+`
+        });
+        if (item.content) {
+          processedQueryParts.push({ text: item.content });
+        } else if (item.part) {
+          processedQueryParts.push(item.part);
+        }
+      }
+    }
     if (embeddedContext.length > 0) {
       processedQueryParts.push({
         text: "\n--- Content from referenced context ---"
@@ -13371,7 +13612,7 @@ var basicPermissionOptions = [
     kind: "reject_once"
   }
 ];
-function toPermissionOptions(confirmation, config) {
+function toPermissionOptions(confirmation, config, enablePermanentToolApproval = false) {
   const disableAlwaysAllow = config.getDisableAlwaysAllow();
   const options = [];
   if (!disableAlwaysAllow) {
@@ -13379,37 +13620,65 @@ function toPermissionOptions(confirmation, config) {
       case "edit":
         options.push({
           optionId: ToolConfirmationOutcome.ProceedAlways,
-          name: "Allow All Edits",
+          name: "Allow for this session",
           kind: "allow_always"
         });
+        if (enablePermanentToolApproval) {
+          options.push({
+            optionId: ToolConfirmationOutcome.ProceedAlwaysAndSave,
+            name: "Allow for this file in all future sessions",
+            kind: "allow_always"
+          });
+        }
         break;
       case "exec":
         options.push({
           optionId: ToolConfirmationOutcome.ProceedAlways,
-          name: `Always Allow ${confirmation.rootCommand}`,
+          name: "Allow for this session",
           kind: "allow_always"
         });
+        if (enablePermanentToolApproval) {
+          options.push({
+            optionId: ToolConfirmationOutcome.ProceedAlwaysAndSave,
+            name: "Allow this command for all future sessions",
+            kind: "allow_always"
+          });
+        }
         break;
       case "mcp":
         options.push(
           {
             optionId: ToolConfirmationOutcome.ProceedAlwaysServer,
-            name: `Always Allow ${confirmation.serverName}`,
+            name: "Allow all server tools for this session",
             kind: "allow_always"
           },
           {
             optionId: ToolConfirmationOutcome.ProceedAlwaysTool,
-            name: `Always Allow ${confirmation.toolName}`,
+            name: "Allow tool for this session",
             kind: "allow_always"
           }
         );
+        if (enablePermanentToolApproval) {
+          options.push({
+            optionId: ToolConfirmationOutcome.ProceedAlwaysAndSave,
+            name: "Allow tool for all future sessions",
+            kind: "allow_always"
+          });
+        }
         break;
       case "info":
         options.push({
           optionId: ToolConfirmationOutcome.ProceedAlways,
-          name: `Always Allow`,
+          name: "Allow for this session",
           kind: "allow_always"
         });
+        if (enablePermanentToolApproval) {
+          options.push({
+            optionId: ToolConfirmationOutcome.ProceedAlwaysAndSave,
+            name: "Allow for all future sessions",
+            kind: "allow_always"
+          });
+        }
         break;
       case "ask_user":
       case "exit_plan_mode":
@@ -13487,8 +13756,21 @@ function buildAvailableModels(config, settings) {
   const preferredModel = config.getModel() || DEFAULT_GEMINI_MODEL_AUTO;
   const shouldShowPreviewModels = config.getHasAccessToPreviewModel();
   const useGemini31 = config.getGemini31LaunchedSync?.() ?? false;
+  const useGemini31FlashLite = config.getGemini31FlashLiteLaunchedSync?.() ?? false;
   const selectedAuthType = settings.merged.security.auth.selectedType;
   const useCustomToolModel = useGemini31 && selectedAuthType === AuthType.USE_GEMINI;
+  if (config.getExperimentalDynamicModelConfiguration?.() === true && config.getModelConfigService) {
+    const options = config.getModelConfigService().getAvailableModelOptions({
+      useGemini3_1: useGemini31,
+      useGemini3_1FlashLite: useGemini31FlashLite,
+      useCustomTools: useCustomToolModel,
+      hasAccessToPreview: shouldShowPreviewModels
+    });
+    return {
+      availableModels: options,
+      currentModelId: preferredModel
+    };
+  }
   const mainOptions = [
     {
       value: DEFAULT_GEMINI_MODEL_AUTO,
@@ -13520,7 +13802,7 @@ function buildAvailableModels(config, settings) {
   if (shouldShowPreviewModels) {
     const previewProModel = useGemini31 ? PREVIEW_GEMINI_3_1_MODEL : PREVIEW_GEMINI_MODEL;
     const previewProValue = useCustomToolModel ? PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL : previewProModel;
-    manualOptions.unshift(
+    const previewOptions = [
       {
         value: previewProValue,
         title: getDisplayString(previewProModel)
@@ -13529,7 +13811,14 @@ function buildAvailableModels(config, settings) {
         value: PREVIEW_GEMINI_FLASH_MODEL,
         title: getDisplayString(PREVIEW_GEMINI_FLASH_MODEL)
       }
-    );
+    ];
+    if (useGemini31FlashLite) {
+      previewOptions.push({
+        value: PREVIEW_GEMINI_3_1_FLASH_LITE_MODEL,
+        title: getDisplayString(PREVIEW_GEMINI_3_1_FLASH_LITE_MODEL)
+      });
+    }
+    manualOptions.unshift(...previewOptions);
   }
   const scaleOptions = (options) => options.map((o) => ({
     modelId: o.value,
@@ -13700,7 +13989,7 @@ async function deleteSession(config, sessionIndex) {
   }
   try {
     const chatRecordingService = new ChatRecordingService(config);
-    chatRecordingService.deleteSession(sessionToDelete.file);
+    await chatRecordingService.deleteSession(sessionToDelete.file);
     const time = formatRelativeTime(sessionToDelete.lastUpdated);
     writeToStdout(
       `Deleted session ${sessionToDelete.index}: ${sessionToDelete.firstUserMessage} (${time})`
@@ -13974,7 +14263,7 @@ ${reason.stack}` : ""}`;
   });
 }
 async function startInteractiveUI(config, settings, startupWarnings, workspaceRoot = process.cwd(), resumedSessionData, initializationResult) {
-  const { startInteractiveUI: doStartUI } = await import("./interactiveCli-HYY2W6AF.js");
+  const { startInteractiveUI: doStartUI } = await import("./interactiveCli-4WFWOVAQ.js");
   await doStartUI(
     config,
     settings,
@@ -14061,6 +14350,7 @@ async function main() {
   const isDebugMode2 = isDebugMode(argv);
   const consolePatcher = new ConsolePatcher({
     stderr: true,
+    interactive: isHeadlessMode() ? false : true,
     debugMode: isDebugMode2,
     onNewMessage: (msg) => {
       coreEvents.emitConsoleLog(msg.type, msg.content);
@@ -14170,7 +14460,7 @@ ${finalArgs[promptIndex + 1]}`;
     await config.storage.initialize();
     adminControlsListner.setConfig(config);
     if (config.isInteractive() && settings.merged.general.devtools) {
-      const { setupInitialActivityLogger } = await import("./devtoolsService-4QGIZO5B.js");
+      const { setupInitialActivityLogger } = await import("./devtoolsService-TVWW3DBW.js");
       await setupInitialActivityLogger(config);
     }
     registerTelemetryConfig(config);
@@ -14277,6 +14567,9 @@ ${finalArgs[promptIndex + 1]}`;
     }
     cliStartupHandle?.end();
     if (config.isInteractive()) {
+      if (process.stdin.isTTY) {
+        process.stdin.resume();
+      }
       await startInteractiveUI(
         config,
         settings,
@@ -14315,9 +14608,6 @@ ${input}` : wrappedContext;
         }
       }
     }
-    registerCleanup(async () => {
-      await config.getHookSystem()?.fireSessionEndEvent(SessionEndReason.Exit);
-    });
     if (!input) {
       debugLogger.error(
         `No input provided via stdin. Input can be provided by piping data into gemini or using the --prompt option.`