@google/gemini-cli 0.67.0-nightly.20261104.g89e9d25d6 → 0.67.0

package/bundle/{chunk-5WHCLVFH.js → chunk-CJFBYU4J.js}

@@ -2,7 +2,7 @@ const require = (await import('node:module')).createRequire(import.meta.url); co
 import {
   exitCli,
   require_source
-} from "./chunk-T6YNV33L.js";
+} from "./chunk-IGE3G3WZ.js";
 import {
   AppEvent,
   appEvents
@@ -69,24 +69,22 @@ import {
   use_stdin_default,
   use_stdout_default,
   validateCustomTheme
-} from "./chunk-Q3OUSMTD.js";
+} from "./chunk-P62CI7AR.js";
 import {
   isDevelopment,
   require_semver
-} from "./chunk-TAYMSEDM.js";
+} from "./chunk-M73CYIV5.js";
 import {
   emptyIcon,
   mapCoreStatusToDisplayStatus,
   require_react
-} from "./chunk-7SSKD5HN.js";
+} from "./chunk-QTXJG3I3.js";
 import {
   ALL_EDITORS,
   ApprovalMode,
   AsyncFzf,
-  AuthType,
   Config,
   CoreEvent,
-  CoreToolCallStatus,
   DiscoveredMCPTool,
   ExtensionDisableEvent,
   ExtensionEnableEvent,
@@ -97,32 +95,21 @@ import {
   ExtensionUpdateEvent,
   GEMINI_CLI_COMPANION_EXTENSION_NAME,
   GEMINI_DIR,
-  HookType,
-  IDEConnectionStatus,
   INITIAL_HISTORY_LENGTH,
   IdeClient,
   IdeConnectionEvent,
-  IdeConnectionType,
-  IntegrityDataStatus,
   KeychainTokenStorage,
-  LlmRole,
-  MCPDiscoveryState,
   MCPOAuthTokenStorage,
-  MCPServerStatus,
   ModelSlashCommandEvent,
-  PolicyDecision,
   ProjectIdRequiredError,
   REFERENCE_CONTENT_END,
   REFERENCE_CONTENT_START,
   ReadManyFilesTool,
   RewindEvent,
   SHELL_TOOL_NAME,
-  SessionEndReason,
-  SessionStartSource,
   ShellExecutionService,
   StartSessionEvent,
   Storage,
-  TrustLevel,
   UPGRADE_URL_PAGE,
   UserAccountManager,
   ValidationRequiredError,
@@ -232,7 +219,6 @@ import {
   require_cross_spawn,
   require_is_stream,
   require_path_key,
-  require_proper_lockfile,
   require_pump,
   require_toml,
   resetBrowserSession,
@@ -253,7 +239,7 @@ import {
   uiTelemetryService,
   unescapePath,
   validateUrlDestination
-} from "./chunk-DKKEYKSG.js";
+} from "./chunk-LAR4JEC7.js";
 import {
   require_src
 } from "./chunk-L6PII3GR.js";
@@ -6514,7 +6500,7 @@ var require_extract_zip = __commonJS({
     var stream = __require("stream");
     var yauzl = require_yauzl();
     var openZip = promisify5(yauzl.open);
-    var pipeline3 = promisify5(stream.pipeline);
+    var pipeline2 = promisify5(stream.pipeline);
     var Extractor = class {
       constructor(zipPath, opts) {
         this.zipPath = zipPath;
@@ -6602,7 +6588,7 @@ var require_extract_zip = __commonJS({
           debug("creating symlink", link, dest);
           await fs33.symlink(link, dest);
         } else {
-          await pipeline3(readStream, createWriteStream5(dest, { mode: procMode }));
+          await pipeline2(readStream, createWriteStream5(dest, { mode: procMode }));
         }
       }
       getExtractedMode(entryMode, isDir) {
@@ -15338,11 +15324,11 @@ var require_util4 = __commonJS({
     var { isUint8Array } = __require("node:util/types");
     var { webidl } = require_webidl();
     var supportedHashes = [];
-    var crypto4;
+    var crypto3;
     try {
-      crypto4 = __require("node:crypto");
+      crypto3 = __require("node:crypto");
       const possibleRelevantHashes = ["sha256", "sha384", "sha512"];
-      supportedHashes = crypto4.getHashes().filter((hash) => possibleRelevantHashes.includes(hash));
+      supportedHashes = crypto3.getHashes().filter((hash) => possibleRelevantHashes.includes(hash));
     } catch {
     }
     function responseURL(response) {
@@ -15645,7 +15631,7 @@ var require_util4 = __commonJS({
       return isOriginPotentiallyTrustworthy(url.origin);
     }
     function bytesMatch(bytes, metadataList) {
-      if (crypto4 === void 0) {
+      if (crypto3 === void 0) {
         return true;
       }
       const parsedMetadata = parseMetadata(metadataList);
@@ -15660,7 +15646,7 @@ var require_util4 = __commonJS({
       for (const item of metadata) {
         const algorithm = item.algo;
         const expectedValue = item.hash;
-        let actualValue = crypto4.createHash(algorithm).update(bytes).digest("base64");
+        let actualValue = crypto3.createHash(algorithm).update(bytes).digest("base64");
         if (actualValue[actualValue.length - 1] === "=") {
           if (actualValue[actualValue.length - 2] === "=") {
             actualValue = actualValue.slice(0, -2);
@@ -16678,8 +16664,8 @@ var require_body = __commonJS({
     var { multipartFormDataParser } = require_formdata_parser();
     var random;
     try {
-      const crypto4 = __require("node:crypto");
-      random = (max) => crypto4.randomInt(0, max);
+      const crypto3 = __require("node:crypto");
+      random = (max) => crypto3.randomInt(0, max);
     } catch {
       random = (max) => Math.floor(Math.random() * max);
     }
@@ -18130,7 +18116,7 @@ var require_client_h2 = __commonJS({
   "packages/cli/node_modules/undici/lib/dispatcher/client-h2.js"(exports, module) {
     "use strict";
     var assert = __require("node:assert");
-    var { pipeline: pipeline3 } = __require("node:stream");
+    var { pipeline: pipeline2 } = __require("node:stream");
     var util2 = require_util3();
     var {
       RequestContentLengthMismatchError,
@@ -18625,7 +18611,7 @@ var require_client_h2 = __commonJS({
     }
     function writeStream(abort, socket, expectsPayload, h2stream, body, client, request, contentLength) {
       assert(contentLength !== 0 || client[kRunning] === 0, "stream body cannot be pipelined");
-      const pipe = pipeline3(
+      const pipe = pipeline2(
         body,
         h2stream,
         (err) => {
@@ -21519,7 +21505,7 @@ var require_api_pipeline = __commonJS({
         util2.destroy(ret, err);
       }
     };
-    function pipeline3(opts, handler2) {
+    function pipeline2(opts, handler2) {
       try {
         const pipelineHandler = new PipelineHandler(opts, handler2);
         this.dispatch({ ...opts, body: pipelineHandler.req }, pipelineHandler);
@@ -21528,7 +21514,7 @@ var require_api_pipeline = __commonJS({
         return new PassThrough().destroy(err);
       }
     }
-    module.exports = pipeline3;
+    module.exports = pipeline2;
   }
 });
 
@@ -26944,7 +26930,7 @@ var require_fetch = __commonJS({
       subresourceSet
     } = require_constants3();
     var EE = __require("node:events");
-    var { Readable, pipeline: pipeline3, finished, isErrored, isReadable } = __require("node:stream");
+    var { Readable, pipeline: pipeline2, finished, isErrored, isReadable } = __require("node:stream");
     var { addAbortListener, bufferToLowerCasedHeaderName } = require_util3();
     var { dataURLProcessor, serializeAMimeType, minimizeSupportedMimeType } = require_data_url();
     var { getGlobalDispatcher } = require_global2();
@@ -27887,7 +27873,7 @@ var require_fetch = __commonJS({
                 status,
                 statusText,
                 headersList,
-                body: decoders.length ? pipeline3(this.body, ...decoders, (err) => {
+                body: decoders.length ? pipeline2(this.body, ...decoders, (err) => {
                   if (err) {
                     this.onError(err);
                   }
@@ -29596,13 +29582,13 @@ var require_frame = __commonJS({
     "use strict";
     var { maxUnsigned16Bit, opcodes } = require_constants5();
     var BUFFER_SIZE = 8 * 1024;
-    var crypto4;
+    var crypto3;
     var buffer = null;
     var bufIdx = BUFFER_SIZE;
     try {
-      crypto4 = __require("node:crypto");
+      crypto3 = __require("node:crypto");
     } catch {
-      crypto4 = {
+      crypto3 = {
         // not full compatibility, but minimum.
         randomFillSync: function randomFillSync(buffer2, _offset, _size) {
           for (let i = 0; i < buffer2.length; ++i) {
@@ -29615,7 +29601,7 @@ var require_frame = __commonJS({
     function generateMask() {
       if (bufIdx === BUFFER_SIZE) {
         bufIdx = 0;
-        crypto4.randomFillSync(buffer ??= Buffer.allocUnsafeSlow(BUFFER_SIZE), 0, BUFFER_SIZE);
+        crypto3.randomFillSync(buffer ??= Buffer.allocUnsafeSlow(BUFFER_SIZE), 0, BUFFER_SIZE);
       }
       return [buffer[bufIdx++], buffer[bufIdx++], buffer[bufIdx++], buffer[bufIdx++]];
     }
@@ -29713,9 +29699,9 @@ var require_connection = __commonJS({
     var { getDecodeSplit } = require_util4();
     var { WebsocketFrameSend } = require_frame();
     var assert = __require("node:assert");
-    var crypto4;
+    var crypto3;
     try {
-      crypto4 = __require("node:crypto");
+      crypto3 = __require("node:crypto");
     } catch {
     }
     function establishWebSocketConnection(url, protocols, client, handler2, options) {
@@ -29735,7 +29721,7 @@ var require_connection = __commonJS({
         const headersList = getHeadersList(new Headers(options.headers));
         request.headersList = headersList;
       }
-      const keyValue = crypto4.randomBytes(16).toString("base64");
+      const keyValue = crypto3.randomBytes(16).toString("base64");
       request.headersList.append("sec-websocket-key", keyValue, true);
       request.headersList.append("sec-websocket-version", "13", true);
       for (const protocol of protocols) {
@@ -29768,7 +29754,7 @@ var require_connection = __commonJS({
             return;
           }
           const secWSAccept = response.headersList.get("Sec-WebSocket-Accept");
-          const digest = crypto4.createHash("sha1").update(keyValue + uid).digest("base64");
+          const digest = crypto3.createHash("sha1").update(keyValue + uid).digest("base64");
           if (secWSAccept !== digest) {
             failWebsocketConnection(handler2, 1002, "Incorrect hash received in Sec-WebSocket-Accept header.");
             return;
@@ -31380,7 +31366,7 @@ ${value}`;
 var require_eventsource = __commonJS({
   "packages/cli/node_modules/undici/lib/web/eventsource/eventsource.js"(exports, module) {
     "use strict";
-    var { pipeline: pipeline3 } = __require("node:stream");
+    var { pipeline: pipeline2 } = __require("node:stream");
     var { fetching } = require_fetch();
     var { makeRequest } = require_request2();
     var { webidl } = require_webidl();
@@ -31541,7 +31527,7 @@ var require_eventsource = __commonJS({
               ));
             }
           });
-          pipeline3(
+          pipeline2(
             response.body.stream,
             eventSourceStream,
             (error) => {
@@ -37261,7 +37247,7 @@ var import_react8 = __toESM(require_react(), 1);
 function useIdeTrustListener() {
   const settings = useSettings();
   const [connectionStatus, setConnectionStatus] = (0, import_react8.useState)(
-    IDEConnectionStatus.Disconnected
+    "disconnected" /* Disconnected */
   );
   const previousTrust = (0, import_react8.useRef)(void 0);
   const [restartReason, setRestartReason] = (0, import_react8.useState)("NONE");
@@ -37291,7 +37277,7 @@ function useIdeTrustListener() {
     };
   }, []);
   const getSnapshot = () => {
-    if (connectionStatus !== IDEConnectionStatus.Connected) {
+    if (connectionStatus !== "connected" /* Connected */) {
       return void 0;
     }
     return ideContextStore.get()?.workspaceState?.isTrusted;
@@ -37996,7 +37982,7 @@ async function initializeApp(config, settings) {
       await ideClient.connect();
       logIdeConnection(
         config,
-        new IdeConnectionEvent(IdeConnectionType.START)
+        new IdeConnectionEvent("start" /* START */)
       );
     }).catch((e) => {
       debugLogger.error("Failed to initialize IDE client:", e);
@@ -38014,17 +38000,17 @@ async function initializeApp(config, settings) {
 // packages/cli/src/config/auth.ts
 async function validateAuthMethod(authMethod) {
   loadEnvironment(loadSettings().merged, process.cwd());
-  if (authMethod === AuthType.LOGIN_WITH_GOOGLE || authMethod === AuthType.COMPUTE_ADC) {
+  if (authMethod === "oauth-personal" /* LOGIN_WITH_GOOGLE */ || authMethod === "compute-default-credentials" /* COMPUTE_ADC */) {
     return null;
   }
-  if (authMethod === AuthType.USE_GEMINI) {
+  if (authMethod === "gemini-api-key" /* USE_GEMINI */) {
     const key = process.env["GEMINI_API_KEY"] || await loadApiKey();
     if (!key) {
       return "When using Gemini API, you must specify the GEMINI_API_KEY environment variable.\nUpdate your environment and try again (no reload needed if using .env)!";
     }
     return null;
   }
-  if (authMethod === AuthType.USE_VERTEX_AI) {
+  if (authMethod === "vertex-ai" /* USE_VERTEX_AI */) {
     const hasVertexProjectLocationConfig = !!process.env["GOOGLE_CLOUD_PROJECT"] && !!process.env["GOOGLE_CLOUD_LOCATION"];
     const hasGoogleApiKey = !!process.env["GOOGLE_API_KEY"];
     if (!hasVertexProjectLocationConfig && !hasGoogleApiKey) {
@@ -38675,7 +38661,6 @@ async function getMissingSettings(extensionConfig, extensionId, workspaceDir) {
 
 // packages/cli/src/config/extension-manager.ts
 var import_chalk2 = __toESM(require_source(), 1);
-var import_proper_lockfile = __toESM(require_proper_lockfile(), 1);
 import * as fs12 from "node:fs";
 import * as path9 from "node:path";
 import { stat } from "node:fs/promises";
@@ -38847,7 +38832,7 @@ var ExtensionEnablementManager = class {
 };
 
 // packages/cli/src/config/extension-manager.ts
-import { createHash as createHash2, randomUUID as randomUUID2 } from "node:crypto";
+import { createHash as createHash2, randomUUID } from "node:crypto";
 
 // packages/cli/src/config/extension.ts
 import * as fs8 from "node:fs";
@@ -38944,12 +38929,10 @@ function extensionUpdatesReducer(state, action) {
 }
 
 // packages/cli/src/config/extensions/github.ts
-import * as crypto2 from "node:crypto";
 import * as os3 from "node:os";
 import * as https2 from "node:https";
 import * as fs10 from "node:fs";
 import * as path8 from "node:path";
-import { pipeline } from "node:stream/promises";
 
 // packages/cli/node_modules/tar/dist/esm/index.min.js
 import Hr from "events";
@@ -41864,14 +41847,6 @@ import * as https from "node:https";
 function getGitHubToken() {
   return process.env["GITHUB_TOKEN"] || void 0;
 }
-function isTrustedGitHubUrl(url) {
-  try {
-    const parsedUrl = new URL(url);
-    return parsedUrl.protocol === "https:" && (parsedUrl.hostname === "github.com" || parsedUrl.hostname.endsWith(".github.com"));
-  } catch {
-    return false;
-  }
-}
 var lookupPublicAddress = (hostname, options, callback) => safeLookup(
   hostname,
   {
@@ -41881,7 +41856,6 @@ var lookupPublicAddress = (hostname, options, callback) => safeLookup(
   callback
 );
 var REDIRECT_STATUS_CODES = /* @__PURE__ */ new Set([301, 302, 303, 307, 308]);
-var REQUEST_TIMEOUT_MS = 3e4;
 async function fetchJson(url, redirectCount = 0) {
   if (!await validateUrlDestination(url)) {
     throw new Error(`Access to blocked or private host ${url} is not allowed.`);
@@ -41890,8 +41864,14 @@ async function fetchJson(url, redirectCount = 0) {
     "User-Agent": "gemini-cli"
   };
   const token = getGitHubToken();
-  if (token && isTrustedGitHubUrl(url)) {
-    headers.Authorization = `token ${token}`;
+  if (token) {
+    try {
+      const parsedUrl = new URL(url);
+      if (parsedUrl.protocol === "https:" && (parsedUrl.hostname === "github.com" || parsedUrl.hostname.endsWith(".github.com"))) {
+        headers.Authorization = `token ${token}`;
+      }
+    } catch {
+    }
   }
   return new Promise((resolve9, reject) => {
     let settled = false;
@@ -41916,7 +41896,7 @@ async function fetchJson(url, redirectCount = 0) {
     const requestOptions = {
       headers,
       lookup: lookupPublicAddress,
-      timeout: REQUEST_TIMEOUT_MS
+      timeout: 3e4
     };
     const req = https.get(url, requestOptions, (res) => {
       res.on(
@@ -42009,9 +41989,7 @@ async function fetchJson(url, redirectCount = 0) {
     });
     req.on("error", (error) => failUnlessRedirecting(() => error));
     req.on("timeout", () => {
-      failUnlessRedirecting(
-        () => new Error(`Request timed out after ${REQUEST_TIMEOUT_MS}ms`)
-      );
+      failUnlessRedirecting(() => new Error("Request timed out after 30000ms"));
       req.destroy();
     });
   });
@@ -42081,7 +42059,7 @@ function tryParseGithubUrl(source2) {
     );
   }
   const owner = parts[0];
-  const repo = parts[1].replace(/\.git$/i, "");
+  const repo = parts[1].replace(".git", "");
   return {
     owner,
     repo
@@ -42362,175 +42340,39 @@ function findReleaseAsset(assets) {
   return void 0;
 }
 async function downloadFile(url, dest, options, redirectCount = 0) {
-  let parsedUrl;
-  try {
-    parsedUrl = new URL(url);
-  } catch (error) {
-    throw new Error(`Invalid download URL ${url}: ${getErrorMessage(error)}`, {
-      cause: error
-    });
-  }
-  if (parsedUrl.protocol !== "https:") {
-    throw new Error(
-      `Refusing to download from insecure protocol ${parsedUrl.protocol} for URL ${url}. Only HTTPS is supported.`
-    );
-  }
-  const requestUrl = parsedUrl.toString();
-  if (!await validateUrlDestination(requestUrl)) {
-    throw new Error(
-      `Access to blocked or private host ${requestUrl} is not allowed.`
-    );
-  }
   const headers = {
     "User-agent": "gemini-cli",
     Accept: "application/octet-stream",
     ...options?.headers
   };
-  const trustedGitHubUrl = isTrustedGitHubUrl(requestUrl);
-  if (!trustedGitHubUrl) {
-    for (const key of Object.keys(headers)) {
-      if (key.toLowerCase() === "authorization") {
-        delete headers[key];
-      }
-    }
-  }
   const token = getGitHubToken();
-  if (token && trustedGitHubUrl) {
+  if (token) {
     headers["Authorization"] = `token ${token}`;
   }
-  let tempDest;
-  let downloadPipeline;
-  try {
-    await new Promise((resolve9, reject) => {
-      let settled = false;
-      let isRedirecting = false;
-      let responseStream;
-      const settleResolve = () => {
-        if (!settled) {
-          settled = true;
-          resolve9();
-        }
-      };
-      const settleReject = (error) => {
-        if (!settled) {
-          settled = true;
-          reject(
-            error instanceof Error ? error : new Error(getErrorMessage(error))
-          );
-        }
-      };
-      const requestOptions = {
-        headers,
-        lookup: lookupPublicAddress,
-        timeout: REQUEST_TIMEOUT_MS
-      };
-      const req = https2.get(requestUrl, requestOptions, (res) => {
-        res.on("error", (error) => {
-          if (!isRedirecting) {
-            settleReject(error);
-          }
-        });
-        if (res.statusCode && REDIRECT_STATUS_CODES.has(res.statusCode)) {
-          if (redirectCount >= 10) {
-            res.resume?.();
-            settleReject(new Error("Too many redirects"));
-            return;
-          }
-          if (!res.headers.location) {
-            res.resume?.();
-            settleReject(
-              new Error("Redirect response missing Location header")
-            );
-            return;
-          }
-          let redirectUrl;
-          try {
-            redirectUrl = new URL(res.headers.location, requestUrl).toString();
-          } catch (error) {
-            res.resume?.();
-            settleReject(
-              new Error(
-                `Invalid redirect URL from ${requestUrl} (status ${res.statusCode}): ${getErrorMessage(error)}`,
-                { cause: error }
-              )
-            );
-            return;
-          }
-          isRedirecting = true;
-          res.resume?.();
-          void downloadFile(redirectUrl, dest, options, redirectCount + 1).then(
-            settleResolve,
-            settleReject
-          );
-          return;
-        }
-        if (res.statusCode !== 200) {
-          res.resume?.();
-          settleReject(
-            new Error(`Request failed with status code ${res.statusCode}`)
-          );
-          return;
-        }
-        responseStream = res;
-        const currentTempDest = `${dest}.${crypto2.randomUUID()}.tmp`;
-        tempDest = currentTempDest;
-        let file;
-        try {
-          file = fs10.createWriteStream(currentTempDest);
-        } catch (error) {
-          res.destroy?.();
-          settleReject(error);
-          return;
-        }
-        file.on("error", settleReject);
-        downloadPipeline = pipeline(res, file);
-        void downloadPipeline.then(() => {
-          if (res.complete === false) {
-            settleReject(
-              new Error(
-                `Response ended prematurely while downloading ${requestUrl}`
-              )
-            );
-            return;
-          }
-          settleResolve();
-        }, settleReject);
-      });
-      req.on("error", (error) => {
-        if (isRedirecting) {
-          return;
+  return new Promise((resolve9, reject) => {
+    https2.get(url, { headers }, (res) => {
+      if (res.statusCode === 302 || res.statusCode === 301) {
+        if (redirectCount >= 10) {
+          return reject(new Error("Too many redirects"));
         }
-        settleReject(error);
-        responseStream?.destroy?.();
-      });
-      req.on("timeout", () => {
-        if (!isRedirecting) {
-          settleReject(
-            new Error(`Request timed out after ${REQUEST_TIMEOUT_MS}ms`)
+        if (!res.headers.location) {
+          return reject(
+            new Error("Redirect response missing Location header")
           );
-          responseStream?.destroy?.();
         }
-        req.destroy?.();
-      });
-    });
-    if (tempDest) {
-      await fs10.promises.rename(tempDest, dest);
-    }
-  } catch (error) {
-    if (downloadPipeline) {
-      try {
-        await downloadPipeline;
-      } catch {
+        downloadFile(res.headers.location, dest, options, redirectCount + 1).then(resolve9).catch(reject);
+        return;
       }
-    }
-    if (tempDest) {
-      try {
-        await fs10.promises.unlink(tempDest);
-      } catch {
+      if (res.statusCode !== 200) {
+        return reject(
+          new Error(`Request failed with status code ${res.statusCode}`)
+        );
       }
-    }
-    throw error;
-  }
+      const file = fs10.createWriteStream(dest);
+      res.pipe(file);
+      file.on("finish", () => file.close(resolve9));
+    }).on("error", reject);
+  });
 }
 async function extractFile(file, dest) {
   if (file.endsWith(".tar.gz")) {
@@ -42758,9 +42600,6 @@ async function removeDirectoryWithRetry(path37, options = {}) {
 }
 
 // packages/cli/src/config/extension-manager.ts
-var INSTALL_LOCK_SUFFIX = ".lock";
-var INSTALL_LOCK_STALE_MS = 15e3;
-var INSTALL_LOCK_RETRIES = { retries: 15, minTimeout: 200, maxTimeout: 500 };
 var ExtensionManager = class extends ExtensionLoader {
   extensionEnablementManager;
   integrityManager;
@@ -42781,7 +42620,7 @@ var ExtensionManager = class extends ExtensionLoader {
     this.telemetryConfig = new Config({
       telemetry: options.settings.telemetry,
       interactive: false,
-      sessionId: randomUUID2(),
+      sessionId: randomUUID(),
       clientVersion: options.clientVersion ?? "unknown",
       targetDir: options.workspaceDir,
       cwd: options.workspaceDir,
@@ -42852,7 +42691,7 @@ var ExtensionManager = class extends ExtensionLoader {
           const trustedFolders = loadTrustedFolders();
           await trustedFolders.setValue(
             this.workspaceDir,
-            TrustLevel.TRUST_FOLDER
+            "TRUST_FOLDER" /* TRUST_FOLDER */
           );
         } else {
           throw new Error(
@@ -42905,7 +42744,6 @@ Would you like to attempt to install via "git clone" instead?`
       } else {
         throw new Error(`Unsupported install type: ${installMetadata.type}`);
       }
-      let releaseLock;
       try {
         newExtensionConfig = await this.loadExtensionConfig(localSourcePath);
         const newExtensionName = newExtensionConfig.name;
@@ -42954,19 +42792,11 @@ Would you like to attempt to install via "git clone" instead?`
         const destinationPath = new ExtensionStorage(
           newExtensionName
         ).getExtensionDir();
-        const assertDestinationIsAvailable = () => {
-          if ((!isUpdate || newExtensionName !== previousName) && fs12.existsSync(destinationPath)) {
-            throw new Error(
-              `Cannot install extension "${newExtensionName}" because a directory with that name already exists. Please remove it manually.`
-            );
-          }
-        };
-        assertDestinationIsAvailable();
-        releaseLock = await acquireExtensionInstallLock(
-          destinationPath,
-          newExtensionName
-        );
-        assertDestinationIsAvailable();
+        if ((!isUpdate || newExtensionName !== previousName) && fs12.existsSync(destinationPath)) {
+          throw new Error(
+            `Cannot install extension "${newExtensionName}" because a directory with that name already exists. Please remove it manually.`
+          );
+        }
         let previousSettings;
         let wasEnabledGlobally = false;
         let wasEnabledWorkspace = false;
@@ -43047,7 +42877,7 @@ Would you like to attempt to install via "git clone" instead?`
               newExtensionConfig.version,
               previousExtensionConfig.version,
               installMetadata.type,
-              CoreToolCallStatus.Success
+              "success" /* Success */
             )
           );
           if (newExtensionName !== previousName) {
@@ -43070,7 +42900,7 @@ Would you like to attempt to install via "git clone" instead?`
               getExtensionId(newExtensionConfig, installMetadata),
               newExtensionConfig.version,
               installMetadata.type,
-              CoreToolCallStatus.Success
+              "success" /* Success */
             )
           );
           await this.enableExtension(
@@ -43079,15 +42909,6 @@ Would you like to attempt to install via "git clone" instead?`
           );
         }
       } finally {
-        if (releaseLock) {
-          try {
-            await releaseLock();
-          } catch (releaseError) {
-            debugLogger.warn(
-              `Failed to release the install lock for extension "${newExtensionConfig?.name}": ${getErrorMessage(releaseError)}`
-            );
-          }
-        }
         if (tempDir) {
           try {
             await removeDirectoryWithRetry(tempDir);
@@ -43118,7 +42939,7 @@ Would you like to attempt to install via "git clone" instead?`
             newExtensionConfig?.version ?? "",
             previousExtensionConfig.version,
             installMetadata.type,
-            CoreToolCallStatus.Error
+            "error" /* Error */
           )
         );
       } else {
@@ -43130,7 +42951,7 @@ Would you like to attempt to install via "git clone" instead?`
             extensionId ?? "",
             newExtensionConfig?.version ?? "",
             installMetadata.type,
-            CoreToolCallStatus.Error
+            "error" /* Error */
           )
         );
       }
@@ -43158,7 +42979,7 @@ Would you like to attempt to install via "git clone" instead?`
         extension.name,
         hashValue(extension.name),
         extension.id,
-        CoreToolCallStatus.Success
+        "success" /* Success */
       )
     );
   }
@@ -43258,9 +43079,6 @@ Would you like to attempt to install via "git clone" instead?`
    * Builds an extension without side effects (does not mutate loadedExtensions or start it).
    */
   async _buildExtension(extensionDir) {
-    if (path9.basename(extensionDir).endsWith(INSTALL_LOCK_SUFFIX)) {
-      return null;
-    }
     try {
       const stats = await fs12.promises.stat(extensionDir);
       if (!stats.isDirectory()) {
@@ -43424,7 +43242,7 @@ Would you like to attempt to install via "git clone" instead?`
             if (eventHooks) {
               for (const definition of eventHooks) {
                 for (const hook of definition.hooks) {
-                  if (hook.type === HookType.Command) {
+                  if (hook.type === "command" /* Command */) {
                     hook.env = { ...hook.env, ...hookEnv };
                   }
                 }
@@ -43746,32 +43564,6 @@ async function copyExtension(source2, destination) {
   await fs12.promises.cp(source2, destination, { recursive: true });
   await makeWritableRecursive(destination);
 }
-async function acquireExtensionInstallLock(destinationPath, extensionName) {
-  await fs12.promises.mkdir(path9.dirname(destinationPath), { recursive: true });
-  try {
-    return await (0, import_proper_lockfile.lock)(destinationPath, {
-      // `destinationPath` usually does not exist yet. With `realpath: false`,
-      // proper-lockfile neither resolves nor stats it; it only creates and
-      // checks the `<destinationPath>.lock` directory.
-      realpath: false,
-      stale: INSTALL_LOCK_STALE_MS,
-      retries: INSTALL_LOCK_RETRIES,
-      // The default handler throws from a timer, which would crash the CLI.
-      onCompromised: (error) => {
-        debugLogger.warn(
-          `Lost the install lock for extension "${extensionName}": ${getErrorMessage(error)}`
-        );
-      }
-    });
-  } catch (error) {
-    if (isNodeError(error) && error.code === "ELOCKED") {
-      throw new Error(
-        `Cannot install extension "${extensionName}" because another installation or update of it is already in progress. Please try again later.`
-      );
-    }
-    throw error;
-  }
-}
 function getContextFileNames(config) {
   if (!config.contextFileName) {
     return ["GEMINI.md"];
@@ -44587,7 +44379,7 @@ async function readMcpResources(resourceParts, config, signal) {
           callId: `mcp-resource-${resource.serverName}-${resource.uri}`,
           name: `resources/read (${resource.serverName})`,
           description: resource.uri,
-          status: CoreToolCallStatus.Success,
+          status: "success" /* Success */,
           isClientInitiated: true,
           resultDisplay: `Successfully read resource ${resource.uri}`,
           confirmationDetails: void 0
@@ -44602,7 +44394,7 @@ async function readMcpResources(resourceParts, config, signal) {
           callId: `mcp-resource-${resource.serverName}-${resource.uri}`,
           name: `resources/read (${resource.serverName})`,
           description: resource.uri,
-          status: CoreToolCallStatus.Error,
+          status: "error" /* Error */,
           isClientInitiated: true,
           resultDisplay: `Error reading resource ${resource.uri}: ${getErrorMessage(error)}`,
           confirmationDetails: void 0
@@ -44627,7 +44419,7 @@ Content from @${result.uri}:
   }
   if (hasError) {
     const firstError = displays.find(
-      (d) => d.status === CoreToolCallStatus.Error
+      (d) => d.status === "error" /* Error */
     );
     return {
       parts: [],
@@ -44666,7 +44458,7 @@ async function readLocalFiles(resolvedFiles, config, signal, userMessageTimestam
       callId: `client-read-${userMessageTimestamp}`,
       name: readManyFilesTool.displayName,
       description: invocation.getDescription(),
-      status: CoreToolCallStatus.Success,
+      status: "success" /* Success */,
       isClientInitiated: true,
       resultDisplay: result.returnDisplay || `Successfully read: ${fileLabelsForDisplay.join(", ")}`,
       confirmationDetails: void 0
@@ -44713,7 +44505,7 @@ Content from @${displayPath}:
       callId: `client-read-${userMessageTimestamp}`,
       name: readManyFilesTool.displayName,
       description: invocation?.getDescription() ?? "Error attempting to execute tool to read files",
-      status: CoreToolCallStatus.Error,
+      status: "error" /* Error */,
       isClientInitiated: true,
       resultDisplay: `Error reading files (${fileLabelsForDisplay.join(", ")}): ${getErrorMessage(error)}`,
       confirmationDetails: void 0
@@ -44876,8 +44668,8 @@ var import_execa = __toESM(require_execa(), 1);
 
 // node_modules/crypto-random-string/index.js
 import { promisify } from "util";
-import crypto3 from "crypto";
-var randomBytesAsync = promisify(crypto3.randomBytes);
+import crypto2 from "crypto";
+var randomBytesAsync = promisify(crypto2.randomBytes);
 var urlSafeCharacters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~".split("");
 var numericCharacters = "0123456789".split("");
 var distinguishableCharacters = "CDEHKMPRTUWXY012458".split("");
@@ -44890,7 +44682,7 @@ var generateForCustomCharacters = (length, characters) => {
   let string = "";
   let stringLength = 0;
   while (stringLength < length) {
-    const entropy = crypto3.randomBytes(entropyLength);
+    const entropy = crypto2.randomBytes(entropyLength);
     let entropyPosition = 0;
     while (entropyPosition < entropyLength && stringLength < length) {
       const entropyValue = entropy.readUInt16LE(entropyPosition);
@@ -44925,7 +44717,7 @@ var generateForCustomCharactersAsync = async (length, characters) => {
   }
   return string;
 };
-var generateRandomBytes = (byteLength, type, length) => crypto3.randomBytes(byteLength).toString(type).slice(0, length);
+var generateRandomBytes = (byteLength, type, length) => crypto2.randomBytes(byteLength).toString(type).slice(0, length);
 var generateRandomBytesAsync = async (byteLength, type, length) => {
   const buffer = await randomBytesAsync(byteLength);
   return buffer.toString(type).slice(0, length);
@@ -47980,7 +47772,7 @@ async function openFileInEditor(filePath, stdin, setRawMode, preferredEditorType
     if (wasRaw) {
       setRawMode?.(true);
     }
-    coreEvents.emit(CoreEvent.ExternalEditorClosed);
+    coreEvents.emit("external-editor-closed" /* ExternalEditorClosed */);
   }
 }
 
@@ -50674,7 +50466,7 @@ async function updateExtension(extension, extensionManager, currentState, dispat
       extension.name,
       installMetadata
     );
-    if (status === IntegrityDataStatus.INVALID) {
+    if (status === "invalid" /* INVALID */) {
       throw new Error("Extension integrity cannot be verified");
     }
   } catch (e) {
@@ -52170,11 +51962,11 @@ var ShellProcessor = class {
         },
         void 0
       );
-      if (decision === PolicyDecision.DENY) {
+      if (decision === "deny" /* DENY */) {
         throw new Error(
           `${this.commandName} cannot be run. Blocked command: "${command}". Reason: Blocked by policy.`
         );
-      } else if (decision === PolicyDecision.ASK_USER) {
+      } else if (decision === "ask_user" /* ASK_USER */) {
         commandsToConfirm.add(command);
       }
     }
@@ -53304,7 +53096,7 @@ var MultiFolderTrustDialog = ({
           if (choice === 1 /* YES_AND_REMEMBER */) {
             await trustedFolders.setValue(
               expandedPath,
-              TrustLevel.TRUST_FOLDER
+              "TRUST_FOLDER" /* TRUST_FOLDER */
             );
           }
           workspaceContext.addDirectory(expandedPath);
@@ -53462,7 +53254,6 @@ var _ExpandableText = ({
   maxWidth = MAX_WIDTH,
   maxLines
 }) => {
-  const labelCharacters = Array.from(label);
   const hasMatch = matchedIndex !== void 0 && matchedIndex >= 0 && matchedIndex < label.length && userInput.length > 0;
   if (!hasMatch) {
     let display = label;
@@ -53471,69 +53262,53 @@ var _ExpandableText = ({
         const lines = label.split("\n");
         let truncated = lines.slice(0, maxLines).join("\n");
         const hasMoreLines = lines.length > maxLines;
-        const truncatedCharacters = Array.from(truncated);
-        if (truncatedCharacters.length > maxWidth) {
-          truncated = truncatedCharacters.slice(0, maxWidth).join("") + "...";
+        if (truncated.length > maxWidth) {
+          truncated = truncated.slice(0, maxWidth) + "...";
         } else if (hasMoreLines) {
           truncated += "...";
         }
         display = truncated;
-      } else if (labelCharacters.length > maxWidth) {
-        display = labelCharacters.slice(0, maxWidth).join("") + "...";
+      } else if (label.length > maxWidth) {
+        display = label.slice(0, maxWidth) + "...";
       }
     }
     return /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(Text, { wrap: "wrap", color: textColor, children: display });
   }
-  const matchCharactersLength = Array.from(userInput).length;
-  let matchedCharacterIndex = 0;
-  let matchedUtf16Index = 0;
-  while (matchedCharacterIndex < labelCharacters.length && matchedUtf16Index < matchedIndex) {
-    matchedUtf16Index += labelCharacters[matchedCharacterIndex].length;
-    matchedCharacterIndex += 1;
-  }
+  const matchLength = userInput.length;
   let before = "";
   let match = "";
   let after = "";
-  if (isExpanded || labelCharacters.length <= maxWidth) {
-    before = labelCharacters.slice(0, matchedCharacterIndex).join("");
-    match = labelCharacters.slice(
-      matchedCharacterIndex,
-      matchedCharacterIndex + matchCharactersLength
-    ).join("");
-    after = labelCharacters.slice(matchedCharacterIndex + matchCharactersLength).join("");
-  } else if (matchCharactersLength >= maxWidth) {
-    match = labelCharacters.slice(matchedCharacterIndex, matchedCharacterIndex + maxWidth - 1).join("") + "...";
+  if (isExpanded || label.length <= maxWidth) {
+    before = label.slice(0, matchedIndex);
+    match = label.slice(matchedIndex, matchedIndex + matchLength);
+    after = label.slice(matchedIndex + matchLength);
+  } else if (matchLength >= maxWidth) {
+    match = label.slice(matchedIndex, matchedIndex + maxWidth - 1) + "...";
   } else {
-    const contextSpace = maxWidth - matchCharactersLength;
+    const contextSpace = maxWidth - matchLength;
     const beforeSpace = Math.floor(contextSpace / 2);
     const afterSpace = Math.ceil(contextSpace / 2);
-    let start = matchedCharacterIndex - beforeSpace;
-    let end = matchedCharacterIndex + matchCharactersLength + afterSpace;
+    let start = matchedIndex - beforeSpace;
+    let end = matchedIndex + matchLength + afterSpace;
     if (start < 0) {
       end += -start;
       start = 0;
     }
-    if (end > labelCharacters.length) {
-      start -= end - labelCharacters.length;
-      end = labelCharacters.length;
+    if (end > label.length) {
+      start -= end - label.length;
+      end = label.length;
     }
     start = Math.max(0, start);
-    const finalMatchIndex = matchedCharacterIndex - start;
-    const slicedLabel = labelCharacters.slice(start, end);
-    const beforeChars = slicedLabel.slice(0, finalMatchIndex);
-    match = slicedLabel.slice(finalMatchIndex, finalMatchIndex + matchCharactersLength).join("");
-    const afterChars = slicedLabel.slice(
-      finalMatchIndex + matchCharactersLength
-    );
+    const finalMatchIndex = matchedIndex - start;
+    const slicedLabel = label.slice(start, end);
+    before = slicedLabel.slice(0, finalMatchIndex);
+    match = slicedLabel.slice(finalMatchIndex, finalMatchIndex + matchLength);
+    after = slicedLabel.slice(finalMatchIndex + matchLength);
     if (start > 0) {
-      before = beforeChars.length >= 3 ? "..." + beforeChars.slice(3).join("") : "...";
-    } else {
-      before = beforeChars.join("");
+      before = before.length >= 3 ? "..." + before.slice(3) : "...";
     }
-    if (end < labelCharacters.length) {
-      after = afterChars.length >= 3 ? afterChars.slice(0, -3).join("") + "..." : "...";
-    } else {
-      after = afterChars.join("");
+    if (end < label.length) {
+      after = after.length >= 3 ? after.slice(0, -3) + "..." : "...";
     }
   }
   return /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)(Text, { color: textColor, wrap: "wrap", children: [
@@ -53635,10 +53410,10 @@ function isShellTool(name) {
   return name === SHELL_COMMAND_NAME || name === SHELL_NAME || name === SHELL_TOOL_NAME || normalized === "shell";
 }
 function isThisShellFocusable(name, status, config) {
-  return !!(isShellTool(name) && status === CoreToolCallStatus.Executing && config?.getEnableInteractiveShell());
+  return !!(isShellTool(name) && status === "executing" /* Executing */ && config?.getEnableInteractiveShell());
 }
 function isThisShellFocused(name, status, ptyId, activeShellPtyId, embeddedShellFocused) {
-  return !!(isShellTool(name) && status === CoreToolCallStatus.Executing && ptyId === activeShellPtyId && embeddedShellFocused);
+  return !!(isShellTool(name) && status === "executing" /* Executing */ && ptyId === activeShellPtyId && embeddedShellFocused);
 }
 function useFocusHint(isThisShellFocusable2, isThisShellFocused2, resultDisplay) {
   const [userHasFocused, setUserHasFocused] = (0, import_react30.useState)(false);
@@ -53798,14 +53573,14 @@ function getToolGroupBorderAppearance(item, activeShellPtyId, embeddedShellFocus
     if (isTrackedToolCall(t)) {
       return t.status !== "success" && t.status !== "error" && t.status !== "cancelled";
     } else {
-      return t.status !== CoreToolCallStatus.Success && t.status !== CoreToolCallStatus.Error && t.status !== CoreToolCallStatus.Cancelled;
+      return t.status !== "success" /* Success */ && t.status !== "error" /* Error */ && t.status !== "cancelled" /* Cancelled */;
     }
   });
   const isEmbeddedShellFocused = toolsToInspect.some((t) => {
     if (isTrackedToolCall(t)) {
       return isShellTool(t.request.name) && t.status === "executing" && t.pid === activeShellPtyId && !!embeddedShellFocused;
     } else {
-      return isShellTool(t.name) && t.status === CoreToolCallStatus.Executing && t.ptyId === activeShellPtyId && !!embeddedShellFocused;
+      return isShellTool(t.name) && t.status === "executing" /* Executing */ && t.ptyId === activeShellPtyId && !!embeddedShellFocused;
     }
   });
   const isShellCommand = toolsToInspect.some((t) => {
@@ -55243,7 +55018,7 @@ var authCommand = {
 import process12 from "node:process";
 
 // packages/cli/src/generated/git-commit.ts
-var GIT_COMMIT_INFO = "89e9d25d6";
+var GIT_COMMIT_INFO = "b367c7296";
 
 // packages/cli/src/ui/utils/historyExportUtils.ts
 import * as fsPromises from "node:fs/promises";
@@ -55293,13 +55068,13 @@ async function exportHistoryToFile(options) {
 // packages/cli/src/ui/utils/memorySnapshot.ts
 import { createWriteStream as createWriteStream3 } from "node:fs";
 import { mkdir as mkdir3 } from "node:fs/promises";
-import { dirname as dirname5 } from "node:path";
-import { pipeline as pipeline2 } from "node:stream/promises";
+import { dirname as dirname4 } from "node:path";
+import { pipeline } from "node:stream/promises";
 import { getHeapSnapshot } from "node:v8";
 var MEMORY_SNAPSHOT_AUTO_THRESHOLD_BYTES = 2 * 1024 * 1024 * 1024;
 async function captureHeapSnapshot(filePath) {
-  await mkdir3(dirname5(filePath), { recursive: true });
-  await pipeline2(getHeapSnapshot(), createWriteStream3(filePath));
+  await mkdir3(dirname4(filePath), { recursive: true });
+  await pipeline(getHeapSnapshot(), createWriteStream3(filePath));
 }
 
 // packages/cli/src/ui/commands/bugCommand.ts
@@ -55877,7 +55652,7 @@ var chatCommand = {
 };
 
 // packages/cli/src/ui/commands/clearCommand.ts
-import { randomUUID as randomUUID3 } from "node:crypto";
+import { randomUUID as randomUUID2 } from "node:crypto";
 var clearCommand = {
   name: "clear",
   altNames: ["new"],
@@ -55889,12 +55664,12 @@ var clearCommand = {
     const config = context.services.agentContext?.config;
     const hookSystem = config?.getHookSystem();
     if (hookSystem) {
-      await hookSystem.fireSessionEndEvent(SessionEndReason.Clear);
+      await hookSystem.fireSessionEndEvent("clear" /* Clear */);
     }
     config?.injectionService.clear();
     let newSessionId;
     if (config) {
-      newSessionId = randomUUID3();
+      newSessionId = randomUUID2();
       config.resetNewSessionState(newSessionId);
     }
     if (geminiClient) {
@@ -55906,7 +55681,7 @@ var clearCommand = {
     }
     let result;
     if (hookSystem) {
-      result = await hookSystem.fireSessionStartEvent(SessionStartSource.Clear);
+      result = await hookSystem.fireSessionStartEvent("clear" /* Clear */);
     }
     await new Promise((resolve9) => setImmediate(resolve9));
     if (config) {
@@ -58915,7 +58690,7 @@ var Footer = () => {
       case "auth": {
         if (!settings.merged.ui.showUserIdentity) break;
         if (!authType) break;
-        const displayStr = authType === AuthType.LOGIN_WITH_GOOGLE ? email ?? "google" : authType;
+        const displayStr = authType === "oauth-personal" /* LOGIN_WITH_GOOGLE */ ? email ?? "google" : authType;
         addCol(
           id,
           header,
@@ -60005,16 +59780,7 @@ async function rewindConversation(context, client, recordingService, messageId,
     const { uiHistory } = convertSessionToHistoryFormats(conversation.messages);
     const clientHistory = convertSessionToClientHistory(conversation.messages);
     client.setHistory(clientHistory);
-    client.clearCurrentSequenceModel?.();
-    const config = context.services.agentContext?.config;
-    if (config) {
-      config.getModelAvailabilityService?.()?.reset();
-      const configuredModel = config.getModel?.();
-      if (configuredModel) {
-        config.setActiveModel?.(configuredModel);
-      }
-      await config.getMemoryContextManager()?.refresh();
-    }
+    await context.services.agentContext?.config.getMemoryContextManager()?.refresh();
     const startId = 1;
     const historyWithIds = uiHistory.map(
       (item, idx) => ({
@@ -60708,12 +60474,12 @@ import path28 from "node:path";
 function getIdeStatusMessage(ideClient) {
   const connection = ideClient.getConnectionStatus();
   switch (connection.status) {
-    case IDEConnectionStatus.Connected:
+    case "connected" /* Connected */:
       return {
         messageType: "info",
         content: `\u{1F7E2} Connected to ${ideClient.getDetectedIdeDisplayName()}`
       };
-    case IDEConnectionStatus.Connecting:
+    case "connecting" /* Connecting */:
       return {
         messageType: "info",
         content: `\u{1F7E1} Connecting...`
@@ -60754,7 +60520,7 @@ ${infoMessage}`;
 async function getIdeStatusMessageWithFiles(ideClient) {
   const connection = ideClient.getConnectionStatus();
   switch (connection.status) {
-    case IDEConnectionStatus.Connected: {
+    case "connected" /* Connected */: {
       let content = `\u{1F7E2} Connected to ${ideClient.getDetectedIdeDisplayName()}`;
       const context = ideContextStore.get();
       const openFiles = context?.workspaceState?.openFiles;
@@ -60766,7 +60532,7 @@ async function getIdeStatusMessageWithFiles(ideClient) {
         content
       };
     }
-    case IDEConnectionStatus.Connecting:
+    case "connecting" /* Connecting */:
       return {
         messageType: "info",
         content: `\u{1F7E1} Connecting...`
@@ -60788,7 +60554,7 @@ async function setIdeModeAndSyncConnection(config, value, options = {}) {
   const ideClient = await IdeClient.getInstance();
   if (value) {
     await ideClient.connect(options);
-    logIdeConnection(config, new IdeConnectionEvent(IdeConnectionType.SESSION));
+    logIdeConnection(config, new IdeConnectionEvent("session" /* SESSION */));
   } else {
     await ideClient.disconnect();
   }
@@ -60876,7 +60642,7 @@ var ideCommand = async () => {
               logToConsole: false
             }
           );
-          if (ideClient.getConnectionStatus().status === IDEConnectionStatus.Connected) {
+          if (ideClient.getConnectionStatus().status === "connected" /* Connected */) {
             break;
           }
           await new Promise((resolve9) => setTimeout(resolve9, 500));
@@ -60953,7 +60719,7 @@ var ideCommand = async () => {
     }
   };
   const { status } = ideClient.getConnectionStatus();
-  const isConnected = status === IDEConnectionStatus.Connected;
+  const isConnected = status === "connected" /* Connected */;
   if (isConnected) {
     ideSlashCommand.subCommands = [statusCommand2, disableCommand5];
   } else {
@@ -61053,13 +60819,13 @@ Use /mcp auth <server-name> to authenticate.`
     const displayListener = (message) => {
       context.ui.addItem({ type: "info", text: message });
     };
-    coreEvents.on(CoreEvent.OauthDisplayMessage, displayListener);
+    coreEvents.on("oauth-display-message" /* OauthDisplayMessage */, displayListener);
     try {
       context.ui.addItem({
         type: "info",
         text: `Starting OAuth authentication for MCP server '${serverName}'...`
       });
-      const { MCPOAuthProvider } = await import("./dist-LJVRZOCO.js");
+      const { MCPOAuthProvider } = await import("./core-GTUUQBGE.js");
       let oauthConfig = server.oauth;
       if (!oauthConfig) {
         oauthConfig = { enabled: false };
@@ -61096,7 +60862,7 @@ Use /mcp auth <server-name> to authenticate.`
         content: `Failed to authenticate with MCP server '${serverName}': ${getErrorMessage(error)}`
       };
     } finally {
-      coreEvents.removeListener(CoreEvent.OauthDisplayMessage, displayListener);
+      coreEvents.removeListener("oauth-display-message" /* OauthDisplayMessage */, displayListener);
     }
   },
   completion: async (context, partialArg) => {
@@ -61142,10 +60908,10 @@ var listAction2 = async (context, showDescriptions = false, showSchema = false,
   }
   const serverNames = Object.keys(mcpServers);
   const connectingServers = serverNames.filter(
-    (name) => getMCPServerStatus(name) === MCPServerStatus.CONNECTING
+    (name) => getMCPServerStatus(name) === "connecting" /* CONNECTING */
   );
   const discoveryState = getMCPDiscoveryState();
-  const discoveryInProgress = discoveryState === MCPDiscoveryState.IN_PROGRESS || connectingServers.length > 0;
+  const discoveryInProgress = discoveryState === "in_progress" /* IN_PROGRESS */ || connectingServers.length > 0;
   const allTools = toolRegistry.getAllTools();
   const mcpTools = allTools.filter((tool) => tool instanceof DiscoveredMCPTool);
   const promptRegistry = config.getPromptRegistry();
@@ -76923,7 +76689,7 @@ Return a JSON object with:
         },
         abortSignal: new AbortController().signal,
         promptId: "triage-duplicates",
-        role: LlmRole.UTILITY_TOOL
+        role: "utility_tool" /* UTILITY_TOOL */
       });
       const rec = response;
       let canonical;
@@ -77757,7 +77523,7 @@ Return a JSON object with:
         },
         abortSignal: abortControllerRef.current.signal,
         promptId: "triage-issues",
-        role: LlmRole.UTILITY_TOOL
+        role: "utility_tool" /* UTILITY_TOOL */
       });
       return response;
     },
@@ -78331,8 +78097,8 @@ var planCommand = {
       return;
     }
     const previousApprovalMode = config.getApprovalMode();
-    config.setApprovalMode(ApprovalMode.PLAN);
-    if (previousApprovalMode !== ApprovalMode.PLAN) {
+    config.setApprovalMode("plan" /* PLAN */);
+    if (previousApprovalMode !== "plan" /* PLAN */) {
       coreEvents.emitFeedback("info", "Switched to Plan Mode.");
     }
     if (context.invocation?.args) {
@@ -78391,10 +78157,10 @@ var categorizeRulesByMode = (rules) => {
   rules.forEach((rule) => {
     const modes = rule.modes?.length ? rule.modes : ALL_MODES;
     const modeSet = new Set(modes);
-    if (modeSet.has(ApprovalMode.DEFAULT)) result.normal.push(rule);
-    if (modeSet.has(ApprovalMode.AUTO_EDIT)) result.autoEdit.push(rule);
-    if (modeSet.has(ApprovalMode.YOLO)) result.yolo.push(rule);
-    if (modeSet.has(ApprovalMode.PLAN)) result.plan.push(rule);
+    if (modeSet.has("default" /* DEFAULT */)) result.normal.push(rule);
+    if (modeSet.has("autoEdit" /* AUTO_EDIT */)) result.autoEdit.push(rule);
+    if (modeSet.has("yolo" /* YOLO */)) result.yolo.push(rule);
+    if (modeSet.has("plan" /* PLAN */)) result.plan.push(rule);
   });
   return result;
 };
@@ -79775,7 +79541,7 @@ var upgradeCommand = {
   action: async (context) => {
     const config = context.services.agentContext?.config;
     const authType = config?.getContentGeneratorConfig()?.authType;
-    if (authType !== AuthType.LOGIN_WITH_GOOGLE) {
+    if (authType !== "oauth-personal" /* LOGIN_WITH_GOOGLE */) {
       return {
         type: "message",
         messageType: "error",
@@ -80004,7 +79770,7 @@ var BuiltinCommandLoader = class {
       setupGithubCommand,
       terminalSetupCommand,
       ...this.config?.isVoiceModeEnabled() ? [voiceCommand] : [],
-      ...this.config?.getContentGeneratorConfig()?.authType === AuthType.LOGIN_WITH_GOOGLE ? [upgradeCommand] : []
+      ...this.config?.getContentGeneratorConfig()?.authType === "oauth-personal" /* LOGIN_WITH_GOOGLE */ ? [upgradeCommand] : []
     ];
     handle?.end();
     return allDefinitions.filter((cmd) => cmd !== null);