wave-code 1.2.0 → 1.3.0

package/src/daemon-cli.ts

@@ -8,9 +8,15 @@
  * keeps the process alive — there is no stdin to wait on.
  */
 
+import { ensureRuntimeDeps } from "wave-agent-sdk";
 import { DaemonServer } from "./stdio/daemonServer.js";
 
 export async function startDaemonCli(socketPath: string): Promise<void> {
+  // Install the on-demand runtime dependencies (image codec + ripgrep) before
+  // serving (see cli.tsx). The daemon serves turns on a remote host, so the
+  // install belongs here — and it must land before the first client attaches,
+  // since the host reports "daemon ready" on this socket.
+  await ensureRuntimeDeps();
   const server = new DaemonServer({ socketPath });
   await server.start();
   // Ready — any error that follows goes to the daemon log via stderr.

package/src/hooks/useInputManager.ts

@@ -61,7 +61,9 @@ export const useInputManager = (
     onRecallQueuedMessage,
     onClearMessages,
     onCompact,
+    onReloadPlugins,
     onAddDir,
+    onRenameSession,
     onPlanCommand,
     isIdle: isIdleProp,
   } = callbacks;
@@ -247,6 +249,8 @@ export const useInputManager = (
                 dispatch({ type: "SET_SHOW_AGENTS_MANAGER", payload: true });
               } else if (command === "rewind") {
                 dispatch({ type: "SET_SHOW_REWIND_MANAGER", payload: true });
+              } else if (command === "resume") {
+                dispatch({ type: "SET_SHOW_RESUME_SELECTOR", payload: true });
               } else if (command === "help") {
                 dispatch({ type: "SET_SHOW_HELP", payload: true });
               } else if (command === "status") {
@@ -280,8 +284,12 @@ export const useInputManager = (
                 await onClearMessages?.();
               } else if (command === "compact") {
                 await onCompact?.(effect.args);
+              } else if (command === "reload-plugins") {
+                await onReloadPlugins?.();
               } else if (command === "add-dir") {
                 await onAddDir?.(effect.args);
+              } else if (command === "rename") {
+                await onRenameSession?.(effect.args);
               } else if (command === "plan") {
                 await onPlanCommand?.(effect.args);
               }
@@ -312,7 +320,9 @@ export const useInputManager = (
     onRecallQueuedMessage,
     onClearMessages,
     onCompact,
+    onReloadPlugins,
     onAddDir,
+    onRenameSession,
     onPlanCommand,
   ]);
 
@@ -511,6 +521,10 @@ export const useInputManager = (
     dispatch({ type: "SET_SHOW_REWIND_MANAGER", payload: show });
   }, []);
 
+  const setShowResumeSelector = useCallback((show: boolean) => {
+    dispatch({ type: "SET_SHOW_RESUME_SELECTOR", payload: show });
+  }, []);
+
   const setShowHelp = useCallback((show: boolean) => {
     dispatch({ type: "SET_SHOW_HELP", payload: show });
   }, []);
