fix: QOL changes for task input (#249)

Author: k11kirky

apps/array/src/renderer/features/task-detail/components/BranchSelect.tsx

@@ -3,24 +3,28 @@ import { ChevronDownIcon } from "@radix-ui/react-icons";
 import { Button, DropdownMenu, Flex, Text, TextField } from "@radix-ui/themes";
 import type { Responsive } from "@radix-ui/themes/dist/esm/props/prop-def.js";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import type { RunMode } from "./RunModeSelect";
 
 const MAX_DISPLAYED_BRANCHES = 20;
 
 interface BranchSelectProps {
   value: string | null; // null means use default branch
   onChange: (branch: string | null) => void;
   directoryPath: string;
+  runMode: RunMode;
   size?: Responsive<"1" | "2">;
 }
 
 export function BranchSelect({
   value,
   onChange,
   directoryPath,
+  runMode,
   size = "1",
 }: BranchSelectProps) {
   const [branches, setBranches] = useState<string[]>([]);
   const [defaultBranch, setDefaultBranch] = useState<string>("");
+  const [currentBranch, setCurrentBranch] = useState<string>("");
   const [isCreatingNew, setIsCreatingNew] = useState(false);
   const [newBranchName, setNewBranchName] = useState("");
   const [searchQuery, setSearchQuery] = useState("");
@@ -32,6 +36,7 @@ export function BranchSelect({
       setIsLoading(false);
       setBranches([]);
       setDefaultBranch("");
+      setCurrentBranch("");
       return;
     }
 
@@ -41,15 +46,18 @@ export function BranchSelect({
     const load = async () => {
       setIsLoading(true);
       try {
-        const [allBranches, detectedDefault] = await Promise.all([
-          window.electronAPI.getAllBranches(directoryPath),
-          window.electronAPI.getDefaultBranch(directoryPath),
-        ]);
+        const [allBranches, detectedDefault, detectedCurrent] =
+          await Promise.all([
+            window.electronAPI.getAllBranches(directoryPath),
+            window.electronAPI.getDefaultBranch(directoryPath),
+            window.electronAPI.getCurrentBranch(directoryPath),
+          ]);
 
         if (cancelled) return;
 
         setBranches(allBranches);
         setDefaultBranch(detectedDefault);
+        setCurrentBranch(detectedCurrent ?? "");
       } catch (_error) {
       } finally {
         if (!cancelled) {
@@ -65,25 +73,39 @@ export function BranchSelect({
     };
   }, [directoryPath]);
 
+  // Determine which branch to use as the initial value based on run mode
+  const initialBranch =
+    runMode === "local" ? currentBranch || defaultBranch : defaultBranch;
+
   useEffect(() => {
-    if (!hasSetInitialValue.current && value === null && defaultBranch) {
+    if (!hasSetInitialValue.current && value === null && initialBranch) {
       hasSetInitialValue.current = true;
-      onChange(defaultBranch);
+      onChange(initialBranch);
+    }
+  }, [initialBranch, value, onChange]);
+
+  // Reset branch selection when runMode changes
+  useEffect(() => {
+    if (initialBranch) {
+      onChange(initialBranch);
     }
-  }, [defaultBranch, value, onChange]);
+  }, [initialBranch, onChange]); // eslint-disable-line react-hooks/exhaustive-deps
 
   const handleOpenChange = useCallback(
     async (open: boolean) => {
       if (open) {
         setSearchQuery("");
         if (directoryPath) {
           try {
-            const [allBranches, detectedDefault] = await Promise.all([
-              window.electronAPI.getAllBranches(directoryPath),
-              window.electronAPI.getDefaultBranch(directoryPath),
-            ]);
+            const [allBranches, detectedDefault, detectedCurrent] =
+              await Promise.all([
+                window.electronAPI.getAllBranches(directoryPath),
+                window.electronAPI.getDefaultBranch(directoryPath),
+                window.electronAPI.getCurrentBranch(directoryPath),
+              ]);
             setBranches(allBranches);
             setDefaultBranch(detectedDefault);
+            setCurrentBranch(detectedCurrent ?? "");
           } catch (_error) {}
         }
       }

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

@@ -148,6 +148,7 @@ export function TaskInput() {
               value={selectedBranch}
               onChange={setSelectedBranch}
               directoryPath={selectedDirectory}
+              runMode={runMode}
             />
           )}
         </Flex>

apps/array/src/renderer/features/task-detail/components/TaskInputEditor.tsx

@@ -1,3 +1,4 @@
+import { ModelSelector } from "@features/sessions/components/ModelSelector";
 import { ArrowUpIcon, GitBranchIcon, Paperclip } from "@phosphor-icons/react";
 import { Box, Flex, IconButton, Text, Tooltip } from "@radix-ui/themes";
 import type { Editor } from "@tiptap/react";
@@ -139,7 +140,7 @@ export function TaskInputEditor({
       </Flex>
 
       <Flex justify="between" align="center" px="3" pb="3">
-        <Flex align="center">
+        <Flex align="center" gap="1">
           <input
             ref={fileInputRef}
             type="file"
@@ -161,6 +162,7 @@ export function TaskInputEditor({
               <Paperclip size={16} weight="bold" />
             </IconButton>
           </Tooltip>
+          <ModelSelector disabled={isCreatingTask} />
         </Flex>
 
         <Flex align="center" gap="4">