@google/gemini-cli 0.41.0-preview.1 → 0.42.0-nightly.20260501.gcaa046641

package/bundle/{chunk-36LZQV4W.js → chunk-2HOG45IA.js}

@@ -6,7 +6,7 @@ import {
 import {
   exitCli,
   require_source
-} from "./chunk-QRSHDIRX.js";
+} from "./chunk-USFRINC4.js";
 import {
   DEFAULT_BACKGROUND_OPACITY,
   DEFAULT_BORDER_OPACITY,
@@ -28,7 +28,6 @@ import {
   darkTheme,
   detectPlatform,
   eastAsianWidth,
-  emptyIcon,
   escapeAnsiCtrlCodes,
   getBinaryPath,
   getCachedStringWidth,
@@ -50,7 +49,6 @@ import {
   loadTrustedFolders,
   readServerPid,
   require_main,
-  require_react,
   require_src as require_src2,
   resolveColor,
   resolveEnvVarsInObject,
@@ -59,10 +57,14 @@ import {
   stripUnsafeCharacters,
   toCodePoints,
   validateCustomTheme
-} from "./chunk-VWYB6GSK.js";
+} from "./chunk-DDX3KSOF.js";
+import {
+  isDevelopment
+} from "./chunk-VJOUKBFO.js";
 import {
-  runExitCleanup
-} from "./chunk-VJ6K3S57.js";
+  emptyIcon,
+  require_react
+} from "./chunk-CTSXRP2T.js";
 import {
   AsyncFzf,
   AuthType,
@@ -148,7 +150,6 @@ import {
   import_lru_cache,
   import_lru_map_with_delete,
   import_multi_map,
-  isGitRepository,
   isGuiEditor,
   isNightly,
   isPrivateIp,
@@ -208,7 +209,7 @@ import {
   stripAnsi,
   tokenLimit,
   uiTelemetryService
-} from "./chunk-QY23ZEK3.js";
+} from "./chunk-UCTXAZT6.js";
 import {
   ApprovalMode,
   CoreEvent,
@@ -235,7 +236,7 @@ import {
   shortenPath,
   tildeifyPath,
   unescapePath
-} from "./chunk-SAJ72M2G.js";
+} from "./chunk-FABHOVMY.js";
 import {
   require_src
 } from "./chunk-RJTRUG2J.js";
@@ -286,11 +287,11 @@ var require_signals = __commonJS({
 // node_modules/ink/node_modules/signal-exit/index.js
 var require_signal_exit = __commonJS({
   "node_modules/ink/node_modules/signal-exit/index.js"(exports, module) {
-    var process35 = global.process;
-    var processOk = function(process36) {
-      return process36 && typeof process36 === "object" && typeof process36.removeListener === "function" && typeof process36.emit === "function" && typeof process36.reallyExit === "function" && typeof process36.listeners === "function" && typeof process36.kill === "function" && typeof process36.pid === "number" && typeof process36.on === "function";
+    var process34 = global.process;
+    var processOk = function(process35) {
+      return process35 && typeof process35 === "object" && typeof process35.removeListener === "function" && typeof process35.emit === "function" && typeof process35.reallyExit === "function" && typeof process35.listeners === "function" && typeof process35.kill === "function" && typeof process35.pid === "number" && typeof process35.on === "function";
     };
-    if (!processOk(process35)) {
+    if (!processOk(process34)) {
       module.exports = function() {
         return function() {
         };
@@ -298,15 +299,15 @@ var require_signal_exit = __commonJS({
     } else {
       assert = __require("assert");
       signals = require_signals();
-      isWin = /^win/i.test(process35.platform);
+      isWin = /^win/i.test(process34.platform);
       EE = __require("events");
       if (typeof EE !== "function") {
         EE = EE.EventEmitter;
       }
-      if (process35.__signal_exit_emitter__) {
-        emitter = process35.__signal_exit_emitter__;
+      if (process34.__signal_exit_emitter__) {
+        emitter = process34.__signal_exit_emitter__;
       } else {
-        emitter = process35.__signal_exit_emitter__ = new EE();
+        emitter = process34.__signal_exit_emitter__ = new EE();
         emitter.count = 0;
         emitter.emitted = {};
       }
@@ -343,12 +344,12 @@ var require_signal_exit = __commonJS({
         loaded = false;
         signals.forEach(function(sig) {
           try {
-            process35.removeListener(sig, sigListeners[sig]);
+            process34.removeListener(sig, sigListeners[sig]);
           } catch (er2) {
           }
         });
-        process35.emit = originalProcessEmit;
-        process35.reallyExit = originalProcessReallyExit;
+        process34.emit = originalProcessEmit;
+        process34.reallyExit = originalProcessReallyExit;
         emitter.count -= 1;
       };
       module.exports.unload = unload;
@@ -365,7 +366,7 @@ var require_signal_exit = __commonJS({
           if (!processOk(global.process)) {
             return;
           }
-          var listeners = process35.listeners(sig);
+          var listeners = process34.listeners(sig);
           if (listeners.length === emitter.count) {
             unload();
             emit("exit", null, sig);
@@ -373,7 +374,7 @@ var require_signal_exit = __commonJS({
             if (isWin && sig === "SIGHUP") {
               sig = "SIGINT";
             }
-            process35.kill(process35.pid, sig);
+            process34.kill(process34.pid, sig);
           }
         };
       });
@@ -389,36 +390,36 @@ var require_signal_exit = __commonJS({
         emitter.count += 1;
         signals = signals.filter(function(sig) {
           try {
-            process35.on(sig, sigListeners[sig]);
+            process34.on(sig, sigListeners[sig]);
             return true;
           } catch (er2) {
             return false;
           }
         });
-        process35.emit = processEmit;
-        process35.reallyExit = processReallyExit;
+        process34.emit = processEmit;
+        process34.reallyExit = processReallyExit;
       };
       module.exports.load = load;
-      originalProcessReallyExit = process35.reallyExit;
+      originalProcessReallyExit = process34.reallyExit;
       processReallyExit = function processReallyExit2(code) {
         if (!processOk(global.process)) {
           return;
         }
-        process35.exitCode = code || /* istanbul ignore next */
+        process34.exitCode = code || /* istanbul ignore next */
         0;
-        emit("exit", process35.exitCode, null);
-        emit("afterexit", process35.exitCode, null);
-        originalProcessReallyExit.call(process35, process35.exitCode);
+        emit("exit", process34.exitCode, null);
+        emit("afterexit", process34.exitCode, null);
+        originalProcessReallyExit.call(process34, process34.exitCode);
       };
-      originalProcessEmit = process35.emit;
+      originalProcessEmit = process34.emit;
       processEmit = function processEmit2(ev, arg) {
         if (ev === "exit" && processOk(global.process)) {
           if (arg !== void 0) {
-            process35.exitCode = arg;
+            process34.exitCode = arg;
           }
           var ret = originalProcessEmit.apply(this, arguments);
-          emit("exit", process35.exitCode, null);
-          emit("afterexit", process35.exitCode, null);
+          emit("exit", process34.exitCode, null);
+          emit("afterexit", process34.exitCode, null);
           return ret;
         } else {
           return originalProcessEmit.apply(this, arguments);
@@ -8799,11 +8800,11 @@ var require_signals2 = __commonJS({
 // node_modules/restore-cursor/node_modules/signal-exit/index.js
 var require_signal_exit2 = __commonJS({
   "node_modules/restore-cursor/node_modules/signal-exit/index.js"(exports, module) {
-    var process35 = global.process;
-    var processOk = function(process36) {
-      return process36 && typeof process36 === "object" && typeof process36.removeListener === "function" && typeof process36.emit === "function" && typeof process36.reallyExit === "function" && typeof process36.listeners === "function" && typeof process36.kill === "function" && typeof process36.pid === "number" && typeof process36.on === "function";
+    var process34 = global.process;
+    var processOk = function(process35) {
+      return process35 && typeof process35 === "object" && typeof process35.removeListener === "function" && typeof process35.emit === "function" && typeof process35.reallyExit === "function" && typeof process35.listeners === "function" && typeof process35.kill === "function" && typeof process35.pid === "number" && typeof process35.on === "function";
     };
-    if (!processOk(process35)) {
+    if (!processOk(process34)) {
       module.exports = function() {
         return function() {
         };
@@ -8811,15 +8812,15 @@ var require_signal_exit2 = __commonJS({
     } else {
       assert = __require("assert");
       signals = require_signals2();
-      isWin = /^win/i.test(process35.platform);
+      isWin = /^win/i.test(process34.platform);
       EE = __require("events");
       if (typeof EE !== "function") {
         EE = EE.EventEmitter;
       }
-      if (process35.__signal_exit_emitter__) {
-        emitter = process35.__signal_exit_emitter__;
+      if (process34.__signal_exit_emitter__) {
+        emitter = process34.__signal_exit_emitter__;
       } else {
-        emitter = process35.__signal_exit_emitter__ = new EE();
+        emitter = process34.__signal_exit_emitter__ = new EE();
         emitter.count = 0;
         emitter.emitted = {};
       }
@@ -8856,12 +8857,12 @@ var require_signal_exit2 = __commonJS({
         loaded = false;
         signals.forEach(function(sig) {
           try {
-            process35.removeListener(sig, sigListeners[sig]);
+            process34.removeListener(sig, sigListeners[sig]);
           } catch (er2) {
           }
         });
-        process35.emit = originalProcessEmit;
-        process35.reallyExit = originalProcessReallyExit;
+        process34.emit = originalProcessEmit;
+        process34.reallyExit = originalProcessReallyExit;
         emitter.count -= 1;
       };
       module.exports.unload = unload;
@@ -8878,7 +8879,7 @@ var require_signal_exit2 = __commonJS({
           if (!processOk(global.process)) {
             return;
           }
-          var listeners = process35.listeners(sig);
+          var listeners = process34.listeners(sig);
           if (listeners.length === emitter.count) {
             unload();
             emit("exit", null, sig);
@@ -8886,7 +8887,7 @@ var require_signal_exit2 = __commonJS({
             if (isWin && sig === "SIGHUP") {
               sig = "SIGINT";
             }
-            process35.kill(process35.pid, sig);
+            process34.kill(process34.pid, sig);
           }
         };
       });
@@ -8902,36 +8903,36 @@ var require_signal_exit2 = __commonJS({
         emitter.count += 1;
         signals = signals.filter(function(sig) {
           try {
-            process35.on(sig, sigListeners[sig]);
+            process34.on(sig, sigListeners[sig]);
             return true;
           } catch (er2) {
             return false;
           }
         });
-        process35.emit = processEmit;
-        process35.reallyExit = processReallyExit;
+        process34.emit = processEmit;
+        process34.reallyExit = processReallyExit;
       };
       module.exports.load = load;
-      originalProcessReallyExit = process35.reallyExit;
+      originalProcessReallyExit = process34.reallyExit;
       processReallyExit = function processReallyExit2(code) {
         if (!processOk(global.process)) {
           return;
         }
-        process35.exitCode = code || /* istanbul ignore next */
+        process34.exitCode = code || /* istanbul ignore next */
         0;
-        emit("exit", process35.exitCode, null);
-        emit("afterexit", process35.exitCode, null);
-        originalProcessReallyExit.call(process35, process35.exitCode);
+        emit("exit", process34.exitCode, null);
+        emit("afterexit", process34.exitCode, null);
+        originalProcessReallyExit.call(process34, process34.exitCode);
       };
-      originalProcessEmit = process35.emit;
+      originalProcessEmit = process34.emit;
       processEmit = function processEmit2(ev, arg) {
         if (ev === "exit" && processOk(global.process)) {
           if (arg !== void 0) {
-            process35.exitCode = arg;
+            process34.exitCode = arg;
           }
           var ret = originalProcessEmit.apply(this, arguments);
-          emit("exit", process35.exitCode, null);
-          emit("afterexit", process35.exitCode, null);
+          emit("exit", process34.exitCode, null);
+          emit("afterexit", process34.exitCode, null);
           return ret;
         } else {
           return originalProcessEmit.apply(this, arguments);
@@ -9695,12 +9696,12 @@ var require_prompt = __commonJS({
     var readline = __require("readline");
     var _require = require_util();
     var action = _require.action;
-    var EventEmitter4 = __require("events");
+    var EventEmitter3 = __require("events");
     var _require2 = require_src3();
     var beep2 = _require2.beep;
     var cursor = _require2.cursor;
     var color = require_kleur();
-    var Prompt = class extends EventEmitter4 {
+    var Prompt = class extends EventEmitter3 {
       constructor(opts = {}) {
         super();
         this.firstRender = true;
@@ -12160,10 +12161,10 @@ var require_prompt2 = __commonJS({
     "use strict";
     var readline = __require("readline");
     var { action } = require_util2();
-    var EventEmitter4 = __require("events");
+    var EventEmitter3 = __require("events");
     var { beep: beep2, cursor } = require_src3();
     var color = require_kleur();
-    var Prompt = class extends EventEmitter4 {
+    var Prompt = class extends EventEmitter3 {
       constructor(opts = {}) {
         super();
         this.firstRender = true;
@@ -14270,22 +14271,22 @@ var require_pend = __commonJS({
 // node_modules/fd-slicer/index.js
 var require_fd_slicer = __commonJS({
   "node_modules/fd-slicer/index.js"(exports) {
-    var fs39 = __require("fs");
+    var fs38 = __require("fs");
     var util2 = __require("util");
     var stream = __require("stream");
     var Readable = stream.Readable;
     var Writable2 = stream.Writable;
     var PassThrough2 = stream.PassThrough;
     var Pend = require_pend();
-    var EventEmitter4 = __require("events").EventEmitter;
+    var EventEmitter3 = __require("events").EventEmitter;
     exports.createFromBuffer = createFromBuffer;
     exports.createFromFd = createFromFd;
     exports.BufferSlicer = BufferSlicer;
     exports.FdSlicer = FdSlicer;
-    util2.inherits(FdSlicer, EventEmitter4);
+    util2.inherits(FdSlicer, EventEmitter3);
     function FdSlicer(fd, options) {
       options = options || {};
-      EventEmitter4.call(this);
+      EventEmitter3.call(this);
       this.fd = fd;
       this.pend = new Pend();
       this.pend.max = 1;
@@ -14295,7 +14296,7 @@ var require_fd_slicer = __commonJS({
     FdSlicer.prototype.read = function(buffer, offset, length, position, callback) {
       var self = this;
       self.pend.go(function(cb) {
-        fs39.read(self.fd, buffer, offset, length, position, function(err, bytesRead, buffer2) {
+        fs38.read(self.fd, buffer, offset, length, position, function(err, bytesRead, buffer2) {
           cb();
           callback(err, bytesRead, buffer2);
         });
@@ -14304,7 +14305,7 @@ var require_fd_slicer = __commonJS({
     FdSlicer.prototype.write = function(buffer, offset, length, position, callback) {
       var self = this;
       self.pend.go(function(cb) {
-        fs39.write(self.fd, buffer, offset, length, position, function(err, written, buffer2) {
+        fs38.write(self.fd, buffer, offset, length, position, function(err, written, buffer2) {
           cb();
           callback(err, written, buffer2);
         });
@@ -14325,7 +14326,7 @@ var require_fd_slicer = __commonJS({
       if (self.refCount > 0) return;
       if (self.refCount < 0) throw new Error("invalid unref");
       if (self.autoClose) {
-        fs39.close(self.fd, onCloseDone);
+        fs38.close(self.fd, onCloseDone);
       }
       function onCloseDone(err) {
         if (err) {
@@ -14362,7 +14363,7 @@ var require_fd_slicer = __commonJS({
       self.context.pend.go(function(cb) {
         if (self.destroyed) return cb();
         var buffer = new Buffer(toRead);
-        fs39.read(self.context.fd, buffer, 0, toRead, self.pos, function(err, bytesRead) {
+        fs38.read(self.context.fd, buffer, 0, toRead, self.pos, function(err, bytesRead) {
           if (err) {
             self.destroy(err);
           } else if (bytesRead === 0) {
@@ -14409,7 +14410,7 @@ var require_fd_slicer = __commonJS({
       }
       self.context.pend.go(function(cb) {
         if (self.destroyed) return cb();
-        fs39.write(self.context.fd, buffer, 0, buffer.length, self.pos, function(err2, bytes) {
+        fs38.write(self.context.fd, buffer, 0, buffer.length, self.pos, function(err2, bytes) {
           if (err2) {
             self.destroy();
             cb();
@@ -14429,9 +14430,9 @@ var require_fd_slicer = __commonJS({
       this.destroyed = true;
       this.context.unref();
     };
-    util2.inherits(BufferSlicer, EventEmitter4);
+    util2.inherits(BufferSlicer, EventEmitter3);
     function BufferSlicer(buffer, options) {
-      EventEmitter4.call(this);
+      EventEmitter3.call(this);
       options = options || {};
       this.refCount = 0;
       this.buffer = buffer;
@@ -14836,12 +14837,12 @@ var require_buffer_crc32 = __commonJS({
 // node_modules/yauzl/index.js
 var require_yauzl = __commonJS({
   "node_modules/yauzl/index.js"(exports) {
-    var fs39 = __require("fs");
+    var fs38 = __require("fs");
     var zlib = __require("zlib");
     var fd_slicer = require_fd_slicer();
     var crc32 = require_buffer_crc32();
     var util2 = __require("util");
-    var EventEmitter4 = __require("events").EventEmitter;
+    var EventEmitter3 = __require("events").EventEmitter;
     var Transform2 = __require("stream").Transform;
     var PassThrough2 = __require("stream").PassThrough;
     var Writable2 = __require("stream").Writable;
@@ -14854,7 +14855,7 @@ var require_yauzl = __commonJS({
     exports.ZipFile = ZipFile;
     exports.Entry = Entry;
     exports.RandomAccessReader = RandomAccessReader;
-    function open(path37, options, callback) {
+    function open(path36, options, callback) {
       if (typeof options === "function") {
         callback = options;
         options = null;
@@ -14866,10 +14867,10 @@ var require_yauzl = __commonJS({
       if (options.validateEntrySizes == null) options.validateEntrySizes = true;
       if (options.strictFileNames == null) options.strictFileNames = false;
       if (callback == null) callback = defaultCallback;
-      fs39.open(path37, "r", function(err, fd) {
+      fs38.open(path36, "r", function(err, fd) {
         if (err) return callback(err);
         fromFd(fd, options, function(err2, zipfile) {
-          if (err2) fs39.close(fd, defaultCallback);
+          if (err2) fs38.close(fd, defaultCallback);
           callback(err2, zipfile);
         });
       });
@@ -14886,7 +14887,7 @@ var require_yauzl = __commonJS({
       if (options.validateEntrySizes == null) options.validateEntrySizes = true;
       if (options.strictFileNames == null) options.strictFileNames = false;
       if (callback == null) callback = defaultCallback;
-      fs39.fstat(fd, function(err, stats) {
+      fs38.fstat(fd, function(err, stats) {
         if (err) return callback(err);
         var reader = fd_slicer.createFromFd(fd, { autoClose: true });
         fromRandomAccessReader(reader, stats.size, options, callback);
@@ -14973,10 +14974,10 @@ var require_yauzl = __commonJS({
         callback(new Error("end of central directory record signature not found"));
       });
     }
-    util2.inherits(ZipFile, EventEmitter4);
+    util2.inherits(ZipFile, EventEmitter3);
     function ZipFile(reader, centralDirectoryOffset, fileSize, entryCount, comment, autoClose, lazyEntries, decodeStrings, validateEntrySizes, strictFileNames) {
       var self = this;
-      EventEmitter4.call(self);
+      EventEmitter3.call(self);
       self.reader = reader;
       self.reader.on("error", function(err) {
         emitError(self, err);
@@ -15337,9 +15338,9 @@ var require_yauzl = __commonJS({
       }
       cb();
     };
-    util2.inherits(RandomAccessReader, EventEmitter4);
+    util2.inherits(RandomAccessReader, EventEmitter3);
     function RandomAccessReader() {
-      EventEmitter4.call(this);
+      EventEmitter3.call(this);
       this.refCount = 0;
     }
     RandomAccessReader.prototype.ref = function() {
@@ -15466,9 +15467,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: createWriteStream4, promises: fs39 } = __require("fs");
+    var { createWriteStream: createWriteStream4, promises: fs38 } = __require("fs");
     var getStream = require_get_stream();
-    var path37 = __require("path");
+    var path36 = __require("path");
     var { promisify: promisify5 } = __require("util");
     var stream = __require("stream");
     var yauzl = require_yauzl();
@@ -15505,12 +15506,12 @@ var require_extract_zip = __commonJS({
               this.zipfile.readEntry();
               return;
             }
-            const destDir = path37.dirname(path37.join(this.opts.dir, entry.fileName));
+            const destDir = path36.dirname(path36.join(this.opts.dir, entry.fileName));
             try {
-              await fs39.mkdir(destDir, { recursive: true });
-              const canonicalDestDir = await fs39.realpath(destDir);
-              const relativeDestDir = path37.relative(this.opts.dir, canonicalDestDir);
-              if (relativeDestDir.split(path37.sep).includes("..")) {
+              await fs38.mkdir(destDir, { recursive: true });
+              const canonicalDestDir = await fs38.realpath(destDir);
+              const relativeDestDir = path36.relative(this.opts.dir, canonicalDestDir);
+              if (relativeDestDir.split(path36.sep).includes("..")) {
                 throw new Error(`Out of bound path "${canonicalDestDir}" found while processing file ${entry.fileName}`);
               }
               await this.extractEntry(entry);
@@ -15532,7 +15533,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 = path36.join(this.opts.dir, entry.fileName);
         const mode = entry.externalFileAttributes >> 16 & 65535;
         const IFMT = 61440;
         const IFDIR = 16384;
@@ -15546,20 +15547,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 : path36.dirname(dest);
         const mkdirOptions = { recursive: true };
         if (isDir) {
           mkdirOptions.mode = procMode;
         }
         debug("mkdir", { dir: destDir, ...mkdirOptions });
-        await fs39.mkdir(destDir, mkdirOptions);
+        await fs38.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 fs39.symlink(link2, dest);
+          await fs38.symlink(link2, dest);
         } else {
           await pipeline(readStream, createWriteStream4(dest, { mode: procMode }));
         }
@@ -15588,11 +15589,11 @@ var require_extract_zip = __commonJS({
     };
     module.exports = async function(zipPath, opts) {
       debug("creating target directory", opts.dir);
-      if (!path37.isAbsolute(opts.dir)) {
+      if (!path36.isAbsolute(opts.dir)) {
         throw new Error("Target directory is expected to be absolute");
       }
-      await fs39.mkdir(opts.dir, { recursive: true });
-      opts.dir = await fs39.realpath(opts.dir);
+      await fs38.mkdir(opts.dir, { recursive: true });
+      opts.dir = await fs38.realpath(opts.dir);
       return new Extractor(zipPath, opts).extract();
     };
   }
@@ -17049,7 +17050,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 path36 = __require("path");
     var pathKey = require_path_key();
     var npmRunPath = (options) => {
       options = {
@@ -17059,16 +17060,16 @@ var require_npm_run_path = __commonJS({
         ...options
       };
       let previous;
-      let cwdPath = path37.resolve(options.cwd);
+      let cwdPath = path36.resolve(options.cwd);
       const result = [];
       while (previous !== cwdPath) {
-        result.push(path37.join(cwdPath, "node_modules/.bin"));
+        result.push(path36.join(cwdPath, "node_modules/.bin"));
         previous = cwdPath;
-        cwdPath = path37.resolve(cwdPath, "..");
+        cwdPath = path36.resolve(cwdPath, "..");
       }
-      const execPathDir = path37.resolve(options.cwd, options.execPath, "..");
+      const execPathDir = path36.resolve(options.cwd, options.execPath, "..");
       result.push(execPathDir);
-      return result.concat(options.path).join(path37.delimiter);
+      return result.concat(options.path).join(path36.delimiter);
     };
     module.exports = npmRunPath;
     module.exports.default = npmRunPath;
@@ -17078,9 +17079,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 path37 = pathKey({ env: env3 });
+      options.path = env3[path37];
+      env3[path37] = module.exports(options);
       return env3;
     };
   }
@@ -17643,11 +17644,11 @@ var require_signals4 = __commonJS({
 // node_modules/run-jxa/node_modules/signal-exit/index.js
 var require_signal_exit3 = __commonJS({
   "node_modules/run-jxa/node_modules/signal-exit/index.js"(exports, module) {
-    var process35 = global.process;
-    var processOk = function(process36) {
-      return process36 && typeof process36 === "object" && typeof process36.removeListener === "function" && typeof process36.emit === "function" && typeof process36.reallyExit === "function" && typeof process36.listeners === "function" && typeof process36.kill === "function" && typeof process36.pid === "number" && typeof process36.on === "function";
+    var process34 = global.process;
+    var processOk = function(process35) {
+      return process35 && typeof process35 === "object" && typeof process35.removeListener === "function" && typeof process35.emit === "function" && typeof process35.reallyExit === "function" && typeof process35.listeners === "function" && typeof process35.kill === "function" && typeof process35.pid === "number" && typeof process35.on === "function";
     };
-    if (!processOk(process35)) {
+    if (!processOk(process34)) {
       module.exports = function() {
         return function() {
         };
@@ -17655,15 +17656,15 @@ var require_signal_exit3 = __commonJS({
     } else {
       assert = __require("assert");
       signals = require_signals4();
-      isWin = /^win/i.test(process35.platform);
+      isWin = /^win/i.test(process34.platform);
       EE = __require("events");
       if (typeof EE !== "function") {
         EE = EE.EventEmitter;
       }
-      if (process35.__signal_exit_emitter__) {
-        emitter = process35.__signal_exit_emitter__;
+      if (process34.__signal_exit_emitter__) {
+        emitter = process34.__signal_exit_emitter__;
       } else {
-        emitter = process35.__signal_exit_emitter__ = new EE();
+        emitter = process34.__signal_exit_emitter__ = new EE();
         emitter.count = 0;
         emitter.emitted = {};
       }
@@ -17700,12 +17701,12 @@ var require_signal_exit3 = __commonJS({
         loaded = false;
         signals.forEach(function(sig) {
           try {
-            process35.removeListener(sig, sigListeners[sig]);
+            process34.removeListener(sig, sigListeners[sig]);
           } catch (er2) {
           }
         });
-        process35.emit = originalProcessEmit;
-        process35.reallyExit = originalProcessReallyExit;
+        process34.emit = originalProcessEmit;
+        process34.reallyExit = originalProcessReallyExit;
         emitter.count -= 1;
       };
       module.exports.unload = unload;
@@ -17722,7 +17723,7 @@ var require_signal_exit3 = __commonJS({
           if (!processOk(global.process)) {
             return;
           }
-          var listeners = process35.listeners(sig);
+          var listeners = process34.listeners(sig);
           if (listeners.length === emitter.count) {
             unload();
             emit("exit", null, sig);
@@ -17730,7 +17731,7 @@ var require_signal_exit3 = __commonJS({
             if (isWin && sig === "SIGHUP") {
               sig = "SIGINT";
             }
-            process35.kill(process35.pid, sig);
+            process34.kill(process34.pid, sig);
           }
         };
       });
@@ -17746,36 +17747,36 @@ var require_signal_exit3 = __commonJS({
         emitter.count += 1;
         signals = signals.filter(function(sig) {
           try {
-            process35.on(sig, sigListeners[sig]);
+            process34.on(sig, sigListeners[sig]);
             return true;
           } catch (er2) {
             return false;
           }
         });
-        process35.emit = processEmit;
-        process35.reallyExit = processReallyExit;
+        process34.emit = processEmit;
+        process34.reallyExit = processReallyExit;
       };
       module.exports.load = load;
-      originalProcessReallyExit = process35.reallyExit;
+      originalProcessReallyExit = process34.reallyExit;
       processReallyExit = function processReallyExit2(code) {
         if (!processOk(global.process)) {
           return;
         }
-        process35.exitCode = code || /* istanbul ignore next */
+        process34.exitCode = code || /* istanbul ignore next */
         0;
-        emit("exit", process35.exitCode, null);
-        emit("afterexit", process35.exitCode, null);
-        originalProcessReallyExit.call(process35, process35.exitCode);
+        emit("exit", process34.exitCode, null);
+        emit("afterexit", process34.exitCode, null);
+        originalProcessReallyExit.call(process34, process34.exitCode);
       };
-      originalProcessEmit = process35.emit;
+      originalProcessEmit = process34.emit;
       processEmit = function processEmit2(ev, arg) {
         if (ev === "exit" && processOk(global.process)) {
           if (arg !== void 0) {
-            process35.exitCode = arg;
+            process34.exitCode = arg;
           }
           var ret = originalProcessEmit.apply(this, arguments);
-          emit("exit", process35.exitCode, null);
-          emit("afterexit", process35.exitCode, null);
+          emit("exit", process34.exitCode, null);
+          emit("afterexit", process34.exitCode, null);
           return ret;
         } else {
           return originalProcessEmit.apply(this, arguments);
@@ -18196,8 +18197,8 @@ 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 childProcess4 = __require("child_process");
+    var path36 = __require("path");
+    var childProcess3 = __require("child_process");
     var crossSpawn = require_cross_spawn();
     var stripFinalNewline = require_strip_final_newline();
     var npmRunPath = require_npm_run_path();
@@ -18238,7 +18239,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" && path36.basename(file, ".exe") === "cmd") {
         args.unshift("/q");
       }
       return { file, args, options, parsed };
@@ -18259,9 +18260,9 @@ var require_execa = __commonJS({
       validateTimeout(parsed.options);
       let spawned;
       try {
-        spawned = childProcess4.spawn(parsed.file, parsed.args, parsed.options);
+        spawned = childProcess3.spawn(parsed.file, parsed.args, parsed.options);
       } catch (error) {
-        const dummySpawned = new childProcess4.ChildProcess();
+        const dummySpawned = new childProcess3.ChildProcess();
         const errorPromise = Promise.reject(makeError3({
           error,
           stdout: "",
@@ -18333,7 +18334,7 @@ var require_execa = __commonJS({
       validateInputSync(parsed.options);
       let result;
       try {
-        result = childProcess4.spawnSync(parsed.file, parsed.args, parsed.options);
+        result = childProcess3.spawnSync(parsed.file, parsed.args, parsed.options);
       } catch (error) {
         throw makeError3({
           error,
@@ -25595,13 +25596,13 @@ var setTextNodeValue = (node, text) => {
   markNodeAsDirty(node);
 };
 var getPathToRoot = (node) => {
-  const path37 = [];
+  const path36 = [];
   let current = node;
   while (current) {
-    path37.unshift(current);
+    path36.unshift(current);
     current = current.parentNode;
   }
-  return path37;
+  return path36;
 };
 var isNodeSelectable = (node) => {
   let current = node;
@@ -30079,8 +30080,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 = (path36) => {
+  return path36?.replace(`file://${cwd()}/`, "");
 };
 var stackUtils = new import_stack_utils.default({
   cwd: cwd(),
@@ -34710,6 +34711,7 @@ var ESC_TIMEOUT = 50;
 var PASTE_TIMEOUT = 3e4;
 var FAST_RETURN_TIMEOUT = 30;
 var KEY_INFO_MAP = {
+  OM: { name: "enter" },
   "[200~": { name: "paste-start" },
   "[201~": { name: "paste-end" },
   "[[A": { name: "f1" },
@@ -35595,15 +35597,8 @@ var defaultKeyBindingConfig = /* @__PURE__ */ new Map([
     "edit.deleteRight" /* DELETE_CHAR_RIGHT */,
     [new KeyBinding("delete"), new KeyBinding("ctrl+d")]
   ],
-  ["edit.undo" /* UNDO */, [new KeyBinding("cmd+z"), new KeyBinding("alt+z")]],
-  [
-    "edit.redo" /* REDO */,
-    [
-      new KeyBinding("ctrl+shift+z"),
-      new KeyBinding("cmd+shift+z"),
-      new KeyBinding("alt+shift+z")
-    ]
-  ],
+  ["edit.undo" /* UNDO */, getPlatformUndoBindings(process.platform)],
+  ["edit.redo" /* REDO */, getPlatformRedoBindings(process.platform)],
   // Scrolling
   ["scroll.up" /* SCROLL_UP */, [new KeyBinding("shift+up")]],
   ["scroll.down" /* SCROLL_DOWN */, [new KeyBinding("shift+down")]],
@@ -35775,6 +35770,26 @@ async function loadCustomKeybindings() {
   }
   return { config, errors };
 }
+function getPlatformUndoBindings(platform5) {
+  if (platform5 === "win32") {
+    return [new KeyBinding("ctrl+z"), new KeyBinding("alt+z")];
+  }
+  if (platform5 === "darwin") {
+    return [new KeyBinding("cmd+z"), new KeyBinding("alt+z")];
+  }
+  return [
+    new KeyBinding("alt+z"),
+    new KeyBinding("cmd+z"),
+    new KeyBinding("ctrl+z")
+  ];
+}
+function getPlatformRedoBindings(_platform) {
+  return [
+    new KeyBinding("ctrl+shift+z"),
+    new KeyBinding("cmd+shift+z"),
+    new KeyBinding("alt+shift+z")
+  ];
+}
 
 // packages/cli/src/ui/key/keyMatchers.ts
 function matchCommand(command, key, config = defaultKeyBindingConfig) {
@@ -39894,308 +39909,9 @@ function validateAuthMethod(authMethod) {
   return "Invalid auth method selected.";
 }
 
-// packages/cli/src/utils/installationInfo.ts
-import * as fs9 from "node:fs";
-import * as path3 from "node:path";
-import * as childProcess from "node:child_process";
-import process20 from "node:process";
-var isDevelopment = process20.env["NODE_ENV"] === "development";
-function getInstallationInfo(projectRoot, isAutoUpdateEnabled) {
-  const cliPath = process20.argv[1];
-  if (!cliPath) {
-    return { packageManager: "unknown" /* UNKNOWN */, isGlobal: false };
-  }
-  try {
-    if (process20.env["IS_BINARY"] === "true") {
-      return {
-        packageManager: "binary" /* BINARY */,
-        isGlobal: true,
-        updateMessage: "Running as a standalone binary. Please update by downloading the latest version from GitHub."
-      };
-    }
-    const realPath = fs9.realpathSync(cliPath).replace(/\\/g, "/");
-    const normalizedProjectRoot = projectRoot?.replace(/\\/g, "/");
-    const isGit = isGitRepository(process20.cwd());
-    if (isGit && normalizedProjectRoot && realPath.startsWith(normalizedProjectRoot) && !realPath.includes("/node_modules/")) {
-      return {
-        packageManager: "unknown" /* UNKNOWN */,
-        // Not managed by a package manager in this sense
-        isGlobal: false,
-        updateMessage: 'Running from a local git clone. Please update with "git pull".'
-      };
-    }
-    if (realPath.includes("/.npm/_npx") || realPath.includes("/npm/_npx")) {
-      return {
-        packageManager: "npx" /* NPX */,
-        isGlobal: false,
-        updateMessage: "Running via npx, update not applicable."
-      };
-    }
-    if (realPath.includes("/.pnpm/_pnpx") || realPath.includes("/.cache/pnpm/dlx")) {
-      return {
-        packageManager: "pnpx" /* PNPX */,
-        isGlobal: false,
-        updateMessage: "Running via pnpx, update not applicable."
-      };
-    }
-    if (process20.platform === "darwin") {
-      try {
-        const brewPrefix = childProcess.execSync("brew --prefix gemini-cli", {
-          encoding: "utf8",
-          stdio: ["ignore", "pipe", "ignore"]
-        }).trim();
-        const brewRealPath = fs9.realpathSync(brewPrefix);
-        if (realPath.startsWith(brewRealPath)) {
-          return {
-            packageManager: "homebrew" /* HOMEBREW */,
-            isGlobal: true,
-            updateMessage: 'Installed via Homebrew. Please update with "brew upgrade gemini-cli".'
-          };
-        }
-      } catch {
-      }
-    }
-    if (realPath.includes("/.pnpm/global") || realPath.includes("/.local/share/pnpm")) {
-      const updateCommand2 = "pnpm add -g @google/gemini-cli@latest";
-      return {
-        packageManager: "pnpm" /* PNPM */,
-        isGlobal: true,
-        updateCommand: updateCommand2,
-        updateMessage: isAutoUpdateEnabled ? "Installed with pnpm. Attempting to automatically update now..." : `Please run ${updateCommand2} to update`
-      };
-    }
-    if (realPath.includes("/.yarn/global")) {
-      const updateCommand2 = "yarn global add @google/gemini-cli@latest";
-      return {
-        packageManager: "yarn" /* YARN */,
-        isGlobal: true,
-        updateCommand: updateCommand2,
-        updateMessage: isAutoUpdateEnabled ? "Installed with yarn. Attempting to automatically update now..." : `Please run ${updateCommand2} to update`
-      };
-    }
-    if (realPath.includes("/.bun/install/cache")) {
-      return {
-        packageManager: "bunx" /* BUNX */,
-        isGlobal: false,
-        updateMessage: "Running via bunx, update not applicable."
-      };
-    }
-    if (realPath.includes("/.bun/install/global")) {
-      const updateCommand2 = "bun add -g @google/gemini-cli@latest";
-      return {
-        packageManager: "bun" /* BUN */,
-        isGlobal: true,
-        updateCommand: updateCommand2,
-        updateMessage: isAutoUpdateEnabled ? "Installed with bun. Attempting to automatically update now..." : `Please run ${updateCommand2} to update`
-      };
-    }
-    if (normalizedProjectRoot && realPath.startsWith(`${normalizedProjectRoot}/node_modules`)) {
-      let pm = "npm" /* NPM */;
-      if (fs9.existsSync(path3.join(projectRoot, "yarn.lock"))) {
-        pm = "yarn" /* YARN */;
-      } else if (fs9.existsSync(path3.join(projectRoot, "pnpm-lock.yaml"))) {
-        pm = "pnpm" /* PNPM */;
-      } else if (fs9.existsSync(path3.join(projectRoot, "bun.lockb"))) {
-        pm = "bun" /* BUN */;
-      }
-      return {
-        packageManager: pm,
-        isGlobal: false,
-        updateMessage: "Locally installed. Please update via your project's package.json."
-      };
-    }
-    const updateCommand = "npm install -g @google/gemini-cli@latest";
-    return {
-      packageManager: "npm" /* NPM */,
-      isGlobal: true,
-      updateCommand,
-      updateMessage: isAutoUpdateEnabled ? "Installed with npm. Attempting to automatically update now..." : `Please run ${updateCommand} to update`
-    };
-  } catch (error) {
-    debugLogger.log(error);
-    return { packageManager: "unknown" /* UNKNOWN */, isGlobal: false };
-  }
-}
-
-// packages/cli/src/utils/updateEventEmitter.ts
-import { EventEmitter as EventEmitter3 } from "node:events";
-var updateEventEmitter = new EventEmitter3();
-
-// packages/cli/src/utils/spawnWrapper.ts
-import { spawn } from "node:child_process";
-var spawnWrapper = spawn;
-
-// packages/cli/src/utils/handleAutoUpdate.ts
-var _updateInProgress = false;
-async function waitForUpdateCompletion(timeoutMs = 3e4) {
-  if (!_updateInProgress) {
-    return;
-  }
-  debugLogger.log(
-    "\nGemini CLI is waiting for a background update to complete before restarting..."
-  );
-  return new Promise((resolve8) => {
-    if (!_updateInProgress) {
-      resolve8();
-      return;
-    }
-    const timer = setTimeout(cleanup, timeoutMs);
-    function cleanup() {
-      clearTimeout(timer);
-      updateEventEmitter.off("update-success", cleanup);
-      updateEventEmitter.off("update-failed", cleanup);
-      resolve8();
-    }
-    updateEventEmitter.once("update-success", cleanup);
-    updateEventEmitter.once("update-failed", cleanup);
-  });
-}
-function handleAutoUpdate(info, settings, projectRoot, spawnFn = spawnWrapper) {
-  if (!info) {
-    return;
-  }
-  if (settings.merged.tools.sandbox || process.env["GEMINI_SANDBOX"]) {
-    updateEventEmitter.emit("update-info", {
-      message: `${info.message}
-Automatic update is not available in sandbox mode.`
-    });
-    return;
-  }
-  if (!settings.merged.general.enableAutoUpdateNotification) {
-    return;
-  }
-  const installationInfo = getInstallationInfo(
-    projectRoot,
-    settings.merged.general.enableAutoUpdate
-  );
-  if ([
-    "npx" /* NPX */,
-    "pnpx" /* PNPX */,
-    "bunx" /* BUNX */,
-    "binary" /* BINARY */
-  ].includes(installationInfo.packageManager)) {
-    return;
-  }
-  let combinedMessage = info.message;
-  if (installationInfo.updateMessage) {
-    combinedMessage += `
-${installationInfo.updateMessage}`;
-  }
-  if (!installationInfo.updateCommand || !settings.merged.general.enableAutoUpdate) {
-    updateEventEmitter.emit("update-received", {
-      ...info,
-      message: combinedMessage,
-      isUpdating: false
-    });
-    return;
-  }
-  updateEventEmitter.emit("update-received", {
-    ...info,
-    message: combinedMessage,
-    isUpdating: true
-  });
-  if (_updateInProgress) {
-    return;
-  }
-  const isNightly2 = info.update.latest.includes("nightly");
-  const updateCommand = installationInfo.updateCommand.replace(
-    "@latest",
-    isNightly2 ? "@nightly" : `@${info.update.latest}`
-  );
-  const updateProcess = spawnFn(updateCommand, {
-    stdio: "ignore",
-    shell: true,
-    detached: true
-  });
-  _updateInProgress = true;
-  updateProcess.unref();
-  updateProcess.on("close", (code) => {
-    _updateInProgress = false;
-    if (code === 0) {
-      updateEventEmitter.emit("update-success", {
-        message: "Update successful! The new version will be used on your next run."
-      });
-    } else {
-      updateEventEmitter.emit("update-failed", {
-        message: `Automatic update failed. Please try updating manually:
-
-${updateCommand}`
-      });
-    }
-  });
-  updateProcess.on("error", (err) => {
-    _updateInProgress = false;
-    updateEventEmitter.emit("update-failed", {
-      message: `Automatic update failed. Please try updating manually. (error: ${err.message})
-
-${updateCommand}`
-    });
-  });
-  return updateProcess;
-}
-function setUpdateHandler(addItem, setUpdateInfo) {
-  let successfullyInstalled = false;
-  const handleUpdateReceived = (info) => {
-    setUpdateInfo(info);
-    const savedMessage = info.message;
-    setTimeout(() => {
-      if (!successfullyInstalled) {
-        addItem(
-          {
-            type: "info" /* INFO */,
-            text: savedMessage
-          },
-          Date.now()
-        );
-      }
-      setUpdateInfo(null);
-    }, 6e4);
-  };
-  const handleUpdateFailed = (data) => {
-    setUpdateInfo(null);
-    addItem(
-      {
-        type: "error" /* ERROR */,
-        text: data?.message || `Automatic update failed. Please try updating manually`
-      },
-      Date.now()
-    );
-  };
-  const handleUpdateSuccess = () => {
-    successfullyInstalled = true;
-    setUpdateInfo(null);
-    addItem(
-      {
-        type: "info" /* INFO */,
-        text: `Update successful! The new version will be used on your next run.`
-      },
-      Date.now()
-    );
-  };
-  const handleUpdateInfo = (data) => {
-    addItem(
-      {
-        type: "info" /* INFO */,
-        text: data.message
-      },
-      Date.now()
-    );
-  };
-  updateEventEmitter.on("update-received", handleUpdateReceived);
-  updateEventEmitter.on("update-failed", handleUpdateFailed);
-  updateEventEmitter.on("update-success", handleUpdateSuccess);
-  updateEventEmitter.on("update-info", handleUpdateInfo);
-  return () => {
-    updateEventEmitter.off("update-received", handleUpdateReceived);
-    updateEventEmitter.off("update-failed", handleUpdateFailed);
-    updateEventEmitter.off("update-success", handleUpdateSuccess);
-    updateEventEmitter.off("update-info", handleUpdateInfo);
-  };
-}
-
 // packages/cli/src/config/extensions/consent.ts
-import * as fs10 from "node:fs/promises";
-import * as path4 from "node:path";
+import * as fs9 from "node:fs/promises";
+import * as path3 from "node:path";
 var import_chalk4 = __toESM(require_source(), 1);
 var INSTALL_WARNING_MESSAGE = import_chalk4.default.yellow(
   "The extension you are about to install may have been created by a third-party developer and sourced from a public repository. Google does not vet, endorse, or guarantee the functionality or security of extensions. Please carefully inspect any extension and its source code before installing to understand the permissions it requires and the actions it may perform."
@@ -40321,10 +40037,10 @@ async function renderSkillsList(skills) {
   const output = [];
   for (const skill of skills) {
     output.push(`  * ${import_chalk4.default.bold(skill.name)}: ${skill.description}`);
-    const skillDir = path4.dirname(skill.location);
+    const skillDir = path3.dirname(skill.location);
     let fileCountStr = "";
     try {
-      const skillDirItems = await fs10.readdir(skillDir);
+      const skillDirItems = await fs9.readdir(skillDir);
       fileCountStr = ` (${skillDirItems.length} items in directory)`;
     } catch {
       fileCountStr = ` ${import_chalk4.default.red("\u26A0\uFE0F (Could not count items in directory)")}`;
@@ -40359,17 +40075,17 @@ async function maybeRequestConsentOrFail(extensionConfig, requestConsent, hasHoo
 
 // packages/cli/src/config/extensions/extensionSettings.ts
 var dotenv = __toESM(require_main(), 1);
-import * as fs12 from "node:fs/promises";
+import * as fs11 from "node:fs/promises";
 import * as fsSync from "node:fs";
-import * as path7 from "node:path";
+import * as path6 from "node:path";
 
 // packages/cli/src/config/extensions/storage.ts
-import * as path6 from "node:path";
-import * as fs11 from "node:fs";
+import * as path5 from "node:path";
+import * as fs10 from "node:fs";
 import * as os2 from "node:os";
 
 // packages/cli/src/config/extensions/variables.ts
-import * as path5 from "node:path";
+import * as path4 from "node:path";
 
 // packages/cli/src/config/extensions/variableSchema.ts
 var PATH_SEPARATOR_DEFINITION = {
@@ -40395,7 +40111,7 @@ var UNMARSHALL_KEY_IGNORE_LIST = /* @__PURE__ */ new Set([
   "constructor",
   "prototype"
 ]);
-var EXTENSIONS_DIRECTORY_NAME = path5.join(GEMINI_DIR, "extensions");
+var EXTENSIONS_DIRECTORY_NAME = path4.join(GEMINI_DIR, "extensions");
 var EXTENSIONS_CONFIG_FILENAME = "gemini-extension.json";
 var INSTALL_METADATA_FILENAME = ".gemini-extension-install.json";
 var EXTENSION_SETTINGS_FILENAME = ".env";
@@ -40450,22 +40166,22 @@ var ExtensionStorage = class _ExtensionStorage {
     this.extensionName = extensionName;
   }
   getExtensionDir() {
-    return path6.join(
+    return path5.join(
       _ExtensionStorage.getUserExtensionsDir(),
       this.extensionName
     );
   }
   getConfigPath() {
-    return path6.join(this.getExtensionDir(), EXTENSIONS_CONFIG_FILENAME);
+    return path5.join(this.getExtensionDir(), EXTENSIONS_CONFIG_FILENAME);
   }
   getEnvFilePath() {
-    return path6.join(this.getExtensionDir(), EXTENSION_SETTINGS_FILENAME);
+    return path5.join(this.getExtensionDir(), EXTENSION_SETTINGS_FILENAME);
   }
   static getUserExtensionsDir() {
     return new Storage(homedir()).getExtensionsDir();
   }
   static async createTmpDir() {
-    return fs11.promises.mkdtemp(path6.join(os2.tmpdir(), "gemini-extension"));
+    return fs10.promises.mkdtemp(path5.join(os2.tmpdir(), "gemini-extension"));
   }
 };
 
@@ -40486,7 +40202,7 @@ var getEnvFilePath = (extensionName, scope, workspaceDir) => {
     if (!workspaceDir) {
       throw new Error("Workspace directory is required for workspace scope");
     }
-    return path7.join(workspaceDir, EXTENSION_SETTINGS_FILENAME);
+    return path6.join(workspaceDir, EXTENSION_SETTINGS_FILENAME);
   }
   return new ExtensionStorage(extensionName).getEnvFilePath();
 };
@@ -40542,7 +40258,7 @@ async function maybePromptForSettings(extensionConfig, extensionId, requestSetti
       );
     }
   }
-  await fs12.writeFile(envFilePath, envContent);
+  await fs11.writeFile(envFilePath, envContent);
 }
 function formatEnvContent(settings) {
   let envContent = "";
@@ -40652,7 +40368,7 @@ async function updateSetting(extensionConfig, extensionId, settingKey, requestSe
         `Cannot write extension settings to ${envFilePath} because it is a directory.`
       );
     }
-    envContent = await fs12.readFile(envFilePath, "utf-8");
+    envContent = await fs11.readFile(envFilePath, "utf-8");
   }
   const parsedEnv = dotenv.parse(envContent);
   if (!newValue) {
@@ -40670,7 +40386,7 @@ async function updateSetting(extensionConfig, extensionId, settingKey, requestSe
     }
   }
   const newEnvContent = formatEnvContent(nonSensitiveSettings);
-  await fs12.writeFile(envFilePath, newEnvContent);
+  await fs11.writeFile(envFilePath, newEnvContent);
 }
 function getSettingsChanges(settings, oldSettings) {
   const isSameSetting = (a, b2) => a.envVar === b2.envVar && (a.sensitive ?? false) === (b2.sensitive ?? false);
@@ -40697,7 +40413,7 @@ async function clearSettings(envFilePath, keychain) {
   if (fsSync.existsSync(envFilePath)) {
     const stat7 = fsSync.statSync(envFilePath);
     if (!stat7.isDirectory()) {
-      await fs12.writeFile(envFilePath, "");
+      await fs11.writeFile(envFilePath, "");
     }
   }
   if (!await keychain.isAvailable()) {
@@ -40730,13 +40446,13 @@ async function getMissingSettings(extensionConfig, extensionId, workspaceDir) {
 
 // packages/cli/src/config/extension-manager.ts
 var import_chalk5 = __toESM(require_source(), 1);
-import * as fs17 from "node:fs";
-import * as path11 from "node:path";
+import * as fs16 from "node:fs";
+import * as path10 from "node:path";
 import { stat } from "node:fs/promises";
 
 // packages/cli/src/config/extensions/extensionEnablement.ts
-import fs13 from "node:fs";
-import path8 from "node:path";
+import fs12 from "node:fs";
+import path7 from "node:path";
 var Override = class _Override {
   constructor(baseRule, isDisable, includeSubdirs) {
     this.baseRule = baseRule;
@@ -40777,8 +40493,8 @@ var Override = class _Override {
   output() {
     return `${this.isDisable ? "!" : ""}${this.baseRule}${this.includeSubdirs ? "*" : ""}`;
   }
-  matchesPath(path37) {
-    return this.asRegex().test(path37);
+  matchesPath(path36) {
+    return this.asRegex().test(path36);
   }
 };
 var ensureLeadingAndTrailingSlash = function(dirPath) {
@@ -40803,7 +40519,7 @@ var ExtensionEnablementManager = class {
   enabledExtensionNamesOverride;
   constructor(enabledExtensionNames) {
     this.configDir = ExtensionStorage.getUserExtensionsDir();
-    this.configFilePath = path8.join(
+    this.configFilePath = path7.join(
       this.configDir,
       "extension-enablement.json"
     );
@@ -40848,7 +40564,7 @@ var ExtensionEnablementManager = class {
   }
   readConfig() {
     try {
-      const content = fs13.readFileSync(this.configFilePath, "utf-8");
+      const content = fs12.readFileSync(this.configFilePath, "utf-8");
       return JSON.parse(content);
     } catch (error) {
       if (error instanceof Error && "code" in error && error.code === "ENOENT") {
@@ -40863,8 +40579,8 @@ var ExtensionEnablementManager = class {
     }
   }
   writeConfig(config) {
-    fs13.mkdirSync(this.configDir, { recursive: true });
-    fs13.writeFileSync(this.configFilePath, JSON.stringify(config, null, 2));
+    fs12.mkdirSync(this.configDir, { recursive: true });
+    fs12.writeFileSync(this.configFilePath, JSON.stringify(config, null, 2));
   }
   enable(extensionName, includeSubdirs, scopePath) {
     const config = this.readConfig();
@@ -40899,12 +40615,12 @@ var ExtensionEnablementManager = class {
 import { createHash, randomUUID } from "node:crypto";
 
 // packages/cli/src/config/extension.ts
-import * as fs14 from "node:fs";
-import * as path9 from "node:path";
+import * as fs13 from "node:fs";
+import * as path8 from "node:path";
 function loadInstallMetadata(extensionDir) {
-  const metadataFilePath = path9.join(extensionDir, INSTALL_METADATA_FILENAME);
+  const metadataFilePath = path8.join(extensionDir, INSTALL_METADATA_FILENAME);
   try {
-    const configContent = fs14.readFileSync(metadataFilePath, "utf-8");
+    const configContent = fs13.readFileSync(metadataFilePath, "utf-8");
     const metadata = JSON.parse(configContent);
     return metadata;
   } catch {
@@ -40995,8 +40711,8 @@ function extensionUpdatesReducer(state, action) {
 // packages/cli/src/config/extensions/github.ts
 import * as os4 from "node:os";
 import * as https2 from "node:https";
-import * as fs16 from "node:fs";
-import * as path10 from "node:path";
+import * as fs15 from "node:fs";
+import * as path9 from "node:path";
 
 // packages/cli/node_modules/tar/dist/esm/index.min.js
 import Hr from "events";
@@ -43122,7 +42838,7 @@ var di = (s3, t, e, i) => {
   });
 };
 var $n = (s3, t, e, i, r2) => {
-  if (t.isDirectory()) fs15(Ee.resolve(s3, t.name), e, i, (n) => {
+  if (t.isDirectory()) fs14(Ee.resolve(s3, t.name), e, i, (n) => {
     if (n) return r2(n);
     let o = Ee.resolve(s3, t.name);
     di(o, e, i, r2);
@@ -43132,7 +42848,7 @@ var $n = (s3, t, e, i, r2) => {
     di(n, e, i, r2);
   }
 };
-var fs15 = (s3, t, e, i) => {
+var fs14 = (s3, t, e, i) => {
   ui.readdir(s3, { withFileTypes: true }, (r2, n) => {
     if (r2) {
       if (r2.code === "ENOENT") return i();
@@ -43195,7 +42911,7 @@ var jn = (s3, t) => {
 var fr = (s3, t, e) => {
   s3 = f(s3);
   let i = t.umask ?? 18, r2 = t.mode | 448, n = (r2 & i) !== 0, o = t.uid, h = t.gid, a = typeof o == "number" && typeof h == "number" && (o !== t.processUid || h !== t.processGid), l = t.preserve, c2 = t.unlink, d = f(t.cwd), S = (E, x) => {
-    E ? e(E) : x && a ? fs15(x, o, h, (_s) => S(_s)) : n ? k.chmod(s3, r2, e) : e();
+    E ? e(E) : x && a ? fs14(x, o, h, (_s) => S(_s)) : n ? k.chmod(s3, r2, e) : e();
   };
   if (s3 === d) return jn(s3, S);
   if (l) return qn.mkdir(s3, { mode: r2, recursive: true }).then((E) => S(null, E ?? void 0), S);
@@ -44201,9 +43917,9 @@ async function downloadFromGitHubRelease(installMetadata, destination, githubRep
       };
     }
     if (!fileName) {
-      fileName = path10.basename(new URL(archiveUrl).pathname);
+      fileName = path9.basename(new URL(archiveUrl).pathname);
     }
-    let downloadedAssetPath = path10.join(destination, fileName);
+    let downloadedAssetPath = path9.join(destination, fileName);
     if (isTar && !downloadedAssetPath.endsWith(".tar.gz")) {
       downloadedAssetPath += ".tar.gz";
     } else if (isZip && !downloadedAssetPath.endsWith(".zip")) {
@@ -44234,26 +43950,26 @@ async function downloadFromGitHubRelease(installMetadata, destination, githubRep
         errorMessage: `Failed to extract asset from ${downloadedAssetPath}: ${getErrorMessage(error)}`
       };
     }
-    const entries = await fs16.promises.readdir(destination, {
+    const entries = await fs15.promises.readdir(destination, {
       withFileTypes: true
     });
     if (entries.length === 2) {
       const lonelyDir = entries.find((entry) => entry.isDirectory());
-      if (lonelyDir && fs16.existsSync(
-        path10.join(destination, lonelyDir.name, EXTENSIONS_CONFIG_FILENAME)
+      if (lonelyDir && fs15.existsSync(
+        path9.join(destination, lonelyDir.name, EXTENSIONS_CONFIG_FILENAME)
       )) {
-        const dirPathToExtract = path10.join(destination, lonelyDir.name);
-        const extractedDirFiles = await fs16.promises.readdir(dirPathToExtract);
+        const dirPathToExtract = path9.join(destination, lonelyDir.name);
+        const extractedDirFiles = await fs15.promises.readdir(dirPathToExtract);
         for (const file of extractedDirFiles) {
-          await fs16.promises.rename(
-            path10.join(dirPathToExtract, file),
-            path10.join(destination, file)
+          await fs15.promises.rename(
+            path9.join(dirPathToExtract, file),
+            path9.join(destination, file)
           );
         }
-        await fs16.promises.rmdir(dirPathToExtract);
+        await fs15.promises.rmdir(dirPathToExtract);
       }
     }
-    await fs16.promises.unlink(downloadedAssetPath);
+    await fs15.promises.unlink(downloadedAssetPath);
     return {
       tagName: releaseData.tag_name,
       type: "github-release",
@@ -44323,7 +44039,7 @@ async function downloadFile(url, dest, options, redirectCount = 0) {
           new Error(`Request failed with status code ${res.statusCode}`)
         );
       }
-      const file = fs16.createWriteStream(dest);
+      const file = fs15.createWriteStream(dest);
       res.pipe(file);
       file.on("finish", () => file.close(resolve8));
     }).on("error", reject);
@@ -44609,9 +44325,9 @@ var ExtensionManager = class extends ExtensionLoader {
         }
       }
       const extensionsDir = ExtensionStorage.getUserExtensionsDir();
-      await fs17.promises.mkdir(extensionsDir, { recursive: true });
+      await fs16.promises.mkdir(extensionsDir, { recursive: true });
       if (installMetadata.type === "local" || installMetadata.type === "link") {
-        installMetadata.source = path11.isAbsolute(installMetadata.source) ? installMetadata.source : path11.resolve(this.workspaceDir, installMetadata.source);
+        installMetadata.source = path10.isAbsolute(installMetadata.source) ? installMetadata.source : path10.resolve(this.workspaceDir, installMetadata.source);
       }
       let tempDir;
       if (installMetadata.type === "git" || installMetadata.type === "github-release") {
@@ -44676,12 +44392,12 @@ Would you like to attempt to install via "git clone" instead?`
             `Cannot update to "${newExtensionName}" because an extension with that name is already installed.`
           );
         }
-        const newHasHooks = fs17.existsSync(
-          path11.join(localSourcePath, "hooks", "hooks.json")
+        const newHasHooks = fs16.existsSync(
+          path10.join(localSourcePath, "hooks", "hooks.json")
         );
         const previousHasHooks = !!(isUpdate && previous && previous.hooks && Object.keys(previous.hooks).length > 0);
         const newSkills = await loadSkillsFromDir(
-          path11.join(localSourcePath, "skills")
+          path10.join(localSourcePath, "skills")
         );
         const previousSkills = previous?.skills ?? [];
         const isMigrating = Boolean(
@@ -44701,7 +44417,7 @@ Would you like to attempt to install via "git clone" instead?`
         const destinationPath = new ExtensionStorage(
           newExtensionName
         ).getExtensionDir();
-        if ((!isUpdate || newExtensionName !== previousName) && fs17.existsSync(destinationPath)) {
+        if ((!isUpdate || newExtensionName !== previousName) && fs16.existsSync(destinationPath)) {
           throw new Error(
             `Cannot install extension "${newExtensionName}" because a directory with that name already exists. Please remove it manually.`
           );
@@ -44729,7 +44445,7 @@ Would you like to attempt to install via "git clone" instead?`
           }
           await this.uninstallExtension(previousName, isUpdate);
         }
-        await fs17.promises.mkdir(destinationPath, { recursive: true });
+        await fs16.promises.mkdir(destinationPath, { recursive: true });
         if (this.requestSetting && this.settings.experimental.extensionConfig) {
           if (isUpdate) {
             await maybePromptForSettings(
@@ -44763,11 +44479,11 @@ Would you like to attempt to install via "git clone" instead?`
           await copyExtension(localSourcePath, destinationPath);
         }
         const metadataString = JSON.stringify(installMetadata, null, 2);
-        const metadataPath = path11.join(
+        const metadataPath = path10.join(
           destinationPath,
           INSTALL_METADATA_FILENAME
         );
-        await fs17.promises.writeFile(metadataPath, metadataString);
+        await fs16.promises.writeFile(metadataPath, metadataString);
         await this.storeExtensionIntegrity(
           newExtensionConfig.name,
           installMetadata
@@ -44819,7 +44535,7 @@ Would you like to attempt to install via "git clone" instead?`
         }
       } finally {
         if (tempDir) {
-          await fs17.promises.rm(tempDir, { recursive: true, force: true });
+          await fs16.promises.rm(tempDir, { recursive: true, force: true });
         }
       }
       return extension;
@@ -44871,9 +44587,9 @@ Would you like to attempt to install via "git clone" instead?`
     }
     await this.unloadExtension(extension);
     const storage = new ExtensionStorage(
-      extension.installMetadata?.type === "link" ? extension.name : path11.basename(extension.path)
+      extension.installMetadata?.type === "link" ? extension.name : path10.basename(extension.path)
     );
-    await fs17.promises.rm(storage.getExtensionDir(), {
+    await fs16.promises.rm(storage.getExtensionDir(), {
       recursive: true,
       force: true
     });
@@ -44918,13 +44634,13 @@ Would you like to attempt to install via "git clone" instead?`
           return this.loadedExtensions;
         }
         const extensionsDir = ExtensionStorage.getUserExtensionsDir();
-        if (!fs17.existsSync(extensionsDir)) {
+        if (!fs16.existsSync(extensionsDir)) {
           this.loadedExtensions = [];
           return this.loadedExtensions;
         }
-        const subdirs = await fs17.promises.readdir(extensionsDir);
+        const subdirs = await fs16.promises.readdir(extensionsDir);
         const extensionPromises = subdirs.map((subdir) => {
-          const extensionDir = path11.join(extensionsDir, subdir);
+          const extensionDir = path10.join(extensionsDir, subdir);
           return this._buildExtension(extensionDir);
         });
         const builtExtensionsOrNull = await Promise.all(extensionPromises);
@@ -44986,7 +44702,7 @@ Would you like to attempt to install via "git clone" instead?`
    */
   async _buildExtension(extensionDir) {
     try {
-      const stats = await fs17.promises.stat(extensionDir);
+      const stats = await fs16.promises.stat(extensionDir);
       if (!stats.isDirectory()) {
         return null;
       }
@@ -45116,7 +44832,7 @@ Would you like to attempt to install via "git clone" instead?`
         }
       }
       const contextFiles = getContextFileNames(config).map((contextFileName) => {
-        const contextFilePath = path11.join(
+        const contextFilePath = path10.join(
           effectiveExtensionPath,
           contextFileName
         );
@@ -45126,12 +44842,12 @@ Would you like to attempt to install via "git clone" instead?`
           );
         }
         return contextFilePath;
-      }).filter((contextFilePath) => fs17.existsSync(contextFilePath));
+      }).filter((contextFilePath) => fs16.existsSync(contextFilePath));
       const hydrationContext = {
         extensionPath: effectiveExtensionPath,
         workspacePath: this.workspaceDir,
-        "/": path11.sep,
-        pathSeparator: path11.sep,
+        "/": path10.sep,
+        pathSeparator: path10.sep,
         ...customEnv
       };
       let hooks;
@@ -45165,7 +44881,7 @@ Would you like to attempt to install via "git clone" instead?`
         }
       }
       let skills = await loadSkillsFromDir(
-        path11.join(effectiveExtensionPath, "skills")
+        path10.join(effectiveExtensionPath, "skills")
       );
       skills = skills.map((skill) => ({
         ...recursivelyHydrateStrings(skill, hydrationContext),
@@ -45173,8 +44889,8 @@ Would you like to attempt to install via "git clone" instead?`
       }));
       let rules;
       let checkers;
-      const policyDir = path11.join(effectiveExtensionPath, "policies");
-      if (fs17.existsSync(policyDir)) {
+      const policyDir = path10.join(effectiveExtensionPath, "policies");
+      if (fs16.existsSync(policyDir)) {
         const result = await loadExtensionPolicies(config.name, policyDir);
         rules = result.rules;
         checkers = result.checkers;
@@ -45188,7 +44904,7 @@ Details: ${error.details}` : ""}`
         }
       }
       const agentLoadResult = await loadAgentsFromDirectory(
-        path11.join(effectiveExtensionPath, "agents")
+        path10.join(effectiveExtensionPath, "agents")
       );
       agentLoadResult.agents = agentLoadResult.agents.map((agent) => ({
         ...recursivelyHydrateStrings(agent, hydrationContext),
@@ -45248,12 +44964,12 @@ Details: ${error.details}` : ""}`
     return this.maybeStopExtension(extension);
   }
   async loadExtensionConfig(extensionDir) {
-    const configFilePath = path11.join(extensionDir, EXTENSIONS_CONFIG_FILENAME);
-    if (!fs17.existsSync(configFilePath)) {
+    const configFilePath = path10.join(extensionDir, EXTENSIONS_CONFIG_FILENAME);
+    if (!fs16.existsSync(configFilePath)) {
       throw new Error(`Configuration file not found at ${configFilePath}`);
     }
     try {
-      const configContent = await fs17.promises.readFile(configFilePath, "utf-8");
+      const configContent = await fs16.promises.readFile(configFilePath, "utf-8");
       const rawConfig = JSON.parse(configContent);
       if (!rawConfig.name || !rawConfig.version) {
         throw new Error(
@@ -45266,8 +44982,8 @@ Details: ${error.details}` : ""}`
         {
           extensionPath: extensionDir,
           workspacePath: this.workspaceDir,
-          "/": path11.sep,
-          pathSeparator: path11.sep
+          "/": path10.sep,
+          pathSeparator: path10.sep
         }
       );
       validateName(config.name);
@@ -45281,9 +44997,9 @@ Details: ${error.details}` : ""}`
     }
   }
   async loadExtensionHooks(extensionDir, context) {
-    const hooksFilePath = path11.join(extensionDir, "hooks", "hooks.json");
+    const hooksFilePath = path10.join(extensionDir, "hooks", "hooks.json");
     try {
-      const hooksContent = await fs17.promises.readFile(hooksFilePath, "utf-8");
+      const hooksContent = await fs16.promises.readFile(hooksFilePath, "utf-8");
       const rawHooks = JSON.parse(hooksContent);
       if (!rawHooks || typeof rawHooks !== "object" || typeof rawHooks.hooks !== "object" || rawHooks.hooks === null || Array.isArray(rawHooks.hooks)) {
         debugLogger.warn(
@@ -45296,8 +45012,8 @@ Details: ${error.details}` : ""}`
         rawHooks.hooks,
         {
           ...context,
-          "/": path11.sep,
-          pathSeparator: path11.sep
+          "/": path10.sep,
+          pathSeparator: path10.sep
         }
       );
       return hydratedHooks;
@@ -45453,19 +45169,19 @@ function filterMcpConfig(original) {
   return Object.freeze(rest);
 }
 async function makeWritableRecursive(targetPath) {
-  const stats = await fs17.promises.lstat(targetPath);
+  const stats = await fs16.promises.lstat(targetPath);
   if (stats.isDirectory()) {
-    await fs17.promises.chmod(targetPath, stats.mode | 448);
-    const children = await fs17.promises.readdir(targetPath);
+    await fs16.promises.chmod(targetPath, stats.mode | 448);
+    const children = await fs16.promises.readdir(targetPath);
     for (const child of children) {
-      await makeWritableRecursive(path11.join(targetPath, child));
+      await makeWritableRecursive(path10.join(targetPath, child));
     }
   } else if (stats.isFile()) {
-    await fs17.promises.chmod(targetPath, stats.mode | 384);
+    await fs16.promises.chmod(targetPath, stats.mode | 384);
   }
 }
 async function copyExtension(source2, destination) {
-  await fs17.promises.cp(source2, destination, { recursive: true });
+  await fs16.promises.cp(source2, destination, { recursive: true });
   await makeWritableRecursive(destination);
 }
 function getContextFileNames(config) {
@@ -45524,8 +45240,8 @@ function hashValue(value) {
 }
 
 // packages/cli/src/config/mcp/mcpServerEnablement.ts
-import fs18 from "node:fs/promises";
-import path12 from "node:path";
+import fs17 from "node:fs/promises";
+import path11 from "node:path";
 function normalizeServerId(serverId) {
   return serverId.toLowerCase().trim();
 }
@@ -45626,7 +45342,7 @@ var McpServerEnablementManager = class _McpServerEnablementManager {
   }
   constructor() {
     this.configDir = Storage.getGlobalGeminiDir();
-    this.configFilePath = path12.join(this.configDir, MCP_ENABLEMENT_FILENAME);
+    this.configFilePath = path11.join(this.configDir, MCP_ENABLEMENT_FILENAME);
   }
   /**
    * Check if server is enabled in FILE (persistent config only).
@@ -45746,7 +45462,7 @@ var McpServerEnablementManager = class _McpServerEnablementManager {
    */
   async readConfig() {
     try {
-      const content = await fs18.readFile(this.configFilePath, "utf-8");
+      const content = await fs17.readFile(this.configFilePath, "utf-8");
       return JSON.parse(content);
     } catch (error) {
       if (error instanceof Error && "code" in error && error.code === "ENOENT") {
@@ -45764,8 +45480,8 @@ var McpServerEnablementManager = class _McpServerEnablementManager {
    * Write config to file asynchronously.
    */
   async writeConfig(config) {
-    await fs18.mkdir(this.configDir, { recursive: true });
-    await fs18.writeFile(this.configFilePath, JSON.stringify(config, null, 2));
+    await fs17.mkdir(this.configDir, { recursive: true });
+    await fs17.writeFile(this.configFilePath, JSON.stringify(config, null, 2));
   }
 };
 
@@ -45806,9 +45522,9 @@ function isSettingsValue(value) {
   const type = typeof value;
   return type === "string" || type === "number" || type === "boolean" || type === "object";
 }
-function getNestedValue(obj, path37) {
+function getNestedValue(obj, path36) {
   let current = obj;
-  for (const key of path37) {
+  for (const key of path36) {
     if (!isRecord(current) || !(key in current)) {
       return void 0;
     }
@@ -45821,8 +45537,8 @@ function getEffectiveValue(key, settings) {
   if (!definition) {
     return void 0;
   }
-  const path37 = key.split(".");
-  const value = getNestedValue(settings, path37);
+  const path36 = key.split(".");
+  const value = getNestedValue(settings, path36);
   if (value !== void 0 && isSettingsValue(value)) {
     return value;
   }
@@ -45832,8 +45548,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 path36 = key.split(".");
+  const value = getNestedValue(scopeSettings, path36);
   return value !== void 0;
 }
 function getDisplayValue(key, scopeSettings, _mergedSettings) {
@@ -45929,8 +45645,8 @@ function getEditValue(type, rawValue) {
 }
 
 // packages/cli/src/ui/hooks/atCommandProcessor.ts
-import * as fs19 from "node:fs/promises";
-import * as path13 from "node:path";
+import * as fs18 from "node:fs/promises";
+import * as path12 from "node:path";
 import { Buffer as Buffer5 } from "node:buffer";
 var REF_CONTENT_HEADER = `
 ${REFERENCE_CONTENT_START}`;
@@ -46009,7 +45725,7 @@ async function checkPermissions(query, config) {
     const pathName = part.content.substring(1);
     if (!pathName) continue;
     const resolvedPathName = resolveToRealPath(
-      path13.resolve(config.getTargetDir(), pathName)
+      path12.resolve(config.getTargetDir(), pathName)
     );
     if (config.validatePathAccess(resolvedPathName, "read")) {
       if (await fileExists(resolvedPathName)) {
@@ -46049,15 +45765,15 @@ async function resolveFilePaths(fileParts, config, onDebugMessage, signal) {
     }
     for (const dir of config.getWorkspaceContext().getDirectories()) {
       try {
-        const absolutePath = path13.resolve(dir, pathName);
-        const stats = await fs19.stat(absolutePath);
-        const relativePath = path13.isAbsolute(pathName) ? path13.relative(dir, absolutePath) : pathName;
+        const absolutePath = path12.resolve(dir, pathName);
+        const stats = await fs18.stat(absolutePath);
+        const relativePath = path12.isAbsolute(pathName) ? path12.relative(dir, absolutePath) : pathName;
         if (stats.isDirectory()) {
-          const pathSpec = path13.join(relativePath, "**");
+          const pathSpec = path12.join(relativePath, "**");
           resolvedFiles.push({
             part,
             pathSpec,
-            displayLabel: path13.isAbsolute(pathName) ? relativePath : pathName,
+            displayLabel: path12.isAbsolute(pathName) ? relativePath : pathName,
             absolutePath
           });
           onDebugMessage(
@@ -46067,7 +45783,7 @@ async function resolveFilePaths(fileParts, config, onDebugMessage, signal) {
           resolvedFiles.push({
             part,
             pathSpec: relativePath,
-            displayLabel: path13.isAbsolute(pathName) ? relativePath : pathName,
+            displayLabel: path12.isAbsolute(pathName) ? relativePath : pathName,
             absolutePath
           });
           onDebugMessage(
@@ -46093,11 +45809,11 @@ async function resolveFilePaths(fileParts, config, onDebugMessage, signal) {
                 const lines = globResult.llmContent.split("\n");
                 if (lines.length > 1 && lines[1]) {
                   const firstMatchAbsolute = lines[1].trim();
-                  const pathSpec = path13.relative(dir, firstMatchAbsolute);
+                  const pathSpec = path12.relative(dir, firstMatchAbsolute);
                   resolvedFiles.push({
                     part,
                     pathSpec,
-                    displayLabel: path13.isAbsolute(pathName) ? pathSpec : pathName
+                    displayLabel: path12.isAbsolute(pathName) ? pathSpec : pathName
                   });
                   onDebugMessage(
                     `Glob search for ${pathName} found ${firstMatchAbsolute}, using relative path: ${pathSpec}`
@@ -46284,7 +46000,7 @@ async function readLocalFiles(resolvedFiles, config, signal, userMessageTimestam
             if (!displayPath) {
               for (const dir of config.getWorkspaceContext().getDirectories()) {
                 if (filePathSpecInContent.startsWith(dir)) {
-                  displayPath = path13.relative(dir, filePathSpecInContent);
+                  displayPath = path12.relative(dir, filePathSpecInContent);
                   break;
                 }
               }
@@ -46447,25 +46163,25 @@ function convertResourceContentsToParts(response) {
 }
 
 // packages/cli/node_modules/clipboardy/index.js
-import process26 from "node:process";
+import process25 from "node:process";
 
 // node_modules/is-wayland/index.js
-import process21 from "node:process";
+import process20 from "node:process";
 function isWayland() {
-  if (process21.platform !== "linux") {
+  if (process20.platform !== "linux") {
     return false;
   }
-  if (process21.env.WAYLAND_DISPLAY) {
+  if (process20.env.WAYLAND_DISPLAY) {
     return true;
   }
-  if (process21.env.XDG_SESSION_TYPE === "wayland") {
+  if (process20.env.XDG_SESSION_TYPE === "wayland") {
     return true;
   }
   return false;
 }
 
 // node_modules/clipboard-image/index.js
-import process23 from "node:process";
+import process22 from "node:process";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 
 // node_modules/run-jxa/index.js
@@ -46705,9 +46421,9 @@ var Subsume = class _Subsume {
 
 // node_modules/macos-version/index.js
 var import_semver = __toESM(require_semver2(), 1);
-import process22 from "node:process";
-import fs20 from "node:fs";
-var isMacOS = process22.platform === "darwin";
+import process21 from "node:process";
+import fs19 from "node:fs";
+var isMacOS = process21.platform === "darwin";
 var version;
 var clean = (version2) => {
   const { length } = version2.split(".");
@@ -46731,7 +46447,7 @@ function macOSVersion() {
     return;
   }
   if (!version) {
-    const file = fs20.readFileSync("/System/Library/CoreServices/SystemVersion.plist", "utf8");
+    const file = fs19.readFileSync("/System/Library/CoreServices/SystemVersion.plist", "utf8");
     const matches = parseVersion(file);
     if (!matches) {
       return;
@@ -46740,7 +46456,7 @@ function macOSVersion() {
   }
   return version;
 }
-if (process22.env.NODE_ENV === "test") {
+if (process21.env.NODE_ENV === "test") {
   macOSVersion._parseVersion = parseVersion;
 }
 function isMacOSVersionGreaterThanOrEqualTo(version2) {
@@ -46787,7 +46503,7 @@ async function runJxa(input, arguments_) {
 
 // node_modules/clipboard-image/index.js
 async function hasClipboardImages() {
-  if (process23.platform !== "darwin") {
+  if (process22.platform !== "darwin") {
     return false;
   }
   const result = await runJxa(() => {
@@ -46813,7 +46529,7 @@ async function hasClipboardImages() {
   return result;
 }
 async function readClipboardImages() {
-  if (process23.platform !== "darwin") {
+  if (process22.platform !== "darwin") {
     return [];
   }
   const result = await runJxa(() => {
@@ -46895,10 +46611,10 @@ async function readClipboardImages() {
   return result;
 }
 async function writeClipboardImages(filePaths) {
-  if (process23.platform !== "darwin") {
+  if (process22.platform !== "darwin") {
     return;
   }
-  const paths = filePaths.map((path37) => path37 instanceof URL ? fileURLToPath2(path37) : path37);
+  const paths = filePaths.map((path36) => path36 instanceof URL ? fileURLToPath2(path36) : path36);
   await runJxa((...paths2) => {
     ObjC.import("AppKit");
     ObjC.import("Foundation");
@@ -46978,13 +46694,13 @@ var clipboard = {
 var termux_default = clipboard;
 
 // packages/cli/node_modules/clipboardy/lib/linux.js
-import fs21 from "node:fs";
-import path14 from "node:path";
+import fs20 from "node:fs";
+import path13 from "node:path";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
-var __dirname = path14.dirname(fileURLToPath3(import.meta.url));
+var __dirname = path13.dirname(fileURLToPath3(import.meta.url));
 var xsel = "xsel";
-var xselFallbackPath = path14.join(__dirname, "../fallbacks/linux/xsel");
-var hasXselFallback = fs21.existsSync(xselFallbackPath);
+var xselFallbackPath = path13.join(__dirname, "../fallbacks/linux/xsel");
+var hasXselFallback = fs20.existsSync(xselFallbackPath);
 var copyArguments = ["--clipboard", "--input"];
 var pasteArguments = ["--clipboard", "--output"];
 var isDisplayError = (error) => /Can't open display|Inappropriate ioctl/i.test(error.stderr ?? "");
@@ -47120,19 +46836,19 @@ var clipboard4 = {
 var macos_default = clipboard4;
 
 // packages/cli/node_modules/clipboardy/lib/windows.js
-import fs22 from "node:fs";
-import path15 from "node:path";
+import fs21 from "node:fs";
+import path14 from "node:path";
 import { fileURLToPath as fileURLToPath4 } from "node:url";
 
 // node_modules/system-architecture/index.js
 import { promisify as promisify2 } from "node:util";
-import process24 from "node:process";
-import childProcess2 from "node:child_process";
-var execFilePromises = promisify2(childProcess2.execFile);
+import process23 from "node:process";
+import childProcess from "node:child_process";
+var execFilePromises = promisify2(childProcess.execFile);
 function systemArchitectureSync() {
-  const { arch: arch2, platform: platform5, env: env3 } = process24;
+  const { arch: arch2, platform: platform5, env: env3 } = process23;
   if (platform5 === "darwin" && arch2 === "x64") {
-    const stdout = childProcess2.execFileSync("sysctl", ["-inq", "sysctl.proc_translated"], { encoding: "utf8" });
+    const stdout = childProcess.execFileSync("sysctl", ["-inq", "sysctl.proc_translated"], { encoding: "utf8" });
     return stdout.trim() === "1" ? "arm64" : "x64";
   }
   if (arch2 === "arm64" || arch2 === "x64") {
@@ -47142,7 +46858,7 @@ function systemArchitectureSync() {
     return "x64";
   }
   if (platform5 === "linux") {
-    const stdout = childProcess2.execFileSync("getconf", ["LONG_BIT"], { encoding: "utf8" });
+    const stdout = childProcess.execFileSync("getconf", ["LONG_BIT"], { encoding: "utf8" });
     if (stdout.trim() === "64") {
       return "x64";
     }
@@ -47162,12 +46878,12 @@ function is64bitSync() {
 }
 
 // node_modules/powershell-utils/index.js
-import process25 from "node:process";
+import process24 from "node:process";
 import { Buffer as Buffer6 } from "node:buffer";
 import { promisify as promisify3 } from "node:util";
-import childProcess3 from "node:child_process";
-var execFile = promisify3(childProcess3.execFile);
-var powerShellPath = () => `${process25.env.SYSTEMROOT || process25.env.windir || String.raw`C:\Windows`}\\System32\\WindowsPowerShell\\v1.0\\powershell.exe`;
+import childProcess2 from "node:child_process";
+var execFile = promisify3(childProcess2.execFile);
+var powerShellPath = () => `${process24.env.SYSTEMROOT || process24.env.windir || String.raw`C:\Windows`}\\System32\\WindowsPowerShell\\v1.0\\powershell.exe`;
 var argumentsPrefix = [
   "-NoProfile",
   "-NonInteractive",
@@ -47198,10 +46914,10 @@ executePowerShell.escapeArgument = escapeArgument;
 executePowerShell.createArguments = createArguments;
 
 // packages/cli/node_modules/clipboardy/lib/windows.js
-var __dirname2 = path15.dirname(fileURLToPath4(import.meta.url));
+var __dirname2 = path14.dirname(fileURLToPath4(import.meta.url));
 var binarySuffix = is64bitSync() ? "x86_64" : "i686";
-var windowBinaryPath = path15.join(__dirname2, `../fallbacks/windows/clipboard_${binarySuffix}.exe`);
-var hasWindowsBinaryFallback = fs22.existsSync(windowBinaryPath);
+var windowBinaryPath = path14.join(__dirname2, `../fallbacks/windows/clipboard_${binarySuffix}.exe`);
+var hasWindowsBinaryFallback = fs21.existsSync(windowBinaryPath);
 var psCopyScript = `
 try {
 	[Console]::InputEncoding = [System.Text.Encoding]::UTF8
@@ -47316,7 +47032,7 @@ var wsl_default = clipboard6;
 
 // packages/cli/node_modules/clipboardy/index.js
 var platformLib = (() => {
-  switch (process26.platform) {
+  switch (process25.platform) {
     case "darwin": {
       return macos_default;
     }
@@ -47324,7 +47040,7 @@ var platformLib = (() => {
       return windows_default;
     }
     case "android": {
-      if (process26.env.TERMUX_VERSION === void 0) {
+      if (process25.env.TERMUX_VERSION === void 0) {
         throw new Error("You need to install Termux for this module to work on Android: https://termux.com");
       }
       return termux_default;
@@ -47375,7 +47091,7 @@ var clipboard7 = {
 var clipboardy_default = clipboard7;
 
 // packages/cli/src/ui/utils/commandUtils.ts
-import fs23 from "node:fs";
+import fs22 from "node:fs";
 var AT_COMMAND_DETECT_REGEX = new RegExp(
   `(?<!\\\\)@${AT_COMMAND_PATH_REGEX_SOURCE}`
 );
@@ -47404,7 +47120,7 @@ var SCREEN_DCS_CHUNK_SIZE = 240;
 var pickTty = () => new Promise((resolve8) => {
   if (process.platform !== "win32") {
     try {
-      const devTty = fs23.createWriteStream("/dev/tty");
+      const devTty = fs22.createWriteStream("/dev/tty");
       const timeout = setTimeout(() => {
         devTty.removeAllListeners("open");
         devTty.removeAllListeners("error");
@@ -47485,7 +47201,7 @@ var writeAll = (stream, data) => new Promise((resolve8, reject) => {
   const fd = stream.fd;
   if (process.platform === "win32" && typeof fd === "number" && (stream === process.stdout || stream === process.stderr)) {
     try {
-      fs23.writeSync(fd, data);
+      fs22.writeSync(fd, data);
       resolve8();
       return;
     } catch (e) {
@@ -47601,16 +47317,16 @@ var parseSlashCommand = (query, commands) => {
 
 // packages/cli/src/ui/components/shared/text-buffer.ts
 var import_react39 = __toESM(require_react(), 1);
-import fs25 from "node:fs";
+import fs24 from "node:fs";
 import os5 from "node:os";
 import pathMod from "node:path";
-import * as path17 from "node:path";
+import * as path16 from "node:path";
 
 // packages/cli/src/ui/utils/clipboardUtils.ts
-import * as fs24 from "node:fs/promises";
-import { createWriteStream as createWriteStream2, existsSync as existsSync6, statSync as statSync2 } from "node:fs";
-import { execSync as execSync2, spawn as spawn2 } from "node:child_process";
-import * as path16 from "node:path";
+import * as fs23 from "node:fs/promises";
+import { createWriteStream as createWriteStream2, existsSync as existsSync5, statSync as statSync2 } from "node:fs";
+import { execSync, spawn } from "node:child_process";
+import * as path15 from "node:path";
 var IMAGE_EXTENSIONS = [
   ".png",
   ".jpg",
@@ -47631,7 +47347,7 @@ function getUserLinuxClipboardTool() {
   else if (displayServer === "x11") toolName = "xclip";
   else return null;
   try {
-    execSync2(`command -v ${toolName}`, { stdio: "ignore" });
+    execSync(`command -v ${toolName}`, { stdio: "ignore" });
     linuxClipboardTool = toolName;
     return toolName;
   } catch (e) {
@@ -47641,7 +47357,7 @@ function getUserLinuxClipboardTool() {
 }
 async function saveFromCommand(command, args, destination) {
   return new Promise((resolve8) => {
-    const child = spawn2(command, args);
+    const child = spawn(command, args);
     const fileStream = createWriteStream2(destination);
     let resolved = false;
     const safeResolve = (value) => {
@@ -47670,7 +47386,7 @@ async function saveFromCommand(command, args, destination) {
       }
       const checkFile = async () => {
         try {
-          const stats = await fs24.stat(destination);
+          const stats = await fs23.stat(destination);
           safeResolve(stats.size > 0);
         } catch (e) {
           debugLogger.debug(`Failed to stat output file ${destination}:`, e);
@@ -47757,7 +47473,7 @@ async function saveFileWithWlPaste(tempFilePath) {
     return true;
   }
   try {
-    await fs24.unlink(tempFilePath);
+    await fs23.unlink(tempFilePath);
   } catch {
   }
   return false;
@@ -47772,7 +47488,7 @@ var saveFileWithXclip = async (tempFilePath) => {
     return true;
   }
   try {
-    await fs24.unlink(tempFilePath);
+    await fs23.unlink(tempFilePath);
   } catch {
   }
   return false;
@@ -47781,15 +47497,15 @@ async function getProjectClipboardImagesDir(targetDir) {
   const storage = new Storage(targetDir);
   await storage.initialize();
   const baseDir = storage.getProjectTempDir();
-  return path16.join(baseDir, "images");
+  return path15.join(baseDir, "images");
 }
 async function saveClipboardImage(targetDir) {
   try {
     const tempDir = await getProjectClipboardImagesDir(targetDir);
-    await fs24.mkdir(tempDir, { recursive: true });
+    await fs23.mkdir(tempDir, { recursive: true });
     const timestamp = (/* @__PURE__ */ new Date()).getTime();
     if (process.platform === "linux") {
-      const tempFilePath = path16.join(tempDir, `clipboard-${timestamp}.png`);
+      const tempFilePath = path15.join(tempDir, `clipboard-${timestamp}.png`);
       const tool = getUserLinuxClipboardTool();
       if (tool === "wl-paste") {
         if (await saveFileWithWlPaste(tempFilePath)) return tempFilePath;
@@ -47802,7 +47518,7 @@ async function saveClipboardImage(targetDir) {
       return null;
     }
     if (process.platform === "win32") {
-      const tempFilePath = path16.join(tempDir, `clipboard-${timestamp}.png`);
+      const tempFilePath = path15.join(tempDir, `clipboard-${timestamp}.png`);
       const psPath = tempFilePath.replace(/'/g, "''");
       const script = `
         Add-Type -AssemblyName System.Windows.Forms
@@ -47820,7 +47536,7 @@ async function saveClipboardImage(targetDir) {
       ]);
       if (stdout.trim() === "success") {
         try {
-          const stats = await fs24.stat(tempFilePath);
+          const stats = await fs23.stat(tempFilePath);
           if (stats.size > 0) {
             return tempFilePath;
           }
@@ -47834,7 +47550,7 @@ async function saveClipboardImage(targetDir) {
       { class: "JPEG", extension: "jpg" }
     ];
     for (const format of formats) {
-      const tempFilePath = path16.join(
+      const tempFilePath = path15.join(
         tempDir,
         `clipboard-${timestamp}.${format.extension}`
       );
@@ -47855,7 +47571,7 @@ async function saveClipboardImage(targetDir) {
       const { stdout } = await spawnAsync("osascript", ["-e", script]);
       if (stdout.trim() === "success") {
         try {
-          const stats = await fs24.stat(tempFilePath);
+          const stats = await fs23.stat(tempFilePath);
           if (stats.size > 0) {
             return tempFilePath;
           }
@@ -47864,7 +47580,7 @@ async function saveClipboardImage(targetDir) {
         }
       }
       try {
-        await fs24.unlink(tempFilePath);
+        await fs23.unlink(tempFilePath);
       } catch (e) {
         debugLogger.debug("Failed to clean up temp file:", tempFilePath, e);
       }
@@ -47878,15 +47594,15 @@ async function saveClipboardImage(targetDir) {
 async function cleanupOldClipboardImages(targetDir) {
   try {
     const tempDir = await getProjectClipboardImagesDir(targetDir);
-    const files = await fs24.readdir(tempDir);
+    const files = await fs23.readdir(tempDir);
     const oneHourAgo = Date.now() - 60 * 60 * 1e3;
     for (const file of files) {
-      const ext = path16.extname(file).toLowerCase();
+      const ext = path15.extname(file).toLowerCase();
       if (file.startsWith("clipboard-") && IMAGE_EXTENSIONS.includes(ext)) {
-        const filePath = path16.join(tempDir, file);
-        const stats = await fs24.stat(filePath);
+        const filePath = path15.join(tempDir, file);
+        const stats = await fs23.stat(filePath);
         if (stats.mtimeMs < oneHourAgo) {
-          await fs24.unlink(filePath);
+          await fs23.unlink(filePath);
         }
       }
     }
@@ -47941,7 +47657,7 @@ function* splitDragAndDropPaths(text) {
 }
 function isValidFilePath(p2) {
   try {
-    return PATH_PREFIX_PATTERN.test(p2) && existsSync6(p2) && statSync2(p2).isFile();
+    return PATH_PREFIX_PATTERN.test(p2) && existsSync5(p2) && statSync2(p2).isFile();
   } catch {
     return false;
   }
@@ -49446,7 +49162,7 @@ function handleVimAction(state, action) {
 }
 
 // packages/cli/src/ui/utils/editorUtils.ts
-import { spawn as spawn3, spawnSync } from "node:child_process";
+import { spawn as spawn2, spawnSync } from "node:child_process";
 async function openFileInEditor(filePath, stdin, setRawMode, preferredEditorType) {
   let command = void 0;
   const args = [filePath];
@@ -49506,7 +49222,7 @@ async function openFileInEditor(filePath, stdin, setRawMode, preferredEditorType
       }
     } else {
       await new Promise((resolve8, reject) => {
-        const child = spawn3(executable, [...initialArgs, ...args], {
+        const child = spawn2(executable, [...initialArgs, ...args], {
           stdio: "inherit",
           shell: process.platform === "win32"
         });
@@ -50023,8 +49739,8 @@ function getTransformedImagePath(filePath) {
     unescaped.lastIndexOf("\\")
   );
   const fileName = lastSepIndex >= 0 ? unescaped.slice(lastSepIndex + 1) : unescaped;
-  const extension = path17.extname(fileName);
-  const baseName = path17.basename(fileName, extension);
+  const extension = path16.extname(fileName);
+  const baseName = path16.basename(fileName, extension);
   const maxBaseLength = 10;
   const truncatedBase = baseName.length > maxBaseLength ? `...${baseName.slice(-maxBaseLength)}` : baseName;
   return `[Image ${truncatedBase}${extension}]`;
@@ -51351,7 +51067,9 @@ function useTextBuffer({
     visualLayout,
     transformationsByLine,
     pastedContent,
-    expandedPaste
+    expandedPaste,
+    undoStack,
+    redoStack
   } = state;
   const text = (0, import_react39.useMemo)(() => lines.join("\n"), [lines]);
   const visualCursor = (0, import_react39.useMemo)(
@@ -51677,10 +51395,10 @@ function useTextBuffer({
     dispatch({ type: "vim_paste_before", payload: { count } });
   }, []);
   const openInExternalEditor = (0, import_react39.useCallback)(async () => {
-    const tmpDir = fs25.mkdtempSync(pathMod.join(os5.tmpdir(), "gemini-edit-"));
+    const tmpDir = fs24.mkdtempSync(pathMod.join(os5.tmpdir(), "gemini-edit-"));
     const filePath = pathMod.join(tmpDir, "buffer.txt");
     const expandedText = expandPastePlaceholders(text, pastedContent);
-    fs25.writeFileSync(filePath, expandedText, "utf8");
+    fs24.writeFileSync(filePath, expandedText, "utf8");
     dispatch({ type: "create_undo_snapshot" });
     try {
       await openFileInEditor(
@@ -51689,7 +51407,7 @@ function useTextBuffer({
         setRawMode,
         getPreferredEditor?.()
       );
-      let newText = fs25.readFileSync(filePath, "utf8");
+      let newText = fs24.readFileSync(filePath, "utf8");
       newText = newText.replace(/\r\n?/g, "\n");
       const sortedPlaceholders = Object.entries(pastedContent).sort(
         (a, b2) => b2[1].length - a[1].length
@@ -51708,11 +51426,11 @@ function useTextBuffer({
       );
     } finally {
       try {
-        fs25.unlinkSync(filePath);
+        fs24.unlinkSync(filePath);
       } catch {
       }
       try {
-        fs25.rmdirSync(tmpDir);
+        fs24.rmdirSync(tmpDir);
       } catch {
       }
     }
@@ -51805,10 +51523,16 @@ function useTextBuffer({
         return true;
       }
       if (keyMatchers["edit.undo" /* UNDO */](key)) {
+        if (undoStack.length === 0) {
+          return false;
+        }
         undo();
         return true;
       }
       if (keyMatchers["edit.redo" /* REDO */](key)) {
+        if (redoStack.length === 0) {
+          return false;
+        }
         redo();
         return true;
       }
@@ -51836,7 +51560,9 @@ function useTextBuffer({
       text,
       visualCursor,
       visualLines,
-      keyMatchers
+      keyMatchers,
+      undoStack.length,
+      redoStack.length
     ]
   );
   const visualScrollRow = (0, import_react39.useMemo)(() => {
@@ -52195,7 +51921,7 @@ function useTextBuffer({
 var import_react40 = __toESM(require_react(), 1);
 
 // packages/cli/src/config/extensions/update.ts
-import * as fs26 from "node:fs";
+import * as fs25 from "node:fs";
 async function updateExtension(extension, extensionManager, currentState, dispatchExtensionStateUpdate, enableExtensionReloading) {
   if (currentState === "updating" /* UPDATING */) {
     return void 0;
@@ -52297,7 +52023,7 @@ ${e}`
     await copyExtension(tempDir, extension.path);
     throw e;
   } finally {
-    await fs26.promises.rm(tempDir, { recursive: true, force: true });
+    await fs25.promises.rm(tempDir, { recursive: true, force: true });
   }
 }
 async function updateAllUpdatableExtensions(extensions, extensionsState, extensionManager, dispatch, enableExtensionReloading) {
@@ -52572,7 +52298,7 @@ var useInputState = () => {
 
 // packages/cli/src/ui/hooks/useSessionBrowser.ts
 var import_react44 = __toESM(require_react(), 1);
-import path18 from "node:path";
+import path17 from "node:path";
 var useSessionBrowser = (config, onLoadHistory) => {
   const [isSessionBrowserOpen, setIsSessionBrowserOpen] = (0, import_react44.useState)(false);
   return {
@@ -52589,12 +52315,12 @@ var useSessionBrowser = (config, onLoadHistory) => {
     handleResumeSession: (0, import_react44.useCallback)(
       async (session) => {
         try {
-          const chatsDir = path18.join(
+          const chatsDir = path17.join(
             config.storage.getProjectTempDir(),
             "chats"
           );
           const fileName = session.fileName;
-          const originalFilePath = path18.join(chatsDir, fileName);
+          const originalFilePath = path17.join(chatsDir, fileName);
           const conversation = await loadConversationRecord(originalFilePath);
           if (!conversation) {
             throw new Error(
@@ -52645,23 +52371,23 @@ var useSessionBrowser = (config, onLoadHistory) => {
 };
 
 // packages/cli/src/ui/utils/terminalSetup.ts
-import { promises as fs28 } from "node:fs";
+import { promises as fs27 } from "node:fs";
 import * as os6 from "node:os";
-import * as path20 from "node:path";
+import * as path19 from "node:path";
 import { exec as exec2 } from "node:child_process";
 import { promisify as promisify4 } from "node:util";
 var import_react45 = __toESM(require_react(), 1);
 
 // packages/cli/src/utils/persistentState.ts
-import * as fs27 from "node:fs";
-import * as path19 from "node:path";
+import * as fs26 from "node:fs";
+import * as path18 from "node:path";
 var STATE_FILENAME = "state.json";
 var PersistentState = class {
   cache = null;
   filePath = null;
   getPath() {
     if (!this.filePath) {
-      this.filePath = path19.join(Storage.getGlobalGeminiDir(), STATE_FILENAME);
+      this.filePath = path18.join(Storage.getGlobalGeminiDir(), STATE_FILENAME);
     }
     return this.filePath;
   }
@@ -52671,8 +52397,8 @@ var PersistentState = class {
     }
     try {
       const filePath = this.getPath();
-      if (fs27.existsSync(filePath)) {
-        const content = fs27.readFileSync(filePath, "utf-8");
+      if (fs26.existsSync(filePath)) {
+        const content = fs26.readFileSync(filePath, "utf-8");
         this.cache = JSON.parse(content);
       } else {
         this.cache = {};
@@ -52687,11 +52413,11 @@ var PersistentState = class {
     if (!this.cache) return;
     try {
       const filePath = this.getPath();
-      const dir = path19.dirname(filePath);
-      if (!fs27.existsSync(dir)) {
-        fs27.mkdirSync(dir, { recursive: true });
+      const dir = path18.dirname(filePath);
+      if (!fs26.existsSync(dir)) {
+        fs26.mkdirSync(dir, { recursive: true });
       }
-      fs27.writeFileSync(filePath, JSON.stringify(this.cache, null, 2));
+      fs26.writeFileSync(filePath, JSON.stringify(this.cache, null, 2));
     } catch (error) {
       debugLogger.warn("Failed to save persistent state:", error);
     }
@@ -52774,7 +52500,7 @@ async function backupFile(filePath) {
   try {
     const timestamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
     const backupPath = `${filePath}.backup.${timestamp}`;
-    await fs28.copyFile(filePath, backupPath);
+    await fs27.copyFile(filePath, backupPath);
   } catch (error) {
     debugLogger.warn(`Failed to create backup of ${filePath}:`, error);
   }
@@ -52782,7 +52508,7 @@ async function backupFile(filePath) {
 function getVSCodeStyleConfigDir(appName) {
   const platform5 = os6.platform();
   if (platform5 === "darwin") {
-    return path20.join(
+    return path19.join(
       homedir(),
       "Library",
       "Application Support",
@@ -52793,9 +52519,9 @@ function getVSCodeStyleConfigDir(appName) {
     if (!process.env["APPDATA"]) {
       return null;
     }
-    return path20.join(process.env["APPDATA"], appName, "User");
+    return path19.join(process.env["APPDATA"], appName, "User");
   } else {
-    return path20.join(homedir(), ".config", appName, "User");
+    return path19.join(homedir(), ".config", appName, "User");
   }
 }
 async function configureVSCodeStyle(terminalName, appName) {
@@ -52806,12 +52532,12 @@ async function configureVSCodeStyle(terminalName, appName) {
       message: `Could not determine ${terminalName} config path on Windows: APPDATA environment variable is not set.`
     };
   }
-  const keybindingsFile = path20.join(configDir, "keybindings.json");
+  const keybindingsFile = path19.join(configDir, "keybindings.json");
   try {
-    await fs28.mkdir(configDir, { recursive: true });
+    await fs27.mkdir(configDir, { recursive: true });
     let keybindings = [];
     try {
-      const content = await fs28.readFile(keybindingsFile, "utf8");
+      const content = await fs27.readFile(keybindingsFile, "utf8");
       await backupFile(keybindingsFile);
       try {
         const cleanContent = stripJsonComments(content);
@@ -52909,7 +52635,7 @@ Please check and modify manually if needed: ${keybindingsFile}`
         keybindings.unshift(target);
       }
     }
-    await fs28.writeFile(keybindingsFile, JSON.stringify(keybindings, null, 4));
+    await fs27.writeFile(keybindingsFile, JSON.stringify(keybindings, null, 4));
     return {
       success: true,
       message: `Added ${targetBindings.map((b2) => b2.key.charAt(0).toUpperCase() + b2.key.slice(1)).join(
@@ -52943,9 +52669,9 @@ async function shouldPromptForTerminalSetup() {
   if (!configDir) {
     return false;
   }
-  const keybindingsFile = path20.join(configDir, "keybindings.json");
+  const keybindingsFile = path19.join(configDir, "keybindings.json");
   try {
-    const content = await fs28.readFile(keybindingsFile, "utf8");
+    const content = await fs27.readFile(keybindingsFile, "utf8");
     const cleanContent = stripJsonComments(content);
     const parsedContent = JSON.parse(cleanContent);
     if (!Array.isArray(parsedContent)) {
@@ -53037,17 +52763,6 @@ function startAutoMemoryIfEnabled(config) {
   });
 }
 
-// packages/cli/src/utils/processUtils.ts
-var RELAUNCH_EXIT_CODE = 199;
-var isRelaunching = false;
-async function relaunchApp() {
-  if (isRelaunching) return;
-  isRelaunching = true;
-  await waitForUpdateCompletion();
-  await runExitCleanup();
-  process.exit(RELAUNCH_EXIT_CODE);
-}
-
 // packages/cli/src/commands/gemma/status.ts
 var import_chalk6 = __toESM(require_source(), 1);
 async function checkGemmaStatus(port) {
@@ -53512,6 +53227,549 @@ var formatResetTime = (resetTime, format = "full") => {
   return `${duration} at ${timeStr}`;
 };
 
+// packages/cli/src/services/FileCommandLoader.ts
+var import_toml = __toESM(require_toml(), 1);
+import { promises as fs28 } from "node:fs";
+import path20 from "node:path";
+
+// packages/cli/src/services/prompt-processors/argumentProcessor.ts
+var DefaultArgumentProcessor = class {
+  async process(prompt, context) {
+    if (context.invocation?.args) {
+      return appendToLastTextPart(prompt, context.invocation.raw);
+    }
+    return prompt;
+  }
+};
+
+// packages/cli/src/services/prompt-processors/types.ts
+var SHORTHAND_ARGS_PLACEHOLDER = "{{args}}";
+var SHELL_INJECTION_TRIGGER = "!{";
+var AT_FILE_INJECTION_TRIGGER = "@{";
+
+// packages/cli/src/services/prompt-processors/injectionParser.ts
+function extractInjections(prompt, trigger, contextName) {
+  const injections = [];
+  let index = 0;
+  while (index < prompt.length) {
+    const startIndex = prompt.indexOf(trigger, index);
+    if (startIndex === -1) {
+      break;
+    }
+    let currentIndex = startIndex + trigger.length;
+    let braceCount = 1;
+    let foundEnd = false;
+    while (currentIndex < prompt.length) {
+      const char = prompt[currentIndex];
+      if (char === "{") {
+        braceCount++;
+      } else if (char === "}") {
+        braceCount--;
+        if (braceCount === 0) {
+          const injectionContent = prompt.substring(
+            startIndex + trigger.length,
+            currentIndex
+          );
+          const endIndex = currentIndex + 1;
+          injections.push({
+            content: injectionContent.trim(),
+            startIndex,
+            endIndex
+          });
+          index = endIndex;
+          foundEnd = true;
+          break;
+        }
+      }
+      currentIndex++;
+    }
+    if (!foundEnd) {
+      const contextInfo = contextName ? ` in command '${contextName}'` : "";
+      throw new Error(
+        `Invalid syntax${contextInfo}: Unclosed injection starting at index ${startIndex} ('${trigger}'). Ensure braces are balanced. Paths or commands with unbalanced braces are not supported directly.`
+      );
+    }
+  }
+  return injections;
+}
+
+// packages/cli/src/services/prompt-processors/shellProcessor.ts
+var ConfirmationRequiredError = class extends Error {
+  constructor(message, commandsToConfirm) {
+    super(message);
+    this.commandsToConfirm = commandsToConfirm;
+    this.name = "ConfirmationRequiredError";
+  }
+};
+var ShellProcessor = class {
+  constructor(commandName) {
+    this.commandName = commandName;
+  }
+  async process(prompt, context) {
+    return flatMapTextParts(
+      prompt,
+      (text) => this.processString(text, context)
+    );
+  }
+  async processString(prompt, context) {
+    const userArgsRaw = context.invocation?.args || "";
+    if (!prompt.includes(SHELL_INJECTION_TRIGGER)) {
+      return [
+        { text: prompt.replaceAll(SHORTHAND_ARGS_PLACEHOLDER, userArgsRaw) }
+      ];
+    }
+    const config = context.services.agentContext?.config;
+    if (!config) {
+      throw new Error(
+        `Security configuration not loaded. Cannot verify shell command permissions for '${this.commandName}'. Aborting.`
+      );
+    }
+    const injections = extractInjections(
+      prompt,
+      SHELL_INJECTION_TRIGGER,
+      this.commandName
+    );
+    if (injections.length === 0) {
+      return [
+        { text: prompt.replaceAll(SHORTHAND_ARGS_PLACEHOLDER, userArgsRaw) }
+      ];
+    }
+    const { shell: shell2 } = getShellConfiguration();
+    const userArgsEscaped = escapeShellArg(userArgsRaw, shell2);
+    const resolvedInjections = injections.map(
+      (injection) => {
+        const command = injection.content;
+        if (command === "") {
+          return { ...injection, resolvedCommand: void 0 };
+        }
+        const resolvedCommand = command.replaceAll(
+          SHORTHAND_ARGS_PLACEHOLDER,
+          userArgsEscaped
+        );
+        return { ...injection, resolvedCommand };
+      }
+    );
+    const commandsToConfirm = /* @__PURE__ */ new Set();
+    for (const injection of resolvedInjections) {
+      const command = injection.resolvedCommand;
+      if (!command) continue;
+      if (context.session.sessionShellAllowlist?.has(command)) {
+        continue;
+      }
+      const { decision } = await config.getPolicyEngine().check(
+        {
+          name: "run_shell_command",
+          args: { command }
+        },
+        void 0
+      );
+      if (decision === PolicyDecision.DENY) {
+        throw new Error(
+          `${this.commandName} cannot be run. Blocked command: "${command}". Reason: Blocked by policy.`
+        );
+      } else if (decision === PolicyDecision.ASK_USER) {
+        commandsToConfirm.add(command);
+      }
+    }
+    if (commandsToConfirm.size > 0) {
+      throw new ConfirmationRequiredError(
+        "Shell command confirmation required",
+        Array.from(commandsToConfirm)
+      );
+    }
+    let processedPrompt = "";
+    let lastIndex = 0;
+    for (const injection of resolvedInjections) {
+      const segment = prompt.substring(lastIndex, injection.startIndex);
+      processedPrompt += segment.replaceAll(
+        SHORTHAND_ARGS_PLACEHOLDER,
+        userArgsRaw
+      );
+      if (injection.resolvedCommand) {
+        const activeTheme = themeManager.getActiveTheme();
+        const shellExecutionConfig = {
+          ...config.getShellExecutionConfig(),
+          defaultFg: activeTheme.colors.Foreground,
+          defaultBg: activeTheme.colors.Background
+        };
+        const { result } = await ShellExecutionService.execute(
+          injection.resolvedCommand,
+          config.getTargetDir(),
+          () => {
+          },
+          new AbortController().signal,
+          config.getEnableInteractiveShell(),
+          shellExecutionConfig
+        );
+        const executionResult = await result;
+        if (executionResult.error && !executionResult.aborted) {
+          throw new Error(
+            `Failed to start shell command in '${this.commandName}': ${executionResult.error.message}. Command: ${injection.resolvedCommand}`
+          );
+        }
+        processedPrompt += executionResult.output;
+        if (executionResult.aborted) {
+          processedPrompt += `
+[Shell command '${injection.resolvedCommand}' aborted]`;
+        } else if (executionResult.exitCode !== 0 && executionResult.exitCode !== null) {
+          processedPrompt += `
+[Shell command '${injection.resolvedCommand}' exited with code ${executionResult.exitCode}]`;
+        } else if (executionResult.signal !== null) {
+          processedPrompt += `
+[Shell command '${injection.resolvedCommand}' terminated by signal ${executionResult.signal}]`;
+        }
+      }
+      lastIndex = injection.endIndex;
+    }
+    const finalSegment = prompt.substring(lastIndex);
+    processedPrompt += finalSegment.replaceAll(
+      SHORTHAND_ARGS_PLACEHOLDER,
+      userArgsRaw
+    );
+    return [{ text: processedPrompt }];
+  }
+};
+
+// packages/cli/src/services/prompt-processors/atFileProcessor.ts
+var AtFileProcessor = class {
+  constructor(commandName) {
+    this.commandName = commandName;
+  }
+  async process(input, context) {
+    const config = context.services.agentContext?.config;
+    if (!config) {
+      return input;
+    }
+    return flatMapTextParts(input, async (text) => {
+      if (!text.includes(AT_FILE_INJECTION_TRIGGER)) {
+        return [{ text }];
+      }
+      const injections = extractInjections(
+        text,
+        AT_FILE_INJECTION_TRIGGER,
+        this.commandName
+      );
+      if (injections.length === 0) {
+        return [{ text }];
+      }
+      const output = [];
+      let lastIndex = 0;
+      for (const injection of injections) {
+        const prefix = text.substring(lastIndex, injection.startIndex);
+        if (prefix) {
+          output.push({ text: prefix });
+        }
+        const pathStr = injection.content;
+        try {
+          const fileContentParts = await readPathFromWorkspace(pathStr, config);
+          if (fileContentParts.length === 0) {
+            const uiMessage = `File '@{${pathStr}}' was ignored by .gitignore or .geminiignore and was not included in the prompt.`;
+            context.ui.addItem(
+              { type: "info" /* INFO */, text: uiMessage },
+              Date.now()
+            );
+          }
+          output.push(...fileContentParts);
+        } catch (error) {
+          const message = error instanceof Error ? error.message : String(error);
+          const uiMessage = `Failed to inject content for '@{${pathStr}}': ${message}`;
+          debugLogger.error(
+            `Error while loading custom command (${context.invocation.name}) ${uiMessage}. Leaving placeholder in prompt.`
+          );
+          context.ui.addItem(
+            { type: "error" /* ERROR */, text: uiMessage },
+            Date.now()
+          );
+          const placeholder = text.substring(
+            injection.startIndex,
+            injection.endIndex
+          );
+          output.push({ text: placeholder });
+        }
+        lastIndex = injection.endIndex;
+      }
+      const suffix = text.substring(lastIndex);
+      if (suffix) {
+        output.push({ text: suffix });
+      }
+      return output;
+    });
+  }
+};
+
+// packages/cli/src/services/FileCommandLoader.ts
+var TomlCommandDefSchema = external_exports.object({
+  prompt: external_exports.string({
+    required_error: "The 'prompt' field is required.",
+    invalid_type_error: "The 'prompt' field must be a string."
+  }),
+  description: external_exports.string().optional()
+});
+var FileCommandLoader = class {
+  constructor(config) {
+    this.config = config;
+    this.folderTrustEnabled = !!config?.getFolderTrust();
+    this.isTrustedFolder = !!config?.isTrustedFolder();
+    this.projectRoot = config?.getProjectRoot() || process.cwd();
+  }
+  projectRoot;
+  folderTrustEnabled;
+  isTrustedFolder;
+  /**
+   * Loads all commands from user, project, and extension directories.
+   * Returns commands in order: user → project → extensions (alphabetically).
+   *
+   * Order is important for conflict resolution in CommandService:
+   * - User/project commands (without extensionName) use "last wins" strategy
+   * - Extension commands (with extensionName) get renamed if conflicts exist
+   *
+   * @param signal An AbortSignal to cancel the loading process.
+   * @returns A promise that resolves to an array of all loaded SlashCommands.
+   */
+  async loadCommands(signal) {
+    if (this.folderTrustEnabled && !this.isTrustedFolder) {
+      return [];
+    }
+    const allCommands = [];
+    const globOptions = {
+      nodir: true,
+      dot: true,
+      signal,
+      follow: true
+    };
+    const commandDirs = this.getCommandDirectories();
+    for (const dirInfo of commandDirs) {
+      try {
+        const files = await glob("**/*.toml", {
+          ...globOptions,
+          cwd: dirInfo.path
+        });
+        const commandPromises = files.map(
+          (file) => this.parseAndAdaptFile(
+            path20.join(dirInfo.path, file),
+            dirInfo.path,
+            dirInfo.kind,
+            dirInfo.extensionName,
+            dirInfo.extensionId
+          )
+        );
+        const commands = (await Promise.all(commandPromises)).filter(
+          (cmd) => cmd !== null
+        );
+        allCommands.push(...commands);
+      } catch (error) {
+        if (!signal.aborted && // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+        error?.code !== "ENOENT") {
+          coreEvents.emitFeedback(
+            "error",
+            `[FileCommandLoader] Error loading commands from ${dirInfo.path}:`,
+            error
+          );
+        }
+      }
+    }
+    return allCommands;
+  }
+  /**
+   * Lists available .toml command files from user, project, and extension directories.
+   */
+  async listAvailableFiles() {
+    const directories = this.getCommandDirectories();
+    const groups = [];
+    for (const dir of directories) {
+      const displayName = this.getDisplayName(dir);
+      try {
+        const files = await glob("**/*.toml", { cwd: dir.path });
+        if (files.length > 0) {
+          groups.push({
+            displayName,
+            path: dir.path,
+            files: [...files].sort()
+          });
+        }
+      } catch (e) {
+        if (e.code === "ENOENT") {
+          continue;
+        }
+        groups.push({
+          displayName,
+          path: dir.path,
+          files: [],
+          error: e instanceof Error ? e.message : String(e)
+        });
+      }
+    }
+    return groups;
+  }
+  /**
+   * Returns a human-readable display name for the command directory source.
+   */
+  getDisplayName(dir) {
+    switch (dir.kind) {
+      case "user-file" /* USER_FILE */:
+        return "User";
+      case "workspace-file" /* WORKSPACE_FILE */:
+        return "Project";
+      case "extension-file" /* EXTENSION_FILE */:
+        return `Extension: ${dir.extensionName || "Unknown"}`;
+      default:
+        return "Custom";
+    }
+  }
+  /**
+   * Get all command directories in order for loading.
+   * User commands → Project commands → Extension commands
+   * This order ensures extension commands can detect all conflicts.
+   */
+  getCommandDirectories() {
+    const dirs = [];
+    const storage = this.config?.storage ?? new Storage(this.projectRoot);
+    dirs.push({
+      path: Storage.getUserCommandsDir(),
+      kind: "user-file" /* USER_FILE */
+    });
+    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) => ({
+        path: path20.join(ext.path, "commands"),
+        kind: "extension-file" /* EXTENSION_FILE */,
+        extensionName: ext.name,
+        extensionId: ext.id
+      }));
+      dirs.push(...extensionCommandDirs);
+    }
+    return dirs;
+  }
+  /**
+   * Parses a single .toml file and transforms it into a SlashCommand object.
+   * @param filePath The absolute path to the .toml file.
+   * @param baseDir The root command directory for name calculation.
+   * @param kind The CommandKind.
+   * @param extensionName Optional extension name to prefix commands with.
+   * @returns A promise resolving to a SlashCommand, or null if the file is invalid.
+   */
+  async parseAndAdaptFile(filePath, baseDir, kind, extensionName, extensionId) {
+    let fileContent;
+    try {
+      fileContent = await fs28.readFile(filePath, "utf-8");
+    } catch (error) {
+      coreEvents.emitFeedback(
+        "error",
+        `[FileCommandLoader] Failed to read file ${filePath}:`,
+        error instanceof Error ? error.message : String(error)
+      );
+      return null;
+    }
+    let parsed;
+    try {
+      parsed = import_toml.default.parse(fileContent);
+    } catch (error) {
+      coreEvents.emitFeedback(
+        "error",
+        `[FileCommandLoader] Failed to parse TOML file ${filePath}:`,
+        error instanceof Error ? error.message : String(error)
+      );
+      return null;
+    }
+    const validationResult = TomlCommandDefSchema.safeParse(parsed);
+    if (!validationResult.success) {
+      coreEvents.emitFeedback(
+        "error",
+        `[FileCommandLoader] Skipping invalid command file: ${filePath}. Validation errors:`,
+        validationResult.error.flatten()
+      );
+      return null;
+    }
+    const validDef = validationResult.data;
+    const relativePathWithExt = path20.relative(baseDir, filePath);
+    const relativePath = relativePathWithExt.substring(
+      0,
+      relativePathWithExt.length - 5
+      // length of '.toml'
+    );
+    const baseCommandName = relativePath.split(path20.sep).map((segment) => {
+      let sanitized = segment.replace(/[^a-zA-Z0-9_\-.]/g, "_");
+      if (sanitized.length > 50) {
+        sanitized = sanitized.substring(0, 47) + "...";
+      }
+      return sanitized;
+    }).join(":");
+    const defaultDescription = `Custom command from ${path20.basename(filePath)}`;
+    let description = validDef.description || defaultDescription;
+    description = sanitizeForDisplay(description, 100);
+    if (extensionName) {
+      description = `[${extensionName}] ${description}`;
+    }
+    const processors = [];
+    const usesArgs = validDef.prompt.includes(SHORTHAND_ARGS_PLACEHOLDER);
+    const usesShellInjection = validDef.prompt.includes(
+      SHELL_INJECTION_TRIGGER
+    );
+    const usesAtFileInjection = validDef.prompt.includes(
+      AT_FILE_INJECTION_TRIGGER
+    );
+    if (usesAtFileInjection) {
+      processors.push(new AtFileProcessor(baseCommandName));
+    }
+    if (usesShellInjection || usesArgs) {
+      processors.push(new ShellProcessor(baseCommandName));
+    }
+    if (!usesArgs) {
+      processors.push(new DefaultArgumentProcessor());
+    }
+    return {
+      name: baseCommandName,
+      description,
+      kind,
+      extensionName,
+      extensionId,
+      action: async (context, _args) => {
+        if (!context.invocation) {
+          coreEvents.emitFeedback(
+            "error",
+            `[FileCommandLoader] Critical error: Command '${baseCommandName}' was executed without invocation context.`
+          );
+          return {
+            type: "submit_prompt",
+            content: [{ text: validDef.prompt }]
+            // Fallback to unprocessed prompt
+          };
+        }
+        try {
+          let processedContent = [
+            { text: validDef.prompt }
+          ];
+          for (const processor of processors) {
+            processedContent = await processor.process(
+              processedContent,
+              context
+            );
+          }
+          return {
+            type: "submit_prompt",
+            content: processedContent
+          };
+        } catch (e) {
+          if (e instanceof ConfirmationRequiredError) {
+            return {
+              type: "confirm_shell_commands",
+              commandsToConfirm: e.commandsToConfirm,
+              originalInvocation: {
+                raw: context.invocation.raw
+              }
+            };
+          }
+          throw e;
+        }
+      }
+    };
+  }
+};
+
 // packages/cli/src/ui/hooks/useMouseClick.ts
 var import_react46 = __toESM(require_react(), 1);
 var useMouseClick = (containerRef, handler2, options = {}) => {
@@ -54390,7 +54648,7 @@ var _ExpandableText = ({
 var ExpandableText = import_react52.default.memo(_ExpandableText);
 
 // packages/cli/src/ui/key/keybindingUtils.ts
-import process27 from "node:process";
+import process26 from "node:process";
 var KEY_NAME_MAP = {
   enter: "Enter",
   escape: "Esc",
@@ -54434,7 +54692,7 @@ var MODIFIER_MAPS = {
   }
 };
 function formatKeyBinding(binding, platform5) {
-  const activePlatform = platform5 ?? (process27.env["FORCE_GENERIC_KEYBINDING_HINTS"] ? "default" : process27.platform);
+  const activePlatform = platform5 ?? (process26.env["FORCE_GENERIC_KEYBINDING_HINTS"] ? "default" : process26.platform);
   const modMap = MODIFIER_MAPS[activePlatform] || MODIFIER_MAPS["default"];
   const parts = [];
   if (binding.ctrl) parts.push(modMap.ctrl);
@@ -54454,7 +54712,7 @@ function formatCommand(command, config = defaultKeyBindingConfig, platform5) {
 }
 
 // packages/cli/src/ui/commands/aboutCommand.ts
-import process28 from "node:process";
+import process27 from "node:process";
 var aboutCommand = {
   name: "about",
   description: "Show version info",
@@ -54462,17 +54720,17 @@ var aboutCommand = {
   autoExecute: true,
   isSafeConcurrent: true,
   action: async (context) => {
-    const osVersion = process28.platform;
+    const osVersion = process27.platform;
     let sandboxEnv = "no sandbox";
-    if (process28.env["SANDBOX"] && process28.env["SANDBOX"] !== "sandbox-exec") {
-      sandboxEnv = process28.env["SANDBOX"];
-    } else if (process28.env["SANDBOX"] === "sandbox-exec") {
-      sandboxEnv = `sandbox-exec (${process28.env["SEATBELT_PROFILE"] || "unknown"})`;
+    if (process27.env["SANDBOX"] && process27.env["SANDBOX"] !== "sandbox-exec") {
+      sandboxEnv = process27.env["SANDBOX"];
+    } else if (process27.env["SANDBOX"] === "sandbox-exec") {
+      sandboxEnv = `sandbox-exec (${process27.env["SEATBELT_PROFILE"] || "unknown"})`;
     }
     const modelVersion = context.services.agentContext?.config.getModel() || "Unknown";
     const cliVersion = await getVersion();
     const selectedAuthType = context.services.settings.merged.security.auth.selectedType || "";
-    const gcpProject = process28.env["GOOGLE_CLOUD_PROJECT"] || "";
+    const gcpProject = process27.env["GOOGLE_CLOUD_PROJECT"] || "";
     const ideClient = await getIdeClientName(context);
     const userAccountManager = new UserAccountManager();
     const cachedAccount = userAccountManager.getCachedGoogleAccount();
@@ -54529,10 +54787,10 @@ function enableFeature(settings, featureName, strategy) {
     };
   }
   const modifiedScopes = [];
-  for (const { scope, path: path37 } of foundInDisabledScopes) {
+  for (const { scope, path: path36 } of foundInDisabledScopes) {
     if (isLoadableSettingScope(scope)) {
       strategy.enable(settings, scope, featureName);
-      modifiedScopes.push({ scope, path: path37 });
+      modifiedScopes.push({ scope, path: path36 });
     }
   }
   return {
@@ -55000,10 +55258,10 @@ var authCommand = {
 };
 
 // packages/cli/src/ui/commands/bugCommand.ts
-import process29 from "node:process";
+import process28 from "node:process";
 
 // packages/cli/src/generated/git-commit.ts
-var GIT_COMMIT_INFO = "7d233ddd5";
+var GIT_COMMIT_INFO = "a9bd7ed75";
 
 // packages/cli/src/ui/utils/historyExportUtils.ts
 import * as fsPromises from "node:fs/promises";
@@ -55061,16 +55319,16 @@ var bugCommand = {
     const bugDescription = (args || "").trim();
     const agentContext = context.services.agentContext;
     const config = agentContext?.config;
-    const osVersion = `${process29.platform} ${process29.version}`;
+    const osVersion = `${process28.platform} ${process28.version}`;
     let sandboxEnv = "no sandbox";
-    if (process29.env["SANDBOX"] && process29.env["SANDBOX"] !== "sandbox-exec") {
-      sandboxEnv = process29.env["SANDBOX"].replace(/^gemini-(?:code-)?/, "");
-    } else if (process29.env["SANDBOX"] === "sandbox-exec") {
-      sandboxEnv = `sandbox-exec (${process29.env["SEATBELT_PROFILE"] || "unknown"})`;
+    if (process28.env["SANDBOX"] && process28.env["SANDBOX"] !== "sandbox-exec") {
+      sandboxEnv = process28.env["SANDBOX"].replace(/^gemini-(?:code-)?/, "");
+    } else if (process28.env["SANDBOX"] === "sandbox-exec") {
+      sandboxEnv = `sandbox-exec (${process28.env["SEATBELT_PROFILE"] || "unknown"})`;
     }
     const modelVersion = config?.getModel() || "Unknown";
     const cliVersion = await getVersion();
-    const memoryUsage = formatBytes(process29.memoryUsage().rss);
+    const memoryUsage = formatBytes(process28.memoryUsage().rss);
     const ideClient = await getIdeClientName2(context);
     const terminalName = terminalCapabilityManager.getTerminalName() || "Unknown";
     const terminalBgColor = terminalCapabilityManager.getTerminalBackgroundColor() || "Unknown";
@@ -55555,13 +55813,54 @@ var clearCommand = {
 };
 
 // packages/cli/src/ui/commands/commandsCommand.ts
-async function listAction(_context, _args) {
+async function defaultAction(_context, _args) {
   return {
     type: "message",
     messageType: "info",
-    content: 'Use "/commands reload" to reload custom command definitions from .toml files.'
+    content: 'Use "/commands list" to view available .toml files, or "/commands reload" to reload custom command definitions.'
   };
 }
+async function listSubcommandAction(context) {
+  try {
+    const config = context.services.agentContext?.config ?? null;
+    const loader = new FileCommandLoader(config);
+    const groups = await loader.listAvailableFiles();
+    const results = [];
+    for (const group of groups) {
+      results.push(`### ${group.displayName} Commands (${group.path})`);
+      if (group.error) {
+        results.push(`- (Error reading directory: ${group.error})`);
+      } else {
+        group.files.forEach((file) => results.push(`- ${file}`));
+      }
+    }
+    results.push(
+      "\n_Note: MCP prompts are dynamically loaded from configured MCP servers._"
+    );
+    if (results.length === 1) {
+      return {
+        type: "message",
+        messageType: "info",
+        content: "No custom command files (.toml) found.\n\n_Note: MCP prompts are dynamically loaded from configured MCP servers._"
+      };
+    }
+    context.ui.addItem(
+      {
+        type: "info" /* INFO */,
+        text: results.join("\n")
+      },
+      Date.now()
+    );
+  } catch (error) {
+    context.ui.addItem(
+      {
+        type: "error" /* ERROR */,
+        text: `Failed to list commands: ${error instanceof Error ? error.message : String(error)}`
+      },
+      Date.now()
+    );
+  }
+}
 async function reloadAction(context) {
   try {
     context.ui.reloadCommands();
@@ -55584,10 +55883,17 @@ async function reloadAction(context) {
 }
 var commandsCommand = {
   name: "commands",
-  description: "Manage custom slash commands. Usage: /commands [reload]",
+  description: "Manage custom slash commands. Usage: /commands [list|reload]",
   kind: "built-in" /* BUILT_IN */,
   autoExecute: false,
   subCommands: [
+    {
+      name: "list",
+      description: "List available custom command .toml files. Usage: /commands list",
+      kind: "built-in" /* BUILT_IN */,
+      autoExecute: true,
+      action: listSubcommandAction
+    },
     {
       name: "reload",
       altNames: ["refresh"],
@@ -55597,7 +55903,7 @@ var commandsCommand = {
       action: reloadAction
     }
   ],
-  action: listAction
+  action: defaultAction
 };
 
 // packages/cli/src/ui/commands/compressCommand.ts
@@ -55730,7 +56036,7 @@ var corgiCommand = {
 };
 
 // packages/cli/src/ui/commands/docsCommand.ts
-import process30 from "node:process";
+import process29 from "node:process";
 var docsCommand = {
   name: "docs",
   description: "Open full Gemini CLI documentation in your browser",
@@ -55738,7 +56044,7 @@ var docsCommand = {
   autoExecute: true,
   action: async (context) => {
     const docsUrl = "https://goo.gle/gemini-cli-docs";
-    if (process30.env["SANDBOX"] && process30.env["SANDBOX"] !== "sandbox-exec") {
+    if (process29.env["SANDBOX"] && process29.env["SANDBOX"] !== "sandbox-exec") {
       context.ui.addItem(
         {
           type: "info" /* INFO */,
@@ -56005,7 +56311,7 @@ var editorCommand = {
 };
 
 // packages/cli/src/ui/commands/extensionsCommand.ts
-import process31 from "node:process";
+import process30 from "node:process";
 import { stat as stat5 } from "node:fs/promises";
 
 // packages/cli/src/ui/components/ConfigExtensionDialog.tsx
@@ -57137,7 +57443,7 @@ function showMessageIfNoExtensions(context, extensions) {
   }
   return false;
 }
-async function listAction2(context) {
+async function listAction(context) {
   const extensions = context.services.agentContext?.config ? listExtensions(context.services.agentContext.config) : [];
   if (showMessageIfNoExtensions(context, extensions)) {
     return;
@@ -57341,12 +57647,12 @@ async function exploreAction(context) {
     }
   }
   const extensionsUrl = "https://geminicli.com/extensions/";
-  if (process31.env["NODE_ENV"] === "test") {
+  if (process30.env["NODE_ENV"] === "test") {
     context.ui.addItem({
       type: "info" /* INFO */,
       text: `Would open extensions page in your browser: ${extensionsUrl} (skipped in test environment)`
     });
-  } else if (process31.env["SANDBOX"] && process31.env["SANDBOX"] !== "sandbox-exec") {
+  } else if (process30.env["SANDBOX"] && process30.env["SANDBOX"] !== "sandbox-exec") {
     context.ui.addItem({
       type: "info" /* INFO */,
       text: `View available extensions at ${extensionsUrl}`
@@ -57735,7 +58041,7 @@ var listExtensionsCommand = {
   kind: "built-in" /* BUILT_IN */,
   autoExecute: true,
   takesArgs: false,
-  action: listAction2
+  action: listAction
 };
 var updateExtensionsCommand = {
   name: "update",
@@ -57777,6 +58083,7 @@ var linkCommand = {
 };
 var uninstallCommand = {
   name: "uninstall",
+  altNames: ["delete"],
   description: "Uninstall an extension",
   kind: "built-in" /* BUILT_IN */,
   autoExecute: false,
@@ -57868,11 +58175,11 @@ var ConsoleSummaryDisplay = ({
 };
 
 // packages/cli/src/ui/components/Footer.tsx
-import process33 from "node:process";
+import process32 from "node:process";
 
 // packages/cli/src/ui/components/MemoryUsageDisplay.tsx
 var import_react62 = __toESM(require_react(), 1);
-import process32 from "node:process";
+import process31 from "node:process";
 var import_jsx_runtime20 = __toESM(require_jsx_runtime(), 1);
 var MemoryUsageDisplay = ({ color = theme.text.primary, isActive = true }) => {
   const [memoryUsage, setMemoryUsage] = (0, import_react62.useState)("");
@@ -57882,7 +58189,7 @@ var MemoryUsageDisplay = ({ color = theme.text.primary, isActive = true }) => {
       return;
     }
     const updateMemory = () => {
-      const usage = process32.memoryUsage().rss;
+      const usage = process31.memoryUsage().rss;
       setMemoryUsage(formatBytes(usage));
       setMemoryUsageColor(
         usage >= 2 * 1024 * 1024 * 1024 ? theme.status.error : color
@@ -58135,7 +58442,7 @@ var SandboxIndicator = ({
   if (isTrustedFolder === false) {
     return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(Text, { color: theme.status.warning, children: "untrusted" });
   }
-  const sandbox = process33.env["SANDBOX"];
+  const sandbox = process32.env["SANDBOX"];
   if (sandbox) {
     return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(Text, { color: theme.status.warning, children: "current process" });
   }
@@ -58310,7 +58617,7 @@ var Footer = () => {
       }
       case "sandbox": {
         let str = "no sandbox";
-        const sandbox = process33.env["SANDBOX"];
+        const sandbox = process32.env["SANDBOX"];
         if (isTrustedFolder === false) str = "untrusted";
         else if (sandbox) str = "current process";
         else if (config.getSandboxEnabled()) str = "all tools";
@@ -59590,14 +59897,14 @@ function enableHook(settings, hookName) {
   }
   const modifiedScopes = [];
   try {
-    for (const { scope, path: path37 } of foundInDisabledScopes) {
+    for (const { scope, path: path36 } 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: path36 });
       }
     }
   } catch (error) {
@@ -59892,7 +60199,7 @@ async function enableAction3(context, args) {
   }
   const feedback = renderHookActionFeedback(
     result,
-    (label, path37) => `${label} (${path37})`
+    (label, path36) => `${label} (${path36})`
   );
   return {
     type: "message",
@@ -59934,7 +60241,7 @@ async function disableAction3(context, args) {
   }
   const feedback = renderHookActionFeedback(
     result,
-    (label, path37) => `${label} (${path37})`
+    (label, path36) => `${label} (${path36})`
   );
   return {
     type: "message",
@@ -60488,7 +60795,7 @@ Use /mcp auth <server-name> to authenticate.`
         type: "info",
         text: `Starting OAuth authentication for MCP server '${serverName}'...`
       });
-      const { MCPOAuthProvider } = await import("./dist-NSJ6AA4L.js");
+      const { MCPOAuthProvider } = await import("./dist-ATBEVH4R.js");
       let oauthConfig = server.oauth;
       if (!oauthConfig) {
         oauthConfig = { enabled: false };
@@ -60538,7 +60845,7 @@ Use /mcp auth <server-name> to authenticate.`
     );
   }
 };
-var listAction3 = async (context, showDescriptions = false, showSchema = false, serverNameFilter) => {
+var listAction2 = async (context, showDescriptions = false, showSchema = false, serverNameFilter) => {
   const agentContext = context.services.agentContext;
   const config = agentContext?.config;
   if (!config) {
@@ -60655,7 +60962,7 @@ var listCommand2 = {
   description: "List configured MCP servers and tools",
   kind: "built-in" /* BUILT_IN */,
   autoExecute: true,
-  action: (context, args) => listAction3(context, false, false, args)
+  action: (context, args) => listAction2(context, false, false, args)
 };
 var descCommand = {
   name: "desc",
@@ -60663,14 +60970,14 @@ var descCommand = {
   description: "List configured MCP servers and tools with descriptions",
   kind: "built-in" /* BUILT_IN */,
   autoExecute: true,
-  action: (context, args) => listAction3(context, true, false, args)
+  action: (context, args) => listAction2(context, true, false, args)
 };
 var schemaCommand = {
   name: "schema",
   description: "List configured MCP servers and tools with descriptions and schemas",
   kind: "built-in" /* BUILT_IN */,
   autoExecute: true,
-  action: (context, args) => listAction3(context, true, true, args)
+  action: (context, args) => listAction2(context, true, true, args)
 };
 var reloadCommand2 = {
   name: "reload",
@@ -60845,9 +61152,9 @@ var mcpCommand = {
       if (parsed.commandToExecute?.action) {
         return parsed.commandToExecute.action(context, parsed.args);
       }
-      return listAction3(context, false, false, args);
+      return listAction2(context, false, false, args);
     }
-    return listAction3(context);
+    return listAction2(context);
   }
 };
 
@@ -77284,7 +77591,7 @@ var oncallCommand = {
 };
 
 // packages/cli/src/ui/commands/permissionsCommand.ts
-import * as process34 from "node:process";
+import * as process33 from "node:process";
 import * as path31 from "node:path";
 import * as fs34 from "node:fs";
 var permissionsCommand = {
@@ -77302,7 +77609,7 @@ var permissionsCommand = {
         const dirPath = input.trim();
         let targetDirectory;
         if (!dirPath) {
-          targetDirectory = process34.cwd();
+          targetDirectory = process33.cwd();
         } else {
           targetDirectory = path31.resolve(expandHomeDir(dirPath));
         }
@@ -77565,12 +77872,14 @@ var quitCommand = {
   description: "Exit the cli",
   kind: "built-in" /* BUILT_IN */,
   autoExecute: true,
-  action: (context) => {
+  action: (context, args) => {
     const now = Date.now();
     const { sessionStartTime } = context.session.stats;
     const wallDuration = now - sessionStartTime.getTime();
+    const deleteSession = args.trim() === "--delete";
     return {
       type: "quit",
+      deleteSession,
       messages: [
         {
           type: "user",
@@ -78113,7 +78422,7 @@ async function uninstallSkill(name, scope) {
 }
 
 // packages/cli/src/ui/commands/skillsCommand.ts
-async function listAction4(context, args) {
+async function listAction3(context, args) {
   const subArgs = args.trim().split(/\s+/);
   let useShowDescriptions = true;
   let showAll = false;
@@ -78237,7 +78546,7 @@ async function disableAction4(context, args) {
   const result = disableSkill(context.services.settings, skillName, scope);
   let feedback = renderSkillActionFeedback(
     result,
-    (label, path37) => `${label} (${path37})`
+    (label, path36) => `${label} (${path36})`
   );
   if (result.status === "success" || result.status === "no-op") {
     feedback += ' You can run "/skills reload" to refresh your current instance.';
@@ -78273,7 +78582,7 @@ async function enableAction4(context, args) {
   const result = enableSkill(context.services.settings, skillName);
   let feedback = renderSkillActionFeedback(
     result,
-    (label, path37) => `${label} (${path37})`
+    (label, path36) => `${label} (${path36})`
   );
   if (result.status === "success" || result.status === "no-op") {
     feedback += ' You can run "/skills reload" to refresh your current instance.';
@@ -78379,7 +78688,7 @@ var skillsCommand = {
       name: "list",
       description: "List available agent skills. Usage: /skills list [nodesc] [all]",
       kind: "built-in" /* BUILT_IN */,
-      action: listAction4
+      action: listAction3
     },
     {
       name: "link",
@@ -78416,7 +78725,7 @@ var skillsCommand = {
         return parsed.commandToExecute.action(context, parsed.args);
       }
     }
-    return listAction4(context, args);
+    return listAction3(context, args);
   }
 };
 
@@ -78470,10 +78779,10 @@ import { Writable } from "node:stream";
 
 // packages/cli/src/utils/gitUtils.ts
 var import_undici = __toESM(require_undici(), 1);
-import { execSync as execSync3 } from "node:child_process";
+import { execSync as execSync2 } from "node:child_process";
 var isGitHubRepository = () => {
   try {
-    const remotes = (execSync3("git remote -v", {
+    const remotes = (execSync2("git remote -v", {
       encoding: "utf-8"
     }) || "").trim();
     const pattern = /github\.com/;
@@ -78484,7 +78793,7 @@ var isGitHubRepository = () => {
   }
 };
 var getGitRepoRoot = () => {
-  const gitRepoRoot = (execSync3("git rev-parse --show-toplevel", {
+  const gitRepoRoot = (execSync2("git rev-parse --show-toplevel", {
     encoding: "utf-8"
   }) || "").trim();
   if (!gitRepoRoot) {
@@ -78527,7 +78836,7 @@ var getLatestGitHubRelease = async (proxy) => {
   }
 };
 function getGitHubRepoInfo() {
-  const remoteUrl = execSync3("git remote get-url origin", {
+  const remoteUrl = execSync2("git remote get-url origin", {
     encoding: "utf-8"
   }).trim();
   let urlToParse = remoteUrl;
@@ -79032,503 +79341,6 @@ var BuiltinCommandLoader = class {
   }
 };
 
-// packages/cli/src/services/FileCommandLoader.ts
-var import_toml = __toESM(require_toml(), 1);
-import { promises as fs38 } from "node:fs";
-import path36 from "node:path";
-
-// packages/cli/src/services/prompt-processors/argumentProcessor.ts
-var DefaultArgumentProcessor = class {
-  async process(prompt, context) {
-    if (context.invocation?.args) {
-      return appendToLastTextPart(prompt, context.invocation.raw);
-    }
-    return prompt;
-  }
-};
-
-// packages/cli/src/services/prompt-processors/types.ts
-var SHORTHAND_ARGS_PLACEHOLDER = "{{args}}";
-var SHELL_INJECTION_TRIGGER = "!{";
-var AT_FILE_INJECTION_TRIGGER = "@{";
-
-// packages/cli/src/services/prompt-processors/injectionParser.ts
-function extractInjections(prompt, trigger, contextName) {
-  const injections = [];
-  let index = 0;
-  while (index < prompt.length) {
-    const startIndex = prompt.indexOf(trigger, index);
-    if (startIndex === -1) {
-      break;
-    }
-    let currentIndex = startIndex + trigger.length;
-    let braceCount = 1;
-    let foundEnd = false;
-    while (currentIndex < prompt.length) {
-      const char = prompt[currentIndex];
-      if (char === "{") {
-        braceCount++;
-      } else if (char === "}") {
-        braceCount--;
-        if (braceCount === 0) {
-          const injectionContent = prompt.substring(
-            startIndex + trigger.length,
-            currentIndex
-          );
-          const endIndex = currentIndex + 1;
-          injections.push({
-            content: injectionContent.trim(),
-            startIndex,
-            endIndex
-          });
-          index = endIndex;
-          foundEnd = true;
-          break;
-        }
-      }
-      currentIndex++;
-    }
-    if (!foundEnd) {
-      const contextInfo = contextName ? ` in command '${contextName}'` : "";
-      throw new Error(
-        `Invalid syntax${contextInfo}: Unclosed injection starting at index ${startIndex} ('${trigger}'). Ensure braces are balanced. Paths or commands with unbalanced braces are not supported directly.`
-      );
-    }
-  }
-  return injections;
-}
-
-// packages/cli/src/services/prompt-processors/shellProcessor.ts
-var ConfirmationRequiredError = class extends Error {
-  constructor(message, commandsToConfirm) {
-    super(message);
-    this.commandsToConfirm = commandsToConfirm;
-    this.name = "ConfirmationRequiredError";
-  }
-};
-var ShellProcessor = class {
-  constructor(commandName) {
-    this.commandName = commandName;
-  }
-  async process(prompt, context) {
-    return flatMapTextParts(
-      prompt,
-      (text) => this.processString(text, context)
-    );
-  }
-  async processString(prompt, context) {
-    const userArgsRaw = context.invocation?.args || "";
-    if (!prompt.includes(SHELL_INJECTION_TRIGGER)) {
-      return [
-        { text: prompt.replaceAll(SHORTHAND_ARGS_PLACEHOLDER, userArgsRaw) }
-      ];
-    }
-    const config = context.services.agentContext?.config;
-    if (!config) {
-      throw new Error(
-        `Security configuration not loaded. Cannot verify shell command permissions for '${this.commandName}'. Aborting.`
-      );
-    }
-    const injections = extractInjections(
-      prompt,
-      SHELL_INJECTION_TRIGGER,
-      this.commandName
-    );
-    if (injections.length === 0) {
-      return [
-        { text: prompt.replaceAll(SHORTHAND_ARGS_PLACEHOLDER, userArgsRaw) }
-      ];
-    }
-    const { shell: shell2 } = getShellConfiguration();
-    const userArgsEscaped = escapeShellArg(userArgsRaw, shell2);
-    const resolvedInjections = injections.map(
-      (injection) => {
-        const command = injection.content;
-        if (command === "") {
-          return { ...injection, resolvedCommand: void 0 };
-        }
-        const resolvedCommand = command.replaceAll(
-          SHORTHAND_ARGS_PLACEHOLDER,
-          userArgsEscaped
-        );
-        return { ...injection, resolvedCommand };
-      }
-    );
-    const commandsToConfirm = /* @__PURE__ */ new Set();
-    for (const injection of resolvedInjections) {
-      const command = injection.resolvedCommand;
-      if (!command) continue;
-      if (context.session.sessionShellAllowlist?.has(command)) {
-        continue;
-      }
-      const { decision } = await config.getPolicyEngine().check(
-        {
-          name: "run_shell_command",
-          args: { command }
-        },
-        void 0
-      );
-      if (decision === PolicyDecision.DENY) {
-        throw new Error(
-          `${this.commandName} cannot be run. Blocked command: "${command}". Reason: Blocked by policy.`
-        );
-      } else if (decision === PolicyDecision.ASK_USER) {
-        commandsToConfirm.add(command);
-      }
-    }
-    if (commandsToConfirm.size > 0) {
-      throw new ConfirmationRequiredError(
-        "Shell command confirmation required",
-        Array.from(commandsToConfirm)
-      );
-    }
-    let processedPrompt = "";
-    let lastIndex = 0;
-    for (const injection of resolvedInjections) {
-      const segment = prompt.substring(lastIndex, injection.startIndex);
-      processedPrompt += segment.replaceAll(
-        SHORTHAND_ARGS_PLACEHOLDER,
-        userArgsRaw
-      );
-      if (injection.resolvedCommand) {
-        const activeTheme = themeManager.getActiveTheme();
-        const shellExecutionConfig = {
-          ...config.getShellExecutionConfig(),
-          defaultFg: activeTheme.colors.Foreground,
-          defaultBg: activeTheme.colors.Background
-        };
-        const { result } = await ShellExecutionService.execute(
-          injection.resolvedCommand,
-          config.getTargetDir(),
-          () => {
-          },
-          new AbortController().signal,
-          config.getEnableInteractiveShell(),
-          shellExecutionConfig
-        );
-        const executionResult = await result;
-        if (executionResult.error && !executionResult.aborted) {
-          throw new Error(
-            `Failed to start shell command in '${this.commandName}': ${executionResult.error.message}. Command: ${injection.resolvedCommand}`
-          );
-        }
-        processedPrompt += executionResult.output;
-        if (executionResult.aborted) {
-          processedPrompt += `
-[Shell command '${injection.resolvedCommand}' aborted]`;
-        } else if (executionResult.exitCode !== 0 && executionResult.exitCode !== null) {
-          processedPrompt += `
-[Shell command '${injection.resolvedCommand}' exited with code ${executionResult.exitCode}]`;
-        } else if (executionResult.signal !== null) {
-          processedPrompt += `
-[Shell command '${injection.resolvedCommand}' terminated by signal ${executionResult.signal}]`;
-        }
-      }
-      lastIndex = injection.endIndex;
-    }
-    const finalSegment = prompt.substring(lastIndex);
-    processedPrompt += finalSegment.replaceAll(
-      SHORTHAND_ARGS_PLACEHOLDER,
-      userArgsRaw
-    );
-    return [{ text: processedPrompt }];
-  }
-};
-
-// packages/cli/src/services/prompt-processors/atFileProcessor.ts
-var AtFileProcessor = class {
-  constructor(commandName) {
-    this.commandName = commandName;
-  }
-  async process(input, context) {
-    const config = context.services.agentContext?.config;
-    if (!config) {
-      return input;
-    }
-    return flatMapTextParts(input, async (text) => {
-      if (!text.includes(AT_FILE_INJECTION_TRIGGER)) {
-        return [{ text }];
-      }
-      const injections = extractInjections(
-        text,
-        AT_FILE_INJECTION_TRIGGER,
-        this.commandName
-      );
-      if (injections.length === 0) {
-        return [{ text }];
-      }
-      const output = [];
-      let lastIndex = 0;
-      for (const injection of injections) {
-        const prefix = text.substring(lastIndex, injection.startIndex);
-        if (prefix) {
-          output.push({ text: prefix });
-        }
-        const pathStr = injection.content;
-        try {
-          const fileContentParts = await readPathFromWorkspace(pathStr, config);
-          if (fileContentParts.length === 0) {
-            const uiMessage = `File '@{${pathStr}}' was ignored by .gitignore or .geminiignore and was not included in the prompt.`;
-            context.ui.addItem(
-              { type: "info" /* INFO */, text: uiMessage },
-              Date.now()
-            );
-          }
-          output.push(...fileContentParts);
-        } catch (error) {
-          const message = error instanceof Error ? error.message : String(error);
-          const uiMessage = `Failed to inject content for '@{${pathStr}}': ${message}`;
-          debugLogger.error(
-            `Error while loading custom command (${context.invocation.name}) ${uiMessage}. Leaving placeholder in prompt.`
-          );
-          context.ui.addItem(
-            { type: "error" /* ERROR */, text: uiMessage },
-            Date.now()
-          );
-          const placeholder = text.substring(
-            injection.startIndex,
-            injection.endIndex
-          );
-          output.push({ text: placeholder });
-        }
-        lastIndex = injection.endIndex;
-      }
-      const suffix = text.substring(lastIndex);
-      if (suffix) {
-        output.push({ text: suffix });
-      }
-      return output;
-    });
-  }
-};
-
-// packages/cli/src/services/FileCommandLoader.ts
-var TomlCommandDefSchema = external_exports.object({
-  prompt: external_exports.string({
-    required_error: "The 'prompt' field is required.",
-    invalid_type_error: "The 'prompt' field must be a string."
-  }),
-  description: external_exports.string().optional()
-});
-var FileCommandLoader = class {
-  constructor(config) {
-    this.config = config;
-    this.folderTrustEnabled = !!config?.getFolderTrust();
-    this.isTrustedFolder = !!config?.isTrustedFolder();
-    this.projectRoot = config?.getProjectRoot() || process.cwd();
-  }
-  projectRoot;
-  folderTrustEnabled;
-  isTrustedFolder;
-  /**
-   * Loads all commands from user, project, and extension directories.
-   * Returns commands in order: user → project → extensions (alphabetically).
-   *
-   * Order is important for conflict resolution in CommandService:
-   * - User/project commands (without extensionName) use "last wins" strategy
-   * - Extension commands (with extensionName) get renamed if conflicts exist
-   *
-   * @param signal An AbortSignal to cancel the loading process.
-   * @returns A promise that resolves to an array of all loaded SlashCommands.
-   */
-  async loadCommands(signal) {
-    if (this.folderTrustEnabled && !this.isTrustedFolder) {
-      return [];
-    }
-    const allCommands = [];
-    const globOptions = {
-      nodir: true,
-      dot: true,
-      signal,
-      follow: true
-    };
-    const commandDirs = this.getCommandDirectories();
-    for (const dirInfo of commandDirs) {
-      try {
-        const files = await glob("**/*.toml", {
-          ...globOptions,
-          cwd: dirInfo.path
-        });
-        const commandPromises = files.map(
-          (file) => this.parseAndAdaptFile(
-            path36.join(dirInfo.path, file),
-            dirInfo.path,
-            dirInfo.kind,
-            dirInfo.extensionName,
-            dirInfo.extensionId
-          )
-        );
-        const commands = (await Promise.all(commandPromises)).filter(
-          (cmd) => cmd !== null
-        );
-        allCommands.push(...commands);
-      } catch (error) {
-        if (!signal.aborted && // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-        error?.code !== "ENOENT") {
-          coreEvents.emitFeedback(
-            "error",
-            `[FileCommandLoader] Error loading commands from ${dirInfo.path}:`,
-            error
-          );
-        }
-      }
-    }
-    return allCommands;
-  }
-  /**
-   * Get all command directories in order for loading.
-   * User commands → Project commands → Extension commands
-   * This order ensures extension commands can detect all conflicts.
-   */
-  getCommandDirectories() {
-    const dirs = [];
-    const storage = this.config?.storage ?? new Storage(this.projectRoot);
-    dirs.push({
-      path: Storage.getUserCommandsDir(),
-      kind: "user-file" /* USER_FILE */
-    });
-    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) => ({
-        path: path36.join(ext.path, "commands"),
-        kind: "extension-file" /* EXTENSION_FILE */,
-        extensionName: ext.name,
-        extensionId: ext.id
-      }));
-      dirs.push(...extensionCommandDirs);
-    }
-    return dirs;
-  }
-  /**
-   * Parses a single .toml file and transforms it into a SlashCommand object.
-   * @param filePath The absolute path to the .toml file.
-   * @param baseDir The root command directory for name calculation.
-   * @param kind The CommandKind.
-   * @param extensionName Optional extension name to prefix commands with.
-   * @returns A promise resolving to a SlashCommand, or null if the file is invalid.
-   */
-  async parseAndAdaptFile(filePath, baseDir, kind, extensionName, extensionId) {
-    let fileContent;
-    try {
-      fileContent = await fs38.readFile(filePath, "utf-8");
-    } catch (error) {
-      coreEvents.emitFeedback(
-        "error",
-        `[FileCommandLoader] Failed to read file ${filePath}:`,
-        error instanceof Error ? error.message : String(error)
-      );
-      return null;
-    }
-    let parsed;
-    try {
-      parsed = import_toml.default.parse(fileContent);
-    } catch (error) {
-      coreEvents.emitFeedback(
-        "error",
-        `[FileCommandLoader] Failed to parse TOML file ${filePath}:`,
-        error instanceof Error ? error.message : String(error)
-      );
-      return null;
-    }
-    const validationResult = TomlCommandDefSchema.safeParse(parsed);
-    if (!validationResult.success) {
-      coreEvents.emitFeedback(
-        "error",
-        `[FileCommandLoader] Skipping invalid command file: ${filePath}. Validation errors:`,
-        validationResult.error.flatten()
-      );
-      return null;
-    }
-    const validDef = validationResult.data;
-    const relativePathWithExt = path36.relative(baseDir, filePath);
-    const relativePath = relativePathWithExt.substring(
-      0,
-      relativePathWithExt.length - 5
-      // length of '.toml'
-    );
-    const baseCommandName = relativePath.split(path36.sep).map((segment) => {
-      let sanitized = segment.replace(/[^a-zA-Z0-9_\-.]/g, "_");
-      if (sanitized.length > 50) {
-        sanitized = sanitized.substring(0, 47) + "...";
-      }
-      return sanitized;
-    }).join(":");
-    const defaultDescription = `Custom command from ${path36.basename(filePath)}`;
-    let description = validDef.description || defaultDescription;
-    description = sanitizeForDisplay(description, 100);
-    if (extensionName) {
-      description = `[${extensionName}] ${description}`;
-    }
-    const processors = [];
-    const usesArgs = validDef.prompt.includes(SHORTHAND_ARGS_PLACEHOLDER);
-    const usesShellInjection = validDef.prompt.includes(
-      SHELL_INJECTION_TRIGGER
-    );
-    const usesAtFileInjection = validDef.prompt.includes(
-      AT_FILE_INJECTION_TRIGGER
-    );
-    if (usesAtFileInjection) {
-      processors.push(new AtFileProcessor(baseCommandName));
-    }
-    if (usesShellInjection || usesArgs) {
-      processors.push(new ShellProcessor(baseCommandName));
-    }
-    if (!usesArgs) {
-      processors.push(new DefaultArgumentProcessor());
-    }
-    return {
-      name: baseCommandName,
-      description,
-      kind,
-      extensionName,
-      extensionId,
-      action: async (context, _args) => {
-        if (!context.invocation) {
-          coreEvents.emitFeedback(
-            "error",
-            `[FileCommandLoader] Critical error: Command '${baseCommandName}' was executed without invocation context.`
-          );
-          return {
-            type: "submit_prompt",
-            content: [{ text: validDef.prompt }]
-            // Fallback to unprocessed prompt
-          };
-        }
-        try {
-          let processedContent = [
-            { text: validDef.prompt }
-          ];
-          for (const processor of processors) {
-            processedContent = await processor.process(
-              processedContent,
-              context
-            );
-          }
-          return {
-            type: "submit_prompt",
-            content: processedContent
-          };
-        } catch (e) {
-          if (e instanceof ConfirmationRequiredError) {
-            return {
-              type: "confirm_shell_commands",
-              commandsToConfirm: e.commandsToConfirm,
-              originalInvocation: {
-                raw: context.invocation.raw
-              }
-            };
-          }
-          throw e;
-        }
-      }
-    };
-  }
-};
-
 // packages/cli/src/services/McpPromptLoader.ts
 var McpPromptLoader = class {
   constructor(config) {
@@ -79818,7 +79630,6 @@ export {
   isAutoExecutableCommand,
   parseSlashCommand,
   CommandService,
-  isDevelopment,
   GIT_COMMIT_INFO,
   formatBytes,
   formatDuration,
@@ -79850,6 +79661,7 @@ export {
   use_stdout_default,
   use_is_screen_reader_enabled_default,
   theme,
+  FileCommandLoader,
   useFocus,
   SettingsContext,
   useSettings,
@@ -79935,15 +79747,10 @@ export {
   useTerminalSetupPrompt,
   isUltraTier,
   BuiltinCommandLoader,
-  FileCommandLoader,
   McpPromptLoader,
   initializeApp,
   validateAuthMethod,
-  startAutoMemoryIfEnabled,
-  handleAutoUpdate,
-  setUpdateHandler,
-  RELAUNCH_EXIT_CODE,
-  relaunchApp
+  startAutoMemoryIfEnabled
 };
 /**
  * @license