@@ -681,6 +695,7 @@ export const useInputManager = (
     showMcpManager: state.showMcpManager,
     showAgentsManager: state.showAgentsManager,
     showRewindManager: state.showRewindManager,
+    showResumeSelector: state.showResumeSelector,
     showHelp: state.showHelp,
     showStatusCommand: state.showStatusCommand,
     showLoginCommand: state.showLoginCommand,
@@ -735,6 +750,7 @@ export const useInputManager = (
     setShowPluginManager,
     setShowModelSelector,
     setShowWorkflowManager,
+    setShowResumeSelector,
     setShowSkillsManager,
     setShowHooksManager,
     setPermissionMode,

package/src/hooks/usePluginManager.ts

@@ -12,7 +12,11 @@ import {
 } from "../components/PluginManagerTypes.js";
 
 export function usePluginManager(options?: {
-  onPluginInstalled?: () => void;
+  /**
+   * 插件变更落盘后的回调：宿主据此置「待应用」信号并提示一次，**不重建会话**
+   * （docs/specs/ecosystem/plugin.md「插件变更的就地重载」）。
+   */
+  onPluginChanged?: () => void;
 }): PluginManagerContextType {
   const [state, setState] = useState<PluginManagerState>({
     currentView: "DISCOVER",
@@ -24,6 +28,7 @@ export function usePluginManager(options?: {
   });
 
   const [marketplaces, setMarketplaces] = useState<KnownMarketplace[]>([]);
+  const [checkingForUpdates, setCheckingForUpdates] = useState(false);
   const [installedPlugins, setInstalledPlugins] = useState<
     (InstalledPlugin & { enabled: boolean })[]
   >([]);
@@ -63,21 +68,26 @@ export function usePluginManager(options?: {
     [setState],
   );
 
-  const refresh = useCallback(async () => {
-    clearPluginFeedback();
-    setState((prev: PluginManagerState) => ({
-      ...prev,
-      isLoading: true,
-    }));
-    try {
-      const [mks, installed, enabledMap] = await Promise.all([
-        pluginCore.listMarketplaces(),
-        pluginCore.getInstalledPlugins(),
-        Promise.resolve(pluginCore.getMergedEnabledPlugins()),
-      ]);
+  /** 读取市场清单 + 已安装插件 + 可发现插件（不碰 isLoading，供后台刷新后重读）。 */
+  const loadLists = useCallback(async () => {
+    const [mks, installed, enabledMap] = await Promise.all([
+      pluginCore.listMarketplaces(),
+      pluginCore.getInstalledPlugins(),
+      Promise.resolve(pluginCore.getMergedEnabledPlugins()),
+    ]);
 
-      setMarketplaces(mks);
-      const allInstalledWithEnabled = installed.plugins.map((p) => {
+    setMarketplaces(mks);
+    // 同一插件在本机可能有多条安装记录（各作用域/各项目一条，spec plugin A-015）；
+    // 「已安装」列表按插件去重，否则同一个插件会重复成行。
+    const listedPlugins = new Set<string>();
+    const allInstalledWithEnabled = installed.plugins
+      .filter((p) => {
+        const pluginId = `${p.name}@${p.marketplace}`;
+        if (listedPlugins.has(pluginId)) return false;
+        listedPlugins.add(pluginId);
+        return true;
+      })
+      .map((p) => {
         const pluginId = `${p.name}@${p.marketplace}`;
         return {
           ...p,
@@ -86,40 +96,50 @@ export function usePluginManager(options?: {
         };
       });
 
-      // Only show enabled plugins in the "Installed" view
-      setInstalledPlugins(allInstalledWithEnabled.filter((p) => p.enabled));
+    // Only show enabled plugins in the "Installed" view
+    setInstalledPlugins(allInstalledWithEnabled.filter((p) => p.enabled));
 
-      const allDiscoverable: (MarketplacePluginEntry & {
-        marketplace: string;
-        installed: boolean;
-        version?: string;
-      })[] = [];
-      for (const mk of mks) {
-        try {
-          const manifest = await pluginCore.loadMarketplaceManifest(
-            pluginCore.getMarketplacePath(mk),
+    const allDiscoverable: (MarketplacePluginEntry & {
+      marketplace: string;
+      installed: boolean;
+      version?: string;
+    })[] = [];
+    for (const mk of mks) {
+      try {
+        const manifest = await pluginCore.loadMarketplaceManifest(
+          pluginCore.getMarketplacePath(mk),
+        );
+        manifest.plugins.forEach((p) => {
+          const pluginId = `${p.name}@${mk.name}`;
+          const isInstalled = installed.plugins.find(
+            (ip) => ip.name === p.name && ip.marketplace === mk.name,
           );
-          manifest.plugins.forEach((p) => {
-            const pluginId = `${p.name}@${mk.name}`;
-            const isInstalled = installed.plugins.find(
-              (ip) => ip.name === p.name && ip.marketplace === mk.name,
-            );
-            const isEnabled = !!enabledMap[pluginId];
+          const isEnabled = !!enabledMap[pluginId];
 
-            // Show in Discover if not installed OR if installed but not enabled in current scope
-            if (!isInstalled || !isEnabled) {
-              allDiscoverable.push({
-                ...p,
-                marketplace: mk.name,
-                installed: !!isInstalled,
-              });
-            }
-          });
-        } catch {
-          // Skip marketplaces that fail to load
-        }
+          // Show in Discover if not installed OR if installed but not enabled in current scope
+          if (!isInstalled || !isEnabled) {
+            allDiscoverable.push({
+              ...p,
+              marketplace: mk.name,
+              installed: !!isInstalled,
+            });
+          }
+        });
+      } catch {
+        // Skip marketplaces that fail to load
       }
-      setDiscoverablePlugins(allDiscoverable);
+    }
+    setDiscoverablePlugins(allDiscoverable);
+  }, [pluginCore]);
+
+  const refresh = useCallback(async () => {
+    clearPluginFeedback();
+    setState((prev: PluginManagerState) => ({
+      ...prev,
+      isLoading: true,
+    }));
+    try {
+      await loadLists();
       setState((prev: PluginManagerState) => ({ ...prev, isLoading: false }));
     } catch (error) {
       setState((prev: PluginManagerState) => ({
@@ -128,12 +148,31 @@ export function usePluginManager(options?: {
         error: error instanceof Error ? error.message : String(error),
       }));
     }
-  }, [pluginCore, clearPluginFeedback]);
+  }, [loadLists, clearPluginFeedback]);
 
   useEffect(() => {
-    refresh();
+    void refresh();
   }, [refresh]);
 
+  // 打开插件管理器即后台刷新各市场检出（只拉清单、不升级任何插件；spec
+  // ecosystem/plugin 场景 5/11）：刷新与列表加载并行、不阻塞界面，完成后重读
+  // 列表呈现最新清单（场景 12）。失败静默——界面仍以刷新前的清单展示（场景 9）。
+  useEffect(() => {
+    let cancelled = false;
+    setCheckingForUpdates(true);
+    pluginCore
+      .refreshMarketplaces()
+      .catch(() => {})
+      .then(async () => {
+        if (cancelled) return;
+        setCheckingForUpdates(false);
+        await loadLists().catch(() => {});
+      });
+    return () => {
+      cancelled = true;
+    };
+  }, [pluginCore, loadLists]);
+
   const setView = useCallback((view: ViewType) => {
     setState((prev: PluginManagerState) => ({ ...prev, currentView: view }));
   }, []);
@@ -150,11 +189,15 @@ export function usePluginManager(options?: {
         isLoading: true,
       }));
       try {
-        await pluginCore.addMarketplace(source, scope);
+        const marketplace = await pluginCore.addMarketplace(source, scope);
         await refresh();
         setSuccessMessage(`Marketplace added successfully (${scope} scope)`);
+        // 焦点落到新加的市场（spec plugin「管理市场」场景 5）：刷新会把市场列表的
+        // 选中项归零，这里用 addMarketplace 的返回值（市场名由市场自身清单决定，
+        // 调用方事先不知道）把选中项设为新市场；失败路径不设置，保持原选中不变。
         setState((prev: PluginManagerState) => ({
           ...prev,
+          selectedId: marketplace.name,
           currentView: "MARKETPLACES",
         }));
       } catch (error) {
@@ -194,6 +237,8 @@ export function usePluginManager(options?: {
     [pluginCore, refresh, clearPluginFeedback, setSuccessMessage],
   );
 
+  // 市场详情的「批量更新插件」项：按当前清单批量升级该市场内已装插件，不拉检出
+  // ——检出已由打开插件管理器时的后台刷新处理（spec ecosystem/plugin A-013 场景 14）。
   const updateMarketplace = useCallback(
     async (name: string) => {
       clearPluginFeedback();
@@ -202,9 +247,12 @@ export function usePluginManager(options?: {
         isLoading: true,
       }));
       try {
-        await pluginCore.updateMarketplace(name);
+        const updated = await pluginCore.updateMarketplacePlugins(name);
         await refresh();
         setSuccessMessage(`Marketplace '${name}' updated successfully`);
+        // 批量更新同属插件变更：真的升级了插件时才产生「待应用」提示
+        // （spec plugin「插件变更的就地重载」场景 1）。
+        if (updated > 0) options?.onPluginChanged?.();
       } catch (error) {
         setState((prev: PluginManagerState) => ({
           ...prev,
@@ -213,7 +261,7 @@ export function usePluginManager(options?: {
         }));
       }
     },
-    [pluginCore, refresh, clearPluginFeedback, setSuccessMessage],
+    [pluginCore, refresh, clearPluginFeedback, setSuccessMessage, options],
   );
 
   const installPlugin = useCallback(
@@ -232,7 +280,7 @@ export function usePluginManager(options?: {
         await pluginCore.installPlugin(pluginId, scope);
         await refresh();
         setSuccessMessage(`Plugin '${name}' installed successfully`);
-        options?.onPluginInstalled?.();
+        options?.onPluginChanged?.();
       } catch (error) {
         setState((prev: PluginManagerState) => ({
           ...prev,
@@ -256,6 +304,7 @@ export function usePluginManager(options?: {
         await pluginCore.uninstallPlugin(pluginId);
         await refresh();
         setSuccessMessage(`Plugin '${name}' uninstalled successfully`);
+        options?.onPluginChanged?.();
       } catch (error) {
         setState((prev: PluginManagerState) => ({
           ...prev,
@@ -264,7 +313,7 @@ export function usePluginManager(options?: {
         }));
       }
     },
-    [pluginCore, refresh, clearPluginFeedback, setSuccessMessage],
+    [pluginCore, refresh, clearPluginFeedback, setSuccessMessage, options],
   );
 
   const updatePlugin = useCallback(
@@ -279,6 +328,7 @@ export function usePluginManager(options?: {
         await pluginCore.updatePlugin(pluginId);
         await refresh();
         setSuccessMessage(`Plugin '${name}' updated successfully`);
+        options?.onPluginChanged?.();
       } catch (error) {
         setState((prev: PluginManagerState) => ({
           ...prev,
@@ -287,36 +337,13 @@ export function usePluginManager(options?: {
         }));
       }
     },
-    [pluginCore, refresh, clearPluginFeedback, setSuccessMessage],
-  );
-
-  const toggleAutoUpdate = useCallback(
-    async (name: string, enabled: boolean) => {
-      clearPluginFeedback();
-      setState((prev: PluginManagerState) => ({
-        ...prev,
-        isLoading: true,
-      }));
-      try {
-        await pluginCore.toggleAutoUpdate(name, enabled);
-        await refresh();
-        setSuccessMessage(
-          `Auto-update for '${name}' ${enabled ? "enabled" : "disabled"}`,
-        );
-      } catch (error) {
-        setState((prev: PluginManagerState) => ({
-          ...prev,
-          isLoading: false,
-          error: error instanceof Error ? error.message : String(error),
-        }));
-      }
-    },
-    [pluginCore, refresh, clearPluginFeedback, setSuccessMessage],
+    [pluginCore, refresh, clearPluginFeedback, setSuccessMessage, options],
   );
 
   return {
     state,
     marketplaces,
+    checkingForUpdates,
     installedPlugins,
     discoverablePlugins,
     actions: {
@@ -328,7 +355,6 @@ export function usePluginManager(options?: {
       installPlugin,
       uninstallPlugin,
       updatePlugin,
-      toggleAutoUpdate,
       refresh,
       clearPluginFeedback,
     },

package/src/index.ts

@@ -218,18 +218,30 @@ export async function main() {
           )
           .command(
             "uninstall <plugin>",
-            "Uninstall a plugin",
+            "Uninstall a plugin from one scope (default: the scope it is enabled in for the current directory)",
             (yargs) => {
-              return yargs.positional("plugin", {
-                describe: "Plugin to uninstall (format: name@marketplace)",
-                type: "string",
-              });
+              return yargs
+                .positional("plugin", {
+                  describe: "Plugin to uninstall (format: name@marketplace)",
+                  type: "string",
+                })
+                .option("scope", {
+                  alias: "s",
+                  describe: "Scope to uninstall from",
+                  choices: ["user", "project", "local"],
+                  type: "string",
+                });
             },
             async (argv) => {
               const { uninstallPluginCommand } = await import(
                 "./commands/plugin/uninstall.js"
               );
-              await uninstallPluginCommand(argv as { plugin: string });
+              await uninstallPluginCommand(
+                argv as {
+                  plugin: string;
+                  scope?: Scope;
+                },
+              );
             },
           )
           .command(
@@ -312,8 +324,9 @@ export async function main() {
                     type: "string",
                   })
                   .option("lines", {
-                    describe: "Number of recent messages to show",
-                    default: 20,
+                    describe:
+                      "Number of recent messages to show (0 = status line only)",
+                    default: 1,
                     type: "number",
                   });
               },
@@ -327,6 +340,47 @@ export async function main() {
                 );
               },
             )
+            .command(
+              "wait <sessionId>",
+              "Block until a session goes idle (or waits for approval), then print its final snapshot (exit 0 = idle, 3 = waiting for approval, 1 = error/timeout). Idle = no turn running, no background task/subagent running, nothing queued (same as `wave -p`); a session holding a long-running background task never goes idle, so give it --timeout",
+              (yargs) => {
+                return yargs
+                  .positional("sessionId", {
+                    describe: "Session ID hosted by the daemon",
+                    type: "string",
+                  })
+                  .option("lines", {
+                    describe:
+                      "Number of recent messages to print on exit (0 = status line only)",
+                    default: 1,
+                    type: "number",
+                  })
+                  .option("from-busy", {
+                    describe:
+                      "Wait until the session has been observed busy at least once before accepting idle (removes the stale-snapshot race right after an async `send`; a running background task also counts as busy)",
+                    default: false,
+                    type: "boolean",
+                  })
+                  .option("timeout", {
+                    describe:
+                      "Seconds to wait before giving up (default: wait forever) — required for sessions with a long-running background task, which never go idle",
+                    type: "number",
+                  });
+              },
+              async (argv) => {
+                const { daemonWaitCommand, DEFAULT_DAEMON_SOCKET } =
+                  await import("./daemon/commands.js");
+                await daemonWaitCommand(
+                  DEFAULT_DAEMON_SOCKET,
+                  argv.sessionId as string,
+                  {
+                    lines: argv.lines as number,
+                    fromBusy: argv.fromBusy as boolean,
+                    timeout: argv.timeout as number | undefined,
+                  },
+                );
+              },
+            )
             .command(
               "send <sessionId> <message>",
               "Inject a message into a session (async by default; --wait N to get the reply)",

package/src/managers/inputHandlers.ts

@@ -6,6 +6,7 @@ import {
   InputAction,
   InputManagerCallbacks,
   isPasteImageKey,
+  permissionModeCycle,
 } from "./inputReducer.js";
 
 export const expandLongTextPlaceholders = (
@@ -136,15 +137,10 @@ export const cyclePermissionMode = (
   dispatch: React.Dispatch<InputAction>,
   callbacks: Partial<InputManagerCallbacks>,
 ) => {
-  const modes: PermissionMode[] = [
-    "default",
-    "acceptEdits",
-    "bypassPermissions",
-    "plan",
-  ];
-  const currentIndex = modes.indexOf(currentMode);
-  const nextIndex = currentIndex === -1 ? 0 : (currentIndex + 1) % modes.length;
-  const nextMode = modes[nextIndex];
+  const currentIndex = permissionModeCycle.indexOf(currentMode);
+  const nextIndex =
+    currentIndex === -1 ? 0 : (currentIndex + 1) % permissionModeCycle.length;
+  const nextMode = permissionModeCycle[nextIndex];
 
   callbacks.logger?.debug("Cycling permission mode", {
     from: currentMode,
@@ -376,6 +372,8 @@ export const handleCommandSelect = (
           dispatch({ type: "SET_SHOW_HOOKS_MANAGER", payload: true });
         } else if (command === "rewind") {
           dispatch({ type: "SET_SHOW_REWIND_MANAGER", payload: true });
+        } else if (command === "resume") {
+          dispatch({ type: "SET_SHOW_RESUME_SELECTOR", payload: true });
         } else if (command === "help") {
           dispatch({ type: "SET_SHOW_HELP", payload: true });
         } else if (command === "status") {
@@ -401,8 +399,12 @@ export const handleCommandSelect = (
           await callbacks.onClearMessages?.();
         } else if (command === "compact") {
           await callbacks.onCompact?.();
+        } else if (command === "reload-plugins") {
+          await callbacks.onReloadPlugins?.();
         } else if (command === "add-dir") {
           await callbacks.onAddDir?.();
+        } else if (command === "rename") {
+          await callbacks.onRenameSession?.();
         }
       }
     })();
@@ -756,6 +758,7 @@ export const handleInput = async (
         state.showBackgroundTaskManager ||
         state.showMcpManager ||
         state.showRewindManager ||
+        state.showResumeSelector ||
         state.showHelp ||
         state.showStatusCommand ||
         state.showPluginManager ||
@@ -780,6 +783,7 @@ export const handleInput = async (
     state.showBackgroundTaskManager ||
     state.showMcpManager ||
     state.showRewindManager ||
+    state.showResumeSelector ||
     state.showHelp ||
     state.showStatusCommand ||
     state.showPluginManager ||
@@ -790,6 +794,7 @@ export const handleInput = async (
       state.showBackgroundTaskManager ||
       state.showMcpManager ||
       state.showRewindManager ||
+      state.showResumeSelector ||
       state.showHelp ||
       state.showStatusCommand ||
       state.showPluginManager ||

package/src/managers/inputReducer.ts

@@ -37,6 +37,18 @@ export const btwOverlayActiveRef: { current: boolean } = { current: false };
 
 export const ESC_DOUBLE_PRESS_TIMEOUT_MS = 1000;
 
+/**
+ * Shift+Tab 循环的权限模式顺序（对齐 Claude Code：plan 之后才进入
+ * bypassPermissions）。单独导出，避免 handler 与 reducer 两条路径各写一份
+ * 而漂移。
+ */
+export const permissionModeCycle: PermissionMode[] = [
+  "default",
+  "acceptEdits",
+  "plan",
+  "bypassPermissions",
+];
+
 /**
  * Paste-image shortcut: Ctrl+V everywhere, plus Alt+V on Windows — Windows
  * terminals reserve Ctrl+V for their own system paste, so the key never
@@ -108,7 +120,9 @@ export interface InputManagerCallbacks {
   ) => Promise<string>;
   onClearMessages?: () => Promise<void>;
   onCompact?: (instructions?: string) => Promise<void>;
+  onReloadPlugins?: () => Promise<void>;
   onAddDir?: (args?: string) => Promise<void>;
+  onRenameSession?: (args?: string) => Promise<void>;
   onPlanCommand?: (args?: string) => Promise<void> | void;
   sessionId?: string;
   workdir?: string;
@@ -142,6 +156,7 @@ export interface InputState {
   showMcpManager: boolean;
   showAgentsManager: boolean;
   showRewindManager: boolean;
+  showResumeSelector: boolean;
   showHelp: boolean;
   showStatusCommand: boolean;
   showLoginCommand: boolean;
@@ -182,6 +197,7 @@ export const initialState: InputState = {
   showMcpManager: false,
   showAgentsManager: false,
   showRewindManager: false,
+  showResumeSelector: false,
   showHelp: false,
   showStatusCommand: false,
   showLoginCommand: false,
@@ -465,6 +481,7 @@ export type InputAction =
   | { type: "SET_SHOW_MCP_MANAGER"; payload: boolean }
   | { type: "SET_SHOW_AGENTS_MANAGER"; payload: boolean }
   | { type: "SET_SHOW_REWIND_MANAGER"; payload: boolean }
+  | { type: "SET_SHOW_RESUME_SELECTOR"; payload: boolean }
   | { type: "SET_SHOW_HELP"; payload: boolean }
   | { type: "SET_SHOW_STATUS_COMMAND"; payload: boolean }
   | { type: "SET_SHOW_LOGIN_COMMAND"; payload: boolean }
@@ -667,6 +684,12 @@ export function inputReducer(
         showRewindManager: action.payload,
         selectorJustUsed: !action.payload ? true : state.selectorJustUsed,
       };
+    case "SET_SHOW_RESUME_SELECTOR":
+      return {
+        ...state,
+        showResumeSelector: action.payload,
+        selectorJustUsed: !action.payload ? true : state.selectorJustUsed,
+      };
     case "SET_SHOW_HELP":
       return {
         ...state,
@@ -1076,6 +1099,7 @@ export function inputReducer(
             state.showMcpManager ||
             state.showAgentsManager ||
             state.showRewindManager ||
+            state.showResumeSelector ||
             state.showHelp ||
             state.showStatusCommand ||
             state.showLoginCommand ||
@@ -1123,16 +1147,12 @@ export function inputReducer(
 
       // 3. Special Shortcuts
       if (key.tab && key.shift) {
-        const modes: PermissionMode[] = [
-          "default",
-          "acceptEdits",
-          "bypassPermissions",
-          "plan",
-        ];
-        const currentIndex = modes.indexOf(state.permissionMode);
+        const currentIndex = permissionModeCycle.indexOf(state.permissionMode);
         const nextIndex =
-          currentIndex === -1 ? 0 : (currentIndex + 1) % modes.length;
-        const nextMode = modes[nextIndex];
+          currentIndex === -1
+            ? 0
+            : (currentIndex + 1) % permissionModeCycle.length;
+        const nextMode = permissionModeCycle[nextIndex];
         return {
           ...state,
           permissionMode: nextMode,