From ced2ae858c2a2a73c33f7e937715ef50a208d4bb Mon Sep 17 00:00:00 2001
From: Neil <4138956+nwparker@users.noreply.github.com>
Date: Sun, 31 May 2026 03:20:26 -0700
Subject: [PATCH] perf: reset automation branch picker by repo key (#4073)

---
 .../src/components/automations/AutomationEditorDialog.tsx   | 3 +++
 .../src/components/automations/CreateFromPicker.tsx         | 6 ------
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/renderer/src/components/automations/AutomationEditorDialog.tsx b/src/renderer/src/components/automations/AutomationEditorDialog.tsx
index 38ab4e9aa95..ceba02ad047 100644
--- a/src/renderer/src/components/automations/AutomationEditorDialog.tsx
+++ b/src/renderer/src/components/automations/AutomationEditorDialog.tsx
@@ -318,6 +318,9 @@ export function AutomationEditorDialog({
                     />
                   ) : (
                     <CreateFromPicker
+                      // Why: branch search state belongs to the selected project,
+                      // so repo switches should reset it before the next paint.
+                      key={draft.projectId}
                       repoId={draft.projectId}
                       repoMap={repoMap}
                       worktrees={worktrees}
diff --git a/src/renderer/src/components/automations/CreateFromPicker.tsx b/src/renderer/src/components/automations/CreateFromPicker.tsx
index 402e9fc72ff..04d29391173 100644
--- a/src/renderer/src/components/automations/CreateFromPicker.tsx
+++ b/src/renderer/src/components/automations/CreateFromPicker.tsx
@@ -127,12 +127,6 @@ export function CreateFromPicker({
     }
   }, [activeRuntimeEnvironmentId, repoId])
 
-  React.useEffect(() => {
-    setQuery('')
-    setSearchResults([])
-    setIsSearching(false)
-  }, [repoId])
-
   React.useEffect(() => {
     const trimmedQuery = query.trim()
     if (!open || !repoId || trimmedQuery.length < 2) {