Skip to content

Commit a81f93a

Browse files
committed
fix(server): fetch worktree base branch's own remote during bootstrap
1 parent 0fbb942 commit a81f93a

2 files changed

Lines changed: 159 additions & 13 deletions

File tree

‎apps/server/src/server.test.ts‎

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8675,6 +8675,125 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
86758675
}).pipe(Effect.provide(NodeHttpServer.layerTest)),
86768676
);
86778677

8678+
it.effect.each([
8679+
{
8680+
caseName: "a non-origin remote base",
8681+
baseBranch: "upstream/main",
8682+
fetchRemoteName: "upstream",
8683+
lookupRefName: "main",
8684+
remoteRefName: "upstream/main",
8685+
},
8686+
{
8687+
caseName: "an origin-prefixed base",
8688+
baseBranch: "origin/main",
8689+
fetchRemoteName: "origin",
8690+
lookupRefName: "main",
8691+
remoteRefName: "origin/main",
8692+
},
8693+
])(
8694+
"fetches the base branch's own remote for $caseName",
8695+
({ baseBranch, fetchRemoteName, lookupRefName, remoteRefName }) =>
8696+
Effect.gen(function* () {
8697+
const fetchedCommit = "abcdef0123456789abcdef0123456789abcdef01";
8698+
const remoteExists = vi.fn(
8699+
(_: Parameters<GitVcsDriver.GitVcsDriver["Service"]["remoteExists"]>[0]) =>
8700+
Effect.succeed(true),
8701+
);
8702+
const fetchRemote = vi.fn(
8703+
(_: Parameters<GitVcsDriver.GitVcsDriver["Service"]["fetchRemote"]>[0]) => Effect.void,
8704+
);
8705+
const remoteBranchExists = vi.fn(
8706+
(_: Parameters<GitVcsDriver.GitVcsDriver["Service"]["remoteBranchExists"]>[0]) =>
8707+
Effect.succeed(true),
8708+
);
8709+
const resolveRemoteTrackingCommit = vi.fn(
8710+
(_: Parameters<GitVcsDriver.GitVcsDriver["Service"]["resolveRemoteTrackingCommit"]>[0]) =>
8711+
Effect.succeed({
8712+
commitSha: fetchedCommit,
8713+
remoteRefName,
8714+
}),
8715+
);
8716+
const createWorktree = vi.fn(
8717+
(_: Parameters<GitVcsDriver.GitVcsDriver["Service"]["createWorktree"]>[0]) =>
8718+
Effect.succeed({
8719+
worktree: {
8720+
refName: "t3code/bootstrap-refName",
8721+
path: "/tmp/bootstrap-worktree",
8722+
},
8723+
}),
8724+
);
8725+
8726+
yield* buildAppUnderTest({
8727+
layers: {
8728+
gitVcsDriver: {
8729+
remoteExists,
8730+
fetchRemote,
8731+
remoteBranchExists,
8732+
resolveRemoteTrackingCommit,
8733+
createWorktree,
8734+
},
8735+
orchestrationEngine: {
8736+
dispatch: (command: OrchestrationCommand) =>
8737+
Effect.sync(() => ({ sequence: 1 })),
8738+
readEvents: () => Stream.empty,
8739+
},
8740+
},
8741+
});
8742+
8743+
const createdAt = "2026-01-01T00:00:00.000Z";
8744+
const wsUrl = yield* getWsServerUrl("/ws");
8745+
yield* Effect.scoped(
8746+
withWsRpcClient(wsUrl, (client) =>
8747+
client[ORCHESTRATION_WS_METHODS.dispatchCommand]({
8748+
type: "thread.turn.start",
8749+
commandId: CommandId.make("cmd-bootstrap-turn-start-remote-base"),
8750+
threadId: ThreadId.make("thread-bootstrap-remote-base"),
8751+
message: {
8752+
messageId: MessageId.make("msg-bootstrap-remote-base"),
8753+
role: "user",
8754+
text: "hello",
8755+
attachments: [],
8756+
},
8757+
modelSelection: defaultModelSelection,
8758+
runtimeMode: "full-access",
8759+
interactionMode: "default",
8760+
bootstrap: {
8761+
prepareWorktree: {
8762+
projectCwd: "/tmp/project",
8763+
baseBranch,
8764+
branch: "t3code/bootstrap-refName",
8765+
startFromOrigin: true,
8766+
},
8767+
},
8768+
createdAt,
8769+
}),
8770+
),
8771+
);
8772+
8773+
assert.deepEqual(fetchRemote.mock.calls[0]?.[0], {
8774+
cwd: "/tmp/project",
8775+
remoteName: fetchRemoteName,
8776+
});
8777+
assert.deepEqual(remoteBranchExists.mock.calls[0]?.[0], {
8778+
cwd: "/tmp/project",
8779+
remoteName: fetchRemoteName,
8780+
refName: lookupRefName,
8781+
});
8782+
assert.deepEqual(resolveRemoteTrackingCommit.mock.calls[0]?.[0], {
8783+
cwd: "/tmp/project",
8784+
refName: baseBranch,
8785+
fallbackRemoteName: fetchRemoteName,
8786+
});
8787+
assert.deepEqual(createWorktree.mock.calls[0]?.[0], {
8788+
cwd: "/tmp/project",
8789+
refName: fetchedCommit,
8790+
newRefName: "t3code/bootstrap-refName",
8791+
baseRefName: baseBranch,
8792+
path: null,
8793+
});
8794+
}).pipe(Effect.provide(NodeHttpServer.layerTest)),
8795+
);
8796+
86788797
it.effect("records setup-script failures without aborting bootstrap turn start", () =>
86798798
Effect.gen(function* () {
86808799
const dispatchedCommands: Array<OrchestrationCommand> = [];

‎apps/server/src/ws.ts‎

Lines changed: 40 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1091,30 +1091,57 @@ const makeWsRpcLayer = (
10911091
}
10921092

10931093
if (bootstrap?.prepareWorktree) {
1094-
let worktreeBaseRef = bootstrap.prepareWorktree.baseBranch;
1094+
const baseBranch = bootstrap.prepareWorktree.baseBranch;
1095+
let worktreeBaseRef = baseBranch;
10951096
// "Start from origin" is a stored default; repos without the
10961097
// requested remote branch fall back to the local base branch.
1097-
const startFromOrigin =
1098-
bootstrap.prepareWorktree.startFromOrigin === true &&
1099-
(yield* gitWorkflow.remoteExists({
1100-
cwd: bootstrap.prepareWorktree.projectCwd,
1101-
remoteName: "origin",
1102-
}));
1103-
if (startFromOrigin) {
1098+
// The base may track a remote other than `origin` (e.g. `upstream/main`),
1099+
// so resolve the fetch target from the base ref instead of assuming `origin`.
1100+
// Otherwise we pay for a useless `fetch origin` and base the worktree
1101+
// on a stale ref while the real remote is never fetched.
1102+
const remotePrefix = baseBranch.includes("/")
1103+
? baseBranch.slice(0, baseBranch.indexOf("/"))
1104+
: null;
1105+
let fetchRemoteName: string | null = null;
1106+
if (bootstrap.prepareWorktree.startFromOrigin === true) {
1107+
if (
1108+
remotePrefix !== null &&
1109+
(yield* gitWorkflow.remoteExists({
1110+
cwd: bootstrap.prepareWorktree.projectCwd,
1111+
remoteName: remotePrefix,
1112+
}))
1113+
) {
1114+
fetchRemoteName = remotePrefix;
1115+
} else if (
1116+
yield* gitWorkflow.remoteExists({
1117+
cwd: bootstrap.prepareWorktree.projectCwd,
1118+
remoteName: "origin",
1119+
})
1120+
) {
1121+
fetchRemoteName = "origin";
1122+
}
1123+
}
1124+
if (fetchRemoteName !== null) {
11041125
yield* gitWorkflow.fetchRemote({
11051126
cwd: bootstrap.prepareWorktree.projectCwd,
1106-
remoteName: "origin",
1127+
remoteName: fetchRemoteName,
11071128
});
1129+
// remoteBranchExists concatenates refs/remotes/<remote>/<refName>,
1130+
// so strip the remote prefix when the base already carries it
1131+
// (`upstream/main` on `upstream` must look up `main`, not `upstream/main`).
1132+
const remoteRefName = baseBranch.startsWith(`${fetchRemoteName}/`)
1133+
? baseBranch.slice(fetchRemoteName.length + 1)
1134+
: baseBranch;
11081135
const remoteBaseExists = yield* gitWorkflow.remoteBranchExists({
11091136
cwd: bootstrap.prepareWorktree.projectCwd,
1110-
refName: bootstrap.prepareWorktree.baseBranch,
1111-
remoteName: "origin",
1137+
refName: remoteRefName,
1138+
remoteName: fetchRemoteName,
11121139
});
11131140
if (remoteBaseExists) {
11141141
const resolvedRemoteBase = yield* gitWorkflow.resolveRemoteTrackingCommit({
11151142
cwd: bootstrap.prepareWorktree.projectCwd,
1116-
refName: bootstrap.prepareWorktree.baseBranch,
1117-
fallbackRemoteName: "origin",
1143+
refName: baseBranch,
1144+
fallbackRemoteName: fetchRemoteName,
11181145
});
11191146
worktreeBaseRef = resolvedRemoteBase.commitSha;
11201147
}

0 commit comments

Comments
 (0)