From cbd2e6df924a72b21d14848e6a193a5254a2a77e Mon Sep 17 00:00:00 2001
From: Donald Silveira <donaldsilveira@gmail.com>
Date: Sat, 26 Sep 2026 11:58:27 -0300
Subject: [PATCH] fix(web): reuse the selected project in worktree settings

- Remove the duplicate project selector from worktree management
- Reset worktree dialogs and errors when the selected project changes
---
 .../components/settings/StorageSettings.tsx   |  3 +-
 .../components/settings/WorktreeManager.tsx   | 37 ++-----------------
 2 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/apps/web/src/components/settings/StorageSettings.tsx b/apps/web/src/components/settings/StorageSettings.tsx
index aa8cfcc2dc85..5b74ec07e080 100644
--- a/apps/web/src/components/settings/StorageSettings.tsx
+++ b/apps/web/src/components/settings/StorageSettings.tsx
@@ -152,7 +152,8 @@ export function StorageSettingsPanel() {
 
   return (
     <SettingsPageContainer>
-      <WorktreeManager />
+      {/* Remount per project so a stale error or delete dialog never carries over. */}
+      <WorktreeManager key={"group" in scope ? scope.group.projectKey : null} />
       <SettingsSection id="storage-worktrees" title="Worktrees">
         {isProjectScope && (
           <SettingsRow
diff --git a/apps/web/src/components/settings/WorktreeManager.tsx b/apps/web/src/components/settings/WorktreeManager.tsx
index 57b2ccc6b163..76b177a763d8 100644
--- a/apps/web/src/components/settings/WorktreeManager.tsx
+++ b/apps/web/src/components/settings/WorktreeManager.tsx
@@ -175,7 +175,7 @@ function CreateWorktreeDialog({
 }
 
 export function WorktreeManager() {
-  const { scope, groups, selectScope, connectedEnvironments } = useSettingsScope();
+  const { scope, connectedEnvironments } = useSettingsScope();
   const [selectedMemberKey, setSelectedMemberKey] = useState<string | null>(null);
   const [creating, setCreating] = useState(false);
   const [deleting, setDeleting] = useState<WorktreeDeletionTarget | null>(null);
@@ -231,38 +231,7 @@ export function WorktreeManager() {
   return (
     <SettingsSection id="storage-manage-worktrees" title="Manage worktrees">
       <div className="flex flex-col gap-4 p-4">
-        <p className="text-sm text-muted-foreground">
-          Create and remove additional worktrees for a project.
-        </p>
         <div className="flex flex-wrap items-center gap-2">
-          <Select
-            value={projectKey}
-            onValueChange={(value) => {
-              if (typeof value === "string") {
-                selectScope({ project: value });
-                setSelectedMemberKey(null);
-                setError(null);
-                setDeleting(null);
-              }
-            }}
-          >
-            <SelectTrigger size="sm" aria-label="Project">
-              <SelectValue>
-                {scope.kind === "project" || scope.kind === "checkout"
-                  ? scope.group.displayName
-                  : "Choose project"}
-              </SelectValue>
-            </SelectTrigger>
-            <SelectPopup>
-              <SelectGroup>
-                {groups.map((group) => (
-                  <SelectItem key={group.projectKey} value={group.projectKey}>
-                    {group.displayName}
-                  </SelectItem>
-                ))}
-              </SelectGroup>
-            </SelectPopup>
-          </Select>
           {connectedMembers.length > 1 && (
             <Select
               value={member?.physicalProjectKey ?? null}
@@ -322,7 +291,9 @@ export function WorktreeManager() {
           </p>
         )}
         {!projectKey ? (
-          <p className="text-sm text-muted-foreground">Choose a project to manage its worktrees.</p>
+          <p className="text-sm text-muted-foreground">
+            Choose a project above to manage its worktrees.
+          </p>
         ) : !member ? (
           <p className="text-sm text-muted-foreground">
             Connect an environment with this project to manage its worktrees.