fix(server): avoid PRs inherited from default upstreams#7317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maria-rcks merged 5 commits into from
Aug 18, 2026
Merged

fix(server): avoid PRs inherited from default upstreams #7317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a09ef3c
fix(server): avoid PRs inherited from default upstreams
gsimone Aug 17, 2026
476a568
fix(server): preserve default-named fork PRs
gsimone Aug 17, 2026
5f03ff7
Merge branch 'main' into t3code/fix-wrong-pr-autosettle
gsimone Aug 18, 2026
54bca01
Merge branch 'main' into t3code/fix-wrong-pr-autosettle
gsimone Aug 18, 2026
81a3765
Merge branch 'main' into t3code/fix-wrong-pr-autosettle
gsimone Aug 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 102 additions & 0 deletions apps/server/src/git/GitManager.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1129,6 +1129,71 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
20_000,
);

it.effect(
"status preserves a fork PR whose head is named after the default branch",
() =>
Effect.gen(function* () {
const repoDir = yield* makeTempDir("t3code-git-manager-");
yield* initRepo(repoDir);
const originDir = yield* createBareRemote();
const forkDir = yield* createBareRemote();
yield* runGit(repoDir, ["remote", "add", "origin", originDir]);
yield* runGit(repoDir, ["push", "-u", "origin", "main"]);
yield* runGit(repoDir, ["remote", "set-head", "origin", "main"]);
yield* runGit(repoDir, ["remote", "add", "fork-seed", forkDir]);
yield* runGit(repoDir, ["push", "fork-seed", "main"]);
yield* runGit(repoDir, ["checkout", "-b", "t3code/pr-777/main"]);
yield* runGit(repoDir, ["branch", "--set-upstream-to", "fork-seed/main"]);
yield* configureVisibleRemoteUrlWithLocalRewrite(
repoDir,
"fork-seed",
"git@github.com:contributor/codething-mvp.git",
forkDir,
);

const { manager, ghCalls } = yield* makeManager({
ghScenario: {
prListByHeadSelector: {
// @effect-diagnostics-next-line preferSchemaOverJson:off
"contributor:main": JSON.stringify([
{
number: 777,
title: "Fork PR from main",
url: "https://github.com/pingdotgg/codething-mvp/pull/777",
baseRefName: "main",
headRefName: "main",
state: "OPEN",
updatedAt: "2026-03-10T07:00:00Z",
isCrossRepository: true,
headRepository: {
nameWithOwner: "contributor/codething-mvp",
},
headRepositoryOwner: {
login: "contributor",
},
},
]),
},
},
});

const status = yield* manager.status({ cwd: repoDir });
expect(status.refName).toBe("t3code/pr-777/main");
expect(status.pr).toEqual({
number: 777,
title: "Fork PR from main",
url: "https://github.com/pingdotgg/codething-mvp/pull/777",
baseRef: "main",
headRef: "main",
state: "open",
});
expect(ghCalls).toContain(
"pr list --head contributor:main --state all --limit 20 --json number,title,url,baseRefName,headRefName,state,mergedAt,updatedAt,isCrossRepository,headRepository,headRepositoryOwner",
);
}),
20_000,
);

it.effect(
"status ignores synthetic local branch aliases when the upstream remote name contains slashes",
() =>
Expand DownExpand Up@@ -1315,6 +1380,43 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
}),
);

it.effect("status does not inherit a merged PR from a feature branch's default upstream", () =>
Effect.gen(function* () {
const repoDir = yield* makeTempDir("t3code-git-manager-");
yield* initRepo(repoDir);
const remoteDir = yield* createBareRemote();
yield* runGit(repoDir, ["remote", "add", "origin", remoteDir]);
yield* runGit(repoDir, ["push", "-u", "origin", "main"]);
yield* runGit(repoDir, ["remote", "set-head", "origin", "main"]);
yield* runGit(repoDir, ["checkout", "-b", "feature/from-main", "origin/main"]);

const { manager, ghCalls } = yield* makeManager({
ghScenario: {
prListSequence: [
// @effect-diagnostics-next-line preferSchemaOverJson:off
JSON.stringify([
{
number: 54,
title: "Reverse merge from main",
url: "https://github.com/pingdotgg/codething-mvp/pull/54",
baseRefName: "je-filter-list",
headRefName: "main",
state: "MERGED",
mergedAt: "2023-09-28T03:21:10Z",
updatedAt: "2023-09-28T03:21:10Z",
},
]),
],
},
});

const status = yield* manager.status({ cwd: repoDir });
expect(status.refName).toBe("feature/from-main");
expect(status.pr).toBeNull();
expect(ghCalls.some((call) => call.includes("pr list"))).toBe(false);
}),
);

