@google/gemini-cli 0.64.0-preview.0 → 0.65.0-nightly.20261007.gef59c532f

package/bundle/{chunk-EDVFNWRG.js → chunk-2QX7AFU2.js}

@@ -1,7 +1,7 @@
 const require = (await import('node:module')).createRequire(import.meta.url); const __chunk_filename = (await import('node:url')).fileURLToPath(import.meta.url); const __chunk_dirname = (await import('node:path')).dirname(__chunk_filename);
 import {
   runExitCleanup
-} from "./chunk-SDWOC67Z.js";
+} from "./chunk-DIMRHS5O.js";
 import {
   __commonJS,
   __require

package/bundle/{chunk-EDYPRCAA.js → chunk-354KMHUX.js}

@@ -1,13 +1,13 @@
 const require = (await import('node:module')).createRequire(import.meta.url); const __chunk_filename = (await import('node:url')).fileURLToPath(import.meta.url); const __chunk_dirname = (await import('node:path')).dirname(__chunk_filename);
 import {
   runExitCleanup
-} from "./chunk-SDWOC67Z.js";
+} from "./chunk-7NUXN3UV.js";
 import {
   RELEASE_CHANNEL_STABILITY,
   debugLogger,
   getChannelFromVersion,
   isGitRepository
-} from "./chunk-6OFXOGEG.js";
+} from "./chunk-JYWQ73Z5.js";
 
 // packages/cli/src/utils/installationInfo.ts
 import * as fs from "node:fs";

package/bundle/{chunk-UFQDAROY.js → chunk-3F7OA7UU.js}

@@ -5,7 +5,7 @@ import {
   isTelemetrySdkInitialized,
   resetBrowserSession,
   shutdownTelemetry
-} from "./chunk-A4TO2DY2.js";
+} from "./chunk-6FH32SR7.js";
 
 // packages/cli/src/utils/cleanup.ts
 import { promises as fs } from "node:fs";

package/bundle/{chunk-HN74ORTP.js → chunk-46A63GIT.js}

