Skip to content

Commit 1ed1257

Browse files
committed
fix(server): share fetches for start-from-origin launches
1 parent 0d91650 commit 1ed1257

3 files changed

Lines changed: 124 additions & 50 deletions

File tree

‎apps/server/src/orchestration-v2/ThreadLaunchService.test.ts‎

Lines changed: 56 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1019,9 +1019,9 @@ it.effect("runs a Scratch scheduled task saved with a worktree in its own folder
10191019
}).pipe(Effect.provide(harness.layer));
10201020
});
10211021

1022-
it.effect(
1023-
"bulk launches preserve occupied branches and paths while creating independent worktrees",
1024-
() =>
1022+
it.effect.each([false, true])(
1023+
"bulk launches preserve occupied work while creating independent worktrees (startFromOrigin: %s)",
1024+
(startFromOrigin) =>
10251025
Effect.gen(function* () {
10261026
const driver = yield* GitVcsDriver.GitVcsDriver;
10271027
const fs = yield* FileSystem.FileSystem;
@@ -1041,6 +1041,28 @@ it.effect(
10411041
"-m",
10421042
"initial",
10431043
]);
1044+
const localHead = (yield* git(["rev-parse", "HEAD"])).stdout.trim();
1045+
let remoteHead = localHead;
1046+
if (startFromOrigin) {
1047+
const remote = yield* fs.makeTempDirectoryScoped({ prefix: "launch-bulk-remote-" });
1048+
yield* git(["init", "--bare", remote]);
1049+
yield* git(["remote", "add", "origin", remote]);
1050+
yield* git(["push", "-u", "origin", "main"]);
1051+
yield* git([
1052+
"-c",
1053+
"user.name=Test",
1054+
"-c",
1055+
1056+
"commit",
1057+
"--allow-empty",
1058+
"-m",
1059+
"remote advance",
1060+
]);
1061+
remoteHead = (yield* git(["rev-parse", "HEAD"])).stdout.trim();
1062+
yield* git(["push", "origin", "main"]);
1063+
yield* git(["reset", "--hard", localHead]);
1064+
yield* git(["update-ref", "-d", "refs/remotes/origin/main"]);
1065+
}
10441066
yield* git(["config", "branch.autoSetupMerge", "always"]);
10451067
const existingPath = path.join(worktreesDirectory, "existing");
10461068
yield* driver.createWorktree({
@@ -1054,6 +1076,10 @@ it.effect(
10541076
yield* fs.makeDirectory(occupiedPath, { recursive: true });
10551077
yield* fs.writeFileString(path.join(occupiedPath, "keep.txt"), "unrelated directory");
10561078
const harness = makeHarness({
1079+
git: {
1080+
resolveWorktreeBaseRemote: (input) => driver.resolveWorktreeBaseRemote({ ...input, cwd }),
1081+
},
1082+
fetchWorktreeBaseCommit: (input) => driver.fetchWorktreeBaseCommit({ ...input, cwd }),
10571083
createWorktree: (input, options) =>
10581084
driver.createWorktree({ ...input, cwd }, { ...options, worktreesDirectory }),
10591085
});
@@ -1069,7 +1095,12 @@ it.effect(
10691095
command,
10701096
thread: `thread:launch:bulk-${index}`,
10711097
message: "Independent work",
1072-
workspace: { type: "worktree", baseRef: "main", branch: "feature/shared" },
1098+
workspace: {
1099+
type: "worktree",
1100+
baseRef: "main",
1101+
branch: "feature/shared",
1102+
startFromOrigin,
1103+
},
10731104
}),
10741105
)
10751106
.pipe(
@@ -1100,12 +1131,26 @@ it.effect(
11001131
assert.isTrue(yield* fs.exists(projection.thread.worktreePath!));
11011132
const base = yield* git(["config", `branch.${projection.thread.branch}.gh-merge-base`]);
11021133
assert.equal(base.stdout.trim(), "main");
1103-
const upstream = yield* git([
1104-
"rev-parse",
1105-
"--abbrev-ref",
1106-
`${projection.thread.branch}@{upstream}`,
1107-
]);
1108-
assert.equal(upstream.stdout.trim(), "main");
1134+
const head = yield* driver.execute({
1135+
operation: "ThreadLaunchService.test",
1136+
cwd: projection.thread.worktreePath!,
1137+
args: ["rev-parse", "HEAD"],
1138+
});
1139+
assert.equal(head.stdout.trim(), remoteHead);
1140+
if (startFromOrigin) {
1141+
const comparison = yield* git([
1142+
"config",
1143+
`branch.${projection.thread.branch}.t3-merge-base-ref`,
1144+
]);
1145+
assert.equal(comparison.stdout.trim(), "refs/remotes/origin/main");
1146+
} else {
1147+
const upstream = yield* git([
1148+
"rev-parse",
1149+
"--abbrev-ref",
1150+
`${projection.thread.branch}@{upstream}`,
1151+
]);
1152+
assert.equal(upstream.stdout.trim(), "main");
1153+
}
11091154
}
11101155
assert.deepEqual(
11111156
launched.map((projection) => projection.thread.branch).toSorted(),
@@ -1120,6 +1165,7 @@ it.effect(
11201165
"unrelated directory",
11211166
);
11221167
assert.equal(harness.removeWorktree.mock.calls.length, 0);
1168+
assert.equal((yield* git(["rev-parse", "main"])).stdout.trim(), localHead);
11231169
}).pipe(Effect.provide(harness.layer));
11241170
}).pipe(
11251171
Effect.provide(

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

Lines changed: 67 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -3986,45 +3986,73 @@ it.layer(layerTest)("GitVcsDriver core integration", (it) => {
39863986
});
39873987

39883988
describe("remote operations", () => {
3989-
it.effect("shares one running fetch of a ref between concurrent callers", () =>
3990-
Effect.gen(function* () {
3991-
const cwd = yield* makeTmpDir();
3992-
const delegate = yield* ChildProcessSpawner.ChildProcessSpawner;
3993-
const started = yield* Deferred.make<void>();
3994-
const release = yield* Deferred.make<void>();
3995-
let fetches = 0;
3996-
const spawner = ChildProcessSpawner.make((command) =>
3997-
Effect.gen(function* () {
3998-
if (!ChildProcess.isStandardCommand(command))
3999-
return yield* Effect.die("unexpected command");
4000-
if (command.args[0] !== "fetch") return yield* delegate.spawn(command);
4001-
fetches += 1;
4002-
yield* Deferred.succeed(started, undefined);
4003-
return ChildProcessSpawner.makeHandle({
4004-
...makeSuccessfulHandle(""),
4005-
exitCode: Deferred.await(release).pipe(Effect.as(ChildProcessSpawner.ExitCode(0))),
4006-
});
4007-
}),
4008-
);
4009-
const driver = yield* makeGitVcsDriverCore().pipe(
4010-
Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner),
4011-
Effect.provide(layerServerConfig),
4012-
);
4013-
const fetch = driver.fetchRemote({ cwd, remoteName: "origin", refName: "main" });
4014-
const first = yield* fetch.pipe(Effect.forkChild({ startImmediately: true }));
4015-
yield* Deferred.await(started);
4016-
const joined = yield* Effect.forEach(Array.from({ length: 5 }), () =>
4017-
fetch.pipe(Effect.forkChild({ startImmediately: true })),
4018-
);
4019-
yield* Deferred.succeed(release, undefined);
4020-
yield* Fiber.join(first);
4021-
yield* Effect.forEach(joined, Fiber.join);
4022-
assert.equal(fetches, 1);
4023-
4024-
// A finished fetch is not reused.
4025-
yield* fetch;
4026-
assert.equal(fetches, 2);
4027-
}),
3989+
it.effect.each(["public", "launch-base"] as const)(
3990+
"shares one running fetch between concurrent %s callers",
3991+
(caller) =>
3992+
Effect.gen(function* () {
3993+
const cwd = yield* makeTmpDir();
3994+
const delegate = yield* ChildProcessSpawner.ChildProcessSpawner;
3995+
const started = yield* Deferred.make<void>();
3996+
const release = yield* Deferred.make<void>();
3997+
let fetches = 0;
3998+
const spawner = ChildProcessSpawner.make((command) =>
3999+
Effect.gen(function* () {
4000+
if (!ChildProcess.isStandardCommand(command))
4001+
return yield* Effect.die("unexpected command");
4002+
if (command.args[0] === "remote") return makeSuccessfulHandle("upstream\n");
4003+
if (command.args[0] === "for-each-ref")
4004+
return makeSuccessfulHandle("refs/heads/stable\tupstream\trefs/heads/release\n");
4005+
if (command.args[0] === "rev-parse") return makeSuccessfulHandle("remote-head\n");
4006+
if (command.args[0] !== "fetch") return yield* delegate.spawn(command);
4007+
assert.deepEqual(command.args, [
4008+
"fetch",
4009+
"--quiet",
4010+
"--",
4011+
"upstream",
4012+
"+refs/heads/release:refs/remotes/upstream/release",
4013+
]);
4014+
fetches += 1;
4015+
yield* Deferred.succeed(started, undefined);
4016+
return ChildProcessSpawner.makeHandle({
4017+
...makeSuccessfulHandle(""),
4018+
exitCode: Deferred.await(release).pipe(Effect.as(ChildProcessSpawner.ExitCode(0))),
4019+
});
4020+
}),
4021+
);
4022+
const driver = yield* makeGitVcsDriverCore().pipe(
4023+
Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner),
4024+
Effect.provide(layerServerConfig),
4025+
);
4026+
const fetch =
4027+
caller === "public"
4028+
? driver
4029+
.fetchRemote({ cwd, remoteName: "upstream", refName: "upstream/release" })
4030+
.pipe(Effect.as(null))
4031+
: driver.fetchWorktreeBaseCommit({ cwd, refName: "stable" });
4032+
const first = yield* fetch.pipe(Effect.forkChild({ startImmediately: true }));
4033+
yield* Deferred.await(started);
4034+
const joined = yield* Effect.forEach(Array.from({ length: 5 }), () =>
4035+
fetch.pipe(Effect.forkChild({ startImmediately: true })),
4036+
);
4037+
yield* Deferred.succeed(release, undefined);
4038+
const result = yield* Fiber.join(first);
4039+
assert.deepEqual(
4040+
result,
4041+
caller === "public"
4042+
? null
4043+
: { commitSha: "remote-head", remoteRefName: "upstream/release" },
4044+
);
4045+
const results = yield* Effect.forEach(joined, Fiber.join);
4046+
assert.deepEqual(
4047+
results,
4048+
Array.from({ length: 5 }, () => result),
4049+
);
4050+
assert.equal(fetches, 1);
4051+
4052+
// A finished fetch is not reused.
4053+
yield* fetch;
4054+
assert.equal(fetches, 2);
4055+
}),
40284056
);
40294057

40304058
it.effect("creates a worktree from the latest fetched remote commit", () =>

‎apps/server/src/vcs/GitVcsDriverCore.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4172,7 +4172,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
41724172
const { remoteName, branchName } = target;
41734173
const remoteRefName = `${remoteName}/${branchName}`;
41744174
// A missing remote branch can leave a stale tracking ref; never resolve it.
4175-
if (!(yield* fetchRemote({ cwd: input.cwd, remoteName, refName: remoteRefName }))) {
4175+
if (!(yield* fetchRemoteShared({ cwd: input.cwd, remoteName, refName: remoteRefName }))) {
41764176
return null;
41774177
}
41784178
const resolved = yield* executeGit(

0 commit comments

Comments
 (0)