it.effect("status prefers open PR when merged PR has newer updatedAt", () =>
Effect.gen(function* () {
const repoDir = yield* makeTempDir("t3code-git-manager-");
Expand Down
47 changes: 41 additions & 6 deletions apps/server/src/git/GitManager.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -904,11 +904,24 @@ export const make = Effect.gen(function* () {
prLookupEpochByCwd.set(cacheKey, prLookupEpoch(cacheKey) + 1);
}),
);
// Cache keys are NUL-joined [cwd, branch, upstreamRef, epoch] — none of the
// Cache keys are NUL-joined [cwd, branch, upstreamRef, defaultBranch, epoch] — none of the
// segments can contain a NUL byte, and refs are never empty, so "" decodes
// back to a null upstreamRef.
const prLookupCacheKey = (cwd: string, details: { branch: string; upstreamRef: string | null }) =>
[cwd, details.branch, details.upstreamRef ?? "", String(prLookupEpoch(cwd))].join("\u0000");
// back to a null ref.
const prLookupCacheKey = (
cwd: string,
details: {
branch: string;
upstreamRef: string | null;
defaultBranch: string | null;
},
) =>
[
cwd,
details.branch,
details.upstreamRef ?? "",
details.defaultBranch ?? "",
String(prLookupEpoch(cwd)),
].join("\u0000");
// Consecutive failures per cache key, so a branch that keeps failing waits
// longer before the next attempt. Cleared as soon as a lookup succeeds.
const prLookupFailureStreakByKey = new Map<string, number>();
Expand All@@ -928,13 +941,29 @@ export const make = Effect.gen(function* () {
};
const prLookupCache = yield* Cache.makeWith(
(key: string) => {
const [cwd = "", branch = "", upstreamRef = ""] = key.split("\u0000");
const [cwd = "", branch = "", upstreamRef = "", defaultBranch = ""] = key.split("\u0000");
const details = {
branch,
upstreamRef: upstreamRef.length > 0 ? upstreamRef : null,
defaultBranch: defaultBranch.length > 0 ? defaultBranch : null,
};
return Effect.gen(function* () {
const headContext = yield* resolveBranchHeadContext(cwd, details);
const upstreamHeadIsDefault =
headContext.headBranch === details.defaultBranch ||
(details.defaultBranch === null &&
(headContext.headBranch === "main" || headContext.headBranch === "master"));
// `git worktree add -b feature origin/main` makes the new local branch
// track origin/main. That upstream is the branch's base, not its
// published PR head. Looking up PRs for it can attach an old reverse
// merge from main and auto-settle an unrelated feature thread.
if (
headContext.headBranch !== details.branch &&
upstreamHeadIsDefault &&
!headContext.isCrossRepository
) {
return { latest: null, headContext };
}
// Only skip when the branch is untracked as well: anything carrying an
// upstream keeps the old behaviour.
if (details.upstreamRef === null && (yield* isUnpublishedBranch(cwd, headContext))) {
Expand DownExpand Up@@ -1015,7 +1044,12 @@ export const make = Effect.gen(function* () {
};
const lookupStatusPr = Effect.fn("lookupStatusPr")(function* (
cwd: string,
details: { branch: string; upstreamRef: string | null; isDefaultBranch: boolean },
details: {
branch: string;
upstreamRef: string | null;
defaultBranch: string | null;
isDefaultBranch: boolean;
},
) {
// Keyed by (cwd, branch) only: the upstream ref changing (e.g. a first
// `push -u`) must not orphan the fallback value for the same branch.
Expand DownExpand Up@@ -1089,6 +1123,7 @@ export const make = Effect.gen(function* () {
? yield* lookupStatusPr(cwd, {
branch: details.branch,
upstreamRef: details.upstreamRef,
defaultBranch: details.defaultBranch,
isDefaultBranch: details.isDefaultBranch,
})
: null;
Expand Down
1 change: 1 addition & 0 deletions apps/server/src/vcs/GitVcsDriver.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -72,6 +72,7 @@ export interface GitStatusDetails {

export interface GitRemoteStatusDetails {
isRepo: boolean;
defaultBranch: string | null;
isDefaultBranch: boolean;
branch: string | null;
upstreamRef: string | null;
Expand Down
2 changes: 2 additions & 0 deletions apps/server/src/vcs/GitVcsDriverCore.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -89,6 +89,7 @@ const NON_REPOSITORY_STATUS_DETAILS = Object.freeze<GitVcsDriver.GitStatusDetail
});
const NON_REPOSITORY_REMOTE_STATUS_DETAILS = Object.freeze<GitVcsDriver.GitRemoteStatusDetails>({
isRepo: false,
defaultBranch: null,
isDefaultBranch: false,
branch: null,
upstreamRef: null,
Expand DownExpand Up@@ -1550,6 +1551,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*

return {
isRepo: true,
defaultBranch,
isDefaultBranch,
branch,
upstreamRef,
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
fix(server): avoid PRs inherited from default upstreams#7317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

maria-rcks
merged 5 commits into

from

Aug 18, 2026
 Merged


fix(server): avoid PRs inherited from default upstreams
#7317
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
a09ef3c

fix(server): avoid PRs inherited from default upstreams


gsimone Aug 17, 2026
476a568

fix(server): preserve default-named fork PRs


gsimone Aug 17, 2026
5f03ff7

Merge branch 'main' into t3code/fix-wrong-pr-autosettle


gsimone Aug 18, 2026
54bca01

Merge branch 'main' into t3code/fix-wrong-pr-autosettle


gsimone Aug 18, 2026
81a3765

Merge branch 'main' into t3code/fix-wrong-pr-autosettle


gsimone Aug 18, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


102 changes: 102 additions & 0 deletions
apps/server/src/git/GitManager.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1129,6 +1129,71 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
 20_000,
 );

 it.effect(
 "status preserves a fork PR whose head is named after the default branch",
 () =>
 Effect.gen(function* () {
 const repoDir = yield* makeTempDir("t3code-git-manager-");
 yield* initRepo(repoDir);
 const originDir = yield* createBareRemote();
 const forkDir = yield* createBareRemote();
 yield* runGit(repoDir, ["remote", "add", "origin", originDir]);
 yield* runGit(repoDir, ["push", "-u", "origin", "main"]);
 yield* runGit(repoDir, ["remote", "set-head", "origin", "main"]);
 yield* runGit(repoDir, ["remote", "add", "fork-seed", forkDir]);
 yield* runGit(repoDir, ["push", "fork-seed", "main"]);
 yield* runGit(repoDir, ["checkout", "-b", "t3code/pr-777/main"]);
 yield* runGit(repoDir, ["branch", "--set-upstream-to", "fork-seed/main"]);
 yield* configureVisibleRemoteUrlWithLocalRewrite(
 repoDir,
 "fork-seed",
 "git@github.com:contributor/codething-mvp.git",
 forkDir,
 );

 const { manager, ghCalls } = yield* makeManager({
 ghScenario: {
 prListByHeadSelector: {
 // @effect-diagnostics-next-line preferSchemaOverJson:off
 "contributor:main": JSON.stringify([
 {
 number: 777,
 title: "Fork PR from main",
 url: "https://github.com/pingdotgg/codething-mvp/pull/777",
 baseRefName: "main",
 headRefName: "main",
 state: "OPEN",
 updatedAt: "2026-03-10T07:00:00Z",
 isCrossRepository: true,
 headRepository: {
 nameWithOwner: "contributor/codething-mvp",
 },
 headRepositoryOwner: {
 login: "contributor",
 },
 },
 ]),
 },
 },
 });

 const status = yield* manager.status({ cwd: repoDir });
 expect(status.refName).toBe("t3code/pr-777/main");
 expect(status.pr).toEqual({
 number: 777,
 title: "Fork PR from main",
 url: "https://github.com/pingdotgg/codething-mvp/pull/777",
 baseRef: "main",
 headRef: "main",
 state: "open",
 });
 expect(ghCalls).toContain(
 "pr list --head contributor:main --state all --limit 20 --json number,title,url,baseRefName,headRefName,state,mergedAt,updatedAt,isCrossRepository,headRepository,headRepositoryOwner",
 );
 }),
 20_000,
 );

 it.effect(
 "status ignores synthetic local branch aliases when the upstream remote name contains slashes",
 () =>
Expand DownExpand Up@@ -1315,6 +1380,43 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
 }),
 );

 it.effect("status does not inherit a merged PR from a feature branch's default upstream", () =>
 Effect.gen(function* () {
 const repoDir = yield* makeTempDir("t3code-git-manager-");
 yield* initRepo(repoDir);
 const remoteDir = yield* createBareRemote();
 yield* runGit(repoDir, ["remote", "add", "origin", remoteDir]);
 yield* runGit(repoDir, ["push", "-u", "origin", "main"]);
 yield* runGit(repoDir, ["remote", "set-head", "origin", "main"]);
 yield* runGit(repoDir, ["checkout", "-b", "feature/from-main", "origin/main"]);

 const { manager, ghCalls } = yield* makeManager({
 ghScenario: {
 prListSequence: [
 // @effect-diagnostics-next-line preferSchemaOverJson:off
 JSON.stringify([
 {
 number: 54,
 title: "Reverse merge from main",
 url: "https://github.com/pingdotgg/codething-mvp/pull/54",
 baseRefName: "je-filter-list",
 headRefName: "main",
 state: "MERGED",
 mergedAt: "2023-09-28T03:21:10Z",
 updatedAt: "2023-09-28T03:21:10Z",
 },
 ]),
 ],
 },
 });

 const status = yield* manager.status({ cwd: repoDir });
 expect(status.refName).toBe("feature/from-main");
 expect(status.pr).toBeNull();
 expect(ghCalls.some((call) => call.includes("pr list"))).toBe(false);
 }),
 );

 it.effect("status prefers open PR when merged PR has newer updatedAt", () =>
 Effect.gen(function* () {
 const repoDir = yield* makeTempDir("t3code-git-manager-");
Expand Down

47 changes: 41 additions & 6 deletions
apps/server/src/git/GitManager.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -904,11 +904,24 @@ export const make = Effect.gen(function* () {
 prLookupEpochByCwd.set(cacheKey, prLookupEpoch(cacheKey) + 1);
 }),
 );
 // Cache keys are NUL-joined [cwd, branch, upstreamRef, epoch] — none of the
 // Cache keys are NUL-joined [cwd, branch, upstreamRef, defaultBranch, epoch] — none of the
 // segments can contain a NUL byte, and refs are never empty, so "" decodes
 // back to a null upstreamRef.
 const prLookupCacheKey = (cwd: string, details: { branch: string; upstreamRef: string | null }) =>
 [cwd, details.branch, details.upstreamRef ?? "", String(prLookupEpoch(cwd))].join("\u0000");
 // back to a null ref.
 const prLookupCacheKey = (
 cwd: string,
 details: {
 branch: string;
 upstreamRef: string | null;
 defaultBranch: string | null;
 },
 ) =>
 [
 cwd,
 details.branch,
 details.upstreamRef ?? "",
 details.defaultBranch ?? "",
 String(prLookupEpoch(cwd)),
 ].join("\u0000");
 // Consecutive failures per cache key, so a branch that keeps failing waits
 // longer before the next attempt. Cleared as soon as a lookup succeeds.
 const prLookupFailureStreakByKey = new Map<string, number>();
Expand All@@ -928,13 +941,29 @@ export const make = Effect.gen(function* () {
 };
 const prLookupCache = yield* Cache.makeWith(
 (key: string) => {
 const [cwd = "", branch = "", upstreamRef = ""] = key.split("\u0000");
 const [cwd = "", branch = "", upstreamRef = "", defaultBranch = ""] = key.split("\u0000");
 const details = {
 branch,
 upstreamRef: upstreamRef.length > 0 ? upstreamRef : null,
 defaultBranch: defaultBranch.length > 0 ? defaultBranch : null,
 };
 return Effect.gen(function* () {
 const headContext = yield* resolveBranchHeadContext(cwd, details);
 const upstreamHeadIsDefault =
 headContext.headBranch === details.defaultBranch ||
 (details.defaultBranch === null &&
 (headContext.headBranch === "main" || headContext.headBranch === "master"));
 // `git worktree add -b feature origin/main` makes the new local branch
 // track origin/main. That upstream is the branch's base, not its
 // published PR head. Looking up PRs for it can attach an old reverse
 // merge from main and auto-settle an unrelated feature thread.
 if (
 headContext.headBranch !== details.branch &&
 upstreamHeadIsDefault &&
 !headContext.isCrossRepository
 ) {
 return { latest: null, headContext };
 }
 // Only skip when the branch is untracked as well: anything carrying an
 // upstream keeps the old behaviour.
 if (details.upstreamRef === null && (yield* isUnpublishedBranch(cwd, headContext))) {
Expand DownExpand Up@@ -1015,7 +1044,12 @@ export const make = Effect.gen(function* () {
 };
 const lookupStatusPr = Effect.fn("lookupStatusPr")(function* (
 cwd: string,
 details: { branch: string; upstreamRef: string | null; isDefaultBranch: boolean },
 details: {
 branch: string;
 upstreamRef: string | null;
 defaultBranch: string | null;
 isDefaultBranch: boolean;
 },
 ) {
 // Keyed by (cwd, branch) only: the upstream ref changing (e.g. a first
 // `push -u`) must not orphan the fallback value for the same branch.
Expand DownExpand Up@@ -1089,6 +1123,7 @@ export const make = Effect.gen(function* () {
 ? yield* lookupStatusPr(cwd, {
 branch: details.branch,
 upstreamRef: details.upstreamRef,
 defaultBranch: details.defaultBranch,
 isDefaultBranch: details.isDefaultBranch,
 })
 : null;
Expand Down

1 change: 1 addition & 0 deletions
apps/server/src/vcs/GitVcsDriver.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,6 +72,7 @@ export interface GitStatusDetails {

export interface GitRemoteStatusDetails {
 isRepo: boolean;
 defaultBranch: string | null;
 isDefaultBranch: boolean;
 branch: string | null;
 upstreamRef: string | null;
Expand Down

2 changes: 2 additions & 0 deletions
apps/server/src/vcs/GitVcsDriverCore.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,6 +89,7 @@ const NON_REPOSITORY_STATUS_DETAILS = Object.freeze<GitVcsDriver.GitStatusDetail
});
const NON_REPOSITORY_REMOTE_STATUS_DETAILS = Object.freeze<GitVcsDriver.GitRemoteStatusDetails>({
 isRepo: false,
 defaultBranch: null,
 isDefaultBranch: false,
 branch: null,
 upstreamRef: null,
Expand DownExpand Up@@ -1550,6 +1551,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*

 return {
 isRepo: true,
 defaultBranch,
 isDefaultBranch,
 branch,
 upstreamRef,
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(server): avoid PRs inherited from default upstreams#7317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

maria-rcks
merged 5 commits into

from

Aug 18, 2026
 Merged


fix(server): avoid PRs inherited from default upstreams
#7317
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
a09ef3c

fix(server): avoid PRs inherited from default upstreams


gsimone Aug 17, 2026
476a568

fix(server): preserve default-named fork PRs


gsimone Aug 17, 2026
5f03ff7

Merge branch 'main' into t3code/fix-wrong-pr-autosettle


gsimone Aug 18, 2026
54bca01

Merge branch 'main' into t3code/fix-wrong-pr-autosettle


gsimone Aug 18, 2026
81a3765

Merge branch 'main' into t3code/fix-wrong-pr-autosettle


gsimone Aug 18, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


102 changes: 102 additions & 0 deletions
apps/server/src/git/GitManager.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1129,6 +1129,71 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
 20_000,
 );

 it.effect(
 "status preserves a fork PR whose head is named after the default branch",
 () =>
 Effect.gen(function* () {
 const repoDir = yield* makeTempDir("t3code-git-manager-");
 yield* initRepo(repoDir);
 const originDir = yield* createBareRemote();
 const forkDir = yield* createBareRemote();
 yield* runGit(repoDir, ["remote", "add", "origin", originDir]);
 yield* runGit(repoDir, ["push", "-u", "origin", "main"]);
 yield* runGit(repoDir, ["remote", "set-head", "origin", "main"]);
 yield* runGit(repoDir, ["remote", "add", "fork-seed", forkDir]);
 yield* runGit(repoDir, ["push", "fork-seed", "main"]);
 yield* runGit(repoDir, ["checkout", "-b", "t3code/pr-777/main"]);
 yield* runGit(repoDir, ["branch", "--set-upstream-to", "fork-seed/main"]);
 yield* configureVisibleRemoteUrlWithLocalRewrite(
 repoDir,
 "fork-seed",
 "git@github.com:contributor/codething-mvp.git",
 forkDir,
 );

 const { manager, ghCalls } = yield* makeManager({
 ghScenario: {
 prListByHeadSelector: {
 // @effect-diagnostics-next-line preferSchemaOverJson:off
 "contributor:main": JSON.stringify([
 {
 number: 777,
 title: "Fork PR from main",
 url: "https://github.com/pingdotgg/codething-mvp/pull/777",
 baseRefName: "main",
 headRefName: "main",
 state: "OPEN",
 updatedAt: "2026-03-10T07:00:00Z",
 isCrossRepository: true,
 headRepository: {
 nameWithOwner: "contributor/codething-mvp",
 },
 headRepositoryOwner: {
 login: "contributor",
 },
 },
 ]),
 },
 },
 });

 const status = yield* manager.status({ cwd: repoDir });
 expect(status.refName).toBe("t3code/pr-777/main");
 expect(status.pr).toEqual({
 number: 777,
 title: "Fork PR from main",
 url: "https://github.com/pingdotgg/codething-mvp/pull/777",
 baseRef: "main",
 headRef: "main",
 state: "open",
 });
 expect(ghCalls).toContain(
 "pr list --head contributor:main --state all --limit 20 --json number,title,url,baseRefName,headRefName,state,mergedAt,updatedAt,isCrossRepository,headRepository,headRepositoryOwner",
 );
 }),
 20_000,
 );

 it.effect(
 "status ignores synthetic local branch aliases when the upstream remote name contains slashes",
 () =>
Expand DownExpand Up@@ -1315,6 +1380,43 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
 }),
 );

 it.effect("status does not inherit a merged PR from a feature branch's default upstream", () =>
 Effect.gen(function* () {
 const repoDir = yield* makeTempDir("t3code-git-manager-");
 yield* initRepo(repoDir);
 const remoteDir = yield* createBareRemote();
 yield* runGit(repoDir, ["remote", "add", "origin", remoteDir]);
 yield* runGit(repoDir, ["push", "-u", "origin", "main"]);
 yield* runGit(repoDir, ["remote", "set-head", "origin", "main"]);
 yield* runGit(repoDir, ["checkout", "-b", "feature/from-main", "origin/main"]);

 const { manager, ghCalls } = yield* makeManager({
 ghScenario: {
 prListSequence: [
 // @effect-diagnostics-next-line preferSchemaOverJson:off
 JSON.stringify([
 {
 number: 54,
 title: "Reverse merge from main",
 url: "https://github.com/pingdotgg/codething-mvp/pull/54",
 baseRefName: "je-filter-list",
 headRefName: "main",
 state: "MERGED",
 mergedAt: "2023-09-28T03:21:10Z",
 updatedAt: "2023-09-28T03:21:10Z",
 },
 ]),
 ],
 },
 });

 const status = yield* manager.status({ cwd: repoDir });
 expect(status.refName).toBe("feature/from-main");
 expect(status.pr).toBeNull();
 expect(ghCalls.some((call) => call.includes("pr list"))).toBe(false);
 }),
 );

 it.effect("status prefers open PR when merged PR has newer updatedAt", () =>
 Effect.gen(function* () {
 const repoDir = yield* makeTempDir("t3code-git-manager-");
Expand Down

47 changes: 41 additions & 6 deletions
apps/server/src/git/GitManager.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -904,11 +904,24 @@ export const make = Effect.gen(function* () {
 prLookupEpochByCwd.set(cacheKey, prLookupEpoch(cacheKey) + 1);
 }),
 );
 // Cache keys are NUL-joined [cwd, branch, upstreamRef, epoch] — none of the
 // Cache keys are NUL-joined [cwd, branch, upstreamRef, defaultBranch, epoch] — none of the
 // segments can contain a NUL byte, and refs are never empty, so "" decodes
 // back to a null upstreamRef.
 const prLookupCacheKey = (cwd: string, details: { branch: string; upstreamRef: string | null }) =>
 [cwd, details.branch, details.upstreamRef ?? "", String(prLookupEpoch(cwd))].join("\u0000");
 // back to a null ref.
 const prLookupCacheKey = (
 cwd: string,
 details: {
 branch: string;
 upstreamRef: string | null;
 defaultBranch: string | null;
 },
 ) =>
 [
 cwd,
 details.branch,
 details.upstreamRef ?? "",
 details.defaultBranch ?? "",
 String(prLookupEpoch(cwd)),
 ].join("\u0000");
 // Consecutive failures per cache key, so a branch that keeps failing waits
 // longer before the next attempt. Cleared as soon as a lookup succeeds.
 const prLookupFailureStreakByKey = new Map<string, number>();
Expand All@@ -928,13 +941,29 @@ export const make = Effect.gen(function* () {
 };
 const prLookupCache = yield* Cache.makeWith(
 (key: string) => {
 const [cwd = "", branch = "", upstreamRef = ""] = key.split("\u0000");
 const [cwd = "", branch = "", upstreamRef = "", defaultBranch = ""] = key.split("\u0000");
 const details = {
 branch,
 upstreamRef: upstreamRef.length > 0 ? upstreamRef : null,
 defaultBranch: defaultBranch.length > 0 ? defaultBranch : null,
 };
 return Effect.gen(function* () {
 const headContext = yield* resolveBranchHeadContext(cwd, details);
 const upstreamHeadIsDefault =
 headContext.headBranch === details.defaultBranch ||
 (details.defaultBranch === null &&
 (headContext.headBranch === "main" || headContext.headBranch === "master"));
 // `git worktree add -b feature origin/main` makes the new local branch
 // track origin/main. That upstream is the branch's base, not its
 // published PR head. Looking up PRs for it can attach an old reverse
 // merge from main and auto-settle an unrelated feature thread.
 if (
 headContext.headBranch !== details.branch &&
 upstreamHeadIsDefault &&
 !headContext.isCrossRepository
 ) {
 return { latest: null, headContext };
 }
 // Only skip when the branch is untracked as well: anything carrying an
 // upstream keeps the old behaviour.
 if (details.upstreamRef === null && (yield* isUnpublishedBranch(cwd, headContext))) {
Expand DownExpand Up@@ -1015,7 +1044,12 @@ export const make = Effect.gen(function* () {
 };
 const lookupStatusPr = Effect.fn("lookupStatusPr")(function* (
 cwd: string,
 details: { branch: string; upstreamRef: string | null; isDefaultBranch: boolean },
 details: {
 branch: string;
 upstreamRef: string | null;
 defaultBranch: string | null;
 isDefaultBranch: boolean;
 },
 ) {
 // Keyed by (cwd, branch) only: the upstream ref changing (e.g. a first
 // `push -u`) must not orphan the fallback value for the same branch.
Expand DownExpand Up@@ -1089,6 +1123,7 @@ export const make = Effect.gen(function* () {
 ? yield* lookupStatusPr(cwd, {
 branch: details.branch,
 upstreamRef: details.upstreamRef,
 defaultBranch: details.defaultBranch,
 isDefaultBranch: details.isDefaultBranch,
 })
 : null;
Expand Down

1 change: 1 addition & 0 deletions
apps/server/src/vcs/GitVcsDriver.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,6 +72,7 @@ export interface GitStatusDetails {

export interface GitRemoteStatusDetails {
 isRepo: boolean;
 defaultBranch: string | null;
 isDefaultBranch: boolean;
 branch: string | null;
 upstreamRef: string | null;
Expand Down

2 changes: 2 additions & 0 deletions
apps/server/src/vcs/GitVcsDriverCore.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,6 +89,7 @@ const NON_REPOSITORY_STATUS_DETAILS = Object.freeze<GitVcsDriver.GitStatusDetail
});
const NON_REPOSITORY_REMOTE_STATUS_DETAILS = Object.freeze<GitVcsDriver.GitRemoteStatusDetails>({
 isRepo: false,
 defaultBranch: null,
 isDefaultBranch: false,
 branch: null,
 upstreamRef: null,
Expand DownExpand Up@@ -1550,6 +1551,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*

 return {
 isRepo: true,
 defaultBranch,
 isDefaultBranch,
 branch,
 upstreamRef,
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(server): avoid PRs inherited from default upstreams#7317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

maria-rcks
merged 5 commits into

from

Aug 18, 2026
 Merged


fix(server): avoid PRs inherited from default upstreams
#7317
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
a09ef3c

fix(server): avoid PRs inherited from default upstreams


gsimone Aug 17, 2026
476a568

fix(server): preserve default-named fork PRs


gsimone Aug 17, 2026
5f03ff7

Merge branch 'main' into t3code/fix-wrong-pr-autosettle


gsimone Aug 18, 2026
54bca01

Merge branch 'main' into t3code/fix-wrong-pr-autosettle


gsimone Aug 18, 2026
81a3765

Merge branch 'main' into t3code/fix-wrong-pr-autosettle


gsimone Aug 18, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


102 changes: 102 additions & 0 deletions
apps/server/src/git/GitManager.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1129,6 +1129,71 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
 20_000,
 );

 it.effect(
 "status preserves a fork PR whose head is named after the default branch",
 () =>
 Effect.gen(function* () {
 const repoDir = yield* makeTempDir("t3code-git-manager-");
 yield* initRepo(repoDir);
 const originDir = yield* createBareRemote();
 const forkDir = yield* createBareRemote();
 yield* runGit(repoDir, ["remote", "add", "origin", originDir]);
 yield* runGit(repoDir, ["push", "-u", "origin", "main"]);
 yield* runGit(repoDir, ["remote", "set-head", "origin", "main"]);
 yield* runGit(repoDir, ["remote", "add", "fork-seed", forkDir]);
 yield* runGit(repoDir, ["push", "fork-seed", "main"]);
 yield* runGit(repoDir, ["checkout", "-b", "t3code/pr-777/main"]);
 yield* runGit(repoDir, ["branch", "--set-upstream-to", "fork-seed/main"]);
 yield* configureVisibleRemoteUrlWithLocalRewrite(
 repoDir,
 "fork-seed",
 "git@github.com:contributor/codething-mvp.git",
 forkDir,
 );

 const { manager, ghCalls } = yield* makeManager({
 ghScenario: {
 prListByHeadSelector: {
 // @effect-diagnostics-next-line preferSchemaOverJson:off
 "contributor:main": JSON.stringify([
 {
 number: 777,
 title: "Fork PR from main",
 url: "https://github.com/pingdotgg/codething-mvp/pull/777",
 baseRefName: "main",
 headRefName: "main",
 state: "OPEN",
 updatedAt: "2026-03-10T07:00:00Z",
 isCrossRepository: true,
 headRepository: {
 nameWithOwner: "contributor/codething-mvp",
 },
 headRepositoryOwner: {
 login: "contributor",
 },
 },
 ]),
 },
 },
 });

 const status = yield* manager.status({ cwd: repoDir });
 expect(status.refName).toBe("t3code/pr-777/main");
 expect(status.pr).toEqual({
 number: 777,
 title: "Fork PR from main",
 url: "https://github.com/pingdotgg/codething-mvp/pull/777",
 baseRef: "main",
 headRef: "main",
 state: "open",
 });
 expect(ghCalls).toContain(
 "pr list --head contributor:main --state all --limit 20 --json number,title,url,baseRefName,headRefName,state,mergedAt,updatedAt,isCrossRepository,headRepository,headRepositoryOwner",
 );
 }),
 20_000,
 );

 it.effect(
 "status ignores synthetic local branch aliases when the upstream remote name contains slashes",
 () =>
Expand DownExpand Up@@ -1315,6 +1380,43 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
 }),
 );

 it.effect("status does not inherit a merged PR from a feature branch's default upstream", () =>
 Effect.gen(function* () {
 const repoDir = yield* makeTempDir("t3code-git-manager-");
 yield* initRepo(repoDir);
 const remoteDir = yield* createBareRemote();
 yield* runGit(repoDir, ["remote", "add", "origin", remoteDir]);
 yield* runGit(repoDir, ["push", "-u", "origin", "main"]);
 yield* runGit(repoDir, ["remote", "set-head", "origin", "main"]);
 yield* runGit(repoDir, ["checkout", "-b", "feature/from-main", "origin/main"]);

 const { manager, ghCalls } = yield* makeManager({
 ghScenario: {
 prListSequence: [
 // @effect-diagnostics-next-line preferSchemaOverJson:off
 JSON.stringify([
 {
 number: 54,
 title: "Reverse merge from main",
 url: "https://github.com/pingdotgg/codething-mvp/pull/54",
 baseRefName: "je-filter-list",
 headRefName: "main",
 state: "MERGED",
 mergedAt: "2023-09-28T03:21:10Z",
 updatedAt: "2023-09-28T03:21:10Z",
 },
 ]),
 ],
 },
 });

 const status = yield* manager.status({ cwd: repoDir });
 expect(status.refName).toBe("feature/from-main");
 expect(status.pr).toBeNull();
 expect(ghCalls.some((call) => call.includes("pr list"))).toBe(false);
 }),
 );

 it.effect("status prefers open PR when merged PR has newer updatedAt", () =>
 Effect.gen(function* () {
 const repoDir = yield* makeTempDir("t3code-git-manager-");
Expand Down

47 changes: 41 additions & 6 deletions
apps/server/src/git/GitManager.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -904,11 +904,24 @@ export const make = Effect.gen(function* () {
 prLookupEpochByCwd.set(cacheKey, prLookupEpoch(cacheKey) + 1);
 }),
 );
 // Cache keys are NUL-joined [cwd, branch, upstreamRef, epoch] — none of the
 // Cache keys are NUL-joined [cwd, branch, upstreamRef, defaultBranch, epoch] — none of the
 // segments can contain a NUL byte, and refs are never empty, so "" decodes
 // back to a null upstreamRef.
 const prLookupCacheKey = (cwd: string, details: { branch: string; upstreamRef: string | null }) =>
 [cwd, details.branch, details.upstreamRef ?? "", String(prLookupEpoch(cwd))].join("\u0000");
 // back to a null ref.
 const prLookupCacheKey = (
 cwd: string,
 details: {
 branch: string;
 upstreamRef: string | null;
 defaultBranch: string | null;
 },
 ) =>
 [
 cwd,
 details.branch,
 details.upstreamRef ?? "",
 details.defaultBranch ?? "",
 String(prLookupEpoch(cwd)),
 ].join("\u0000");
 // Consecutive failures per cache key, so a branch that keeps failing waits
 // longer before the next attempt. Cleared as soon as a lookup succeeds.
 const prLookupFailureStreakByKey = new Map<string, number>();
Expand All@@ -928,13 +941,29 @@ export const make = Effect.gen(function* () {
 };
 const prLookupCache = yield* Cache.makeWith(
 (key: string) => {
 const [cwd = "", branch = "", upstreamRef = ""] = key.split("\u0000");
 const [cwd = "", branch = "", upstreamRef = "", defaultBranch = ""] = key.split("\u0000");
 const details = {
 branch,
 upstreamRef: upstreamRef.length > 0 ? upstreamRef : null,
 defaultBranch: defaultBranch.length > 0 ? defaultBranch : null,
 };
 return Effect.gen(function* () {
 const headContext = yield* resolveBranchHeadContext(cwd, details);
 const upstreamHeadIsDefault =
 headContext.headBranch === details.defaultBranch ||
 (details.defaultBranch === null &&
 (headContext.headBranch === "main" || headContext.headBranch === "master"));
 // `git worktree add -b feature origin/main` makes the new local branch
 // track origin/main. That upstream is the branch's base, not its
 // published PR head. Looking up PRs for it can attach an old reverse
 // merge from main and auto-settle an unrelated feature thread.
 if (
 headContext.headBranch !== details.branch &&
 upstreamHeadIsDefault &&
 !headContext.isCrossRepository
 ) {
 return { latest: null, headContext };
 }
 // Only skip when the branch is untracked as well: anything carrying an
 // upstream keeps the old behaviour.
 if (details.upstreamRef === null && (yield* isUnpublishedBranch(cwd, headContext))) {
Expand DownExpand Up@@ -1015,7 +1044,12 @@ export const make = Effect.gen(function* () {
 };
 const lookupStatusPr = Effect.fn("lookupStatusPr")(function* (
 cwd: string,
 details: { branch: string; upstreamRef: string | null; isDefaultBranch: boolean },
 details: {
 branch: string;
 upstreamRef: string | null;
 defaultBranch: string | null;
 isDefaultBranch: boolean;
 },
 ) {
 // Keyed by (cwd, branch) only: the upstream ref changing (e.g. a first
 // `push -u`) must not orphan the fallback value for the same branch.
Expand DownExpand Up@@ -1089,6 +1123,7 @@ export const make = Effect.gen(function* () {
 ? yield* lookupStatusPr(cwd, {
 branch: details.branch,
 upstreamRef: details.upstreamRef,
 defaultBranch: details.defaultBranch,
 isDefaultBranch: details.isDefaultBranch,
 })
 : null;
Expand Down

1 change: 1 addition & 0 deletions
apps/server/src/vcs/GitVcsDriver.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,6 +72,7 @@ export interface GitStatusDetails {

export interface GitRemoteStatusDetails {
 isRepo: boolean;
 defaultBranch: string | null;
 isDefaultBranch: boolean;
 branch: string | null;
 upstreamRef: string | null;
Expand Down

2 changes: 2 additions & 0 deletions
apps/server/src/vcs/GitVcsDriverCore.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,6 +89,7 @@ const NON_REPOSITORY_STATUS_DETAILS = Object.freeze<GitVcsDriver.GitStatusDetail
});
const NON_REPOSITORY_REMOTE_STATUS_DETAILS = Object.freeze<GitVcsDriver.GitRemoteStatusDetails>({
 isRepo: false,
 defaultBranch: null,
 isDefaultBranch: false,
 branch: null,
 upstreamRef: null,
Expand DownExpand Up@@ -1550,6 +1551,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*

 return {
 isRepo: true,
 defaultBranch,
 isDefaultBranch,
 branch,
 upstreamRef,
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
fix(server): avoid PRs inherited from default upstreams#7317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

maria-rcks
merged 5 commits into

from

Aug 18, 2026
 Merged


fix(server): avoid PRs inherited from default upstreams
#7317
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
a09ef3c

fix(server): avoid PRs inherited from default upstreams


gsimone Aug 17, 2026
476a568

fix(server): preserve default-named fork PRs


gsimone Aug 17, 2026
5f03ff7

Merge branch 'main' into t3code/fix-wrong-pr-autosettle


gsimone Aug 18, 2026
54bca01

Merge branch 'main' into t3code/fix-wrong-pr-autosettle


gsimone Aug 18, 2026
81a3765

Merge branch 'main' into t3code/fix-wrong-pr-autosettle


gsimone Aug 18, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


102 changes: 102 additions & 0 deletions
apps/server/src/git/GitManager.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1129,6 +1129,71 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
 20_000,
 );

 it.effect(
 "status preserves a fork PR whose head is named after the default branch",
 () =>
 Effect.gen(function* () {
 const repoDir = yield* makeTempDir("t3code-git-manager-");
 yield* initRepo(repoDir);
 const originDir = yield* createBareRemote();
 const forkDir = yield* createBareRemote();
 yield* runGit(repoDir, ["remote", "add", "origin", originDir]);
 yield* runGit(repoDir, ["push", "-u", "origin", "main"]);
 yield* runGit(repoDir, ["remote", "set-head", "origin", "main"]);
 yield* runGit(repoDir, ["remote", "add", "fork-seed", forkDir]);
 yield* runGit(repoDir, ["push", "fork-seed", "main"]);
 yield* runGit(repoDir, ["checkout", "-b", "t3code/pr-777/main"]);
 yield* runGit(repoDir, ["branch", "--set-upstream-to", "fork-seed/main"]);
 yield* configureVisibleRemoteUrlWithLocalRewrite(
 repoDir,
 "fork-seed",
 "git@github.com:contributor/codething-mvp.git",
 forkDir,
 );

 const { manager, ghCalls } = yield* makeManager({
 ghScenario: {
 prListByHeadSelector: {
 // @effect-diagnostics-next-line preferSchemaOverJson:off
 "contributor:main": JSON.stringify([
 {
 number: 777,
 title: "Fork PR from main",
 url: "https://github.com/pingdotgg/codething-mvp/pull/777",
 baseRefName: "main",
 headRefName: "main",
 state: "OPEN",
 updatedAt: "2026-03-10T07:00:00Z",
 isCrossRepository: true,
 headRepository: {
 nameWithOwner: "contributor/codething-mvp",
 },
 headRepositoryOwner: {
 login: "contributor",
 },
 },
 ]),
 },
 },
 });

 const status = yield* manager.status({ cwd: repoDir });
 expect(status.refName).toBe("t3code/pr-777/main");
 expect(status.pr).toEqual({
 number: 777,
 title: "Fork PR from main",
 url: "https://github.com/pingdotgg/codething-mvp/pull/777",
 baseRef: "main",
 headRef: "main",
 state: "open",
 });
 expect(ghCalls).toContain(
 "pr list --head contributor:main --state all --limit 20 --json number,title,url,baseRefName,headRefName,state,mergedAt,updatedAt,isCrossRepository,headRepository,headRepositoryOwner",
 );
 }),
 20_000,
 );

 it.effect(
 "status ignores synthetic local branch aliases when the upstream remote name contains slashes",
 () =>
Expand DownExpand Up@@ -1315,6 +1380,43 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
 }),
 );

 it.effect("status does not inherit a merged PR from a feature branch's default upstream", () =>
 Effect.gen(function* () {
 const repoDir = yield* makeTempDir("t3code-git-manager-");
 yield* initRepo(repoDir);
 const remoteDir = yield* createBareRemote();
 yield* runGit(repoDir, ["remote", "add", "origin", remoteDir]);
 yield* runGit(repoDir, ["push", "-u", "origin", "main"]);
 yield* runGit(repoDir, ["remote", "set-head", "origin", "main"]);
 yield* runGit(repoDir, ["checkout", "-b", "feature/from-main", "origin/main"]);

 const { manager, ghCalls } = yield* makeManager({
 ghScenario: {
 prListSequence: [
 // @effect-diagnostics-next-line preferSchemaOverJson:off
 JSON.stringify([
 {
 number: 54,
 title: "Reverse merge from main",
 url: "https://github.com/pingdotgg/codething-mvp/pull/54",
 baseRefName: "je-filter-list",
 headRefName: "main",
 state: "MERGED",
 mergedAt: "2023-09-28T03:21:10Z",
 updatedAt: "2023-09-28T03:21:10Z",
 },
 ]),
 ],
 },
 });

 const status = yield* manager.status({ cwd: repoDir });
 expect(status.refName).toBe("feature/from-main");
 expect(status.pr).toBeNull();
 expect(ghCalls.some((call) => call.includes("pr list"))).toBe(false);
 }),
 );

 it.effect("status prefers open PR when merged PR has newer updatedAt", () =>
 Effect.gen(function* () {
 const repoDir = yield* makeTempDir("t3code-git-manager-");
Expand Down

47 changes: 41 additions & 6 deletions
apps/server/src/git/GitManager.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -904,11 +904,24 @@ export const make = Effect.gen(function* () {
 prLookupEpochByCwd.set(cacheKey, prLookupEpoch(cacheKey) + 1);
 }),
 );
 // Cache keys are NUL-joined [cwd, branch, upstreamRef, epoch] — none of the
 // Cache keys are NUL-joined [cwd, branch, upstreamRef, defaultBranch, epoch] — none of the
 // segments can contain a NUL byte, and refs are never empty, so "" decodes
 // back to a null upstreamRef.
 const prLookupCacheKey = (cwd: string, details: { branch: string; upstreamRef: string | null }) =>
 [cwd, details.branch, details.upstreamRef ?? "", String(prLookupEpoch(cwd))].join("\u0000");
 // back to a null ref.
 const prLookupCacheKey = (
 cwd: string,
 details: {
 branch: string;
 upstreamRef: string | null;
 defaultBranch: string | null;
 },
 ) =>
 [
 cwd,
 details.branch,
 details.upstreamRef ?? "",
 details.defaultBranch ?? "",
 String(prLookupEpoch(cwd)),
 ].join("\u0000");
 // Consecutive failures per cache key, so a branch that keeps failing waits
 // longer before the next attempt. Cleared as soon as a lookup succeeds.
 const prLookupFailureStreakByKey = new Map<string, number>();
Expand All@@ -928,13 +941,29 @@ export const make = Effect.gen(function* () {
 };
 const prLookupCache = yield* Cache.makeWith(
 (key: string) => {
 const [cwd = "", branch = "", upstreamRef = ""] = key.split("\u0000");
 const [cwd = "", branch = "", upstreamRef = "", defaultBranch = ""] = key.split("\u0000");
 const details = {
 branch,
 upstreamRef: upstreamRef.length > 0 ? upstreamRef : null,
 defaultBranch: defaultBranch.length > 0 ? defaultBranch : null,
 };
 return Effect.gen(function* () {
 const headContext = yield* resolveBranchHeadContext(cwd, details);
 const upstreamHeadIsDefault =
 headContext.headBranch === details.defaultBranch ||
 (details.defaultBranch === null &&
 (headContext.headBranch === "main" || headContext.headBranch === "master"));
 // `git worktree add -b feature origin/main` makes the new local branch
 // track origin/main. That upstream is the branch's base, not its
 // published PR head. Looking up PRs for it can attach an old reverse
 // merge from main and auto-settle an unrelated feature thread.
 if (
 headContext.headBranch !== details.branch &&
 upstreamHeadIsDefault &&
 !headContext.isCrossRepository
 ) {
 return { latest: null, headContext };
 }
 // Only skip when the branch is untracked as well: anything carrying an
 // upstream keeps the old behaviour.
 if (details.upstreamRef === null && (yield* isUnpublishedBranch(cwd, headContext))) {
Expand DownExpand Up@@ -1015,7 +1044,12 @@ export const make = Effect.gen(function* () {
 };
 const lookupStatusPr = Effect.fn("lookupStatusPr")(function* (
 cwd: string,
 details: { branch: string; upstreamRef: string | null; isDefaultBranch: boolean },
 details: {
 branch: string;
 upstreamRef: string | null;
 defaultBranch: string | null;
 isDefaultBranch: boolean;
 },
 ) {
 // Keyed by (cwd, branch) only: the upstream ref changing (e.g. a first
 // `push -u`) must not orphan the fallback value for the same branch.
Expand DownExpand Up@@ -1089,6 +1123,7 @@ export const make = Effect.gen(function* () {
 ? yield* lookupStatusPr(cwd, {
 branch: details.branch,
 upstreamRef: details.upstreamRef,
 defaultBranch: details.defaultBranch,
 isDefaultBranch: details.isDefaultBranch,
 })
 : null;
Expand Down

1 change: 1 addition & 0 deletions
apps/server/src/vcs/GitVcsDriver.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,6 +72,7 @@ export interface GitStatusDetails {

export interface GitRemoteStatusDetails {
 isRepo: boolean;
 defaultBranch: string | null;
 isDefaultBranch: boolean;
 branch: string | null;
 upstreamRef: string | null;
Expand Down

2 changes: 2 additions & 0 deletions
apps/server/src/vcs/GitVcsDriverCore.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,6 +89,7 @@ const NON_REPOSITORY_STATUS_DETAILS = Object.freeze<GitVcsDriver.GitStatusDetail
});
const NON_REPOSITORY_REMOTE_STATUS_DETAILS = Object.freeze<GitVcsDriver.GitRemoteStatusDetails>({
 isRepo: false,
 defaultBranch: null,
 isDefaultBranch: false,
 branch: null,
 upstreamRef: null,
Expand DownExpand Up@@ -1550,6 +1551,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*

 return {
 isRepo: true,
 defaultBranch,
 isDefaultBranch,
 branch,
 upstreamRef,
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(server): avoid PRs inherited from default upstreams#7317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

maria-rcks
merged 5 commits into

from

Aug 18, 2026
 Merged


fix(server): avoid PRs inherited from default upstreams
#7317
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
a09ef3c

fix(server): avoid PRs inherited from default upstreams


gsimone Aug 17, 2026
476a568

fix(server): preserve default-named fork PRs


gsimone Aug 17, 2026
5f03ff7

Merge branch 'main' into t3code/fix-wrong-pr-autosettle


gsimone Aug 18, 2026
54bca01

Merge branch 'main' into t3code/fix-wrong-pr-autosettle


gsimone Aug 18, 2026
81a3765

Merge branch 'main' into t3code/fix-wrong-pr-autosettle


gsimone Aug 18, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


102 changes: 102 additions & 0 deletions
apps/server/src/git/GitManager.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1129,6 +1129,71 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
 20_000,
 );

 it.effect(
 "status preserves a fork PR whose head is named after the default branch",
 () =>
 Effect.gen(function* () {
 const repoDir = yield* makeTempDir("t3code-git-manager-");
 yield* initRepo(repoDir);
 const originDir = yield* createBareRemote();
 const forkDir = yield* createBareRemote();
 yield* runGit(repoDir, ["remote", "add", "origin", originDir]);
 yield* runGit(repoDir, ["push", "-u", "origin", "main"]);
 yield* runGit(repoDir, ["remote", "set-head", "origin", "main"]);
 yield* runGit(repoDir, ["remote", "add", "fork-seed", forkDir]);
 yield* runGit(repoDir, ["push", "fork-seed", "main"]);
 yield* runGit(repoDir, ["checkout", "-b", "t3code/pr-777/main"]);
 yield* runGit(repoDir, ["branch", "--set-upstream-to", "fork-seed/main"]);
 yield* configureVisibleRemoteUrlWithLocalRewrite(
 repoDir,
 "fork-seed",
 "git@github.com:contributor/codething-mvp.git",
 forkDir,
 );

 const { manager, ghCalls } = yield* makeManager({
 ghScenario: {
 prListByHeadSelector: {
 // @effect-diagnostics-next-line preferSchemaOverJson:off
 "contributor:main": JSON.stringify([
 {
 number: 777,
 title: "Fork PR from main",
 url: "https://github.com/pingdotgg/codething-mvp/pull/777",
 baseRefName: "main",
 headRefName: "main",
 state: "OPEN",
 updatedAt: "2026-03-10T07:00:00Z",
 isCrossRepository: true,
 headRepository: {
 nameWithOwner: "contributor/codething-mvp",
 },
 headRepositoryOwner: {
 login: "contributor",
 },
 },
 ]),
 },
 },
 });

 const status = yield* manager.status({ cwd: repoDir });
 expect(status.refName).toBe("t3code/pr-777/main");
 expect(status.pr).toEqual({
 number: 777,
 title: "Fork PR from main",
 url: "https://github.com/pingdotgg/codething-mvp/pull/777",
 baseRef: "main",
 headRef: "main",
 state: "open",
 });
 expect(ghCalls).toContain(
 "pr list --head contributor:main --state all --limit 20 --json number,title,url,baseRefName,headRefName,state,mergedAt,updatedAt,isCrossRepository,headRepository,headRepositoryOwner",
 );
 }),
 20_000,
 );

 it.effect(
 "status ignores synthetic local branch aliases when the upstream remote name contains slashes",
 () =>
Expand DownExpand Up@@ -1315,6 +1380,43 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
 }),
 );

 it.effect("status does not inherit a merged PR from a feature branch's default upstream", () =>
 Effect.gen(function* () {
 const repoDir = yield* makeTempDir("t3code-git-manager-");
 yield* initRepo(repoDir);
 const remoteDir = yield* createBareRemote();
 yield* runGit(repoDir, ["remote", "add", "origin", remoteDir]);
 yield* runGit(repoDir, ["push", "-u", "origin", "main"]);
 yield* runGit(repoDir, ["remote", "set-head", "origin", "main"]);
 yield* runGit(repoDir, ["checkout", "-b", "feature/from-main", "origin/main"]);

 const { manager, ghCalls } = yield* makeManager({
 ghScenario: {
 prListSequence: [
 // @effect-diagnostics-next-line preferSchemaOverJson:off
 JSON.stringify([
 {
 number: 54,
 title: "Reverse merge from main",
 url: "https://github.com/pingdotgg/codething-mvp/pull/54",
 baseRefName: "je-filter-list",
 headRefName: "main",
 state: "MERGED",
 mergedAt: "2023-09-28T03:21:10Z",
 updatedAt: "2023-09-28T03:21:10Z",
 },
 ]),
 ],
 },
 });

 const status = yield* manager.status({ cwd: repoDir });
 expect(status.refName).toBe("feature/from-main");
 expect(status.pr).toBeNull();
 expect(ghCalls.some((call) => call.includes("pr list"))).toBe(false);
 }),
 );

 it.effect("status prefers open PR when merged PR has newer updatedAt", () =>
 Effect.gen(function* () {
 const repoDir = yield* makeTempDir("t3code-git-manager-");
Expand Down

47 changes: 41 additions & 6 deletions
apps/server/src/git/GitManager.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -904,11 +904,24 @@ export const make = Effect.gen(function* () {
 prLookupEpochByCwd.set(cacheKey, prLookupEpoch(cacheKey) + 1);
 }),
 );
 // Cache keys are NUL-joined [cwd, branch, upstreamRef, epoch] — none of the
 // Cache keys are NUL-joined [cwd, branch, upstreamRef, defaultBranch, epoch] — none of the
 // segments can contain a NUL byte, and refs are never empty, so "" decodes
 // back to a null upstreamRef.
 const prLookupCacheKey = (cwd: string, details: { branch: string; upstreamRef: string | null }) =>
 [cwd, details.branch, details.upstreamRef ?? "", String(prLookupEpoch(cwd))].join("\u0000");
 // back to a null ref.
 const prLookupCacheKey = (
 cwd: string,
 details: {
 branch: string;
 upstreamRef: string | null;
 defaultBranch: string | null;
 },
 ) =>
 [
 cwd,
 details.branch,
 details.upstreamRef ?? "",
 details.defaultBranch ?? "",
 String(prLookupEpoch(cwd)),
 ].join("\u0000");
 // Consecutive failures per cache key, so a branch that keeps failing waits
 // longer before the next attempt. Cleared as soon as a lookup succeeds.
 const prLookupFailureStreakByKey = new Map<string, number>();
Expand All@@ -928,13 +941,29 @@ export const make = Effect.gen(function* () {
 };
 const prLookupCache = yield* Cache.makeWith(
 (key: string) => {
 const [cwd = "", branch = "", upstreamRef = ""] = key.split("\u0000");
 const [cwd = "", branch = "", upstreamRef = "", defaultBranch = ""] = key.split("\u0000");
 const details = {
 branch,
 upstreamRef: upstreamRef.length > 0 ? upstreamRef : null,
 defaultBranch: defaultBranch.length > 0 ? defaultBranch : null,
 };
 return Effect.gen(function* () {
 const headContext = yield* resolveBranchHeadContext(cwd, details);
 const upstreamHeadIsDefault =
 headContext.headBranch === details.defaultBranch ||
 (details.defaultBranch === null &&
 (headContext.headBranch === "main" || headContext.headBranch === "master"));
 // `git worktree add -b feature origin/main` makes the new local branch
 // track origin/main. That upstream is the branch's base, not its
 // published PR head. Looking up PRs for it can attach an old reverse
 // merge from main and auto-settle an unrelated feature thread.
 if (
 headContext.headBranch !== details.branch &&
 upstreamHeadIsDefault &&
 !headContext.isCrossRepository
 ) {
 return { latest: null, headContext };
 }
 // Only skip when the branch is untracked as well: anything carrying an
 // upstream keeps the old behaviour.
 if (details.upstreamRef === null && (yield* isUnpublishedBranch(cwd, headContext))) {
Expand DownExpand Up@@ -1015,7 +1044,12 @@ export const make = Effect.gen(function* () {
 };
 const lookupStatusPr = Effect.fn("lookupStatusPr")(function* (
 cwd: string,
 details: { branch: string; upstreamRef: string | null; isDefaultBranch: boolean },
 details: {
 branch: string;
 upstreamRef: string | null;
 defaultBranch: string | null;
 isDefaultBranch: boolean;
 },
 ) {
 // Keyed by (cwd, branch) only: the upstream ref changing (e.g. a first
 // `push -u`) must not orphan the fallback value for the same branch.
Expand DownExpand Up@@ -1089,6 +1123,7 @@ export const make = Effect.gen(function* () {
 ? yield* lookupStatusPr(cwd, {
 branch: details.branch,
 upstreamRef: details.upstreamRef,
 defaultBranch: details.defaultBranch,
 isDefaultBranch: details.isDefaultBranch,
 })
 : null;
Expand Down

1 change: 1 addition & 0 deletions
apps/server/src/vcs/GitVcsDriver.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,6 +72,7 @@ export interface GitStatusDetails {

export interface GitRemoteStatusDetails {
 isRepo: boolean;
 defaultBranch: string | null;
 isDefaultBranch: boolean;
 branch: string | null;
 upstreamRef: string | null;
Expand Down

2 changes: 2 additions & 0 deletions
apps/server/src/vcs/GitVcsDriverCore.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,6 +89,7 @@ const NON_REPOSITORY_STATUS_DETAILS = Object.freeze<GitVcsDriver.GitStatusDetail
});
const NON_REPOSITORY_REMOTE_STATUS_DETAILS = Object.freeze<GitVcsDriver.GitRemoteStatusDetails>({
 isRepo: false,
 defaultBranch: null,
 isDefaultBranch: false,
 branch: null,
 upstreamRef: null,
Expand DownExpand Up@@ -1550,6 +1551,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*

 return {
 isRepo: true,
 defaultBranch,
 isDefaultBranch,
 branch,
 upstreamRef,
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(server): avoid PRs inherited from default upstreams#7317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

maria-rcks
merged 5 commits into

from

Aug 18, 2026
 Merged


fix(server): avoid PRs inherited from default upstreams
#7317
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
a09ef3c

fix(server): avoid PRs inherited from default upstreams


gsimone Aug 17, 2026
476a568

fix(server): preserve default-named fork PRs


gsimone Aug 17, 2026
5f03ff7

Merge branch 'main' into t3code/fix-wrong-pr-autosettle


gsimone Aug 18, 2026
54bca01

Merge branch 'main' into t3code/fix-wrong-pr-autosettle


gsimone Aug 18, 2026
81a3765

Merge branch 'main' into t3code/fix-wrong-pr-autosettle


gsimone Aug 18, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


102 changes: 102 additions & 0 deletions
apps/server/src/git/GitManager.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1129,6 +1129,71 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
 20_000,
 );

 it.effect(
 "status preserves a fork PR whose head is named after the default branch",
 () =>
 Effect.gen(function* () {
 const repoDir = yield* makeTempDir("t3code-git-manager-");
 yield* initRepo(repoDir);
 const originDir = yield* createBareRemote();
 const forkDir = yield* createBareRemote();
 yield* runGit(repoDir, ["remote", "add", "origin", originDir]);
 yield* runGit(repoDir, ["push", "-u", "origin", "main"]);
 yield* runGit(repoDir, ["remote", "set-head", "origin", "main"]);
 yield* runGit(repoDir, ["remote", "add", "fork-seed", forkDir]);
 yield* runGit(repoDir, ["push", "fork-seed", "main"]);
 yield* runGit(repoDir, ["checkout", "-b", "t3code/pr-777/main"]);
 yield* runGit(repoDir, ["branch", "--set-upstream-to", "fork-seed/main"]);
 yield* configureVisibleRemoteUrlWithLocalRewrite(
 repoDir,
 "fork-seed",
 "git@github.com:contributor/codething-mvp.git",
 forkDir,
 );

 const { manager, ghCalls } = yield* makeManager({
 ghScenario: {
 prListByHeadSelector: {
 // @effect-diagnostics-next-line preferSchemaOverJson:off
 "contributor:main": JSON.stringify([
 {
 number: 777,
 title: "Fork PR from main",
 url: "https://github.com/pingdotgg/codething-mvp/pull/777",
 baseRefName: "main",
 headRefName: "main",
 state: "OPEN",
 updatedAt: "2026-03-10T07:00:00Z",
 isCrossRepository: true,
 headRepository: {
 nameWithOwner: "contributor/codething-mvp",
 },
 headRepositoryOwner: {
 login: "contributor",
 },
 },
 ]),
 },
 },
 });

 const status = yield* manager.status({ cwd: repoDir });
 expect(status.refName).toBe("t3code/pr-777/main");
 expect(status.pr).toEqual({
 number: 777,
 title: "Fork PR from main",
 url: "https://github.com/pingdotgg/codething-mvp/pull/777",
 baseRef: "main",
 headRef: "main",
 state: "open",
 });
 expect(ghCalls).toContain(
 "pr list --head contributor:main --state all --limit 20 --json number,title,url,baseRefName,headRefName,state,mergedAt,updatedAt,isCrossRepository,headRepository,headRepositoryOwner",
 );
 }),
 20_000,
 );

 it.effect(
 "status ignores synthetic local branch aliases when the upstream remote name contains slashes",
 () =>
Expand DownExpand Up@@ -1315,6 +1380,43 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
 }),
 );

 it.effect("status does not inherit a merged PR from a feature branch's default upstream", () =>
 Effect.gen(function* () {
 const repoDir = yield* makeTempDir("t3code-git-manager-");
 yield* initRepo(repoDir);
 const remoteDir = yield* createBareRemote();
 yield* runGit(repoDir, ["remote", "add", "origin", remoteDir]);
 yield* runGit(repoDir, ["push", "-u", "origin", "main"]);
 yield* runGit(repoDir, ["remote", "set-head", "origin", "main"]);
 yield* runGit(repoDir, ["checkout", "-b", "feature/from-main", "origin/main"]);

 const { manager, ghCalls } = yield* makeManager({
 ghScenario: {
 prListSequence: [
 // @effect-diagnostics-next-line preferSchemaOverJson:off
 JSON.stringify([
 {
 number: 54,
 title: "Reverse merge from main",
 url: "https://github.com/pingdotgg/codething-mvp/pull/54",
 baseRefName: "je-filter-list",
 headRefName: "main",
 state: "MERGED",
 mergedAt: "2023-09-28T03:21:10Z",
 updatedAt: "2023-09-28T03:21:10Z",
 },
 ]),
 ],
 },
 });

 const status = yield* manager.status({ cwd: repoDir });
 expect(status.refName).toBe("feature/from-main");
 expect(status.pr).toBeNull();
 expect(ghCalls.some((call) => call.includes("pr list"))).toBe(false);
 }),
 );

 it.effect("status prefers open PR when merged PR has newer updatedAt", () =>
 Effect.gen(function* () {
 const repoDir = yield* makeTempDir("t3code-git-manager-");
Expand Down

47 changes: 41 additions & 6 deletions
apps/server/src/git/GitManager.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -904,11 +904,24 @@ export const make = Effect.gen(function* () {
 prLookupEpochByCwd.set(cacheKey, prLookupEpoch(cacheKey) + 1);
 }),
 );
 // Cache keys are NUL-joined [cwd, branch, upstreamRef, epoch] — none of the
 // Cache keys are NUL-joined [cwd, branch, upstreamRef, defaultBranch, epoch] — none of the
 // segments can contain a NUL byte, and refs are never empty, so "" decodes
 // back to a null upstreamRef.
 const prLookupCacheKey = (cwd: string, details: { branch: string; upstreamRef: string | null }) =>
 [cwd, details.branch, details.upstreamRef ?? "", String(prLookupEpoch(cwd))].join("\u0000");
 // back to a null ref.
 const prLookupCacheKey = (
 cwd: string,
 details: {
 branch: string;
 upstreamRef: string | null;
 defaultBranch: string | null;
 },
 ) =>
 [
 cwd,
 details.branch,
 details.upstreamRef ?? "",
 details.defaultBranch ?? "",
 String(prLookupEpoch(cwd)),
 ].join("\u0000");
 // Consecutive failures per cache key, so a branch that keeps failing waits
 // longer before the next attempt. Cleared as soon as a lookup succeeds.
 const prLookupFailureStreakByKey = new Map<string, number>();
Expand All@@ -928,13 +941,29 @@ export const make = Effect.gen(function* () {
 };
 const prLookupCache = yield* Cache.makeWith(
 (key: string) => {
 const [cwd = "", branch = "", upstreamRef = ""] = key.split("\u0000");
 const [cwd = "", branch = "", upstreamRef = "", defaultBranch = ""] = key.split("\u0000");
 const details = {
 branch,
 upstreamRef: upstreamRef.length > 0 ? upstreamRef : null,
 defaultBranch: defaultBranch.length > 0 ? defaultBranch : null,
 };
 return Effect.gen(function* () {
 const headContext = yield* resolveBranchHeadContext(cwd, details);
 const upstreamHeadIsDefault =
 headContext.headBranch === details.defaultBranch ||
 (details.defaultBranch === null &&
 (headContext.headBranch === "main" || headContext.headBranch === "master"));
 // `git worktree add -b feature origin/main` makes the new local branch
 // track origin/main. That upstream is the branch's base, not its
 // published PR head. Looking up PRs for it can attach an old reverse
 // merge from main and auto-settle an unrelated feature thread.
 if (
 headContext.headBranch !== details.branch &&
 upstreamHeadIsDefault &&
 !headContext.isCrossRepository
 ) {
 return { latest: null, headContext };
 }
 // Only skip when the branch is untracked as well: anything carrying an
 // upstream keeps the old behaviour.
 if (details.upstreamRef === null && (yield* isUnpublishedBranch(cwd, headContext))) {
Expand DownExpand Up@@ -1015,7 +1044,12 @@ export const make = Effect.gen(function* () {
 };
 const lookupStatusPr = Effect.fn("lookupStatusPr")(function* (
 cwd: string,
 details: { branch: string; upstreamRef: string | null; isDefaultBranch: boolean },
 details: {
 branch: string;
 upstreamRef: string | null;
 defaultBranch: string | null;
 isDefaultBranch: boolean;
 },
 ) {
 // Keyed by (cwd, branch) only: the upstream ref changing (e.g. a first
 // `push -u`) must not orphan the fallback value for the same branch.
Expand DownExpand Up@@ -1089,6 +1123,7 @@ export const make = Effect.gen(function* () {
 ? yield* lookupStatusPr(cwd, {
 branch: details.branch,
 upstreamRef: details.upstreamRef,
 defaultBranch: details.defaultBranch,
 isDefaultBranch: details.isDefaultBranch,
 })
 : null;
Expand Down

1 change: 1 addition & 0 deletions
apps/server/src/vcs/GitVcsDriver.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,6 +72,7 @@ export interface GitStatusDetails {

export interface GitRemoteStatusDetails {
 isRepo: boolean;
 defaultBranch: string | null;
 isDefaultBranch: boolean;
 branch: string | null;
 upstreamRef: string | null;
Expand Down

2 changes: 2 additions & 0 deletions
apps/server/src/vcs/GitVcsDriverCore.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,6 +89,7 @@ const NON_REPOSITORY_STATUS_DETAILS = Object.freeze<GitVcsDriver.GitStatusDetail
});
const NON_REPOSITORY_REMOTE_STATUS_DETAILS = Object.freeze<GitVcsDriver.GitRemoteStatusDetails>({
 isRepo: false,
 defaultBranch: null,
 isDefaultBranch: false,
 branch: null,
 upstreamRef: null,
Expand DownExpand Up@@ -1550,6 +1551,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*

 return {
 isRepo: true,
 defaultBranch,
 isDefaultBranch,
 branch,
 upstreamRef,
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
fix(server): avoid PRs inherited from default upstreams#7317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

maria-rcks
merged 5 commits into

from

Aug 18, 2026
 Merged


fix(server): avoid PRs inherited from default upstreams
#7317
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
a09ef3c

fix(server): avoid PRs inherited from default upstreams


gsimone Aug 17, 2026
476a568

fix(server): preserve default-named fork PRs


gsimone Aug 17, 2026
5f03ff7

Merge branch 'main' into t3code/fix-wrong-pr-autosettle


gsimone Aug 18, 2026
54bca01

Merge branch 'main' into t3code/fix-wrong-pr-autosettle


gsimone Aug 18, 2026
81a3765

Merge branch 'main' into t3code/fix-wrong-pr-autosettle


gsimone Aug 18, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


102 changes: 102 additions & 0 deletions
apps/server/src/git/GitManager.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1129,6 +1129,71 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
 20_000,
 );

 it.effect(
 "status preserves a fork PR whose head is named after the default branch",
 () =>
 Effect.gen(function* () {
 const repoDir = yield* makeTempDir("t3code-git-manager-");
 yield* initRepo(repoDir);
 const originDir = yield* createBareRemote();
 const forkDir = yield* createBareRemote();
 yield* runGit(repoDir, ["remote", "add", "origin", originDir]);
 yield* runGit(repoDir, ["push", "-u", "origin", "main"]);
 yield* runGit(repoDir, ["remote", "set-head", "origin", "main"]);
 yield* runGit(repoDir, ["remote", "add", "fork-seed", forkDir]);
 yield* runGit(repoDir, ["push", "fork-seed", "main"]);
 yield* runGit(repoDir, ["checkout", "-b", "t3code/pr-777/main"]);
 yield* runGit(repoDir, ["branch", "--set-upstream-to", "fork-seed/main"]);
 yield* configureVisibleRemoteUrlWithLocalRewrite(
 repoDir,
 "fork-seed",
 "git@github.com:contributor/codething-mvp.git",
 forkDir,
 );

 const { manager, ghCalls } = yield* makeManager({
 ghScenario: {
 prListByHeadSelector: {
 // @effect-diagnostics-next-line preferSchemaOverJson:off
 "contributor:main": JSON.stringify([
 {
 number: 777,
 title: "Fork PR from main",
 url: "https://github.com/pingdotgg/codething-mvp/pull/777",
 baseRefName: "main",
 headRefName: "main",
 state: "OPEN",
 updatedAt: "2026-03-10T07:00:00Z",
 isCrossRepository: true,
 headRepository: {
 nameWithOwner: "contributor/codething-mvp",
 },
 headRepositoryOwner: {
 login: "contributor",
 },
 },
 ]),
 },
 },
 });

 const status = yield* manager.status({ cwd: repoDir });
 expect(status.refName).toBe("t3code/pr-777/main");
 expect(status.pr).toEqual({
 number: 777,
 title: "Fork PR from main",
 url: "https://github.com/pingdotgg/codething-mvp/pull/777",
 baseRef: "main",
 headRef: "main",
 state: "open",
 });
 expect(ghCalls).toContain(
 "pr list --head contributor:main --state all --limit 20 --json number,title,url,baseRefName,headRefName,state,mergedAt,updatedAt,isCrossRepository,headRepository,headRepositoryOwner",
 );
 }),
 20_000,
 );

 it.effect(
 "status ignores synthetic local branch aliases when the upstream remote name contains slashes",
 () =>
Expand DownExpand Up@@ -1315,6 +1380,43 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
 }),
 );

 it.effect("status does not inherit a merged PR from a feature branch's default upstream", () =>
 Effect.gen(function* () {
 const repoDir = yield* makeTempDir("t3code-git-manager-");
 yield* initRepo(repoDir);
 const remoteDir = yield* createBareRemote();
 yield* runGit(repoDir, ["remote", "add", "origin", remoteDir]);
 yield* runGit(repoDir, ["push", "-u", "origin", "main"]);
 yield* runGit(repoDir, ["remote", "set-head", "origin", "main"]);
 yield* runGit(repoDir, ["checkout", "-b", "feature/from-main", "origin/main"]);

 const { manager, ghCalls } = yield* makeManager({
 ghScenario: {
 prListSequence: [
 // @effect-diagnostics-next-line preferSchemaOverJson:off
 JSON.stringify([
 {
 number: 54,
 title: "Reverse merge from main",
 url: "https://github.com/pingdotgg/codething-mvp/pull/54",
 baseRefName: "je-filter-list",
 headRefName: "main",
 state: "MERGED",
 mergedAt: "2023-09-28T03:21:10Z",
 updatedAt: "2023-09-28T03:21:10Z",
 },
 ]),
 ],
 },
 });

 const status = yield* manager.status({ cwd: repoDir });
 expect(status.refName).toBe("feature/from-main");
 expect(status.pr).toBeNull();
 expect(ghCalls.some((call) => call.includes("pr list"))).toBe(false);
 }),
 );

 it.effect("status prefers open PR when merged PR has newer updatedAt", () =>
 Effect.gen(function* () {
 const repoDir = yield* makeTempDir("t3code-git-manager-");
Expand Down

47 changes: 41 additions & 6 deletions
apps/server/src/git/GitManager.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -904,11 +904,24 @@ export const make = Effect.gen(function* () {
 prLookupEpochByCwd.set(cacheKey, prLookupEpoch(cacheKey) + 1);
 }),
 );
 // Cache keys are NUL-joined [cwd, branch, upstreamRef, epoch] — none of the
 // Cache keys are NUL-joined [cwd, branch, upstreamRef, defaultBranch, epoch] — none of the
 // segments can contain a NUL byte, and refs are never empty, so "" decodes
 // back to a null upstreamRef.
 const prLookupCacheKey = (cwd: string, details: { branch: string; upstreamRef: string | null }) =>
 [cwd, details.branch, details.upstreamRef ?? "", String(prLookupEpoch(cwd))].join("\u0000");
 // back to a null ref.
 const prLookupCacheKey = (
 cwd: string,
 details: {
 branch: string;
 upstreamRef: string | null;
 defaultBranch: string | null;
 },
 ) =>
 [
 cwd,
 details.branch,
 details.upstreamRef ?? "",
 details.defaultBranch ?? "",
 String(prLookupEpoch(cwd)),
 ].join("\u0000");
 // Consecutive failures per cache key, so a branch that keeps failing waits
 // longer before the next attempt. Cleared as soon as a lookup succeeds.
 const prLookupFailureStreakByKey = new Map<string, number>();
Expand All@@ -928,13 +941,29 @@ export const make = Effect.gen(function* () {
 };
 const prLookupCache = yield* Cache.makeWith(
 (key: string) => {
 const [cwd = "", branch = "", upstreamRef = ""] = key.split("\u0000");
 const [cwd = "", branch = "", upstreamRef = "", defaultBranch = ""] = key.split("\u0000");
 const details = {
 branch,
 upstreamRef: upstreamRef.length > 0 ? upstreamRef : null,
 defaultBranch: defaultBranch.length > 0 ? defaultBranch : null,
 };
 return Effect.gen(function* () {
 const headContext = yield* resolveBranchHeadContext(cwd, details);
 const upstreamHeadIsDefault =
 headContext.headBranch === details.defaultBranch ||
 (details.defaultBranch === null &&
 (headContext.headBranch === "main" || headContext.headBranch === "master"));
 // `git worktree add -b feature origin/main` makes the new local branch
 // track origin/main. That upstream is the branch's base, not its
 // published PR head. Looking up PRs for it can attach an old reverse
 // merge from main and auto-settle an unrelated feature thread.
 if (
 headContext.headBranch !== details.branch &&
 upstreamHeadIsDefault &&
 !headContext.isCrossRepository
 ) {
 return { latest: null, headContext };
 }
 // Only skip when the branch is untracked as well: anything carrying an
 // upstream keeps the old behaviour.
 if (details.upstreamRef === null && (yield* isUnpublishedBranch(cwd, headContext))) {
Expand DownExpand Up@@ -1015,7 +1044,12 @@ export const make = Effect.gen(function* () {
 };
 const lookupStatusPr = Effect.fn("lookupStatusPr")(function* (
 cwd: string,
 details: { branch: string; upstreamRef: string | null; isDefaultBranch: boolean },
 details: {
 branch: string;
 upstreamRef: string | null;
 defaultBranch: string | null;
 isDefaultBranch: boolean;
 },
 ) {
 // Keyed by (cwd, branch) only: the upstream ref changing (e.g. a first
 // `push -u`) must not orphan the fallback value for the same branch.
Expand DownExpand Up@@ -1089,6 +1123,7 @@ export const make = Effect.gen(function* () {
 ? yield* lookupStatusPr(cwd, {
 branch: details.branch,
 upstreamRef: details.upstreamRef,
 defaultBranch: details.defaultBranch,
 isDefaultBranch: details.isDefaultBranch,
 })
 : null;
Expand Down

1 change: 1 addition & 0 deletions
apps/server/src/vcs/GitVcsDriver.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,6 +72,7 @@ export interface GitStatusDetails {

export interface GitRemoteStatusDetails {
 isRepo: boolean;
 defaultBranch: string | null;
 isDefaultBranch: boolean;
 branch: string | null;
 upstreamRef: string | null;
Expand Down

2 changes: 2 additions & 0 deletions
apps/server/src/vcs/GitVcsDriverCore.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,6 +89,7 @@ const NON_REPOSITORY_STATUS_DETAILS = Object.freeze<GitVcsDriver.GitStatusDetail
});
const NON_REPOSITORY_REMOTE_STATUS_DETAILS = Object.freeze<GitVcsDriver.GitRemoteStatusDetails>({
 isRepo: false,
 defaultBranch: null,
 isDefaultBranch: false,
 branch: null,
 upstreamRef: null,
Expand DownExpand Up@@ -1550,6 +1551,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*

 return {
 isRepo: true,
 defaultBranch,
 isDefaultBranch,
 branch,
 upstreamRef,
Expand Down
Loading