Skip to content

Commit 4de85be

Browse files
author
Tejas Parmar
committed
fix(server): lock folder cleanup against project registration
1 parent 3904367 commit 4de85be

3 files changed

Lines changed: 77 additions & 4 deletions

File tree

‎apps/server/src/project/ManagedProjectFolders.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -438,10 +438,9 @@ const make = Effect.gen(function* () {
438438
const removeFolder = fileSystem.remove(workspaceRoot, { recursive: true }).pipe(Effect.ignore);
439439
// Another create can register the claimed path while scaffolding runs.
440440
// A failed ownership lookup keeps data rather than risking its deletion.
441-
const removeFolderIfUnowned = projects.getByWorkspaceRoot(workspaceRoot).pipe(
442-
Effect.flatMap((owner) => (Option.isNone(owner) ? removeFolder : Effect.void)),
443-
Effect.ignore,
444-
);
441+
const removeFolderIfUnowned = projects
442+
.whileWorkspaceUnowned(workspaceRoot, removeFolder)
443+
.pipe(Effect.ignore);
445444
const prepared = yield* Effect.all([
446445
scaffoldRepository(workspaceRoot, input.name).pipe(
447446
Effect.mapError((cause) => new NamedProjectFolderError({ folder: workspaceRoot, cause })),

‎apps/server/src/project/ProjectService.test.ts‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -669,3 +669,48 @@ it.effect("rejects an update that waited on the lock while its project was delet
669669
);
670670
}).pipe(Effect.provide(layerProjectServiceDependencies)),
671671
);
672+
673+
it.effect("serializes unowned-folder cleanup with a project registration already committing", () =>
674+
Effect.gen(function* () {
675+
const eventSink = yield* EventSink.EventSinkV2;
676+
const firstReachedCommit = yield* Deferred.make<void>();
677+
const releaseFirst = yield* Deferred.make<void>();
678+
const gatedSink = EventSink.EventSinkV2.of({
679+
...eventSink,
680+
commitProjectCommand: (input) =>
681+
input.projectId === "project:race:first"
682+
? Deferred.succeed(firstReachedCommit, undefined).pipe(
683+
Effect.andThen(Deferred.await(releaseFirst)),
684+
Effect.andThen(eventSink.commitProjectCommand(input)),
685+
)
686+
: eventSink.commitProjectCommand(input),
687+
});
688+
const service = yield* ProjectService.make.pipe(
689+
Effect.provideService(EventSink.EventSinkV2, gatedSink),
690+
);
691+
const claim = (name: string) =>
692+
service.create({
693+
commandId: CommandId.make(`command:race:${name}`),
694+
projectId: ProjectId.make(`project:race:${name}`),
695+
title: name,
696+
workspaceRoot: "/work/race",
697+
});
698+
const first = yield* claim("first").pipe(Effect.forkChild({ startImmediately: true }));
699+
yield* Deferred.await(firstReachedCommit);
700+
let removed = false;
701+
const second = yield* service
702+
.whileWorkspaceUnowned(
703+
"/work/race/",
704+
Effect.sync(() => {
705+
removed = true;
706+
}),
707+
)
708+
.pipe(Effect.forkChild({ startImmediately: true }));
709+
yield* Effect.yieldNow;
710+
assert.isUndefined(second.pollUnsafe());
711+
yield* Deferred.succeed(releaseFirst, undefined);
712+
assert.equal((yield* Fiber.join(first)).id, "project:race:first");
713+
yield* Fiber.join(second);
714+
assert.isFalse(removed);
715+
}).pipe(Effect.provide(layerProjectServiceDependencies)),
716+
);

‎apps/server/src/project/ProjectService.ts‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,10 @@ export class ProjectService extends Context.Service<
130130
workspaceRoot: string,
131131
options?: { readonly includeDeleted?: boolean },
132132
) => Effect.Effect<Option.Option<Project>, ProjectOperationError>;
133+
readonly whileWorkspaceUnowned: <E, R>(
134+
workspaceRoot: string,
135+
effect: Effect.Effect<void, E, R>,
136+
) => Effect.Effect<void, E | ProjectOperationError, R>;
133137
readonly snapshot: Effect.Effect<ProjectSnapshot, ProjectOperationError>;
134138
readonly getShell: (
135139
projectId: ProjectId,
@@ -216,6 +220,8 @@ export const make = Effect.gen(function* () {
216220
new ProjectOperationError({ operation: "dispatch-project-command", projectId, cause });
217221
const workspaceRoot = command.type === "project.delete" ? undefined : command.workspaceRoot;
218222
const planAndCommit = Effect.gen(function* () {
223+
// Cleanup can remove an unowned folder while registration waits for the workspace lock.
224+
if (workspaceRoot !== undefined) yield* normalizeWorkspaceRoot({ workspaceRoot });
219225
const project = Option.getOrUndefined(yield* readRow(projectId, { includeDeleted: true }));
220226
const workspaceOwner =
221227
workspaceRoot === undefined
@@ -325,6 +331,28 @@ export const make = Effect.gen(function* () {
325331
return Option.isNone(row) ? Option.none() : Option.some(yield* hydrate(row.value));
326332
});
327333

334+
const whileWorkspaceUnowned: ProjectService["Service"]["whileWorkspaceUnowned"] = Effect.fn(
335+
"ProjectService.whileWorkspaceUnowned",
336+
)(function* <E, R>(workspaceRoot: string, effect: Effect.Effect<void, E, R>) {
337+
const normalized = yield* normalizeWorkspaceRoot({ workspaceRoot });
338+
yield* workspaceLocks.withLock(
339+
normalized,
340+
Effect.gen(function* () {
341+
const owner = yield* projects.findActiveByWorkspaceRoot(normalized).pipe(
342+
Effect.mapError(
343+
(cause) =>
344+
new ProjectOperationError({
345+
operation: "read-project",
346+
workspaceRoot: normalized,
347+
cause,
348+
}),
349+
),
350+
);
351+
if (Option.isNone(owner)) yield* effect;
352+
}),
353+
);
354+
});
355+
328356
const create: ProjectService["Service"]["create"] = Effect.fn("ProjectService.create")(
329357
function* (input) {
330358
const workspaceRoot = yield* normalizeWorkspaceRoot({
@@ -569,6 +597,7 @@ export const make = Effect.gen(function* () {
569597
delete: deleteProject,
570598
getById,
571599
getByWorkspaceRoot,
600+
whileWorkspaceUnowned,
572601
snapshot,
573602
getShell,
574603
listShells,

0 commit comments

Comments
 (0)