@@ -9,6 +9,7 @@ import { CommandId, type Project, ProjectId, ProviderInstanceId } from "@t3tools
99import * as Deferred from "effect/Deferred" ;
1010import * as Effect from "effect/Effect" ;
1111import * as Fiber from "effect/Fiber" ;
12+ import * as FileSystem from "effect/FileSystem" ;
1213import * as Layer from "effect/Layer" ;
1314import * as Metric from "effect/Metric" ;
1415import * as Option from "effect/Option" ;
@@ -36,6 +37,7 @@ import * as ProjectEnrichmentService from "./ProjectEnrichmentService.ts";
3637import * as ProjectFaviconResolver from "./ProjectFaviconResolver.ts" ;
3738import * as ProjectService from "./ProjectService.ts" ;
3839import * as RepositoryIdentityResolver from "./RepositoryIdentityResolver.ts" ;
40+ import * as T3ProjectFileLoader from "./T3ProjectFileLoader.ts" ;
3941
4042const layerWorkspacePaths = Layer . succeed ( WorkspacePaths . WorkspacePaths , {
4143 normalizeWorkspaceRoot : ( workspaceRoot ) => Effect . succeed ( workspaceRoot . replace ( / \/ $ / , "" ) ) ,
@@ -300,7 +302,14 @@ it.layer(layerTest)("ProjectService", (it) => {
300302 } ) ;
301303 assert . isFalse ( reset . autoPull ) ;
302304 assert . isNull ( reset . projectIcon ) ;
303- assert . equal ( reset . faviconPath , hydratedCreated . faviconPath ) ;
305+ assert . equal (
306+ ( yield * waitForProject (
307+ service ,
308+ projectId ,
309+ ( project ) => project . faviconPath === hydratedCreated . faviconPath ,
310+ ) ) . faviconPath ,
311+ hydratedCreated . faviconPath ,
312+ ) ;
304313 assert . isNull ( reset . defaultThreadEnvMode ) ;
305314 assert . deepEqual (
306315 ( yield * service . snapshot ) . projects . map ( ( project ) => project . id ) ,
@@ -725,6 +734,49 @@ it.effect("invalidates workspace-derived metadata when a project moves", () =>
725734 } ) ,
726735) ;
727736
737+ it . effect ( "resolves a restored icon immediately after reselecting its saved path" , ( ) =>
738+ Effect . gen ( function * ( ) {
739+ const fileSystem = yield * FileSystem . FileSystem ;
740+ const cwd = yield * fileSystem . makeTempDirectoryScoped ( { prefix : "project-icon-reselect-" } ) ;
741+ const iconPath = `${ cwd } /icon.svg` ;
742+ const metadata = Layer . merge (
743+ Layer . succeed ( RepositoryIdentityResolver . RepositoryIdentityResolver , {
744+ resolve : ( ) => Effect . succeed ( null ) ,
745+ } ) ,
746+ ProjectFaviconResolver . layer . pipe (
747+ Layer . provide ( layerWorkspacePaths ) ,
748+ Layer . provide ( T3ProjectFileLoader . layer ) ,
749+ Layer . provide ( NodeServices . layer ) ,
750+ ) ,
751+ ) ;
752+ yield * Effect . gen ( function * ( ) {
753+ const service = yield * ProjectService . ProjectService ;
754+ const resolver = yield * ProjectFaviconResolver . ProjectFaviconResolver ;
755+ const projectId = ProjectId . make ( "project:icon-reselect" ) ;
756+ yield * service . create ( {
757+ commandId : CommandId . make ( "command:icon-reselect:create" ) ,
758+ projectId,
759+ title : "Icon reselection" ,
760+ workspaceRoot : cwd ,
761+ } ) ;
762+ yield * service . update ( {
763+ commandId : CommandId . make ( "command:icon-reselect:missing" ) ,
764+ projectId,
765+ faviconPath : "icon.svg" ,
766+ } ) ;
767+ assert . isNull ( yield * resolver . resolvePath ( cwd , "icon.svg" ) ) ;
768+ yield * fileSystem . writeFileString ( iconPath , '<svg xmlns="http://www.w3.org/2000/svg"/>' ) ;
769+ assert . isNull ( yield * resolver . resolvePath ( cwd , "icon.svg" ) ) ;
770+ yield * service . update ( {
771+ commandId : CommandId . make ( "command:icon-reselect:restored" ) ,
772+ projectId,
773+ faviconPath : "icon.svg" ,
774+ } ) ;
775+ assert . equal ( yield * resolver . resolvePath ( cwd , "icon.svg" ) , iconPath ) ;
776+ } ) . pipe ( Effect . provide ( layerTestFor ( metadata ) ) ) ;
777+ } ) . pipe ( Effect . provide ( NodeServices . layer ) ) ,
778+ ) ;
779+
728780it . effect ( "serializes two projects claiming the same workspace root" , ( ) =>
729781 Effect . gen ( function * ( ) {
730782 const eventSink = yield * EventSink . EventSinkV2 ;
0 commit comments