@@ -63,7 +63,7 @@ import {
6363 writeProviderStatusCache ,
6464} from "../providerStatusCache.ts" ;
6565import { COMPACT_SLASH_COMMAND } from "../providerSnapshot.ts" ;
66- import type { ProviderInstance } from "../ProviderDriver.ts" ;
66+ import type { ProviderInstance , ProviderWorkspaceSnapshot } from "../ProviderDriver.ts" ;
6767import * as ProviderInstanceRegistry from "../Services/ProviderInstanceRegistry.ts" ;
6868import * as ProviderRegistry from "../Services/ProviderRegistry.ts" ;
6969import { makeManualOnlyProviderMaintenanceCapabilities } from "../providerMaintenance.ts" ;
@@ -641,6 +641,34 @@ it.layer(Layer.mergeAll(TestNodeServices, ServerSettingsModule.layerTest(), Test
641641 skills : scopedSnapshot . skills ,
642642 } ,
643643 ] ) ;
644+
645+ const pendingSnapshot = {
646+ ...scopedSnapshot ,
647+ slashCommands : [ COMPACT_SLASH_COMMAND ] ,
648+ slashCommandsPending : true ,
649+ } satisfies ProviderWorkspaceSnapshot ;
650+ const partial = upsertProviderWorkspaceSnapshot ( result , "/project" , pendingSnapshot ) ;
651+ assert . deepStrictEqual ( partial . workspaceSnapshots ?. [ 0 ] ?. slashCommands , [
652+ { name : "project" } ,
653+ ] ) ;
654+ assert . strictEqual ( partial . workspaceSnapshots ?. [ 0 ] ?. slashCommandsPending , true ) ;
655+ const otherProject = upsertProviderWorkspaceSnapshot (
656+ partial ,
657+ "/other-project" ,
658+ pendingSnapshot ,
659+ ) ;
660+ assert . deepStrictEqual ( otherProject . workspaceSnapshots ?. [ 1 ] ?. slashCommands , [
661+ COMPACT_SLASH_COMMAND ,
662+ ] ) ;
663+ const recovered = upsertProviderWorkspaceSnapshot ( partial , "/project" , {
664+ ...scopedSnapshot ,
665+ slashCommands : [ COMPACT_SLASH_COMMAND , { name : "replacement" } ] ,
666+ } ) ;
667+ assert . deepStrictEqual ( recovered . workspaceSnapshots ?. [ 0 ] ?. slashCommands , [
668+ COMPACT_SLASH_COMMAND ,
669+ { name : "replacement" } ,
670+ ] ) ;
671+ assert . strictEqual ( recovered . workspaceSnapshots ?. [ 0 ] ?. slashCommandsPending , undefined ) ;
644672 } ) ;
645673
646674 it ( "preserves previously discovered provider models when a refresh returns none" , ( ) => {
@@ -1573,7 +1601,12 @@ it.layer(Layer.mergeAll(TestNodeServices, ServerSettingsModule.layerTest(), Test
15731601 slashCommands : [ ] ,
15741602 } as const satisfies ServerProvider ;
15751603 const snapshotCalls = yield * Ref . make ( 0 ) ;
1576- const scopedResult = yield * Ref . make < ServerProvider > ( scopedProvider ) ;
1604+ const scopedResult = yield * Ref . make < ProviderWorkspaceSnapshot > ( {
1605+ ...scopedProvider ,
1606+ status : "error" ,
1607+ slashCommands : [ COMPACT_SLASH_COMMAND ] ,
1608+ slashCommandsPending : true ,
1609+ } ) ;
15771610 const cacheInvalidations = yield * Ref . make ( 0 ) ;
15781611 const scanGate = yield * Ref . make < {
15791612 readonly started : Deferred . Deferred < void > ;
@@ -1698,8 +1731,27 @@ it.layer(Layer.mergeAll(TestNodeServices, ServerSettingsModule.layerTest(), Test
16981731 providers [ 0 ] ?. workspaceSnapshots ?. [ 0 ] ?. skills ,
16991732 scopedProvider . skills ,
17001733 ) ;
1734+ assert . deepStrictEqual ( providers [ 0 ] ?. workspaceSnapshots ?. [ 0 ] ?. slashCommands , [
1735+ COMPACT_SLASH_COMMAND ,
1736+ ] ) ;
1737+ assert . strictEqual ( providers [ 0 ] ?. workspaceSnapshots ?. [ 0 ] ?. slashCommandsPending , true ) ;
1738+ yield * Ref . set ( scopedResult , {
1739+ ...scopedProvider ,
1740+ status : "error" ,
1741+ slashCommandsPending : false ,
1742+ } ) ;
1743+ yield * registry . refreshWorkspaceSnapshot ( { instanceId, cwd : "/workspace" } ) ;
1744+ assert . strictEqual ( yield * Ref . get ( snapshotCalls ) , 3 ) ;
1745+ assert . deepStrictEqual (
1746+ ( yield * registry . getProviders ) [ 0 ] ?. workspaceSnapshots ?. [ 0 ] ?. slashCommands ,
1747+ scopedProvider . slashCommands ,
1748+ ) ;
1749+ assert . strictEqual (
1750+ ( yield * registry . getProviders ) [ 0 ] ?. workspaceSnapshots ?. [ 0 ] ?. slashCommandsPending ,
1751+ undefined ,
1752+ ) ;
17011753 yield * registry . refreshWorkspaceSnapshot ( { instanceId, cwd : "/workspace" } ) ;
1702- assert . strictEqual ( yield * Ref . get ( snapshotCalls ) , 2 ) ;
1754+ assert . strictEqual ( yield * Ref . get ( snapshotCalls ) , 3 ) ;
17031755 const newSkills = [
17041756 ...scopedProvider . skills ,
17051757 { name : "added" , path : "/workspace/added/SKILL.md" , enabled : true } ,
@@ -1710,7 +1762,7 @@ it.layer(Layer.mergeAll(TestNodeServices, ServerSettingsModule.layerTest(), Test
17101762 cwd : "/workspace" ,
17111763 fresh : true ,
17121764 } ) ;
1713- assert . strictEqual ( yield * Ref . get ( snapshotCalls ) , 3 ) ;
1765+ assert . strictEqual ( yield * Ref . get ( snapshotCalls ) , 4 ) ;
17141766 assert . strictEqual ( yield * Ref . get ( cacheInvalidations ) , 1 ) ;
17151767 assert . deepStrictEqual (
17161768 ( yield * registry . getProviders ) [ 0 ] ?. workspaceSnapshots ?. map ( ( s ) => s . skills ) ,
0 commit comments