Skip to content

Commit 54346a6

Browse files
t3dotggclaude
andauthored
fix(web,server): adding a project to another machine takes you there, with no toasts and the right favicon (pingdotgg#22254)
Co-authored-by: Claude Opus 5.5 <[email protected]>
1 parent 729c56c commit 54346a6

15 files changed

Lines changed: 210 additions & 54 deletions

‎apps/server/src/assets/AssetAccess.test.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1525,6 +1525,7 @@ describe("AssetAccess", () => {
15251525
cause: platformCause,
15261526
});
15271527
const resolver = ProjectFaviconResolver.ProjectFaviconResolver.of({
1528+
invalidate: () => Effect.void,
15281529
resolvePath: () => Effect.fail(resolutionCause),
15291530
});
15301531

‎apps/server/src/assets/AssetAccess.ts‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,8 @@ export const issueAssetUrl = Effect.fn("AssetAccess.issueAssetUrl")(function* (i
493493
readonly resource: AssetResource;
494494
readonly workspaceRoot?: string;
495495
readonly projectFaviconPath?: string;
496-
readonly projectCheckoutPending?: boolean;
496+
/** Where a cloned project's checkout stands, while the clone tracker still knows it. */
497+
readonly projectCheckout?: "pending" | "cloned";
497498
}) {
498499
const fileSystem = yield* FileSystem.FileSystem;
499500
const path = yield* Path.Path;
@@ -648,19 +649,22 @@ export const issueAssetUrl = Effect.fn("AssetAccess.issueAssetUrl")(function* (i
648649
);
649650
const faviconResolver = yield* ProjectFaviconResolver.ProjectFaviconResolver;
650651
// A lookup in a half-cloned checkout would cache a miss that outlives the clone.
651-
const faviconPath = input.projectCheckoutPending
652-
? null
653-
: yield* faviconResolver
654-
.resolvePath(workspaceRoot, input.projectFaviconPath ?? undefined)
655-
.pipe(
656-
Effect.mapError(
657-
(cause) =>
658-
new AssetProjectFaviconResolutionError({
659-
resource: input.resource,
660-
cause,
661-
}),
662-
),
663-
);
652+
// Once it lands, a miss cached before (by enrichment) is stale too.
653+
if (input.projectCheckout === "cloned") yield* faviconResolver.invalidate(workspaceRoot);
654+
const faviconPath =
655+
input.projectCheckout === "pending"
656+
? null
657+
: yield* faviconResolver
658+
.resolvePath(workspaceRoot, input.projectFaviconPath ?? undefined)
659+
.pipe(
660+
Effect.mapError(
661+
(cause) =>
662+
new AssetProjectFaviconResolutionError({
663+
resource: input.resource,
664+
cause,
665+
}),
666+
),
667+
);
664668
const isExternalOverride =
665669
faviconPath !== null &&
666670
input.projectFaviconPath !== undefined &&

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ const layerEnrichment = ProjectEnrichmentService.layer.pipe(
4747
resolve: () => Effect.succeed(null),
4848
}),
4949
Layer.succeed(ProjectFaviconResolver.ProjectFaviconResolver, {
50+
invalidate: () => Effect.void,
5051
resolvePath: () => Effect.succeed(null),
5152
}),
5253
),

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ it.effect("preserves either enrichment field when the other resolver fails", ()
5858
: Effect.succeed(identity(workspaceRoot)),
5959
}),
6060
Layer.succeed(ProjectFaviconResolver.ProjectFaviconResolver, {
61+
invalidate: () => Effect.void,
6162
resolvePath: (workspaceRoot) =>
6263
workspaceRoot === "/favicon-fails"
6364
? Effect.fail(
@@ -109,6 +110,7 @@ it.effect("does not warn about favicons for workspace roots that no longer exist
109110
resolve: (workspaceRoot) => Effect.succeed(identity(workspaceRoot)),
110111
}),
111112
Layer.succeed(ProjectFaviconResolver.ProjectFaviconResolver, {
113+
invalidate: () => Effect.void,
112114
resolvePath: (workspaceRoot) =>
113115
Effect.fail(
114116
workspaceRoot === "/missing"
@@ -158,6 +160,7 @@ it.effect("publishes repository completion while favicon enrichment is still pen
158160
resolve: (workspaceRoot) => Effect.succeed(identity(workspaceRoot)),
159161
}),
160162
Layer.succeed(ProjectFaviconResolver.ProjectFaviconResolver, {
163+
invalidate: () => Effect.void,
161164
resolvePath: (workspaceRoot) =>
162165
Deferred.await(releaseFavicon).pipe(Effect.as(`${workspaceRoot}/favicon.svg`)),
163166
}),
@@ -186,6 +189,7 @@ it.effect("keeps repository workers available when every favicon worker is hung"
186189
resolve: (workspaceRoot) => Effect.succeed(identity(workspaceRoot)),
187190
}),
188191
Layer.succeed(ProjectFaviconResolver.ProjectFaviconResolver, {
192+
invalidate: () => Effect.void,
189193
resolvePath: () =>
190194
Effect.gen(function* () {
191195
const started = yield* Ref.updateAndGet(faviconStarts, (count) => count + 1);
@@ -237,6 +241,7 @@ it.effect("getAvailable returns immediately while repository identity is still u
237241
),
238242
}),
239243
Layer.succeed(ProjectFaviconResolver.ProjectFaviconResolver, {
244+
invalidate: () => Effect.void,
240245
resolvePath: (workspaceRoot) => Effect.succeed(`${workspaceRoot}/favicon.svg`),
241246
}),
242247
);
@@ -285,6 +290,7 @@ it.effect(
285290
},
286291
}),
287292
Layer.succeed(ProjectFaviconResolver.ProjectFaviconResolver, {
293+
invalidate: () => Effect.void,
288294
resolvePath: () => Effect.succeed(null),
289295
}),
290296
);
@@ -344,6 +350,7 @@ it.effect("deduplicates requests, bounds pending work, and reloads invalidated r
344350
}),
345351
}),
346352
Layer.succeed(ProjectFaviconResolver.ProjectFaviconResolver, {
353+
invalidate: () => Effect.void,
347354
resolvePath: (workspaceRoot) => Effect.succeed(`${workspaceRoot}/favicon.svg`),
348355
}),
349356
);
@@ -403,6 +410,7 @@ it.effect("rescans a favicon only after 15 minutes", () =>
403410
resolve: (workspaceRoot) => Effect.succeed(identity(workspaceRoot)),
404411
}),
405412
Layer.succeed(ProjectFaviconResolver.ProjectFaviconResolver, {
413+
invalidate: () => Effect.void,
406414
resolvePath: (workspaceRoot) =>
407415
Ref.updateAndGet(faviconScans, (count) => count + 1).pipe(
408416
Effect.map((scan) => `${workspaceRoot}/favicon-${scan}.svg`),
@@ -451,6 +459,7 @@ it.effect(
451459
),
452460
}),
453461
Layer.succeed(ProjectFaviconResolver.ProjectFaviconResolver, {
462+
invalidate: () => Effect.void,
454463
resolvePath: () => Ref.update(faviconScans, (count) => count + 1).pipe(Effect.as(null)),
455464
}),
456465
);

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,8 @@ export const make = Effect.fn("ProjectEnrichmentService.make")(function* (
283283
[
284284
Cache.invalidate(repositoryIdentityCache, workspaceRoot),
285285
Cache.invalidate(faviconCache, workspaceRoot),
286+
// The resolver keeps its own misses, which would outlive a clone filling the folder.
287+
faviconResolver.invalidate(workspaceRoot),
286288
],
287289
{ concurrency: "unbounded", discard: true },
288290
),

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,22 @@ it.layer(layerTest)("ProjectFaviconResolverLive", (it) => {
7474
}).pipe(Effect.provide(TestClock.layer())),
7575
);
7676

