Skip to content

Commit 4854aa7

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

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
@@ -12,7 +12,48 @@ import * as GitWorkflowService from "./GitWorkflowService.ts";
1212
import * as GitVcsDriver from "../vcs/GitVcsDriver.ts";
1313
import * as VcsDriverRegistry from "../vcs/VcsDriverRegistry.ts";
1414

15+
function realGitLayer(prefix: string) {
16+
return GitWorkflowService.layer.pipe(
17+
Layer.provide(
18+
Layer.mock(VcsDriverRegistry.VcsDriverRegistry)({
19+
resolve: () => Effect.succeed({ kind: "git" } as VcsDriverRegistry.VcsDriverHandle),
20+
}),
21+
),
22+
Layer.provide(Layer.mock(GitManager.GitManager)({})),
23+
Layer.provideMerge(GitVcsDriver.layer),
24+
Layer.provideMerge(VcsProcess.layer),
25+
Layer.provideMerge(
26+
ServerConfig.layerTest(process.cwd(), { prefix }).pipe(Layer.provide(NodeServices.layer)),
27+
),
28+
Layer.provideMerge(NodeServices.layer),
29+
);
30+
}
31+
1532
it.layer(NodeServices.layer)("GitWorkflowService", (it) => {
33+
it.effect("finds a ref only once the repository has a commit", () =>
34+
Effect.gen(function* () {
35+
const fileSystem = yield* FileSystem.FileSystem;
36+
const cwd = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-any-ref-" });
37+
const workflow = yield* GitWorkflowService.GitWorkflowService;
38+
const driver = yield* GitVcsDriver.GitVcsDriver;
39+
const git = (args: string[]) => driver.execute({ operation: "test.setupRepo", cwd, args });
40+
yield* git(["init", "-b", "main"]);
41+
assert.isFalse(yield* workflow.hasAnyRef(cwd));
42+
yield* git([
43+
"-c",
44+
"user.email=t@t",
45+
"-c",
46+
"user.name=t",
47+
"commit",
48+
"--allow-empty",
49+
"-m",
50+
"init",
51+
]);
52+
yield* git(["checkout", "--orphan", "unborn"]);
53+
assert.isTrue(yield* workflow.hasAnyRef(cwd));
54+
}).pipe(Effect.scoped, Effect.provide(realGitLayer("t3-any-ref-"))),
55+
);
56+
1657
it.effect("finds a name among the refs of every namespace", () =>
1758
Effect.gen(function* () {
1859
const fileSystem = yield* FileSystem.FileSystem;
@@ -33,26 +74,6 @@ it.layer(NodeServices.layer)("GitWorkflowService", (it) => {
3374
(refName) => workflow.hasRefNamed({ cwd, refName }),
3475
);
3576
assert.deepEqual(found, [true, true, true, true, false, false]);
36-
}).pipe(
37-
Effect.scoped,
38-
Effect.provide(
39-
GitWorkflowService.layer.pipe(
40-
Layer.provide(
41-
Layer.mock(VcsDriverRegistry.VcsDriverRegistry)({
42-
resolve: () => Effect.succeed({ kind: "git" } as VcsDriverRegistry.VcsDriverHandle),
43-
}),
44-
),
45-
Layer.provide(Layer.mock(GitManager.GitManager)({})),
46-
Layer.provideMerge(GitVcsDriver.layer),
47-
Layer.provideMerge(VcsProcess.layer),
48-
Layer.provideMerge(
49-
ServerConfig.layerTest(process.cwd(), { prefix: "t3-ref-named-" }).pipe(
50-
Layer.provide(NodeServices.layer),
51-
),
52-
),
53-
Layer.provideMerge(NodeServices.layer),
54-
),
55-
),
56-
),
77+
}).pipe(Effect.scoped, Effect.provide(realGitLayer("t3-ref-named-"))),
5778
);
5879
});

‎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
@@ -1024,7 +1024,7 @@ it.effect(
10241024
Effect.gen(function* () {
10251025
const harness = makeHarness({
10261026
hasCommit: () => Effect.succeed(false),
1027-
git: { hasRefNamed: () => Effect.succeed(false) },
1027+
git: { hasAnyRef: () => Effect.succeed(false) },
10281028
});
10291029
yield* Effect.gen(function* () {
10301030
const launches = yield* ThreadLaunch.ThreadLaunchService;
@@ -1056,13 +1056,13 @@ it.effect(
10561056
);
10571057

10581058
it.effect.each([
1059-
{ name: "a base fetched from origin", startFromOrigin: true, remoteBranch: false },
1060-
{ name: "a remote-tracking branch", startFromOrigin: false, remoteBranch: true },
1061-
])("creates a worktree from $name when the repository has no commits", (testCase) =>
1059+
{ name: "the base is fetched from origin", startFromOrigin: true, hasAnyRef: false },
1060+
{ name: "another ref has a commit", startFromOrigin: false, hasAnyRef: true },
1061+
])("keeps the worktree when HEAD has no commit but $name", (testCase) =>
10621062
Effect.gen(function* () {
10631063
const harness = makeHarness({
10641064
hasCommit: ({ refName }) => Effect.succeed(refName === "remote-main-sha"),
1065-
git: { hasRefNamed: () => Effect.succeed(testCase.remoteBranch) },
1065+
git: { hasAnyRef: () => Effect.succeed(testCase.hasAnyRef) },
10661066
});
10671067
yield* Effect.gen(function* () {
10681068
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)