@google/gemini-cli 0.42.0-preview.1 → 0.43.0-preview.0

package/bundle/{chunk-VERP26KN.js → chunk-QYUN3J2L.js}

@@ -6,7 +6,7 @@ import {
 import {
   exitCli,
   require_source
-} from "./chunk-BI5ZICGL.js";
+} from "./chunk-LBQFRHYD.js";
 import {
   DEFAULT_BACKGROUND_OPACITY,
   DEFAULT_BORDER_OPACITY,
@@ -19,6 +19,7 @@ import {
   GEMMA_MODEL_NAME,
   LRU_BUFFER_PERF_CACHE_LIMIT,
   MIN_TERMINAL_WIDTH_FOR_FULL_LABEL,
+  SessionSelector,
   Theme,
   convertSessionToHistoryFormats,
   cpIndexToOffset,
@@ -57,19 +58,17 @@ import {
   stripUnsafeCharacters,
   toCodePoints,
   validateCustomTheme
-} from "./chunk-5MQ5VMQK.js";
+} from "./chunk-SYD5SJFT.js";
 import {
   isDevelopment
-} from "./chunk-AS4E6DX7.js";
+} from "./chunk-43AGRA7S.js";
 import {
   emptyIcon,
   require_react
-} from "./chunk-7H3CQGS6.js";
+} from "./chunk-46T44JOY.js";
 import {
   AsyncFzf,
-  AuthType,
   Config,
-  CoreToolCallStatus,
   ExtensionDisableEvent,
   ExtensionEnableEvent,
   ExtensionInstallEvent,
@@ -78,27 +77,17 @@ import {
   ExtensionUninstallEvent,
   ExtensionUpdateEvent,
   GEMINI_CLI_COMPANION_EXTENSION_NAME,
-  HookType,
-  IDEConnectionStatus,
   INITIAL_HISTORY_LENGTH,
   IdeClient,
   IdeConnectionEvent,
-  IdeConnectionType,
-  IntegrityDataStatus,
   KeychainTokenStorage,
-  LlmRole,
-  MCPDiscoveryState,
   MCPOAuthTokenStorage,
-  MCPServerStatus,
   ModelSlashCommandEvent,
   ProjectIdRequiredError,
   ReadManyFilesTool,
   RewindEvent,
-  SessionEndReason,
-  SessionStartSource,
   ShellExecutionService,
   StartSessionEvent,
-  TrustLevel,
   UPGRADE_URL_PAGE,
   UserAccountManager,
   ValidationRequiredError,
@@ -212,13 +201,12 @@ import {
   stripAnsi,
   tokenLimit,
   uiTelemetryService
-} from "./chunk-A564QXJJ.js";
+} from "./chunk-UNAVBUTP.js";
 import {
   ApprovalMode,
   CoreEvent,
   DiscoveredMCPTool,
   GEMINI_DIR,
-  PolicyDecision,
   REFERENCE_CONTENT_END,
   REFERENCE_CONTENT_START,
   Storage,
@@ -239,7 +227,7 @@ import {
   shortenPath,
   tildeifyPath,
   unescapePath
-} from "./chunk-JEW7ZIWE.js";
+} from "./chunk-N6QYTC2T.js";
 import {
   require_src
 } from "./chunk-RJTRUG2J.js";
@@ -1742,8 +1730,8 @@ var require_react_reconciler_production = __commonJS({
           currentEntangledActionThenable = {
             status: "pending",
             value: void 0,
-            then: function(resolve8) {
-              entangledListeners.push(resolve8);
+            then: function(resolve9) {
+              entangledListeners.push(resolve9);
             }
           };
         }
@@ -1766,8 +1754,8 @@ var require_react_reconciler_production = __commonJS({
           status: "pending",
           value: null,
           reason: null,
-          then: function(resolve8) {
-            listeners.push(resolve8);
+          then: function(resolve9) {
+            listeners.push(resolve9);
           }
         };
         thenable.then(
@@ -9761,7 +9749,7 @@ var require_prompt = __commonJS({
 var require_text = __commonJS({
   "node_modules/prompts/dist/elements/text.js"(exports, module) {
     "use strict";
-    function asyncGeneratorStep(gen, resolve8, reject, _next, _throw, key, arg) {
+    function asyncGeneratorStep(gen, resolve9, reject, _next, _throw, key, arg) {
       try {
         var info = gen[key](arg);
         var value = info.value;
@@ -9770,7 +9758,7 @@ var require_text = __commonJS({
         return;
       }
       if (info.done) {
-        resolve8(value);
+        resolve9(value);
       } else {
         Promise.resolve(value).then(_next, _throw);
       }
@@ -9778,13 +9766,13 @@ var require_text = __commonJS({
     function _asyncToGenerator(fn2) {
       return function() {
         var self = this, args = arguments;
-        return new Promise(function(resolve8, reject) {
+        return new Promise(function(resolve9, reject) {
           var gen = fn2.apply(self, args);
           function _next(value) {
-            asyncGeneratorStep(gen, resolve8, reject, _next, _throw, "next", value);
+            asyncGeneratorStep(gen, resolve9, reject, _next, _throw, "next", value);
           }
           function _throw(err) {
-            asyncGeneratorStep(gen, resolve8, reject, _next, _throw, "throw", err);
+            asyncGeneratorStep(gen, resolve9, reject, _next, _throw, "throw", err);
           }
           _next(void 0);
         });
@@ -10500,7 +10488,7 @@ var require_dateparts = __commonJS({
 var require_date = __commonJS({
   "node_modules/prompts/dist/elements/date.js"(exports, module) {
     "use strict";
-    function asyncGeneratorStep(gen, resolve8, reject, _next, _throw, key, arg) {
+    function asyncGeneratorStep(gen, resolve9, reject, _next, _throw, key, arg) {
       try {
         var info = gen[key](arg);
         var value = info.value;
@@ -10509,7 +10497,7 @@ var require_date = __commonJS({
         return;
       }
       if (info.done) {
-        resolve8(value);
+        resolve9(value);
       } else {
         Promise.resolve(value).then(_next, _throw);
       }
@@ -10517,13 +10505,13 @@ var require_date = __commonJS({
     function _asyncToGenerator(fn2) {
       return function() {
         var self = this, args = arguments;
-        return new Promise(function(resolve8, reject) {
+        return new Promise(function(resolve9, reject) {
           var gen = fn2.apply(self, args);
           function _next(value) {
-            asyncGeneratorStep(gen, resolve8, reject, _next, _throw, "next", value);
+            asyncGeneratorStep(gen, resolve9, reject, _next, _throw, "next", value);
           }
           function _throw(err) {
-            asyncGeneratorStep(gen, resolve8, reject, _next, _throw, "throw", err);
+            asyncGeneratorStep(gen, resolve9, reject, _next, _throw, "throw", err);
           }
           _next(void 0);
         });
@@ -10726,7 +10714,7 @@ ${i ? ` ` : figures.pointerSmall} ${color.red().italic(l)}`, ``);
 var require_number = __commonJS({
   "node_modules/prompts/dist/elements/number.js"(exports, module) {
     "use strict";
-    function asyncGeneratorStep(gen, resolve8, reject, _next, _throw, key, arg) {
+    function asyncGeneratorStep(gen, resolve9, reject, _next, _throw, key, arg) {
       try {
         var info = gen[key](arg);
         var value = info.value;
@@ -10735,7 +10723,7 @@ var require_number = __commonJS({
         return;
       }
       if (info.done) {
-        resolve8(value);
+        resolve9(value);
       } else {
         Promise.resolve(value).then(_next, _throw);
       }
@@ -10743,13 +10731,13 @@ var require_number = __commonJS({
     function _asyncToGenerator(fn2) {
       return function() {
         var self = this, args = arguments;
-        return new Promise(function(resolve8, reject) {
+        return new Promise(function(resolve9, reject) {
           var gen = fn2.apply(self, args);
           function _next(value) {
-            asyncGeneratorStep(gen, resolve8, reject, _next, _throw, "next", value);
+            asyncGeneratorStep(gen, resolve9, reject, _next, _throw, "next", value);
           }
           function _throw(err) {
-            asyncGeneratorStep(gen, resolve8, reject, _next, _throw, "throw", err);
+            asyncGeneratorStep(gen, resolve9, reject, _next, _throw, "throw", err);
           }
           _next(void 0);
         });
@@ -11172,7 +11160,7 @@ Instructions:
 var require_autocomplete = __commonJS({
   "node_modules/prompts/dist/elements/autocomplete.js"(exports, module) {
     "use strict";
-    function asyncGeneratorStep(gen, resolve8, reject, _next, _throw, key, arg) {
+    function asyncGeneratorStep(gen, resolve9, reject, _next, _throw, key, arg) {
       try {
         var info = gen[key](arg);
         var value = info.value;
@@ -11181,7 +11169,7 @@ var require_autocomplete = __commonJS({
         return;
       }
       if (info.done) {
-        resolve8(value);
+        resolve9(value);
       } else {
         Promise.resolve(value).then(_next, _throw);
       }
@@ -11189,13 +11177,13 @@ var require_autocomplete = __commonJS({
     function _asyncToGenerator(fn2) {
       return function() {
         var self = this, args = arguments;
-        return new Promise(function(resolve8, reject) {
+        return new Promise(function(resolve9, reject) {
           var gen = fn2.apply(self, args);
           function _next(value) {
-            asyncGeneratorStep(gen, resolve8, reject, _next, _throw, "next", value);
+            asyncGeneratorStep(gen, resolve9, reject, _next, _throw, "next", value);
           }
           function _throw(err) {
-            asyncGeneratorStep(gen, resolve8, reject, _next, _throw, "throw", err);
+            asyncGeneratorStep(gen, resolve9, reject, _next, _throw, "throw", err);
           }
           _next(void 0);
         });
@@ -11826,7 +11814,7 @@ var require_dist = __commonJS({
       for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
       return arr2;
     }
-    function asyncGeneratorStep(gen, resolve8, reject, _next, _throw, key, arg) {
+    function asyncGeneratorStep(gen, resolve9, reject, _next, _throw, key, arg) {
       try {
         var info = gen[key](arg);
         var value = info.value;
@@ -11835,7 +11823,7 @@ var require_dist = __commonJS({
         return;
       }
       if (info.done) {
-        resolve8(value);
+        resolve9(value);
       } else {
         Promise.resolve(value).then(_next, _throw);
       }
@@ -11843,13 +11831,13 @@ var require_dist = __commonJS({
     function _asyncToGenerator(fn2) {
       return function() {
         var self = this, args = arguments;
-        return new Promise(function(resolve8, reject) {
+        return new Promise(function(resolve9, reject) {
           var gen = fn2.apply(self, args);
           function _next(value) {
-            asyncGeneratorStep(gen, resolve8, reject, _next, _throw, "next", value);
+            asyncGeneratorStep(gen, resolve9, reject, _next, _throw, "next", value);
           }
           function _throw(err) {
-            asyncGeneratorStep(gen, resolve8, reject, _next, _throw, "throw", err);
+            asyncGeneratorStep(gen, resolve9, reject, _next, _throw, "throw", err);
           }
           _next(void 0);
         });
@@ -14186,7 +14174,7 @@ var require_get_stream = __commonJS({
       };
       const { maxBuffer } = options;
       let stream;
-      await new Promise((resolve8, reject) => {
+      await new Promise((resolve9, reject) => {
         const rejectPromise = (error) => {
           if (error && stream.getBufferedLength() <= BufferConstants.MAX_LENGTH) {
             error.bufferedData = stream.getBufferedValue();
@@ -14198,7 +14186,7 @@ var require_get_stream = __commonJS({
             rejectPromise(error);
             return;
           }
-          resolve8();
+          resolve9();
         });
         stream.on("data", () => {
           if (stream.getBufferedLength() > maxBuffer) {
@@ -14274,7 +14262,7 @@ var require_pend = __commonJS({
 // node_modules/fd-slicer/index.js
 var require_fd_slicer = __commonJS({
   "node_modules/fd-slicer/index.js"(exports) {
-    var fs38 = __require("fs");
+    var fs39 = __require("fs");
     var util2 = __require("util");
     var stream = __require("stream");
     var Readable = stream.Readable;
@@ -14299,7 +14287,7 @@ var require_fd_slicer = __commonJS({
     FdSlicer.prototype.read = function(buffer, offset, length, position, callback) {
       var self = this;
       self.pend.go(function(cb) {
-        fs38.read(self.fd, buffer, offset, length, position, function(err, bytesRead, buffer2) {
+        fs39.read(self.fd, buffer, offset, length, position, function(err, bytesRead, buffer2) {
           cb();
           callback(err, bytesRead, buffer2);
         });
@@ -14308,7 +14296,7 @@ var require_fd_slicer = __commonJS({
     FdSlicer.prototype.write = function(buffer, offset, length, position, callback) {
       var self = this;
       self.pend.go(function(cb) {
-        fs38.write(self.fd, buffer, offset, length, position, function(err, written, buffer2) {
+        fs39.write(self.fd, buffer, offset, length, position, function(err, written, buffer2) {
           cb();
           callback(err, written, buffer2);
         });
@@ -14329,7 +14317,7 @@ var require_fd_slicer = __commonJS({
       if (self.refCount > 0) return;
       if (self.refCount < 0) throw new Error("invalid unref");
       if (self.autoClose) {
-        fs38.close(self.fd, onCloseDone);
+        fs39.close(self.fd, onCloseDone);
       }
       function onCloseDone(err) {
         if (err) {
@@ -14366,7 +14354,7 @@ var require_fd_slicer = __commonJS({
       self.context.pend.go(function(cb) {
         if (self.destroyed) return cb();
         var buffer = new Buffer(toRead);
-        fs38.read(self.context.fd, buffer, 0, toRead, self.pos, function(err, bytesRead) {
+        fs39.read(self.context.fd, buffer, 0, toRead, self.pos, function(err, bytesRead) {
           if (err) {
             self.destroy(err);
           } else if (bytesRead === 0) {
@@ -14413,7 +14401,7 @@ var require_fd_slicer = __commonJS({
       }
       self.context.pend.go(function(cb) {
         if (self.destroyed) return cb();
-        fs38.write(self.context.fd, buffer, 0, buffer.length, self.pos, function(err2, bytes) {
+        fs39.write(self.context.fd, buffer, 0, buffer.length, self.pos, function(err2, bytes) {
           if (err2) {
             self.destroy();
             cb();
@@ -14840,7 +14828,7 @@ var require_buffer_crc32 = __commonJS({
 // node_modules/yauzl/index.js
 var require_yauzl = __commonJS({
   "node_modules/yauzl/index.js"(exports) {
-    var fs38 = __require("fs");
+    var fs39 = __require("fs");
     var zlib = __require("zlib");
     var fd_slicer = require_fd_slicer();
     var crc32 = require_buffer_crc32();
@@ -14858,7 +14846,7 @@ var require_yauzl = __commonJS({
     exports.ZipFile = ZipFile;
     exports.Entry = Entry;
     exports.RandomAccessReader = RandomAccessReader;
-    function open(path37, options, callback) {
+    function open(path38, options, callback) {
       if (typeof options === "function") {
         callback = options;
         options = null;
@@ -14870,10 +14858,10 @@ var require_yauzl = __commonJS({
       if (options.validateEntrySizes == null) options.validateEntrySizes = true;
       if (options.strictFileNames == null) options.strictFileNames = false;
       if (callback == null) callback = defaultCallback;
-      fs38.open(path37, "r", function(err, fd) {
+      fs39.open(path38, "r", function(err, fd) {
         if (err) return callback(err);
         fromFd(fd, options, function(err2, zipfile) {
-          if (err2) fs38.close(fd, defaultCallback);
+          if (err2) fs39.close(fd, defaultCallback);
           callback(err2, zipfile);
         });
       });
@@ -14890,7 +14878,7 @@ var require_yauzl = __commonJS({
       if (options.validateEntrySizes == null) options.validateEntrySizes = true;
       if (options.strictFileNames == null) options.strictFileNames = false;
       if (callback == null) callback = defaultCallback;
-      fs38.fstat(fd, function(err, stats) {
+      fs39.fstat(fd, function(err, stats) {
         if (err) return callback(err);
         var reader = fd_slicer.createFromFd(fd, { autoClose: true });
         fromRandomAccessReader(reader, stats.size, options, callback);
@@ -15470,9 +15458,9 @@ var require_yauzl = __commonJS({
 var require_extract_zip = __commonJS({
   "node_modules/extract-zip/index.js"(exports, module) {
     var debug = require_src()("extract-zip");
-    var { createWriteStream: createWriteStream5, promises: fs38 } = __require("fs");
+    var { createWriteStream: createWriteStream5, promises: fs39 } = __require("fs");
     var getStream = require_get_stream();
-    var path37 = __require("path");
+    var path38 = __require("path");
     var { promisify: promisify5 } = __require("util");
     var stream = __require("stream");
     var yauzl = require_yauzl();
@@ -15487,7 +15475,7 @@ var require_extract_zip = __commonJS({
         debug("opening", this.zipPath, "with opts", this.opts);
         this.zipfile = await openZip(this.zipPath, { lazyEntries: true });
         this.canceled = false;
-        return new Promise((resolve8, reject) => {
+        return new Promise((resolve9, reject) => {
           this.zipfile.on("error", (err) => {
             this.canceled = true;
             reject(err);
@@ -15496,7 +15484,7 @@ var require_extract_zip = __commonJS({
           this.zipfile.on("close", () => {
             if (!this.canceled) {
               debug("zip extraction complete");
-              resolve8();
+              resolve9();
             }
           });
           this.zipfile.on("entry", async (entry) => {
@@ -15509,12 +15497,12 @@ var require_extract_zip = __commonJS({
               this.zipfile.readEntry();
               return;
             }
-            const destDir = path37.dirname(path37.join(this.opts.dir, entry.fileName));
+            const destDir = path38.dirname(path38.join(this.opts.dir, entry.fileName));
             try {
-              await fs38.mkdir(destDir, { recursive: true });
-              const canonicalDestDir = await fs38.realpath(destDir);
-              const relativeDestDir = path37.relative(this.opts.dir, canonicalDestDir);
-              if (relativeDestDir.split(path37.sep).includes("..")) {
+              await fs39.mkdir(destDir, { recursive: true });
+              const canonicalDestDir = await fs39.realpath(destDir);
+              const relativeDestDir = path38.relative(this.opts.dir, canonicalDestDir);
+              if (relativeDestDir.split(path38.sep).includes("..")) {
                 throw new Error(`Out of bound path "${canonicalDestDir}" found while processing file ${entry.fileName}`);
               }
               await this.extractEntry(entry);
@@ -15536,7 +15524,7 @@ var require_extract_zip = __commonJS({
         if (this.opts.onEntry) {
           this.opts.onEntry(entry, this.zipfile);
         }
-        const dest = path37.join(this.opts.dir, entry.fileName);
+        const dest = path38.join(this.opts.dir, entry.fileName);
         const mode = entry.externalFileAttributes >> 16 & 65535;
         const IFMT = 61440;
         const IFDIR = 16384;
@@ -15550,20 +15538,20 @@ var require_extract_zip = __commonJS({
         if (!isDir) isDir = madeBy === 0 && entry.externalFileAttributes === 16;
         debug("extracting entry", { filename: entry.fileName, isDir, isSymlink: symlink2 });
         const procMode = this.getExtractedMode(mode, isDir) & 511;
-        const destDir = isDir ? dest : path37.dirname(dest);
+        const destDir = isDir ? dest : path38.dirname(dest);
         const mkdirOptions = { recursive: true };
         if (isDir) {
           mkdirOptions.mode = procMode;
         }
         debug("mkdir", { dir: destDir, ...mkdirOptions });
-        await fs38.mkdir(destDir, mkdirOptions);
+        await fs39.mkdir(destDir, mkdirOptions);
         if (isDir) return;
         debug("opening read stream", dest);
         const readStream = await promisify5(this.zipfile.openReadStream.bind(this.zipfile))(entry);
         if (symlink2) {
           const link2 = await getStream(readStream);
           debug("creating symlink", link2, dest);
-          await fs38.symlink(link2, dest);
+          await fs39.symlink(link2, dest);
         } else {
           await pipeline2(readStream, createWriteStream5(dest, { mode: procMode }));
         }
@@ -15592,11 +15580,11 @@ var require_extract_zip = __commonJS({
     };
     module.exports = async function(zipPath, opts) {
       debug("creating target directory", opts.dir);
-      if (!path37.isAbsolute(opts.dir)) {
+      if (!path38.isAbsolute(opts.dir)) {
         throw new Error("Target directory is expected to be absolute");
       }
-      await fs38.mkdir(opts.dir, { recursive: true });
-      opts.dir = await fs38.realpath(opts.dir);
+      await fs39.mkdir(opts.dir, { recursive: true });
+      opts.dir = await fs39.realpath(opts.dir);
       return new Extractor(zipPath, opts).extract();
     };
   }
@@ -17053,7 +17041,7 @@ var require_strip_final_newline = __commonJS({
 var require_npm_run_path = __commonJS({
   "node_modules/run-jxa/node_modules/npm-run-path/index.js"(exports, module) {
     "use strict";
-    var path37 = __require("path");
+    var path38 = __require("path");
     var pathKey = require_path_key();
     var npmRunPath = (options) => {
       options = {
@@ -17063,16 +17051,16 @@ var require_npm_run_path = __commonJS({
         ...options
       };
       let previous;
-      let cwdPath = path37.resolve(options.cwd);
+      let cwdPath = path38.resolve(options.cwd);
       const result = [];
       while (previous !== cwdPath) {
-        result.push(path37.join(cwdPath, "node_modules/.bin"));
+        result.push(path38.join(cwdPath, "node_modules/.bin"));
         previous = cwdPath;
-        cwdPath = path37.resolve(cwdPath, "..");
+        cwdPath = path38.resolve(cwdPath, "..");
       }
-      const execPathDir = path37.resolve(options.cwd, options.execPath, "..");
+      const execPathDir = path38.resolve(options.cwd, options.execPath, "..");
       result.push(execPathDir);
-      return result.concat(options.path).join(path37.delimiter);
+      return result.concat(options.path).join(path38.delimiter);
     };
     module.exports = npmRunPath;
     module.exports.default = npmRunPath;
@@ -17082,9 +17070,9 @@ var require_npm_run_path = __commonJS({
         ...options
       };
       const env3 = { ...options.env };
-      const path38 = pathKey({ env: env3 });
-      options.path = env3[path38];
-      env3[path38] = module.exports(options);
+      const path39 = pathKey({ env: env3 });
+      options.path = env3[path39];
+      env3[path39] = module.exports(options);
       return env3;
     };
   }
@@ -17807,7 +17795,7 @@ var require_signal_exit3 = __commonJS({
 var require_kill = __commonJS({
   "node_modules/run-jxa/node_modules/execa/lib/kill.js"(exports, module) {
     "use strict";
-    var os8 = __require("os");
+    var os9 = __require("os");
     var onExit = require_signal_exit3();
     var DEFAULT_FORCE_KILL_TIMEOUT = 1e3 * 5;
     var spawnedKill = (kill, signal = "SIGTERM", options = {}) => {
@@ -17831,7 +17819,7 @@ var require_kill = __commonJS({
       return isSigterm(signal) && forceKillAfterTimeout !== false && killResult;
     };
     var isSigterm = (signal) => {
-      return signal === os8.constants.signals.SIGTERM || typeof signal === "string" && signal.toUpperCase() === "SIGTERM";
+      return signal === os9.constants.signals.SIGTERM || typeof signal === "string" && signal.toUpperCase() === "SIGTERM";
     };
     var getForceKillAfterTimeout = ({ forceKillAfterTimeout = true }) => {
       if (forceKillAfterTimeout === true) {
@@ -17857,7 +17845,7 @@ var require_kill = __commonJS({
         return spawnedPromise;
       }
       let timeoutId;
-      const timeoutPromise = new Promise((resolve8, reject) => {
+      const timeoutPromise = new Promise((resolve9, reject) => {
         timeoutId = setTimeout(() => {
           timeoutKill(spawned, killSignal, reject);
         }, timeout);
@@ -17963,7 +17951,7 @@ var require_get_stream2 = __commonJS({
       };
       const { maxBuffer } = options;
       const stream2 = bufferStream(options);
-      await new Promise((resolve8, reject) => {
+      await new Promise((resolve9, reject) => {
         const rejectPromise = (error) => {
           if (error && stream2.getBufferedLength() <= BufferConstants.MAX_LENGTH) {
             error.bufferedData = stream2.getBufferedValue();
@@ -17973,7 +17961,7 @@ var require_get_stream2 = __commonJS({
         (async () => {
           try {
             await streamPipelinePromisified(inputStream, stream2);
-            resolve8();
+            resolve9();
           } catch (error) {
             rejectPromise(error);
           }
@@ -18130,9 +18118,9 @@ var require_promise = __commonJS({
       return spawned;
     };
     var getSpawnedPromise = (spawned) => {
-      return new Promise((resolve8, reject) => {
+      return new Promise((resolve9, reject) => {
         spawned.on("exit", (exitCode, signal) => {
-          resolve8({ exitCode, signal });
+          resolve9({ exitCode, signal });
         });
         spawned.on("error", (error) => {
           reject(error);
@@ -18200,7 +18188,7 @@ var require_command = __commonJS({
 var require_execa = __commonJS({
   "node_modules/run-jxa/node_modules/execa/index.js"(exports, module) {
     "use strict";
-    var path37 = __require("path");
+    var path38 = __require("path");
     var childProcess3 = __require("child_process");
     var crossSpawn = require_cross_spawn();
     var stripFinalNewline = require_strip_final_newline();
@@ -18242,7 +18230,7 @@ var require_execa = __commonJS({
       };
       options.env = getEnv(options);
       options.stdio = normalizeStdio(options);
-      if (process.platform === "win32" && path37.basename(file, ".exe") === "cmd") {
+      if (process.platform === "win32" && path38.basename(file, ".exe") === "cmd") {
         args.unshift("/q");
       }
       return { file, args, options, parsed };
@@ -25599,13 +25587,13 @@ var setTextNodeValue = (node, text) => {
   markNodeAsDirty(node);
 };
 var getPathToRoot = (node) => {
-  const path37 = [];
+  const path38 = [];
   let current = node;
   while (current) {
-    path37.unshift(current);
+    path38.unshift(current);
     current = current.parentNode;
   }
-  return path37;
+  return path38;
 };
 var isNodeSelectable = (node) => {
   let current = node;
@@ -30083,8 +30071,8 @@ function Text({ color, backgroundColor, dimColor = false, bold = false, italic =
 }
 
 // node_modules/ink/build/components/ErrorOverview.js
-var cleanupPath = (path37) => {
-  return path37?.replace(`file://${cwd()}/`, "");
+var cleanupPath = (path38) => {
+  return path38?.replace(`file://${cwd()}/`, "");
 };
 var stackUtils = new import_stack_utils.default({
   cwd: cwd(),
@@ -31280,12 +31268,12 @@ var TerminalWriter = class {
       if (chunk) {
         this.synchronizedWrite(chunk);
       }
-      await new Promise((resolve8) => {
+      await new Promise((resolve9) => {
         let finished = false;
         const timer = setTimeout(() => {
           finished = true;
           this.cancelSlowFlush = void 0;
-          resolve8();
+          resolve9();
         }, 50);
         this.cancelSlowFlush = () => {
           if (!finished) {
@@ -31296,7 +31284,7 @@ var TerminalWriter = class {
               this.outputBuffer = [];
             }
             this.cancelSlowFlush = void 0;
-            resolve8();
+            resolve9();
           }
         };
       });
@@ -31687,8 +31675,8 @@ var AnimationController = class {
     if (!this.isRunning) {
       return;
     }
-    return new Promise((resolve8) => {
-      this.idleResolvers.push(resolve8);
+    return new Promise((resolve9) => {
+      this.idleResolvers.push(resolve9);
     });
   }
   /**
@@ -31728,8 +31716,8 @@ var AnimationController = class {
       clearInterval(this.intervalId);
       this.intervalId = void 0;
     }
-    for (const resolve8 of this.idleResolvers) {
-      resolve8();
+    for (const resolve9 of this.idleResolvers) {
+      resolve9();
     }
     this.idleResolvers = [];
   }
@@ -33234,11 +33222,11 @@ var TerminalBuffer = class {
     if (!this.worker?.connected) {
       return 0;
     }
-    return new Promise((resolve8) => {
+    return new Promise((resolve9) => {
       const handler2 = (message) => {
         if (message.type === "linesUpdated") {
           this.worker?.off("message", handler2);
-          resolve8(message.count);
+          resolve9(message.count);
         }
       };
       this.worker?.on("message", handler2);
@@ -33247,7 +33235,7 @@ var TerminalBuffer = class {
       } catch (error) {
         this.worker?.off("message", handler2);
         console.error("Failed to send getLinesUpdated message to worker:", error);
-        resolve8(0);
+        resolve9(0);
       }
     });
   }
@@ -33759,8 +33747,8 @@ var Ink = class {
     }
   }
   async waitUntilExit() {
-    this.exitPromise ||= new Promise((resolve8, reject) => {
-      this.resolveExitPromise = resolve8;
+    this.exitPromise ||= new Promise((resolve9, reject) => {
+      this.resolveExitPromise = resolve9;
       this.rejectExitPromise = reject;
     });
     return this.exitPromise;
@@ -34559,7 +34547,7 @@ var TerminalCapabilityManager = class _TerminalCapabilityManager {
     process.on("exit", cleanupTerminalOnExit);
     process.on("SIGTERM", cleanupTerminalOnExit);
     process.on("SIGINT", cleanupTerminalOnExit);
-    return new Promise((resolve8) => {
+    return new Promise((resolve9) => {
       const originalRawMode = process.stdin.isRaw;
       if (!originalRawMode) {
         process.stdin.setRawMode(true);
@@ -34580,7 +34568,7 @@ var TerminalCapabilityManager = class _TerminalCapabilityManager {
           process.stdin.setRawMode(false);
         }
         this.detectionComplete = true;
-        resolve8();
+        resolve9();
       };
       timeoutId = setTimeout(cleanup, 1e3);
       const onData = (data) => {
@@ -38973,7 +38961,6 @@ var ThemeManager = class {
         try {
           const theme2 = createCustomTheme(themeWithDefaults);
           this.extensionThemes.set(namespacedName, theme2);
-          debugLogger.log(`Registered theme: ${namespacedName}`);
         } catch (error) {
           debugLogger.warn(
             `Failed to load custom theme "${namespacedName}":`,
@@ -38999,7 +38986,6 @@ var ThemeManager = class {
     for (const theme2 of customThemes) {
       const namespacedName = `${theme2.name} (${extensionName})`;
       this.extensionThemes.delete(namespacedName);
-      debugLogger.log(`Unregistered theme: ${namespacedName}`);
     }
   }
   /**
@@ -39458,7 +39444,7 @@ var import_react34 = __toESM(require_react(), 1);
 function useIdeTrustListener() {
   const settings = useSettings();
   const [connectionStatus, setConnectionStatus] = (0, import_react34.useState)(
-    IDEConnectionStatus.Disconnected
+    "disconnected" /* Disconnected */
   );
   const previousTrust = (0, import_react34.useRef)(void 0);
   const [restartReason, setRestartReason] = (0, import_react34.useState)("NONE");
@@ -39488,7 +39474,7 @@ function useIdeTrustListener() {
     };
   }, []);
   const getSnapshot = () => {
-    if (connectionStatus !== IDEConnectionStatus.Connected) {
+    if (connectionStatus !== "connected" /* Connected */) {
       return void 0;
     }
     return ideContextStore.get()?.workspaceState?.isTrusted;
@@ -40193,7 +40179,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);
@@ -40211,16 +40197,16 @@ async function initializeApp(config, settings) {
 // packages/cli/src/config/auth.ts
 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 */) {
     if (!process.env["GEMINI_API_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) {
@@ -40278,25 +40264,25 @@ async function promptForConsentNonInteractive(prompt, defaultValue = true) {
     input: process.stdin,
     output: process.stdout
   });
-  return new Promise((resolve8) => {
+  return new Promise((resolve9) => {
     rl.question(prompt, (answer) => {
       rl.close();
       const trimmedAnswer = answer.trim().toLowerCase();
       if (trimmedAnswer === "") {
-        resolve8(defaultValue);
+        resolve9(defaultValue);
       } else {
-        resolve8(["y", "yes"].includes(trimmedAnswer));
+        resolve9(["y", "yes"].includes(trimmedAnswer));
       }
     });
   });
 }
 async function promptForConsentInteractive(prompt, addExtensionUpdateConfirmationRequest, clearConfirmationRequest) {
-  return new Promise((resolve8) => {
+  return new Promise((resolve9) => {
     addExtensionUpdateConfirmationRequest({
       prompt,
       onConfirm: (resolvedConfirmed) => {
         clearConfirmationRequest?.();
-        setImmediate(() => resolve8(resolvedConfirmed));
+        setImmediate(() => resolve9(resolvedConfirmed));
       }
     });
   });
@@ -40817,8 +40803,8 @@ var Override = class _Override {
   output() {
     return `${this.isDisable ? "!" : ""}${this.baseRule}${this.includeSubdirs ? "*" : ""}`;
   }
-  matchesPath(path37) {
-    return this.asRegex().test(path37);
+  matchesPath(path38) {
+    return this.asRegex().test(path38);
   }
 };
 var ensureLeadingAndTrailingSlash = function(dirPath) {
@@ -43959,7 +43945,7 @@ async function fetchJson(url, redirectCount = 0) {
   if (token) {
     headers.Authorization = `token ${token}`;
   }
-  return new Promise((resolve8, reject) => {
+  return new Promise((resolve9, reject) => {
     https.get(url, { headers }, (res) => {
       if (res.statusCode === 302 || res.statusCode === 301) {
         if (redirectCount >= 10) {
@@ -43972,7 +43958,7 @@ async function fetchJson(url, redirectCount = 0) {
         fetchJson(
           new URL(res.headers.location, url).toString(),
           redirectCount + 1
-        ).then(resolve8).catch(reject);
+        ).then(resolve9).catch(reject);
         return;
       }
       if (res.statusCode !== 200) {
@@ -43984,7 +43970,7 @@ async function fetchJson(url, redirectCount = 0) {
       res.on("data", (chunk) => chunks.push(chunk));
       res.on("end", () => {
         const data = Buffer.concat(chunks).toString();
-        resolve8(JSON.parse(data));
+        resolve9(JSON.parse(data));
       });
     }).on("error", reject);
   });
@@ -44344,7 +44330,7 @@ async function downloadFile(url, dest, options, redirectCount = 0) {
   if (token) {
     headers["Authorization"] = `token ${token}`;
   }
-  return new Promise((resolve8, reject) => {
+  return new Promise((resolve9, reject) => {
     https2.get(url, { headers }, (res) => {
       if (res.statusCode === 302 || res.statusCode === 301) {
         if (redirectCount >= 10) {
@@ -44355,7 +44341,7 @@ async function downloadFile(url, dest, options, redirectCount = 0) {
             new Error("Redirect response missing Location header")
           );
         }
-        downloadFile(res.headers.location, dest, options, redirectCount + 1).then(resolve8).catch(reject);
+        downloadFile(res.headers.location, dest, options, redirectCount + 1).then(resolve9).catch(reject);
         return;
       }
       if (res.statusCode !== 200) {
@@ -44365,7 +44351,7 @@ async function downloadFile(url, dest, options, redirectCount = 0) {
       }
       const file = fs15.createWriteStream(dest);
       res.pipe(file);
-      file.on("finish", () => file.close(resolve8));
+      file.on("finish", () => file.close(resolve9));
     }).on("error", reject);
   });
 }
@@ -44640,7 +44626,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(
@@ -44826,7 +44812,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) {
@@ -44849,7 +44835,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(
@@ -44882,7 +44868,7 @@ Would you like to attempt to install via "git clone" instead?`
             newExtensionConfig?.version ?? "",
             previousExtensionConfig.version,
             installMetadata.type,
-            CoreToolCallStatus.Error
+            "error" /* Error */
           )
         );
       } else {
@@ -44894,7 +44880,7 @@ Would you like to attempt to install via "git clone" instead?`
             extensionId ?? "",
             newExtensionConfig?.version ?? "",
             installMetadata.type,
-            CoreToolCallStatus.Error
+            "error" /* Error */
           )
         );
       }
@@ -44925,7 +44911,7 @@ Would you like to attempt to install via "git clone" instead?`
         extension.name,
         hashValue(extension.name),
         extension.id,
-        CoreToolCallStatus.Success
+        "success" /* Success */
       )
     );
   }
@@ -45195,7 +45181,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 };
                   }
                 }
@@ -45524,7 +45510,7 @@ function validateName(name) {
   }
 }
 async function inferInstallMetadata(source2, args = {}) {
-  if (source2.startsWith("http://") || source2.startsWith("https://") || source2.startsWith("git@") || source2.startsWith("sso://") || source2.startsWith("github:") || source2.startsWith("gitlab:")) {
+  if (source2.startsWith("http://") || source2.startsWith("https://") || source2.startsWith("git@") || source2.startsWith("sso://") || source2.startsWith("github:") || source2.startsWith("gitlab:") || source2.startsWith("ssh://")) {
     return {
       source: source2,
       type: "git",
@@ -45846,9 +45832,9 @@ function isSettingsValue(value) {
   const type = typeof value;
   return type === "string" || type === "number" || type === "boolean" || type === "object";
 }
-function getNestedValue(obj, path37) {
+function getNestedValue(obj, path38) {
   let current = obj;
-  for (const key of path37) {
+  for (const key of path38) {
     if (!isRecord(current) || !(key in current)) {
       return void 0;
     }
@@ -45861,8 +45847,8 @@ function getEffectiveValue(key, settings) {
   if (!definition) {
     return void 0;
   }
-  const path37 = key.split(".");
-  const value = getNestedValue(settings, path37);
+  const path38 = key.split(".");
+  const value = getNestedValue(settings, path38);
   if (value !== void 0 && isSettingsValue(value)) {
     return value;
   }
@@ -45872,8 +45858,8 @@ function getDialogSettingKeys() {
   return Object.values(getFlattenedSchema()).filter((definition) => definition.showInDialog !== false).map((definition) => definition.key);
 }
 function isInSettingsScope(key, scopeSettings) {
-  const path37 = key.split(".");
-  const value = getNestedValue(scopeSettings, path37);
+  const path38 = key.split(".");
+  const value = getNestedValue(scopeSettings, path38);
   return value !== void 0;
 }
 function getDisplayValue(key, scopeSettings, _mergedSettings) {
@@ -46227,7 +46213,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
@@ -46242,7 +46228,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
@@ -46267,7 +46253,7 @@ Content from @${result.uri}:
   }
   if (hasError) {
     const firstError = displays.find(
-      (d) => d.status === CoreToolCallStatus.Error
+      (d) => d.status === "error" /* Error */
     );
     return {
       parts: [],
@@ -46303,7 +46289,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
@@ -46350,7 +46336,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
@@ -46938,7 +46924,7 @@ async function writeClipboardImages(filePaths) {
   if (process22.platform !== "darwin") {
     return;
   }
-  const paths = filePaths.map((path37) => path37 instanceof URL ? fileURLToPath2(path37) : path37);
+  const paths = filePaths.map((path38) => path38 instanceof URL ? fileURLToPath2(path38) : path38);
   await runJxa((...paths2) => {
     ObjC.import("AppKit");
     ObjC.import("Foundation");
@@ -47441,7 +47427,7 @@ var OSC52_FOOTER = BEL3;
 var MAX_OSC52_BODY_B64_BYTES = MAX_OSC52_SEQUENCE_BYTES - Buffer.byteLength(OSC52_HEADER) - Buffer.byteLength(OSC52_FOOTER);
 var MAX_OSC52_DATA_BYTES = Math.floor(MAX_OSC52_BODY_B64_BYTES / 4) * 3;
 var SCREEN_DCS_CHUNK_SIZE = 240;
-var pickTty = () => new Promise((resolve8) => {
+var pickTty = () => new Promise((resolve9) => {
   if (process.platform !== "win32") {
     try {
       const devTty = fs22.createWriteStream("/dev/tty");
@@ -47449,25 +47435,25 @@ var pickTty = () => new Promise((resolve8) => {
         devTty.removeAllListeners("open");
         devTty.removeAllListeners("error");
         devTty.destroy();
-        resolve8(getStdioTty());
+        resolve9(getStdioTty());
       }, 100);
       devTty.once("open", () => {
         clearTimeout(timeout);
         devTty.removeAllListeners("error");
         devTty.on("error", () => {
         });
-        resolve8({ stream: devTty, closeAfter: true });
+        resolve9({ stream: devTty, closeAfter: true });
       });
       devTty.once("error", () => {
         clearTimeout(timeout);
         devTty.removeAllListeners("open");
-        resolve8(getStdioTty());
+        resolve9(getStdioTty());
       });
       return;
     } catch {
     }
   }
-  resolve8(getStdioTty());
+  resolve9(getStdioTty());
 });
 var getStdioTty = () => {
   if (process.platform === "win32") {
@@ -47521,12 +47507,12 @@ var wrapForScreen = (seq) => {
   }
   return out;
 };
-var writeAll = (stream, data) => new Promise((resolve8, reject) => {
+var writeAll = (stream, data) => new Promise((resolve9, reject) => {
   const fd = stream.fd;
   if (process.platform === "win32" && typeof fd === "number" && (stream === process.stdout || stream === process.stderr)) {
     try {
       fs22.writeSync(fd, data);
-      resolve8();
+      resolve9();
       return;
     } catch (e) {
       debugLogger.warn(
@@ -47541,7 +47527,7 @@ var writeAll = (stream, data) => new Promise((resolve8, reject) => {
   };
   const onDrain = () => {
     cleanup();
-    resolve8();
+    resolve9();
   };
   const cleanup = () => {
     stream.off("error", onError);
@@ -47550,7 +47536,7 @@ var writeAll = (stream, data) => new Promise((resolve8, reject) => {
   stream.once("error", onError);
   if (stream.write(data)) {
     cleanup();
-    resolve8();
+    resolve9();
   } else {
     stream.once("drain", onDrain);
   }
@@ -47680,14 +47666,14 @@ function getUserLinuxClipboardTool() {
   }
 }
 async function saveFromCommand(command, args, destination) {
-  return new Promise((resolve8) => {
+  return new Promise((resolve9) => {
     const child = spawn(command, args);
     const fileStream = createWriteStream2(destination);
     let resolved = false;
     const safeResolve = (value) => {
       if (!resolved) {
         resolved = true;
-        resolve8(value);
+        resolve9(value);
       }
     };
     child.stdout.pipe(fileStream);
@@ -49545,7 +49531,7 @@ async function openFileInEditor(filePath, stdin, setRawMode, preferredEditorType
         throw err;
       }
     } else {
-      await new Promise((resolve8, reject) => {
+      await new Promise((resolve9, reject) => {
         const child = spawn2(executable, [...initialArgs, ...args], {
           stdio: "inherit",
           shell: process.platform === "win32"
@@ -49570,7 +49556,7 @@ async function openFileInEditor(filePath, stdin, setRawMode, preferredEditorType
             );
             reject(err);
           } else {
-            resolve8();
+            resolve9();
           }
         });
       });
@@ -49579,7 +49565,7 @@ async function openFileInEditor(filePath, stdin, setRawMode, preferredEditorType
     if (wasRaw) {
       setRawMode?.(true);
     }
-    coreEvents.emit(CoreEvent.ExternalEditorClosed);
+    coreEvents.emit("external-editor-closed" /* ExternalEditorClosed */);
   }
 }
 
@@ -52269,7 +52255,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) {
@@ -53687,11 +53673,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);
       }
     }
@@ -53948,14 +53934,17 @@ var FileCommandLoader = class {
   getCommandDirectories() {
     const dirs = [];
     const storage = this.config?.storage ?? new Storage(this.projectRoot);
+    const userCommandsDir = Storage.getUserCommandsDir();
     dirs.push({
-      path: Storage.getUserCommandsDir(),
+      path: userCommandsDir,
       kind: "user-file" /* USER_FILE */
     });
-    dirs.push({
-      path: storage.getProjectCommandsDir(),
-      kind: "workspace-file" /* WORKSPACE_FILE */
-    });
+    if (!storage.isWorkspaceHomeDir()) {
+      dirs.push({
+        path: storage.getProjectCommandsDir(),
+        kind: "workspace-file" /* WORKSPACE_FILE */
+      });
+    }
     if (this.config) {
       const activeExtensions = this.config.getExtensions().filter((ext) => ext.isActive).sort((a, b2) => a.name.localeCompare(b2.name));
       const extensionCommandDirs = activeExtensions.map((ext) => ({
@@ -54806,7 +54795,7 @@ var MultiFolderTrustDialog = ({
           if (choice === 1 /* YES_AND_REMEMBER */) {
             await trustedFolders.setValue(
               expandedPath,
-              TrustLevel.TRUST_FOLDER
+              "TRUST_FOLDER" /* TRUST_FOLDER */
             );
           }
           workspaceContext.addDirectory(expandedPath);
@@ -55960,10 +55949,10 @@ function enableFeature(settings, featureName, strategy) {
     };
   }
   const modifiedScopes = [];
-  for (const { scope, path: path37 } of foundInDisabledScopes) {
+  for (const { scope, path: path38 } of foundInDisabledScopes) {
     if (isLoadableSettingScope(scope)) {
       strategy.enable(settings, scope, featureName);
-      modifiedScopes.push({ scope, path: path37 });
+      modifiedScopes.push({ scope, path: path38 });
     }
   }
   return {
@@ -56454,7 +56443,7 @@ var authCommand = {
 import process28 from "node:process";
 
 // packages/cli/src/generated/git-commit.ts
-var GIT_COMMIT_INFO = "246f98459";
+var GIT_COMMIT_INFO = "022e8baef";
 
 // packages/cli/src/ui/utils/historyExportUtils.ts
 import * as fsPromises from "node:fs/promises";
@@ -57100,7 +57089,7 @@ 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;
@@ -57117,9 +57106,9 @@ var clearCommand = {
     }
     let result;
     if (hookSystem) {
-      result = await hookSystem.fireSessionStartEvent(SessionStartSource.Clear);
+      result = await hookSystem.fireSessionStartEvent("clear" /* Clear */);
     }
-    await new Promise((resolve8) => setImmediate(resolve8));
+    await new Promise((resolve9) => setImmediate(resolve9));
     if (config) {
       await flushTelemetry(config);
     }
@@ -57393,10 +57382,85 @@ ${docsUrl}`
   }
 };
 
+// packages/cli/src/ui/commands/exportSessionCommand.ts
+import * as fs30 from "node:fs/promises";
+import * as path27 from "node:path";
+var exportSessionCommand = {
+  name: "export-session",
+  description: "Export the current session to a JSON file",
+  kind: "built-in" /* BUILT_IN */,
+  autoExecute: true,
+  action: async (context) => {
+    const { ui: ui2 } = context;
+    const args = context.invocation?.args.trim();
+    if (!args) {
+      return {
+        type: "message",
+        messageType: "error",
+        content: "Please provide a file path to export the session to. Example: /export-session ./my-session.json"
+      };
+    }
+    const sessionId = context.services.agentContext?.config.getSessionId();
+    if (!sessionId) {
+      return {
+        type: "message",
+        messageType: "error",
+        content: "No active session found to export."
+      };
+    }
+    if (ui2.pendingItem) {
+      ui2.addItem(
+        {
+          type: "error" /* ERROR */,
+          text: "Operation already in progress, please wait."
+        },
+        Date.now()
+      );
+      return;
+    }
+    const pendingMessage = {
+      type: "export_session" /* EXPORT_SESSION */,
+      exportSession: {
+        isPending: true
+      }
+    };
+    try {
+      ui2.setPendingItem(pendingMessage);
+      const storage = context.services.agentContext.config.storage;
+      const sessionSelector = new SessionSelector(storage);
+      const { sessionData } = await sessionSelector.resolveSession(sessionId);
+      const targetPath = path27.resolve(process.cwd(), args);
+      await fs30.writeFile(
+        targetPath,
+        JSON.stringify(sessionData, null, 2),
+        "utf-8"
+      );
+      ui2.addItem(
+        {
+          type: "export_session" /* EXPORT_SESSION */,
+          exportSession: {
+            isPending: false,
+            targetPath
+          }
+        },
+        Date.now()
+      );
+    } catch (error) {
+      return {
+        type: "message",
+        messageType: "error",
+        content: `Failed to export session: ${error instanceof Error ? error.message : "Unknown error"}`
+      };
+    } finally {
+      ui2.setPendingItem(null);
+    }
+  }
+};
+
 // packages/cli/src/ui/commands/directoryCommand.tsx
 var import_jsx_runtime15 = __toESM(require_jsx_runtime(), 1);
-import * as path27 from "node:path";
-import * as fs30 from "node:fs";
+import * as path28 from "node:path";
+import * as fs31 from "node:fs";
 async function finishAddingDirectories(config, addItem, added, errors) {
   if (!config) {
     addItem({
@@ -57464,15 +57528,15 @@ var directoryCommand = {
         if (context.services.agentContext?.config) {
           const workspaceContext = context.services.agentContext.config.getWorkspaceContext();
           const existingDirs = new Set(
-            workspaceContext.getDirectories().map((dir) => path27.resolve(dir))
+            workspaceContext.getDirectories().map((dir) => path28.resolve(dir))
           );
           filteredSuggestions = suggestions.filter((s3) => {
             const expanded = expandHomeDir(s3);
-            const absolute = path27.resolve(expanded);
+            const absolute = path28.resolve(expanded);
             if (existingDirs.has(absolute)) {
               return false;
             }
-            if (absolute.endsWith(path27.sep) && existingDirs.has(absolute.slice(0, -1))) {
+            if (absolute.endsWith(path28.sep) && existingDirs.has(absolute.slice(0, -1))) {
               return false;
             }
             return true;
@@ -57522,11 +57586,11 @@ var directoryCommand = {
           const trimmedPath = pathToAdd.trim();
           const expandedPath = expandHomeDir(trimmedPath);
           try {
-            const absolutePath = path27.resolve(
+            const absolutePath = path28.resolve(
               workspaceContext.targetDir,
               expandedPath
             );
-            const resolvedPath = fs30.realpathSync(absolutePath);
+            const resolvedPath = fs31.realpathSync(absolutePath);
             if (currentWorkspaceDirs.includes(resolvedPath)) {
               alreadyAdded.push(trimmedPath);
               continue;
@@ -57552,7 +57616,7 @@ var directoryCommand = {
           const dirsToConfirm = [];
           const trustedDirs = [];
           for (const pathToAdd of pathsToProcess) {
-            const expandedPath = path27.resolve(expandHomeDir(pathToAdd.trim()));
+            const expandedPath = path28.resolve(expandHomeDir(pathToAdd.trim()));
             const isTrusted = trustedFolders.isPathTrusted(expandedPath);
             if (isTrusted === true) {
               trustedDirs.push(pathToAdd.trim());
@@ -57773,14 +57837,14 @@ var ConfigExtensionDialog = ({
     [loggerAdapter]
   );
   const requestSetting = (0, import_react62.useCallback)(
-    async (setting) => new Promise((resolve8) => {
+    async (setting) => new Promise((resolve9) => {
       if (!mounted.current) return;
       settingBuffer.setText("");
       setState({
         type: "ASK_SETTING",
         setting,
         resolve: (val) => {
-          resolve8(val);
+          resolve9(val);
           setState({ type: "BUSY", message: "Updating..." });
         }
       });
@@ -57788,13 +57852,13 @@ var ConfigExtensionDialog = ({
     [settingBuffer]
   );
   const requestConfirmation = (0, import_react62.useCallback)(
-    async (message) => new Promise((resolve8) => {
+    async (message) => new Promise((resolve9) => {
       if (!mounted.current) return;
       setState({
         type: "ASK_CONFIRMATION",
         message,
         resolve: (val) => {
-          resolve8(val);
+          resolve9(val);
           setState({ type: "BUSY", message: "Processing..." });
         }
       });
@@ -58131,7 +58195,7 @@ function SearchableList({
 var import_react64 = __toESM(require_react(), 1);
 
 // packages/cli/src/config/extensionRegistryClient.ts
-import * as fs31 from "node:fs/promises";
+import * as fs32 from "node:fs/promises";
 var ExtensionRegistryClient = class _ExtensionRegistryClient {
   static DEFAULT_REGISTRY_URL = "https://geminicli.com/extensions.json";
   static FETCH_TIMEOUT_MS = 1e4;
@@ -58209,7 +58273,7 @@ var ExtensionRegistryClient = class _ExtensionRegistryClient {
           return await response.json();
         } else {
           const filePath = resolveToRealPath(uri);
-          const content = await fs31.readFile(filePath, "utf-8");
+          const content = await fs32.readFile(filePath, "utf-8");
           return JSON.parse(content);
         }
       } catch (error) {
@@ -58380,8 +58444,8 @@ function ExtensionDetails({
       if (keyMatchers["basic.confirm" /* RETURN */](key) && !isInstalled && !isInstalling) {
         setIsInstalling(true);
         void onInstall(
-          (prompt) => new Promise((resolve8) => {
-            setConsentRequest({ prompt, resolve: resolve8 });
+          (prompt) => new Promise((resolve9) => {
+            setConsentRequest({ prompt, resolve: resolve9 });
           })
         );
         return true;
@@ -58389,8 +58453,8 @@ function ExtensionDetails({
       if (keyMatchers["extension.link" /* LINK_EXTENSION */](key) && isLinkable && !isInstalled && !isInstalling) {
         setIsInstalling(true);
         void onLink(
-          (prompt) => new Promise((resolve8) => {
-            setConsentRequest({ prompt, resolve: resolve8 });
+          (prompt) => new Promise((resolve9) => {
+            setConsentRequest({ prompt, resolve: resolve9 });
           })
         );
         return true;
@@ -58794,7 +58858,7 @@ function updateAction(context, args) {
   }
   let resolveUpdateComplete;
   const updateComplete = new Promise(
-    (resolve8) => resolveUpdateComplete = resolve8
+    (resolve9) => resolveUpdateComplete = resolve9
   );
   const extensions = context.services.agentContext?.config ? listExtensions(context.services.agentContext.config) : [];
   if (showMessageIfNoExtensions(context, extensions)) {
@@ -59503,6 +59567,7 @@ var ConsoleSummaryDisplay = ({
 
 // packages/cli/src/ui/components/Footer.tsx
 import process33 from "node:process";
+import os7 from "node:os";
 
 // packages/cli/src/ui/components/MemoryUsageDisplay.tsx
 var import_react69 = __toESM(require_react(), 1);
@@ -59673,6 +59738,11 @@ var ALL_ITEMS = [
     header: "session",
     description: "Unique identifier for the current session"
   },
+  {
+    id: "hostname",
+    header: "machine",
+    description: "Current machine hostname"
+  },
   {
     id: "auth",
     header: "/auth",
@@ -59698,6 +59768,7 @@ var DEFAULT_ORDER = [
   "quota",
   "memory-usage",
   "session-id",
+  "hostname",
   "auth",
   "code-changes",
   "token-count"
@@ -59746,6 +59817,7 @@ function resolveFooterState(settings) {
 
 // packages/cli/src/ui/components/Footer.tsx
 var import_jsx_runtime26 = __toESM(require_jsx_runtime(), 1);
+var HOSTNAME = os7.hostname();
 var CwdIndicator = ({
   targetDir,
   maxWidth,
@@ -60021,10 +60093,19 @@ var Footer = () => {
         );
         break;
       }
+      case "hostname": {
+        addCol(
+          id,
+          header,
+          () => /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(Text, { color: itemColor, children: HOSTNAME }),
+          HOSTNAME.length
+        );
+        break;
+      }
       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,
@@ -60298,6 +60379,7 @@ var FooterConfigDialog = ({
       quota: /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(Text, { color: getColor("quota", itemColor), children: "42% used" }),
       "memory-usage": /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(Text, { color: getColor("memory-usage", itemColor), children: "260 MB" }),
       "session-id": /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(Text, { color: getColor("session-id", itemColor), children: "769992f9" }),
+      hostname: /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(Text, { color: getColor("hostname", itemColor), children: "dev-machine" }),
       "code-changes": /* @__PURE__ */ (0, import_jsx_runtime27.jsxs)(Box_default, { flexDirection: "row", children: [
         /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(Text, { color: getColor("code-changes", theme.status.success), children: "+12" }),
         /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(Text, { color: getColor("code-changes"), children: " " }),
@@ -60467,7 +60549,7 @@ var import_react74 = __toESM(require_react(), 1);
 var import_react72 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/utils/rewindFileOps.ts
-import fs32 from "node:fs/promises";
+import fs33 from "node:fs/promises";
 function calculateTurnStats(conversation, userMessage) {
   const msgIndex = conversation.messages.indexOf(userMessage);
   if (msgIndex === -1) return null;
@@ -60554,7 +60636,7 @@ async function revertFileChanges(conversation, targetMessageId) {
           try {
             let currentContent = null;
             try {
-              currentContent = await fs32.readFile(filePath, "utf8");
+              currentContent = await fs33.readFile(filePath, "utf8");
             } catch (e) {
               const error = e;
               if ("code" in error && error.code === "ENOENT") {
@@ -60572,9 +60654,9 @@ async function revertFileChanges(conversation, targetMessageId) {
             }
             if (currentContent === newContent) {
               if (!isNewFile2) {
-                await fs32.writeFile(filePath, originalContent ?? "");
+                await fs33.writeFile(filePath, originalContent ?? "");
               } else {
-                await fs32.unlink(filePath);
+                await fs33.unlink(filePath);
               }
             } else if (currentContent !== null) {
               const originalText = originalContent ?? "";
@@ -60586,9 +60668,9 @@ async function revertFileChanges(conversation, targetMessageId) {
               const patchedContent = applyPatch(currentContent, undoPatch);
               if (typeof patchedContent === "string") {
                 if (patchedContent === "" && isNewFile2) {
-                  await fs32.unlink(filePath);
+                  await fs33.unlink(filePath);
                 } else {
-                  await fs32.writeFile(filePath, patchedContent);
+                  await fs33.writeFile(filePath, patchedContent);
                 }
               } else {
                 coreEvents.emitFeedback(
@@ -61224,14 +61306,14 @@ function enableHook(settings, hookName) {
   }
   const modifiedScopes = [];
   try {
-    for (const { scope, path: path37 } of foundInDisabledScopes) {
+    for (const { scope, path: path38 } of foundInDisabledScopes) {
       if (isLoadableSettingScope(scope)) {
         const currentScopeDisabled = settings.forScope(scope).settings.hooksConfig?.disabled ?? [];
         const newDisabled = currentScopeDisabled.filter(
           (name) => name !== hookName
         );
         settings.setValue(scope, "hooksConfig.disabled", newDisabled);
-        modifiedScopes.push({ scope, path: path37 });
+        modifiedScopes.push({ scope, path: path38 });
       }
     }
   } catch (error) {
@@ -61526,7 +61608,7 @@ async function enableAction3(context, args) {
   }
   const feedback = renderHookActionFeedback(
     result,
-    (label, path37) => `${label} (${path37})`
+    (label, path38) => `${label} (${path38})`
   );
   return {
     type: "message",
@@ -61568,7 +61650,7 @@ async function disableAction3(context, args) {
   }
   const feedback = renderHookActionFeedback(
     result,
-    (label, path37) => `${label} (${path37})`
+    (label, path38) => `${label} (${path38})`
   );
   return {
     type: "message",
@@ -61767,16 +61849,16 @@ var hooksCommand = {
 };
 
 // packages/cli/src/ui/commands/ideCommand.ts
-import path28 from "node:path";
+import path29 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...`
@@ -61796,13 +61878,13 @@ function getIdeStatusMessage(ideClient) {
 function formatFileList(openFiles) {
   const basenameCounts = /* @__PURE__ */ new Map();
   for (const file of openFiles) {
-    const basename6 = path28.basename(file.path);
+    const basename6 = path29.basename(file.path);
     basenameCounts.set(basename6, (basenameCounts.get(basename6) || 0) + 1);
   }
   const fileList = openFiles.map((file) => {
-    const basename6 = path28.basename(file.path);
+    const basename6 = path29.basename(file.path);
     const isDuplicate = (basenameCounts.get(basename6) || 0) > 1;
-    const parentDir = path28.basename(path28.dirname(file.path));
+    const parentDir = path29.basename(path29.dirname(file.path));
     const displayName = isDuplicate ? `${basename6} (/${parentDir})` : basename6;
     return `  - ${displayName}${file.isActive ? " (active)" : ""}`;
   }).join("\n");
@@ -61817,7 +61899,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;
@@ -61829,7 +61911,7 @@ async function getIdeStatusMessageWithFiles(ideClient) {
         content
       };
     }
-    case IDEConnectionStatus.Connecting:
+    case "connecting" /* Connecting */:
       return {
         messageType: "info",
         content: `\u{1F7E1} Connecting...`
@@ -61851,7 +61933,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();
   }
@@ -61939,10 +62021,10 @@ var ideCommand = async () => {
               logToConsole: false
             }
           );
-          if (ideClient.getConnectionStatus().status === IDEConnectionStatus.Connected) {
+          if (ideClient.getConnectionStatus().status === "connected" /* Connected */) {
             break;
           }
-          await new Promise((resolve8) => setTimeout(resolve8, 500));
+          await new Promise((resolve9) => setTimeout(resolve9, 500));
         }
         const { messageType, content } = getIdeStatusMessage(ideClient);
         if (messageType === "error") {
@@ -62016,7 +62098,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 {
@@ -62030,8 +62112,8 @@ var ideCommand = async () => {
 };
 
 // packages/cli/src/ui/commands/initCommand.ts
-import * as fs33 from "node:fs";
-import * as path29 from "node:path";
+import * as fs34 from "node:fs";
+import * as path30 from "node:path";
 var initCommand = {
   name: "init",
   description: "Analyzes the project and creates a tailored GEMINI.md file",
@@ -62046,10 +62128,10 @@ var initCommand = {
       };
     }
     const targetDir = context.services.agentContext.config.getTargetDir();
-    const geminiMdPath = path29.join(targetDir, "GEMINI.md");
-    const result = performInit(fs33.existsSync(geminiMdPath));
+    const geminiMdPath = path30.join(targetDir, "GEMINI.md");
+    const result = performInit(fs34.existsSync(geminiMdPath));
     if (result.type === "submit_prompt") {
-      fs33.writeFileSync(geminiMdPath, "", "utf8");
+      fs34.writeFileSync(geminiMdPath, "", "utf8");
       context.ui.addItem(
         {
           type: "info",
@@ -62116,13 +62198,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-ZZ5HEQGP.js");
+      const { MCPOAuthProvider } = await import("./core-ERSGIOMQ.js");
       let oauthConfig = server.oauth;
       if (!oauthConfig) {
         oauthConfig = { enabled: false };
@@ -62159,7 +62241,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) => {
@@ -62205,10 +62287,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();
@@ -62490,7 +62572,7 @@ var import_react81 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/components/InboxDialog.tsx
 var import_react80 = __toESM(require_react(), 1);
-import * as path31 from "node:path";
+import * as path32 from "node:path";
 
 // packages/cli/src/ui/components/messages/DiffRenderer.tsx
 var import_react79 = __toESM(require_react(), 1);
@@ -76288,10 +76370,10 @@ function colorizeCode({
 }
 
 // packages/cli/src/ui/utils/fileUtils.ts
-import * as path30 from "node:path";
+import * as path31 from "node:path";
 function getFileExtension(filename) {
   if (!filename) return null;
-  const ext = path30.extname(filename);
+  const ext = path31.extname(filename);
   return ext ? ext.slice(1) : null;
 }
 
@@ -76654,11 +76736,11 @@ var MEMORY_PATCH_ACTION_CHOICES = [
   }
 ];
 function normalizePathForUi(filePath) {
-  return path31.posix.normalize(filePath.replaceAll("\\", "/"));
+  return path32.posix.normalize(filePath.replaceAll("\\", "/"));
 }
 function getPathBasename(filePath) {
   const normalizedPath = normalizePathForUi(filePath);
-  const basename6 = path31.posix.basename(normalizedPath);
+  const basename6 = path32.posix.basename(normalizedPath);
   return basename6 === "." ? filePath : basename6;
 }
 function formatMemoryPatchSummary(patch) {
@@ -77615,97 +77697,62 @@ var InboxDialog = ({
 };
 
 // packages/cli/src/ui/commands/memoryCommand.ts
-var memoryCommand = {
-  name: "memory",
-  description: "Commands for interacting with memory",
+var showSubCommand = {
+  name: "show",
+  description: "Show the current memory contents",
+  kind: "built-in" /* BUILT_IN */,
+  autoExecute: true,
+  action: async (context) => {
+    const config = context.services.agentContext?.config;
+    if (!config) return;
+    const result = showMemory(config);
+    context.ui.addItem(
+      {
+        type: "info" /* INFO */,
+        text: result.content
+      },
+      Date.now()
+    );
+  }
+};
+var addSubCommand = {
+  name: "add",
+  description: "Add content to the memory",
   kind: "built-in" /* BUILT_IN */,
   autoExecute: false,
-  subCommands: [
-    {
-      name: "show",
-      description: "Show the current memory contents",
-      kind: "built-in" /* BUILT_IN */,
-      autoExecute: true,
-      action: async (context) => {
-        const config = context.services.agentContext?.config;
-        if (!config) return;
-        const result = showMemory(config);
-        context.ui.addItem(
-          {
-            type: "info" /* INFO */,
-            text: result.content
-          },
-          Date.now()
-        );
-      }
-    },
-    {
-      name: "add",
-      description: "Add content to the memory",
-      kind: "built-in" /* BUILT_IN */,
-      autoExecute: false,
-      action: (context, args) => {
-        const result = addMemory(args);
-        if (result.type === "message") {
-          return result;
-        }
-        context.ui.addItem(
-          {
-            type: "info" /* INFO */,
-            text: `Attempting to save to memory: "${args.trim()}"`
-          },
-          Date.now()
-        );
-        return result;
-      }
-    },
-    {
-      name: "reload",
-      altNames: ["refresh"],
-      description: "Reload the memory from the source",
-      kind: "built-in" /* BUILT_IN */,
-      autoExecute: true,
-      action: async (context) => {
-        context.ui.addItem(
-          {
-            type: "info" /* INFO */,
-            text: "Reloading memory from source files..."
-          },
-          Date.now()
-        );
-        try {
-          const config = context.services.agentContext?.config;
-          if (config) {
-            const result = await refreshMemory(config);
-            context.ui.addItem(
-              {
-                type: "info" /* INFO */,
-                text: result.content
-              },
-              Date.now()
-            );
-          }
-        } catch (error) {
-          context.ui.addItem(
-            {
-              type: "error" /* ERROR */,
-              // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-              text: `Error reloading memory: ${error.message}`
-            },
-            Date.now()
-          );
-        }
-      }
-    },
-    {
-      name: "list",
-      description: "Lists the paths of the GEMINI.md files in use",
-      kind: "built-in" /* BUILT_IN */,
-      autoExecute: true,
-      action: async (context) => {
-        const config = context.services.agentContext?.config;
-        if (!config) return;
-        const result = listMemoryFiles(config);
+  action: (context, args) => {
+    const result = addMemory(args);
+    if (result.type === "message") {
+      return result;
+    }
+    context.ui.addItem(
+      {
+        type: "info" /* INFO */,
+        text: `Attempting to save to memory: "${args.trim()}"`
+      },
+      Date.now()
+    );
+    return result;
+  }
+};
+var reloadSubCommand = {
+  name: "reload",
+  altNames: ["refresh"],
+  description: "Reload the memory from the source",
+  kind: "built-in" /* BUILT_IN */,
+  autoExecute: true,
+  action: async (context) => {
+    context.ui.addItem(
+      {
+        type: "info" /* INFO */,
+        text: "Reloading memory from source files..."
+      },
+      Date.now()
+    );
+    try {
+      const config = context.services.agentContext?.config;
+      if (config) {
+        const result = await refreshMemory(config);
         context.ui.addItem(
           {
             type: "info" /* INFO */,
@@ -77714,45 +77761,89 @@ var memoryCommand = {
           Date.now()
         );
       }
-    },
-    {
-      name: "inbox",
-      description: "Review skills extracted from past sessions and move them to global or project skills",
-      kind: "built-in" /* BUILT_IN */,
-      autoExecute: true,
-      action: (context) => {
-        const config = context.services.agentContext?.config;
-        if (!config) {
-          return {
-            type: "message",
-            messageType: "error",
-            content: "Config not loaded."
-          };
-        }
-        if (!config.isAutoMemoryEnabled()) {
-          return {
-            type: "message",
-            messageType: "info",
-            content: "The memory inbox requires Auto Memory. Enable it with: experimental.autoMemory = true in settings."
-          };
-        }
-        return {
-          type: "custom_dialog",
-          component: import_react81.default.createElement(InboxDialog, {
-            config,
-            onClose: () => context.ui.removeComponent(),
-            onReloadSkills: async () => {
-              await config.reloadSkills();
-              context.ui.reloadCommands();
-            },
-            onReloadMemory: async () => {
-              await refreshMemory(config);
-            }
-          })
-        };
-      }
+    } catch (error) {
+      context.ui.addItem(
+        {
+          type: "error" /* ERROR */,
+          // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+          text: `Error reloading memory: ${error.message}`
+        },
+        Date.now()
+      );
     }
-  ]
+  }
+};
+var listSubCommand = {
+  name: "list",
+  description: "Lists the paths of the GEMINI.md files in use",
+  kind: "built-in" /* BUILT_IN */,
+  autoExecute: true,
+  action: async (context) => {
+    const config = context.services.agentContext?.config;
+    if (!config) return;
+    const result = listMemoryFiles(config);
+    context.ui.addItem(
+      {
+        type: "info" /* INFO */,
+        text: result.content
+      },
+      Date.now()
+    );
+  }
+};
+var inboxSubCommand = {
+  name: "inbox",
+  description: "Review skills extracted from past sessions and move them to global or project skills",
+  kind: "built-in" /* BUILT_IN */,
+  autoExecute: true,
+  action: (context) => {
+    const config = context.services.agentContext?.config;
+    if (!config) {
+      return {
+        type: "message",
+        messageType: "error",
+        content: "Config not loaded."
+      };
+    }
+    if (!config.isAutoMemoryEnabled()) {
+      return {
+        type: "message",
+        messageType: "info",
+        content: "The memory inbox requires Auto Memory. Enable it with: experimental.autoMemory = true in settings."
+      };
+    }
+    return {
+      type: "custom_dialog",
+      component: import_react81.default.createElement(InboxDialog, {
+        config,
+        onClose: () => context.ui.removeComponent(),
+        onReloadSkills: async () => {
+          await config.reloadSkills();
+          context.ui.reloadCommands();
+        },
+        onReloadMemory: async () => {
+          await refreshMemory(config);
+        }
+      })
+    };
+  }
+};
+var memoryCommand = (config) => {
+  const isMemoryV2 = config?.isMemoryV2Enabled() ?? false;
+  const subCommands = [
+    showSubCommand,
+    ...isMemoryV2 ? [] : [addSubCommand],
+    reloadSubCommand,
+    listSubCommand,
+    inboxSubCommand
+  ];
+  return {
+    name: "memory",
+    description: "Commands for interacting with memory",
+    kind: "built-in" /* BUILT_IN */,
+    autoExecute: false,
+    subCommands
+  };
 };
 
 // packages/cli/src/ui/commands/modelCommand.ts
@@ -77979,7 +78070,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;
@@ -78813,7 +78904,7 @@ Return a JSON object with:
         },
         abortSignal: abortControllerRef.current.signal,
         promptId: "triage-issues",
-        role: LlmRole.UTILITY_TOOL
+        role: "utility_tool" /* UTILITY_TOOL */
       });
       return response;
     },
@@ -79286,8 +79377,8 @@ var oncallCommand = {
 
 // packages/cli/src/ui/commands/permissionsCommand.ts
 import * as process34 from "node:process";
-import * as path32 from "node:path";
-import * as fs34 from "node:fs";
+import * as path33 from "node:path";
+import * as fs35 from "node:fs";
 var permissionsCommand = {
   name: "permissions",
   description: "Manage folder trust settings and other permissions",
@@ -79305,10 +79396,10 @@ var permissionsCommand = {
         if (!dirPath) {
           targetDirectory = process34.cwd();
         } else {
-          targetDirectory = path32.resolve(expandHomeDir(dirPath));
+          targetDirectory = path33.resolve(expandHomeDir(dirPath));
         }
         try {
-          if (!fs34.statSync(targetDirectory).isDirectory()) {
+          if (!fs35.statSync(targetDirectory).isDirectory()) {
             return {
               type: "message",
               messageType: "error",
@@ -79352,7 +79443,7 @@ var permissionsCommand = {
 };
 
 // packages/cli/src/ui/commands/planCommand.ts
-import * as path33 from "node:path";
+import * as path34 from "node:path";
 async function copyAction(context) {
   const config = context.services.agentContext?.config;
   if (!config) {
@@ -79369,7 +79460,7 @@ async function copyAction(context) {
     await copyToClipboard(content);
     coreEvents.emitFeedback(
       "info",
-      `Plan copied to clipboard (${path33.basename(planPath)}).`
+      `Plan copied to clipboard (${path34.basename(planPath)}).`
     );
   } catch (error) {
     coreEvents.emitFeedback("error", `Failed to copy plan: ${error}`, error);
@@ -79387,8 +79478,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) {
@@ -79407,7 +79498,7 @@ var planCommand = {
         config.storage.getPlansDir(),
         config.getFileSystemService()
       );
-      const fileName = path33.basename(approvedPlanPath);
+      const fileName = path34.basename(approvedPlanPath);
       coreEvents.emitFeedback("info", `Approved Plan: ${fileName}`);
       context.ui.addItem({
         type: "gemini" /* GEMINI */,
@@ -79447,10 +79538,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;
 };
@@ -79592,8 +79683,8 @@ var quitCommand = {
 };
 
 // packages/cli/src/ui/commands/restoreCommand.ts
-import * as fs35 from "node:fs/promises";
-import path34 from "node:path";
+import * as fs36 from "node:fs/promises";
+import path35 from "node:path";
 var HistoryItemSchema = external_exports.object({
   type: external_exports.string(),
   id: external_exports.number()
@@ -79612,8 +79703,8 @@ async function restoreAction(context, args) {
     };
   }
   try {
-    await fs35.mkdir(checkpointDir, { recursive: true });
-    const files = await fs35.readdir(checkpointDir);
+    await fs36.mkdir(checkpointDir, { recursive: true });
+    const files = await fs36.readdir(checkpointDir);
     const jsonFiles = files.filter((file) => file.endsWith(".json"));
     if (!args) {
       if (jsonFiles.length === 0) {
@@ -79640,8 +79731,8 @@ ${fileList}`
         content: `File not found: ${selectedFile}`
       };
     }
-    const filePath = path34.join(checkpointDir, selectedFile);
-    const data = await fs35.readFile(filePath, "utf-8");
+    const filePath = path35.join(checkpointDir, selectedFile);
+    const data = await fs36.readFile(filePath, "utf-8");
     const parseResult = ToolCallDataSchema.safeParse(JSON.parse(data));
     if (!parseResult.success) {
       return {
@@ -79689,7 +79780,7 @@ async function completion(context, _partialArg) {
     return [];
   }
   try {
-    const files = await fs35.readdir(checkpointDir);
+    const files = await fs36.readdir(checkpointDir);
     const jsonFiles = files.filter((file) => file.endsWith(".json"));
     return getTruncatedCheckpointNames(jsonFiles);
   } catch {
@@ -79865,7 +79956,7 @@ async function listTools(context, showDescriptions) {
   };
   context.ui.addItem(toolsListItem);
 }
-var listSubCommand = {
+var listSubCommand2 = {
   name: "list",
   description: "List available Gemini CLI tools.",
   kind: "built-in" /* BUILT_IN */,
@@ -79885,7 +79976,7 @@ var toolsCommand = {
   description: "List available Gemini CLI tools. Use /tools desc to include descriptions.",
   kind: "built-in" /* BUILT_IN */,
   autoExecute: false,
-  subCommands: [listSubCommand, descSubCommand],
+  subCommands: [listSubCommand2, descSubCommand],
   action: async (context, args) => {
     const subCommand = args?.trim();
     const useShowDescriptions = subCommand === "desc" || subCommand === "descriptions";
@@ -79942,9 +80033,9 @@ function disableSkill(settings, skillName, scope) {
 
 // packages/cli/src/utils/skillUtils.ts
 var import_extract_zip2 = __toESM(require_extract_zip(), 1);
-import * as fs36 from "node:fs/promises";
-import * as path35 from "node:path";
-import * as os7 from "node:os";
+import * as fs37 from "node:fs/promises";
+import * as path36 from "node:path";
+import * as os8 from "node:os";
 function renderSkillActionFeedback(result, formatScope) {
   const { skillName, action, status, error } = result;
   if (status === "error") {
@@ -79983,8 +80074,8 @@ async function installSkill(source2, scope, subpath, onLog, requestConsent = ()
   const isSkillFile = source2.toLowerCase().endsWith(".skill");
   try {
     if (isGitUrl) {
-      tempDirToClean = await fs36.mkdtemp(
-        path35.join(os7.tmpdir(), "gemini-skill-")
+      tempDirToClean = await fs37.mkdtemp(
+        path36.join(os8.tmpdir(), "gemini-skill-")
       );
       sourcePath = tempDirToClean;
       onLog(`Cloning skill from ${source2}...`);
@@ -79996,18 +80087,18 @@ async function installSkill(source2, scope, subpath, onLog, requestConsent = ()
         tempDirToClean
       );
     } else if (isSkillFile) {
-      tempDirToClean = await fs36.mkdtemp(
-        path35.join(os7.tmpdir(), "gemini-skill-")
+      tempDirToClean = await fs37.mkdtemp(
+        path36.join(os8.tmpdir(), "gemini-skill-")
       );
       sourcePath = tempDirToClean;
       onLog(`Extracting skill from ${source2}...`);
-      await (0, import_extract_zip2.default)(path35.resolve(source2), { dir: tempDirToClean });
+      await (0, import_extract_zip2.default)(path36.resolve(source2), { dir: tempDirToClean });
     }
     if (subpath) {
-      sourcePath = path35.join(sourcePath, subpath);
+      sourcePath = path36.join(sourcePath, subpath);
     }
-    sourcePath = path35.resolve(sourcePath);
-    if (tempDirToClean && !sourcePath.startsWith(path35.resolve(tempDirToClean))) {
+    sourcePath = path36.resolve(sourcePath);
+    if (tempDirToClean && !sourcePath.startsWith(path36.resolve(tempDirToClean))) {
       throw new Error("Invalid path: Directory traversal not allowed.");
     }
     onLog(`Searching for skills in ${sourcePath}...`);
@@ -80023,29 +80114,29 @@ async function installSkill(source2, scope, subpath, onLog, requestConsent = ()
     if (!await requestConsent(skills, targetDir)) {
       throw new Error("Skill installation cancelled by user.");
     }
-    await fs36.mkdir(targetDir, { recursive: true });
+    await fs37.mkdir(targetDir, { recursive: true });
     const installedSkills = [];
     for (const skill of skills) {
       const skillName = skill.name;
-      const skillDir = path35.dirname(skill.location);
-      const destPath = path35.join(targetDir, skillName);
-      const exists = await fs36.stat(destPath).catch(() => null);
+      const skillDir = path36.dirname(skill.location);
+      const destPath = path36.join(targetDir, skillName);
+      const exists = await fs37.stat(destPath).catch(() => null);
       if (exists) {
         onLog(`Skill "${skillName}" already exists. Overwriting...`);
-        await fs36.rm(destPath, { recursive: true, force: true });
+        await fs37.rm(destPath, { recursive: true, force: true });
       }
-      await fs36.cp(skillDir, destPath, { recursive: true });
+      await fs37.cp(skillDir, destPath, { recursive: true });
       installedSkills.push({ name: skillName, location: destPath });
     }
     return installedSkills;
   } finally {
     if (tempDirToClean) {
-      await fs36.rm(tempDirToClean, { recursive: true, force: true });
+      await fs37.rm(tempDirToClean, { recursive: true, force: true });
     }
   }
 }
 async function linkSkill(source2, scope, onLog, requestConsent = () => Promise.resolve(true)) {
-  const sourcePath = path35.resolve(source2);
+  const sourcePath = path36.resolve(source2);
   onLog(`Searching for skills in ${sourcePath}...`);
   const skills = await loadSkillsFromDir(sourcePath);
   if (skills.length === 0) {
@@ -80070,20 +80161,20 @@ async function linkSkill(source2, scope, onLog, requestConsent = () => Promise.r
   if (!await requestConsent(skills, targetDir)) {
     throw new Error("Skill linking cancelled by user.");
   }
-  await fs36.mkdir(targetDir, { recursive: true });
+  await fs37.mkdir(targetDir, { recursive: true });
   const linkedSkills = [];
   for (const skill of skills) {
     const skillName = skill.name;
-    const skillSourceDir = path35.dirname(skill.location);
-    const destPath = path35.join(targetDir, skillName);
-    const exists = await fs36.lstat(destPath).catch(() => null);
+    const skillSourceDir = path36.dirname(skill.location);
+    const destPath = path36.join(targetDir, skillName);
+    const exists = await fs37.lstat(destPath).catch(() => null);
     if (exists) {
       onLog(
         `Skill "${skillName}" already exists at destination. Overwriting...`
       );
-      await fs36.rm(destPath, { recursive: true, force: true });
+      await fs37.rm(destPath, { recursive: true, force: true });
     }
-    await fs36.symlink(
+    await fs37.symlink(
       skillSourceDir,
       destPath,
       process.platform === "win32" ? "junction" : "dir"
@@ -80099,19 +80190,19 @@ async function uninstallSkill(name, scope) {
   const discoveredSkills = await loadSkillsFromDir(targetDir);
   const skillToUninstall = discoveredSkills.find((s3) => s3.name === name);
   if (!skillToUninstall) {
-    const skillPath = path35.resolve(targetDir, name);
-    if (!skillPath.startsWith(path35.resolve(targetDir))) {
+    const skillPath = path36.resolve(targetDir, name);
+    if (!skillPath.startsWith(path36.resolve(targetDir))) {
       return null;
     }
-    const exists = await fs36.lstat(skillPath).catch(() => null);
+    const exists = await fs37.lstat(skillPath).catch(() => null);
     if (!exists) {
       return null;
     }
-    await fs36.rm(skillPath, { recursive: true, force: true });
+    await fs37.rm(skillPath, { recursive: true, force: true });
     return { location: skillPath };
   }
-  const skillDir = path35.dirname(skillToUninstall.location);
-  await fs36.rm(skillDir, { recursive: true, force: true });
+  const skillDir = path36.dirname(skillToUninstall.location);
+  await fs37.rm(skillDir, { recursive: true, force: true });
   return { location: skillDir };
 }
 
@@ -80241,7 +80332,7 @@ async function disableAction4(context, args) {
   const result = disableSkill(context.services.settings, skillName, scope);
   let feedback = renderSkillActionFeedback(
     result,
-    (label, path37) => `${label} (${path37})`
+    (label, path38) => `${label} (${path38})`
   );
   if (result.status === "success" || result.status === "no-op") {
     feedback += ' You can run "/skills reload" to refresh your current instance.';
@@ -80277,7 +80368,7 @@ async function enableAction4(context, args) {
   const result = enableSkill(context.services.settings, skillName);
   let feedback = renderSkillActionFeedback(
     result,
-    (label, path37) => `${label} (${path37})`
+    (label, path38) => `${label} (${path38})`
   );
   if (result.status === "success" || result.status === "no-op") {
     feedback += ' You can run "/skills reload" to refresh your current instance.';
@@ -80315,7 +80406,7 @@ async function reloadAction2(context) {
       const minVisibleDuration = 500;
       if (elapsed < minVisibleDuration) {
         await new Promise(
-          (resolve8) => setTimeout(resolve8, minVisibleDuration - elapsed)
+          (resolve9) => setTimeout(resolve9, minVisibleDuration - elapsed)
         );
       }
       context.ui.setPendingItem(null);
@@ -80468,8 +80559,8 @@ var vimCommand = {
 
 // packages/cli/src/ui/commands/setupGithubCommand.ts
 var import_undici2 = __toESM(require_undici(), 1);
-import path36 from "node:path";
-import * as fs37 from "node:fs";
+import path37 from "node:path";
+import * as fs38 from "node:fs";
 import { Writable } from "node:stream";
 
 // packages/cli/src/utils/gitUtils.ts
@@ -80596,25 +80687,25 @@ function getOpenUrlsCommands(readmeUrl) {
 }
 async function updateGitignore(gitRepoRoot) {
   const gitignoreEntries = [".gemini/", "gha-creds-*.json"];
-  const gitignorePath = path36.join(gitRepoRoot, ".gitignore");
+  const gitignorePath = path37.join(gitRepoRoot, ".gitignore");
   try {
     let existingContent = "";
     let fileExists2 = true;
     try {
-      existingContent = await fs37.promises.readFile(gitignorePath, "utf8");
+      existingContent = await fs38.promises.readFile(gitignorePath, "utf8");
     } catch {
       fileExists2 = false;
     }
     if (!fileExists2) {
       const contentToWrite = gitignoreEntries.join("\n") + "\n";
-      await fs37.promises.writeFile(gitignorePath, contentToWrite);
+      await fs38.promises.writeFile(gitignorePath, contentToWrite);
     } else {
       const missingEntries = gitignoreEntries.filter(
         (entry) => !existingContent.split(/\r?\n/).some((line) => line.split("#")[0].trim() === entry)
       );
       if (missingEntries.length > 0) {
         const contentToAdd = "\n" + missingEntries.join("\n") + "\n";
-        await fs37.promises.appendFile(gitignorePath, contentToAdd);
+        await fs38.promises.appendFile(gitignorePath, contentToAdd);
       }
     }
   } catch (error) {
@@ -80652,11 +80743,11 @@ async function downloadFiles({
             `Empty body while downloading ${endpoint}: ${response.status} - ${response.statusText}`
           );
         }
-        const destination = path36.resolve(
+        const destination = path37.resolve(
           targetDir,
-          path36.basename(fileBasename)
+          path37.basename(fileBasename)
         );
-        const fileStream = fs37.createWriteStream(destination, {
+        const fileStream = fs38.createWriteStream(destination, {
           mode: 420,
           // -rw-r--r--, user(rw), group(r), other(r)
           flags: "w",
@@ -80673,7 +80764,7 @@ async function downloadFiles({
 }
 async function createDirectory(dirPath) {
   try {
-    await fs37.promises.mkdir(dirPath, { recursive: true });
+    await fs38.promises.mkdir(dirPath, { recursive: true });
   } catch (error) {
     debugLogger.debug(`Failed to create ${dirPath} directory:`, error);
     throw new Error(
@@ -80727,9 +80818,9 @@ var setupGithubCommand = {
     const proxy = context?.services?.agentContext?.config.getProxy();
     const releaseTag = await getLatestGitHubRelease(proxy);
     const readmeUrl = `https://github.com/google-github-actions/run-gemini-cli/blob/${releaseTag}/README.md#quick-start`;
-    const workflowsDir = path36.join(gitRepoRoot, ".github", "workflows");
+    const workflowsDir = path37.join(gitRepoRoot, ".github", "workflows");
     await createDirectory(workflowsDir);
-    const commandsDir = path36.join(gitRepoRoot, ".github", "commands");
+    const commandsDir = path37.join(gitRepoRoot, ".github", "commands");
     await createDirectory(commandsDir);
     await downloadSetupFiles({
       configs: [
@@ -80802,7 +80893,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",
@@ -80949,6 +81040,7 @@ var BuiltinCommandLoader = class {
       copyCommand,
       corgiCommand,
       docsCommand,
+      exportSessionCommand,
       directoryCommand,
       editorCommand,
       ...this.config?.getExtensionsEnabled() === false ? [
@@ -80990,7 +81082,7 @@ var BuiltinCommandLoader = class {
           })
         }
       ] : [mcpCommand],
-      memoryCommand,
+      memoryCommand(this.config),
       modelCommand,
       ...this.config?.getFolderTrust() ? [permissionsCommand] : [],
       ...this.config?.isPlanEnabled() ? [planCommand] : [],
@@ -81030,7 +81122,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);