77+
it.effect("finds a favicon added after a cached miss once the workspace is invalidated", () =>
78+
Effect.gen(function* () {
79+
const resolver = yield* ProjectFaviconResolver.ProjectFaviconResolver;
80+
const path = yield* Path.Path;
81+
const cwd = yield* makeTempDir;
82+
83+
// A clone's project exists while its folder is still empty.
84+
expect(yield* resolver.resolvePath(cwd)).toBeNull();
85+
yield* writeTextFile(cwd, "favicon.ico", "icon");
86+
expect(yield* resolver.resolvePath(cwd)).toBeNull();
87+
88+
yield* resolver.invalidate(cwd);
89+
expect(yield* resolver.resolvePath(cwd)).toBe(path.join(cwd, "favicon.ico"));
90+
}),
91+
);
92+
7793
it.effect("falls back at once when a cached favicon is deleted", () =>
7894
Effect.gen(function* () {
7995
const fileSystem = yield* FileSystem.FileSystem;

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

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,8 @@ export class ProjectFaviconResolver extends Context.Service<
111111
cwd: string,
112112
faviconPath?: string,
113113
) => Effect.Effect<string | null, ProjectFaviconResolutionError>;
114+
/** Forgets cached lookups for a workspace whose files changed, such as a finished clone. */
115+
readonly invalidate: (cwd: string) => Effect.Effect<void>;
114116
}
115117
>()("t3/project/ProjectFaviconResolver") {}
116118

@@ -340,7 +342,18 @@ export const make = Effect.gen(function* () {
340342
return yield* Cache.get(faviconCache, key);
341343
});
342344

343-
return ProjectFaviconResolver.of({ resolvePath });
345+
const invalidate: ProjectFaviconResolver["Service"]["invalidate"] = (cwd) =>
346+
Cache.keys(faviconCache).pipe(
347+
Effect.flatMap((keys) =>
348+
Effect.forEach(
349+
Array.from(keys).filter((key) => parseFaviconCacheKey(key).cwd === cwd),
350+
(key) => Cache.invalidate(faviconCache, key),
351+
{ discard: true },
352+
),
353+
),
354+
);
355+
356+
return ProjectFaviconResolver.of({ resolvePath, invalidate });
344357
});
345358

