@@ -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