wave-code 0.18.3 → 0.18.5

package/dist/reducers/questionReducer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"questionReducer.d.ts","sourceRoot":"","sources":["../../src/reducers/questionReducer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"questionReducer.d.ts","sourceRoot":"","sources":["../../src/reducers/questionReducer.ts"],"names":[],"mappings":"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"}

package/dist/reducers/questionReducer.js

@@ -192,7 +192,8 @@ export function questionReducer(state, action) {
         case "CLEAR_DECISION":
             return { ...state, decision: null };
         case "HANDLE_KEY": {
-            const { input, key, currentQuestion, questions } = action;
+            const { input, key, questions } = action;
+            const currentQuestion = questions[state.currentQuestionIndex];
             if (!currentQuestion)
                 return state;
             const options = [...currentQuestion.options, { label: "Other" }];

package/dist/reducers/selectorReducer.d.ts

@@ -1,22 +1,24 @@
 import { Key } from "ink";
-export interface SelectorState {
+export interface SelectorState<T = unknown> {
     selectedIndex: number;
     pendingDecision: "select" | "insert" | "cancel" | null;
+    items: T[];
 }
-export type SelectorAction = {
+export type SelectorAction<T = unknown> = {
     type: "MOVE_UP";
 } | {
     type: "MOVE_DOWN";
-    maxIndex: number;
 } | {
     type: "RESET_INDEX";
+} | {
+    type: "SET_ITEMS";
+    items: T[];
 } | {
     type: "HANDLE_KEY";
     key: Key;
-    maxIndex: number;
     hasInsert: boolean;
 } | {
     type: "CLEAR_DECISION";
 };
-export declare function selectorReducer(state: SelectorState, action: SelectorAction): SelectorState;
+export declare function selectorReducer<T = unknown>(state: SelectorState<T>, action: SelectorAction<T>): SelectorState<T>;
 //# sourceMappingURL=selectorReducer.d.ts.map

package/dist/reducers/selectorReducer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"selectorReducer.d.ts","sourceRoot":"","sources":["../../src/reducers/selectorReducer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAE1B,MAAM,WAAW,aAAa;IAC5B,aAAa,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,IAAI,CAAC;CACxD;AAED,MAAM,MAAM,cAAc,GACtB;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,GACnB;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GACvC;IAAE,IAAI,EAAE,aAAa,CAAA;CAAE,GACvB;IAAE,IAAI,EAAE,YAAY,CAAC;IAAC,GAAG,EAAE,GAAG,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,OAAO,CAAA;CAAE,GACtE;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,CAAC;AAE/B,wBAAgB,eAAe,CAC7B,KAAK,EAAE,aAAa,EACpB,MAAM,EAAE,cAAc,GACrB,aAAa,CAuCf"}
+{"version":3,"file":"selectorReducer.d.ts","sourceRoot":"","sources":["../../src/reducers/selectorReducer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAE1B,MAAM,WAAW,aAAa,CAAC,CAAC,GAAG,OAAO;IACxC,aAAa,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,IAAI,CAAC;IACvD,KAAK,EAAE,CAAC,EAAE,CAAC;CACZ;AAED,MAAM,MAAM,cAAc,CAAC,CAAC,GAAG,OAAO,IAClC;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,GACnB;IAAE,IAAI,EAAE,WAAW,CAAA;CAAE,GACrB;IAAE,IAAI,EAAE,aAAa,CAAA;CAAE,GACvB;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,KAAK,EAAE,CAAC,EAAE,CAAA;CAAE,GACjC;IAAE,IAAI,EAAE,YAAY,CAAC;IAAC,GAAG,EAAE,GAAG,CAAC;IAAC,SAAS,EAAE,OAAO,CAAA;CAAE,GACpD;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,CAAC;AAE/B,wBAAgB,eAAe,CAAC,CAAC,GAAG,OAAO,EACzC,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,EACvB,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,GACxB,aAAa,CAAC,CAAC,CAAC,CA+ClB"}

package/dist/reducers/selectorReducer.js

@@ -5,10 +5,12 @@ export function selectorReducer(state, action) {
         case "MOVE_DOWN":
             return {
                 ...state,
-                selectedIndex: Math.min(action.maxIndex, state.selectedIndex + 1),
+                selectedIndex: Math.min(state.items.length - 1, state.selectedIndex + 1),
             };
         case "RESET_INDEX":
             return { ...state, selectedIndex: 0 };
+        case "SET_ITEMS":
+            return { ...state, items: action.items, selectedIndex: 0 };
         case "HANDLE_KEY":
             if (action.key.upArrow) {
                 return {
@@ -19,7 +21,7 @@ export function selectorReducer(state, action) {
             if (action.key.downArrow) {
                 return {
                     ...state,
-                    selectedIndex: Math.min(action.maxIndex, state.selectedIndex + 1),
+                    selectedIndex: Math.min(state.items.length - 1, state.selectedIndex + 1),
                 };
             }
             if (action.key.return) {

package/dist/utils/worktree.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worktree.d.ts","sourceRoot":"","sources":["../../src/utils/worktree.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,qBAAqB,EAAE,OAAO,CAAC;IAC/B,aAAa,EAAE,OAAO,CAAC;IACvB,KAAK,EAAE,OAAO,CAAC;CAChB;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,eAAe,CA2HzE;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,eAAe,GAAG,IAAI,CA6D7D"}
+{"version":3,"file":"worktree.d.ts","sourceRoot":"","sources":["../../src/utils/worktree.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,qBAAqB,EAAE,OAAO,CAAC;IAC/B,aAAa,EAAE,OAAO,CAAC;IACvB,KAAK,EAAE,OAAO,CAAC;CAChB;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,eAAe,CAiIzE;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,eAAe,GAAG,IAAI,CAiE7D"}

package/dist/utils/worktree.js

@@ -1,4 +1,4 @@
-import { execSync } from "node:child_process";
+import { execFileSync } from "node:child_process";
 import * as path from "node:path";
 import * as fs from "node:fs";
 import { getDefaultRemoteBranch, getGitMainRepoRoot } from "wave-agent-sdk";
@@ -33,7 +33,7 @@ export function createWorktree(name, cwd) {
     }
     try {
         // Create worktree and branch
-        execSync(`git worktree add -b ${branchName} "${worktreePath}" ${baseBranch}`, {
+        execFileSync("git", ["worktree", "add", "-b", branchName, worktreePath, baseBranch], {
             cwd: repoRoot,
             stdio: ["ignore", "pipe", "pipe"],
         });
@@ -52,7 +52,7 @@ export function createWorktree(name, cwd) {
         if (stderr.includes("already exists")) {
             // If branch already exists, try to add worktree without -b
             try {
-                execSync(`git worktree add "${worktreePath}" ${branchName}`, {
+                execFileSync("git", ["worktree", "add", worktreePath, branchName], {
                     cwd: repoRoot,
                     stdio: ["ignore", "pipe", "pipe"],
                 });
@@ -75,11 +75,11 @@ export function createWorktree(name, cwd) {
             // Base branch not fetched yet — try fetching then retrying
             const branchNameOnly = baseBranch.split("/").pop();
             try {
-                execSync(`git fetch origin ${branchNameOnly}`, {
+                execFileSync("git", ["fetch", "origin", branchNameOnly], {
                     cwd: repoRoot,
                     stdio: ["ignore", "pipe", "pipe"],
                 });
-                execSync(`git worktree add -b ${branchName} "${worktreePath}" ${baseBranch}`, {
+                execFileSync("git", ["worktree", "add", "-b", branchName, worktreePath, baseBranch], {
                     cwd: repoRoot,
                     stdio: ["ignore", "pipe", "pipe"],
                 });
@@ -96,7 +96,7 @@ export function createWorktree(name, cwd) {
             catch {
                 // Fetch or retry failed — fall back to HEAD
                 try {
-                    execSync(`git worktree add -b ${branchName} "${worktreePath}" HEAD`, {
+                    execFileSync("git", ["worktree", "add", "-b", branchName, worktreePath, "HEAD"], {
                         cwd: repoRoot,
                         stdio: ["ignore", "pipe", "pipe"],
                     });
@@ -128,7 +128,7 @@ export function removeWorktree(session) {
         // Get current branch in worktree before removing it
         let currentBranch;
         try {
-            currentBranch = execSync(`git rev-parse --abbrev-ref HEAD`, {
+            currentBranch = execFileSync("git", ["rev-parse", "--abbrev-ref", "HEAD"], {
                 cwd: session.path,
                 encoding: "utf8",
                 stdio: ["ignore", "pipe", "ignore"],
@@ -138,13 +138,13 @@ export function removeWorktree(session) {
             // Ignore errors getting current branch
         }
         // Remove worktree
-        execSync(`git worktree remove --force "${session.path}"`, {
+        execFileSync("git", ["worktree", "remove", "--force", session.path], {
             cwd: repoRoot,
             stdio: ["ignore", "pipe", "pipe"],
         });
         // Delete original branch
         try {
-            execSync(`git branch -D ${session.branch}`, {
+            execFileSync("git", ["branch", "-D", session.branch], {
                 cwd: repoRoot,
                 stdio: ["ignore", "pipe", "pipe"],
             });
@@ -162,7 +162,7 @@ export function removeWorktree(session) {
                 currentBranch !== "main" &&
                 currentBranch !== "master") {
                 try {
-                    execSync(`git branch -D ${currentBranch}`, {
+                    execFileSync("git", ["branch", "-D", currentBranch], {
                         cwd: repoRoot,
                         stdio: ["ignore", "pipe", "pipe"],
                     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wave-code",
-  "version": "0.18.3",
+  "version": "0.18.5",
   "description": "CLI-based code assistant powered by AI, built with React and Ink",
   "repository": {
     "type": "git",
@@ -42,7 +42,7 @@
     "semver": "^7.7.4",
     "yargs": "^17.7.2",
     "zod": "^3.23.8",
-    "wave-agent-sdk": "0.18.3"
+    "wave-agent-sdk": "0.18.5"
   },
   "devDependencies": {
     "@types/react": "^19.1.8",

package/src/acp/agent.ts

@@ -245,6 +245,8 @@ export class WaveAcpAgent implements AcpAgent {
           callbacks.onSessionIdChange?.(newSessionId),
         onLatestTotalTokensChange: (tokens: number) =>
           callbacks.onLatestTotalTokensChange?.(tokens),
+        onLoadingChange: (loading: boolean) =>
+          callbacks.onLoadingChange?.(loading),
       },
     });
 
@@ -1398,6 +1400,18 @@ export class WaveAcpAgent implements AcpAgent {
             },
           });
         },
+        onLoadingChange: (loading: boolean) => {
+          if (!loading) {
+            this.connection.sessionUpdate({
+              sessionId: sessionRef.id as AcpSessionId,
+              update: {
+                sessionUpdate: "agent_message_chunk",
+                content: { type: "text", text: "" },
+                _meta: { endOfTurn: true },
+              },
+            });
+          }
+        },
       },
       sessionRef,
     };

package/src/components/CommandSelector.tsx

@@ -23,20 +23,16 @@ export const CommandSelector: React.FC<CommandSelectorProps> = ({
   commands = [],
 }) => {
   const MAX_VISIBLE_ITEMS = 3;
-  const [state, dispatch] = useReducer(selectorReducer, {
+  const [state, dispatch] = useReducer(selectorReducer<SlashCommand>, {
     selectedIndex: 0,
     pendingDecision: null,
-  } as SelectorState);
+    items: [],
+  } as SelectorState<SlashCommand>);
 
-  const { selectedIndex, pendingDecision } = state;
-
-  // Reset selected index when search query changes
-  useEffect(() => {
-    dispatch({ type: "RESET_INDEX" });
-  }, [searchQuery]);
+  const { selectedIndex, pendingDecision, items: filteredCommands } = state;
 
   // Merge agent commands and local commands, memoized to stabilize useEffect dependencies
-  const filteredCommands = useMemo(() => {
+  const computedCommands = useMemo(() => {
     const allCommands = [...AVAILABLE_COMMANDS, ...commands];
     return allCommands.filter(
       (command) =>
@@ -45,6 +41,11 @@ export const CommandSelector: React.FC<CommandSelectorProps> = ({
     );
   }, [searchQuery, commands]);
 
+  // Sync computed commands into reducer state (SET_ITEMS also resets index)
+  useEffect(() => {
+    dispatch({ type: "SET_ITEMS", items: computedCommands });
+  }, [computedCommands]);
+
   // Handle decisions from reducer
   useEffect(() => {
     if (!pendingDecision) return;
@@ -91,12 +92,7 @@ export const CommandSelector: React.FC<CommandSelectorProps> = ({
   );
 
   useInput((input, key) => {
-    dispatch({
-      type: "HANDLE_KEY",
-      key,
-      maxIndex: filteredCommands.length - 1,
-      hasInsert: !!onInsert,
-    });
+    dispatch({ type: "HANDLE_KEY", key, hasInsert: !!onInsert });
   });
 
   if (filteredCommands.length === 0) {

package/src/components/ConfirmationSelector.tsx

@@ -108,7 +108,6 @@ export const ConfirmationSelector: React.FC<ConfirmationSelectorProps> = ({
         type: "HANDLE_KEY",
         input,
         key,
-        currentQuestion,
         questions,
       });
     } else {

package/src/components/DiscoverView.tsx

@@ -1,37 +1,52 @@
 import React, { useReducer, useEffect } from "react";
 import { Box, useInput } from "ink";
+import type { MarketplacePluginEntry } from "wave-agent-sdk";
 import { usePluginManagerContext } from "../contexts/PluginManagerContext.js";
 import { PluginList } from "./PluginList.js";
-import { selectorReducer } from "../reducers/selectorReducer.js";
+import {
+  selectorReducer,
+  type SelectorState,
+} from "../reducers/selectorReducer.js";
+
+type DiscoverablePlugin = MarketplacePluginEntry & {
+  marketplace: string;
+  installed: boolean;
+  version?: string;
+};
 
 export const DiscoverView: React.FC = () => {
   const { discoverablePlugins, actions } = usePluginManagerContext();
-  const [state, dispatch] = useReducer(selectorReducer, {
+  const [state, dispatch] = useReducer(selectorReducer<DiscoverablePlugin>, {
     selectedIndex: 0,
     pendingDecision: null,
-  });
+    items: [],
+  } as SelectorState<DiscoverablePlugin>);
 
-  const { selectedIndex, pendingDecision } = state;
+  const { selectedIndex, pendingDecision, items } = state;
+
+  // Sync plugins into reducer state
+  useEffect(() => {
+    dispatch({ type: "SET_ITEMS", items: discoverablePlugins });
+  }, [discoverablePlugins]);
 
   useInput((_input, key) => {
     dispatch({
       type: "HANDLE_KEY",
       key,
-      maxIndex: discoverablePlugins.length - 1,
       hasInsert: false,
     });
   });
 
   useEffect(() => {
     if (pendingDecision === "select") {
-      const plugin = discoverablePlugins[selectedIndex];
+      const plugin = items[selectedIndex];
       if (plugin) {
         actions.setSelectedId(`${plugin.name}@${plugin.marketplace}`);
         actions.setView("PLUGIN_DETAIL");
       }
       dispatch({ type: "CLEAR_DECISION" });
     }
-  }, [pendingDecision, selectedIndex, discoverablePlugins, actions]);
+  }, [pendingDecision, selectedIndex, items, actions]);
 
   return (
     <Box flexDirection="column">

package/src/components/FileSelector.tsx

@@ -23,16 +23,17 @@ export const FileSelector: React.FC<FileSelectorProps> = ({
   onSelect,
   onCancel,
 }) => {
-  const [state, dispatch] = useReducer(selectorReducer, {
+  const [state, dispatch] = useReducer(selectorReducer<FileItem>, {
     selectedIndex: 0,
     pendingDecision: null,
-  } as SelectorState);
+    items: [],
+  } as SelectorState<FileItem>);
 
-  const { selectedIndex, pendingDecision } = state;
+  const { selectedIndex, pendingDecision, items: filesInState } = state;
 
-  // Reset selected index when files change
+  // Sync files from props into reducer state (SET_ITEMS also resets index)
   useEffect(() => {
-    dispatch({ type: "RESET_INDEX" });
+    dispatch({ type: "SET_ITEMS", items: files });
   }, [files]);
 
   // Handle decisions from reducer
@@ -40,21 +41,20 @@ export const FileSelector: React.FC<FileSelectorProps> = ({
     if (!pendingDecision) return;
 
     if (pendingDecision === "select" || pendingDecision === "insert") {
-      if (files.length > 0 && selectedIndex < files.length) {
-        onSelect(files[selectedIndex].path);
+      if (filesInState.length > 0 && selectedIndex < filesInState.length) {
+        onSelect(filesInState[selectedIndex].path);
       }
     } else if (pendingDecision === "cancel") {
       onCancel();
     }
 
     dispatch({ type: "CLEAR_DECISION" });
-  }, [pendingDecision, selectedIndex, files, onSelect, onCancel]);
+  }, [pendingDecision, selectedIndex, filesInState, onSelect, onCancel]);
 
   useInput((input, key) => {
     dispatch({
       type: "HANDLE_KEY",
       key,
-      maxIndex: files.length - 1,
       hasInsert: true, // For FileSelector, Tab is also select
     });
   });

package/src/components/HistorySearch.tsx

@@ -1,4 +1,4 @@
-import React, { useReducer, useEffect, useState } from "react";
+import React, { useReducer, useEffect } from "react";
 import { Box, Text, useInput } from "ink";
 import { PromptHistoryManager, type PromptEntry } from "wave-agent-sdk";
 import {
@@ -18,20 +18,18 @@ export const HistorySearch: React.FC<HistorySearchProps> = ({
   onCancel,
 }) => {
   const MAX_VISIBLE_ITEMS = 5;
-  const [state, dispatch] = useReducer(selectorReducer, {
+  const [state, dispatch] = useReducer(selectorReducer<PromptEntry>, {
     selectedIndex: 0,
     pendingDecision: null,
-  } as SelectorState);
-  const [entries, setEntries] = useState<PromptEntry[]>([]);
+    items: [],
+  } as SelectorState<PromptEntry>);
 
-  const { selectedIndex, pendingDecision } = state;
+  const { selectedIndex, pendingDecision, items: entries } = state;
 
   useEffect(() => {
     const fetchHistory = async () => {
       const results = await PromptHistoryManager.searchHistory(searchQuery);
-      const limitedResults = results.slice(0, 20);
-      setEntries(limitedResults);
-      dispatch({ type: "RESET_INDEX" });
+      dispatch({ type: "SET_ITEMS", items: results.slice(0, 20) });
     };
     fetchHistory();
   }, [searchQuery]);
@@ -52,12 +50,7 @@ export const HistorySearch: React.FC<HistorySearchProps> = ({
   }, [pendingDecision, selectedIndex, entries, onSelect, onCancel]);
 
   useInput((input, key) => {
-    dispatch({
-      type: "HANDLE_KEY",
-      key,
-      maxIndex: entries.length - 1,
-      hasInsert: false,
-    });
+    dispatch({ type: "HANDLE_KEY", key, hasInsert: false });
   });
 
   if (entries.length === 0) {

package/src/components/InstalledView.tsx

@@ -1,36 +1,50 @@
 import React, { useReducer, useEffect } from "react";
 import { Box, Text, useInput } from "ink";
+import type { InstalledPlugin } from "wave-agent-sdk";
 import { usePluginManagerContext } from "../contexts/PluginManagerContext.js";
-import { selectorReducer } from "../reducers/selectorReducer.js";
+import {
+  selectorReducer,
+  type SelectorState,
+} from "../reducers/selectorReducer.js";
+
+type InstalledPluginWithEnabled = InstalledPlugin & { enabled: boolean };
 
 export const InstalledView: React.FC = () => {
   const { installedPlugins, actions } = usePluginManagerContext();
-  const [state, dispatch] = useReducer(selectorReducer, {
-    selectedIndex: 0,
-    pendingDecision: null,
-  });
+  const [state, dispatch] = useReducer(
+    selectorReducer<InstalledPluginWithEnabled>,
+    {
+      selectedIndex: 0,
+      pendingDecision: null,
+      items: [],
+    } as SelectorState<InstalledPluginWithEnabled>,
+  );
 
-  const { selectedIndex, pendingDecision } = state;
+  const { selectedIndex, pendingDecision, items } = state;
+
+  // Sync plugins into reducer state
+  useEffect(() => {
+    dispatch({ type: "SET_ITEMS", items: installedPlugins });
+  }, [installedPlugins]);
 
   useInput((_input, key) => {
     dispatch({
       type: "HANDLE_KEY",
       key,
-      maxIndex: installedPlugins.length - 1,
       hasInsert: false,
     });
   });
 
   useEffect(() => {
     if (pendingDecision === "select") {
-      const plugin = installedPlugins[selectedIndex];
+      const plugin = items[selectedIndex];
       if (plugin) {
         actions.setSelectedId(`${plugin.name}@${plugin.marketplace}`);
         actions.setView("PLUGIN_DETAIL");
       }
       dispatch({ type: "CLEAR_DECISION" });
     }
-  }, [pendingDecision, selectedIndex, installedPlugins, actions]);
+  }, [pendingDecision, selectedIndex, items, actions]);
 
   if (installedPlugins.length === 0) {
     return (

package/src/components/LoginCommand.tsx

@@ -36,49 +36,46 @@ export const LoginCommand: React.FC<LoginCommandProps> = ({ onCancel }) => {
   const tokenResolveRef = useRef<((token: string) => void) | null>(null);
   const tokenRejectRef = useRef<((err: Error) => void) | null>(null);
 
-  // Pre-loading input: Enter starts login, Esc cancels
-  useInput(
-    (_, key) => {
+  // Single useInput handler — branches on isLoading to avoid the
+  // isActive transition race that drops stdin between hook swaps.
+  useInput((input, key) => {
+    if (!isLoadingRef.current) {
+      // Pre-loading mode: Enter starts login, Esc cancels
       if (key.escape) {
         onCancel();
       }
-      if (key.return && !isLoadingRef.current) {
+      if (key.return) {
         handleEnter();
       }
-    },
-    { isActive: !isLoading },
-  );
+      return;
+    }
 
-  // Token input: capture keystrokes while loading
-  useInput(
-    (input, key) => {
-      if (key.escape) {
-        tokenRejectRef.current?.(new Error("cancelled"));
-        onCancel();
-      }
-      if (key.return) {
-        // Submit token
-        const trimmed = tokenInput.trim();
-        if (trimmed) {
-          tokenResolveRef.current?.(trimmed);
-        } else {
-          // Empty: just clear, keep waiting
-          setTokenInput("");
-        }
-        return;
-      }
-      // Backspace
-      if (key.backspace && tokenInput.length > 0) {
-        setTokenInput((prev) => prev.slice(0, -1));
-        return;
-      }
-      // Regular character input (single or pasted multi-char)
-      if (input && !key.ctrl && !key.meta && !key.return && input.length > 0) {
-        setTokenInput((prev) => prev + input);
+    // Token input mode: capture keystrokes while loading
+    if (key.escape) {
+      tokenRejectRef.current?.(new Error("cancelled"));
+      onCancel();
+    }
+    if (key.return) {
+      // Submit token
+      const trimmed = tokenInput.trim();
+      if (trimmed) {
+        tokenResolveRef.current?.(trimmed);
+      } else {
+        // Empty: just clear, keep waiting
+        setTokenInput("");
       }
-    },
-    { isActive: isLoading },
-  );
+      return;
+    }
+    // Backspace
+    if (key.backspace && tokenInput.length > 0) {
+      setTokenInput((prev) => prev.slice(0, -1));
+      return;
+    }
+    // Regular character input (single or pasted multi-char)
+    if (input && !key.ctrl && !key.meta && !key.return && input.length > 0) {
+      setTokenInput((prev) => prev + input);
+    }
+  });
 
   const handleEnter = async () => {
     if (isLoadingRef.current) return;

package/src/components/MarketplaceDetail.tsx

@@ -1,16 +1,27 @@
 import React, { useReducer, useEffect, useMemo } from "react";
 import { Box, Text, useInput } from "ink";
 import { usePluginManagerContext } from "../contexts/PluginManagerContext.js";
-import { selectorReducer } from "../reducers/selectorReducer.js";
+import {
+  selectorReducer,
+  type SelectorState,
+} from "../reducers/selectorReducer.js";
 
 export const MarketplaceDetail: React.FC = () => {
   const { state, marketplaces, actions } = usePluginManagerContext();
-  const [selectorState, dispatch] = useReducer(selectorReducer, {
-    selectedIndex: 0,
-    pendingDecision: null,
-  });
+  const [selectorState, dispatch] = useReducer(
+    selectorReducer<{ id: string; label: string }>,
+    {
+      selectedIndex: 0,
+      pendingDecision: null,
+      items: [],
+    } as SelectorState<{ id: string; label: string }>,
+  );
 
-  const { selectedIndex: selectedActionIndex, pendingDecision } = selectorState;
+  const {
+    selectedIndex: selectedActionIndex,
+    pendingDecision,
+    items: actionsList,
+  } = selectorState;
 
   const marketplace = marketplaces.find((m) => m.name === state.selectedId);
 
@@ -27,13 +38,17 @@ export const MarketplaceDetail: React.FC = () => {
     [marketplace?.autoUpdate],
   );
 
+  // Sync ACTIONS into reducer state
+  useEffect(() => {
+    dispatch({ type: "SET_ITEMS", items: [...ACTIONS] });
+  }, [ACTIONS]);
+
   useInput((_input, key) => {
     if (state.isLoading && !key.escape) return;
 
     dispatch({
       type: "HANDLE_KEY",
       key,
-      maxIndex: ACTIONS.length - 1,
       hasInsert: false,
     });
   });
@@ -42,12 +57,12 @@ export const MarketplaceDetail: React.FC = () => {
     if (!pendingDecision) return;
 
     if (pendingDecision === "select" && marketplace && !state.isLoading) {
-      const action = ACTIONS[selectedActionIndex].id;
+      const action = actionsList[selectedActionIndex]?.id;
       if (action === "toggle-auto-update") {
         actions.toggleAutoUpdate(marketplace.name, !marketplace.autoUpdate);
       } else if (action === "update") {
         actions.updateMarketplace(marketplace.name);
-      } else {
+      } else if (action === "remove") {
         actions.removeMarketplace(marketplace.name);
       }
     } else if (pendingDecision === "cancel") {
@@ -58,10 +73,10 @@ export const MarketplaceDetail: React.FC = () => {
   }, [
     pendingDecision,
     selectedActionIndex,
+    actionsList,
     marketplace,
     state.isLoading,
     actions,
-    ACTIONS,
   ]);
 
   if (!marketplace) {