346359
export const layer = Layer.effect(ProjectFaviconResolver, make);

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ const layerServices = Layer.mergeAll(
5858
resolve: () => Effect.succeed(null),
5959
}),
6060
Layer.succeed(ProjectFaviconResolver.ProjectFaviconResolver, {
61+
invalidate: () => Effect.void,
6162
resolvePath: () => Effect.succeed(null),
6263
}),
6364
),

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ const layerMetadata = Layer.merge(
4646
}),
4747
}),
4848
Layer.succeed(ProjectFaviconResolver.ProjectFaviconResolver, {
49+
invalidate: () => Effect.void,
4950
resolvePath: (workspaceRoot) => Effect.succeed(`${workspaceRoot}/favicon.svg`),
5051
}),
5152
);
@@ -513,6 +514,7 @@ it.effect(
513514
}),
514515
}),
515516
Layer.succeed(ProjectFaviconResolver.ProjectFaviconResolver, {
517+
invalidate: () => Effect.void,
516518
resolvePath: (workspaceRoot) =>
517519
Ref.updateAndGet(faviconCalls, (count) => count + 1).pipe(
518520
Effect.as(`${workspaceRoot}/favicon.svg`),
@@ -597,6 +599,7 @@ it.effect("keeps project snapshots available when optional metadata enrichment f
597599
resolve: () => Effect.succeed(null),
598600
}),
599601
Layer.succeed(ProjectFaviconResolver.ProjectFaviconResolver, {
602+
invalidate: () => Effect.void,
600603
resolvePath: (workspaceRoot) =>
601604
Effect.fail(
602605
new ProjectFaviconResolver.ProjectFaviconResolutionError({
@@ -647,6 +650,7 @@ it.effect("invalidates workspace-derived metadata when a project moves", () =>
647650
),
648651
}),
649652
Layer.succeed(ProjectFaviconResolver.ProjectFaviconResolver, {
653+
invalidate: () => Effect.void,
650654
resolvePath: (workspaceRoot) =>
651655
Ref.get(metadataVersion).pipe(
652656
Effect.map((version) => `${workspaceRoot}/favicon-v${version}.svg`),

‎apps/server/src/ws.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2756,10 +2756,9 @@ export const layerWsRpc = (
27562756
...(project.value.faviconPath
27572757
? { projectFaviconPath: project.value.faviconPath }
27582758
: {}),
2759-
projectCheckoutPending:
2760-
clone !== null &&
2761-
clone.phase !== "done" &&
2762-
clone.destinationPath === project.value.workspaceRoot,
2759+
...(clone !== null && clone.destinationPath === project.value.workspaceRoot
2760+
? { projectCheckout: clone.phase === "done" ? "cloned" : "pending" }
2761+
: {}),
27632762
});
27642763
}
27652764
const thread = yield* threadManagement

0 commit comments

Comments
 (0)