@devries-cameron20 / t3code-1 / commits / adf31511e6
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

fix(server): restored worktrees find pushed thread work on a non-origin remote (#35769)

Julius Marminge committed Nov 12, 2026 at 17:50 UTC adf31511e678f0a638b4290c9e9351192a23be25
3 files changed +29 -6
apps/server/src/git/GitWorkflowService.ts
+8
@@ -95,6 +95,7 @@ export class GitWorkflowService extends Context.Service<
95 readonly remoteName: string;
96 readonly refName: string;
97 }) => Effect.Effect<boolean, GitCommandError>;
98 + readonly resolvePrimaryRemoteName: (cwd: string) => Effect.Effect<string, GitCommandError>;
99 readonly resolveRemoteTrackingCommit: (input: {
100 readonly cwd: string;
101 readonly refName: string;
@@ -450,6 +451,13 @@ export const make = Effect.gen(function* () {
451 Effect.andThen(git.remoteBranchExists(input)),
452 );
453 }),
454 + resolvePrimaryRemoteName: Effect.fn("GitWorkflowService.resolvePrimaryRemoteName")(
455 + function (cwd) {
456 + return ensureGitCommand("GitWorkflowService.resolvePrimaryRemoteName", cwd).pipe(
457 + Effect.andThen(git.resolvePrimaryRemoteName(cwd)),
458 + );
459 + },
460 + ),
461 resolveRemoteTrackingCommit: Effect.fn("GitWorkflowService.resolveRemoteTrackingCommit")(
462 function (input) {
463 return ensureGitCommand("GitWorkflowService.resolveRemoteTrackingCommit", input.cwd).pipe(
apps/server/src/orchestration-v2/ProviderTurnStartService.test.ts
+10
@@ -1137,6 +1137,12 @@ effectIt.effect(
1137 upstream: "refs/remotes/origin/feature/restore",
1138 base: "",
1139 },
1140 + "pushed-sole-remote": {
1141 + tip: threadTip,
1142 + file: "thread.txt",
1143 + upstream: "refs/remotes/upstream/feature/restore",
1144 + base: "",
1145 + },
1146 detached: { tip: baseTip, file: null, upstream: null, base: "main" },
1147 "detached-no-remote": { tip: projectTip, file: "project.txt", upstream: null, base: "" },
1148 } as const;
@@ -1151,7 +1157,11 @@ effectIt.effect(
1157 yield* git(workspaceRoot, ["switch", "--detach"]);
1158 expect(yield* git(workspaceRoot, ["branch", "--show-current"])).toBe("");
1159 }
1160 + if (scenario === "pushed-sole-remote") {
1161 + yield* git(workspaceRoot, ["remote", "rename", "origin", "upstream"]);
1162 + }
1163 if (scenario === "detached") {
1164 + yield* git(workspaceRoot, ["remote", "rename", "upstream", "origin"]);
1165 yield* git(workspaceRoot, ["push", "origin", "--delete", "feature/restore"]);
1166 }
1167 if (scenario === "detached-no-remote") {
apps/server/src/workspace/restoreMissingWorktree.ts
+11 -6
@@ -48,6 +48,7 @@ export const makeRestoreMissingWorktree = Effect.gen(function* () {
48
49 const resolveRecreateBase = Effect.fn("restoreMissingWorktree.resolveRecreateBase")(function* (
50 cwd: string,
51 + remoteName: string | null,
52 ) {
53 // Recovery can follow an external checkout, before the status cache expires.
54 yield* gitWorkflow.invalidateLocalStatus(cwd);
@@ -56,14 +57,15 @@ export const makeRestoreMissingWorktree = Effect.gen(function* () {
57 const refName = `refs/heads/${currentBranch}`;
58 return { refName, baseRefName: refName };
59 }
59 - if (yield* gitWorkflow.hasCommit({ cwd, refName: "refs/remotes/origin/HEAD" })) {
60 + const remoteHead = `refs/remotes/${remoteName}/HEAD`;
61 + if (remoteName !== null && (yield* gitWorkflow.hasCommit({ cwd, refName: remoteHead }))) {
62 const { commitSha } = yield* gitWorkflow.resolveRemoteTrackingCommit({
63 cwd,
64 refName: "HEAD",
63 - fallbackRemoteName: "origin",
65 + fallbackRemoteName: remoteName,
66 });
67 // Start from the commit so the thread branch does not track the default branch.
66 - return { refName: commitSha, baseRefName: "refs/remotes/origin/HEAD" };
68 + return { refName: commitSha, baseRefName: remoteHead };
69 }
70 if (yield* gitWorkflow.hasCommit({ cwd, refName: "HEAD" })) {
71 return { refName: "HEAD", baseRefName: undefined };
@@ -83,9 +85,12 @@ export const makeRestoreMissingWorktree = Effect.gen(function* () {
85 yield* gitWorkflow.createWorktree({ cwd, refName: branch, path: worktreePath });
86 return;
87 }
88 + const remoteName = yield* gitWorkflow
89 + .resolvePrimaryRemoteName(cwd)
90 + .pipe(Effect.orElseSucceed(() => null));
91 // Push keeps the tracking ref current, so recovery reads it without fetching.
87 - const pushedRef = `refs/remotes/origin/${branch}`;
88 - if (yield* gitWorkflow.hasCommit({ cwd, refName: pushedRef })) {
92 + const pushedRef = remoteName === null ? null : `refs/remotes/${remoteName}/${branch}`;
93 + if (pushedRef !== null && (yield* gitWorkflow.hasCommit({ cwd, refName: pushedRef }))) {
94 yield* gitWorkflow.createWorktree({
95 cwd,
96 refName: pushedRef,
@@ -94,7 +99,7 @@ export const makeRestoreMissingWorktree = Effect.gen(function* () {
99 });
100 return;
101 }
97 - const base = yield* resolveRecreateBase(cwd);
102 + const base = yield* resolveRecreateBase(cwd, remoteName);
103 if (base === null) {
104 return yield* new WorktreeRecreateNoBaseError({ worktreePath, branch });
105 }