Skip to content

Cursor plugin specification and official plugins

TypeScript

fix(watch-pr): distinguish fork heads during stack discovery (#801)

lauren96dec8ee58de
diff --git a/harness/pstack/claude-code/skills/poteto-mode/scripts/watch-pr/github.test.ts b/harness/pstack/claude-code/skills/poteto-mode/scripts/watch-pr/github.test.ts
index 54722a94..4e589383 100644
--- a/harness/pstack/claude-code/skills/poteto-mode/scripts/watch-pr/github.test.ts
+++ b/harness/pstack/claude-code/skills/poteto-mode/scripts/watch-pr/github.test.ts
@@ -1,4 +1,8 @@
import { describe, expect, it } from "bun:test";
+import { spawnSync } from "node:child_process";
+import { mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
import {
ChecksUnavailable,
WatcherQueryError,
@@ -418,19 +422,77 @@ describe("context and stack discovery", () => {
{
number: parsePrNumber(41),
headRefName: "base-feature",
+ isCrossRepository: false,
baseRefName: "main",
},
{
number: context.number,
headRefName: "feature",
+ isCrossRepository: false,
baseRefName: "base-feature",
},
{
number: parsePrNumber(43),
headRefName: "upstack",
+ isCrossRepository: false,
baseRefName: "feature",
},
]);
expect(ordered.map((item) => Number(item.number))).toEqual([41, 42, 43]);
});
+ it("does not use a fork's same-named head as a stack parent", () => {
+ const ordered = orderStack(context, [
+ { number: parsePrNumber(41), headRefName: "base-feature", baseRefName: "main", isCrossRepository: true },
+ { number: context.number, headRefName: "feature", baseRefName: "base-feature", isCrossRepository: false },
+ ]);
+ expect(ordered.map((item) => Number(item.number))).toEqual([42]);
+ });
+
+ it("does not attach upstream branch children to a fork head", () => {
+ const ordered = orderStack(context, [
+ { number: context.number, headRefName: "feature", baseRefName: "main", isCrossRepository: true },
+ { number: parsePrNumber(43), headRefName: "upstack", baseRefName: "feature", isCrossRepository: false },
+ ]);
+ expect(ordered.map((item) => Number(item.number))).toEqual([42]);
+ });
+
+ it("terminates when an unrelated fork opens main against main", () => {
+ // Bound the subprocess so this regression reports a failure instead of hanging the suite.
+ const program = `import { orderStack } from ${JSON.stringify(import.meta.dir + "/github.ts")};
+ console.log(JSON.stringify(orderStack(${JSON.stringify(context)}, [
+ { number: 41, headRefName: "main", baseRefName: "main", isCrossRepository: true },
+ { number: 42, headRefName: "feature", baseRefName: "main", isCrossRepository: false }
+ ])));`;
+ const child = spawnSync(process.execPath, ["-e", program], { encoding: "utf8", timeout: 2000 });
+ expect(child.error).toBeUndefined();
+ expect(child.status).toBe(0);
+ expect(JSON.parse(child.stdout).map((item: { number: number }) => item.number)).toEqual([42]);
+ });
+
+ it("requests and parses fork identity from gh before stack discovery", () => {
+ const directory = mkdtempSync(join(tmpdir(), "watch-pr-fork-"));
+ try {
+ writeFileSync(join(directory, "gh"), `#!/bin/sh
+case "$*" in
+ *number,headRefName,baseRefName,isCrossRepository*) ;;
+ *) exit 2 ;;
+esac
+printf '%s\\n' '[{"number":42,"headRefName":"feature","baseRefName":"main","isCrossRepository":true}]'
+`, { mode: 0o755 });
+ const program = `import { GhGitHubReader } from ${JSON.stringify(import.meta.dir + "/github.ts")};
+ console.log(JSON.stringify(await new GhGitHubReader().openPullRequests({ owner: "owner", repo: "repo" })));`;
+ const child = spawnSync(process.execPath, ["-e", program], {
+ encoding: "utf8", timeout: 2000,
+ env: { ...process.env, PATH: directory + ":" + process.env.PATH },
+ });
+ expect(child.error).toBeUndefined();
+ expect(child.status).toBe(0);
+ expect(JSON.parse(child.stdout)).toEqual([
+ { number: 42, headRefName: "feature", baseRefName: "main", isCrossRepository: true },
+ ]);
+ } finally {
+ rmSync(directory, { recursive: true, force: true });
+ }
+ });
+
});
diff --git a/harness/pstack/claude-code/skills/poteto-mode/scripts/watch-pr/github.ts b/harness/pstack/claude-code/skills/poteto-mode/scripts/watch-pr/github.ts
index 4828b029..123a33b1 100644
--- a/harness/pstack/claude-code/skills/poteto-mode/scripts/watch-pr/github.ts
+++ b/harness/pstack/claude-code/skills/poteto-mode/scripts/watch-pr/github.ts
@@ -500,11 +500,14 @@ export class GhGitHubReader implements T.GitHubReader {
"--limit",
"300",
"--json",
- "number,headRefName,baseRefName",
+ "number,headRefName,baseRefName,isCrossRepository",
]);
return list(value, "open PRs").map((item, index) => {
const object = record(item, `open PRs[${index}]`);
+ if (typeof object.isCrossRepository !== "boolean")
+ missing(`open PRs[${index}].isCrossRepository`, object.isCrossRepository);
return {
+ isCrossRepository: object.isCrossRepository,
number: parsePrNumber(object.number, `open PRs[${index}].number`),
headRefName: string(
object.headRefName,
@@ -671,7 +674,11 @@ export function orderStack(
open: readonly T.OpenPullRequest[]
): T.NonEmpty<T.PrContext> {
const byNumber = new Map(open.map((pr) => [pr.number, pr]));
- const byHead = new Map(open.map((pr) => [pr.headRefName, pr]));
+ // A base ref belongs to this repository. A fork head with the same name
+ // cannot be its parent, even when that name is the default branch.
+ const byHead = new Map(
+ open.filter((pr) => !pr.isCrossRepository).map((pr) => [pr.headRefName, pr])
+ );
const children = new Map<string, T.OpenPullRequest[]>();
for (const pr of open)
children.set(pr.baseRefName, [...(children.get(pr.baseRefName) ?? []), pr]);
@@ -693,6 +700,7 @@ export function orderStack(
]);
const up: T.OpenPullRequest[] = [];
const visit = (parent: T.OpenPullRequest): void => {
+ if (parent.isCrossRepository) return;
for (const child of children.get(parent.headRefName) ?? []) {
if (seen.has(child.number)) continue;
seen.add(child.number);
diff --git a/harness/pstack/claude-code/skills/poteto-mode/scripts/watch-pr/types.ts b/harness/pstack/claude-code/skills/poteto-mode/scripts/watch-pr/types.ts
index 6c94e0a6..60b9abca 100644
--- a/harness/pstack/claude-code/skills/poteto-mode/scripts/watch-pr/types.ts
+++ b/harness/pstack/claude-code/skills/poteto-mode/scripts/watch-pr/types.ts
@@ -52,6 +52,7 @@ export interface PullRequestFacts {
}
export interface OpenPullRequest {
readonly number: PrNumber;
+ readonly isCrossRepository: boolean;
readonly headRefName: string;
readonly baseRefName: string;
}
diff --git a/pstack/skills/poteto-mode/scripts/watch-pr/github.test.ts b/pstack/skills/poteto-mode/scripts/watch-pr/github.test.ts
index 54722a94..4e589383 100644
--- a/pstack/skills/poteto-mode/scripts/watch-pr/github.test.ts
+++ b/pstack/skills/poteto-mode/scripts/watch-pr/github.test.ts
@@ -1,4 +1,8 @@
import { describe, expect, it } from "bun:test";
+import { spawnSync } from "node:child_process";
+import { mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
import {
ChecksUnavailable,
WatcherQueryError,
@@ -418,19 +422,77 @@ describe("context and stack discovery", () => {
{
number: parsePrNumber(41),
headRefName: "base-feature",
+ isCrossRepository: false,
baseRefName: "main",
},
{
number: context.number,
headRefName: "feature",
+ isCrossRepository: false,
baseRefName: "base-feature",
},
{
number: parsePrNumber(43),
headRefName: "upstack",
+ isCrossRepository: false,
baseRefName: "feature",
},
]);
expect(ordered.map((item) => Number(item.number))).toEqual([41, 42, 43]);
});
+ it("does not use a fork's same-named head as a stack parent", () => {
+ const ordered = orderStack(context, [
+ { number: parsePrNumber(41), headRefName: "base-feature", baseRefName: "main", isCrossRepository: true },
+ { number: context.number, headRefName: "feature", baseRefName: "base-feature", isCrossRepository: false },
+ ]);
+ expect(ordered.map((item) => Number(item.number))).toEqual([42]);
+ });
+
+ it("does not attach upstream branch children to a fork head", () => {
+ const ordered = orderStack(context, [
+ { number: context.number, headRefName: "feature", baseRefName: "main", isCrossRepository: true },
+ { number: parsePrNumber(43), headRefName: "upstack", baseRefName: "feature", isCrossRepository: false },
+ ]);
+ expect(ordered.map((item) => Number(item.number))).toEqual([42]);
+ });
+
+ it("terminates when an unrelated fork opens main against main", () => {
+ // Bound the subprocess so this regression reports a failure instead of hanging the suite.
+ const program = `import { orderStack } from ${JSON.stringify(import.meta.dir + "/github.ts")};
+ console.log(JSON.stringify(orderStack(${JSON.stringify(context)}, [
+ { number: 41, headRefName: "main", baseRefName: "main", isCrossRepository: true },
+ { number: 42, headRefName: "feature", baseRefName: "main", isCrossRepository: false }
+ ])));`;
+ const child = spawnSync(process.execPath, ["-e", program], { encoding: "utf8", timeout: 2000 });
+ expect(child.error).toBeUndefined();
+ expect(child.status).toBe(0);
+ expect(JSON.parse(child.stdout).map((item: { number: number }) => item.number)).toEqual([42]);
+ });
+
+ it("requests and parses fork identity from gh before stack discovery", () => {
+ const directory = mkdtempSync(join(tmpdir(), "watch-pr-fork-"));
+ try {
+ writeFileSync(join(directory, "gh"), `#!/bin/sh
+case "$*" in
+ *number,headRefName,baseRefName,isCrossRepository*) ;;
+ *) exit 2 ;;
+esac
+printf '%s\\n' '[{"number":42,"headRefName":"feature","baseRefName":"main","isCrossRepository":true}]'
+`, { mode: 0o755 });
+ const program = `import { GhGitHubReader } from ${JSON.stringify(import.meta.dir + "/github.ts")};
+ console.log(JSON.stringify(await new GhGitHubReader().openPullRequests({ owner: "owner", repo: "repo" })));`;
+ const child = spawnSync(process.execPath, ["-e", program], {
+ encoding: "utf8", timeout: 2000,
+ env: { ...process.env, PATH: directory + ":" + process.env.PATH },
+ });
+ expect(child.error).toBeUndefined();
+ expect(child.status).toBe(0);
+ expect(JSON.parse(child.stdout)).toEqual([
+ { number: 42, headRefName: "feature", baseRefName: "main", isCrossRepository: true },
+ ]);
+ } finally {
+ rmSync(directory, { recursive: true, force: true });
+ }
+ });
+
});
diff --git a/pstack/skills/poteto-mode/scripts/watch-pr/github.ts b/pstack/skills/poteto-mode/scripts/watch-pr/github.ts
index 4828b029..123a33b1 100644
--- a/pstack/skills/poteto-mode/scripts/watch-pr/github.ts
+++ b/pstack/skills/poteto-mode/scripts/watch-pr/github.ts
@@ -500,11 +500,14 @@ export class GhGitHubReader implements T.GitHubReader {
"--limit",
"300",
"--json",
- "number,headRefName,baseRefName",
+ "number,headRefName,baseRefName,isCrossRepository",
]);
return list(value, "open PRs").map((item, index) => {
const object = record(item, `open PRs[${index}]`);
+ if (typeof object.isCrossRepository !== "boolean")
+ missing(`open PRs[${index}].isCrossRepository`, object.isCrossRepository);
return {
+ isCrossRepository: object.isCrossRepository,
number: parsePrNumber(object.number, `open PRs[${index}].number`),
headRefName: string(
object.headRefName,
@@ -671,7 +674,11 @@ export function orderStack(
open: readonly T.OpenPullRequest[]
): T.NonEmpty<T.PrContext> {
const byNumber = new Map(open.map((pr) => [pr.number, pr]));
- const byHead = new Map(open.map((pr) => [pr.headRefName, pr]));
+ // A base ref belongs to this repository. A fork head with the same name
+ // cannot be its parent, even when that name is the default branch.
+ const byHead = new Map(
+ open.filter((pr) => !pr.isCrossRepository).map((pr) => [pr.headRefName, pr])
+ );
const children = new Map<string, T.OpenPullRequest[]>();
for (const pr of open)
children.set(pr.baseRefName, [...(children.get(pr.baseRefName) ?? []), pr]);
@@ -693,6 +700,7 @@ export function orderStack(
]);
const up: T.OpenPullRequest[] = [];
const visit = (parent: T.OpenPullRequest): void => {
+ if (parent.isCrossRepository) return;
for (const child of children.get(parent.headRefName) ?? []) {
if (seen.has(child.number)) continue;
seen.add(child.number);
diff --git a/pstack/skills/poteto-mode/scripts/watch-pr/types.ts b/pstack/skills/poteto-mode/scripts/watch-pr/types.ts
index 6c94e0a6..60b9abca 100644
--- a/pstack/skills/poteto-mode/scripts/watch-pr/types.ts
+++ b/pstack/skills/poteto-mode/scripts/watch-pr/types.ts
@@ -52,6 +52,7 @@ export interface PullRequestFacts {
}
export interface OpenPullRequest {
readonly number: PrNumber;
+ readonly isCrossRepository: boolean;
readonly headRefName: string;
readonly baseRefName: string;
}