Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import { runMigrations } from "../persistence/Migrations.ts";
import * as ProjectEnrichmentService from "../project/ProjectEnrichmentService.ts";
import * as ProjectService from "../project/ProjectService.ts";
import * as ModelManifest from "../provider/ModelManifest.ts";
import * as ProjectSetupScriptRunner from "../project/ProjectSetupScriptRunner.ts";
import * as ProviderInstanceRegistry from "../provider/ProviderInstanceRegistry.ts";
import * as ServerSettings from "../serverSettings.ts";
import * as SourceControlProviderRegistry from "../sourceControl/SourceControlProviderRegistry.ts";
Expand Down Expand Up @@ -172,6 +173,7 @@ const layerRuntime = (dbPath: string) => {
pruneWorktrees: () => Effect.void,
}),
),
Layer.provide(Layer.mock(ProjectSetupScriptRunner.ProjectSetupScriptRunner)({})),
Layer.provide(layerPlatform),
);
};
Expand Down
88 changes: 84 additions & 4 deletions apps/server/src/orchestration-v2/ProviderTurnStartService.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ import {
import * as GitVcsDriver from "../vcs/GitVcsDriver.ts";
import { layerRealGit } from "./ProviderTurnStartService.testkit.ts";
import * as ProjectService from "../project/ProjectService.ts";
import * as ProjectSetupScriptRunner from "../project/ProjectSetupScriptRunner.ts";
import * as ProviderAuthService from "../provider/ProviderAuthService.ts";
import * as ServerSettings from "../serverSettings.ts";
import * as ContextHandoffService from "./ContextHandoffService.ts";
Expand Down Expand Up @@ -162,17 +163,26 @@ function startWithMissingWorktree(
);
const startRootRun = vi.fn(() => Effect.void);
const pruneWorktrees = vi.fn(() => Effect.void);
const createWorktree = vi.fn(() => Effect.succeed({} as never));
let worktreeExists = false;
const createWorktree = vi.fn(() =>
Effect.sync(() => {
worktreeExists = true;
return {} as never;
}),
);
const listLocalBranchNames = vi.fn(() => Effect.succeed(["feature/restore"]));
const layer = ProviderTurnStart.layer.pipe(
Layer.provide(
Layer.mergeAll(
Layer.mock(ProjectSetupScriptRunner.ProjectSetupScriptRunner)({
runForThread: () => Effect.succeed({ status: "no-script" }),
}),
Layer.mock(ContextHandoffService.ContextHandoffServiceV2)({}),
Layer.mock(EventSink.EventSinkV2)({ writeIfRunCurrent }),
IdAllocator.layer,
Layer.mock(TurnItemPositionStore.TurnItemPositionStoreV2)({}),
Layer.succeed(FileSystem.FileSystem, {
exists: () => Effect.succeed(false),
exists: () => Effect.succeed(worktreeExists),
realPath: (target: string) =>
normalize(target) in realPaths
? Effect.succeed(realPaths[normalize(target)])
Expand Down Expand Up @@ -465,6 +475,7 @@ function makeLocalCommandHarness(input: {
readonly workspaceRoot?: string;
readonly gitWorkflow?: GitWorkflow.GitWorkflowService["Service"];
readonly fileSystem?: FileSystem.FileSystem;
readonly runSetup?: ProjectSetupScriptRunner.ProjectSetupScriptRunner["Service"]["runForThread"];
readonly previousNativeSession?: boolean;
readonly previousMessages?: ReadonlyArray<string>;
readonly createdBy?: "agent" | "system";
Expand Down Expand Up @@ -1345,6 +1356,9 @@ function makeLocalCommandHarness(input: {
}),
IdAllocator.layer,
Layer.mock(TurnItemPositionStore.TurnItemPositionStoreV2)({}),
Layer.mock(ProjectSetupScriptRunner.ProjectSetupScriptRunner)({
runForThread: input.runSetup ?? (() => Effect.succeed({ status: "no-script" })),
}),
layerWorktreeLocation(input.worktreesDir),
input.fileSystem === undefined
? FileSystem.layerNoop({ exists: () => Effect.succeed(true) })
Expand Down Expand Up @@ -2077,6 +2091,72 @@ effectIt.effect("leaves a managed worktree folder without .git that holds user f
}).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
);

effectIt.effect.each([
{ async: false, exitCode: 0 },
{ async: false, exitCode: 1 },
{ async: true, exitCode: 0 },
])("restored setup respects async=$async and exitCode=$exitCode", (input) =>
Effect.gen(function* () {
const fileSystem = yield* FileSystem.FileSystem;
const path = yield* Path.Path;
const worktreesDir = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-restore-setup-" });
const worktreePath = path.join(worktreesDir, "project", "restore");
const setupStarted = yield* Deferred.make<void>();
const setupDone = yield* Deferred.make<ProjectSetupScriptRunner.ProjectSetupScriptCompletion>();
const completionObserved = yield* Deferred.make<void>();
const harness = makeLocalCommandHarness({
text: "Continue",
worktreesDir,
worktreePath,
fileSystem,
failReadsAfterRunning: true,
runSetup: () =>
withWorkspaceLease(worktreePath, Deferred.succeed(setupStarted, undefined)).pipe(
Effect.as({
status: "started",
scriptId: "setup",
scriptName: "Setup",
scriptCommand: "setup",
terminalId: "setup-test",
cwd: worktreePath,
async: input.async,
completion: Deferred.await(setupDone).pipe(
Effect.tap(() => Deferred.succeed(completionObserved, undefined)),
),
}),
),
});
harness.createWorktree.mockImplementation(() =>
fileSystem
.makeDirectory(path.join(worktreePath, ".git"), { recursive: true })
.pipe(Effect.as({} as never), Effect.orDie),
);

const startup = yield* harness.start.pipe(Effect.forkChild({ startImmediately: true }));
yield* Deferred.await(setupStarted);
if (input.async) yield* Fiber.join(startup);
else expect(harness.open).not.toHaveBeenCalled();
yield* Deferred.succeed(setupDone, { exitCode: input.exitCode, durationMs: 0 });
yield* Deferred.await(completionObserved);
yield* Fiber.join(startup);

const failed = !input.async && input.exitCode !== 0;
expect(harness.projection().runs.at(-1)?.status).toBe(failed ? "failed" : "running");
expect(harness.open).toHaveBeenCalledTimes(failed ? 0 : 1);
if (failed) {
expect(harness.projection().turnItems).toMatchObject([
{
type: "error",
title: "Couldn't set up restored workspace",
failure: {
message: `Setup script exited with ${input.exitCode} in '${worktreePath}'.`,
},
},
]);
}
}).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
);

effectIt.effect(
"preserves recreation interrupts and retries, then fails the final attempt before provider start",
() =>
Expand Down Expand Up @@ -2785,7 +2865,7 @@ effectIt.effect.each(["cleanup-first", "startup-first"])(
const path = yield* Path.Path;
const workspaceRoot = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-start-" });
const worktreePath = path.join(workspaceRoot, "project", "worktree");
yield* fileSystem.makeDirectory(worktreePath, { recursive: true });
yield* fileSystem.makeDirectory(path.join(worktreePath, ".git"), { recursive: true });
const release = yield* Deferred.make<void>();
const openEntered = yield* Deferred.make<void>();
const harness = makeLocalCommandHarness({
Expand All @@ -2797,7 +2877,7 @@ effectIt.effect.each(["cleanup-first", "startup-first"])(
});
harness.createWorktree.mockImplementation(() =>
fileSystem
.makeDirectory(worktreePath, { recursive: true })
.makeDirectory(path.join(worktreePath, ".git"), { recursive: true })
.pipe(Effect.as({} as never), Effect.orDie),
);
const open = harness.open.getMockImplementation()!;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@ import * as Layer from "effect/Layer";
import * as GitWorkflow from "../git/GitWorkflowService.ts";
import * as ProjectService from "../project/ProjectService.ts";

export const layer = Layer.merge(
export const layer = Layer.mergeAll(
Layer.mock(ProjectSetupScriptRunner.ProjectSetupScriptRunner)({
runForThread: () => Effect.succeed({ status: "no-script" }),
}),
Layer.mock(GitWorkflow.GitWorkflowService)({
pruneWorktrees: () => Effect.void,
createWorktree: () => Effect.succeed({} as never),
Expand Down
Loading
Loading