Skip to content

Commit b976fca

Browse files
fix(server): list_thread_pull_requests returns 50 per page with a cursor
A thread with hundreds of linked PRs still produced one oversized list. The tool now takes an optional cursor and returns nextCursor; each page carries the stacks of the PRs on it. This adds 40 bytes to the MCP tool list. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 9c7e889 commit b976fca

6 files changed

Lines changed: 50 additions & 11 deletions

File tree

‎apps/server/src/mcp/toolkits/pullRequests/handlers.test.ts‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -608,6 +608,31 @@ describe("listThreadPullRequests", () => {
608608
]);
609609
expect(result.chains).toEqual([{ kind: "derived", numbers: [1, 2, 3] }]);
610610
});
611+
612+
it("pages a large list once through, with each page's stacks whole", () => {
613+
const thread = {
614+
pullRequests: [
615+
makeLink(1, { headBranch: "feat-a" }),
616+
...Array.from({ length: 118 }, (_, index) => makeLink(index + 2)),
617+
makeLink(120, { headBranch: "feat-z", baseBranch: "feat-a" }),
618+
],
619+
};
620+
const pages = [listThreadPullRequests(thread)];
621+
for (let next = pages[0]!.nextCursor; next !== null; next = pages.at(-1)!.nextCursor) {
622+
pages.push(listThreadPullRequests(thread, next));
623+
}
624+
expect(pages.map((page) => page.pullRequests.length)).toEqual([50, 50, 20]);
625+
expect(pages.flatMap((page) => page.pullRequests.map((entry) => entry.number))).toEqual(
626+
Array.from({ length: 120 }, (_, index) => index + 1),
627+
);
628+
const stack = { kind: "derived", numbers: [1, 120] };
629+
expect(pages.map((page) => page.chains.length)).toEqual([50, 50, 20]);
630+
expect(pages.map((page) => page.chains.filter((chain) => chain.numbers.length > 1))).toEqual([
631+
[stack],
632+
[],
633+
[stack],
634+
]);
635+
});
611636
});
612637

613638
describe("pull request guide tools", () => {

‎apps/server/src/mcp/toolkits/pullRequests/handlers.ts‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,18 +72,27 @@ function entryOf(
7272
};
7373
}
7474

75+
const PULL_REQUEST_LIST_PAGE_SIZE = 50;
76+
7577
export function listThreadPullRequests(
7678
thread: Pick<OrchestrationV2ThreadShell, "pullRequests">,
79+
cursor = 0,
7780
): ListThreadPullRequestsResult {
7881
const chains = resolveThreadPullRequestChains(thread.pullRequests ?? []);
82+
const visible = visibleThreadPullRequests(thread.pullRequests ?? []);
83+
const end = cursor + PULL_REQUEST_LIST_PAGE_SIZE;
84+
const page = visible.slice(cursor, end);
85+
const pageKeys = new Set(page.map(threadPullRequestKeyOf));
7986
return {
80-
pullRequests: visibleThreadPullRequests(thread.pullRequests ?? []).map((link) =>
81-
entryOf(link, chains),
82-
),
83-
chains: chains.map((chain) => ({
84-
kind: chain.kind,
85-
numbers: chain.layers.map((layer) => layer.number),
86-
})),
87+
pullRequests: page.map((link) => entryOf(link, chains)),
88+
// Stacks with a pull request on this page, whole.
89+
chains: chains
90+
.filter((chain) => chain.layers.some((layer) => pageKeys.has(threadPullRequestKeyOf(layer))))
91+
.map((chain) => ({
92+
kind: chain.kind,
93+
numbers: chain.layers.map((layer) => layer.number),
94+
})),
95+
nextCursor: end < visible.length ? end : null,
8796
};
8897
}
8998

@@ -407,7 +416,7 @@ const make = Effect.gen(function* () {
407416
),
408417
list_thread_pull_requests: McpToolAccess.reads((input) =>
409418
requireThread(PullRequestListFailedError, input.threadId).pipe(
410-
Effect.map(listThreadPullRequests),
419+
Effect.map((thread) => listThreadPullRequests(thread, input.cursor)),
411420
),
412421
),
413422
watch_pull_request: writesThread((input) => setWatching(input, true)),

‎apps/server/src/mcp/toolkits/pullRequests/tools.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import {
22
McpCapabilityUnavailableError,
3+
NonNegativeInt,
34
OrchestratorMcpEnvironmentTarget,
45
OrchestratorMcpFailure,
56
PositiveInt,
@@ -236,6 +237,8 @@ export const ListThreadPullRequestsResult = Schema.Struct({
236237
numbers: Schema.Array(Schema.Int),
237238
}),
238239
),
240+
/** Pass as `cursor` for the next page; null on the last page. */
241+
nextCursor: Schema.NullOr(NonNegativeInt),
239242
});
240243
export type ListThreadPullRequestsResult = typeof ListThreadPullRequestsResult.Type;
241244

@@ -309,6 +312,7 @@ const ListThreadPullRequestsTool = Tool.make("list_thread_pull_requests", {
309312
parameters: Schema.Struct({
310313
environmentId: OrchestratorMcpEnvironmentTarget,
311314
threadId: Schema.optional(ThreadId.annotate({ description: "Thread. Default: this thread." })),
315+
cursor: Schema.optional(NonNegativeInt),
312316
}),
313317
success: ListThreadPullRequestsResult,
314318
failure: PullRequestToolError,
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"claudeSystemAppendBytes": 5597,
33
"codexAdditionalContextBytes": 7327,
4-
"mcpToolListJsonBytes": 48099
4+
"mcpToolListJsonBytes": 48139
55
}

‎evals/mcp-tool-use/run.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1310,6 +1310,7 @@ export const t3Default = (
13101310
watching: false,
13111311
})),
13121312
chains: [],
1313+
nextCursor: null,
13131314
};
13141315
case "t3_thread_read": {
13151316
const threadId = valueText(input.threadId);

‎packages/contracts/src/orchestratorMcp.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ export const OrchestratorMcpThreadListItem = Schema.Struct({
387387
runtimeMode: RuntimeMode,
388388
interactionMode: ProviderInteractionMode,
389389
linkedPullRequest: Schema.NullOr(ThreadLinkedPullRequest),
390-
/** Up to 5 open linked pull requests, watched first; list_thread_pull_requests has all of them. */
390+
/** Up to 5 open linked pull requests, watched first; list_thread_pull_requests pages all of them. */
391391
pullRequests: Schema.optional(Schema.Array(OrchestratorMcpThreadPullRequest)),
392392
pullRequestCount: Schema.optional(NonNegativeInt),
393393
openPullRequestCount: Schema.optional(NonNegativeInt),
@@ -462,7 +462,7 @@ export const OrchestratorMcpThreadDetail = Schema.Struct({
462462
runtimeMode: RuntimeMode,
463463
interactionMode: ProviderInteractionMode,
464464
linkedPullRequest: Schema.NullOr(ThreadLinkedPullRequest),
465-
/** Up to 5 open linked pull requests, watched first, on the first page only; list_thread_pull_requests has all of them. */
465+
/** Up to 5 open linked pull requests, watched first, on the first page only; list_thread_pull_requests pages all of them. */
466466
pullRequests: Schema.optional(Schema.Array(OrchestratorMcpThreadPullRequest)),
467467
pullRequestCount: Schema.optional(NonNegativeInt),
468468
openPullRequestCount: Schema.optional(NonNegativeInt),

0 commit comments

Comments
 (0)