Skip to content

Commit def1c3b

Browse files
fix(shared): keep native stack order when some saved layer lists are stale (pingdotgg#20388)
Co-authored-by: Julius Marminge <[email protected]>
1 parent 4513fce commit def1c3b

2 files changed

Lines changed: 77 additions & 2 deletions

File tree

‎packages/shared/src/threadPullRequests.test.ts‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,63 @@ describe("resolveThreadPullRequestChains", () => {
315315
});
316316
});
317317

318+
it("uses a later complete native snapshot for layer order and the current pull request", () => {
319+
const links = [18, 20, 83, 84].map((number) =>
320+
link(number, {
321+
linkedAt: "2026-01-01T00:00:00.000Z",
322+
snapshot: snapshot(),
323+
stack: {
324+
kind: "native",
325+
id: "80",
326+
number: 80,
327+
url: "https://github.com/pingdotgg/t3code/stacks/80",
328+
base: "main",
329+
layers: (number < 83
330+
? [79, 37, 38, 39, 76, 18, 20]
331+
: [79, 37, 38, 39, 76, 18, 20, 83, 84]
332+
).map((number) => ({ number, headBranch: `pr-${number}`, state: "open" })),
333+
},
334+
}),
335+
);
336+
expect
337+
.soft(
338+
resolveThreadPullRequestChains(links).map((chain) =>
339+
chain.layers.map((layer) => layer.number),
340+
),
341+
)
342+
.toEqual([[18, 20, 83, 84]]);
343+
expect(resolveThreadCurrentPullRequest(links)).toMatchObject({
344+
kind: "stack",
345+
top: { number: 84 },
346+
open: [{ number: 84 }, { number: 83 }, { number: 20 }, { number: 18 }],
347+
});
348+
});
349+
350+
it("uses the earliest longest partial snapshot and appends missing members in stored order", () => {
351+
const links = [
352+
[3, 2],
353+
[9, 2, 3],
354+
[9, 3, 2],
355+
[9, 3, 2],
356+
].map((numbers, index) =>
357+
link(index + 1, {
358+
stack: {
359+
kind: "native",
360+
id: "s1",
361+
number: 1,
362+
url: "https://github.com/pingdotgg/t3code/stacks/1",
363+
base: "main",
364+
layers: numbers.map((number) => ({ number, headBranch: `pr-${number}`, state: "open" })),
365+
},
366+
}),
367+
);
368+
expect(
369+
resolveThreadPullRequestChains(links).map((chain) =>
370+
chain.layers.map((layer) => layer.number),
371+
),
372+
).toEqual([[2, 3, 1, 4]]);
373+
});
374+
318375
it("uses the native stack order when the host provides one", () => {
319376
const stack = {
320377
kind: "native" as const,

‎packages/shared/src/threadPullRequests.ts‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,26 @@ export function resolveThreadPullRequestChains(
230230
nativeStacks.set(stackKey, members);
231231
}
232232
for (const members of nativeStacks.values()) {
233-
const order = new Map(members[0]!.stack!.layers.map((layer, index) => [layer.number, index]));
234-
members.sort((left, right) => (order.get(left.number) ?? 0) - (order.get(right.number) ?? 0));
233+
// Saved snapshots can lag behind newer members of the same stack.
234+
const memberNumbers = new Set(members.map((member) => member.number));
235+
let layers = members[0]!.stack!.layers;
236+
let coverage = layers.filter((layer) => memberNumbers.has(layer.number)).length;
237+
for (const member of members.slice(1)) {
238+
const candidate = member.stack!.layers;
239+
const candidateCoverage = candidate.filter((layer) => memberNumbers.has(layer.number)).length;
240+
if (
241+
candidateCoverage > coverage ||
242+
(candidateCoverage === coverage && candidate.length > layers.length)
243+
) {
244+
layers = candidate;
245+
coverage = candidateCoverage;
246+
}
247+
}
248+
const order = new Map(layers.map((layer, index) => [layer.number, index]));
249+
members.sort(
250+
(left, right) =>
251+
(order.get(left.number) ?? layers.length) - (order.get(right.number) ?? layers.length),
252+
);
235253
for (const member of members) placed.add(threadPullRequestKeyOf(member));
236254
chains.push({ kind: "native", layers: members, depths: members.map((_, index) => index) });
237255
}

0 commit comments

Comments
 (0)