@@ -531,25 +531,35 @@ export const make = Effect.gen(function* () {
531531 result: yield* Deferred.make<VcsStatusResult, GitManagerServiceError>(),
532532 policyCwds: new Set([rawCwd]),
533533 };
534- const [joined, start] = yield* Ref.modify(
535- refreshesRef,
536- (refreshes): readonly [readonly [QueuedRefresh, boolean], ActiveRefreshes] => {
537- const active = refreshes.get(cwd);
538- if (active === undefined) {
539- return [[request, true], new Map(refreshes).set(cwd, { queued: null })];
540- }
541- if (active.queued !== null) {
542- const queued = {
543- ...active.queued,
544- policyCwds: new Set(active.queued.policyCwds).add(rawCwd),
545- };
546- return [[queued, false], new Map(refreshes).set(cwd, { queued })];
534+ const joined = yield* Effect.uninterruptibleMask(() =>
535+ Effect.gen(function* () {
536+ const [joined, start] = yield* Ref.modify(
537+ refreshesRef,
538+ (refreshes): readonly [readonly [QueuedRefresh, boolean], ActiveRefreshes] => {
539+ const active = refreshes.get(cwd);
540+ if (active === undefined) {
541+ return [[request, true], new Map(refreshes).set(cwd, { queued: null })];
542+ }
543+ if (active.queued !== null) {
544+ const queued = {
545+ ...active.queued,
546+ policyCwds: new Set(active.queued.policyCwds).add(rawCwd),
547+ };
548+ return [[queued, false], new Map(refreshes).set(cwd, { queued })];
549+ }
550+ return [[request, false], new Map(refreshes).set(cwd, { queued: request })];
551+ },
552+ );
553+ // Do not leave an active entry behind without its broadcaster-owned worker.
554+ if (start) {
555+ yield* runQueuedRefreshes(cwd, request).pipe(
556+ Effect.forkIn(broadcasterScope, { uninterruptible: false }),
557+ );
547558 }
548- return [[request, false], new Map(refreshes).set(cwd, { queued: request })] ;
549- },
559+ return joined ;
560+ }) ,
550561 );
551562 // The refresh outlives a caller that stops waiting, so the others still get its result.
552- if (start) yield* runQueuedRefreshes(cwd, request).pipe(Effect.forkIn(broadcasterScope));
553563 return yield* Deferred.await(joined.result);
554564 });
555565
0 commit comments