Fix state loss on settings navigation + FolderPicker cursor

Author: charlesvien

apps/twig/src/renderer/features/folder-picker/components/FolderPicker.tsx

@@ -60,6 +60,7 @@ export function FolderPicker({
         variant="outline"
         size={size}
         onClick={handleOpenFilePicker}
+        style={{ cursor: "pointer" }}
       >
         <Flex justify="between" align="center" gap="2" width="100%">
           <Flex align="center" gap="2">

apps/twig/src/renderer/features/task-detail/components/TaskInput.tsx

@@ -21,9 +21,12 @@ const DOT_FILL = "var(--gray-6)";
 
 export function TaskInput() {
   const { view } = useNavigationStore();
-  const { lastUsedDirectory } = useTaskDirectoryStore();
-  const { lastUsedLocalWorkspaceMode, allowBypassPermissions } =
-    useSettingsStore();
+  const { lastUsedDirectory, setLastUsedDirectory } = useTaskDirectoryStore();
+  const {
+    lastUsedLocalWorkspaceMode,
+    setLastUsedLocalWorkspaceMode,
+    allowBypassPermissions,
+  } = useSettingsStore();
 
   const editorRef = useRef<MessageEditorHandle>(null);
   const containerRef = useRef<HTMLDivElement>(null);
@@ -67,6 +70,7 @@ export function TaskInput() {
 
   const handleDirectoryChange = (newPath: string) => {
     setSelectedDirectory(newPath);
+    setLastUsedDirectory(newPath);
   };
 
   const effectiveWorkspaceMode = workspaceMode;
@@ -149,7 +153,10 @@ export function TaskInput() {
             />
             <WorkspaceModeSelect
               value={workspaceMode}
-              onChange={setWorkspaceMode}
+              onChange={(mode) => {
+                setWorkspaceMode(mode);
+                setLastUsedLocalWorkspaceMode(mode);
+              }}
               size="1"
             />
           </Flex>

apps/twig/src/renderer/stores/taskDirectoryStore.ts

@@ -10,6 +10,7 @@ interface TaskDirectoryState {
   lastUsedDirectory: string | null;
   getTaskDirectory: (taskId: string, repoKey?: string) => string | null;
   setRepoDirectory: (repoKey: string, directory: string) => void;
+  setLastUsedDirectory: (directory: string) => void;
   clearRepoDirectory: (repoKey: string) => void;
   validateLastUsedDirectory: () => Promise<void>;
 }
@@ -51,6 +52,10 @@ export const useTaskDirectoryStore = create<TaskDirectoryState>()(
         }));
       },
 
+      setLastUsedDirectory: (directory: string) => {
+        set({ lastUsedDirectory: directory });
+      },
+
       clearRepoDirectory: (repoKey: string) => {
         set((state) => ({
           repoDirectories: omitKey(state.repoDirectories, repoKey),