Skip to content

Commit f24c2b1

Browse files
committed
fix(server): fall back to the project folder only when the repo has no refs at all
1 parent 26b3ba5 commit f24c2b1

4 files changed

Lines changed: 65 additions & 34 deletions

File tree

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

Lines changed: 42 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,23 @@ function layer(input: {
3030
);
3131
}
3232

33+
function realGitLayer(prefix: string) {
34+
return GitWorkflowService.layer.pipe(
35+
Layer.provide(
36+
Layer.mock(VcsDriverRegistry.VcsDriverRegistry)({
37+
resolve: () => Effect.succeed({ kind: "git" } as VcsDriverRegistry.VcsDriverHandle),
38+
}),
39+
),
40+
Layer.provide(Layer.mock(GitManager.GitManager)({})),
41+
Layer.provideMerge(GitVcsDriver.layer),
42+
Layer.provideMerge(VcsProcess.layer),
43+
Layer.provideMerge(
44+
ServerConfig.layerTest(process.cwd(), { prefix }).pipe(Layer.provide(NodeServices.layer)),
45+
),
46+
Layer.provideMerge(NodeServices.layer),
47+
);
48+
}
49+
3350
it.layer(NodeServices.layer)("GitWorkflowService", (it) => {
3451
it.effect("reports a non-Git VCS repository as not a Git repository", () =>
3552
Effect.gen(function* () {
@@ -226,6 +243,30 @@ it.layer(NodeServices.layer)("GitWorkflowService", (it) => {
226243
);
227244
});
228245

246+
it.effect("finds a ref only once the repository has a commit", () =>
247+
Effect.gen(function* () {
248+
const fileSystem = yield* FileSystem.FileSystem;
249+
const cwd = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-any-ref-" });
250+
const workflow = yield* GitWorkflowService.GitWorkflowService;
251+
const driver = yield* GitVcsDriver.GitVcsDriver;
252+
const git = (args: string[]) => driver.execute({ operation: "test.setupRepo", cwd, args });
253+
yield* git(["init", "-b", "main"]);
254+
assert.isFalse(yield* workflow.hasAnyRef(cwd));
255+
yield* git([
256+
"-c",
257+
"user.email=t@t",
258+
"-c",
259+
"user.name=t",
260+
"commit",
261+
"--allow-empty",
262+
"-m",
263+
"init",
264+
]);
265+
yield* git(["checkout", "--orphan", "unborn"]);
266+
assert.isTrue(yield* workflow.hasAnyRef(cwd));
267+
}).pipe(Effect.scoped, Effect.provide(realGitLayer("t3-any-ref-"))),
268+
);
269+
229270
it.effect("finds a name among the refs of every namespace", () =>
230271
Effect.gen(function* () {
231272
const fileSystem = yield* FileSystem.FileSystem;
@@ -246,26 +287,6 @@ it.layer(NodeServices.layer)("GitWorkflowService", (it) => {
246287
(refName) => workflow.hasRefNamed({ cwd, refName }),
247288
);
248289
assert.deepEqual(found, [true, true, true, true, false, false]);
249-
}).pipe(
250-
Effect.scoped,
251-
Effect.provide(
252-
GitWorkflowService.layer.pipe(
253-
Layer.provide(
254-
Layer.mock(VcsDriverRegistry.VcsDriverRegistry)({
255-
resolve: () => Effect.succeed({ kind: "git" } as VcsDriverRegistry.VcsDriverHandle),
256-
}),
257-
),
258-
Layer.provide(Layer.mock(GitManager.GitManager)({})),
259-
Layer.provideMerge(GitVcsDriver.layer),
260-
Layer.provideMerge(VcsProcess.layer),
261-
Layer.provideMerge(
262-
ServerConfig.layerTest(process.cwd(), { prefix: "t3-ref-named-" }).pipe(
263-
Layer.provide(NodeServices.layer),
264-
),
265-
),
266-
Layer.provideMerge(NodeServices.layer),
267-
),
268-
),
269-
),
290+
}).pipe(Effect.scoped, Effect.provide(realGitLayer("t3-ref-named-"))),
270291
);
271292
});

‎apps/server/src/git/GitWorkflowService.ts‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ export class GitWorkflowService extends Context.Service<
4646
readonly cwd: string;
4747
readonly refName: string;
4848
}) => Effect.Effect<boolean, GitCommandError>;
49+
readonly hasAnyRef: (cwd: string) => Effect.Effect<boolean, GitCommandError>;
4950
readonly status: (
5051
input: VcsStatusInput,
5152
) => Effect.Effect<VcsStatusResult, GitManagerServiceError>;
@@ -343,6 +344,17 @@ export const make = Effect.gen(function* () {
343344
),
344345
Effect.map((result) => result.stdout.trim().length > 0),
345346
),
347+
hasAnyRef: (cwd) =>
348+
ensureGitCommand("GitWorkflowService.hasAnyRef", cwd).pipe(
349+
Effect.andThen(
350+
git.execute({
351+
operation: "GitWorkflowService.hasAnyRef",
352+
cwd,
353+
args: ["for-each-ref", "--count=1", "--format=%(refname)"],
354+
}),
355+
),
356+
Effect.map((result) => result.stdout.trim().length > 0),
357+
),
346358
status: (input) =>
347359
detectGitRepositoryForStatus("GitWorkflowService.status", input.cwd).pipe(
348360
Effect.flatMap((isGitRepository) =>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1480,7 +1480,7 @@ it.effect(
14801480
Effect.gen(function* () {
14811481
const harness = makeHarness({
14821482
hasCommit: () => Effect.succeed(false),
1483-
git: { hasRefNamed: () => Effect.succeed(false) },
1483+
git: { hasAnyRef: () => Effect.succeed(false) },
14841484
});
14851485
yield* Effect.gen(function* () {
14861486
const launches = yield* ThreadLaunch.ThreadLaunchService;
@@ -1512,13 +1512,13 @@ it.effect(
15121512
);
15131513

15141514
it.effect.each([
1515-
{ name: "a base fetched from origin", startFromOrigin: true, remoteBranch: false },
1516-
{ name: "a remote-tracking branch", startFromOrigin: false, remoteBranch: true },
1517-
])("creates a worktree from $name when the repository has no commits", (testCase) =>
1515+
{ name: "the base is fetched from origin", startFromOrigin: true, hasAnyRef: false },
1516+
{ name: "another ref has a commit", startFromOrigin: false, hasAnyRef: true },
1517+
])("keeps the worktree when HEAD has no commit but $name", (testCase) =>
15181518
Effect.gen(function* () {
15191519
const harness = makeHarness({
15201520
hasCommit: ({ refName }) => Effect.succeed(refName === "remote-main-sha"),
1521-
git: { hasRefNamed: () => Effect.succeed(testCase.remoteBranch) },
1521+
git: { hasAnyRef: () => Effect.succeed(testCase.hasAnyRef) },
15221522
});
15231523
yield* Effect.gen(function* () {
15241524
const launches = yield* ThreadLaunch.ThreadLaunchService;

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -294,16 +294,14 @@ const make = Effect.gen(function* () {
294294
const project = Option.getOrUndefined(yield* projects.getById(projectId));
295295
if (project === undefined) return false;
296296
const cwd = project.workspaceRoot;
297-
const { baseRef } = strategy;
298-
if (yield* git.hasCommit({ cwd, refName: "HEAD" })) return false;
297+
// Any ref means a commit exists, so a bad base ref still reports its error.
298+
if ((yield* git.hasCommit({ cwd, refName: "HEAD" })) || (yield* git.hasAnyRef(cwd)))
299+
return false;
299300
// Provisioning fetches the base first, which may bring the first commit.
300-
if (
301+
return !(
301302
strategy.startFromOrigin === true &&
302-
(yield* git.resolveWorktreeBaseRemote({ cwd, refName: baseRef })) !== null
303-
)
304-
return false;
305-
if (yield* git.hasCommit({ cwd, refName: baseRef })) return false;
306-
return !(yield* git.hasRefNamed({ cwd, refName: baseRef }));
303+
(yield* git.resolveWorktreeBaseRemote({ cwd, refName: strategy.baseRef })) !== null
304+
);
307305
},
308306
Effect.orElseSucceed(() => false),
309307
);

0 commit comments

Comments
 (0)