Fix desktop build and streamline thread UI (#334)

* Fix desktop build and runtime cleanup

- Harden screenshot image loading cleanup
- Simplify thread snapshot hydration and sidebar props
- Fix widget notification event typing and test rename

* Prune merged worktrees after thread cleanup (#335)

* Clean up merged worktrees after thread deletion

- Add merged worktree candidate detection and prune support
- Auto-remove orphaned worktrees after merged thread cleanup
- Surface cleanup state through the web client and WS contract

* Add merged worktree cleanup dialog

- Add a command-palette entry to review merged worktrees
- Let users delete on-disk worktrees or prune stale Git records
- Wire the dialog into the chat route and auto-delete flow

* 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

* Format worktree cleanup and prune call

- Reflow worktree cleanup dialog strings and layout
- Reformat Git worktree prune call for consistency

* Simplify merged worktree cleanup handling

- Ignore prune failures silently during worktree cleanup
- Add explicit git operation labels for merged-worktree cleanup calls

Author: BunsDev

apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.ts

@@ -81,6 +81,15 @@ const ProjectionLatestTurnDbRowSchema = Schema.Struct({
 });
 const ProjectionStateDbRowSchema = ProjectionState;
 
+function parseGithubRef(serialized: string | null): OrchestrationThread["githubRef"] | undefined {
+  if (!serialized) return undefined;
+  try {
+    return JSON.parse(serialized) as OrchestrationThread["githubRef"];
+  } catch {
+    return undefined;
+  }
+}
+
 const REQUIRED_SNAPSHOT_PROJECTORS = [
   ORCHESTRATION_PROJECTOR_NAMES.projects,
   ORCHESTRATION_PROJECTOR_NAMES.threads,
@@ -543,39 +552,30 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
             deletedAt: row.deletedAt,
           }));
 
-          const threads: Array<OrchestrationThread> = threadRows.map((row) => {
-            let githubRef: OrchestrationThread["githubRef"];
-            try {
-              if (row.githubRef) {
-                githubRef = JSON.parse(row.githubRef);
-              }
-            } catch {
-              // Ignore invalid JSON — treat as no ref
-            }
-            const thread = Object.assign(
-              {
-                id: row.threadId,
-                projectId: row.projectId,
-                title: row.title,
-                model: row.model,
-                runtimeMode: row.runtimeMode,
-                interactionMode: row.interactionMode,
-                branch: row.branch,
-                worktreePath: row.worktreePath,
-                latestTurn: latestTurnByThread.get(row.threadId) ?? null,
-                createdAt: row.createdAt,
-                updatedAt: row.updatedAt,
-                deletedAt: row.deletedAt,
-                messages: messagesByThread.get(row.threadId) ?? [],
-                proposedPlans: proposedPlansByThread.get(row.threadId) ?? [],
-                activities: activitiesByThread.get(row.threadId) ?? [],
-                checkpoints: checkpointsByThread.get(row.threadId) ?? [],
-                session: sessionsByThread.get(row.threadId) ?? null,
-              },
-              githubRef ? { githubRef } : {},
-            ) as OrchestrationThread;
-            return thread;
-          });
+          const threads: Array<OrchestrationThread> = [];
+          for (const row of threadRows) {
+            const githubRef = parseGithubRef(row.githubRef);
+            const thread: OrchestrationThread = {
+              id: row.threadId,
+              projectId: row.projectId,
+              title: row.title,
+              model: row.model,
+              runtimeMode: row.runtimeMode,
+              interactionMode: row.interactionMode,
+              branch: row.branch,
+              worktreePath: row.worktreePath,
+              latestTurn: latestTurnByThread.get(row.threadId) ?? null,
+              createdAt: row.createdAt,
+              updatedAt: row.updatedAt,
+              deletedAt: row.deletedAt,
+              messages: messagesByThread.get(row.threadId) ?? [],
+              proposedPlans: proposedPlansByThread.get(row.threadId) ?? [],
+              activities: activitiesByThread.get(row.threadId) ?? [],
+              checkpoints: checkpointsByThread.get(row.threadId) ?? [],
+              session: sessionsByThread.get(row.threadId) ?? null,
+            };
+            threads.push(githubRef ? { ...thread, githubRef } : thread);
+          }
 
           const snapshot = {
             snapshotSequence: computeSnapshotSequence(stateRows),

apps/web/src/components/ScreenshotTool.tsx

@@ -84,8 +84,20 @@ async function captureRegion(rect: {
 function loadImage(src: string): Promise<HTMLImageElement> {
   return new Promise((resolve, reject) => {
     const img = new Image();
-    img.addEventListener("load", () => resolve(img), { once: true });
-    img.addEventListener("error", reject, { once: true });
+    const cleanup = () => {
+      img.removeEventListener("load", onLoad);
+      img.removeEventListener("error", onError);
+    };
+    const onLoad = () => {
+      cleanup();
+      resolve(img);
+    };
+    const onError = () => {
+      cleanup();
+      reject(new Error("Failed to load image"));
+    };
+    img.addEventListener("load", onLoad);
+    img.addEventListener("error", onError);
     img.src = src;
   });
 }

apps/web/src/components/Sidebar.tsx

@@ -130,7 +130,6 @@ const SIDEBAR_THREAD_SORT_LABELS: Record<SidebarThreadSortOrder, string> = {
   updated_at: "Last user message",
   created_at: "Created at",
 };
-
 interface PrStatusIndicator {
   label: "PR open" | "PR closed" | "PR merged";
   colorClass: string;
@@ -287,7 +286,6 @@ interface MemoizedThreadRowProps {
   thread: Thread;
   isActive: boolean;
   isSelected: boolean;
-  routeThreadId: ThreadIdType | null;
   prByThreadId: Map<ThreadIdType, ThreadPr>;
   orderedProjectThreadIds: ThreadIdType[];
   selectedThreadIds: ReadonlySet<ThreadIdType>;
@@ -1339,7 +1337,6 @@ export default function Sidebar() {
                 thread={thread}
                 isActive={routeThreadId === thread.id}
                 isSelected={selectedThreadIds.has(thread.id)}
-                routeThreadId={routeThreadId}
                 prByThreadId={prByThreadId}
                 orderedProjectThreadIds={orderedProjectThreadIds}
                 selectedThreadIds={selectedThreadIds}

apps/web/src/components/widget/ChatWidgetShell.tsx

@@ -9,7 +9,6 @@ import ThreadSidebar from "../Sidebar";
 import { Sidebar, SidebarProvider, SidebarRail } from "../ui/sidebar";
 import { ChatWidgetBubble } from "./ChatWidgetBubble";
 import { ChatWidgetPanel } from "./ChatWidgetPanel";
-
 const THREAD_SIDEBAR_WIDTH_STORAGE_KEY = "chat_thread_sidebar_width";
 const THREAD_SIDEBAR_MIN_WIDTH = 13 * 16;
 const THREAD_MAIN_CONTENT_MIN_WIDTH = 40 * 16;
@@ -39,7 +38,7 @@ export function ChatWidgetShell() {
   useEffect(() => {
     const expand = useChatWidgetStore.getState().expand;
 
-    const onNotificationTap = (() => {
+    const onNotificationTap = ((_event: CustomEvent<{ threadId?: string }>) => {
       expand();
       // Navigation to the thread is handled by the notification system.
     }) as EventListener;