@mmmbuto/gemini-cli-termux 0.42.0-termux → 0.46.0-termux

package/bundle/{chunk-SLMD2AMF.js → chunk-YGU42N5I.js}

@@ -6,7 +6,7 @@ import {
 import {
   exitCli,
   require_source
-} from "./chunk-EHTAR2YP.js";
+} from "./chunk-G2G6HEZZ.js";
 import {
   DEFAULT_BACKGROUND_OPACITY,
   DEFAULT_BORDER_OPACITY,
@@ -19,6 +19,7 @@ import {
   GEMMA_MODEL_NAME,
   LRU_BUFFER_PERF_CACHE_LIMIT,
   MIN_TERMINAL_WIDTH_FOR_FULL_LABEL,
+  SessionSelector,
   Theme,
   convertSessionToHistoryFormats,
   cpIndexToOffset,
@@ -57,19 +58,23 @@ import {
   stripUnsafeCharacters,
   toCodePoints,
   validateCustomTheme
-} from "./chunk-BF6DCDLJ.js";
+} from "./chunk-4TSWR3AN.js";
 import {
   isDevelopment
-} from "./chunk-A6KCGXPK.js";
+} from "./chunk-WUVOS6TV.js";
 import {
   emptyIcon,
   require_react
-} from "./chunk-MP2YMAMR.js";
+} from "./chunk-IT3YFQ3I.js";
 import {
+  ALL_EDITORS,
+  ApprovalMode,
   AsyncFzf,
   AuthType,
   Config,
+  CoreEvent,
   CoreToolCallStatus,
+  DiscoveredMCPTool,
   ExtensionDisableEvent,
   ExtensionEnableEvent,
   ExtensionInstallEvent,
@@ -78,6 +83,7 @@ import {
   ExtensionUninstallEvent,
   ExtensionUpdateEvent,
   GEMINI_CLI_COMPANION_EXTENSION_NAME,
+  GEMINI_DIR,
   HookType,
   IDEConnectionStatus,
   INITIAL_HISTORY_LENGTH,
@@ -91,28 +97,35 @@ import {
   MCPOAuthTokenStorage,
   MCPServerStatus,
   ModelSlashCommandEvent,
+  PolicyDecision,
   ProjectIdRequiredError,
+  REFERENCE_CONTENT_END,
+  REFERENCE_CONTENT_START,
   ReadManyFilesTool,
   RewindEvent,
   SessionEndReason,
   SessionStartSource,
   ShellExecutionService,
   StartSessionEvent,
+  Storage,
   TrustLevel,
   UPGRADE_URL_PAGE,
   UserAccountManager,
   ValidationRequiredError,
-  addMemory,
   appendToLastTextPart,
   applyAdminAllowlist,
   applyInboxMemoryPatch,
   applyInboxPatch,
+  applyPatch,
   assumeExhaustive,
   checkExhaustive,
   clearCachedCredentialFile,
   computeModelAddedAndRemovedLines,
   convertSessionToClientHistory,
   convertToRestPayload,
+  coreEvents,
+  createPatch,
+  debugLogger,
   decodeTagName,
   disableBracketedPasteMode,
   disableKittyKeyboardProtocol,
@@ -124,9 +137,11 @@ import {
   enableBracketedPasteMode,
   enableKittyKeyboardProtocol,
   enableModifyOtherKeys,
+  escapePath,
   escapeShellArg,
   execa,
   execaSync,
+  external_exports,
   fetchWithTimeout,
   fileExists,
   flatMapTextParts,
@@ -134,7 +149,11 @@ import {
   formatCheckpointDisplayList,
   getAdminBlockedMcpServersMessage,
   getAdminErrorMessage,
+  getDisplayString,
   getEditorCommand,
+  getEditorExtraArgs,
+  getEditorWaitFlag,
+  getErrorMessage,
   getFileDiffFromResultDisplay,
   getG1CreditBalance,
   getIdeInstaller,
@@ -147,16 +166,21 @@ import {
   getTruncatedCheckpointNames,
   getVersion,
   glob,
+  homedir,
   ideContextStore,
   import_fixed_deque,
   import_lru_cache,
   import_lru_map_with_delete,
   import_multi_map,
+  isAccountSuspendedError,
   isGuiEditor,
   isNightly,
+  isNodeError,
   isPrivateIp,
   isProjectSkillPatchTarget,
+  isSubpath,
   isTerminalEditor,
+  isValidEditorType,
   is_wsl_default,
   listExtensions,
   listInboxMemoryPatches,
@@ -164,6 +188,7 @@ import {
   listInboxSkills,
   listMemoryFiles,
   loadAgentsFromDirectory,
+  loadApiKey,
   loadConversationRecord,
   loadExtensionPolicies,
   loadSkillsFromDir,
@@ -203,6 +228,10 @@ import {
   require_undici,
   require_valid,
   resetBrowserSession,
+  resolveAtCommandPath,
+  resolveEditorTypeFromCommand,
+  resolveToRealPath,
+  shortenPath,
   shouldLaunchBrowser,
   showMemory,
   simpleGit,
@@ -210,39 +239,14 @@ import {
   startMemoryService,
   startupProfiler,
   stripAnsi,
-  tokenLimit,
-  uiTelemetryService
-} from "./chunk-LX6GOGBA.js";
-import {
-  ApprovalMode,
-  CoreEvent,
-  DiscoveredMCPTool,
-  GEMINI_DIR,
-  PolicyDecision,
-  REFERENCE_CONTENT_END,
-  REFERENCE_CONTENT_START,
-  Storage,
-  applyPatch,
-  coreEvents,
-  createPatch,
-  debugLogger,
-  escapePath,
-  external_exports,
-  getDisplayString,
-  getErrorMessage,
-  homedir,
-  isAccountSuspendedError,
-  isNodeError,
-  isSubpath,
-  refreshServerHierarchicalMemory,
-  resolveToRealPath,
-  shortenPath,
   tildeifyPath,
+  tokenLimit,
+  uiTelemetryService,
   unescapePath
-} from "./chunk-2X6HJV2G.js";
+} from "./chunk-IB4Q6NBY.js";
 import {
   require_src
-} from "./chunk-RJTRUG2J.js";
+} from "./chunk-TUDYL3X4.js";
 import {
   __commonJS,
   __export,
@@ -290,11 +294,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 process36 = global.process;
+    var processOk = function(process37) {
+      return process37 && typeof process37 === "object" && typeof process37.removeListener === "function" && typeof process37.emit === "function" && typeof process37.reallyExit === "function" && typeof process37.listeners === "function" && typeof process37.kill === "function" && typeof process37.pid === "number" && typeof process37.on === "function";
     };
-    if (!processOk(process35)) {
+    if (!processOk(process36)) {
       module.exports = function() {
         return function() {
         };
@@ -302,15 +306,15 @@ var require_signal_exit = __commonJS({
     } else {
       assert = __require("assert");
       signals = require_signals();
-      isWin = /^win/i.test(process35.platform);
+      isWin = /^win/i.test(process36.platform);
       EE = __require("events");
       if (typeof EE !== "function") {
         EE = EE.EventEmitter;
       }
-      if (process35.__signal_exit_emitter__) {
-        emitter = process35.__signal_exit_emitter__;
+      if (process36.__signal_exit_emitter__) {
+        emitter = process36.__signal_exit_emitter__;
       } else {
-        emitter = process35.__signal_exit_emitter__ = new EE();
+        emitter = process36.__signal_exit_emitter__ = new EE();
         emitter.count = 0;
         emitter.emitted = {};
       }
@@ -347,12 +351,12 @@ var require_signal_exit = __commonJS({
         loaded = false;
         signals.forEach(function(sig) {
           try {
-            process35.removeListener(sig, sigListeners[sig]);
+            process36.removeListener(sig, sigListeners[sig]);
           } catch (er2) {
           }
         });
-        process35.emit = originalProcessEmit;
-        process35.reallyExit = originalProcessReallyExit;
+        process36.emit = originalProcessEmit;
+        process36.reallyExit = originalProcessReallyExit;
         emitter.count -= 1;
       };
       module.exports.unload = unload;
@@ -369,7 +373,7 @@ var require_signal_exit = __commonJS({
           if (!processOk(global.process)) {
             return;
           }
-          var listeners = process35.listeners(sig);
+          var listeners = process36.listeners(sig);
           if (listeners.length === emitter.count) {
             unload();
             emit("exit", null, sig);
@@ -377,7 +381,7 @@ var require_signal_exit = __commonJS({
             if (isWin && sig === "SIGHUP") {
               sig = "SIGINT";
             }
-            process35.kill(process35.pid, sig);
+            process36.kill(process36.pid, sig);
           }
         };
       });
@@ -393,36 +397,36 @@ var require_signal_exit = __commonJS({
         emitter.count += 1;
         signals = signals.filter(function(sig) {
           try {
-            process35.on(sig, sigListeners[sig]);
+            process36.on(sig, sigListeners[sig]);
             return true;
           } catch (er2) {
             return false;
           }
         });
-        process35.emit = processEmit;
-        process35.reallyExit = processReallyExit;
+        process36.emit = processEmit;
+        process36.reallyExit = processReallyExit;
       };
       module.exports.load = load;
-      originalProcessReallyExit = process35.reallyExit;
+      originalProcessReallyExit = process36.reallyExit;
       processReallyExit = function processReallyExit2(code) {
         if (!processOk(global.process)) {
           return;
         }
-        process35.exitCode = code || /* istanbul ignore next */
+        process36.exitCode = code || /* istanbul ignore next */
         0;
-        emit("exit", process35.exitCode, null);
-        emit("afterexit", process35.exitCode, null);
-        originalProcessReallyExit.call(process35, process35.exitCode);
+        emit("exit", process36.exitCode, null);
+        emit("afterexit", process36.exitCode, null);
+        originalProcessReallyExit.call(process36, process36.exitCode);
       };
-      originalProcessEmit = process35.emit;
+      originalProcessEmit = process36.emit;
       processEmit = function processEmit2(ev, arg) {
         if (ev === "exit" && processOk(global.process)) {
           if (arg !== void 0) {
-            process35.exitCode = arg;
+            process36.exitCode = arg;
           }
           var ret = originalProcessEmit.apply(this, arguments);
-          emit("exit", process35.exitCode, null);
-          emit("afterexit", process35.exitCode, null);
+          emit("exit", process36.exitCode, null);
+          emit("afterexit", process36.exitCode, null);
           return ret;
         } else {
           return originalProcessEmit.apply(this, arguments);
@@ -1742,8 +1746,8 @@ var require_react_reconciler_production = __commonJS({
           currentEntangledActionThenable = {
             status: "pending",
             value: void 0,
-            then: function(resolve8) {
-              entangledListeners.push(resolve8);
+            then: function(resolve9) {
+              entangledListeners.push(resolve9);
             }
           };
         }
@@ -1766,8 +1770,8 @@ var require_react_reconciler_production = __commonJS({
           status: "pending",
           value: null,
           reason: null,
-          then: function(resolve8) {
-            listeners.push(resolve8);
+          then: function(resolve9) {
+            listeners.push(resolve9);
           }
         };
         thenable.then(
@@ -8803,11 +8807,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 process36 = global.process;
+    var processOk = function(process37) {
+      return process37 && typeof process37 === "object" && typeof process37.removeListener === "function" && typeof process37.emit === "function" && typeof process37.reallyExit === "function" && typeof process37.listeners === "function" && typeof process37.kill === "function" && typeof process37.pid === "number" && typeof process37.on === "function";
     };
-    if (!processOk(process35)) {
+    if (!processOk(process36)) {
       module.exports = function() {
         return function() {
         };
@@ -8815,15 +8819,15 @@ var require_signal_exit2 = __commonJS({
     } else {
       assert = __require("assert");
       signals = require_signals2();
-      isWin = /^win/i.test(process35.platform);
+      isWin = /^win/i.test(process36.platform);
       EE = __require("events");
       if (typeof EE !== "function") {
         EE = EE.EventEmitter;
       }
-      if (process35.__signal_exit_emitter__) {
-        emitter = process35.__signal_exit_emitter__;
+      if (process36.__signal_exit_emitter__) {
+        emitter = process36.__signal_exit_emitter__;
       } else {
-        emitter = process35.__signal_exit_emitter__ = new EE();
+        emitter = process36.__signal_exit_emitter__ = new EE();
         emitter.count = 0;
         emitter.emitted = {};
       }
@@ -8860,12 +8864,12 @@ var require_signal_exit2 = __commonJS({
         loaded = false;
         signals.forEach(function(sig) {
           try {
-            process35.removeListener(sig, sigListeners[sig]);
+            process36.removeListener(sig, sigListeners[sig]);
           } catch (er2) {
           }
         });
-        process35.emit = originalProcessEmit;
-        process35.reallyExit = originalProcessReallyExit;
+        process36.emit = originalProcessEmit;
+        process36.reallyExit = originalProcessReallyExit;
         emitter.count -= 1;
       };
       module.exports.unload = unload;
@@ -8882,7 +8886,7 @@ var require_signal_exit2 = __commonJS({
           if (!processOk(global.process)) {
             return;
           }
-          var listeners = process35.listeners(sig);
+          var listeners = process36.listeners(sig);
           if (listeners.length === emitter.count) {
             unload();
             emit("exit", null, sig);
@@ -8890,7 +8894,7 @@ var require_signal_exit2 = __commonJS({
             if (isWin && sig === "SIGHUP") {
               sig = "SIGINT";
             }
-            process35.kill(process35.pid, sig);
+            process36.kill(process36.pid, sig);
           }
         };
       });
@@ -8906,36 +8910,36 @@ var require_signal_exit2 = __commonJS({
         emitter.count += 1;
         signals = signals.filter(function(sig) {
           try {
-            process35.on(sig, sigListeners[sig]);
+            process36.on(sig, sigListeners[sig]);
             return true;
           } catch (er2) {
             return false;
           }
         });
-        process35.emit = processEmit;
-        process35.reallyExit = processReallyExit;
+        process36.emit = processEmit;
+        process36.reallyExit = processReallyExit;
       };
       module.exports.load = load;
-      originalProcessReallyExit = process35.reallyExit;
+      originalProcessReallyExit = process36.reallyExit;
       processReallyExit = function processReallyExit2(code) {
         if (!processOk(global.process)) {
           return;
         }
-        process35.exitCode = code || /* istanbul ignore next */
+        process36.exitCode = code || /* istanbul ignore next */
         0;
-        emit("exit", process35.exitCode, null);
-        emit("afterexit", process35.exitCode, null);
-        originalProcessReallyExit.call(process35, process35.exitCode);
+        emit("exit", process36.exitCode, null);
+        emit("afterexit", process36.exitCode, null);
+        originalProcessReallyExit.call(process36, process36.exitCode);
       };
-      originalProcessEmit = process35.emit;
+      originalProcessEmit = process36.emit;
       processEmit = function processEmit2(ev, arg) {
         if (ev === "exit" && processOk(global.process)) {
           if (arg !== void 0) {
-            process35.exitCode = arg;
+            process36.exitCode = arg;
           }
           var ret = originalProcessEmit.apply(this, arguments);
-          emit("exit", process35.exitCode, null);
-          emit("afterexit", process35.exitCode, null);
+          emit("exit", process36.exitCode, null);
+          emit("afterexit", process36.exitCode, null);
           return ret;
         } else {
           return originalProcessEmit.apply(this, arguments);
@@ -9761,7 +9765,7 @@ var require_prompt = __commonJS({
 var require_text = __commonJS({
   "node_modules/prompts/dist/elements/text.js"(exports, module) {
     "use strict";
-    function asyncGeneratorStep(gen, resolve8, reject, _next, _throw, key, arg) {
+    function asyncGeneratorStep(gen, resolve9, reject, _next, _throw, key, arg) {
       try {
         var info = gen[key](arg);
         var value = info.value;
@@ -9770,7 +9774,7 @@ var require_text = __commonJS({
         return;
       }
       if (info.done) {
-        resolve8(value);
+        resolve9(value);
       } else {
         Promise.resolve(value).then(_next, _throw);
       }
@@ -9778,13 +9782,13 @@ var require_text = __commonJS({
     function _asyncToGenerator(fn2) {
       return function() {
         var self = this, args = arguments;
-        return new Promise(function(resolve8, reject) {
+        return new Promise(function(resolve9, reject) {
           var gen = fn2.apply(self, args);
           function _next(value) {
-            asyncGeneratorStep(gen, resolve8, reject, _next, _throw, "next", value);
+            asyncGeneratorStep(gen, resolve9, reject, _next, _throw, "next", value);
           }
           function _throw(err) {
-            asyncGeneratorStep(gen, resolve8, reject, _next, _throw, "throw", err);
+            asyncGeneratorStep(gen, resolve9, reject, _next, _throw, "throw", err);
           }
           _next(void 0);
         });
@@ -10500,7 +10504,7 @@ var require_dateparts = __commonJS({
 var require_date = __commonJS({
   "node_modules/prompts/dist/elements/date.js"(exports, module) {
     "use strict";
-    function asyncGeneratorStep(gen, resolve8, reject, _next, _throw, key, arg) {
+    function asyncGeneratorStep(gen, resolve9, reject, _next, _throw, key, arg) {
       try {
         var info = gen[key](arg);
         var value = info.value;
@@ -10509,7 +10513,7 @@ var require_date = __commonJS({
         return;
       }
       if (info.done) {
-        resolve8(value);
+        resolve9(value);
       } else {
         Promise.resolve(value).then(_next, _throw);
       }
@@ -10517,13 +10521,13 @@ var require_date = __commonJS({
     function _asyncToGenerator(fn2) {
       return function() {
         var self = this, args = arguments;
-        return new Promise(function(resolve8, reject) {
+        return new Promise(function(resolve9, reject) {
           var gen = fn2.apply(self, args);
           function _next(value) {
-            asyncGeneratorStep(gen, resolve8, reject, _next, _throw, "next", value);
+            asyncGeneratorStep(gen, resolve9, reject, _next, _throw, "next", value);
           }
           function _throw(err) {
-            asyncGeneratorStep(gen, resolve8, reject, _next, _throw, "throw", err);
+            asyncGeneratorStep(gen, resolve9, reject, _next, _throw, "throw", err);
           }
           _next(void 0);
         });
@@ -10726,7 +10730,7 @@ ${i ? ` ` : figures.pointerSmall} ${color.red().italic(l)}`, ``);
 var require_number = __commonJS({
   "node_modules/prompts/dist/elements/number.js"(exports, module) {
     "use strict";
-    function asyncGeneratorStep(gen, resolve8, reject, _next, _throw, key, arg) {
+    function asyncGeneratorStep(gen, resolve9, reject, _next, _throw, key, arg) {
       try {
         var info = gen[key](arg);
         var value = info.value;
@@ -10735,7 +10739,7 @@ var require_number = __commonJS({
         return;
       }
       if (info.done) {
-        resolve8(value);
+        resolve9(value);
       } else {
         Promise.resolve(value).then(_next, _throw);
       }
@@ -10743,13 +10747,13 @@ var require_number = __commonJS({
     function _asyncToGenerator(fn2) {
       return function() {
         var self = this, args = arguments;
-        return new Promise(function(resolve8, reject) {
+        return new Promise(function(resolve9, reject) {
           var gen = fn2.apply(self, args);
           function _next(value) {
-            asyncGeneratorStep(gen, resolve8, reject, _next, _throw, "next", value);
+            asyncGeneratorStep(gen, resolve9, reject, _next, _throw, "next", value);
           }
           function _throw(err) {
-            asyncGeneratorStep(gen, resolve8, reject, _next, _throw, "throw", err);
+            asyncGeneratorStep(gen, resolve9, reject, _next, _throw, "throw", err);
           }
           _next(void 0);
         });
@@ -11172,7 +11176,7 @@ Instructions:
 var require_autocomplete = __commonJS({
   "node_modules/prompts/dist/elements/autocomplete.js"(exports, module) {
     "use strict";
-    function asyncGeneratorStep(gen, resolve8, reject, _next, _throw, key, arg) {
+    function asyncGeneratorStep(gen, resolve9, reject, _next, _throw, key, arg) {
       try {
         var info = gen[key](arg);
         var value = info.value;
@@ -11181,7 +11185,7 @@ var require_autocomplete = __commonJS({
         return;
       }
       if (info.done) {
-        resolve8(value);
+        resolve9(value);
       } else {
         Promise.resolve(value).then(_next, _throw);
       }
@@ -11189,13 +11193,13 @@ var require_autocomplete = __commonJS({
     function _asyncToGenerator(fn2) {
       return function() {
         var self = this, args = arguments;
-        return new Promise(function(resolve8, reject) {
+        return new Promise(function(resolve9, reject) {
           var gen = fn2.apply(self, args);
           function _next(value) {
-            asyncGeneratorStep(gen, resolve8, reject, _next, _throw, "next", value);
+            asyncGeneratorStep(gen, resolve9, reject, _next, _throw, "next", value);
           }
           function _throw(err) {
-            asyncGeneratorStep(gen, resolve8, reject, _next, _throw, "throw", err);
+            asyncGeneratorStep(gen, resolve9, reject, _next, _throw, "throw", err);
           }
           _next(void 0);
         });
@@ -11826,7 +11830,7 @@ var require_dist = __commonJS({
       for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
       return arr2;
     }
-    function asyncGeneratorStep(gen, resolve8, reject, _next, _throw, key, arg) {
+    function asyncGeneratorStep(gen, resolve9, reject, _next, _throw, key, arg) {
       try {
         var info = gen[key](arg);
         var value = info.value;
@@ -11835,7 +11839,7 @@ var require_dist = __commonJS({
         return;
       }
       if (info.done) {
-        resolve8(value);
+        resolve9(value);
       } else {
         Promise.resolve(value).then(_next, _throw);
       }
@@ -11843,13 +11847,13 @@ var require_dist = __commonJS({
     function _asyncToGenerator(fn2) {
       return function() {
         var self = this, args = arguments;
-        return new Promise(function(resolve8, reject) {
+        return new Promise(function(resolve9, reject) {
           var gen = fn2.apply(self, args);
           function _next(value) {
-            asyncGeneratorStep(gen, resolve8, reject, _next, _throw, "next", value);
+            asyncGeneratorStep(gen, resolve9, reject, _next, _throw, "next", value);
           }
           function _throw(err) {
-            asyncGeneratorStep(gen, resolve8, reject, _next, _throw, "throw", err);
+            asyncGeneratorStep(gen, resolve9, reject, _next, _throw, "throw", err);
           }
           _next(void 0);
         });
@@ -14186,7 +14190,7 @@ var require_get_stream = __commonJS({
       };
       const { maxBuffer } = options;
       let stream;
-      await new Promise((resolve8, reject) => {
+      await new Promise((resolve9, reject) => {
         const rejectPromise = (error) => {
           if (error && stream.getBufferedLength() <= BufferConstants.MAX_LENGTH) {
             error.bufferedData = stream.getBufferedValue();
@@ -14198,7 +14202,7 @@ var require_get_stream = __commonJS({
             rejectPromise(error);
             return;
           }
-          resolve8();
+          resolve9();
         });
         stream.on("data", () => {
           if (stream.getBufferedLength() > maxBuffer) {
@@ -14858,7 +14862,7 @@ var require_yauzl = __commonJS({
     exports.ZipFile = ZipFile;
     exports.Entry = Entry;
     exports.RandomAccessReader = RandomAccessReader;
-    function open(path37, options, callback) {
+    function open(path38, options, callback) {
       if (typeof options === "function") {
         callback = options;
         options = null;
@@ -14870,7 +14874,7 @@ var require_yauzl = __commonJS({
       if (options.validateEntrySizes == null) options.validateEntrySizes = true;
       if (options.strictFileNames == null) options.strictFileNames = false;
       if (callback == null) callback = defaultCallback;
-      fs38.open(path37, "r", function(err, fd) {
+      fs38.open(path38, "r", function(err, fd) {
         if (err) return callback(err);
         fromFd(fd, options, function(err2, zipfile) {
           if (err2) fs38.close(fd, defaultCallback);
@@ -15472,7 +15476,7 @@ var require_extract_zip = __commonJS({
     var debug = require_src()("extract-zip");
     var { createWriteStream: createWriteStream5, promises: fs38 } = __require("fs");
     var getStream = require_get_stream();
-    var path37 = __require("path");
+    var path38 = __require("path");
     var { promisify: promisify5 } = __require("util");
     var stream = __require("stream");
     var yauzl = require_yauzl();
@@ -15487,7 +15491,7 @@ var require_extract_zip = __commonJS({
         debug("opening", this.zipPath, "with opts", this.opts);
         this.zipfile = await openZip(this.zipPath, { lazyEntries: true });
         this.canceled = false;
-        return new Promise((resolve8, reject) => {
+        return new Promise((resolve9, reject) => {
           this.zipfile.on("error", (err) => {
             this.canceled = true;
             reject(err);
@@ -15496,7 +15500,7 @@ var require_extract_zip = __commonJS({
           this.zipfile.on("close", () => {
             if (!this.canceled) {
               debug("zip extraction complete");
-              resolve8();
+              resolve9();
             }
           });
           this.zipfile.on("entry", async (entry) => {
@@ -15509,12 +15513,12 @@ var require_extract_zip = __commonJS({
               this.zipfile.readEntry();
               return;
             }
-            const destDir = path37.dirname(path37.join(this.opts.dir, entry.fileName));
+            const destDir = path38.dirname(path38.join(this.opts.dir, entry.fileName));
             try {
               await fs38.mkdir(destDir, { recursive: true });
               const canonicalDestDir = await fs38.realpath(destDir);
-              const relativeDestDir = path37.relative(this.opts.dir, canonicalDestDir);
-              if (relativeDestDir.split(path37.sep).includes("..")) {
+              const relativeDestDir = path38.relative(this.opts.dir, canonicalDestDir);
+              if (relativeDestDir.split(path38.sep).includes("..")) {
                 throw new Error(`Out of bound path "${canonicalDestDir}" found while processing file ${entry.fileName}`);
               }
               await this.extractEntry(entry);
@@ -15536,7 +15540,7 @@ var require_extract_zip = __commonJS({
         if (this.opts.onEntry) {
           this.opts.onEntry(entry, this.zipfile);
         }
-        const dest = path37.join(this.opts.dir, entry.fileName);
+        const dest = path38.join(this.opts.dir, entry.fileName);
         const mode = entry.externalFileAttributes >> 16 & 65535;
         const IFMT = 61440;
         const IFDIR = 16384;
@@ -15550,7 +15554,7 @@ var require_extract_zip = __commonJS({
         if (!isDir) isDir = madeBy === 0 && entry.externalFileAttributes === 16;
         debug("extracting entry", { filename: entry.fileName, isDir, isSymlink: symlink2 });
         const procMode = this.getExtractedMode(mode, isDir) & 511;
-        const destDir = isDir ? dest : path37.dirname(dest);
+        const destDir = isDir ? dest : path38.dirname(dest);
         const mkdirOptions = { recursive: true };
         if (isDir) {
           mkdirOptions.mode = procMode;
@@ -15592,7 +15596,7 @@ var require_extract_zip = __commonJS({
     };
     module.exports = async function(zipPath, opts) {
       debug("creating target directory", opts.dir);
-      if (!path37.isAbsolute(opts.dir)) {
+      if (!path38.isAbsolute(opts.dir)) {
         throw new Error("Target directory is expected to be absolute");
       }
       await fs38.mkdir(opts.dir, { recursive: true });
@@ -17053,7 +17057,7 @@ var require_strip_final_newline = __commonJS({
 var require_npm_run_path = __commonJS({
   "node_modules/run-jxa/node_modules/npm-run-path/index.js"(exports, module) {
     "use strict";
-    var path37 = __require("path");
+    var path38 = __require("path");
     var pathKey = require_path_key();
     var npmRunPath = (options) => {
       options = {
@@ -17063,16 +17067,16 @@ var require_npm_run_path = __commonJS({
         ...options
       };
       let previous;
-      let cwdPath = path37.resolve(options.cwd);
+      let cwdPath = path38.resolve(options.cwd);
       const result = [];
       while (previous !== cwdPath) {
-        result.push(path37.join(cwdPath, "node_modules/.bin"));
+        result.push(path38.join(cwdPath, "node_modules/.bin"));
         previous = cwdPath;
-        cwdPath = path37.resolve(cwdPath, "..");
+        cwdPath = path38.resolve(cwdPath, "..");
       }
-      const execPathDir = path37.resolve(options.cwd, options.execPath, "..");
+      const execPathDir = path38.resolve(options.cwd, options.execPath, "..");
       result.push(execPathDir);
-      return result.concat(options.path).join(path37.delimiter);
+      return result.concat(options.path).join(path38.delimiter);
     };
     module.exports = npmRunPath;
     module.exports.default = npmRunPath;
@@ -17082,9 +17086,9 @@ var require_npm_run_path = __commonJS({
         ...options
       };
       const env3 = { ...options.env };
-      const path38 = pathKey({ env: env3 });
-      options.path = env3[path38];
-      env3[path38] = module.exports(options);
+      const path39 = pathKey({ env: env3 });
+      options.path = env3[path39];
+      env3[path39] = module.exports(options);
       return env3;
     };
   }
@@ -17647,11 +17651,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 process36 = global.process;
+    var processOk = function(process37) {
+      return process37 && typeof process37 === "object" && typeof process37.removeListener === "function" && typeof process37.emit === "function" && typeof process37.reallyExit === "function" && typeof process37.listeners === "function" && typeof process37.kill === "function" && typeof process37.pid === "number" && typeof process37.on === "function";
     };
-    if (!processOk(process35)) {
+    if (!processOk(process36)) {
       module.exports = function() {
         return function() {
         };
@@ -17659,15 +17663,15 @@ var require_signal_exit3 = __commonJS({
     } else {
       assert = __require("assert");
       signals = require_signals4();
-      isWin = /^win/i.test(process35.platform);
+      isWin = /^win/i.test(process36.platform);
       EE = __require("events");
       if (typeof EE !== "function") {
         EE = EE.EventEmitter;
       }
-      if (process35.__signal_exit_emitter__) {
-        emitter = process35.__signal_exit_emitter__;
+      if (process36.__signal_exit_emitter__) {
+        emitter = process36.__signal_exit_emitter__;
       } else {
-        emitter = process35.__signal_exit_emitter__ = new EE();
+        emitter = process36.__signal_exit_emitter__ = new EE();
         emitter.count = 0;
         emitter.emitted = {};
       }
@@ -17704,12 +17708,12 @@ var require_signal_exit3 = __commonJS({
         loaded = false;
         signals.forEach(function(sig) {
           try {
-            process35.removeListener(sig, sigListeners[sig]);
+            process36.removeListener(sig, sigListeners[sig]);
           } catch (er2) {
           }
         });
-        process35.emit = originalProcessEmit;
-        process35.reallyExit = originalProcessReallyExit;
+        process36.emit = originalProcessEmit;
+        process36.reallyExit = originalProcessReallyExit;
         emitter.count -= 1;
       };
       module.exports.unload = unload;
@@ -17726,7 +17730,7 @@ var require_signal_exit3 = __commonJS({
           if (!processOk(global.process)) {
             return;
           }
-          var listeners = process35.listeners(sig);
+          var listeners = process36.listeners(sig);
           if (listeners.length === emitter.count) {
             unload();
             emit("exit", null, sig);
@@ -17734,7 +17738,7 @@ var require_signal_exit3 = __commonJS({
             if (isWin && sig === "SIGHUP") {
               sig = "SIGINT";
             }
-            process35.kill(process35.pid, sig);
+            process36.kill(process36.pid, sig);
           }
         };
       });
@@ -17750,36 +17754,36 @@ var require_signal_exit3 = __commonJS({
         emitter.count += 1;
         signals = signals.filter(function(sig) {
           try {
-            process35.on(sig, sigListeners[sig]);
+            process36.on(sig, sigListeners[sig]);
             return true;
           } catch (er2) {
             return false;
           }
         });
-        process35.emit = processEmit;
-        process35.reallyExit = processReallyExit;
+        process36.emit = processEmit;
+        process36.reallyExit = processReallyExit;
       };
       module.exports.load = load;
-      originalProcessReallyExit = process35.reallyExit;
+      originalProcessReallyExit = process36.reallyExit;
       processReallyExit = function processReallyExit2(code) {
         if (!processOk(global.process)) {
           return;
         }
-        process35.exitCode = code || /* istanbul ignore next */
+        process36.exitCode = code || /* istanbul ignore next */
         0;
-        emit("exit", process35.exitCode, null);
-        emit("afterexit", process35.exitCode, null);
-        originalProcessReallyExit.call(process35, process35.exitCode);
+        emit("exit", process36.exitCode, null);
+        emit("afterexit", process36.exitCode, null);
+        originalProcessReallyExit.call(process36, process36.exitCode);
       };
-      originalProcessEmit = process35.emit;
+      originalProcessEmit = process36.emit;
       processEmit = function processEmit2(ev, arg) {
         if (ev === "exit" && processOk(global.process)) {
           if (arg !== void 0) {
-            process35.exitCode = arg;
+            process36.exitCode = arg;
           }
           var ret = originalProcessEmit.apply(this, arguments);
-          emit("exit", process35.exitCode, null);
-          emit("afterexit", process35.exitCode, null);
+          emit("exit", process36.exitCode, null);
+          emit("afterexit", process36.exitCode, null);
           return ret;
         } else {
           return originalProcessEmit.apply(this, arguments);
@@ -17807,7 +17811,7 @@ var require_signal_exit3 = __commonJS({
 var require_kill = __commonJS({
   "node_modules/run-jxa/node_modules/execa/lib/kill.js"(exports, module) {
     "use strict";
-    var os8 = __require("os");
+    var os9 = __require("os");
     var onExit = require_signal_exit3();
     var DEFAULT_FORCE_KILL_TIMEOUT = 1e3 * 5;
     var spawnedKill = (kill, signal = "SIGTERM", options = {}) => {
@@ -17831,7 +17835,7 @@ var require_kill = __commonJS({
       return isSigterm(signal) && forceKillAfterTimeout !== false && killResult;
     };
     var isSigterm = (signal) => {
-      return signal === os8.constants.signals.SIGTERM || typeof signal === "string" && signal.toUpperCase() === "SIGTERM";
+      return signal === os9.constants.signals.SIGTERM || typeof signal === "string" && signal.toUpperCase() === "SIGTERM";
     };
     var getForceKillAfterTimeout = ({ forceKillAfterTimeout = true }) => {
       if (forceKillAfterTimeout === true) {
@@ -17857,7 +17861,7 @@ var require_kill = __commonJS({
         return spawnedPromise;
       }
       let timeoutId;
-      const timeoutPromise = new Promise((resolve8, reject) => {
+      const timeoutPromise = new Promise((resolve9, reject) => {
         timeoutId = setTimeout(() => {
           timeoutKill(spawned, killSignal, reject);
         }, timeout);
@@ -17963,7 +17967,7 @@ var require_get_stream2 = __commonJS({
       };
       const { maxBuffer } = options;
       const stream2 = bufferStream(options);
-      await new Promise((resolve8, reject) => {
+      await new Promise((resolve9, reject) => {
         const rejectPromise = (error) => {
           if (error && stream2.getBufferedLength() <= BufferConstants.MAX_LENGTH) {
             error.bufferedData = stream2.getBufferedValue();
@@ -17973,7 +17977,7 @@ var require_get_stream2 = __commonJS({
         (async () => {
           try {
             await streamPipelinePromisified(inputStream, stream2);
-            resolve8();
+            resolve9();
           } catch (error) {
             rejectPromise(error);
           }
@@ -18130,9 +18134,9 @@ var require_promise = __commonJS({
       return spawned;
     };
     var getSpawnedPromise = (spawned) => {
-      return new Promise((resolve8, reject) => {
+      return new Promise((resolve9, reject) => {
         spawned.on("exit", (exitCode, signal) => {
-          resolve8({ exitCode, signal });
+          resolve9({ exitCode, signal });
         });
         spawned.on("error", (error) => {
           reject(error);
@@ -18200,7 +18204,7 @@ var require_command = __commonJS({
 var require_execa = __commonJS({
   "node_modules/run-jxa/node_modules/execa/index.js"(exports, module) {
     "use strict";
-    var path37 = __require("path");
+    var path38 = __require("path");
     var childProcess3 = __require("child_process");
     var crossSpawn = require_cross_spawn();
     var stripFinalNewline = require_strip_final_newline();
@@ -18242,7 +18246,7 @@ var require_execa = __commonJS({
       };
       options.env = getEnv(options);
       options.stdio = normalizeStdio(options);
-      if (process.platform === "win32" && path37.basename(file, ".exe") === "cmd") {
+      if (process.platform === "win32" && path38.basename(file, ".exe") === "cmd") {
         args.unshift("/q");
       }
       return { file, args, options, parsed };
@@ -25599,13 +25603,13 @@ var setTextNodeValue = (node, text) => {
   markNodeAsDirty(node);
 };
 var getPathToRoot = (node) => {
-  const path37 = [];
+  const path38 = [];
   let current = node;
   while (current) {
-    path37.unshift(current);
+    path38.unshift(current);
     current = current.parentNode;
   }
-  return path37;
+  return path38;
 };
 var isNodeSelectable = (node) => {
   let current = node;
@@ -25869,7 +25873,7 @@ var styles_default = styles3;
 // node_modules/ink/build/reconciler.js
 if (process3.env["DEV"] === "true") {
   try {
-    await import("./devtools-ZLHMA45S.js");
+    await import("./devtools-V7NE4CQA.js");
   } catch (error) {
     if (error.code === "ERR_MODULE_NOT_FOUND") {
       console.warn(`
@@ -30083,8 +30087,8 @@ function Text({ color, backgroundColor, dimColor = false, bold = false, italic =
 }
 
 // node_modules/ink/build/components/ErrorOverview.js
-var cleanupPath = (path37) => {
-  return path37?.replace(`file://${cwd()}/`, "");
+var cleanupPath = (path38) => {
+  return path38?.replace(`file://${cwd()}/`, "");
 };
 var stackUtils = new import_stack_utils.default({
   cwd: cwd(),
@@ -31280,12 +31284,12 @@ var TerminalWriter = class {
       if (chunk) {
         this.synchronizedWrite(chunk);
       }
-      await new Promise((resolve8) => {
+      await new Promise((resolve9) => {
         let finished = false;
         const timer = setTimeout(() => {
           finished = true;
           this.cancelSlowFlush = void 0;
-          resolve8();
+          resolve9();
         }, 50);
         this.cancelSlowFlush = () => {
           if (!finished) {
@@ -31296,7 +31300,7 @@ var TerminalWriter = class {
               this.outputBuffer = [];
             }
             this.cancelSlowFlush = void 0;
-            resolve8();
+            resolve9();
           }
         };
       });
@@ -31687,8 +31691,8 @@ var AnimationController = class {
     if (!this.isRunning) {
       return;
     }
-    return new Promise((resolve8) => {
-      this.idleResolvers.push(resolve8);
+    return new Promise((resolve9) => {
+      this.idleResolvers.push(resolve9);
     });
   }
   /**
@@ -31728,8 +31732,8 @@ var AnimationController = class {
       clearInterval(this.intervalId);
       this.intervalId = void 0;
     }
-    for (const resolve8 of this.idleResolvers) {
-      resolve8();
+    for (const resolve9 of this.idleResolvers) {
+      resolve9();
     }
     this.idleResolvers = [];
   }
@@ -33234,11 +33238,11 @@ var TerminalBuffer = class {
     if (!this.worker?.connected) {
       return 0;
     }
-    return new Promise((resolve8) => {
+    return new Promise((resolve9) => {
       const handler2 = (message) => {
         if (message.type === "linesUpdated") {
           this.worker?.off("message", handler2);
-          resolve8(message.count);
+          resolve9(message.count);
         }
       };
       this.worker?.on("message", handler2);
@@ -33247,7 +33251,7 @@ var TerminalBuffer = class {
       } catch (error) {
         this.worker?.off("message", handler2);
         console.error("Failed to send getLinesUpdated message to worker:", error);
-        resolve8(0);
+        resolve9(0);
       }
     });
   }
@@ -33759,8 +33763,8 @@ var Ink = class {
     }
   }
   async waitUntilExit() {
-    this.exitPromise ||= new Promise((resolve8, reject) => {
-      this.resolveExitPromise = resolve8;
+    this.exitPromise ||= new Promise((resolve9, reject) => {
+      this.resolveExitPromise = resolve9;
       this.rejectExitPromise = reject;
     });
     return this.exitPromise;
@@ -34559,7 +34563,7 @@ var TerminalCapabilityManager = class _TerminalCapabilityManager {
     process.on("exit", cleanupTerminalOnExit);
     process.on("SIGTERM", cleanupTerminalOnExit);
     process.on("SIGINT", cleanupTerminalOnExit);
-    return new Promise((resolve8) => {
+    return new Promise((resolve9) => {
       const originalRawMode = process.stdin.isRaw;
       if (!originalRawMode) {
         process.stdin.setRawMode(true);
@@ -34580,7 +34584,7 @@ var TerminalCapabilityManager = class _TerminalCapabilityManager {
           process.stdin.setRawMode(false);
         }
         this.detectionComplete = true;
-        resolve8();
+        resolve9();
       };
       timeoutId = setTimeout(cleanup, 1e3);
       const onData = (data) => {
@@ -38973,7 +38977,6 @@ var ThemeManager = class {
         try {
           const theme2 = createCustomTheme(themeWithDefaults);
           this.extensionThemes.set(namespacedName, theme2);
-          debugLogger.log(`Registered theme: ${namespacedName}`);
         } catch (error) {
           debugLogger.warn(
             `Failed to load custom theme "${namespacedName}":`,
@@ -38999,7 +39002,6 @@ var ThemeManager = class {
     for (const theme2 of customThemes) {
       const namespacedName = `${theme2.name} (${extensionName})`;
       this.extensionThemes.delete(namespacedName);
-      debugLogger.log(`Unregistered theme: ${namespacedName}`);
     }
   }
   /**
@@ -40209,13 +40211,14 @@ async function initializeApp(config, settings) {
 }
 
 // packages/cli/src/config/auth.ts
-function validateAuthMethod(authMethod) {
+async function validateAuthMethod(authMethod) {
   loadEnvironment(loadSettings().merged, process.cwd());
   if (authMethod === AuthType.LOGIN_WITH_GOOGLE || authMethod === AuthType.COMPUTE_ADC) {
     return null;
   }
   if (authMethod === AuthType.USE_GEMINI) {
-    if (!process.env["GEMINI_API_KEY"]) {
+    const key = process.env["GEMINI_API_KEY"] || await loadApiKey();
+    if (!key) {
       return "When using Gemini API, you must specify the GEMINI_API_KEY environment variable.\nUpdate your environment and try again (no reload needed if using .env)!";
     }
     return null;
@@ -40278,25 +40281,25 @@ async function promptForConsentNonInteractive(prompt, defaultValue = true) {
     input: process.stdin,
     output: process.stdout
   });
-  return new Promise((resolve8) => {
+  return new Promise((resolve9) => {
     rl.question(prompt, (answer) => {
       rl.close();
       const trimmedAnswer = answer.trim().toLowerCase();
       if (trimmedAnswer === "") {
-        resolve8(defaultValue);
+        resolve9(defaultValue);
       } else {
-        resolve8(["y", "yes"].includes(trimmedAnswer));
+        resolve9(["y", "yes"].includes(trimmedAnswer));
       }
     });
   });
 }
 async function promptForConsentInteractive(prompt, addExtensionUpdateConfirmationRequest, clearConfirmationRequest) {
-  return new Promise((resolve8) => {
+  return new Promise((resolve9) => {
     addExtensionUpdateConfirmationRequest({
       prompt,
       onConfirm: (resolvedConfirmed) => {
         clearConfirmationRequest?.();
-        setImmediate(() => resolve8(resolvedConfirmed));
+        setImmediate(() => resolve9(resolvedConfirmed));
       }
     });
   });
@@ -40461,10 +40464,7 @@ function recursivelyHydrateStrings(obj, values) {
   }
   if (Array.isArray(obj)) {
     return obj.map(
-      (item) => (
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-        recursivelyHydrateStrings(item, values)
-      )
+      (item) => recursivelyHydrateStrings(item, values)
     );
   }
   if (typeof obj === "object" && obj !== null) {
@@ -40559,7 +40559,9 @@ async function maybePromptForSettings(extensionConfig, extensionId, requestSetti
     settingsChanges.promptForEnv
   )) {
     const answer = await requestSetting(setting);
-    allSettings[setting.envVar] = answer;
+    if (answer !== void 0) {
+      allSettings[setting.envVar] = answer;
+    }
   }
   const nonSensitiveSettings = {};
   for (const setting of settings) {
@@ -40575,8 +40577,8 @@ async function maybePromptForSettings(extensionConfig, extensionId, requestSetti
   }
   const envContent = formatEnvContent(nonSensitiveSettings);
   if (fsSync.existsSync(envFilePath)) {
-    const stat9 = fsSync.statSync(envFilePath);
-    if (stat9.isDirectory()) {
+    const stat8 = fsSync.statSync(envFilePath);
+    if (stat8.isDirectory()) {
       throw new Error(
         `Cannot write extension settings to ${envFilePath} because it is a directory.`
       );
@@ -40610,7 +40612,7 @@ async function promptForSetting(setting) {
     message: `${setting.name}
 ${setting.description}`
   });
-  return response.value;
+  return typeof response.value === "string" ? response.value : void 0;
 }
 async function getScopedEnvContents(extensionConfig, extensionId, scope, workspaceDir) {
   const { name: extensionName } = extensionConfig;
@@ -40620,8 +40622,8 @@ async function getScopedEnvContents(extensionConfig, extensionId, scope, workspa
   const envFilePath = getEnvFilePath(extensionName, scope, workspaceDir);
   let customEnv = {};
   if (fsSync.existsSync(envFilePath)) {
-    const stat9 = fsSync.statSync(envFilePath);
-    if (!stat9.isDirectory()) {
+    const stat8 = fsSync.statSync(envFilePath);
+    if (!stat8.isDirectory()) {
       const envFile = fsSync.readFileSync(envFilePath, "utf-8");
       customEnv = dotenv.parse(envFile);
     }
@@ -40669,6 +40671,9 @@ async function updateSetting(extensionConfig, extensionId, settingKey, requestSe
     return;
   }
   const newValue = await requestSetting(settingToUpdate);
+  if (newValue === void 0) {
+    return;
+  }
   const keychain = new KeychainTokenStorage(
     getKeychainStorageName(extensionName, extensionId, scope, workspaceDir)
   );
@@ -40686,8 +40691,8 @@ async function updateSetting(extensionConfig, extensionId, settingKey, requestSe
   const envFilePath = getEnvFilePath(extensionName, scope, workspaceDir);
   let envContent = "";
   if (fsSync.existsSync(envFilePath)) {
-    const stat9 = fsSync.statSync(envFilePath);
-    if (stat9.isDirectory()) {
+    const stat8 = fsSync.statSync(envFilePath);
+    if (stat8.isDirectory()) {
       throw new Error(
         `Cannot write extension settings to ${envFilePath} because it is a directory.`
       );
@@ -40735,8 +40740,8 @@ function getSettingsChanges(settings, oldSettings) {
 }
 async function clearSettings(envFilePath, keychain) {
   if (fsSync.existsSync(envFilePath)) {
-    const stat9 = fsSync.statSync(envFilePath);
-    if (!stat9.isDirectory()) {
+    const stat8 = fsSync.statSync(envFilePath);
+    if (!stat8.isDirectory()) {
       await fs11.writeFile(envFilePath, "");
     }
   }
@@ -40817,8 +40822,8 @@ var Override = class _Override {
   output() {
     return `${this.isDisable ? "!" : ""}${this.baseRule}${this.includeSubdirs ? "*" : ""}`;
   }
-  matchesPath(path37) {
-    return this.asRegex().test(path37);
+  matchesPath(path38) {
+    return this.asRegex().test(path38);
   }
 };
 var ensureLeadingAndTrailingSlash = function(dirPath) {
@@ -40889,7 +40894,12 @@ var ExtensionEnablementManager = class {
   readConfig() {
     try {
       const content = fs12.readFileSync(this.configFilePath, "utf-8");
-      return JSON.parse(content);
+      const parsed = JSON.parse(content);
+      const schema = external_exports.record(
+        external_exports.string(),
+        external_exports.object({ overrides: external_exports.array(external_exports.string()) })
+      );
+      return schema.parse(parsed);
     } catch (error) {
       if (error instanceof Error && "code" in error && error.code === "ENOENT") {
         return {};
@@ -43959,7 +43969,7 @@ async function fetchJson(url, redirectCount = 0) {
   if (token) {
     headers.Authorization = `token ${token}`;
   }
-  return new Promise((resolve8, reject) => {
+  return new Promise((resolve9, reject) => {
     https.get(url, { headers }, (res) => {
       if (res.statusCode === 302 || res.statusCode === 301) {
         if (redirectCount >= 10) {
@@ -43972,7 +43982,7 @@ async function fetchJson(url, redirectCount = 0) {
         fetchJson(
           new URL(res.headers.location, url).toString(),
           redirectCount + 1
-        ).then(resolve8).catch(reject);
+        ).then(resolve9).catch(reject);
         return;
       }
       if (res.statusCode !== 200) {
@@ -43984,7 +43994,7 @@ async function fetchJson(url, redirectCount = 0) {
       res.on("data", (chunk) => chunks.push(chunk));
       res.on("end", () => {
         const data = Buffer.concat(chunks).toString();
-        resolve8(JSON.parse(data));
+        resolve9(JSON.parse(data));
       });
     }).on("error", reject);
   });
@@ -44344,7 +44354,7 @@ async function downloadFile(url, dest, options, redirectCount = 0) {
   if (token) {
     headers["Authorization"] = `token ${token}`;
   }
-  return new Promise((resolve8, reject) => {
+  return new Promise((resolve9, reject) => {
     https2.get(url, { headers }, (res) => {
       if (res.statusCode === 302 || res.statusCode === 301) {
         if (redirectCount >= 10) {
@@ -44355,7 +44365,7 @@ async function downloadFile(url, dest, options, redirectCount = 0) {
             new Error("Redirect response missing Location header")
           );
         }
-        downloadFile(res.headers.location, dest, options, redirectCount + 1).then(resolve8).catch(reject);
+        downloadFile(res.headers.location, dest, options, redirectCount + 1).then(resolve9).catch(reject);
         return;
       }
       if (res.statusCode !== 200) {
@@ -44365,7 +44375,7 @@ async function downloadFile(url, dest, options, redirectCount = 0) {
       }
       const file = fs15.createWriteStream(dest);
       res.pipe(file);
-      file.on("finish", () => file.close(resolve8));
+      file.on("finish", () => file.close(resolve9));
     }).on("error", reject);
   });
 }
@@ -44396,7 +44406,7 @@ var defaultRequestConfirmation = async (message) => {
     message,
     initial: false
   });
-  return response.confirm;
+  return typeof response.confirm === "boolean" ? response.confirm : false;
 };
 async function getExtensionManager() {
   const workspaceDir = process.cwd();
@@ -45524,7 +45534,7 @@ function validateName(name) {
   }
 }
 async function inferInstallMetadata(source2, args = {}) {
-  if (source2.startsWith("http://") || source2.startsWith("https://") || source2.startsWith("git@") || source2.startsWith("sso://") || source2.startsWith("github:") || source2.startsWith("gitlab:")) {
+  if (source2.startsWith("http://") || source2.startsWith("https://") || source2.startsWith("git@") || source2.startsWith("sso://") || source2.startsWith("github:") || source2.startsWith("gitlab:") || source2.startsWith("ssh://")) {
     return {
       source: source2,
       type: "git",
@@ -45595,7 +45605,7 @@ async function canLoadServer(serverId, config) {
       blockType: "admin"
     };
   }
-  if (config.allowedList && config.allowedList.length > 0) {
+  if (config.allowedList !== void 0) {
     const { found, deprecationWarning } = isInSettingsList(
       normalizedId,
       config.allowedList
@@ -45846,9 +45856,9 @@ function isSettingsValue(value) {
   const type = typeof value;
   return type === "string" || type === "number" || type === "boolean" || type === "object";
 }
-function getNestedValue(obj, path37) {
+function getNestedValue(obj, path38) {
   let current = obj;
-  for (const key of path37) {
+  for (const key of path38) {
     if (!isRecord(current) || !(key in current)) {
       return void 0;
     }
@@ -45861,8 +45871,8 @@ function getEffectiveValue(key, settings) {
   if (!definition) {
     return void 0;
   }
-  const path37 = key.split(".");
-  const value = getNestedValue(settings, path37);
+  const path38 = key.split(".");
+  const value = getNestedValue(settings, path38);
   if (value !== void 0 && isSettingsValue(value)) {
     return value;
   }
@@ -45872,8 +45882,8 @@ function getDialogSettingKeys() {
   return Object.values(getFlattenedSchema()).filter((definition) => definition.showInDialog !== false).map((definition) => definition.key);
 }
 function isInSettingsScope(key, scopeSettings) {
-  const path37 = key.split(".");
-  const value = getNestedValue(scopeSettings, path37);
+  const path38 = key.split(".");
+  const value = getNestedValue(scopeSettings, path38);
   return value !== void 0;
 }
 function getDisplayValue(key, scopeSettings, _mergedSettings) {
@@ -45969,7 +45979,6 @@ function getEditValue(type, rawValue) {
 }
 
 // packages/cli/src/ui/hooks/atCommandProcessor.ts
-import * as fs18 from "node:fs/promises";
 import * as path12 from "node:path";
 import { Buffer as Buffer5 } from "node:buffer";
 var REF_CONTENT_HEADER = `
@@ -46048,9 +46057,14 @@ async function checkPermissions(query, config) {
   for (const part of fileParts) {
     const pathName = part.content.substring(1);
     if (!pathName) continue;
-    const resolvedPathName = resolveToRealPath(
-      path12.resolve(config.getTargetDir(), pathName)
-    );
+    let resolvedPathName;
+    try {
+      resolvedPathName = resolveToRealPath(
+        path12.resolve(config.getTargetDir(), pathName)
+      );
+    } catch {
+      continue;
+    }
     if (config.validatePathAccess(resolvedPathName, "read")) {
       if (await fileExists(resolvedPathName)) {
         permissionsRequired.push(resolvedPathName);
@@ -46087,91 +46101,86 @@ async function resolveFilePaths(fileParts, config, onDebugMessage, signal) {
       onDebugMessage(`Path ${pathName} is ${reasonText} and will be skipped.`);
       continue;
     }
-    for (const dir of config.getWorkspaceContext().getDirectories()) {
-      try {
-        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 = path12.join(relativePath, "**");
-          resolvedFiles.push({
-            part,
-            pathSpec,
-            displayLabel: path12.isAbsolute(pathName) ? relativePath : pathName,
-            absolutePath
-          });
-          onDebugMessage(
-            `Path ${pathName} resolved to directory, using glob: ${pathSpec}`
-          );
-        } else {
-          resolvedFiles.push({
-            part,
-            pathSpec: relativePath,
-            displayLabel: path12.isAbsolute(pathName) ? relativePath : pathName,
-            absolutePath
-          });
-          onDebugMessage(
-            `Path ${pathName} resolved to file: ${absolutePath}, using relative path: ${relativePath}`
-          );
-        }
-        break;
-      } catch (error) {
-        if (isNodeError(error) && error.code === "ENOENT") {
-          if (config.getEnableRecursiveFileSearch() && globTool) {
-            onDebugMessage(
-              `Path ${pathName} not found directly, attempting glob search.`
+    const result = await resolveAtCommandPath(pathName, config, onDebugMessage);
+    if (result.status === "resolved") {
+      const { absolutePath, relativePath, stats } = result.resolved;
+      if (stats.isDirectory()) {
+        const pathSpec = path12.join(relativePath, "**");
+        resolvedFiles.push({
+          part,
+          pathSpec,
+          displayLabel: path12.isAbsolute(pathName) ? relativePath : pathName,
+          absolutePath
+        });
+        onDebugMessage(
+          `Path ${pathName} resolved to directory, using glob: ${pathSpec}`
+        );
+      } else {
+        resolvedFiles.push({
+          part,
+          pathSpec: relativePath,
+          displayLabel: path12.isAbsolute(pathName) ? relativePath : pathName,
+          absolutePath
+        });
+        onDebugMessage(
+          `Path ${pathName} resolved to file: ${absolutePath}, using relative path: ${relativePath}`
+        );
+      }
+    } else if (result.status === "not_found" || result.status === "unauthorized") {
+      if (config.getEnableRecursiveFileSearch() && globTool) {
+        onDebugMessage(
+          `Path ${pathName} not found directly, attempting glob search.`
+        );
+        for (const dir of config.getWorkspaceContext().getDirectories()) {
+          try {
+            const globResult = await globTool.buildAndExecute(
+              {
+                pattern: `**/*${pathName}*`,
+                path: dir
+              },
+              signal
             );
-            try {
-              const globResult = await globTool.buildAndExecute(
-                {
-                  pattern: `**/*${pathName}*`,
-                  path: dir
-                },
-                signal
-              );
-              if (globResult.llmContent && typeof globResult.llmContent === "string" && !globResult.llmContent.startsWith("No files found") && !globResult.llmContent.startsWith("Error:")) {
-                const lines = globResult.llmContent.split("\n");
-                if (lines.length > 1 && lines[1]) {
-                  const firstMatchAbsolute = lines[1].trim();
-                  const pathSpec = path12.relative(dir, firstMatchAbsolute);
-                  resolvedFiles.push({
-                    part,
-                    pathSpec,
-                    displayLabel: path12.isAbsolute(pathName) ? pathSpec : pathName
-                  });
-                  onDebugMessage(
-                    `Glob search for ${pathName} found ${firstMatchAbsolute}, using relative path: ${pathSpec}`
-                  );
-                  break;
-                } else {
-                  onDebugMessage(
-                    `Glob search for '**/*${pathName}*' did not return a usable path. Path ${pathName} will be skipped.`
-                  );
+            if (globResult.llmContent && typeof globResult.llmContent === "string" && !globResult.llmContent.startsWith("No files found") && !globResult.llmContent.startsWith("Error:")) {
+              const lines = globResult.llmContent.split("\n");
+              if (lines.length > 1 && lines[1]) {
+                const rawMatch = lines[1].trim();
+                let firstMatchAbsolute;
+                try {
+                  firstMatchAbsolute = resolveToRealPath(rawMatch);
+                } catch {
+                  firstMatchAbsolute = rawMatch;
                 }
+                const pathSpec = path12.relative(dir, firstMatchAbsolute);
+                resolvedFiles.push({
+                  part,
+                  pathSpec,
+                  displayLabel: path12.isAbsolute(pathName) ? pathSpec : pathName,
+                  absolutePath: firstMatchAbsolute
+                });
+                onDebugMessage(
+                  `Glob search for ${pathName} found ${firstMatchAbsolute}, using relative path: ${pathSpec}`
+                );
+                break;
               } else {
                 onDebugMessage(
-                  `Glob search for '**/*${pathName}*' found no files or an error. Path ${pathName} will be skipped.`
+                  `Glob search for '**/*${pathName}*' did not return a usable path. Path ${pathName} will be skipped.`
                 );
               }
-            } catch (globError) {
-              debugLogger.warn(
-                `Error during glob search for ${pathName}: ${getErrorMessage(globError)}`
-              );
+            } else {
               onDebugMessage(
-                `Error during glob search for ${pathName}. Path ${pathName} will be skipped.`
+                `Glob search for '**/*${pathName}*' found no files or an error. Path ${pathName} will be skipped.`
               );
             }
-          } else {
-            onDebugMessage(
-              `Glob tool not found. Path ${pathName} will be skipped.`
+          } catch (globError) {
+            debugLogger.warn(
+              `Error during glob search for ${pathName}: ${getErrorMessage(globError)}`
             );
           }
-        } else {
-          debugLogger.warn(
-            `Error stating path ${pathName}: ${getErrorMessage(error)}`
-          );
+        }
+      } else {
+        if (!config.getEnableRecursiveFileSearch() || !globTool) {
           onDebugMessage(
-            `Error stating path ${pathName}. Path ${pathName} will be skipped.`
+            `Glob tool not found. Path ${pathName} will be skipped.`
           );
         }
       }
@@ -46285,7 +46294,12 @@ async function readLocalFiles(resolvedFiles, config, signal, userMessageTimestam
     config,
     config.getMessageBus()
   );
-  const pathSpecsToRead = resolvedFiles.map((rf) => rf.pathSpec);
+  const pathSpecsToRead = resolvedFiles.map((rf) => {
+    if (rf.absolutePath) {
+      return rf.pathSpec.endsWith("**") ? path12.join(rf.absolutePath, "**") : rf.absolutePath;
+    }
+    return rf.pathSpec;
+  });
   const fileLabelsForDisplay = resolvedFiles.map((rf) => rf.displayLabel);
   const respectFileIgnore = config.getFileFilteringOptions();
   const toolArgs = {
@@ -46746,7 +46760,7 @@ var Subsume = class _Subsume {
 // node_modules/macos-version/index.js
 var import_semver = __toESM(require_semver2(), 1);
 import process21 from "node:process";
-import fs19 from "node:fs";
+import fs18 from "node:fs";
 var isMacOS = process21.platform === "darwin";
 var version;
 var clean = (version2) => {
@@ -46771,7 +46785,7 @@ function macOSVersion() {
     return;
   }
   if (!version) {
-    const file = fs19.readFileSync("/System/Library/CoreServices/SystemVersion.plist", "utf8");
+    const file = fs18.readFileSync("/System/Library/CoreServices/SystemVersion.plist", "utf8");
     const matches = parseVersion(file);
     if (!matches) {
       return;
@@ -46938,7 +46952,7 @@ async function writeClipboardImages(filePaths) {
   if (process22.platform !== "darwin") {
     return;
   }
-  const paths = filePaths.map((path37) => path37 instanceof URL ? fileURLToPath2(path37) : path37);
+  const paths = filePaths.map((path38) => path38 instanceof URL ? fileURLToPath2(path38) : path38);
   await runJxa((...paths2) => {
     ObjC.import("AppKit");
     ObjC.import("Foundation");
@@ -47018,13 +47032,13 @@ var clipboard = {
 var termux_default = clipboard;
 
 // packages/cli/node_modules/clipboardy/lib/linux.js
-import fs20 from "node:fs";
+import fs19 from "node:fs";
 import path13 from "node:path";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
 var __dirname = path13.dirname(fileURLToPath3(import.meta.url));
 var xsel = "xsel";
 var xselFallbackPath = path13.join(__dirname, "../fallbacks/linux/xsel");
-var hasXselFallback = fs20.existsSync(xselFallbackPath);
+var hasXselFallback = fs19.existsSync(xselFallbackPath);
 var copyArguments = ["--clipboard", "--input"];
 var pasteArguments = ["--clipboard", "--output"];
 var isDisplayError = (error) => /Can't open display|Inappropriate ioctl/i.test(error.stderr ?? "");
@@ -47160,7 +47174,7 @@ var clipboard4 = {
 var macos_default = clipboard4;
 
 // packages/cli/node_modules/clipboardy/lib/windows.js
-import fs21 from "node:fs";
+import fs20 from "node:fs";
 import path14 from "node:path";
 import { fileURLToPath as fileURLToPath4 } from "node:url";
 
@@ -47241,7 +47255,7 @@ executePowerShell.createArguments = createArguments;
 var __dirname2 = path14.dirname(fileURLToPath4(import.meta.url));
 var binarySuffix = is64bitSync() ? "x86_64" : "i686";
 var windowBinaryPath = path14.join(__dirname2, `../fallbacks/windows/clipboard_${binarySuffix}.exe`);
-var hasWindowsBinaryFallback = fs21.existsSync(windowBinaryPath);
+var hasWindowsBinaryFallback = fs20.existsSync(windowBinaryPath);
 var psCopyScript = `
 try {
 	[Console]::InputEncoding = [System.Text.Encoding]::UTF8
@@ -47415,7 +47429,7 @@ var clipboard7 = {
 var clipboardy_default = clipboard7;
 
 // packages/cli/src/ui/utils/commandUtils.ts
-import fs22 from "node:fs";
+import fs21 from "node:fs";
 var AT_COMMAND_DETECT_REGEX = new RegExp(
   `(?<!\\\\)@${AT_COMMAND_PATH_REGEX_SOURCE}`
 );
@@ -47441,33 +47455,33 @@ var OSC52_FOOTER = BEL3;
 var MAX_OSC52_BODY_B64_BYTES = MAX_OSC52_SEQUENCE_BYTES - Buffer.byteLength(OSC52_HEADER) - Buffer.byteLength(OSC52_FOOTER);
 var MAX_OSC52_DATA_BYTES = Math.floor(MAX_OSC52_BODY_B64_BYTES / 4) * 3;
 var SCREEN_DCS_CHUNK_SIZE = 240;
-var pickTty = () => new Promise((resolve8) => {
+var pickTty = () => new Promise((resolve9) => {
   if (process.platform !== "win32") {
     try {
-      const devTty = fs22.createWriteStream("/dev/tty");
+      const devTty = fs21.createWriteStream("/dev/tty");
       const timeout = setTimeout(() => {
         devTty.removeAllListeners("open");
         devTty.removeAllListeners("error");
         devTty.destroy();
-        resolve8(getStdioTty());
+        resolve9(getStdioTty());
       }, 100);
       devTty.once("open", () => {
         clearTimeout(timeout);
         devTty.removeAllListeners("error");
         devTty.on("error", () => {
         });
-        resolve8({ stream: devTty, closeAfter: true });
+        resolve9({ stream: devTty, closeAfter: true });
       });
       devTty.once("error", () => {
         clearTimeout(timeout);
         devTty.removeAllListeners("open");
-        resolve8(getStdioTty());
+        resolve9(getStdioTty());
       });
       return;
     } catch {
     }
   }
-  resolve8(getStdioTty());
+  resolve9(getStdioTty());
 });
 var getStdioTty = () => {
   if (process.platform === "win32") {
@@ -47521,12 +47535,12 @@ var wrapForScreen = (seq) => {
   }
   return out;
 };
-var writeAll = (stream, data) => new Promise((resolve8, reject) => {
+var writeAll = (stream, data) => new Promise((resolve9, reject) => {
   const fd = stream.fd;
   if (process.platform === "win32" && typeof fd === "number" && (stream === process.stdout || stream === process.stderr)) {
     try {
-      fs22.writeSync(fd, data);
-      resolve8();
+      fs21.writeSync(fd, data);
+      resolve9();
       return;
     } catch (e) {
       debugLogger.warn(
@@ -47541,7 +47555,7 @@ var writeAll = (stream, data) => new Promise((resolve8, reject) => {
   };
   const onDrain = () => {
     cleanup();
-    resolve8();
+    resolve9();
   };
   const cleanup = () => {
     stream.off("error", onError);
@@ -47550,7 +47564,7 @@ var writeAll = (stream, data) => new Promise((resolve8, reject) => {
   stream.once("error", onError);
   if (stream.write(data)) {
     cleanup();
-    resolve8();
+    resolve9();
   } else {
     stream.once("drain", onDrain);
   }
@@ -47644,13 +47658,13 @@ var parseSlashCommand = (query, commands) => {
 
 // packages/cli/src/ui/components/shared/text-buffer.ts
 var import_react41 = __toESM(require_react(), 1);
-import fs24 from "node:fs";
+import fs23 from "node:fs";
 import os5 from "node:os";
 import pathMod from "node:path";
 import * as path16 from "node:path";
 
 // packages/cli/src/ui/utils/clipboardUtils.ts
-import * as fs23 from "node:fs/promises";
+import * as fs22 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";
@@ -47683,14 +47697,14 @@ function getUserLinuxClipboardTool() {
   }
 }
 async function saveFromCommand(command, args, destination) {
-  return new Promise((resolve8) => {
+  return new Promise((resolve9) => {
     const child = spawn(command, args);
     const fileStream = createWriteStream2(destination);
     let resolved = false;
     const safeResolve = (value) => {
       if (!resolved) {
         resolved = true;
-        resolve8(value);
+        resolve9(value);
       }
     };
     child.stdout.pipe(fileStream);
@@ -47713,7 +47727,7 @@ async function saveFromCommand(command, args, destination) {
       }
       const checkFile = async () => {
         try {
-          const stats = await fs23.stat(destination);
+          const stats = await fs22.stat(destination);
           safeResolve(stats.size > 0);
         } catch (e) {
           debugLogger.debug(`Failed to stat output file ${destination}:`, e);
@@ -47800,7 +47814,7 @@ async function saveFileWithWlPaste(tempFilePath) {
     return true;
   }
   try {
-    await fs23.unlink(tempFilePath);
+    await fs22.unlink(tempFilePath);
   } catch {
   }
   return false;
@@ -47815,7 +47829,7 @@ var saveFileWithXclip = async (tempFilePath) => {
     return true;
   }
   try {
-    await fs23.unlink(tempFilePath);
+    await fs22.unlink(tempFilePath);
   } catch {
   }
   return false;
@@ -47829,7 +47843,7 @@ async function getProjectClipboardImagesDir(targetDir) {
 async function saveClipboardImage(targetDir) {
   try {
     const tempDir = await getProjectClipboardImagesDir(targetDir);
-    await fs23.mkdir(tempDir, { recursive: true });
+    await fs22.mkdir(tempDir, { recursive: true });
     const timestamp = (/* @__PURE__ */ new Date()).getTime();
     if (process.platform === "linux") {
       const tempFilePath = path15.join(tempDir, `clipboard-${timestamp}.png`);
@@ -47863,7 +47877,7 @@ async function saveClipboardImage(targetDir) {
       ]);
       if (stdout.trim() === "success") {
         try {
-          const stats = await fs23.stat(tempFilePath);
+          const stats = await fs22.stat(tempFilePath);
           if (stats.size > 0) {
             return tempFilePath;
           }
@@ -47898,7 +47912,7 @@ async function saveClipboardImage(targetDir) {
       const { stdout } = await spawnAsync("osascript", ["-e", script]);
       if (stdout.trim() === "success") {
         try {
-          const stats = await fs23.stat(tempFilePath);
+          const stats = await fs22.stat(tempFilePath);
           if (stats.size > 0) {
             return tempFilePath;
           }
@@ -47907,7 +47921,7 @@ async function saveClipboardImage(targetDir) {
         }
       }
       try {
-        await fs23.unlink(tempFilePath);
+        await fs22.unlink(tempFilePath);
       } catch (e) {
         debugLogger.debug("Failed to clean up temp file:", tempFilePath, e);
       }
@@ -47921,15 +47935,15 @@ async function saveClipboardImage(targetDir) {
 async function cleanupOldClipboardImages(targetDir) {
   try {
     const tempDir = await getProjectClipboardImagesDir(targetDir);
-    const files = await fs23.readdir(tempDir);
+    const files = await fs22.readdir(tempDir);
     const oneHourAgo = Date.now() - 60 * 60 * 1e3;
     for (const file of files) {
       const ext = path15.extname(file).toLowerCase();
       if (file.startsWith("clipboard-") && IMAGE_EXTENSIONS.includes(ext)) {
         const filePath = path15.join(tempDir, file);
-        const stats = await fs23.stat(filePath);
+        const stats = await fs22.stat(filePath);
         if (stats.mtimeMs < oneHourAgo) {
-          await fs23.unlink(filePath);
+          await fs22.unlink(filePath);
         }
       }
     }
@@ -49490,24 +49504,55 @@ function handleVimAction(state, action) {
 
 // packages/cli/src/ui/utils/editorUtils.ts
 import { spawn as spawn2, spawnSync } from "node:child_process";
-async function openFileInEditor(filePath, stdin, setRawMode, preferredEditorType) {
+var HEURISTIC_GUI_COMMANDS = [
+  "code",
+  "cursor",
+  "subl",
+  "zed",
+  "atom",
+  "agy"
+];
+async function openFileInEditor(filePath, stdin, setRawMode, preferredEditorType, openInNewWindow) {
   let command = void 0;
   const args = [filePath];
+  const extraArgs = [];
   if (preferredEditorType) {
+    if (!isValidEditorType(preferredEditorType)) {
+      coreEvents.emitFeedback(
+        "error",
+        `Editor '${preferredEditorType}' is not a recognized editor identifier. Supported editors: ${ALL_EDITORS.join(", ")}. Use /editor to select one, or set the $VISUAL or $EDITOR environment variable.`
+      );
+      return;
+    }
     command = getEditorCommand(preferredEditorType);
     if (isGuiEditor(preferredEditorType)) {
-      args.unshift("--wait");
+      args.unshift(getEditorWaitFlag(preferredEditorType));
     }
+    extraArgs.push(
+      ...getEditorExtraArgs(preferredEditorType, {
+        newWindow: openInNewWindow
+      })
+    );
   }
   if (!command) {
-    command = process.env["VISUAL"] ?? process.env["EDITOR"];
-    if (command) {
-      const lowerCommand = command.toLowerCase();
-      const isGui = ["code", "cursor", "subl", "zed", "atom"].some(
-        (gui) => lowerCommand.includes(gui)
-      );
-      if (isGui && !lowerCommand.includes("--wait") && !lowerCommand.includes("-w")) {
-        args.unshift(lowerCommand.includes("subl") ? "-w" : "--wait");
+    const envCommand = process.env["VISUAL"] ?? process.env["EDITOR"];
+    if (envCommand) {
+      command = envCommand;
+      const [envExecutable = ""] = envCommand.split(" ");
+      const resolvedType = resolveEditorTypeFromCommand(envExecutable);
+      if (resolvedType) {
+        if (isGuiEditor(resolvedType) && !envCommand.includes("--wait") && !envCommand.includes("-w")) {
+          args.unshift(getEditorWaitFlag(resolvedType));
+        }
+        extraArgs.push(
+          ...getEditorExtraArgs(resolvedType, { newWindow: openInNewWindow })
+        );
+      } else {
+        const lower = envCommand.toLowerCase();
+        const isGui = HEURISTIC_GUI_COMMANDS.some((g2) => lower.includes(g2));
+        if (isGui && !lower.includes("--wait") && !lower.includes("-w")) {
+          args.unshift(lower.includes("subl") ? "-w" : "--wait");
+        }
       }
     }
   }
@@ -49515,7 +49560,16 @@ async function openFileInEditor(filePath, stdin, setRawMode, preferredEditorType
     command = process.platform === "win32" ? "notepad" : "vi";
   }
   const [executable = "", ...initialArgs] = command.split(" ");
-  const terminalEditors = ["vi", "vim", "nvim", "emacs", "hx", "nano"];
+  const terminalEditors = [
+    "vi",
+    "vim",
+    "nvim",
+    "emacs",
+    "emacsclient",
+    "hx",
+    "nano",
+    "micro"
+  ];
   const isTerminal = preferredEditorType ? isTerminalEditor(preferredEditorType) : terminalEditors.some((te2) => executable.toLowerCase().includes(te2));
   if (isTerminal && (executable.includes("vi") || executable.includes("vim") || executable.includes("nvim"))) {
     args.unshift("-i", "NONE");
@@ -49524,56 +49578,54 @@ async function openFileInEditor(filePath, stdin, setRawMode, preferredEditorType
   setRawMode?.(false);
   try {
     if (isTerminal) {
-      const result = spawnSync(executable, [...initialArgs, ...args], {
-        stdio: "inherit",
-        shell: process.platform === "win32"
-      });
+      const result = spawnSync(
+        executable,
+        [...initialArgs, ...extraArgs, ...args],
+        {
+          stdio: "inherit",
+          shell: process.platform === "win32"
+        }
+      );
       if (result.error) {
+        const spawnErr = result.error;
         coreEvents.emitFeedback(
           "error",
-          "[editorUtils] external terminal editor error",
-          result.error
+          spawnErr.code === "ENOENT" ? `Editor command '${executable}' was not found in PATH. Install it or use /editor to choose another editor.` : spawnErr.message ?? String(spawnErr)
         );
-        throw result.error;
+        return;
       }
       if (typeof result.status === "number" && result.status !== 0) {
-        const err = new Error(
-          `External editor exited with status ${result.status}`
-        );
         coreEvents.emitFeedback(
           "error",
-          "[editorUtils] external editor error",
-          err
+          `External editor exited with status ${result.status}`
         );
-        throw err;
+        return;
       }
     } else {
-      await new Promise((resolve8, reject) => {
-        const child = spawn2(executable, [...initialArgs, ...args], {
-          stdio: "inherit",
-          shell: process.platform === "win32"
-        });
+      await new Promise((resolve9) => {
+        const child = spawn2(
+          executable,
+          [...initialArgs, ...extraArgs, ...args],
+          {
+            stdio: "inherit",
+            shell: process.platform === "win32"
+          }
+        );
         child.on("error", (err) => {
+          const spawnErr = err;
+          resolve9();
           coreEvents.emitFeedback(
             "error",
-            "[editorUtils] external editor spawn error",
-            err
+            spawnErr.code === "ENOENT" ? `Editor command '${executable}' was not found in PATH. Install it or use /editor to choose another editor.` : spawnErr.message ?? String(spawnErr)
           );
-          reject(err);
         });
         child.on("close", (status) => {
+          resolve9();
           if (typeof status === "number" && status !== 0) {
-            const err = new Error(
-              `External editor exited with status ${status}`
-            );
             coreEvents.emitFeedback(
               "error",
-              "[editorUtils] external editor error",
-              err
+              `External editor exited with status ${status}`
             );
-            reject(err);
-          } else {
-            resolve8();
           }
         });
       });
@@ -51348,6 +51400,7 @@ function useTextBuffer({
   singleLine = false,
   getPreferredEditor
 }) {
+  const settings = useSettings();
   const keyMatchers = useKeyMatchers();
   const initialState = (0, import_react41.useMemo)(() => {
     const lines2 = initialText.split("\n");
@@ -51722,19 +51775,20 @@ function useTextBuffer({
     dispatch({ type: "vim_paste_before", payload: { count } });
   }, []);
   const openInExternalEditor = (0, import_react41.useCallback)(async () => {
-    const tmpDir = fs24.mkdtempSync(pathMod.join(os5.tmpdir(), "gemini-edit-"));
+    const tmpDir = fs23.mkdtempSync(pathMod.join(os5.tmpdir(), "gemini-edit-"));
     const filePath = pathMod.join(tmpDir, "buffer.txt");
     const expandedText = expandPastePlaceholders(text, pastedContent);
-    fs24.writeFileSync(filePath, expandedText, "utf8");
+    fs23.writeFileSync(filePath, expandedText, "utf8");
     dispatch({ type: "create_undo_snapshot" });
     try {
       await openFileInEditor(
         filePath,
         stdin,
         setRawMode,
-        getPreferredEditor?.()
+        getPreferredEditor?.(),
+        settings.merged.general.openEditorInNewWindow
       );
-      let newText = fs24.readFileSync(filePath, "utf8");
+      let newText = fs23.readFileSync(filePath, "utf8");
       newText = newText.replace(/\r\n?/g, "\n");
       const sortedPlaceholders = Object.entries(pastedContent).sort(
         (a, b2) => b2[1].length - a[1].length
@@ -51746,22 +51800,25 @@ function useTextBuffer({
       }
       dispatch({ type: "set_text", payload: newText, pushToUndo: false });
     } catch (err) {
-      coreEvents.emitFeedback(
-        "error",
-        "[useTextBuffer] external editor error",
-        err
-      );
+      coreEvents.emitFeedback("error", getErrorMessage(err), err);
     } finally {
       try {
-        fs24.unlinkSync(filePath);
+        fs23.unlinkSync(filePath);
       } catch {
       }
       try {
-        fs24.rmdirSync(tmpDir);
+        fs23.rmdirSync(tmpDir);
       } catch {
       }
     }
-  }, [text, pastedContent, stdin, setRawMode, getPreferredEditor]);
+  }, [
+    text,
+    pastedContent,
+    stdin,
+    setRawMode,
+    getPreferredEditor,
+    settings.merged.general.openEditorInNewWindow
+  ]);
   const handleInput = (0, import_react41.useCallback)(
     (key) => {
       const { sequence: input } = key;
@@ -52248,7 +52305,7 @@ function useTextBuffer({
 var import_react42 = __toESM(require_react(), 1);
 
 // packages/cli/src/config/extensions/update.ts
-import * as fs25 from "node:fs";
+import * as fs24 from "node:fs";
 async function updateExtension(extension, extensionManager, currentState, dispatchExtensionStateUpdate, enableExtensionReloading) {
   if (currentState === "updating" /* UPDATING */) {
     return void 0;
@@ -52350,7 +52407,7 @@ ${e}`
     await copyExtension(tempDir, extension.path);
     throw e;
   } finally {
-    await fs25.promises.rm(tempDir, { recursive: true, force: true });
+    await fs24.promises.rm(tempDir, { recursive: true, force: true });
   }
 }
 async function updateAllUpdatableExtensions(extensions, extensionsState, extensionManager, dispatch, enableExtensionReloading) {
@@ -52698,7 +52755,7 @@ var useSessionBrowser = (config, onLoadHistory) => {
 };
 
 // packages/cli/src/ui/utils/terminalSetup.ts
-import { promises as fs27 } from "node:fs";
+import { promises as fs26 } from "node:fs";
 import * as os6 from "node:os";
 import * as path19 from "node:path";
 import { exec as exec2 } from "node:child_process";
@@ -52706,7 +52763,7 @@ import { promisify as promisify4 } from "node:util";
 var import_react47 = __toESM(require_react(), 1);
 
 // packages/cli/src/utils/persistentState.ts
-import * as fs26 from "node:fs";
+import * as fs25 from "node:fs";
 import * as path18 from "node:path";
 var STATE_FILENAME = "state.json";
 var PersistentState = class {
@@ -52724,8 +52781,8 @@ var PersistentState = class {
     }
     try {
       const filePath = this.getPath();
-      if (fs26.existsSync(filePath)) {
-        const content = fs26.readFileSync(filePath, "utf-8");
+      if (fs25.existsSync(filePath)) {
+        const content = fs25.readFileSync(filePath, "utf-8");
         this.cache = JSON.parse(content);
       } else {
         this.cache = {};
@@ -52741,10 +52798,10 @@ var PersistentState = class {
     try {
       const filePath = this.getPath();
       const dir = path18.dirname(filePath);
-      if (!fs26.existsSync(dir)) {
-        fs26.mkdirSync(dir, { recursive: true });
+      if (!fs25.existsSync(dir)) {
+        fs25.mkdirSync(dir, { recursive: true });
       }
-      fs26.writeFileSync(filePath, JSON.stringify(this.cache, null, 2));
+      fs25.writeFileSync(filePath, JSON.stringify(this.cache, null, 2));
     } catch (error) {
       debugLogger.warn("Failed to save persistent state:", error);
     }
@@ -52827,7 +52884,7 @@ async function backupFile(filePath) {
   try {
     const timestamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
     const backupPath = `${filePath}.backup.${timestamp}`;
-    await fs27.copyFile(filePath, backupPath);
+    await fs26.copyFile(filePath, backupPath);
   } catch (error) {
     debugLogger.warn(`Failed to create backup of ${filePath}:`, error);
   }
@@ -52861,10 +52918,10 @@ async function configureVSCodeStyle(terminalName, appName) {
   }
   const keybindingsFile = path19.join(configDir, "keybindings.json");
   try {
-    await fs27.mkdir(configDir, { recursive: true });
+    await fs26.mkdir(configDir, { recursive: true });
     let keybindings = [];
     try {
-      const content = await fs27.readFile(keybindingsFile, "utf8");
+      const content = await fs26.readFile(keybindingsFile, "utf8");
       await backupFile(keybindingsFile);
       try {
         const cleanContent = stripJsonComments(content);
@@ -52962,7 +53019,7 @@ Please check and modify manually if needed: ${keybindingsFile}`
         keybindings.unshift(target);
       }
     }
-    await fs27.writeFile(keybindingsFile, JSON.stringify(keybindings, null, 4));
+    await fs26.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(
@@ -52998,7 +53055,7 @@ async function shouldPromptForTerminalSetup() {
   }
   const keybindingsFile = path19.join(configDir, "keybindings.json");
   try {
-    const content = await fs27.readFile(keybindingsFile, "utf8");
+    const content = await fs26.readFile(keybindingsFile, "utf8");
     const cleanContent = stripJsonComments(content);
     const parsedContent = JSON.parse(cleanContent);
     if (!Array.isArray(parsedContent)) {
@@ -53556,7 +53613,7 @@ var formatResetTime = (resetTime, format = "full") => {
 
 // packages/cli/src/services/FileCommandLoader.ts
 var import_toml = __toESM(require_toml(), 1);
-import { promises as fs28 } from "node:fs";
+import { promises as fs27 } from "node:fs";
 import path20 from "node:path";
 
 // packages/cli/src/services/prompt-processors/argumentProcessor.ts
@@ -53951,14 +54008,17 @@ var FileCommandLoader = class {
   getCommandDirectories() {
     const dirs = [];
     const storage = this.config?.storage ?? new Storage(this.projectRoot);
+    const userCommandsDir = Storage.getUserCommandsDir();
     dirs.push({
-      path: Storage.getUserCommandsDir(),
+      path: userCommandsDir,
       kind: "user-file" /* USER_FILE */
     });
-    dirs.push({
-      path: storage.getProjectCommandsDir(),
-      kind: "workspace-file" /* WORKSPACE_FILE */
-    });
+    if (!storage.isWorkspaceHomeDir()) {
+      dirs.push({
+        path: storage.getProjectCommandsDir(),
+        kind: "workspace-file" /* WORKSPACE_FILE */
+      });
+    }
     if (this.config) {
       const activeExtensions = this.config.getExtensions().filter((ext) => ext.isActive).sort((a, b2) => a.name.localeCompare(b2.name));
       const extensionCommandDirs = activeExtensions.map((ext) => ({
@@ -53982,7 +54042,7 @@ var FileCommandLoader = class {
   async parseAndAdaptFile(filePath, baseDir, kind, extensionName, extensionId) {
     let fileContent;
     try {
-      fileContent = await fs28.readFile(filePath, "utf-8");
+      fileContent = await fs27.readFile(filePath, "utf-8");
     } catch (error) {
       coreEvents.emitFeedback(
         "error",
@@ -54634,7 +54694,7 @@ function RadioButtonSelect({
 
 // packages/cli/src/ui/utils/directoryUtils.ts
 import * as path21 from "node:path";
-import * as fs29 from "node:fs";
+import * as fs28 from "node:fs";
 import { opendir } from "node:fs/promises";
 var MAX_SUGGESTIONS = 50;
 var MATCH_BUFFER_MULTIPLIER = 3;
@@ -54685,7 +54745,7 @@ function parsePartialPath(partialPath) {
 async function getDirectorySuggestions(partialPath) {
   try {
     const { searchDir, filter, resultPrefix } = parsePartialPath(partialPath);
-    if (!fs29.existsSync(searchDir) || !fs29.statSync(searchDir).isDirectory()) {
+    if (!fs28.existsSync(searchDir) || !fs28.statSync(searchDir).isDirectory()) {
       return [];
     }
     const matches = [];
@@ -54854,6 +54914,36 @@ var MultiFolderTrustDialog = ({
   ] });
 };
 
+// packages/cli/src/ui/utils/antigravityUtils.ts
+import process26 from "node:process";
+var ANTIGRAVITY_SH_INSTALL = "curl -fsSL https://antigravity.google/cli/install.sh | bash";
+function getAntigravityInstallInfo() {
+  if (process26.platform === "win32") {
+    if (process26.env["PSModulePath"]) {
+      return {
+        platformName: "Windows (PowerShell)",
+        installCmd: "irm https://antigravity.google/cli/install.ps1 | iex"
+      };
+    } else {
+      return {
+        platformName: "Windows (Command Prompt)",
+        installCmd: "curl -fsSL https://antigravity.google/cli/install.cmd -o install.cmd && install.cmd && del install.cmd"
+      };
+    }
+  } else if (process26.platform === "darwin") {
+    return {
+      platformName: "macOS",
+      installCmd: ANTIGRAVITY_SH_INSTALL
+    };
+  } else if (process26.platform === "linux") {
+    return {
+      platformName: "Linux",
+      installCmd: ANTIGRAVITY_SH_INSTALL
+    };
+  }
+  return null;
+}
+
 // node_modules/ink-spinner/build/index.js
 var import_react52 = __toESM(require_react(), 1);
 var import_cli_spinners = __toESM(require_cli_spinners(), 1);
@@ -54975,7 +55065,7 @@ var _ExpandableText = ({
 var ExpandableText = import_react54.default.memo(_ExpandableText);
 
 // packages/cli/src/ui/key/keybindingUtils.ts
-import process26 from "node:process";
+import process27 from "node:process";
 var KEY_NAME_MAP = {
   enter: "Enter",
   escape: "Esc",
@@ -55019,7 +55109,7 @@ var MODIFIER_MAPS = {
   }
 };
 function formatKeyBinding(binding, platform5) {
-  const activePlatform = platform5 ?? (process26.env["FORCE_GENERIC_KEYBINDING_HINTS"] ? "default" : process26.platform);
+  const activePlatform = platform5 ?? (process27.env["FORCE_GENERIC_KEYBINDING_HINTS"] ? "default" : process27.platform);
   const modMap = MODIFIER_MAPS[activePlatform] || MODIFIER_MAPS["default"];
   const parts = [];
   if (binding.ctrl) parts.push(modMap.ctrl);
@@ -55888,7 +55978,7 @@ var useAlternateBuffer = () => {
 };
 
 // packages/cli/src/ui/commands/aboutCommand.ts
-import process27 from "node:process";
+import process28 from "node:process";
 var aboutCommand = {
   name: "about",
   description: "Show version info",
@@ -55896,17 +55986,17 @@ var aboutCommand = {
   autoExecute: true,
   isSafeConcurrent: true,
   action: async (context) => {
-    const osVersion = process27.platform;
+    const osVersion = process28.platform;
     let sandboxEnv = "no sandbox";
-    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"})`;
+    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"})`;
     }
     const modelVersion = context.services.agentContext?.config.getModel() || "Unknown";
     const cliVersion = await getVersion();
     const selectedAuthType = context.services.settings.merged.security.auth.selectedType || "";
-    const gcpProject = process27.env["GOOGLE_CLOUD_PROJECT"] || "";
+    const gcpProject = process28.env["GOOGLE_CLOUD_PROJECT"] || "";
     const ideClient = await getIdeClientName(context);
     const userAccountManager = new UserAccountManager();
     const cachedAccount = userAccountManager.getCachedGoogleAccount();
@@ -55963,10 +56053,10 @@ function enableFeature(settings, featureName, strategy) {
     };
   }
   const modifiedScopes = [];
-  for (const { scope, path: path37 } of foundInDisabledScopes) {
+  for (const { scope, path: path38 } of foundInDisabledScopes) {
     if (isLoadableSettingScope(scope)) {
       strategy.enable(settings, scope, featureName);
-      modifiedScopes.push({ scope, path: path37 });
+      modifiedScopes.push({ scope, path: path38 });
     }
   }
   return {
@@ -56454,10 +56544,10 @@ var authCommand = {
 };
 
 // packages/cli/src/ui/commands/bugCommand.ts
-import process28 from "node:process";
+import process29 from "node:process";
 
 // packages/cli/src/generated/git-commit.ts
-var GIT_COMMIT_INFO = "2249c15a2";
+var GIT_COMMIT_INFO = "bfd6a65f5";
 
 // packages/cli/src/ui/utils/historyExportUtils.ts
 import * as fsPromises from "node:fs/promises";
@@ -56517,7 +56607,7 @@ async function captureHeapSnapshot(filePath) {
 }
 
 // packages/cli/src/ui/commands/bugCommand.ts
-import { stat as stat4 } from "node:fs/promises";
+import { stat as stat3 } from "node:fs/promises";
 import path24 from "node:path";
 var bugCommand = {
   name: "bug",
@@ -56528,16 +56618,16 @@ var bugCommand = {
     const bugDescription = (args || "").trim();
     const agentContext = context.services.agentContext;
     const config = agentContext?.config;
-    const osVersion = `${process28.platform} ${process28.version}`;
+    const osVersion = `${process29.platform} ${process29.version}`;
     let sandboxEnv = "no sandbox";
-    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"})`;
+    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"})`;
     }
     const modelVersion = config?.getModel() || "Unknown";
     const cliVersion = await getVersion();
-    const memoryUsage = formatBytes(process28.memoryUsage().rss);
+    const memoryUsage = formatBytes(process29.memoryUsage().rss);
     const ideClient = await getIdeClientName2(context);
     const terminalName = terminalCapabilityManager.getTerminalName() || "Unknown";
     const terminalBgColor = terminalCapabilityManager.getTerminalBackgroundColor() || "Unknown";
@@ -56619,7 +56709,7 @@ ${bugReportUrl}${historyFileMessage}`
         Date.now()
       );
     }
-    const rss = process28.memoryUsage().rss;
+    const rss = process29.memoryUsage().rss;
     const tempDir = config?.storage?.getProjectTempDir();
     if (rss >= MEMORY_SNAPSHOT_AUTO_THRESHOLD_BYTES && tempDir) {
       const snapshotPath = path24.join(
@@ -56640,7 +56730,7 @@ This can take 20+ seconds and the CLI may be temporarily unresponsive; please do
         const durationMs = Date.now() - startedAt;
         let sizeText = "";
         try {
-          const { size } = await stat4(snapshotPath);
+          const { size } = await stat3(snapshotPath);
           sizeText = ` (${formatBytes(size)})`;
         } catch {
         }
@@ -56679,9 +56769,9 @@ async function getIdeClientName2(context) {
 }
 
 // packages/cli/src/ui/commands/bugMemoryCommand.ts
-import { stat as stat5 } from "node:fs/promises";
+import { stat as stat4 } from "node:fs/promises";
 import path25 from "node:path";
-import process29 from "node:process";
+import process30 from "node:process";
 var bugMemoryCommand = {
   name: "bug-memory",
   description: "Capture a V8 heap snapshot to disk to attach to a bug report",
@@ -56703,7 +56793,7 @@ var bugMemoryCommand = {
       tempDir,
       `bug-memory-${Date.now()}.heapsnapshot`
     );
-    const rss = process29.memoryUsage().rss;
+    const rss = process30.memoryUsage().rss;
     context.ui.addItem(
       {
         type: "info" /* INFO */,
@@ -56731,7 +56821,7 @@ Destination: ${filePath}`
     const durationMs = Date.now() - startedAt;
     let sizeText = "";
     try {
-      const { size } = await stat5(filePath);
+      const { size } = await stat4(filePath);
       sizeText = ` (${formatBytes(size)})`;
     } catch {
     }
@@ -57122,7 +57212,7 @@ var clearCommand = {
     if (hookSystem) {
       result = await hookSystem.fireSessionStartEvent(SessionStartSource.Clear);
     }
-    await new Promise((resolve8) => setImmediate(resolve8));
+    await new Promise((resolve9) => setImmediate(resolve9));
     if (config) {
       await flushTelemetry(config);
     }
@@ -57366,7 +57456,7 @@ var corgiCommand = {
 };
 
 // packages/cli/src/ui/commands/docsCommand.ts
-import process30 from "node:process";
+import process31 from "node:process";
 var docsCommand = {
   name: "docs",
   description: "Open full Gemini CLI documentation in your browser",
@@ -57374,7 +57464,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 (process31.env["SANDBOX"] && process31.env["SANDBOX"] !== "sandbox-exec") {
       context.ui.addItem(
         {
           type: "info" /* INFO */,
@@ -57396,9 +57486,84 @@ ${docsUrl}`
   }
 };
 
+// packages/cli/src/ui/commands/exportSessionCommand.ts
+import * as fs29 from "node:fs/promises";
+import * as path27 from "node:path";
+var exportSessionCommand = {
+  name: "export-session",
+  description: "Export the current session to a JSON file",
+  kind: "built-in" /* BUILT_IN */,
+  autoExecute: true,
+  action: async (context) => {
+    const { ui: ui2 } = context;
+    const args = context.invocation?.args.trim();
+    if (!args) {
+      return {
+        type: "message",
+        messageType: "error",
+        content: "Please provide a file path to export the session to. Example: /export-session ./my-session.json"
+      };
+    }
+    const sessionId = context.services.agentContext?.config.getSessionId();
+    if (!sessionId) {
+      return {
+        type: "message",
+        messageType: "error",
+        content: "No active session found to export."
+      };
+    }
+    if (ui2.pendingItem) {
+      ui2.addItem(
+        {
+          type: "error" /* ERROR */,
+          text: "Operation already in progress, please wait."
+        },
+        Date.now()
+      );
+      return;
+    }
+    const pendingMessage = {
+      type: "export_session" /* EXPORT_SESSION */,
+      exportSession: {
+        isPending: true
+      }
+    };
+    try {
+      ui2.setPendingItem(pendingMessage);
+      const storage = context.services.agentContext.config.storage;
+      const sessionSelector = new SessionSelector(storage);
+      const { sessionData } = await sessionSelector.resolveSession(sessionId);
+      const targetPath = path27.resolve(process.cwd(), args);
+      await fs29.writeFile(
+        targetPath,
+        JSON.stringify(sessionData, null, 2),
+        "utf-8"
+      );
+      ui2.addItem(
+        {
+          type: "export_session" /* EXPORT_SESSION */,
+          exportSession: {
+            isPending: false,
+            targetPath
+          }
+        },
+        Date.now()
+      );
+    } catch (error) {
+      return {
+        type: "message",
+        messageType: "error",
+        content: `Failed to export session: ${error instanceof Error ? error.message : "Unknown error"}`
+      };
+    } finally {
+      ui2.setPendingItem(null);
+    }
+  }
+};
+
 // packages/cli/src/ui/commands/directoryCommand.tsx
 var import_jsx_runtime15 = __toESM(require_jsx_runtime(), 1);
-import * as path27 from "node:path";
+import * as path28 from "node:path";
 import * as fs30 from "node:fs";
 async function finishAddingDirectories(config, addItem, added, errors) {
   if (!config) {
@@ -57411,7 +57576,7 @@ async function finishAddingDirectories(config, addItem, added, errors) {
   if (added.length > 0) {
     try {
       if (config.shouldLoadMemoryFromIncludeDirectories()) {
-        await refreshServerHierarchicalMemory(config);
+        await config.getMemoryContextManager()?.refresh();
       }
       addItem({
         type: "info" /* INFO */,
@@ -57467,15 +57632,15 @@ var directoryCommand = {
         if (context.services.agentContext?.config) {
           const workspaceContext = context.services.agentContext.config.getWorkspaceContext();
           const existingDirs = new Set(
-            workspaceContext.getDirectories().map((dir) => path27.resolve(dir))
+            workspaceContext.getDirectories().map((dir) => path28.resolve(dir))
           );
           filteredSuggestions = suggestions.filter((s3) => {
             const expanded = expandHomeDir(s3);
-            const absolute = path27.resolve(expanded);
+            const absolute = path28.resolve(expanded);
             if (existingDirs.has(absolute)) {
               return false;
             }
-            if (absolute.endsWith(path27.sep) && existingDirs.has(absolute.slice(0, -1))) {
+            if (absolute.endsWith(path28.sep) && existingDirs.has(absolute.slice(0, -1))) {
               return false;
             }
             return true;
@@ -57525,7 +57690,7 @@ var directoryCommand = {
           const trimmedPath = pathToAdd.trim();
           const expandedPath = expandHomeDir(trimmedPath);
           try {
-            const absolutePath = path27.resolve(
+            const absolutePath = path28.resolve(
               workspaceContext.targetDir,
               expandedPath
             );
@@ -57555,7 +57720,7 @@ var directoryCommand = {
           const dirsToConfirm = [];
           const trustedDirs = [];
           for (const pathToAdd of pathsToProcess) {
-            const expandedPath = path27.resolve(expandHomeDir(pathToAdd.trim()));
+            const expandedPath = path28.resolve(expandHomeDir(pathToAdd.trim()));
             const isTrusted = trustedFolders.isPathTrusted(expandedPath);
             if (isTrusted === true) {
               trustedDirs.push(pathToAdd.trim());
@@ -57641,8 +57806,8 @@ var editorCommand = {
 };
 
 // packages/cli/src/ui/commands/extensionsCommand.ts
-import process31 from "node:process";
-import { stat as stat7 } from "node:fs/promises";
+import process32 from "node:process";
+import { stat as stat6 } from "node:fs/promises";
 
 // packages/cli/src/ui/components/ConfigExtensionDialog.tsx
 var import_react62 = __toESM(require_react(), 1);
@@ -57776,14 +57941,14 @@ var ConfigExtensionDialog = ({
     [loggerAdapter]
   );
   const requestSetting = (0, import_react62.useCallback)(
-    async (setting) => new Promise((resolve8) => {
+    async (setting) => new Promise((resolve9) => {
       if (!mounted.current) return;
       settingBuffer.setText("");
       setState({
         type: "ASK_SETTING",
         setting,
         resolve: (val) => {
-          resolve8(val);
+          resolve9(val);
           setState({ type: "BUSY", message: "Updating..." });
         }
       });
@@ -57791,13 +57956,13 @@ var ConfigExtensionDialog = ({
     [settingBuffer]
   );
   const requestConfirmation = (0, import_react62.useCallback)(
-    async (message) => new Promise((resolve8) => {
+    async (message) => new Promise((resolve9) => {
       if (!mounted.current) return;
       setState({
         type: "ASK_CONFIRMATION",
         message,
         resolve: (val) => {
-          resolve8(val);
+          resolve9(val);
           setState({ type: "BUSY", message: "Processing..." });
         }
       });
@@ -58383,8 +58548,8 @@ function ExtensionDetails({
       if (keyMatchers["basic.confirm" /* RETURN */](key) && !isInstalled && !isInstalling) {
         setIsInstalling(true);
         void onInstall(
-          (prompt) => new Promise((resolve8) => {
-            setConsentRequest({ prompt, resolve: resolve8 });
+          (prompt) => new Promise((resolve9) => {
+            setConsentRequest({ prompt, resolve: resolve9 });
           })
         );
         return true;
@@ -58392,8 +58557,8 @@ function ExtensionDetails({
       if (keyMatchers["extension.link" /* LINK_EXTENSION */](key) && isLinkable && !isInstalled && !isInstalling) {
         setIsInstalling(true);
         void onLink(
-          (prompt) => new Promise((resolve8) => {
-            setConsentRequest({ prompt, resolve: resolve8 });
+          (prompt) => new Promise((resolve9) => {
+            setConsentRequest({ prompt, resolve: resolve9 });
           })
         );
         return true;
@@ -58797,7 +58962,7 @@ function updateAction(context, args) {
   }
   let resolveUpdateComplete;
   const updateComplete = new Promise(
-    (resolve8) => resolveUpdateComplete = resolve8
+    (resolve9) => resolveUpdateComplete = resolve9
   );
   const extensions = context.services.agentContext?.config ? listExtensions(context.services.agentContext.config) : [];
   if (showMessageIfNoExtensions(context, extensions)) {
@@ -58977,12 +59142,12 @@ async function exploreAction(context) {
     }
   }
   const extensionsUrl = "https://geminicli.com/extensions/";
-  if (process31.env["NODE_ENV"] === "test") {
+  if (process32.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 (process32.env["SANDBOX"] && process32.env["SANDBOX"] !== "sandbox-exec") {
     context.ui.addItem({
       type: "info" /* INFO */,
       text: `View available extensions at ${extensionsUrl}`
@@ -59191,7 +59356,7 @@ async function linkAction(context, args, requestConsentOverride) {
     return;
   }
   try {
-    await stat7(sourceFilepath);
+    await stat6(sourceFilepath);
   } catch (error) {
     context.ui.addItem({
       type: "error" /* ERROR */,
@@ -59505,11 +59670,12 @@ var ConsoleSummaryDisplay = ({
 };
 
 // packages/cli/src/ui/components/Footer.tsx
-import process33 from "node:process";
+import process34 from "node:process";
+import os7 from "node:os";
 
 // packages/cli/src/ui/components/MemoryUsageDisplay.tsx
 var import_react69 = __toESM(require_react(), 1);
-import process32 from "node:process";
+import process33 from "node:process";
 var import_jsx_runtime23 = __toESM(require_jsx_runtime(), 1);
 var MemoryUsageDisplay = ({ color = theme.text.primary, isActive = true }) => {
   const [memoryUsage, setMemoryUsage] = (0, import_react69.useState)("");
@@ -59519,7 +59685,7 @@ var MemoryUsageDisplay = ({ color = theme.text.primary, isActive = true }) => {
       return;
     }
     const updateMemory = () => {
-      const usage = process32.memoryUsage().rss;
+      const usage = process33.memoryUsage().rss;
       setMemoryUsage(formatBytes(usage));
       setMemoryUsageColor(
         usage >= 2 * 1024 * 1024 * 1024 ? theme.status.error : color
@@ -59676,6 +59842,11 @@ var ALL_ITEMS = [
     header: "session",
     description: "Unique identifier for the current session"
   },
+  {
+    id: "hostname",
+    header: "machine",
+    description: "Current machine hostname"
+  },
   {
     id: "auth",
     header: "/auth",
@@ -59701,6 +59872,7 @@ var DEFAULT_ORDER = [
   "quota",
   "memory-usage",
   "session-id",
+  "hostname",
   "auth",
   "code-changes",
   "token-count"
@@ -59749,6 +59921,7 @@ function resolveFooterState(settings) {
 
 // packages/cli/src/ui/components/Footer.tsx
 var import_jsx_runtime26 = __toESM(require_jsx_runtime(), 1);
+var HOSTNAME = os7.hostname();
 var CwdIndicator = ({
   targetDir,
   maxWidth,
@@ -59772,7 +59945,7 @@ var SandboxIndicator = ({
   if (isTrustedFolder === false) {
     return /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(Text, { color: theme.status.warning, children: "untrusted" });
   }
-  const sandbox = process33.env["SANDBOX"];
+  const sandbox = process34.env["SANDBOX"];
   if (sandbox) {
     return /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(Text, { color: theme.status.warning, children: "current process" });
   }
@@ -59947,7 +60120,7 @@ var Footer = () => {
       }
       case "sandbox": {
         let str = "no sandbox";
-        const sandbox = process33.env["SANDBOX"];
+        const sandbox = process34.env["SANDBOX"];
         if (isTrustedFolder === false) str = "untrusted";
         else if (sandbox) str = "current process";
         else if (config.getSandboxEnabled()) str = "all tools";
@@ -60024,6 +60197,15 @@ var Footer = () => {
         );
         break;
       }
+      case "hostname": {
+        addCol(
+          id,
+          header,
+          () => /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(Text, { color: itemColor, children: HOSTNAME }),
+          HOSTNAME.length
+        );
+        break;
+      }
       case "auth": {
         if (!settings.merged.ui.showUserIdentity) break;
         if (!authType) break;
@@ -60301,6 +60483,7 @@ var FooterConfigDialog = ({
       quota: /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(Text, { color: getColor("quota", itemColor), children: "42% used" }),
       "memory-usage": /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(Text, { color: getColor("memory-usage", itemColor), children: "260 MB" }),
       "session-id": /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(Text, { color: getColor("session-id", itemColor), children: "769992f9" }),
+      hostname: /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(Text, { color: getColor("hostname", itemColor), children: "dev-machine" }),
       "code-changes": /* @__PURE__ */ (0, import_jsx_runtime27.jsxs)(Box_default, { flexDirection: "row", children: [
         /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(Text, { color: getColor("code-changes", theme.status.success), children: "+12" }),
         /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(Text, { color: getColor("code-changes"), children: " " }),
@@ -60442,7 +60625,27 @@ var helpCommand = {
   kind: "built-in" /* BUILT_IN */,
   description: "For help on gemini-cli",
   autoExecute: true,
-  action: async (context) => {
+  action: async (context, args) => {
+    const lowerArgs = args?.toLowerCase() || "";
+    const hasAntigravity = lowerArgs.includes("antigravity");
+    const hasInstallOrMigrate = lowerArgs.includes("install") || lowerArgs.includes("migrate");
+    if (hasAntigravity && hasInstallOrMigrate) {
+      const info = getAntigravityInstallInfo();
+      if (info) {
+        context.ui.addItem({
+          type: "info" /* INFO */,
+          text: `To install the Antigravity CLI on ${info.platformName}, run the following command:
+
+'${info.installCmd}'`
+        });
+      } else {
+        context.ui.addItem({
+          type: "info" /* INFO */,
+          text: `Learn more about Antigravity CLI at https://antigravity.google/docs/cli-getting-started`
+        });
+      }
+      return;
+    }
     const helpItem = {
       type: "help" /* HELP */,
       timestamp: /* @__PURE__ */ new Date()
@@ -61227,14 +61430,14 @@ function enableHook(settings, hookName) {
   }
   const modifiedScopes = [];
   try {
-    for (const { scope, path: path37 } of foundInDisabledScopes) {
+    for (const { scope, path: path38 } of foundInDisabledScopes) {
       if (isLoadableSettingScope(scope)) {
         const currentScopeDisabled = settings.forScope(scope).settings.hooksConfig?.disabled ?? [];
         const newDisabled = currentScopeDisabled.filter(
           (name) => name !== hookName
         );
         settings.setValue(scope, "hooksConfig.disabled", newDisabled);
-        modifiedScopes.push({ scope, path: path37 });
+        modifiedScopes.push({ scope, path: path38 });
       }
     }
   } catch (error) {
@@ -61529,7 +61732,7 @@ async function enableAction3(context, args) {
   }
   const feedback = renderHookActionFeedback(
     result,
-    (label, path37) => `${label} (${path37})`
+    (label, path38) => `${label} (${path38})`
   );
   return {
     type: "message",
@@ -61571,7 +61774,7 @@ async function disableAction3(context, args) {
   }
   const feedback = renderHookActionFeedback(
     result,
-    (label, path37) => `${label} (${path37})`
+    (label, path38) => `${label} (${path38})`
   );
   return {
     type: "message",
@@ -61770,7 +61973,7 @@ var hooksCommand = {
 };
 
 // packages/cli/src/ui/commands/ideCommand.ts
-import path28 from "node:path";
+import path29 from "node:path";
 function getIdeStatusMessage(ideClient) {
   const connection = ideClient.getConnectionStatus();
   switch (connection.status) {
@@ -61799,13 +62002,13 @@ function getIdeStatusMessage(ideClient) {
 function formatFileList(openFiles) {
   const basenameCounts = /* @__PURE__ */ new Map();
   for (const file of openFiles) {
-    const basename6 = path28.basename(file.path);
+    const basename6 = path29.basename(file.path);
     basenameCounts.set(basename6, (basenameCounts.get(basename6) || 0) + 1);
   }
   const fileList = openFiles.map((file) => {
-    const basename6 = path28.basename(file.path);
+    const basename6 = path29.basename(file.path);
     const isDuplicate = (basenameCounts.get(basename6) || 0) > 1;
-    const parentDir = path28.basename(path28.dirname(file.path));
+    const parentDir = path29.basename(path29.dirname(file.path));
     const displayName = isDuplicate ? `${basename6} (/${parentDir})` : basename6;
     return `  - ${displayName}${file.isActive ? " (active)" : ""}`;
   }).join("\n");
@@ -61945,7 +62148,7 @@ var ideCommand = async () => {
           if (ideClient.getConnectionStatus().status === IDEConnectionStatus.Connected) {
             break;
           }
-          await new Promise((resolve8) => setTimeout(resolve8, 500));
+          await new Promise((resolve9) => setTimeout(resolve9, 500));
         }
         const { messageType, content } = getIdeStatusMessage(ideClient);
         if (messageType === "error") {
@@ -62034,7 +62237,7 @@ var ideCommand = async () => {
 
 // packages/cli/src/ui/commands/initCommand.ts
 import * as fs33 from "node:fs";
-import * as path29 from "node:path";
+import * as path30 from "node:path";
 var initCommand = {
   name: "init",
   description: "Analyzes the project and creates a tailored GEMINI.md file",
@@ -62049,7 +62252,7 @@ var initCommand = {
       };
     }
     const targetDir = context.services.agentContext.config.getTargetDir();
-    const geminiMdPath = path29.join(targetDir, "GEMINI.md");
+    const geminiMdPath = path30.join(targetDir, "GEMINI.md");
     const result = performInit(fs33.existsSync(geminiMdPath));
     if (result.type === "submit_prompt") {
       fs33.writeFileSync(geminiMdPath, "", "utf8");
@@ -62125,7 +62328,7 @@ Use /mcp auth <server-name> to authenticate.`
         type: "info",
         text: `Starting OAuth authentication for MCP server '${serverName}'...`
       });
-      const { MCPOAuthProvider } = await import("./dist-B3HBIK36.js");
+      const { MCPOAuthProvider } = await import("./dist-R3LOFA4X.js");
       let oauthConfig = server.oauth;
       if (!oauthConfig) {
         oauthConfig = { enabled: false };
@@ -62493,7 +62696,7 @@ var import_react81 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/components/InboxDialog.tsx
 var import_react80 = __toESM(require_react(), 1);
-import * as path31 from "node:path";
+import * as path32 from "node:path";
 
 // packages/cli/src/ui/components/messages/DiffRenderer.tsx
 var import_react79 = __toESM(require_react(), 1);
@@ -76291,10 +76494,10 @@ function colorizeCode({
 }
 
 // packages/cli/src/ui/utils/fileUtils.ts
-import * as path30 from "node:path";
+import * as path31 from "node:path";
 function getFileExtension(filename) {
   if (!filename) return null;
-  const ext = path30.extname(filename);
+  const ext = path31.extname(filename);
   return ext ? ext.slice(1) : null;
 }
 
@@ -76657,11 +76860,11 @@ var MEMORY_PATCH_ACTION_CHOICES = [
   }
 ];
 function normalizePathForUi(filePath) {
-  return path31.posix.normalize(filePath.replaceAll("\\", "/"));
+  return path32.posix.normalize(filePath.replaceAll("\\", "/"));
 }
 function getPathBasename(filePath) {
   const normalizedPath = normalizePathForUi(filePath);
-  const basename6 = path31.posix.basename(normalizedPath);
+  const basename6 = path32.posix.basename(normalizedPath);
   return basename6 === "." ? filePath : basename6;
 }
 function formatMemoryPatchSummary(patch) {
@@ -77618,97 +77821,42 @@ var InboxDialog = ({
 };
 
 // packages/cli/src/ui/commands/memoryCommand.ts
-var memoryCommand = {
-  name: "memory",
-  description: "Commands for interacting with memory",
+var showSubCommand = {
+  name: "show",
+  description: "Show the current memory contents",
   kind: "built-in" /* BUILT_IN */,
-  autoExecute: false,
-  subCommands: [
-    {
-      name: "show",
-      description: "Show the current memory contents",
-      kind: "built-in" /* BUILT_IN */,
-      autoExecute: true,
-      action: async (context) => {
-        const config = context.services.agentContext?.config;
-        if (!config) return;
-        const result = showMemory(config);
-        context.ui.addItem(
-          {
-            type: "info" /* INFO */,
-            text: result.content
-          },
-          Date.now()
-        );
-      }
-    },
-    {
-      name: "add",
-      description: "Add content to the memory",
-      kind: "built-in" /* BUILT_IN */,
-      autoExecute: false,
-      action: (context, args) => {
-        const result = addMemory(args);
-        if (result.type === "message") {
-          return result;
-        }
-        context.ui.addItem(
-          {
-            type: "info" /* INFO */,
-            text: `Attempting to save to memory: "${args.trim()}"`
-          },
-          Date.now()
-        );
-        return result;
-      }
-    },
-    {
-      name: "reload",
-      altNames: ["refresh"],
-      description: "Reload the memory from the source",
-      kind: "built-in" /* BUILT_IN */,
-      autoExecute: true,
-      action: async (context) => {
-        context.ui.addItem(
-          {
-            type: "info" /* INFO */,
-            text: "Reloading memory from source files..."
-          },
-          Date.now()
-        );
-        try {
-          const config = context.services.agentContext?.config;
-          if (config) {
-            const result = await refreshMemory(config);
-            context.ui.addItem(
-              {
-                type: "info" /* INFO */,
-                text: result.content
-              },
-              Date.now()
-            );
-          }
-        } catch (error) {
-          context.ui.addItem(
-            {
-              type: "error" /* ERROR */,
-              // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-              text: `Error reloading memory: ${error.message}`
-            },
-            Date.now()
-          );
-        }
-      }
-    },
-    {
-      name: "list",
-      description: "Lists the paths of the GEMINI.md files in use",
-      kind: "built-in" /* BUILT_IN */,
-      autoExecute: true,
-      action: async (context) => {
-        const config = context.services.agentContext?.config;
-        if (!config) return;
-        const result = listMemoryFiles(config);
+  autoExecute: true,
+  action: async (context) => {
+    const config = context.services.agentContext?.config;
+    if (!config) return;
+    const result = showMemory(config);
+    context.ui.addItem(
+      {
+        type: "info" /* INFO */,
+        text: result.content
+      },
+      Date.now()
+    );
+  }
+};
+var reloadSubCommand = {
+  name: "reload",
+  altNames: ["refresh"],
+  description: "Reload the memory from the source",
+  kind: "built-in" /* BUILT_IN */,
+  autoExecute: true,
+  action: async (context) => {
+    context.ui.addItem(
+      {
+        type: "info" /* INFO */,
+        text: "Reloading memory from source files..."
+      },
+      Date.now()
+    );
+    try {
+      const config = context.services.agentContext?.config;
+      if (config) {
+        const result = await refreshMemory(config);
         context.ui.addItem(
           {
             type: "info" /* INFO */,
@@ -77717,45 +77865,87 @@ var memoryCommand = {
           Date.now()
         );
       }
-    },
-    {
-      name: "inbox",
-      description: "Review skills extracted from past sessions and move them to global or project skills",
-      kind: "built-in" /* BUILT_IN */,
-      autoExecute: true,
-      action: (context) => {
-        const config = context.services.agentContext?.config;
-        if (!config) {
-          return {
-            type: "message",
-            messageType: "error",
-            content: "Config not loaded."
-          };
-        }
-        if (!config.isAutoMemoryEnabled()) {
-          return {
-            type: "message",
-            messageType: "info",
-            content: "The memory inbox requires Auto Memory. Enable it with: experimental.autoMemory = true in settings."
-          };
-        }
-        return {
-          type: "custom_dialog",
-          component: import_react81.default.createElement(InboxDialog, {
-            config,
-            onClose: () => context.ui.removeComponent(),
-            onReloadSkills: async () => {
-              await config.reloadSkills();
-              context.ui.reloadCommands();
-            },
-            onReloadMemory: async () => {
-              await refreshMemory(config);
-            }
-          })
-        };
-      }
+    } catch (error) {
+      context.ui.addItem(
+        {
+          type: "error" /* ERROR */,
+          // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+          text: `Error reloading memory: ${error.message}`
+        },
+        Date.now()
+      );
     }
-  ]
+  }
+};
+var listSubCommand = {
+  name: "list",
+  description: "Lists the paths of the GEMINI.md files in use",
+  kind: "built-in" /* BUILT_IN */,
+  autoExecute: true,
+  action: async (context) => {
+    const config = context.services.agentContext?.config;
+    if (!config) return;
+    const result = listMemoryFiles(config);
+    context.ui.addItem(
+      {
+        type: "info" /* INFO */,
+        text: result.content
+      },
+      Date.now()
+    );
+  }
+};
+var inboxSubCommand = {
+  name: "inbox",
+  description: "Review skills extracted from past sessions and move them to global or project skills",
+  kind: "built-in" /* BUILT_IN */,
+  autoExecute: true,
+  action: (context) => {
+    const config = context.services.agentContext?.config;
+    if (!config) {
+      return {
+        type: "message",
+        messageType: "error",
+        content: "Config not loaded."
+      };
+    }
+    if (!config.isAutoMemoryEnabled()) {
+      return {
+        type: "message",
+        messageType: "info",
+        content: "The memory inbox requires Auto Memory. Enable it with: experimental.autoMemory = true in settings."
+      };
+    }
+    return {
+      type: "custom_dialog",
+      component: import_react81.default.createElement(InboxDialog, {
+        config,
+        onClose: () => context.ui.removeComponent(),
+        onReloadSkills: async () => {
+          await config.reloadSkills();
+          context.ui.reloadCommands();
+        },
+        onReloadMemory: async () => {
+          await refreshMemory(config);
+        }
+      })
+    };
+  }
+};
+var memoryCommand = (_config) => {
+  const subCommands = [
+    showSubCommand,
+    reloadSubCommand,
+    listSubCommand,
+    inboxSubCommand
+  ];
+  return {
+    name: "memory",
+    description: "Commands for interacting with memory",
+    kind: "built-in" /* BUILT_IN */,
+    autoExecute: false,
+    subCommands
+  };
 };
 
 // packages/cli/src/ui/commands/modelCommand.ts
@@ -79288,8 +79478,8 @@ var oncallCommand = {
 };
 
 // packages/cli/src/ui/commands/permissionsCommand.ts
-import * as process34 from "node:process";
-import * as path32 from "node:path";
+import * as process35 from "node:process";
+import * as path33 from "node:path";
 import * as fs34 from "node:fs";
 var permissionsCommand = {
   name: "permissions",
@@ -79306,9 +79496,9 @@ var permissionsCommand = {
         const dirPath = input.trim();
         let targetDirectory;
         if (!dirPath) {
-          targetDirectory = process34.cwd();
+          targetDirectory = process35.cwd();
         } else {
-          targetDirectory = path32.resolve(expandHomeDir(dirPath));
+          targetDirectory = path33.resolve(expandHomeDir(dirPath));
         }
         try {
           if (!fs34.statSync(targetDirectory).isDirectory()) {
@@ -79355,7 +79545,7 @@ var permissionsCommand = {
 };
 
 // packages/cli/src/ui/commands/planCommand.ts
-import * as path33 from "node:path";
+import * as path34 from "node:path";
 async function copyAction(context) {
   const config = context.services.agentContext?.config;
   if (!config) {
@@ -79372,7 +79562,7 @@ async function copyAction(context) {
     await copyToClipboard(content);
     coreEvents.emitFeedback(
       "info",
-      `Plan copied to clipboard (${path33.basename(planPath)}).`
+      `Plan copied to clipboard (${path34.basename(planPath)}).`
     );
   } catch (error) {
     coreEvents.emitFeedback("error", `Failed to copy plan: ${error}`, error);
@@ -79410,7 +79600,7 @@ var planCommand = {
         config.storage.getPlansDir(),
         config.getFileSystemService()
       );
-      const fileName = path33.basename(approvedPlanPath);
+      const fileName = path34.basename(approvedPlanPath);
       coreEvents.emitFeedback("info", `Approved Plan: ${fileName}`);
       context.ui.addItem({
         type: "gemini" /* GEMINI */,
@@ -79596,7 +79786,7 @@ var quitCommand = {
 
 // packages/cli/src/ui/commands/restoreCommand.ts
 import * as fs35 from "node:fs/promises";
-import path34 from "node:path";
+import path35 from "node:path";
 var HistoryItemSchema = external_exports.object({
   type: external_exports.string(),
   id: external_exports.number()
@@ -79643,7 +79833,7 @@ ${fileList}`
         content: `File not found: ${selectedFile}`
       };
     }
-    const filePath = path34.join(checkpointDir, selectedFile);
+    const filePath = path35.join(checkpointDir, selectedFile);
     const data = await fs35.readFile(filePath, "utf-8");
     const parseResult = ToolCallDataSchema.safeParse(JSON.parse(data));
     if (!parseResult.success) {
@@ -79868,7 +80058,7 @@ async function listTools(context, showDescriptions) {
   };
   context.ui.addItem(toolsListItem);
 }
-var listSubCommand = {
+var listSubCommand2 = {
   name: "list",
   description: "List available Gemini CLI tools.",
   kind: "built-in" /* BUILT_IN */,
@@ -79888,7 +80078,7 @@ var toolsCommand = {
   description: "List available Gemini CLI tools. Use /tools desc to include descriptions.",
   kind: "built-in" /* BUILT_IN */,
   autoExecute: false,
-  subCommands: [listSubCommand, descSubCommand],
+  subCommands: [listSubCommand2, descSubCommand],
   action: async (context, args) => {
     const subCommand = args?.trim();
     const useShowDescriptions = subCommand === "desc" || subCommand === "descriptions";
@@ -79946,8 +80136,8 @@ function disableSkill(settings, skillName, scope) {
 // packages/cli/src/utils/skillUtils.ts
 var import_extract_zip2 = __toESM(require_extract_zip(), 1);
 import * as fs36 from "node:fs/promises";
-import * as path35 from "node:path";
-import * as os7 from "node:os";
+import * as path36 from "node:path";
+import * as os8 from "node:os";
 function renderSkillActionFeedback(result, formatScope) {
   const { skillName, action, status, error } = result;
   if (status === "error") {
@@ -79987,7 +80177,7 @@ async function installSkill(source2, scope, subpath, onLog, requestConsent = ()
   try {
     if (isGitUrl) {
       tempDirToClean = await fs36.mkdtemp(
-        path35.join(os7.tmpdir(), "gemini-skill-")
+        path36.join(os8.tmpdir(), "gemini-skill-")
       );
       sourcePath = tempDirToClean;
       onLog(`Cloning skill from ${source2}...`);
@@ -80000,17 +80190,17 @@ async function installSkill(source2, scope, subpath, onLog, requestConsent = ()
       );
     } else if (isSkillFile) {
       tempDirToClean = await fs36.mkdtemp(
-        path35.join(os7.tmpdir(), "gemini-skill-")
+        path36.join(os8.tmpdir(), "gemini-skill-")
       );
       sourcePath = tempDirToClean;
       onLog(`Extracting skill from ${source2}...`);
-      await (0, import_extract_zip2.default)(path35.resolve(source2), { dir: tempDirToClean });
+      await (0, import_extract_zip2.default)(path36.resolve(source2), { dir: tempDirToClean });
     }
     if (subpath) {
-      sourcePath = path35.join(sourcePath, subpath);
+      sourcePath = path36.join(sourcePath, subpath);
     }
-    sourcePath = path35.resolve(sourcePath);
-    if (tempDirToClean && !sourcePath.startsWith(path35.resolve(tempDirToClean))) {
+    sourcePath = path36.resolve(sourcePath);
+    if (tempDirToClean && !sourcePath.startsWith(path36.resolve(tempDirToClean))) {
       throw new Error("Invalid path: Directory traversal not allowed.");
     }
     onLog(`Searching for skills in ${sourcePath}...`);
@@ -80030,8 +80220,8 @@ async function installSkill(source2, scope, subpath, onLog, requestConsent = ()
     const installedSkills = [];
     for (const skill of skills) {
       const skillName = skill.name;
-      const skillDir = path35.dirname(skill.location);
-      const destPath = path35.join(targetDir, skillName);
+      const skillDir = path36.dirname(skill.location);
+      const destPath = path36.join(targetDir, skillName);
       const exists = await fs36.stat(destPath).catch(() => null);
       if (exists) {
         onLog(`Skill "${skillName}" already exists. Overwriting...`);
@@ -80048,7 +80238,7 @@ async function installSkill(source2, scope, subpath, onLog, requestConsent = ()
   }
 }
 async function linkSkill(source2, scope, onLog, requestConsent = () => Promise.resolve(true)) {
-  const sourcePath = path35.resolve(source2);
+  const sourcePath = path36.resolve(source2);
   onLog(`Searching for skills in ${sourcePath}...`);
   const skills = await loadSkillsFromDir(sourcePath);
   if (skills.length === 0) {
@@ -80077,8 +80267,8 @@ async function linkSkill(source2, scope, onLog, requestConsent = () => Promise.r
   const linkedSkills = [];
   for (const skill of skills) {
     const skillName = skill.name;
-    const skillSourceDir = path35.dirname(skill.location);
-    const destPath = path35.join(targetDir, skillName);
+    const skillSourceDir = path36.dirname(skill.location);
+    const destPath = path36.join(targetDir, skillName);
     const exists = await fs36.lstat(destPath).catch(() => null);
     if (exists) {
       onLog(
@@ -80102,8 +80292,8 @@ async function uninstallSkill(name, scope) {
   const discoveredSkills = await loadSkillsFromDir(targetDir);
   const skillToUninstall = discoveredSkills.find((s3) => s3.name === name);
   if (!skillToUninstall) {
-    const skillPath = path35.resolve(targetDir, name);
-    if (!skillPath.startsWith(path35.resolve(targetDir))) {
+    const skillPath = path36.resolve(targetDir, name);
+    if (!skillPath.startsWith(path36.resolve(targetDir))) {
       return null;
     }
     const exists = await fs36.lstat(skillPath).catch(() => null);
@@ -80113,7 +80303,7 @@ async function uninstallSkill(name, scope) {
     await fs36.rm(skillPath, { recursive: true, force: true });
     return { location: skillPath };
   }
-  const skillDir = path35.dirname(skillToUninstall.location);
+  const skillDir = path36.dirname(skillToUninstall.location);
   await fs36.rm(skillDir, { recursive: true, force: true });
   return { location: skillDir };
 }
@@ -80244,7 +80434,7 @@ async function disableAction4(context, args) {
   const result = disableSkill(context.services.settings, skillName, scope);
   let feedback = renderSkillActionFeedback(
     result,
-    (label, path37) => `${label} (${path37})`
+    (label, path38) => `${label} (${path38})`
   );
   if (result.status === "success" || result.status === "no-op") {
     feedback += ' You can run "/skills reload" to refresh your current instance.';
@@ -80280,7 +80470,7 @@ async function enableAction4(context, args) {
   const result = enableSkill(context.services.settings, skillName);
   let feedback = renderSkillActionFeedback(
     result,
-    (label, path37) => `${label} (${path37})`
+    (label, path38) => `${label} (${path38})`
   );
   if (result.status === "success" || result.status === "no-op") {
     feedback += ' You can run "/skills reload" to refresh your current instance.';
@@ -80318,7 +80508,7 @@ async function reloadAction2(context) {
       const minVisibleDuration = 500;
       if (elapsed < minVisibleDuration) {
         await new Promise(
-          (resolve8) => setTimeout(resolve8, minVisibleDuration - elapsed)
+          (resolve9) => setTimeout(resolve9, minVisibleDuration - elapsed)
         );
       }
       context.ui.setPendingItem(null);
@@ -80471,7 +80661,7 @@ var vimCommand = {
 
 // packages/cli/src/ui/commands/setupGithubCommand.ts
 var import_undici2 = __toESM(require_undici(), 1);
-import path36 from "node:path";
+import path37 from "node:path";
 import * as fs37 from "node:fs";
 import { Writable } from "node:stream";
 
@@ -80522,7 +80712,7 @@ var getLatestGitHubRelease = async (proxy) => {
     if (!releaseTag) {
       throw new Error(`Response did not include tag_name field`);
     }
-    return releaseTag;
+    return typeof releaseTag === "string" ? releaseTag : "";
   } catch (error) {
     debugLogger.debug(
       `Failed to determine latest run-gemini-cli release:`,
@@ -80599,7 +80789,7 @@ function getOpenUrlsCommands(readmeUrl) {
 }
 async function updateGitignore(gitRepoRoot) {
   const gitignoreEntries = [".gemini/", "gha-creds-*.json"];
-  const gitignorePath = path36.join(gitRepoRoot, ".gitignore");
+  const gitignorePath = path37.join(gitRepoRoot, ".gitignore");
   try {
     let existingContent = "";
     let fileExists2 = true;
@@ -80655,9 +80845,9 @@ async function downloadFiles({
             `Empty body while downloading ${endpoint}: ${response.status} - ${response.statusText}`
           );
         }
-        const destination = path36.resolve(
+        const destination = path37.resolve(
           targetDir,
-          path36.basename(fileBasename)
+          path37.basename(fileBasename)
         );
         const fileStream = fs37.createWriteStream(destination, {
           mode: 420,
@@ -80730,9 +80920,9 @@ var setupGithubCommand = {
     const proxy = context?.services?.agentContext?.config.getProxy();
     const releaseTag = await getLatestGitHubRelease(proxy);
     const readmeUrl = `https://github.com/google-github-actions/run-gemini-cli/blob/${releaseTag}/README.md#quick-start`;
-    const workflowsDir = path36.join(gitRepoRoot, ".github", "workflows");
+    const workflowsDir = path37.join(gitRepoRoot, ".github", "workflows");
     await createDirectory(workflowsDir);
-    const commandsDir = path36.join(gitRepoRoot, ".github", "commands");
+    const commandsDir = path37.join(gitRepoRoot, ".github", "commands");
     await createDirectory(commandsDir);
     await downloadSetupFiles({
       configs: [
@@ -80952,6 +81142,7 @@ var BuiltinCommandLoader = class {
       copyCommand,
       corgiCommand,
       docsCommand,
+      exportSessionCommand,
       directoryCommand,
       editorCommand,
       ...this.config?.getExtensionsEnabled() === false ? [
@@ -80993,7 +81184,7 @@ var BuiltinCommandLoader = class {
           })
         }
       ] : [mcpCommand],
-      memoryCommand,
+      memoryCommand(this.config),
       modelCommand,
       ...this.config?.getFolderTrust() ? [permissionsCommand] : [],
       ...this.config?.isPlanEnabled() ? [planCommand] : [],
@@ -81421,6 +81612,7 @@ export {
   InputContext,
   useInputState,
   Footer,
+  getAntigravityInstallInfo,
   build_default,
   CliSpinner,
   MAX_WIDTH,