Skip to content

Commit 28051c4

Browse files
fix(server): replace unnecessary full projection reads
Read selected control records for commands, provider cleanup, thread polling, and MCP tools. Select timeline pages before loading payloads, query attachment IDs separately, and restrict handoff and delegated-result reads to relevant runs. Cover unreadable unrelated history, paging across forks, and control behavior with focused regressions.
1 parent 534b7d4 commit 28051c4

46 files changed

Lines changed: 1493 additions & 386 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎apps/server/src/mcp/OrchestratorMcpService.activity.test.ts‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,8 @@ it("readThread prefers activity-run status over a newer cancelled queued run", a
128128
Layer.provide(
129129
Layer.mergeAll(
130130
Layer.mock(ThreadManagementService)({
131-
getThreadProjection: (threadId) =>
131+
getTimelinePage: () => Effect.succeed({ items: [], totalItems: 0, hasMore: false }),
132+
getThreadRecords: (threadId) =>
132133
threadId === parentThreadId
133134
? Effect.succeed(projection)
134135
: Effect.die(`unexpected thread ${threadId}`),
@@ -180,7 +181,8 @@ it("readThread prefers waiting activity status over a newer cancelled queued run
180181
Layer.provide(
181182
Layer.mergeAll(
182183
Layer.mock(ThreadManagementService)({
183-
getThreadProjection: (threadId) =>
184+
getTimelinePage: () => Effect.succeed({ items: [], totalItems: 0, hasMore: false }),
185+
getThreadRecords: (threadId) =>
184186
threadId === parentThreadId
185187
? Effect.succeed(projection)
186188
: Effect.die(`unexpected thread ${threadId}`),
@@ -289,7 +291,8 @@ it("taskStatus returns task.providerInstanceId rather than the driver kind", asy
289291
Layer.provide(
290292
Layer.mergeAll(
291293
Layer.mock(ThreadManagementService)({
292-
getThreadProjection: (threadId) => {
294+
getTimelinePage: () => Effect.succeed({ items: [], totalItems: 0, hasMore: false }),
295+
getThreadRecords: (threadId) => {
293296
if (threadId === parentThreadId) return Effect.succeed(parentProjection);
294297
if (threadId === childThreadId) return Effect.succeed(childProjection);
295298
return Effect.die(`unexpected thread ${threadId}`);
@@ -407,14 +410,20 @@ it("readThread reaches a thread the user attached as context, but not one an age
407410
Layer.provide(
408411
Layer.mergeAll(
409412
Layer.mock(ThreadManagementService)({
410-
getThreadProjection: (threadId) => {
413+
getThreadRecords: (threadId) => {
411414
if (threadId === parentThreadId) return Effect.succeed(parentProjection);
412415
if (threadId === foreignThreadId || threadId === agentOnlyThreadId) {
413416
return Effect.succeed(foreignProjection(threadId));
414417
}
415418
return Effect.die(`unexpected thread ${threadId}`);
416419
},
417-
getProjectThread: (input) =>
420+
getTimelinePage: (threadId) =>
421+
Effect.succeed({
422+
items: foreignProjection(threadId).visibleTurnItems,
423+
totalItems: 1,
424+
hasMore: false,
425+
}),
426+
getProjectThreadRecords: (input) =>
418427
Effect.fail(
419428
new ThreadManagementThreadNotFoundError({
420429
projectId: input.projectId,

‎apps/server/src/mcp/OrchestratorMcpService.test.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ describe("OrchestratorMcpService", () => {
6565
const dependencies = Layer.mergeAll(
6666
NodeServices.layer,
6767
Layer.mock(ThreadManagementService)({
68-
getThreadProjection: (threadId) =>
68+
getThreadRecords: (threadId) =>
6969
Effect.succeed(
7070
threadId === parentThreadId
7171
? hasNestedWork
@@ -168,7 +168,7 @@ describe("OrchestratorMcpService", () => {
168168
const dependencies = Layer.mergeAll(
169169
NodeServices.layer,
170170
Layer.mock(ThreadManagementService)({
171-
getThreadProjection: (threadId) =>
171+
getThreadRecords: (threadId) =>
172172
Effect.succeed(threadId === parentThreadId ? parentProjection : childProjection),
173173
dispatch: (command) =>
174174
Ref.update(dispatched, (commands) => [...commands, command]).pipe(
@@ -234,7 +234,7 @@ describe("OrchestratorMcpService", () => {
234234
const dependencies = Layer.mergeAll(
235235
NodeServices.layer,
236236
Layer.mock(ThreadManagementService)({
237-
getThreadProjection: (threadId) =>
237+
getThreadRecords: (threadId) =>
238238
Effect.succeed(threadId === parentThreadId ? parentProjection : childProjection),
239239
dispatch: (command) =>
240240
Ref.update(dispatched, (commands) => [...commands, command]).pipe(
@@ -303,7 +303,7 @@ describe("OrchestratorMcpService", () => {
303303
const dependencies = Layer.mergeAll(
304304
NodeServices.layer,
305305
Layer.mock(ThreadManagementService)({
306-
getThreadProjection: (threadId) =>
306+
getThreadRecords: (threadId) =>
307307
Effect.succeed(threadId === parentThreadId ? parentProjection : childProjection),
308308
dispatch: (command) =>
309309
Ref.update(dispatched, (commands) => [...commands, command]).pipe(
@@ -486,7 +486,7 @@ describe("OrchestratorMcpService provider resolution", () => {
486486
const dependencies = Layer.mergeAll(
487487
NodeServices.layer,
488488
Layer.mock(ThreadManagementService)({
489-
getThreadProjection: () => Effect.succeed(parentProjection([])),
489+
getThreadRecords: () => Effect.succeed(parentProjection([])),
490490
}),
491491
Layer.mock(ProviderRegistry)({ getProviders: Effect.succeed(providers) }),
492492
adapterRegistryLayer([
@@ -572,7 +572,7 @@ describe("OrchestratorMcpService provider resolution", () => {
572572
const dependencies = Layer.mergeAll(
573573
NodeServices.layer,
574574
Layer.mock(ThreadManagementService)({
575-
getThreadProjection: (threadId) =>
575+
getThreadRecords: (threadId) =>
576576
Effect.succeed(
577577
threadId === parentThreadId
578578
? parentProjection(delegated ? [task] : [])
@@ -665,7 +665,7 @@ describe("OrchestratorMcpService provider resolution", () => {
665665
const dependencies = Layer.mergeAll(
666666
NodeServices.layer,
667667
Layer.mock(ThreadManagementService)({
668-
getThreadProjection: (threadId) =>
668+
getThreadRecords: (threadId) =>
669669
Effect.succeed(
670670
threadId === parentThreadId
671671
? parentProjection(delegated ? [task] : [])
@@ -740,7 +740,7 @@ describe("OrchestratorMcpService provider resolution", () => {
740740
const dependencies = Layer.mergeAll(
741741
NodeServices.layer,
742742
Layer.mock(ThreadManagementService)({
743-
getThreadProjection: () => Effect.succeed(parentProjection([])),
743+
getThreadRecords: () => Effect.succeed(parentProjection([])),
744744
}),
745745
Layer.mock(ProviderRegistry)({
746746
getProviders: Effect.succeed([

0 commit comments

Comments
 (0)