@@ -33,7 +33,7 @@ import {
   partListUnionToString,
   require_strip_json_comments,
   sanitizeFilenamePart
-} from "./chunk-ZQW7OGUO.js";
+} from "./chunk-HYF74TEA.js";
 import {
   __commonJS,
   __require,
@@ -15248,7 +15248,13 @@ var SETTINGS_SCHEMA_DEFINITIONS = {
       oauth: {
         type: "object",
         description: "OAuth configuration for authenticating with the server.",
-        additionalProperties: true
+        additionalProperties: true,
+        properties: {
+          authorizationResponseIssParameterSupported: {
+            type: "boolean",
+            description: 'Whether the authorization server returns the "iss" parameter in the authorization response (RFC 9207). When true, callbacks without "iss" are rejected; when false, they are accepted. A provided "iss" is always validated. Overrides the "authorization_response_iss_parameter_supported" value discovered from server metadata.'
+          }
+        }
       },
       authProviderType: {
         type: "string",
@@ -15309,7 +15315,13 @@ var SETTINGS_SCHEMA_DEFINITIONS = {
       oauth: {
         type: "object",
         description: "OAuth configuration for authenticating with the server.",
-        additionalProperties: true
+        additionalProperties: true,
+        properties: {
+          authorizationResponseIssParameterSupported: {
+            type: "boolean",
+            description: 'Whether the authorization server returns the "iss" parameter in the authorization response (RFC 9207). When true, callbacks without "iss" are rejected; when false, they are accepted. A provided "iss" is always validated. Overrides the "authorization_response_iss_parameter_supported" value discovered from server metadata.'
+          }
+        }
       },
       authProviderType: {
         type: "string",
@@ -16332,6 +16344,7 @@ function mergeSettings(system, systemDefaults, user, workspace, isTrusted) {
     system
   );
 }
+var UNTRUSTED_WORKSPACE_SETTINGS_ERROR = "Cannot modify settings in an untrusted workspace. To enable this, verify the source of the repository and set GEMINI_CLI_TRUST_WORKSPACE=true or move your configuration to the global settings file.";
 var LoadedSettings = class {
   constructor(system, systemDefaults, user, workspace, isTrusted, errors = []) {
     this.system = system;
@@ -16378,7 +16391,8 @@ var LoadedSettings = class {
     return {
       ...workspace,
       settings: {},
-      originalSettings: {}
+      originalSettings: {},
+      readOnly: true
     };
   }
   computeMergedSettings(forceTrusted = false) {
@@ -16448,6 +16462,14 @@ var LoadedSettings = class {
   }
   setValue(scope, key, value) {
     const settingsFile = this.forScope(scope);
+    if (scope === "Workspace" /* Workspace */ && !this.isPersistable(settingsFile)) {
+      if (settingsFile.path === "" || settingsFile.path === this.user.path) {
+        throw new Error(
+          "Cannot modify workspace settings in the home directory. Please use user scope instead."
+        );
+      }
+      throw new Error(UNTRUSTED_WORKSPACE_SETTINGS_ERROR);
+    }
     const valueToSet = typeof value === "object" && value !== null ? structuredClone(value) : value;
     setNestedProperty(settingsFile.settings, key, valueToSet);
     if (this.isPersistable(settingsFile)) {
@@ -17461,6 +17483,7 @@ export {
   USER_SETTINGS_PATH,
   SettingScope,
   isLoadableSettingScope,
+  UNTRUSTED_WORKSPACE_SETTINGS_ERROR,
   loadEnvironment,
   isWorktreeEnabled,
   loadSettings,

package/bundle/{chunk-ZQW7OGUO.js → chunk-6FH32SR7.js}

@@ -283529,8 +283529,8 @@ function isValidToolName(name3, options = {}) {
 }
 
 // packages/core/dist/src/generated/git-commit.js
-var GIT_COMMIT_INFO = "fb972b2f8";
-var CLI_VERSION = "0.64.0-preview.0";
+var GIT_COMMIT_INFO = "ef59c532f";
+var CLI_VERSION = "0.65.0-nightly.20261007.gef59c532f";
 
 // packages/core/dist/src/ide/detect-ide.js
 var IDE_DEFINITIONS = {
@@ -286098,24 +286098,52 @@ function isIgnoredUserContent(trimmedContent) {
 }
 function convertSessionToClientHistory(messages) {
   const clientHistory = [];
-  for (const msg of messages) {
+  const seenFunctionResponseIds = /* @__PURE__ */ new Set();
+  const pendingPartsToAppend = /* @__PURE__ */ new Map();
+  for (let i3 = 0; i3 < messages.length; i3++) {
+    const msg = messages[i3];
     if (msg.type === "info" || msg.type === "error" || msg.type === "warning") {
       continue;
     }
     if (msg.type === "user") {
-      const contentString = partListUnionToString(msg.content);
-      const trimmedContent = contentString.trim();
-      if (isIgnoredUserContent(trimmedContent)) {
+      const extraParts = pendingPartsToAppend.get(msg.id) || [];
+      pendingPartsToAppend.delete(msg.id);
+      if (extraParts.length === 0) {
+        if (!msg.content) {
+          continue;
+        }
+        const contentString = partListUnionToString(msg.content);
+        const trimmedContent = contentString.trim();
+        if (isIgnoredUserContent(trimmedContent)) {
+          continue;
+        }
+      }
+      const parts2 = [
+        ...msg.content ? ensurePartArray(msg.content) : [],
+        ...extraParts
+      ].filter((part) => {
+        const respId = part?.functionResponse?.id;
+        if (!respId) {
+          return true;
+        }
+        if (seenFunctionResponseIds.has(respId)) {
+          return false;
+        }
+        seenFunctionResponseIds.add(respId);
+        return true;
+      });
+      if (parts2.length === 0) {
         continue;
       }
       clientHistory.push({
         id: msg.id,
         content: {
           role: "user",
-          parts: ensurePartArray(msg.content)
+          parts: parts2
         }
       });
     } else if (msg.type === "gemini") {
+      seenFunctionResponseIds.clear();
       const modelParts = [];
       const contentParts = msg.content ? ensurePartArray(msg.content) : [];
       const hasCallsInContent = contentParts.some((p) => !!p.functionCall);
@@ -286154,9 +286182,31 @@ function convertSessionToClientHistory(messages) {
           }
         });
         if (msg.toolCalls && msg.toolCalls.length > 0) {
+          const recordedResponseIds = /* @__PURE__ */ new Set();
+          let hasUntrackedFunctionResponse = false;
+          let targetUserMsgId;
+          for (let j = i3 + 1; j < messages.length; j++) {
+            const nextMsg = messages[j];
+            if (nextMsg.type === "gemini") {
+              break;
+            }
+            if (nextMsg.type === "user" && nextMsg.content) {
+              for (const part of ensurePartArray(nextMsg.content)) {
+                if (part?.functionResponse) {
+                  targetUserMsgId ??= nextMsg.id;
+                  if (part.functionResponse.id) {
+                    recordedResponseIds.add(part.functionResponse.id);
+                  } else {
+                    hasUntrackedFunctionResponse = true;
+                  }
+                }
+              }
+            }
+          }
           const functionResponseParts = [];
           for (const toolCall of msg.toolCalls) {
-            if (toolCall.result) {
+            const isAlreadyRecorded = toolCall.id ? recordedResponseIds.has(toolCall.id) : hasUntrackedFunctionResponse;
+            if (toolCall.result && !isAlreadyRecorded) {
               let responseData;
               if (typeof toolCall.result === "string") {
                 responseData = {
@@ -286178,13 +286228,34 @@ function convertSessionToClientHistory(messages) {
             }
           }
           if (functionResponseParts.length > 0) {
-            clientHistory.push({
-              id: `${msg.id}_response`,
-              content: {
-                role: "user",
-                parts: functionResponseParts
+            if (targetUserMsgId) {
+              const existingPending = pendingPartsToAppend.get(targetUserMsgId) || [];
+              pendingPartsToAppend.set(targetUserMsgId, [
+                ...existingPending,
+                ...functionResponseParts
+              ]);
+            } else {
+              const dedupedResponseParts = functionResponseParts.filter((part) => {
+                const respId = part?.functionResponse?.id;
+                if (!respId) {
+                  return true;
+                }
+                if (seenFunctionResponseIds.has(respId)) {
+                  return false;
+                }
+                seenFunctionResponseIds.add(respId);
+                return true;
+              });
+              if (dedupedResponseParts.length > 0) {
+                clientHistory.push({
+                  id: `${msg.id}_response`,
+                  content: {
+                    role: "user",
+                    parts: dedupedResponseParts
+                  }
+                });
               }
-            });
+            }
           }
         }
       }
@@ -286304,7 +286375,7 @@ function isResumableMessageRecord(message) {
   return false;
 }
 function hasResumableConversationContent(messages) {
-  return messages.some((message) => isResumableMessageRecord(message));
+  return messages?.some((message) => isResumableMessageRecord(message)) ?? false;
 }
 function createJsonlRecordAccumulator(options) {
   let metadata2 = {};
@@ -286646,6 +286717,8 @@ var ChatRecordingService = class {
   queuedThoughts = [];
   queuedTokens = null;
   context;
+  isResumedSession = false;
+  initializationPromise = null;
   messageOrder = [];
   messageMetaMap = /* @__PURE__ */ new Map();
   toolCallMetaMap = /* @__PURE__ */ new Map();
@@ -286657,7 +286730,18 @@ var ChatRecordingService = class {
     this.sessionId = context2.promptId;
     this.projectHash = getProjectHash(context2.config.getProjectRoot());
   }
+  getIsResumedSession() {
+    return this.isResumedSession;
+  }
+  setIsResumedSession(isResumed) {
+    this.isResumedSession = isResumed;
+  }
   async initialize(resumedSessionData, kind) {
+    this.isResumedSession = Boolean(resumedSessionData);
+    this.initializationPromise = this.doInitialize(resumedSessionData, kind);
+    return this.initializationPromise;
+  }
+  async doInitialize(resumedSessionData, kind) {
     try {
       this.kind = kind;
       if (resumedSessionData) {
@@ -286666,7 +286750,10 @@ var ChatRecordingService = class {
         this.kind = resumedSessionData.conversation.kind;
         const loadedRecord = await loadConversationRecord(this.conversationFile);
         if (loadedRecord) {
-          this.cachedConversation = loadedRecord;
+          this.cachedConversation = {
+            ...loadedRecord,
+            messages: loadedRecord.messages ?? []
+          };
           this.projectHash = this.cachedConversation.projectHash;
           if (this.conversationFile.endsWith(".json")) {
             this.conversationFile = this.conversationFile + "l";
@@ -286734,20 +286821,39 @@ var ChatRecordingService = class {
         const directories = this.kind === "subagent" ? [
           ...this.context.config.getWorkspaceContext()?.getDirectories() ?? []
         ] : void 0;
-        const initialMetadata = {
-          sessionId: this.sessionId,
-          projectHash: this.projectHash,
-          startTime: (/* @__PURE__ */ new Date()).toISOString(),
-          lastUpdated: (/* @__PURE__ */ new Date()).toISOString(),
-          kind: this.kind,
-          directories
-        };
-        this.appendRecord(initialMetadata);
-        this.cachedConversation = {
-          ...initialMetadata,
-          messages: []
-        };
-        this.rebuildIndexAndWindow([]);
+        let fileAlreadyExisted = false;
+        if (fs32.existsSync(this.conversationFile)) {
+          fileAlreadyExisted = true;
+          const loadedRecord = await loadConversationRecord(this.conversationFile);
+          if (loadedRecord) {
+            this.cachedConversation = {
+              ...loadedRecord,
+              messages: loadedRecord.messages ?? []
+            };
+            this.projectHash = this.cachedConversation.projectHash;
+            if (loadedRecord.hasResumableContent || hasResumableConversationContent(this.cachedConversation.messages)) {
+              this.isResumedSession = true;
+            }
+          }
+        }
+        if (!fileAlreadyExisted || !this.cachedConversation) {
+          const initialMetadata = {
+            sessionId: this.sessionId,
+            projectHash: this.projectHash,
+            startTime: (/* @__PURE__ */ new Date()).toISOString(),
+            lastUpdated: (/* @__PURE__ */ new Date()).toISOString(),
+            kind: this.kind,
+            directories
+          };
+          this.appendRecord(initialMetadata);
+          this.cachedConversation = {
+            ...initialMetadata,
+            messages: []
+          };
+          this.rebuildIndexAndWindow([]);
+        } else {
+          this.rebuildIndexAndWindow(this.cachedConversation.messages);
+        }
       }
       this.queuedThoughts = [];
       this.queuedTokens = null;
@@ -286792,14 +286898,15 @@ var ChatRecordingService = class {
     this.hasEvictedMessages = msgs.length < this.messageOrder.length;
   }
   rebuildIndexAndWindow(messages) {
+    const safeMessages = messages ?? [];
     this.messageOrder = [];
     this.messageMetaMap.clear();
     this.toolCallMetaMap.clear();
-    for (const msg of messages) {
+    for (const msg of safeMessages) {
       this.indexMessage(msg);
     }
     if (this.cachedConversation) {
-      this.cachedConversation.messages = messages.length > MAX_HISTORY_MESSAGES ? messages.slice(-MAX_HISTORY_MESSAGES) : [...messages];
+      this.cachedConversation.messages = safeMessages.length > MAX_HISTORY_MESSAGES ? safeMessages.slice(-MAX_HISTORY_MESSAGES) : [...safeMessages];
       this.hasEvictedMessages = this.cachedConversation.messages.length < this.messageOrder.length;
     } else {
       this.hasEvictedMessages = false;
@@ -287106,12 +287213,30 @@ var ChatRecordingService = class {
    * session with a real user prompt, model response, or tool activity.
    */
   async deleteCurrentSessionIfNotResumableAsync() {
-    if (!this.conversationFile || !this.cachedConversation) {
+    if (this.initializationPromise) {
+      try {
+        await this.initializationPromise;
+      } catch {
+      }
+    }
+    if (this.isResumedSession) {
+      return;
+    }
+    if (!this.conversationFile) {
       return;
     }
-    if (hasResumableConversationContent(this.cachedConversation.messages) || Array.from(this.messageMetaMap.values()).some((m) => m.isResumable)) {
+    if (this.cachedConversation && hasResumableConversationContent(this.cachedConversation.messages ?? []) || Array.from(this.messageMetaMap.values()).some((m) => m.isResumable)) {
       return;
     }
+    if (fs32.existsSync(this.conversationFile)) {
+      try {
+        const fileRecord = await loadConversationRecord(this.conversationFile);
+        if (fileRecord && (fileRecord.hasResumableContent || hasResumableConversationContent(fileRecord.messages ?? []))) {
+          return;
+        }
+      } catch {
+      }
+    }
     await this.deleteCurrentSessionAsync();
   }
   /**
@@ -307310,7 +307435,7 @@ function getVersion() {
   }
   versionPromise = (async () => {
     const pkgJson = await getPackageJson(__dirname4);
-    return "0.64.0-preview.0";
+    return "0.65.0-nightly.20261007.gef59c532f";
   })();
   return versionPromise;
 }
@@ -341235,7 +341360,13 @@ var OAuthUtils = class {
       issuer: metadata2.issuer,
       tokenUrl: metadata2.token_endpoint,
       scopes: metadata2.scopes_supported || [],
-      registrationUrl: metadata2.registration_endpoint
+      registrationUrl: metadata2.registration_endpoint,
+      // RFC 9207 Section 3: the flag defaults to false when omitted. Discovered
+      // configurations therefore always carry an explicit boolean, which lets
+      // the callback policy distinguish them from an explicitly configured issuer.
+      // Only a literal boolean `true` enables the flag, so loosely typed values
+      // returned by some servers (e.g. "false" or "0") are not coerced to true.
+      authorizationResponseIssParameterSupported: metadata2.authorization_response_iss_parameter_supported === true
     };
   }
   /**
@@ -341559,7 +341690,7 @@ var A2AAuthProviderFactory = class _A2AAuthProviderFactory {
         return provider;
       }
       case "oauth2": {
-        const { OAuth2AuthProvider } = await import("./oauth2-provider-FVTRRJZR.js");
+        const { OAuth2AuthProvider } = await import("./oauth2-provider-IUYZ2A7H.js");
         const provider = new OAuth2AuthProvider(authConfig, options.agentName ?? "unknown", agentCard, options.agentCardUrl);
         await provider.initialize();
         return provider;
@@ -369889,7 +370020,7 @@ function areIssuersEqual(issuerA, issuerB) {
   }
   return normA === normB;
 }
-function startCallbackServer(expectedState, port, expectedIssuer) {
+function startCallbackServer(expectedState, port, expectedIssuer, requireIssInResponse) {
   let portResolve;
   let portReject;
   const portPromise = new Promise((resolve29, reject) => {
@@ -369943,8 +370074,9 @@ function startCallbackServer(expectedState, port, expectedIssuer) {
           return;
         }
         if (expectedIssuer) {
-          if (!iss) {
-            debugLogger.error('OAuth callback rejected: Missing required "iss" parameter when an expected issuer is configured. Possible IdP mix-up attack (RFC 9207).');
+          const requireIss = requireIssInResponse ?? true;
+          if (requireIss && !iss) {
+            debugLogger.error('OAuth callback rejected: Missing required "iss" parameter for the expected authorization server (RFC 9207).');
             res.writeHead(400, { "Content-Type": "text/html" });
             res.end(`
                 <html>
@@ -369959,7 +370091,7 @@ function startCallbackServer(expectedState, port, expectedIssuer) {
             reject(new Error('Missing "iss" parameter in authorization response per RFC 9207'));
             return;
           }
-          if (!areIssuersEqual(iss, expectedIssuer)) {
+          if (iss && !areIssuersEqual(iss, expectedIssuer)) {
             debugLogger.error("OAuth callback rejected: Issuer mismatch between authorization response and expected authorization server. Possible IdP mix-up attack (RFC 9207).");
             res.writeHead(400, { "Content-Type": "text/html" });
             res.end(`
@@ -369975,7 +370107,9 @@ function startCallbackServer(expectedState, port, expectedIssuer) {
             reject(new Error("Issuer mismatch in authorization response - possible OAuth mix-up attack"));
             return;
           }
-          debugLogger.debug("\u2713 OAuth callback issuer validated successfully.");
+          if (iss) {
+            debugLogger.debug("\u2713 OAuth callback issuer validated successfully.");
+          }
         } else if (iss) {
           debugLogger.debug('OAuth callback received "iss" parameter (no expected issuer was configured).');
         }
@@ -370379,6 +370513,7 @@ var MCPOAuthProvider = class {
                 issuer: discoveredConfig.issuer,
                 tokenUrl: discoveredConfig.tokenUrl,
                 scopes: config2.scopes || discoveredConfig.scopes || [],
+                authorizationResponseIssParameterSupported: config2.authorizationResponseIssParameterSupported ?? discoveredConfig.authorizationResponseIssParameterSupported,
                 // Preserve existing client credentials
                 clientId: config2.clientId,
                 clientSecret: config2.clientSecret
@@ -370402,6 +370537,7 @@ var MCPOAuthProvider = class {
             issuer: discoveredConfig.issuer,
             scopes: config2.scopes || discoveredConfig.scopes || [],
             registrationUrl: discoveredConfig.registrationUrl,
+            authorizationResponseIssParameterSupported: config2.authorizationResponseIssParameterSupported ?? discoveredConfig.authorizationResponseIssParameterSupported,
             // Preserve existing client credentials
             clientId: config2.clientId,
             clientSecret: config2.clientSecret
@@ -370414,7 +370550,8 @@ var MCPOAuthProvider = class {
     const pkceParams = generatePKCEParams();
     const preferredPort = getPortFromUrl(config2.redirectUri);
     debugLogger.debug(`Starting callback server for "${serverName}" (expected issuer: ${config2.issuer || "none"})...`);
-    const callbackServer = startCallbackServer(pkceParams.state, preferredPort, config2.issuer);
+    const requireIssInResponse = config2.authorizationResponseIssParameterSupported ?? Boolean(config2.issuer);
+    const callbackServer = startCallbackServer(pkceParams.state, preferredPort, config2.issuer, requireIssInResponse);
     const redirectPort = await callbackServer.port;
     debugLogger.debug(`Callback server listening on port ${redirectPort}`);
     if (!config2.clientId) {
@@ -371163,7 +371300,8 @@ async function handleAutomaticOAuth(mcpServerName, mcpServerConfig, wwwAuthentic
       authorizationUrl: oauthConfig.authorizationUrl,
       issuer: oauthConfig.issuer,
       tokenUrl: oauthConfig.tokenUrl,
-      scopes: oauthConfig.scopes || []
+      scopes: oauthConfig.scopes || [],
+      authorizationResponseIssParameterSupported: mcpServerConfig.oauth?.authorizationResponseIssParameterSupported ?? oauthConfig.authorizationResponseIssParameterSupported
     };
     debugLogger.log(`Starting OAuth authentication for server '${mcpServerName}'...`);
     const authProvider = new MCPOAuthProvider(new MCPOAuthTokenStorage());
@@ -371707,7 +371845,8 @@ async function connectToMcpServer(clientVersion, mcpServerName, mcpServerConfig,
               authorizationUrl: oauthConfig.authorizationUrl,
               issuer: oauthConfig.issuer,
               tokenUrl: oauthConfig.tokenUrl,
-              scopes: oauthConfig.scopes || []
+              scopes: oauthConfig.scopes || [],
+              authorizationResponseIssParameterSupported: mcpServerConfig.oauth?.authorizationResponseIssParameterSupported ?? oauthConfig.authorizationResponseIssParameterSupported
             };
             const authServerUrl = mcpServerConfig.httpUrl || mcpServerConfig.url;
             debugLogger.log(`Starting OAuth authentication for server '${mcpServerName}'...`);

package/bundle/{chunk-SDWOC67Z.js → chunk-7NUXN3UV.js}

@@ -5,7 +5,7 @@ import {
   isTelemetrySdkInitialized,
   resetBrowserSession,
   shutdownTelemetry
-} from "./chunk-6OFXOGEG.js";
+} from "./chunk-JYWQ73Z5.js";
 
 // packages/cli/src/utils/cleanup.ts
 import { promises as fs } from "node:fs";

package/bundle/{chunk-Y2HXXBXI.js → chunk-ASQYH7O3.js}

@@ -1,7 +1,7 @@
 const require = (await import('node:module')).createRequire(import.meta.url); const __chunk_filename = (await import('node:url')).fileURLToPath(import.meta.url); const __chunk_dirname = (await import('node:path')).dirname(__chunk_filename);
 import {
   checkExhaustive
-} from "./chunk-6OFXOGEG.js";
+} from "./chunk-JYWQ73Z5.js";
 import {
   __commonJS,
   __toESM

package/bundle/{chunk-EBP6K2WG.js → chunk-BT4BJCGX.js}

@@ -2,7 +2,7 @@ const require = (await import('node:module')).createRequire(import.meta.url); co
 import {
   exitCli,
   require_source
-} from "./chunk-ZOHM7BPT.js";
+} from "./chunk-NUWDVBI7.js";
 import {
   AppEvent,
   appEvents
@@ -63,15 +63,15 @@ import {
   stripUnsafeCharacters,
   toCodePoints,
   validateCustomTheme
-} from "./chunk-HN74ORTP.js";
+} from "./chunk-XOG2HJ3Y.js";
 import {
   isDevelopment
-} from "./chunk-VBVCLWLA.js";
+} from "./chunk-WGJZZTZY.js";
 import {
   emptyIcon,
   mapCoreStatusToDisplayStatus,
   require_react
-} from "./chunk-NX7TO2DU.js";
+} from "./chunk-NDVLWD4V.js";
 import {
   ALL_EDITORS,
   ApprovalMode,
@@ -252,7 +252,7 @@ import {
   tokenLimit,
   uiTelemetryService,
   unescapePath
-} from "./chunk-ZQW7OGUO.js";
+} from "./chunk-6FH32SR7.js";
 import {
   require_src
 } from "./chunk-L6PII3GR.js";
@@ -77764,7 +77764,7 @@ var authCommand = {
 import process29 from "node:process";
 
 // packages/cli/src/generated/git-commit.ts
-var GIT_COMMIT_INFO = "fdf63956c";
+var GIT_COMMIT_INFO = "3f70412f0";
 
 // packages/cli/src/ui/utils/historyExportUtils.ts
 import * as fsPromises from "node:fs/promises";
@@ -80895,18 +80895,22 @@ var import_react71 = __toESM(require_react(), 1);
 import process33 from "node:process";
 var import_jsx_runtime24 = __toESM(require_jsx_runtime(), 1);
 var MemoryUsageDisplay = ({ color = theme.text.primary, isActive = true }) => {
-  const [memoryUsage, setMemoryUsage] = (0, import_react71.useState)("");
-  const [memoryUsageColor, setMemoryUsageColor] = (0, import_react71.useState)(color);
+  const [memoryUsage, setMemoryUsage] = (0, import_react71.useState)(
+    () => formatBytes(process33.memoryUsage().rss)
+  );
+  const [memoryUsageColor, setMemoryUsageColor] = (0, import_react71.useState)(
+    () => process33.memoryUsage().rss >= 2 * 1024 * 1024 * 1024 ? theme.status.error : color
+  );
   (0, import_react71.useEffect)(() => {
     if (!isActive) {
       return;
     }
     const updateMemory = () => {
       const usage = process33.memoryUsage().rss;
-      setMemoryUsage(formatBytes(usage));
-      setMemoryUsageColor(
-        usage >= 2 * 1024 * 1024 * 1024 ? theme.status.error : color
-      );
+      const formatted = formatBytes(usage);
+      const nextColor = usage >= 2 * 1024 * 1024 * 1024 ? theme.status.error : color;
+      setMemoryUsage((prev) => prev === formatted ? prev : formatted);
+      setMemoryUsageColor((prev) => prev === nextColor ? prev : nextColor);
     };
     const intervalId = setInterval(updateMemory, 2e3);
     updateMemory();
@@ -81400,7 +81404,13 @@ var Footer = () => {
         addCol(
           id,
           header,
-          () => /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(MemoryUsageDisplay, { color: itemColor, isActive: !copyModeEnabled }),
+          () => /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(
+            MemoryUsageDisplay,
+            {
+              color: itemColor,
+              isActive: !copyModeEnabled && uiState.constrainHeight
+            }
+          ),
           10
         );
         break;
@@ -83545,7 +83555,7 @@ Use /mcp auth <server-name> to authenticate.`
         type: "info",
         text: `Starting OAuth authentication for MCP server '${serverName}'...`
       });
-      const { MCPOAuthProvider } = await import("./dist-7L3BRW6V.js");
+      const { MCPOAuthProvider } = await import("./dist-Z23CJKTC.js");
       let oauthConfig = server.oauth;
       if (!oauthConfig) {
         oauthConfig = { enabled: false };
@@ -97502,10 +97512,16 @@ var MaxSizedBox = ({
   (0, import_react79.useEffect)(() => {
     if (totalHiddenLines > 0) {
       addOverflowingId?.(id);
-    } else {
+    } else if (effectiveMaxHeight !== void 0) {
       removeOverflowingId?.(id);
     }
-  }, [id, totalHiddenLines, addOverflowingId, removeOverflowingId]);
+  }, [
+    id,
+    totalHiddenLines,
+    effectiveMaxHeight,
+    addOverflowingId,
+    removeOverflowingId
+  ]);
   (0, import_react79.useEffect)(
     () => () => {
       removeOverflowingId?.(id);