From 7982127535ce465909be64be0c8ad8b6ece3a249 Mon Sep 17 00:00:00 2001
From: Jason Chiu <jason@runloop.ai>
Date: Tue, 7 Apr 2026 11:25:21 -0700
Subject: [PATCH] fix: don't reset settings TUI menu cursor on back

---
 src/components/SettingsMenu.tsx | 21 ++++++++++++++++++++-
 src/store/menuStore.ts          |  4 ++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/components/SettingsMenu.tsx b/src/components/SettingsMenu.tsx
index c83e0ec..0267f59 100644
--- a/src/components/SettingsMenu.tsx
+++ b/src/components/SettingsMenu.tsx
@@ -5,6 +5,7 @@ import { Breadcrumb } from "./Breadcrumb.js";
 import { NavigationTips } from "./NavigationTips.js";
 import { colors } from "../utils/theme.js";
 import { useExitOnCtrlC } from "../hooks/useExitOnCtrlC.js";
+import { useMenuStore } from "../store/menuStore.js";
 
 interface SettingsMenuItem {
   key: string;
@@ -52,8 +53,26 @@ interface SettingsMenuProps {
 
 export const SettingsMenu = ({ onSelect, onBack }: SettingsMenuProps) => {
   const { exit } = useApp();
-  const [selectedIndex, setSelectedIndex] = React.useState(0);
   const { stdout } = useStdout();
+  const { settingsSelectedKey, setSettingsSelectedKey } = useMenuStore();
+
+  // Calculate initial index from persisted key
+  const initialIndex = React.useMemo(() => {
+    const index = settingsMenuItems.findIndex(
+      (item) => item.key === settingsSelectedKey,
+    );
+    return index >= 0 ? index : 0;
+  }, [settingsSelectedKey]);
+
+  const [selectedIndex, setSelectedIndex] = React.useState(initialIndex);
+
+  // Persist selection when it changes
+  React.useEffect(() => {
+    const currentKey = settingsMenuItems[selectedIndex]?.key;
+    if (currentKey && currentKey !== settingsSelectedKey) {
+      setSettingsSelectedKey(currentKey);
+    }
+  }, [selectedIndex, settingsSelectedKey, setSettingsSelectedKey]);
 
   // Get terminal dimensions for responsive layout
   const getTerminalDimensions = React.useCallback(() => {
diff --git a/src/store/menuStore.ts b/src/store/menuStore.ts
index 55dd3dd..f4f02cf 100644
--- a/src/store/menuStore.ts
+++ b/src/store/menuStore.ts
@@ -3,9 +3,13 @@ import { create } from "zustand";
 interface MenuState {
   selectedKey: string;
   setSelectedKey: (key: string) => void;
+  settingsSelectedKey: string;
+  setSettingsSelectedKey: (key: string) => void;
 }
 
 export const useMenuStore = create<MenuState>((set) => ({
   selectedKey: "devboxes",
   setSelectedKey: (key) => set({ selectedKey: key }),
+  settingsSelectedKey: "network-policies",
+  setSettingsSelectedKey: (key) => set({ settingsSelectedKey: key }),
 }));