feat(lastcode): make worktree cleanup durable

apps/mobile/src/features/threads/thread-list-items.tsx

@@ -459,6 +459,7 @@ export const ThreadListRow = memo(function ThreadListRow(props: {
 
   const { thread, onSelectThread, onArchiveThread, onDeleteThread, onRegenerateThreadTitle } =
     props;
+  const cleanupPending = thread.worktreeCleanup != null;
   const runningAction = thread.actionResume?.outcome === "running" ? thread.actionResume : null;
   const closeTerminal = useAtomCommand(terminalEnvironment.close, { reportFailure: false });
   const status = resolveThreadStatus(thread);
@@ -598,7 +599,9 @@ export const ThreadListRow = memo(function ThreadListRow(props: {
         accessibilityHint="Swipe left for archive and delete actions"
         accessibilityLabel={threadAccessibilityLabel}
         accessibilityRole="button"
+        accessibilityState={{ disabled: cleanupPending }}
         className="bg-screen"
+        disabled={cleanupPending}
         onPress={() => {
           close();
           onSelectThread(thread);
@@ -651,7 +654,8 @@ export const ThreadListRow = memo(function ThreadListRow(props: {
         accessibilityHint="Opens the thread"
         accessibilityLabel={threadAccessibilityLabel}
         accessibilityRole="button"
-        accessibilityState={{ selected }}
+        accessibilityState={{ disabled: cleanupPending, selected }}
+        disabled={cleanupPending}
         onHoverIn={() => setHovered(true)}
         onHoverOut={() => setHovered(false)}
         onPress={() => {
@@ -711,6 +715,7 @@ export const ThreadListRow = memo(function ThreadListRow(props: {
   return (
     <ThreadSwipeable
       backgroundColor={backgroundColor}
+      enabled={!cleanupPending}
       containerStyle={
         compact ? undefined : { borderRadius: SIDEBAR_ROW_RADIUS, overflow: "hidden" }
       }
@@ -734,9 +739,9 @@ export const ThreadListRow = memo(function ThreadListRow(props: {
         // ControlPillMenu injects onLongPress into the row and anchors the
         // token-styled dropdown to it; taps and swipes are untouched.
         <ControlPillMenu
-          actions={menuActions}
+          actions={cleanupPending ? [] : menuActions}
           onPressAction={handleMenuAction}
-          shouldOpenOnLongPress
+          shouldOpenOnLongPress={!cleanupPending}
         >
           {rowContent(close)}
         </ControlPillMenu>

apps/mobile/src/features/threads/thread-list-v2-items.tsx

@@ -406,6 +406,7 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
   const snoozedRow = props.snoozed === true;
   const pinnedRow = props.pinned === true;
   const runningAction = thread.actionResume?.outcome === "running" ? thread.actionResume : null;
+  const cleanupPending = thread.worktreeCleanup != null;
   const closeTerminal = useAtomCommand(terminalEnvironment.close, { reportFailure: false });
 
   const pr = useThreadPr(thread, props.projectCwd ?? props.project?.workspaceRoot ?? null);
@@ -848,7 +849,8 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
         accessibilityHint={swipeAccessibilityHint}
         accessibilityLabel={thread.title}
         accessibilityRole="button"
-        accessibilityState={{ selected }}
+        accessibilityState={{ disabled: cleanupPending, selected }}
+        disabled={cleanupPending}
         onPress={() => {
           close();
           onSelectThread(thread);
@@ -888,7 +890,8 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
         accessibilityHint={swipeAccessibilityHint}
         accessibilityLabel={thread.title}
         accessibilityRole="button"
-        accessibilityState={{ selected }}
+        accessibilityState={{ disabled: cleanupPending, selected }}
+        disabled={cleanupPending}
         className={sidebarPane ? undefined : "bg-screen"}
         onPress={() => {
           close();
@@ -971,6 +974,7 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
           sidebarPane ? { borderRadius: SIDEBAR_V2_ROW_RADIUS, overflow: "hidden" } : undefined
         }
         enableTrackpadSwipe
+        enabled={!cleanupPending}
         // Full swipe commits the advertised lifecycle action (Settle /
         // Un-settle), never the secondary snooze action.
         fullSwipeAction="primary"
@@ -987,18 +991,20 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
         {(close) => (
           <ControlPillMenu
             actions={
-              snoozedRow
-                ? snoozedMenuActions
-                : !props.settlementSupported
-                  ? legacyMenuActions
-                  : canUnsettle
-                    ? slimMenuActions
-                    : swipeActions.secondary === "snooze"
-                      ? snoozableCardMenuActions
-                      : cardMenuActions
+              cleanupPending
+                ? []
+                : snoozedRow
+                  ? snoozedMenuActions
+                  : !props.settlementSupported
+                    ? legacyMenuActions
+                    : canUnsettle
+                      ? slimMenuActions
+                      : swipeActions.secondary === "snooze"
+                        ? snoozableCardMenuActions
+                        : cardMenuActions
             }
             onPressAction={handleMenuAction}
-            shouldOpenOnLongPress
+            shouldOpenOnLongPress={!cleanupPending}
           >
             {rowContent(close)}
           </ControlPillMenu>

apps/mobile/src/features/threads/threadListV2.test.ts

@@ -127,6 +127,37 @@ describe("resolveThreadListV2Enabled", () => {
 });
 
 describe("resolveThreadListV2Status", () => {
+  it("shows durable cleanup before agent status", () => {
+    const deleting = makeThread({
+      id: ThreadId.make("cleanup"),
+      title: "Cleanup",
+      worktreeCleanup: {
+        status: "deleting",
+        repositoryRoot: "/repo",
+        worktreePath: "/repo-worktrees/cleanup",
+        startedAt: NOW,
+      },
+    });
+    expect(resolveThreadStatus(deleting)).toMatchObject({
+      kind: "cleanup-deleting",
+      label: "Deleting",
+      pulse: false,
+    });
+    expect(
+      resolveThreadStatus({
+        ...deleting,
+        worktreeCleanup: {
+          status: "failed",
+          repositoryRoot: "/repo",
+          worktreePath: "/repo-worktrees/cleanup",
+          startedAt: NOW,
+          failedAt: NOW,
+          error: "permission denied",
+        },
+      }),
+    ).toMatchObject({ kind: "cleanup-failed", label: "Cleanup failed" });
+  });
+
   it("prioritizes approval over a running session", () => {
     const thread = makeThread({
       id: ThreadId.make("t"),

apps/mobile/src/features/threads/threadPresentation.ts

@@ -14,6 +14,9 @@ export type ThreadStatusKind =
   | "waiting"
   | "connecting"
   | "error"
+  | "cleanup-deleting"
+  | "cleanup-queued"
+  | "cleanup-failed"
   | "plan-ready";
 
 export interface ThreadStatusPresentation extends StatusTone {
@@ -50,6 +53,42 @@ function isLatestTurnSettled(
 export function resolveThreadStatus(
   thread: EnvironmentThreadShell,
 ): ThreadStatusPresentation | null {
+  if (thread.worktreeCleanup?.status === "failed") {
+    return {
+      kind: "cleanup-failed",
+      label: "Cleanup failed",
+      pillClassName: "bg-rose-500/12 dark:bg-rose-500/16",
+      textClassName: "text-rose-700 dark:text-rose-300",
+      iconColor: "#ff453a",
+      iconBackground: "rgba(255,69,58,0.22)",
+      pulse: false,
+    };
+  }
+
+  if (thread.worktreeCleanup?.status === "queued") {
+    return {
+      kind: "cleanup-queued",
+      label: "Deleting (Queued)",
+      pillClassName: "bg-orange-500/12 dark:bg-orange-500/16",
+      textClassName: "text-orange-700 dark:text-orange-300",
+      iconColor: "#ff9f0a",
+      iconBackground: "rgba(255,159,10,0.22)",
+      pulse: false,
+    };
+  }
+
+  if (thread.worktreeCleanup?.status === "deleting") {
+    return {
+      kind: "cleanup-deleting",
+      label: "Deleting",
+      pillClassName: "bg-orange-500/12 dark:bg-orange-500/16",
+      textClassName: "text-orange-700 dark:text-orange-300",
+      iconColor: "#ff9f0a",
+      iconBackground: "rgba(255,159,10,0.22)",
+      pulse: false,
+    };
+  }
+
   if (thread.hasPendingApprovals) {
     return {
       kind: "pending-approval",

apps/server/src/environment/ServerEnvironment.test.ts

@@ -93,6 +93,7 @@ it.layer(NodeServices.layer)("ServerEnvironmentLive", (it) => {
       expect(second.capabilities.pullRequests).toBe(true);
       expect(second.capabilities.threadTitleRegeneration).toBe(true);
       expect(second.capabilities.threadAnnotations).toBe(true);
+      expect(second.capabilities.threadWorktreeCleanup).toBe(true);
       expect(second.capabilities.agentActivityPublishing).toBe(false);
     }),
   );

apps/server/src/environment/ServerEnvironment.ts

@@ -153,6 +153,7 @@ export const make = Effect.gen(function* () {
       threadPinReorder: true,
       threadTitleRegeneration: true,
       threadAnnotations: true,
+      threadWorktreeCleanup: true,
       ...(serverSelfUpdate === null ? {} : { serverSelfUpdate }),
       ...(serverSelfUpdate === "boot-service" ? { serverSelfUpdateProgress: true } : {}),
     },

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

@@ -635,6 +635,7 @@ const makeOrchestrationProjectionPipeline = Effect.fn("makeOrchestrationProjecti
             titleRegenerationRequestId: null,
             titleRegenerationStartedAt: null,
             annotation: null,
+            worktreeCleanup: null,
             latestUserMessageId: null,
             latestUserMessageAt: null,
             pendingApprovalCount: 0,
@@ -874,11 +875,27 @@ const makeOrchestrationProjectionPipeline = Effect.fn("makeOrchestrationProjecti
           yield* projectionThreadRepository.upsert({
             ...existingRow.value,
             deletedAt: event.payload.deletedAt,
+            worktreeCleanup: event.payload.worktreeCleanup ?? null,
             updatedAt: event.payload.deletedAt,
           });
           return;
         }
 
+        case "thread.worktree-cleanup-updated": {
+          const existingRow = yield* projectionThreadRepository.getById({
+            threadId: event.payload.threadId,
+          });
+          if (Option.isNone(existingRow)) {
+            return;
+          }
+          yield* projectionThreadRepository.upsert({
+            ...existingRow.value,
+            worktreeCleanup: event.payload.cleanup,
+            updatedAt: event.payload.updatedAt,
+          });
+          return;
+        }
+
         case "thread.message-sent":
         case "thread.proposed-plan-upserted":
         case "thread.activity-appended":

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

@@ -1630,6 +1630,32 @@ projectionSnapshotLayer("ProjectionSnapshotQuery", (it) => {
       const shellSnapshot = yield* snapshotQuery.getShellSnapshot();
       assert.equal(shellSnapshot.projects.length, 0);
       assert.equal(shellSnapshot.threads.length, 0);
+
+      yield* sql`
+        UPDATE projection_projects
+        SET deleted_at = NULL
+        WHERE project_id = 'project-deleted'
+      `;
+      yield* sql`
+        UPDATE projection_threads
+        SET
+          worktree_path = '/tmp/deleted-project-worktrees/thread-deleted',
+          worktree_cleanup_json = '{"status":"deleting","repositoryRoot":"/tmp/deleted-project","worktreePath":"/tmp/deleted-project-worktrees/thread-deleted","startedAt":"2026-04-05T00:00:05.000Z"}'
+        WHERE thread_id = 'thread-deleted'
+      `;
+
+      const cleanupShellSnapshot = yield* snapshotQuery.getShellSnapshot();
+      assert.equal(cleanupShellSnapshot.projects.length, 1);
+      assert.deepStrictEqual(cleanupShellSnapshot.threads[0]?.worktreeCleanup, {
+        status: "deleting",
+        repositoryRoot: "/tmp/deleted-project",
+        worktreePath: "/tmp/deleted-project-worktrees/thread-deleted",
+        startedAt: "2026-04-05T00:00:05.000Z",
+      });
+      const cleanupDetail = yield* snapshotQuery.getThreadDetailById(
+        ThreadId.make("thread-deleted"),
+      );
+      assert.equal(cleanupDetail._tag, "None");
     }),
   );
 
@@ -2444,25 +2470,29 @@ projectionSnapshotLayer("ProjectionSnapshotQuery windowed thread detail", (it) =
       const detailWithPinnedRequests = yield* snapshotQuery.getThreadDetailById(threadW);
       assert.equal(detailWithPinnedRequests._tag, "Some");
       if (detailWithPinnedRequests._tag === "Some") {
-        const ids = detailWithPinnedRequests.value.activities.map((activity) => activity.id);
+        const ids = new Set(
+          detailWithPinnedRequests.value.activities.map((activity) => activity.id),
+        );
         assert.equal(detailWithPinnedRequests.value.activities.length, 503);
-        assert.equal(ids.includes(asEventId("approval-old")), true);
-        assert.equal(ids.includes(asEventId("user-input-old")), true);
-        assert.equal(ids.includes(asEventId("user-input-closed")), false);
-        assert.equal(ids.includes(asEventId("user-input-tied-z-request")), true);
+        assert.equal(ids.has(asEventId("approval-old")), true);
+        assert.equal(ids.has(asEventId("user-input-old")), true);
+        assert.equal(ids.has(asEventId("user-input-closed")), false);
+        assert.equal(ids.has(asEventId("user-input-tied-z-request")), true);
       }
 
       const windowWithPinnedRequests = yield* snapshotQuery.getThreadDetailSnapshot(threadW, {
         turnLimit: 2,
       });
       assert.equal(windowWithPinnedRequests._tag, "Some");
       if (windowWithPinnedRequests._tag === "Some") {
-        const ids = windowWithPinnedRequests.value.thread.activities.map((activity) => activity.id);
+        const ids = new Set(
+          windowWithPinnedRequests.value.thread.activities.map((activity) => activity.id),
+        );
         assert.equal(windowWithPinnedRequests.value.thread.activities.length, 503);
-        assert.equal(ids.includes(asEventId("approval-old")), true);
-        assert.equal(ids.includes(asEventId("user-input-old")), true);
-        assert.equal(ids.includes(asEventId("user-input-closed")), false);
-        assert.equal(ids.includes(asEventId("user-input-tied-z-request")), true);
+        assert.equal(ids.has(asEventId("approval-old")), true);
+        assert.equal(ids.has(asEventId("user-input-old")), true);
+        assert.equal(ids.has(asEventId("user-input-closed")), false);
+        assert.equal(ids.has(asEventId("user-input-tied-z-request")), true);
       }
     }),
   );