feat(web): preview worktree storage before saving cleanup rules

apps/server/integration/OrchestrationEngineHarness.integration.ts

@@ -384,7 +384,7 @@ export const makeOrchestrationIntegrationHarness = (
     );
     const orchestrationReactorLayer = OrchestrationReactorLive.pipe(
       Layer.provideMerge(
-        Layer.succeed(StorageCleanup.StorageCleanup, {
+        Layer.mock(StorageCleanup.StorageCleanup)({
           start: () => Effect.void,
           drain: Effect.void,
         }),

apps/server/src/auth/RpcAuthorization.ts

@@ -54,6 +54,8 @@ export const RPC_REQUIRED_SCOPES = {
   [WS_METHODS.serverCommitDesktopUpdate]: AuthOrchestrationOperateScope,
   [WS_METHODS.serverUpsertKeybinding]: AuthOrchestrationOperateScope,
   [WS_METHODS.serverRemoveKeybinding]: AuthOrchestrationOperateScope,
+  [WS_METHODS.serverPreviewStorageCleanup]: AuthOrchestrationReadScope,
+  [WS_METHODS.subscribeStorageCleanup]: AuthOrchestrationReadScope,
   [WS_METHODS.serverGetSettings]: AuthOrchestrationReadScope,
   [WS_METHODS.serverUpdateSettings]: AuthOrchestrationOperateScope,
   [WS_METHODS.serverDiscoverSourceControl]: AuthOrchestrationReadScope,

apps/server/src/environment/ServerEnvironment.ts

@@ -225,6 +225,7 @@ export const make = Effect.gen(function* () {
       threadSettlement: true,
       threadAutoSettlement: true,
       storageCleanup: true,
+      storageCleanupPreview: true,
       projectWorktreeCleanup: true,
       threadRestartContinuation: true,
       projectSettingsOverrides: true,

apps/server/src/git/GitManager.test.ts

@@ -60,6 +60,7 @@ interface FakeGhScenario {
   createdPrUrl?: string;
   defaultBranch?: string;
   pullRequest?: {
+    headSha?: string;
     number: number;
     title: string;
     url: string;
@@ -1127,6 +1128,39 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
     }),
   );
 
+  it.effect("reads an identified merged PR head afresh without checking out its branch", () =>
+    Effect.gen(function* () {
+      const repoDir = yield* makeTempDir("t3code-git-manager-");
+      yield* initRepo(repoDir);
+      const reference = "https://github.com/pingdotgg/t3code/pull/216";
+      const { manager } = yield* makeManager({
+        ghScenario: {
+          pullRequest: {
+            number: 216,
+            title: "Squash merged",
+            url: reference,
+            baseRefName: "release",
+            headRefName: "feature",
+            headSha: "a".repeat(40),
+            state: "merged",
+          },
+        },
+      });
+      const pr = yield* manager.branchPullRequest(
+        { cwd: repoDir, branch: "feature", reference },
+        { refresh: true },
+      );
+      expect(pr).toMatchObject({
+        state: "merged",
+        headSha: "a".repeat(40),
+        baseRef: "release",
+        headRef: "feature",
+        repositoryKey: "github.com/pingdotgg/t3code",
+      });
+      expect((yield* runGit(repoDir, ["branch", "--show-current"])).stdout.trim()).toBe("main");
+    }),
+  );
+
   it.effect("branch PR lookup uses a saved tracked branch without changing checkout", () =>
     Effect.gen(function* () {
       const repoDir = yield* makeTempDir("t3code-git-manager-");

apps/server/src/git/GitManager.ts

@@ -87,6 +87,7 @@ export interface GitRemoteStatusOptions extends GitVcsDriver.GitRemoteStatusOpti
 }
 
 export type GitBranchPullRequest = NonNullable<VcsStatusResult["pr"]> & {
+  readonly headSha?: string;
   readonly repositoryKey: string | null;
   readonly updatedAt: string | null;
   readonly closedAt?: string | null;
@@ -113,7 +114,7 @@ export class GitManager extends Context.Service<
     ) => Effect.Effect<VcsStatusRemoteResult | null, GitManagerServiceError>;
     /** Resolve the PR for a saved branch without changing the current checkout. */
     readonly branchPullRequest: (
-      input: { readonly cwd: string; readonly branch: string },
+      input: { readonly cwd: string; readonly branch: string; readonly reference?: string },
       options?: { readonly refresh?: boolean },
     ) => Effect.Effect<GitBranchPullRequest | null, GitManagerServiceError>;
     readonly invalidateLocalStatus: (cwd: string) => Effect.Effect<void, never>;
@@ -188,6 +189,7 @@ interface OpenPrInfo {
 }
 
 interface PullRequestInfo extends OpenPrInfo, PullRequestHeadRemoteInfo {
+  headSha?: string | undefined;
   state: "open" | "closed" | "merged";
   isDraft?: boolean;
   closedAt?: string | null;
@@ -452,6 +454,7 @@ function toPullRequestInfo(summary: ChangeRequest): PullRequestInfo {
     url: summary.url,
     baseRefName: summary.baseRefName,
     headRefName: summary.headRefName,
+    ...(summary.headSha ? { headSha: summary.headSha } : {}),
     state: summary.state ?? "open",
     ...(summary.isDraft === true ? { isDraft: true } : {}),
     closedAt: summary.closedAt ?? null,
@@ -2142,7 +2145,20 @@ export const make = Effect.gen(function* () {
   });
   const branchPullRequest: GitManager["Service"]["branchPullRequest"] = Effect.fn(
     "branchPullRequest",
-  )(function* ({ cwd, branch }, options) {
+  )(function* ({ cwd, branch, reference }, options) {
+    if (reference !== undefined) {
+      // Cleanup reads an identified PR afresh, rather than selecting a reused branch's PR.
+      const latest = toPullRequestInfo(
+        yield* (yield* sourceControlProvider(cwd)).getChangeRequest({ cwd, reference }),
+      );
+      return {
+        ...toStatusPr(latest),
+        ...(latest.headSha ? { headSha: latest.headSha } : {}),
+        closedAt: latest.closedAt ?? null,
+        mergedAt: latest.mergedAt ?? null,
+        repositoryKey: pullRequestRepositoryKey(latest.url),
+      };
+    }
     const cacheCwd = yield* normalizeStatusCacheKey(cwd);
     const remotes = yield* gitCore.execute({
       operation: "GitManager.branchPullRequest.remotes",
@@ -2286,6 +2302,7 @@ export const make = Effect.gen(function* () {
     }
     return {
       ...toStatusPr(latest),
+      ...(latest.headSha ? { headSha: latest.headSha } : {}),
       closedAt: latest.closedAt ?? null,
       mergedAt: latest.mergedAt ?? null,
       // Hosting CLIs can select an upstream repository instead of origin.

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

@@ -33,7 +33,7 @@ describe("OrchestrationReactor", () => {
     runtime = ManagedRuntime.make(
       Layer.effect(OrchestrationReactor, makeOrchestrationReactor).pipe(
         Layer.provideMerge(
-          Layer.succeed(StorageCleanup, {
+          Layer.mock(StorageCleanup)({
             start: () => {
               started.push("storage-cleanup");
               return Effect.void;

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

@@ -3547,12 +3547,13 @@ it.effect(
         ('t-deleted', 'github.com', 'acme/web', 6, 'https://github.com/acme/web/pull/6', 'manual', '2026-09-02T00:00:00Z', NULL)`;
       const expected = (yield* query.getShellSnapshot()).threads
         .filter((thread) => thread.pullRequests.length > 0)
-        .map(({ id, projectId, settledOverride, settledAt, pullRequests }) => ({
+        .map(({ id, projectId, settledOverride, settledAt, pullRequests, branchPullRequest }) => ({
           id,
           projectId,
           settledOverride,
           settledAt,
           pullRequests,
+          branchPullRequest,
         }));
       resolved.length = 0;
 
@@ -3571,6 +3572,26 @@ it.effect(
       assert.deepStrictEqual(threads, expected);
       assert.strictEqual(counter.count(), 1);
       assert.deepStrictEqual(resolved, []);
+
+      const legacy = {
+        projectId: "p1",
+        repository: "acme/web",
+        number: 7,
+        url: "https://github.com/acme/web/pull/7",
+      };
+      yield* sql`UPDATE projection_threads SET branch_pull_request_json = '{"projectId":"p1","repository":"acme/web","number":7,"url":"https://github.com/acme/web/pull/7"}' 
+        WHERE thread_id IN ('t-plain', 't-deleted')`;
+      yield* sql`UPDATE projection_threads SET worktree_path = '/worktrees/archived'
+        WHERE thread_id = 't-archived'`;
+      const eligible = yield* query.listThreadsWithPullRequests();
+      assert.deepStrictEqual(
+        eligible.map((thread) => thread.id),
+        ["t-archived", "t-first", "t-plain", "t-late", "t-early"],
+      );
+      const legacyThread = eligible.find((thread) => thread.id === "t-plain");
+      assert.deepStrictEqual(legacyThread?.branchPullRequest, legacy);
+      assert.deepStrictEqual(legacyThread?.pullRequests, []);
+      assert.deepStrictEqual(resolved, []);
     }).pipe(Effect.provide(layer));
   },
 );

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

@@ -811,23 +811,29 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
       `,
   });
 
-  // One row per link, in the shell snapshot's thread order and link order.
-  const listActiveThreadPullRequestSyncRows = SqlSchema.findAll({
+  const pullRequestSyncThreadFields = {
+    threadId: ProjectionThread.fields.threadId,
+    projectId: ProjectionThread.fields.projectId,
+    settledOverride: ProjectionThread.fields.settledOverride,
+    settledAt: ProjectionThread.fields.settledAt,
+    branchPullRequest: ProjectionThreadDbRowSchema.fields.branchPullRequest,
+  };
+
+  // A left join retains legacy-only links without loading full shell snapshots.
+  const listThreadPullRequestSyncRows = SqlSchema.findAll({
     Request: Schema.Void,
-    Result: ProjectionThreadPullRequestDbRowSchema.mapFields(
-      Struct.assign({
-        projectId: ProjectionThread.fields.projectId,
-        settledOverride: ProjectionThread.fields.settledOverride,
-        settledAt: ProjectionThread.fields.settledAt,
-      }),
-    ),
+    Result: Schema.Union([
+      ProjectionThreadPullRequestDbRowSchema.mapFields(Struct.assign(pullRequestSyncThreadFields)),
+      Schema.Struct({ ...pullRequestSyncThreadFields, host: Schema.Null }),
+    ]),
     execute: () =>
       sql`
         SELECT
-          links.thread_id AS "threadId",
+          threads.thread_id AS "threadId",
           threads.project_id AS "projectId",
           threads.settled_override AS "settledOverride",
           threads.settled_at AS "settledAt",
+          threads.branch_pull_request_json AS "branchPullRequest",
           links.host,
           links.repository,
           links.number,
@@ -836,11 +842,12 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
           links.linked_at AS "linkedAt",
           links.snapshot_json AS "snapshot",
           links.stack_json AS "stack"
-        FROM projection_thread_pull_requests links
-        INNER JOIN projection_threads threads
+        FROM projection_threads threads
+        LEFT JOIN projection_thread_pull_requests links
           ON threads.thread_id = links.thread_id
         WHERE threads.deleted_at IS NULL
-          AND threads.archived_at IS NULL
+          AND (threads.archived_at IS NULL OR threads.worktree_path IS NOT NULL)
+          AND (links.thread_id IS NOT NULL OR threads.branch_pull_request_json IS NOT NULL)
         ORDER BY threads.project_id ASC, threads.created_at ASC, threads.thread_id ASC,
           links.linked_at ASC, links.number ASC
       `,
@@ -2828,7 +2835,7 @@ pending_approval_requests AS (
 
   const listThreadsWithPullRequests: ProjectionSnapshotQueryShape["listThreadsWithPullRequests"] =
     () =>
-      listActiveThreadPullRequestSyncRows(undefined).pipe(
+      listThreadPullRequestSyncRows(undefined).pipe(
         Effect.map((rows) => {
           const threads = new Map<
             ThreadId,
@@ -2840,9 +2847,10 @@ pending_approval_requests AS (
               projectId: row.projectId,
               settledOverride: row.settledOverride,
               settledAt: row.settledAt,
+              branchPullRequest: row.branchPullRequest,
               pullRequests: [],
             };
-            thread.pullRequests.push(mapPullRequestRow(row));
+            if (row.host !== null) thread.pullRequests.push(mapPullRequestRow(row));
             threads.set(row.threadId, thread);
           }
           return [...threads.values()];