@@ -82,6 +82,15 @@ const hasModelCapabilities = (model: ServerProvider["models"][number]): boolean
8282
8383const MAX_WORKSPACE_SNAPSHOTS_PER_PROVIDER = 16 ;
8484
85+ function dropProviderWorkspaceSnapshot ( provider : ServerProvider , cwd : string ) : ServerProvider {
86+ return provider . workspaceSnapshots ?. some ( ( snapshot ) => snapshot . cwd === cwd )
87+ ? {
88+ ...provider ,
89+ workspaceSnapshots : provider . workspaceSnapshots . filter ( ( snapshot ) => snapshot . cwd !== cwd ) ,
90+ }
91+ : provider ;
92+ }
93+
8594export function upsertProviderWorkspaceSnapshot (
8695 provider : ServerProvider ,
8796 cwd : string ,
@@ -835,17 +844,44 @@ export const ProviderRegistryLive = Layer.effect(
835844 return yield * Ref . get ( providersRef ) ;
836845 } ) ;
837846
847+ const updateProviders = (
848+ update : ( providers : ReadonlyArray < ServerProvider > ) => ReadonlyArray < ServerProvider > ,
849+ ) =>
850+ Ref . modify ( providersRef , ( currentProviders ) => {
851+ const nextProviders = update ( currentProviders ) ;
852+ return [ [ currentProviders , nextProviders ] as const , nextProviders ] ;
853+ } ) . pipe (
854+ Effect . tap ( ( [ previousProviders , nextProviders ] ) =>
855+ haveProvidersChanged ( previousProviders , nextProviders )
856+ ? PubSub . publish ( changesPubSub , nextProviders )
857+ : Effect . void ,
858+ ) ,
859+ Effect . map ( ( [ , nextProviders ] ) => nextProviders ) ,
860+ ) ;
861+
838862 const refreshWorkspaceSnapshot = Effect . fn ( "refreshWorkspaceSnapshot" ) ( function * ( input : {
839863 readonly instanceId : ProviderInstanceId ;
840864 readonly cwd : string ;
865+ readonly fresh ?: boolean ;
841866 } ) {
867+ // Fresh scans drop other instances' snapshots for this cwd first, so a
868+ // composer on one of them scans again on next use, even when this
869+ // instance is gone or cannot be scanned.
870+ if ( input . fresh ) {
871+ yield * updateProviders ( ( providers ) =>
872+ providers . map ( ( candidate ) =>
873+ candidate . instanceId === input . instanceId
874+ ? candidate
875+ : dropProviderWorkspaceSnapshot ( candidate , input . cwd ) ,
876+ ) ,
877+ ) ;
878+ }
842879 const providers = yield * Ref . get ( providersRef ) ;
843880 const provider = providers . find ( ( candidate ) => candidate . instanceId === input . instanceId ) ;
844- if (
845- ! provider ||
846- ! provider . enabled ||
847- provider . workspaceSnapshots ?. some ( ( s ) => s . cwd === input . cwd )
848- ) {
881+ const workspaceSnapshotOf = ( candidate : ServerProvider | undefined ) =>
882+ candidate ?. workspaceSnapshots ?. find ( ( s ) => s . cwd === input . cwd ) ;
883+ const scannedFrom = workspaceSnapshotOf ( provider ) ;
884+ if ( ! provider || ! provider . enabled || ( ! input . fresh && scannedFrom ) ) {
849885 return providers ;
850886 }
851887 const instance = yield * instanceRegistry . getInstance ( input . instanceId ) ;
@@ -857,42 +893,47 @@ export const ProviderRegistryLive = Layer.effect(
857893 next . set ( instance , new Set ( current ) . add ( input . cwd ) ) ;
858894 return [ true , next ] as const ;
859895 } ) ;
860- if ( ! claimed ) return yield * Ref . get ( providersRef ) ;
861- return yield * instance . snapshotForCwd ( input . cwd ) . pipe (
896+ // A fresh scan never joins a running one, which may predate the change.
897+ if ( ! claimed && ! input . fresh ) return yield * Ref . get ( providersRef ) ;
898+ // Fresh scans also re-read the machine snapshot: Claude's plugin
899+ // commands come from it, not from the cwd scan.
900+ const refreshMachineSnapshot = input . fresh
901+ ? ( instance . invalidateCaches ?? Effect . void ) . pipe (
902+ Effect . andThen ( refreshInstance ( input . instanceId ) ) ,
903+ )
904+ : Effect . void ;
905+ return yield * refreshMachineSnapshot . pipe (
906+ Effect . andThen ( instance . snapshotForCwd ( input . cwd ) ) ,
862907 Effect . flatMap ( ( scopedSnapshot ) =>
863908 scopedSnapshot . status === "error"
864909 ? Ref . get ( providersRef )
865910 : instanceRegistry . getInstance ( input . instanceId ) . pipe (
866911 Effect . flatMap ( ( currentInstance ) => {
867912 if ( currentInstance !== instance ) return Ref . get ( providersRef ) ;
868- return Ref . modify ( providersRef , ( currentProviders ) => {
869- const nextProviders = currentProviders . map ( ( candidate ) =>
913+ // Write only if the cwd's snapshot did not change during the
914+ // scan. A session event or another scan that landed first is newer.
915+ return updateProviders ( ( currentProviders ) =>
916+ currentProviders . map ( ( candidate ) =>
870917 candidate . instanceId === input . instanceId &&
871- ! candidate . workspaceSnapshots ?. some ( ( s ) => s . cwd === input . cwd )
918+ Equal . equals ( workspaceSnapshotOf ( candidate ) , scannedFrom )
872919 ? upsertProviderWorkspaceSnapshot ( candidate , input . cwd , scopedSnapshot )
873920 : candidate ,
874- ) ;
875- return [ [ currentProviders , nextProviders ] as const , nextProviders ] ;
876- } ) . pipe (
877- Effect . tap ( ( [ previousProviders , nextProviders ] ) =>
878- haveProvidersChanged ( previousProviders , nextProviders )
879- ? PubSub . publish ( changesPubSub , nextProviders )
880- : Effect . void ,
881921 ) ,
882- Effect . map ( ( [ , nextProviders ] ) => nextProviders ) ,
883922 ) ;
884923 } ) ,
885924 ) ,
886925 ) ,
887926 Effect . ensuring (
888- Ref . update ( workspaceRefreshesRef , ( refreshes ) => {
889- const next = new Map ( refreshes ) ;
890- const current = new Set ( next . get ( instance ) ) ;
891- current . delete ( input . cwd ) ;
892- if ( current . size ) next . set ( instance , current ) ;
893- else next . delete ( instance ) ;
894- return next ;
895- } ) ,
927+ claimed
928+ ? Ref . update ( workspaceRefreshesRef , ( refreshes ) => {
929+ const next = new Map ( refreshes ) ;
930+ const current = new Set ( next . get ( instance ) ) ;
931+ current . delete ( input . cwd ) ;
932+ if ( current . size ) next . set ( instance , current ) ;
933+ else next . delete ( instance ) ;
934+ return next ;
935+ } )
936+ : Effect . void ,
896937 ) ,
897938 ) ;
898939 } ) ;
0 commit comments