Skip to content

Commit 6530de0

Browse files
t3dotggclaude
andauthored
perf(server): pull request sync reads only threads with linked pull requests (#13704)
Co-authored-by: Claude Opus 5.5 (1M context) <[email protected]>
1 parent 75bf92e commit 6530de0

12 files changed

Lines changed: 187 additions & 10 deletions

‎apps/server/src/checkpointing/CheckpointDiffQuery.test.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ describe("CheckpointDiffQuery.layer", () => {
8484
getShellSnapshot: () =>
8585
Effect.die("CheckpointDiffQuery should not request the orchestration shell snapshot"),
8686
getDeletedWorktreeThreads: () => Effect.die("unused"),
87+
listThreadsWithPullRequests: () => Effect.die("unused"),
8788
getArchivedShellSnapshot: () =>
8889
Effect.die("CheckpointDiffQuery should not request archived shell snapshots"),
8990
getSnapshotSequence: () => Effect.succeed({ snapshotSequence: 0 }),
@@ -201,6 +202,7 @@ describe("CheckpointDiffQuery.layer", () => {
201202
getShellSnapshot: () =>
202203
Effect.die("CheckpointDiffQuery should not request the orchestration shell snapshot"),
203204
getDeletedWorktreeThreads: () => Effect.die("unused"),
205+
listThreadsWithPullRequests: () => Effect.die("unused"),
204206
getArchivedShellSnapshot: () =>
205207
Effect.die("CheckpointDiffQuery should not request archived shell snapshots"),
206208
getSnapshotSequence: () => Effect.succeed({ snapshotSequence: 0 }),
@@ -293,6 +295,7 @@ describe("CheckpointDiffQuery.layer", () => {
293295
getShellSnapshot: () =>
294296
Effect.die("CheckpointDiffQuery should not request the orchestration shell snapshot"),
295297
getDeletedWorktreeThreads: () => Effect.die("unused"),
298+
listThreadsWithPullRequests: () => Effect.die("unused"),
296299
getArchivedShellSnapshot: () =>
297300
Effect.die("CheckpointDiffQuery should not request archived shell snapshots"),
298301
getSnapshotSequence: () => Effect.succeed({ snapshotSequence: 0 }),
@@ -370,6 +373,7 @@ describe("CheckpointDiffQuery.layer", () => {
370373
getShellSnapshot: () =>
371374
Effect.die("CheckpointDiffQuery should not request the orchestration shell snapshot"),
372375
getDeletedWorktreeThreads: () => Effect.die("unused"),
376+
listThreadsWithPullRequests: () => Effect.die("unused"),
373377
getArchivedShellSnapshot: () =>
374378
Effect.die("CheckpointDiffQuery should not request archived shell snapshots"),
375379
getSnapshotSequence: () => Effect.succeed({ snapshotSequence: 0 }),
@@ -432,6 +436,7 @@ describe("CheckpointDiffQuery.layer", () => {
432436
getShellSnapshot: () =>
433437
Effect.die("CheckpointDiffQuery should not request the orchestration shell snapshot"),
434438
getDeletedWorktreeThreads: () => Effect.die("unused"),
439+
listThreadsWithPullRequests: () => Effect.die("unused"),
435440
getArchivedShellSnapshot: () =>
436441
Effect.die("CheckpointDiffQuery should not request archived shell snapshots"),
437442
getSnapshotSequence: () => Effect.succeed({ snapshotSequence: 0 }),

‎apps/server/src/orchestration/Layers/OrchestrationEngine.test.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -435,6 +435,7 @@ describe("OrchestrationEngine", () => {
435435
updatedAt: projectionSnapshot.updatedAt,
436436
}),
437437
getDeletedWorktreeThreads: () => Effect.die("unused"),
438+
listThreadsWithPullRequests: () => Effect.die("unused"),
438439
getArchivedShellSnapshot: () =>
439440
Effect.succeed({
440441
snapshotSequence: projectionSnapshot.snapshotSequence,

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

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3503,6 +3503,77 @@ it.effect("omits foreign-host PRs from legacy snapshots while preserving native
35033503
}).pipe(Effect.provide(layer));
35043504
});
35053505

3506+
it.effect(
3507+
"lists linked threads like the shell snapshot, in one query and without identities",
3508+
() => {
3509+
const resolved: string[] = [];
3510+
const layer = OrchestrationProjectionSnapshotQueryLive.pipe(
3511+
Layer.provide(ThreadBackgroundLiveness.layer),
3512+
Layer.provide(ThreadPlanProgress.layer),
3513+
Layer.provide(
3514+
Layer.succeed(RepositoryIdentityResolver.RepositoryIdentityResolver, {
3515+
resolve: (root) =>
3516+
Effect.sync(() => {
3517+
resolved.push(root);
3518+
return null;
3519+
}),
3520+
}),
3521+
),
3522+
Layer.provideMerge(SqlitePersistenceMemory),
3523+
);
3524+
return Effect.gen(function* () {
3525+
const sql = yield* SqlClient.SqlClient;
3526+
const query = yield* ProjectionSnapshotQuery;
3527+
yield* sql`INSERT INTO projection_projects (project_id, title, workspace_root, scripts_json, created_at, updated_at)
3528+
VALUES ('p1', 'One', '/one', '[]', '2026-09-01T00:00:00Z', '2026-09-01T00:00:00Z'),
3529+
('p2', 'Two', '/two', '[]', '2026-09-01T00:00:00Z', '2026-09-01T00:00:00Z')`;
3530+
yield* sql`INSERT INTO projection_threads (thread_id, project_id, title, model_selection_json, runtime_mode, interaction_mode, created_at, updated_at, archived_at, deleted_at, settled_override, settled_at)
3531+
VALUES
3532+
('t-late', 'p1', 'Late', '{"provider":"codex","model":"gpt-5"}', 'full-access', 'default', '2026-09-03T00:00:00Z', '2026-09-03T00:00:00Z', NULL, NULL, 'settled', '2026-09-04T00:00:00Z'),
3533+
('t-early', 'p2', 'Early', '{"provider":"codex","model":"gpt-5"}', 'full-access', 'default', '2026-09-01T00:00:00Z', '2026-09-01T00:00:00Z', NULL, NULL, NULL, NULL),
3534+
('t-first', 'p1', 'First', '{"provider":"codex","model":"gpt-5"}', 'full-access', 'default', '2026-09-02T00:00:00Z', '2026-09-02T00:00:00Z', NULL, NULL, NULL, NULL),
3535+
('t-plain', 'p1', 'Plain', '{"provider":"codex","model":"gpt-5"}', 'full-access', 'default', '2026-09-02T00:00:00Z', '2026-09-02T00:00:00Z', NULL, NULL, NULL, NULL),
3536+
('t-archived', 'p1', 'Archived', '{"provider":"codex","model":"gpt-5"}', 'full-access', 'default', '2026-09-02T00:00:00Z', '2026-09-02T00:00:00Z', '2026-09-05T00:00:00Z', NULL, NULL, NULL),
3537+
('t-deleted', 'p1', 'Deleted', '{"provider":"codex","model":"gpt-5"}', 'full-access', 'default', '2026-09-02T00:00:00Z', '2026-09-02T00:00:00Z', NULL, '2026-09-05T00:00:00Z', NULL, NULL)`;
3538+
yield* sql`INSERT INTO projection_thread_pull_requests (thread_id, host, repository, number, url, source, linked_at, snapshot_json)
3539+
VALUES
3540+
('t-late', 'github.com', 'acme/web', 3, 'https://github.com/acme/web/pull/3', 'manual', '2026-09-03T00:00:00Z', NULL),
3541+
('t-early', 'github.com', 'acme/api', 4, 'https://github.com/acme/api/pull/4', 'agent', '2026-09-01T00:00:00Z', NULL),
3542+
('t-first', 'github.com', 'acme/web', 2, 'https://github.com/acme/web/pull/2', 'stack-dismissed', '2026-09-02T00:00:00Z', NULL),
3543+
('t-first', 'github.com', 'acme/web', 1, 'https://github.com/acme/web/pull/1', 'created', '2026-09-02T00:00:00Z',
3544+
'{"state":"open","title":"One","headBranch":"one","baseBranch":"main","isDraft":false,"updatedAt":null,"syncedAt":"2026-09-02T00:00:00Z"}'),
3545+
('t-archived', 'github.com', 'acme/web', 5, 'https://github.com/acme/web/pull/5', 'manual', '2026-09-02T00:00:00Z', NULL),
3546+
('t-deleted', 'github.com', 'acme/web', 6, 'https://github.com/acme/web/pull/6', 'manual', '2026-09-02T00:00:00Z', NULL)`;
3547+
const expected = (yield* query.getShellSnapshot()).threads
3548+
.filter((thread) => thread.pullRequests.length > 0)
3549+
.map(({ id, projectId, settledOverride, settledAt, pullRequests }) => ({
3550+
id,
3551+
projectId,
3552+
settledOverride,
3553+
settledAt,
3554+
pullRequests,
3555+
}));
3556+
resolved.length = 0;
3557+
3558+
const counter = makeSqlStatementCounter();
3559+
const threads = yield* query
3560+
.listThreadsWithPullRequests()
3561+
.pipe(Effect.withTracer(counter.tracer));
3562+
assert.deepStrictEqual(
3563+
threads.map((thread) => [thread.id, thread.pullRequests.map((link) => link.number)]),
3564+
[
3565+
["t-first", [1, 2]],
3566+
["t-late", [3]],
3567+
["t-early", [4]],
3568+
],
3569+
);
3570+
assert.deepStrictEqual(threads, expected);
3571+
assert.strictEqual(counter.count(), 1);
3572+
assert.deepStrictEqual(resolved, []);
3573+
}).pipe(Effect.provide(layer));
3574+
},
3575+
);
3576+
35063577
projectionSnapshotLayer("ProjectionSnapshotQuery activities by kind", (it) => {
35073578
it.effect("lists one kind across active threads only, without hydrating the threads", () =>
35083579
Effect.gen(function* () {

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

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ import {
7777
type ProjectionSnapshotCounts,
7878
type ProjectionThreadCheckpointContext,
7979
type ProjectionThreadDetailQuery,
80+
type ProjectionThreadPullRequests,
8081
type ProjectionSnapshotQueryShape,
8182
} from "../Services/ProjectionSnapshotQuery.ts";
8283

@@ -802,6 +803,41 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
802803
`,
803804
});
804805

806+
// One row per link, in the shell snapshot's thread order and link order.
807+
const listActiveThreadPullRequestSyncRows = SqlSchema.findAll({
808+
Request: Schema.Void,
809+
Result: ProjectionThreadPullRequestDbRowSchema.mapFields(
810+
Struct.assign({
811+
projectId: ProjectionThread.fields.projectId,
812+
settledOverride: ProjectionThread.fields.settledOverride,
813+
settledAt: ProjectionThread.fields.settledAt,
814+
}),
815+
),
816+
execute: () =>
817+
sql`
818+
SELECT
819+
links.thread_id AS "threadId",
820+
threads.project_id AS "projectId",
821+
threads.settled_override AS "settledOverride",
822+
threads.settled_at AS "settledAt",
823+
links.host,
824+
links.repository,
825+
links.number,
826+
links.url,
827+
links.source,
828+
links.linked_at AS "linkedAt",
829+
links.snapshot_json AS "snapshot",
830+
links.stack_json AS "stack"
831+
FROM projection_thread_pull_requests links
832+
INNER JOIN projection_threads threads
833+
ON threads.thread_id = links.thread_id
834+
WHERE threads.deleted_at IS NULL
835+
AND threads.archived_at IS NULL
836+
ORDER BY threads.project_id ASC, threads.created_at ASC, threads.thread_id ASC,
837+
links.linked_at ASC, links.number ASC
838+
`,
839+
});
840+
805841
const listArchivedThreadPullRequestRows = SqlSchema.findAll({
806842
Request: Schema.Void,
807843
Result: ProjectionThreadPullRequestDbRowSchema,
@@ -2783,6 +2819,35 @@ pending_approval_requests AS (
27832819
}),
27842820
);
27852821

2822+
const listThreadsWithPullRequests: ProjectionSnapshotQueryShape["listThreadsWithPullRequests"] =
2823+
() =>
2824+
listActiveThreadPullRequestSyncRows(undefined).pipe(
2825+
Effect.map((rows) => {
2826+
const threads = new Map<
2827+
ThreadId,
2828+
ProjectionThreadPullRequests & { readonly pullRequests: Array<ThreadPullRequestLink> }
2829+
>();
2830+
for (const row of rows) {
2831+
const thread = threads.get(row.threadId) ?? {
2832+
id: row.threadId,
2833+
projectId: row.projectId,
2834+
settledOverride: row.settledOverride,
2835+
settledAt: row.settledAt,
2836+
pullRequests: [],
2837+
};
2838+
thread.pullRequests.push(mapPullRequestRow(row));
2839+
threads.set(row.threadId, thread);
2840+
}
2841+
return [...threads.values()];
2842+
}),
2843+
Effect.mapError(
2844+
toPersistenceSqlOrDecodeError(
2845+
"ProjectionSnapshotQuery.listThreadsWithPullRequests:query",
2846+
"ProjectionSnapshotQuery.listThreadsWithPullRequests:decodeRows",
2847+
),
2848+
),
2849+
);
2850+
27862851
const getArchivedShellSnapshot: ProjectionSnapshotQueryShape["getArchivedShellSnapshot"] = () =>
27872852
sql
27882853
.withTransaction(
@@ -3778,6 +3843,7 @@ pending_approval_requests AS (
37783843
listActivitiesByKind,
37793844
getSnapshot,
37803845
getShellSnapshot,
3846+
listThreadsWithPullRequests,
37813847
getArchivedShellSnapshot,
37823848
getDeletedWorktreeThreads,
37833849
searchThreads,

‎apps/server/src/orchestration/PullRequestSyncReactor.test.ts‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ const makeHarness = Effect.fn("makePullRequestSyncHarness")(function* (options:
172172
const snapshots = yield* Ref.make(options.snapshot);
173173
const events = yield* PubSub.unbounded<OrchestrationEvent>();
174174
const snapshotReads = yield* Queue.unbounded<void>();
175+
const shellSnapshotReads = yield* Ref.make(0);
175176
const syncCommands = yield* Ref.make<ReadonlyArray<SyncCommand>>([]);
176177
const linkCommands = yield* Ref.make<ReadonlyArray<LinkCommand>>([]);
177178
const summaryCalls = yield* Ref.make<ReadonlyArray<PullRequestRef>>([]);
@@ -209,8 +210,16 @@ const makeHarness = Effect.fn("makePullRequestSyncHarness")(function* (options:
209210

210211
const dependencies = Layer.mergeAll(
211212
Layer.mock(ProjectionSnapshotQuery)({
213+
listThreadsWithPullRequests: () =>
214+
Queue.offer(snapshotReads, undefined).pipe(
215+
Effect.andThen(Ref.get(snapshots)),
216+
Effect.map((snapshot) => snapshot.threads),
217+
),
212218
getShellSnapshot: () =>
213-
Queue.offer(snapshotReads, undefined).pipe(Effect.andThen(Ref.get(snapshots))),
219+
Ref.update(shellSnapshotReads, (count) => count + 1).pipe(
220+
Effect.andThen(Queue.offer(snapshotReads, undefined)),
221+
Effect.andThen(Ref.get(snapshots)),
222+
),
214223
}),
215224
Layer.mock(PullRequestService)({
216225
summary,
@@ -235,6 +244,7 @@ const makeHarness = Effect.fn("makePullRequestSyncHarness")(function* (options:
235244
activation,
236245
snapshots,
237246
snapshotReads,
247+
shellSnapshotReads,
238248
syncCommands,
239249
linkCommands,
240250
summaryCalls,
@@ -511,6 +521,8 @@ describe("PullRequestSyncReactor", () => {
511521
],
512522
);
513523
assert.strictEqual((yield* Ref.get(fixture.stackCalls)).length, 1);
524+
// Reads only linked threads, never the full shell snapshot of every thread.
525+
assert.strictEqual(yield* Ref.get(fixture.shellSnapshotReads), 0);
514526
}).pipe(Effect.provide(fixture.layer));
515527
}),
516528
),

‎apps/server/src/orchestration/PullRequestSyncReactor.ts‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { siblingPullRequestUrl } from "@t3tools/shared/changeRequestUrl";
22
import {
33
CommandId,
4-
type OrchestrationThreadShell,
54
type PullRequestSummary,
65
type ThreadPullRequestKey,
76
type ThreadPullRequestLink,
@@ -36,7 +35,7 @@ const SLOW_SYNC_INTERVAL_MS = 15 * 60 * 1_000;
3635
type SnapshotFields = Omit<ThreadPullRequestSnapshot, "syncedAt">;
3736

3837
interface LinkEntry {
39-
readonly thread: OrchestrationThreadShell;
38+
readonly thread: ProjectionSnapshotQuery.ProjectionThreadPullRequests;
4039
readonly link: ThreadPullRequestLink;
4140
}
4241

@@ -104,15 +103,15 @@ function stacksEqual(
104103
);
105104
}
106105

107-
function isUnsettled(thread: OrchestrationThreadShell): boolean {
106+
function isUnsettled(thread: ProjectionSnapshotQuery.ProjectionThreadPullRequests): boolean {
108107
return thread.settledOverride !== "settled" && thread.settledAt === null;
109108
}
110109

111110
/**
112111
* Keeps every thread ↔ pull request link's host snapshot current. One sweep a minute reads
113-
* the shell snapshot, groups visible links by pull request so the host is asked once per PR
114-
* no matter how many threads share it, and writes back only what changed. Native stacks the
115-
* host reports are auto-linked to the thread as `source: "stack"`.
112+
* only the active threads that have links, groups visible links by pull request so the host
113+
* is asked once per PR no matter how many threads share it, and writes back only what
114+
* changed. Native stacks the host reports are auto-linked to the thread as `source: "stack"`.
116115
*/
117116
export class PullRequestSyncReactor extends Context.Service<
118117
PullRequestSyncReactor,
@@ -153,14 +152,13 @@ export const make = Effect.gen(function* () {
153152
Cause.hasInterruptsOnly(cause) ? Effect.failCause(cause) : Effect.logWarning(message, fields);
154153

155154
const sweep = Effect.fn("PullRequestSyncReactor.sweep")(function* (requestedKey?: string) {
156-
const snapshot = yield* snapshots.getShellSnapshot();
155+
const threads = yield* snapshots.listThreadsWithPullRequests();
157156
const now = yield* DateTime.now;
158157
const nowMs = DateTime.toEpochMillis(now);
159158
const nowIso = DateTime.formatIso(now);
160159

161160
const groups = new Map<string, Array<LinkEntry>>();
162-
for (const thread of snapshot.threads) {
163-
if (thread.archivedAt !== null) continue;
161+
for (const thread of threads) {
164162
for (const link of visibleThreadPullRequests(thread.pullRequests)) {
165163
const key = threadPullRequestKeyOf(link);
166164
const entries = groups.get(key) ?? [];

‎apps/server/src/orchestration/Services/ProjectionSnapshotQuery.ts‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,12 @@ export interface ProjectionFullThreadDiffContext {
6464
readonly toCheckpointRef: CheckpointRef | null;
6565
}
6666

67+
/** The thread fields pull request sync reads, for a thread with at least one link. */
68+
export type ProjectionThreadPullRequests = Pick<
69+
OrchestrationThreadShell,
70+
"id" | "projectId" | "settledOverride" | "settledAt" | "pullRequests"
71+
>;
72+
6773
export interface ProjectionThreadDetailQuery {
6874
/**
6975
* Limit activities before SQLite returns and decodes their payloads.
@@ -131,6 +137,16 @@ export interface ProjectionSnapshotQueryShape {
131137
ProjectionRepositoryError
132138
>;
133139

140+
/**
141+
* Read active (not deleted, not archived) threads that have at least one pull
142+
* request link, in shell snapshot order. Skips repository identity, so no
143+
* legacy `linkedPullRequest` is derived.
144+
*/
145+
readonly listThreadsWithPullRequests: () => Effect.Effect<
146+
ReadonlyArray<ProjectionThreadPullRequests>,
147+
ProjectionRepositoryError
148+
>;
149+
134150
/** Durable worktree ownership retained after thread deletion, including across restarts. */
135151
readonly getDeletedWorktreeThreads: () => Effect.Effect<
136152
ReadonlyArray<{

‎apps/server/src/project/AgentSessionScanner.test.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ const makeProjectionSnapshotQueryLayer = (importedWorkspaceRoots: ReadonlyArray<
4848
updatedAt: "2026-01-01T00:00:00.000Z",
4949
}),
5050
getDeletedWorktreeThreads: () => Effect.die("unused"),
51+
listThreadsWithPullRequests: () => Effect.die("unused"),
5152
getArchivedShellSnapshot: () => Effect.die("unused"),
5253
getSnapshotSequence: () => Effect.die("unused"),
5354
getCounts: () => Effect.die("unused"),

‎apps/server/src/project/ProjectSetupScriptRunner.test.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ const makeProjectionSnapshotQueryLayer = (project: OrchestrationProject) =>
3434
getSnapshot: () => Effect.die("unused"),
3535
getShellSnapshot: () => Effect.die("unused"),
3636
getDeletedWorktreeThreads: () => Effect.die("unused"),
37+
listThreadsWithPullRequests: () => Effect.die("unused"),
3738
getArchivedShellSnapshot: () => Effect.die("unused"),
3839
getSnapshotSequence: () => Effect.succeed({ snapshotSequence: 1 }),
3940
getCounts: () => Effect.die("unused"),

‎apps/server/src/provider/Layers/ProviderService.test.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4969,6 +4969,7 @@ describe("agent browser access", () => {
49694969
getSnapshot: () => Effect.die("unused"),
49704970
getShellSnapshot: () => Effect.die("unused"),
49714971
getDeletedWorktreeThreads: () => Effect.die("unused"),
4972+
listThreadsWithPullRequests: () => Effect.die("unused"),
49724973
getArchivedShellSnapshot: () => Effect.die("unused"),
49734974
getSnapshotSequence: () => Effect.die("unused"),
49744975
getCounts: () => Effect.die("unused"),

0 commit comments

Comments
 (0)