Skip to content

fix(server): fall back when new worktrees are unavailable #6208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maria-rcks merged 3 commits into from
Sep 13, 2026
Merged

fix(server): fall back when new worktrees are unavailable #6208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cba957e
fix(server): fall back when new worktrees are unavailable
tris203 Aug 11, 2026
f877402
test(server): model repository in bootstrap cleanup test
tris203 Aug 23, 2026
4c83fbf
fix(server): skip worktrees for non-git projects
tris203 Sep 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions apps/server/src/git/GitWorkflowService.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { assert, describe, expect, it, vi } from "@effect/vitest";
import * as DateTime from "effect/DateTime";
import * as Effect from "effect/Effect";
import * as Layer from "effect/Layer";
import * as Option from "effect/Option";

import { VcsRepositoryDetectionError } from "@t3tools/contracts";

Expand All @@ -24,6 +26,35 @@ function makeLayer(input: {
}

describe("GitWorkflowService", () => {
it.effect("reports a non-Git VCS repository as not a Git repository", () =>
Effect.gen(function* () {
const workflow = yield* GitWorkflowService.GitWorkflowService;
const isRepository = yield* workflow.isRepository("/jj-repo");

assert.equal(isRepository, false);
}).pipe(
Effect.provide(
makeLayer({
detect: () =>
Effect.succeed({
kind: "jj",
repository: {
kind: "jj",
rootPath: "/jj-repo",
metadataPath: "/jj-repo/.jj",
freshness: {
source: "live-local",
observedAt: DateTime.makeUnsafe("2026-01-01T00:00:00.000Z"),
expiresAt: Option.none(),
},
},
driver: {} as VcsDriverRegistry.VcsDriverHandle["driver"],
}),
}),
),
),
);

it.effect("returns an empty local status when no VCS repository is detected", () =>
Effect.gen(function* () {
const workflow = yield* GitWorkflowService.GitWorkflowService;
Expand Down
30 changes: 30 additions & 0 deletions apps/server/src/git/GitWorkflowService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ import * as VcsDriverRegistry from "../vcs/VcsDriverRegistry.ts";
export class GitWorkflowService extends Context.Service<
GitWorkflowService,
{
readonly isRepository: (cwd: string) => Effect.Effect<boolean, GitManagerServiceError>;
readonly hasCommit: (input: {
readonly cwd: string;
readonly refName: string;
}) => Effect.Effect<boolean, GitCommandError>;
readonly status: (
input: VcsStatusInput,
) => Effect.Effect<VcsStatusResult, GitManagerServiceError>;
Expand Down Expand Up @@ -262,6 +267,31 @@ export const make = Effect.gen(function* () {
ensureGit(operation, input.cwd).pipe(Effect.andThen(run(input)));

return GitWorkflowService.of({
isRepository: (cwd) =>
registry.detect({ cwd }).pipe(
Effect.map((handle) => handle?.kind === "git"),
Effect.mapError(
(cause) =>
new GitManagerError({
operation: "GitWorkflowService.isRepository",
cwd,
detail: "Failed to detect a VCS repository for this Git workflow.",
cause,
}),
),
),
hasCommit: (input) =>
ensureGitCommand("GitWorkflowService.hasCommit", input.cwd).pipe(
Effect.andThen(
git.execute({
operation: "GitWorkflowService.hasCommit",
cwd: input.cwd,
args: ["rev-parse", "--verify", `${input.refName}^{commit}`],
allowNonZeroExit: true,
}),
),
Effect.map((result) => result.exitCode === 0),
),
status: (input) =>
detectGitRepositoryForStatus("GitWorkflowService.status", input.cwd).pipe(
Effect.flatMap((isGitRepository) =>
Expand Down
192 changes: 192 additions & 0 deletions apps/server/src/server.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,13 @@ import * as Socket from "effect/unstable/socket/Socket";
import { vi } from "vite-plus/test";

const TEST_EPOCH = DateTime.makeUnsafe("1970-01-01T00:00:00.000Z");
const SUCCESSFUL_GIT_EXECUTION = {
exitCode: ChildProcessSpawner.ExitCode(0),
stdout: "",
stderr: "",
stdoutTruncated: false,
stderrTruncated: false,
};
const decodeTransferThreadSnapshot = Schema.decodeUnknownEffect(
Schema.fromJsonString(OrchestrationThreadDetailSnapshot),
);
Expand Down Expand Up @@ -9292,7 +9299,11 @@ it.layer(NodeServices.layer)("server router seam", (it) => {

yield* buildAppUnderTest({
layers: {
vcsDriver: {
isInsideWorkTree: () => Effect.succeed(true),
},
gitVcsDriver: {
execute: () => Effect.succeed(SUCCESSFUL_GIT_EXECUTION),
remoteExists,
fetchRemote,
remoteBranchExists,
Expand Down Expand Up @@ -9456,7 +9467,11 @@ it.layer(NodeServices.layer)("server router seam", (it) => {

yield* buildAppUnderTest({
layers: {
vcsDriver: {
isInsideWorkTree: () => Effect.succeed(true),
},
gitVcsDriver: {
execute: () => Effect.succeed(SUCCESSFUL_GIT_EXECUTION),
remoteExists,
fetchRemote,
remoteBranchExists,
Expand Down Expand Up @@ -9538,6 +9553,167 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
}).pipe(Effect.provide(NodeHttpServer.layerTest)),
);

it.effect("falls back to the project checkout when worktree mode targets a non-repository", () =>
Effect.gen(function* () {
const dispatchedCommands: Array<OrchestrationCommand> = [];
const createWorktree = vi.fn(
(_: Parameters<GitVcsDriver.GitVcsDriver["Service"]["createWorktree"]>[0]) =>
Effect.die(new Error("createWorktree must not run for a non-repository")),
);

yield* buildAppUnderTest({
layers: {
gitVcsDriver: {
execute: () => Effect.succeed(SUCCESSFUL_GIT_EXECUTION),
createWorktree,
},
orchestrationEngine: {
dispatch: (command) =>
Effect.sync(() => {
dispatchedCommands.push(command);
return { sequence: dispatchedCommands.length };
}),
readEvents: () => Stream.empty,
},
},
});

const createdAt = "2026-01-01T00:00:00.000Z";
const wsUrl = yield* getWsServerUrl("/ws");
const response = yield* Effect.scoped(
withWsRpcClient(wsUrl, (client) =>
client[ORCHESTRATION_WS_METHODS.dispatchCommand]({
type: "thread.turn.start",
commandId: CommandId.make("cmd-bootstrap-turn-start-non-repo"),
threadId: ThreadId.make("thread-bootstrap-non-repo"),
message: {
messageId: MessageId.make("msg-bootstrap-non-repo"),
role: "user",
text: "hello",
attachments: [],
},
modelSelection: defaultModelSelection,
runtimeMode: "full-access",
interactionMode: "default",
bootstrap: {
createThread: {
projectId: defaultProjectId,
title: "Bootstrap Thread",
modelSelection: defaultModelSelection,
runtimeMode: "full-access",
interactionMode: "default",
branch: null,
worktreePath: null,
createdAt,
},
prepareWorktree: {
projectCwd: "/tmp/project",
baseBranch: "main",
branch: "t3code/bootstrap-refName",
},
runSetupScript: true,
},
createdAt,
}),
),
);

assert.equal(response.sequence, 2);
assert.equal(createWorktree.mock.calls.length, 0);
assert.deepEqual(
dispatchedCommands.map((command) => command.type),
["thread.create", "thread.turn.start"],
);
const finalCommand = dispatchedCommands[1];
assertTrue(finalCommand?.type === "thread.turn.start");
if (finalCommand?.type === "thread.turn.start") {
assert.equal(finalCommand.bootstrap, undefined);
}
}).pipe(Effect.provide(NodeHttpServer.layerTest)),
);

it.effect("falls back to the project checkout when the worktree base has no commit", () =>
Effect.gen(function* () {
const dispatchedCommands: Array<OrchestrationCommand> = [];
const createWorktree = vi.fn(
(_: Parameters<GitVcsDriver.GitVcsDriver["Service"]["createWorktree"]>[0]) =>
Effect.die(new Error("createWorktree must not run without a base commit")),
);

yield* buildAppUnderTest({
layers: {
vcsDriver: {
isInsideWorkTree: () => Effect.succeed(true),
},
gitVcsDriver: {
execute: () =>
Effect.succeed({
...SUCCESSFUL_GIT_EXECUTION,
exitCode: ChildProcessSpawner.ExitCode(128),
stderr: "fatal: Needed a single revision",
}),
createWorktree,
},
orchestrationEngine: {
dispatch: (command) =>
Effect.sync(() => {
dispatchedCommands.push(command);
return { sequence: dispatchedCommands.length };
}),
readEvents: () => Stream.empty,
},
},
});

const createdAt = "2026-01-01T00:00:00.000Z";
const wsUrl = yield* getWsServerUrl("/ws");
const response = yield* Effect.scoped(
withWsRpcClient(wsUrl, (client) =>
client[ORCHESTRATION_WS_METHODS.dispatchCommand]({
type: "thread.turn.start",
commandId: CommandId.make("cmd-bootstrap-turn-start-unborn-head"),
threadId: ThreadId.make("thread-bootstrap-unborn-head"),
message: {
messageId: MessageId.make("msg-bootstrap-unborn-head"),
role: "user",
text: "hello",
attachments: [],
},
modelSelection: defaultModelSelection,
runtimeMode: "full-access",
interactionMode: "default",
bootstrap: {
createThread: {
projectId: defaultProjectId,
title: "Bootstrap Thread",
modelSelection: defaultModelSelection,
runtimeMode: "full-access",
interactionMode: "default",
branch: "main",
worktreePath: null,
createdAt,
},
prepareWorktree: {
projectCwd: "/tmp/project",
baseBranch: "main",
branch: "t3code/bootstrap-refName",
},
runSetupScript: true,
},
createdAt,
}),
),
);

assert.equal(response.sequence, 2);
assert.equal(createWorktree.mock.calls.length, 0);
assert.deepEqual(
dispatchedCommands.map((command) => command.type),
["thread.create", "thread.turn.start"],
);
}).pipe(Effect.provide(NodeHttpServer.layerTest)),
);

it.effect("records setup-script failures without aborting bootstrap turn start", () =>
Effect.gen(function* () {
const dispatchedCommands: Array<OrchestrationCommand> = [];
Expand Down Expand Up @@ -9568,7 +9744,11 @@ it.layer(NodeServices.layer)("server router seam", (it) => {

yield* buildAppUnderTest({
layers: {
vcsDriver: {
isInsideWorkTree: () => Effect.succeed(true),
},
gitVcsDriver: {
execute: () => Effect.succeed(SUCCESSFUL_GIT_EXECUTION),
createWorktree,
},
orchestrationEngine: {
Expand Down Expand Up @@ -9673,7 +9853,11 @@ it.layer(NodeServices.layer)("server router seam", (it) => {

yield* buildAppUnderTest({
layers: {
vcsDriver: {
isInsideWorkTree: () => Effect.succeed(true),
},
gitVcsDriver: {
execute: () => Effect.succeed(SUCCESSFUL_GIT_EXECUTION),
createWorktree,
},
orchestrationEngine: {
Expand Down Expand Up @@ -9778,7 +9962,11 @@ it.layer(NodeServices.layer)("server router seam", (it) => {

const config = yield* buildAppUnderTest({
layers: {
vcsDriver: {
isInsideWorkTree: () => Effect.succeed(true),
},
gitVcsDriver: {
execute: () => Effect.succeed(SUCCESSFUL_GIT_EXECUTION),
Comment thread
cursor[bot] marked this conversation as resolved.
createWorktree,
},
orchestrationEngine: {
Expand Down Expand Up @@ -9987,7 +10175,11 @@ it.layer(NodeServices.layer)("server router seam", (it) => {

yield* buildAppUnderTest({
layers: {
vcsDriver: {
isInsideWorkTree: () => Effect.succeed(true),
},
gitVcsDriver: {
execute: () => Effect.succeed(SUCCESSFUL_GIT_EXECUTION),
createWorktree,
},
orchestrationEngine: {
Expand Down
Loading
Loading