Improve merged worktree cleanup feedback

- Use the active thread to choose the cleanup project
- Rename prune action for stale records
- Show an error toast when merged thread auto-delete fails

Author: BunsDev

apps/server/src/wsServer.ts

@@ -1385,7 +1385,7 @@ export const createServer = Effect.fn(function* (): Effect.fn.Return<
             args: ["worktree", "prune", "--expire", "now"],
             timeoutMs: 15_000,
           })
-          .pipe(Effect.provideService(RuntimeEnv, gitEnv));
+          .pipe(Effect.provideService(RuntimeEnv, gitEnv), Effect.asVoid);
       }
 
       case WS_METHODS.gitCreateBranch: {

apps/web/src/components/WorktreeCleanupDialog.tsx

@@ -4,6 +4,7 @@ import { GitMergeIcon, LoaderCircleIcon, Trash2Icon } from "lucide-react";
 import { useMemo } from "react";
 
 import { useStore } from "~/store";
+import { useHandleNewThread } from "~/hooks/useHandleNewThread";
 import {
   gitMergedWorktreeCleanupCandidatesQueryOptions,
   gitPruneWorktreesMutationOptions,
@@ -37,16 +38,16 @@ function resolveWorktreeUsageCount(
 export function WorktreeCleanupDialog() {
   const open = useWorktreeCleanupStore((state) => state.open);
   const closeDialog = useWorktreeCleanupStore((state) => state.closeDialog);
+  const { activeThread } = useHandleNewThread();
   const threads = useStore((state) => state.threads);
   const projects = useStore((state) => state.projects);
   const queryClient = useQueryClient();
   const activeProject = useMemo(() => {
-    const firstThread = threads[0];
-    if (firstThread) {
-      return projects.find((project) => project.id === firstThread.projectId) ?? projects[0] ?? null;
+    if (activeThread) {
+      return projects.find((project) => project.id === activeThread.projectId) ?? projects[0] ?? null;
     }
     return projects[0] ?? null;
-  }, [projects, threads]);
+  }, [activeThread, projects]);
   const cwd = activeProject?.cwd ?? null;
   const threadWorktreePaths = useMemo(
     () => threads.map((thread) => thread.worktreePath),
@@ -133,7 +134,7 @@ export function WorktreeCleanupDialog() {
                   const usageCount = resolveWorktreeUsageCount(candidate, threadWorktreePaths);
                   const displayPath = formatWorktreePathForDisplay(candidate.path);
                   const canDelete = usageCount === 0;
-                  const actionLabel = candidate.pathExists ? "Delete worktree" : "Prune record";
+                  const actionLabel = candidate.pathExists ? "Delete worktree" : "Prune stale records";
 
                   return (
                     <Card

apps/web/src/hooks/useAutoDeleteMergedThreads.ts

@@ -81,7 +81,6 @@ export function useAutoDeleteMergedThreads(settings: AppSettings) {
         const threadTitle = thread.title || `Thread ${thread.id.slice(0, 8)}`;
         const minutesLabel = delayMinutes === 1 ? "1 minute" : `${delayMinutes} minutes`;
         const threadProject = projects.find((project) => project.id === thread.projectId) ?? null;
-        const displayWorktreePath = formatWorktreePathForDisplay(orphanedWorktreePath);
 
         const toastId = toastManager.add({
           type: "info",
@@ -121,6 +120,13 @@ export function useAutoDeleteMergedThreads(settings: AppSettings) {
                 title: "Merged thread deleted",
                 description: `"${threadTitle}" was auto-deleted after its PR was merged.`,
               });
+            } catch (error) {
+              toastManager.add({
+                type: "error",
+                title: "Auto-delete failed",
+                description:
+                  error instanceof Error ? error.message : "Could not delete the merged thread.",
+              });
             } finally {
               timersRef.current.delete(thread.id);
               void queryClient.invalidateQueries({ queryKey: gitQueryKeys.all });