@@ -7,6 +7,7 @@ import { CommandId, type Project, ProjectId, ProviderInstanceId } from "@t3tools
77import * as Deferred from "effect/Deferred" ;
88import * as Effect from "effect/Effect" ;
99import * as Fiber from "effect/Fiber" ;
10+ import * as FileSystem from "effect/FileSystem" ;
1011import * as Layer from "effect/Layer" ;
1112import * as Metric from "effect/Metric" ;
1213import * as Option from "effect/Option" ;
@@ -33,6 +34,7 @@ import * as ProjectEnrichmentService from "./ProjectEnrichmentService.ts";
3334import * as ProjectFaviconResolver from "./ProjectFaviconResolver.ts" ;
3435import * as ProjectService from "./ProjectService.ts" ;
3536import * as RepositoryIdentityResolver from "./RepositoryIdentityResolver.ts" ;
37+ import * as T3ProjectFileLoader from "./T3ProjectFileLoader.ts" ;
3638
3739const layerWorkspacePaths = Layer . succeed ( WorkspacePaths . WorkspacePaths , {
3840 normalizeWorkspaceRoot : ( workspaceRoot ) => Effect . succeed ( workspaceRoot . replace ( / \/ $ / , "" ) ) ,
@@ -215,7 +217,14 @@ it.layer(layerTest)("ProjectService", (it) => {
215217 } ) ;
216218 assert . isFalse ( reset . autoPull ) ;
217219 assert . isNull ( reset . projectIcon ) ;
218- assert . equal ( reset . faviconPath , hydratedCreated . faviconPath ) ;
220+ assert . equal (
221+ ( yield * waitForProject (
222+ service ,
223+ projectId ,
224+ ( project ) => project . faviconPath === hydratedCreated . faviconPath ,
225+ ) ) . faviconPath ,
226+ hydratedCreated . faviconPath ,
227+ ) ;
219228 assert . isNull ( reset . defaultThreadEnvMode ) ;
220229 assert . deepEqual (
221230 ( yield * service . snapshot ) . projects . map ( ( project ) => project . id ) ,
@@ -643,6 +652,49 @@ it.effect("invalidates workspace-derived metadata when a project moves", () =>
643652 } ) ,
644653) ;
645654
655+ it . effect ( "resolves a restored icon immediately after reselecting its saved path" , ( ) =>
656+ Effect . gen ( function * ( ) {
657+ const fileSystem = yield * FileSystem . FileSystem ;
658+ const cwd = yield * fileSystem . makeTempDirectoryScoped ( { prefix : "project-icon-reselect-" } ) ;
659+ const iconPath = `${ cwd } /icon.svg` ;
660+ const metadata = Layer . merge (
661+ Layer . succeed ( RepositoryIdentityResolver . RepositoryIdentityResolver , {
662+ resolve : ( ) => Effect . succeed ( null ) ,
663+ } ) ,
664+ ProjectFaviconResolver . layer . pipe (
665+ Layer . provide ( layerWorkspacePaths ) ,
666+ Layer . provide ( T3ProjectFileLoader . layer ) ,
667+ Layer . provide ( NodeServices . layer ) ,
668+ ) ,
669+ ) ;
670+ yield * Effect . gen ( function * ( ) {
671+ const service = yield * ProjectService . ProjectService ;
672+ const resolver = yield * ProjectFaviconResolver . ProjectFaviconResolver ;
673+ const projectId = ProjectId . make ( "project:icon-reselect" ) ;
674+ yield * service . create ( {
675+ commandId : CommandId . make ( "command:icon-reselect:create" ) ,
676+ projectId,
677+ title : "Icon reselection" ,
678+ workspaceRoot : cwd ,
679+ } ) ;
680+ yield * service . update ( {
681+ commandId : CommandId . make ( "command:icon-reselect:missing" ) ,
682+ projectId,
683+ faviconPath : "icon.svg" ,
684+ } ) ;
685+ assert . isNull ( yield * resolver . resolvePath ( cwd , "icon.svg" ) ) ;
686+ yield * fileSystem . writeFileString ( iconPath , '<svg xmlns="http://www.w3.org/2000/svg"/>' ) ;
687+ assert . isNull ( yield * resolver . resolvePath ( cwd , "icon.svg" ) ) ;
688+ yield * service . update ( {
689+ commandId : CommandId . make ( "command:icon-reselect:restored" ) ,
690+ projectId,
691+ faviconPath : "icon.svg" ,
692+ } ) ;
693+ assert . equal ( yield * resolver . resolvePath ( cwd , "icon.svg" ) , iconPath ) ;
694+ } ) . pipe ( Effect . provide ( layerTestFor ( metadata ) ) ) ;
695+ } ) . pipe ( Effect . provide ( NodeServices . layer ) ) ,
696+ ) ;
697+
646698it . effect ( "serializes two projects claiming the same workspace root" , ( ) =>
647699 Effect . gen ( function * ( ) {
648700 const eventSink = yield * EventSink . EventSinkV2 ;
0 commit comments