wave-code 0.14.4 → 0.15.1

package/dist/components/HelpView.js

@@ -1,10 +1,9 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useState } from "react";
+import { useReducer, useEffect } from "react";
 import { Box, Text, useInput } from "ink";
 import { AVAILABLE_COMMANDS } from "../constants/commands.js";
+import { helpSelectorReducer } from "../reducers/helpSelectorReducer.js";
 export const HelpView = ({ onCancel, commands = [], }) => {
-    const [activeTab, setActiveTab] = useState("general");
-    const [selectedIndex, setSelectedIndex] = useState(0);
     const MAX_VISIBLE_ITEMS = 10;
     const tabs = [
         "general",
@@ -13,29 +12,30 @@ export const HelpView = ({ onCancel, commands = [], }) => {
     if (commands.length > 0) {
         tabs.push("custom-commands");
     }
-    useInput((_, key) => {
-        if (key.escape) {
+    const [state, dispatch] = useReducer(helpSelectorReducer, {
+        selectedIndex: 0,
+        activeTab: "general",
+        pendingDecision: null,
+    });
+    const { selectedIndex, activeTab, pendingDecision } = state;
+    // Handle decisions from reducer
+    useEffect(() => {
+        if (pendingDecision === "cancel") {
             onCancel();
-            return;
-        }
-        if (key.tab) {
-            setActiveTab((prev) => {
-                const currentIndex = tabs.indexOf(prev);
-                const nextIndex = (currentIndex + 1) % tabs.length;
-                return tabs[nextIndex];
-            });
-            setSelectedIndex(0);
-            return;
-        }
-        if (activeTab === "commands" || activeTab === "custom-commands") {
-            const currentCommands = activeTab === "commands" ? AVAILABLE_COMMANDS : commands;
-            if (key.upArrow) {
-                setSelectedIndex((prev) => Math.max(0, prev - 1));
-            }
-            else if (key.downArrow) {
-                setSelectedIndex((prev) => Math.min(currentCommands.length - 1, prev + 1));
-            }
+            dispatch({ type: "CLEAR_DECISION" });
         }
+    }, [pendingDecision, onCancel]);
+    const currentCommands = activeTab === "commands" ? AVAILABLE_COMMANDS : commands;
+    // Calculate visible window for commands
+    const startIndex = Math.max(0, Math.min(selectedIndex - Math.floor(MAX_VISIBLE_ITEMS / 2), Math.max(0, currentCommands.length - MAX_VISIBLE_ITEMS)));
+    const visibleCommands = currentCommands.slice(startIndex, startIndex + MAX_VISIBLE_ITEMS);
+    useInput((_, key) => {
+        dispatch({
+            type: "HANDLE_KEY",
+            key,
+            maxIndex: activeTab === "general" ? 0 : currentCommands.length - 1,
+            tabs,
+        });
     });
     const helpItems = [
         { key: "@", description: "Reference files" },
@@ -53,10 +53,6 @@ export const HelpView = ({ onCancel, commands = [], }) => {
             description: "Interrupt AI or command / Cancel selector / Close help",
         },
     ];
-    // Calculate visible window for commands
-    const currentCommands = activeTab === "commands" ? AVAILABLE_COMMANDS : commands;
-    const startIndex = Math.max(0, Math.min(selectedIndex - Math.floor(MAX_VISIBLE_ITEMS / 2), Math.max(0, currentCommands.length - MAX_VISIBLE_ITEMS)));
-    const visibleCommands = currentCommands.slice(startIndex, startIndex + MAX_VISIBLE_ITEMS);
     const footerText = [
         "Tab switch",
         activeTab !== "general" && "↑↓ navigate",

package/dist/components/HistorySearch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HistorySearch.d.ts","sourceRoot":"","sources":["../../src/components/HistorySearch.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAEnD,OAAO,EAAwB,KAAK,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAExE,MAAM,WAAW,kBAAkB;IACjC,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;IACvC,QAAQ,EAAE,MAAM,IAAI,CAAC;CACtB;AAED,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CAkKtD,CAAC"}
+{"version":3,"file":"HistorySearch.d.ts","sourceRoot":"","sources":["../../src/components/HistorySearch.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA0C,MAAM,OAAO,CAAC;AAE/D,OAAO,EAAwB,KAAK,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAMxE,MAAM,WAAW,kBAAkB;IACjC,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;IACvC,QAAQ,EAAE,MAAM,IAAI,CAAC;CACtB;AAED,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CAuJtD,CAAC"}

package/dist/components/HistorySearch.js

@@ -1,48 +1,46 @@
 import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
-import React, { useState, useEffect } from "react";
+import { useReducer, useEffect, useState } from "react";
 import { Box, Text, useInput } from "ink";
 import { PromptHistoryManager } from "wave-agent-sdk";
+import { selectorReducer, } from "../reducers/selectorReducer.js";
 export const HistorySearch = ({ searchQuery, onSelect, onCancel, }) => {
     const MAX_VISIBLE_ITEMS = 5;
-    const [selectedIndex, setSelectedIndex] = useState(0);
+    const [state, dispatch] = useReducer(selectorReducer, {
+        selectedIndex: 0,
+        pendingDecision: null,
+    });
     const [entries, setEntries] = useState([]);
-    const entriesRef = React.useRef([]);
-    const selectedIndexRef = React.useRef(0);
-    useEffect(() => {
-        entriesRef.current = entries;
-    }, [entries]);
-    useEffect(() => {
-        selectedIndexRef.current = selectedIndex;
-    }, [selectedIndex]);
+    const { selectedIndex, pendingDecision } = state;
     useEffect(() => {
         const fetchHistory = async () => {
             const results = await PromptHistoryManager.searchHistory(searchQuery);
             const limitedResults = results.slice(0, 20);
-            setEntries(limitedResults); // Limit to 20 results
-            setSelectedIndex(0);
+            setEntries(limitedResults);
+            dispatch({ type: "RESET_INDEX" });
         };
         fetchHistory();
     }, [searchQuery]);
-    useInput((input, key) => {
-        if (key.return) {
-            if (entriesRef.current.length > 0 &&
-                selectedIndexRef.current < entriesRef.current.length) {
-                onSelect(entriesRef.current[selectedIndexRef.current]);
-            }
+    // Handle decisions from reducer
+    useEffect(() => {
+        if (!pendingDecision)
             return;
+        if (pendingDecision === "select") {
+            if (entries.length > 0 && selectedIndex < entries.length) {
+                onSelect(entries[selectedIndex]);
+            }
         }
-        if (key.escape) {
+        else if (pendingDecision === "cancel") {
             onCancel();
-            return;
-        }
-        if (key.upArrow) {
-            setSelectedIndex((prev) => Math.max(0, prev - 1));
-            return;
-        }
-        if (key.downArrow) {
-            setSelectedIndex((prev) => Math.min(entriesRef.current.length - 1, prev + 1));
-            return;
         }
+        dispatch({ type: "CLEAR_DECISION" });
+    }, [pendingDecision, selectedIndex, entries, onSelect, onCancel]);
+    useInput((input, key) => {
+        dispatch({
+            type: "HANDLE_KEY",
+            key,
+            maxIndex: entries.length - 1,
+            hasInsert: false,
+        });
     });
     if (entries.length === 0) {
         return (_jsxs(Box, { flexDirection: "column", borderStyle: "single", borderColor: "yellow", borderBottom: false, borderLeft: false, borderRight: false, children: [_jsxs(Text, { color: "yellow", children: ["No history found ", searchQuery && `for "${searchQuery}"`] }), _jsx(Text, { dimColor: true, children: "Press Escape to cancel" })] }));

package/dist/components/InputBox.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"InputBox.d.ts","sourceRoot":"","sources":["../../src/components/InputBox.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AAkBzC,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAEpE,eAAO,MAAM,sBAAsB,mDACe,CAAC;AAEnD,eAAO,MAAM,6BAA6B,QAGzC,CAAC;AAEF,MAAM,WAAW,aAAa;IAC5B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,CACZ,OAAO,EAAE,MAAM,EACf,MAAM,CAAC,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,EAClD,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KACjC,IAAI,CAAC;IACV,YAAY,CAAC,EAAE,MAAM,IAAI,CAAC;IAE1B,UAAU,CAAC,EAAE,eAAe,EAAE,CAAC;IAC/B,gBAAgB,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5D,mBAAmB,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAE/D,aAAa,CAAC,EAAE,YAAY,EAAE,CAAC;IAC/B,eAAe,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC;CAClD;AAED,eAAO,MAAM,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,aAAa,CA6Q5C,CAAC"}
+{"version":3,"file":"InputBox.d.ts","sourceRoot":"","sources":["../../src/components/InputBox.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AAkBzC,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAEpE,eAAO,MAAM,sBAAsB,mDACe,CAAC;AAEnD,eAAO,MAAM,6BAA6B,QAGzC,CAAC;AAEF,MAAM,WAAW,aAAa;IAC5B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,CACZ,OAAO,EAAE,MAAM,EACf,MAAM,CAAC,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,EAClD,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KACjC,IAAI,CAAC;IACV,YAAY,CAAC,EAAE,MAAM,IAAI,CAAC;IAE1B,UAAU,CAAC,EAAE,eAAe,EAAE,CAAC;IAC/B,gBAAgB,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5D,mBAAmB,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAE/D,aAAa,CAAC,EAAE,YAAY,EAAE,CAAC;IAC/B,eAAe,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC;CAClD;AAED,eAAO,MAAM,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,aAAa,CAoR5C,CAAC"}

package/dist/components/InputBox.js

@@ -19,7 +19,7 @@ import { useChat } from "../contexts/useChat.js";
 export const INPUT_PLACEHOLDER_TEXT = "Type your message (use /help for more info)...";
 export const INPUT_PLACEHOLDER_TEXT_PREFIX = INPUT_PLACEHOLDER_TEXT.substring(0, 10);
 export const InputBox = ({ sendMessage = () => { }, abortMessage = () => { }, mcpServers = [], connectMcpServer = async () => false, disconnectMcpServer = async () => false, slashCommands = [], hasSlashCommand = () => false, }) => {
-    const { permissionMode: chatPermissionMode, setPermissionMode: setChatPermissionMode, allowBypassInCycle: chatAllowBypassInCycle, handleRewindSelect, backgroundCurrentTask, messages, getFullMessageThread, sessionId, workingDirectory, askBtw, currentModel, configuredModels, setModel, recreateAgent, } = useChat();
+    const { permissionMode: chatPermissionMode, setPermissionMode: setChatPermissionMode, handleRewindSelect, backgroundCurrentTask, messages, getFullMessageThread, sessionId, workingDirectory, askBtw, currentModel, configuredModels, setModel, recreateAgent, } = useChat();
     // Input manager with all input state and functionality (including images)
     const { inputText, cursorPosition, 
     // Image management
@@ -33,7 +33,7 @@ export const InputBox = ({ sendMessage = () => { }, abortMessage = () => { }, mc
     // Task/MCP Manager
     showBackgroundTaskManager, showMcpManager, showRewindManager, showHelp, showStatusCommand, showPluginManager, showModelSelector, setShowBackgroundTaskManager, setShowMcpManager, setShowRewindManager, setShowHelp, setShowStatusCommand, setShowPluginManager, setShowModelSelector, 
     // Permission mode
-    permissionMode, setPermissionMode, setAllowBypassInCycle, 
+    permissionMode, setPermissionMode, 
     // BTW state
     btwState, 
     // Main handler
@@ -54,12 +54,20 @@ export const InputBox = ({ sendMessage = () => { }, abortMessage = () => { }, mc
     useEffect(() => {
         setPermissionMode(chatPermissionMode);
     }, [chatPermissionMode, setPermissionMode]);
-    // Sync allowBypassInCycle from useChat to InputManager
-    useEffect(() => {
-        setAllowBypassInCycle(chatAllowBypassInCycle);
-    }, [chatAllowBypassInCycle, setAllowBypassInCycle]);
     // Use the InputManager's unified input handler
     useInput(async (input, key) => {
+        // These views have their own useInput handlers that handle escape and navigation.
+        // If they are active, we should skip InputBox's global input handling to avoid
+        // duplicate dispatches or state update conflicts.
+        if (showRewindManager ||
+            showHelp ||
+            showStatusCommand ||
+            showPluginManager ||
+            showModelSelector ||
+            showBackgroundTaskManager ||
+            showMcpManager) {
+            return;
+        }
         await handleInput(input, key, attachedImages, clearImages);
     });
     const handleRewindCancel = () => {

package/dist/components/InstalledView.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"InstalledView.d.ts","sourceRoot":"","sources":["../../src/components/InstalledView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmB,MAAM,OAAO,CAAC;AAIxC,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAqEjC,CAAC"}
+{"version":3,"file":"InstalledView.d.ts","sourceRoot":"","sources":["../../src/components/InstalledView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAgC,MAAM,OAAO,CAAC;AAKrD,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EA8EjC,CAAC"}

package/dist/components/InstalledView.js

@@ -1,25 +1,33 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useState } from "react";
+import { useReducer, useEffect } from "react";
 import { Box, Text, useInput } from "ink";
 import { usePluginManagerContext } from "../contexts/PluginManagerContext.js";
+import { selectorReducer } from "../reducers/selectorReducer.js";
 export const InstalledView = () => {
     const { installedPlugins, actions } = usePluginManagerContext();
-    const [selectedIndex, setSelectedIndex] = useState(0);
-    useInput((input, key) => {
-        if (key.upArrow) {
-            setSelectedIndex(Math.max(0, selectedIndex - 1));
-        }
-        else if (key.downArrow) {
-            setSelectedIndex(Math.min(installedPlugins.length - 1, selectedIndex + 1));
-        }
-        else if (key.return) {
+    const [state, dispatch] = useReducer(selectorReducer, {
+        selectedIndex: 0,
+        pendingDecision: null,
+    });
+    const { selectedIndex, pendingDecision } = state;
+    useInput((_input, key) => {
+        dispatch({
+            type: "HANDLE_KEY",
+            key,
+            maxIndex: installedPlugins.length - 1,
+            hasInsert: false,
+        });
+    });
+    useEffect(() => {
+        if (pendingDecision === "select") {
             const plugin = installedPlugins[selectedIndex];
             if (plugin) {
                 actions.setSelectedId(`${plugin.name}@${plugin.marketplace}`);
                 actions.setView("PLUGIN_DETAIL");
             }
+            dispatch({ type: "CLEAR_DECISION" });
         }
-    });
+    }, [pendingDecision, selectedIndex, installedPlugins, actions]);
     if (installedPlugins.length === 0) {
         return (_jsx(Box, { padding: 1, children: _jsx(Text, { dimColor: true, children: "No plugins installed." }) }));
     }

package/dist/components/MarketplaceDetail.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MarketplaceDetail.d.ts","sourceRoot":"","sources":["../../src/components/MarketplaceDetail.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmB,MAAM,OAAO,CAAC;AAIxC,eAAO,MAAM,iBAAiB,EAAE,KAAK,CAAC,EAuHrC,CAAC"}
+{"version":3,"file":"MarketplaceDetail.d.ts","sourceRoot":"","sources":["../../src/components/MarketplaceDetail.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAyC,MAAM,OAAO,CAAC;AAK9D,eAAO,MAAM,iBAAiB,EAAE,KAAK,CAAC,EA8IrC,CAAC"}

package/dist/components/MarketplaceDetail.js

@@ -1,30 +1,38 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useState } from "react";
+import { useReducer, useEffect, useMemo } from "react";
 import { Box, Text, useInput } from "ink";
 import { usePluginManagerContext } from "../contexts/PluginManagerContext.js";
+import { selectorReducer } from "../reducers/selectorReducer.js";
 export const MarketplaceDetail = () => {
     const { state, marketplaces, actions } = usePluginManagerContext();
-    const [selectedActionIndex, setSelectedActionIndex] = useState(0);
+    const [selectorState, dispatch] = useReducer(selectorReducer, {
+        selectedIndex: 0,
+        pendingDecision: null,
+    });
+    const { selectedIndex: selectedActionIndex, pendingDecision } = selectorState;
     const marketplace = marketplaces.find((m) => m.name === state.selectedId);
-    const ACTIONS = [
+    const ACTIONS = useMemo(() => [
         {
             id: "toggle-auto-update",
             label: `${marketplace?.autoUpdate ? "Disable" : "Enable"} auto-update`,
         },
         { id: "update", label: "Update marketplace" },
         { id: "remove", label: "Remove marketplace" },
-    ];
-    useInput((input, key) => {
-        if (key.escape) {
-            actions.setView("MARKETPLACES");
-        }
-        else if (key.upArrow) {
-            setSelectedActionIndex((prev) => prev > 0 ? prev - 1 : ACTIONS.length - 1);
-        }
-        else if (key.downArrow) {
-            setSelectedActionIndex((prev) => prev < ACTIONS.length - 1 ? prev + 1 : 0);
-        }
-        else if (key.return && marketplace && !state.isLoading) {
+    ], [marketplace?.autoUpdate]);
+    useInput((_input, key) => {
+        if (state.isLoading && !key.escape)
+            return;
+        dispatch({
+            type: "HANDLE_KEY",
+            key,
+            maxIndex: ACTIONS.length - 1,
+            hasInsert: false,
+        });
+    });
+    useEffect(() => {
+        if (!pendingDecision)
+            return;
+        if (pendingDecision === "select" && marketplace && !state.isLoading) {
             const action = ACTIONS[selectedActionIndex].id;
             if (action === "toggle-auto-update") {
                 actions.toggleAutoUpdate(marketplace.name, !marketplace.autoUpdate);
@@ -36,7 +44,18 @@ export const MarketplaceDetail = () => {
                 actions.removeMarketplace(marketplace.name);
             }
         }
-    });
+        else if (pendingDecision === "cancel") {
+            actions.setView("MARKETPLACES");
+        }
+        dispatch({ type: "CLEAR_DECISION" });
+    }, [
+        pendingDecision,
+        selectedActionIndex,
+        marketplace,
+        state.isLoading,
+        actions,
+        ACTIONS,
+    ]);
     if (!marketplace) {
         return (_jsx(Box, { children: _jsx(Text, { color: "red", children: "Marketplace not found." }) }));
     }

package/dist/components/MarketplaceView.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MarketplaceView.d.ts","sourceRoot":"","sources":["../../src/components/MarketplaceView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmB,MAAM,OAAO,CAAC;AAMxC,eAAO,MAAM,eAAe,EAAE,KAAK,CAAC,EAoCnC,CAAC"}
+{"version":3,"file":"MarketplaceView.d.ts","sourceRoot":"","sources":["../../src/components/MarketplaceView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAgC,MAAM,OAAO,CAAC;AAOrD,eAAO,MAAM,eAAe,EAAE,KAAK,CAAC,EAkDnC,CAAC"}

package/dist/components/MarketplaceView.js

@@ -1,28 +1,37 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useState } from "react";
+import { useReducer, useEffect } from "react";
 import { Box, Text, useInput } from "ink";
 import { usePluginManagerContext } from "../contexts/PluginManagerContext.js";
+import { selectorReducer } from "../reducers/selectorReducer.js";
 import { MarketplaceList } from "./MarketplaceList.js";
 export const MarketplaceView = () => {
     const { marketplaces, actions } = usePluginManagerContext();
-    const [selectedIndex, setSelectedIndex] = useState(0);
+    const [state, dispatch] = useReducer(selectorReducer, {
+        selectedIndex: 0,
+        pendingDecision: null,
+    });
+    const { selectedIndex, pendingDecision } = state;
     useInput((input, key) => {
-        if (key.upArrow) {
-            setSelectedIndex(Math.max(0, selectedIndex - 1));
-        }
-        else if (key.downArrow) {
-            setSelectedIndex(Math.min(marketplaces.length - 1, selectedIndex + 1));
+        if (input === "a") {
+            actions.setView("ADD_MARKETPLACE");
+            return;
         }
-        else if (key.return) {
+        dispatch({
+            type: "HANDLE_KEY",
+            key,
+            maxIndex: marketplaces.length - 1,
+            hasInsert: false,
+        });
+    });
+    useEffect(() => {
+        if (pendingDecision === "select") {
             const mk = marketplaces[selectedIndex];
             if (mk) {
                 actions.setSelectedId(mk.name);
                 actions.setView("MARKETPLACE_DETAIL");
             }
+            dispatch({ type: "CLEAR_DECISION" });
         }
-        else if (input === "a") {
-            actions.setView("ADD_MARKETPLACE");
-        }
-    });
+    }, [pendingDecision, selectedIndex, marketplaces, actions]);
     return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { color: "green", children: "Press 'a' to add a new marketplace" }) }), _jsx(MarketplaceList, { marketplaces: marketplaces, selectedIndex: selectedIndex }), marketplaces.length > 0 && (_jsx(Box, { marginLeft: 4, marginTop: 1, children: _jsx(Text, { dimColor: true, children: "Press Enter for actions" }) }))] }));
 };

package/dist/components/McpManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"McpManager.d.ts","sourceRoot":"","sources":["../../src/components/McpManager.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAqB,MAAM,OAAO,CAAC;AAE1C,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAMjD,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,eAAe,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC1D,kBAAkB,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CAC9D;AAOD,eAAO,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAuShD,CAAC"}
+{"version":3,"file":"McpManager.d.ts","sourceRoot":"","sources":["../../src/components/McpManager.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAgC,MAAM,OAAO,CAAC;AAErD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAMjD,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,eAAe,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC1D,kBAAkB,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CAC9D;AAQD,eAAO,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CA6QhD,CAAC"}

package/dist/components/McpManager.js

@@ -1,13 +1,32 @@
 import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
-import { useReducer } from "react";
+import { useReducer, useEffect } from "react";
 import { Box, Text, useInput } from "ink";
 import { mcpManagerReducer, } from "../reducers/mcpManagerReducer.js";
 const initialState = {
     selectedIndex: 0,
     viewMode: "list",
+    pendingEffect: null,
 };
 export const McpManager = ({ onCancel, servers, onConnectServer, onDisconnectServer, }) => {
     const [state, dispatch] = useReducer(mcpManagerReducer, initialState);
+    // Handle pending effects
+    useEffect(() => {
+        if (!state.pendingEffect)
+            return;
+        const effect = state.pendingEffect;
+        dispatch({ type: "CLEAR_PENDING_EFFECT" });
+        switch (effect.type) {
+            case "CANCEL":
+                onCancel();
+                break;
+            case "CONNECT_SERVER":
+                onConnectServer(effect.serverName);
+                break;
+            case "DISCONNECT_SERVER":
+                onDisconnectServer(effect.serverName);
+                break;
+        }
+    }, [state.pendingEffect, onCancel, onConnectServer, onDisconnectServer]);
     // Dynamically calculate selectedServer based on selectedIndex and servers
     const selectedServer = state.viewMode === "detail" &&
         servers.length > 0 &&
@@ -41,52 +60,14 @@ export const McpManager = ({ onCancel, servers, onConnectServer, onDisconnectSer
                 return "○";
         }
     };
-    const handleConnect = async (serverName) => {
-        await onConnectServer(serverName);
-    };
-    const handleDisconnect = async (serverName) => {
-        await onDisconnectServer(serverName);
-    };
     useInput((input, key) => {
-        if (key.return) {
-            if (state.viewMode === "list") {
-                dispatch({ type: "SET_VIEW_MODE", viewMode: "detail" });
-            }
-            return;
-        }
-        if (key.escape) {
-            if (state.viewMode === "detail") {
-                dispatch({ type: "SET_VIEW_MODE", viewMode: "list" });
-            }
-            else {
-                onCancel();
-            }
-            return;
-        }
-        if (key.upArrow) {
-            dispatch({ type: "MOVE_UP", serverCount: servers.length });
-            return;
-        }
-        if (key.downArrow) {
-            dispatch({ type: "MOVE_DOWN", serverCount: servers.length });
-            return;
-        }
-        // Hotkeys for server actions
-        if (input === "c") {
-            const server = servers[state.selectedIndex];
-            if (server &&
-                (server.status === "disconnected" || server.status === "error")) {
-                handleConnect(server.name);
-            }
-            return;
-        }
-        if (input === "d") {
-            const server = servers[state.selectedIndex];
-            if (server && server.status === "connected") {
-                handleDisconnect(server.name);
-            }
-            return;
-        }
+        dispatch({
+            type: "HANDLE_KEY",
+            input,
+            key,
+            serverCount: servers.length,
+            servers: servers.map((s) => ({ name: s.name, status: s.status })),
+        });
     });
     if (state.viewMode === "detail" && selectedServer) {
         return (_jsxs(Box, { flexDirection: "column", borderStyle: "single", borderColor: "cyan", borderBottom: false, borderLeft: false, borderRight: false, paddingTop: 1, gap: 1, children: [_jsx(Box, { children: _jsxs(Text, { color: "cyan", bold: true, children: ["MCP Server Details: ", selectedServer.name] }) }), _jsxs(Box, { flexDirection: "column", gap: 1, children: [_jsx(Box, { children: _jsxs(Text, { children: [_jsx(Text, { color: "blue", children: "Status:" }), " ", _jsxs(Text, { color: getStatusColor(selectedServer.status), children: [getStatusIcon(selectedServer.status), " ", selectedServer.status] })] }) }), _jsx(Box, { children: _jsxs(Text, { children: [_jsx(Text, { color: "blue", children: "Command:" }), " ", selectedServer.config.command] }) }), selectedServer.config.args && (_jsx(Box, { children: _jsxs(Text, { children: [_jsx(Text, { color: "blue", children: "Args:" }), " ", selectedServer.config.args.join(" ")] }) })), selectedServer.toolCount !== undefined && (_jsx(Box, { children: _jsxs(Text, { children: [_jsx(Text, { color: "blue", children: "Tools:" }), " ", selectedServer.toolCount, " ", "tools"] }) })), selectedServer.capabilities && (_jsx(Box, { children: _jsxs(Text, { children: [_jsx(Text, { color: "blue", children: "Capabilities:" }), " ", selectedServer.capabilities.join(", ")] }) })), selectedServer.lastConnected && (_jsx(Box, { children: _jsxs(Text, { children: [_jsx(Text, { color: "blue", children: "Last Connected:" }), " ", formatTime(selectedServer.lastConnected)] }) })), selectedServer.error && (_jsx(Box, { children: _jsxs(Text, { children: [_jsx(Text, { color: "red", children: "Error:" }), " ", selectedServer.error] }) }))] }), selectedServer.config.env &&

package/dist/components/ModelSelector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ModelSelector.d.ts","sourceRoot":"","sources":["../../src/components/ModelSelector.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmB,MAAM,OAAO,CAAC;AAGxC,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,aAAa,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACxC;AAID,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CAoHtD,CAAC"}
+{"version":3,"file":"ModelSelector.d.ts","sourceRoot":"","sources":["../../src/components/ModelSelector.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAgC,MAAM,OAAO,CAAC;AAIrD,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,aAAa,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACxC;AAID,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CA0HtD,CAAC"}

package/dist/components/ModelSelector.js

@@ -1,33 +1,43 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useState } from "react";
+import { useReducer, useEffect } from "react";
 import { Box, Text, useInput } from "ink";
+import { selectorReducer } from "../reducers/selectorReducer.js";
 const MAX_VISIBLE_ITEMS = 5;
 export const ModelSelector = ({ onCancel, currentModel, configuredModels, onSelectModel, }) => {
-    const [selectedIndex, setSelectedIndex] = useState(() => {
-        const index = configuredModels.indexOf(currentModel);
-        return index !== -1 ? index : 0;
+    const [state, dispatch] = useReducer(selectorReducer, {
+        selectedIndex: configuredModels.indexOf(currentModel) !== -1
+            ? configuredModels.indexOf(currentModel)
+            : 0,
+        pendingDecision: null,
     });
+    const { selectedIndex, pendingDecision } = state;
     useInput((_input, key) => {
-        if (key.return) {
+        dispatch({
+            type: "HANDLE_KEY",
+            key,
+            maxIndex: configuredModels.length - 1,
+            hasInsert: false,
+        });
+    });
+    useEffect(() => {
+        if (pendingDecision === "select") {
             if (configuredModels.length > 0) {
                 onSelectModel(configuredModels[selectedIndex]);
             }
             onCancel();
-            return;
+            dispatch({ type: "CLEAR_DECISION" });
         }
-        if (key.escape) {
+        else if (pendingDecision === "cancel") {
             onCancel();
-            return;
-        }
-        if (key.upArrow) {
-            setSelectedIndex((prev) => Math.max(0, prev - 1));
-            return;
+            dispatch({ type: "CLEAR_DECISION" });
         }
-        if (key.downArrow) {
-            setSelectedIndex((prev) => Math.min(configuredModels.length - 1, prev + 1));
-            return;
-        }
-    });
+    }, [
+        pendingDecision,
+        selectedIndex,
+        configuredModels,
+        onSelectModel,
+        onCancel,
+    ]);
     // Calculate visible window
     const startIndex = Math.max(0, Math.min(selectedIndex - Math.floor(MAX_VISIBLE_ITEMS / 2), Math.max(0, configuredModels.length - MAX_VISIBLE_ITEMS)));
     const visibleModels = configuredModels.slice(startIndex, startIndex + MAX_VISIBLE_ITEMS);

package/dist/components/PluginDetail.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PluginDetail.d.ts","sourceRoot":"","sources":["../../src/components/PluginDetail.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAqB,MAAM,OAAO,CAAC;AAc1C,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAyJhC,CAAC"}
+{"version":3,"file":"PluginDetail.d.ts","sourceRoot":"","sources":["../../src/components/PluginDetail.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAyC,MAAM,OAAO,CAAC;AAc9D,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAgLhC,CAAC"}