automations: test: cover aggregate discovery transitions

Exercise provider registration and live discovery precedence through the aggregate observable. Clarify that unsupported hosts are ready only when their legacy storage is readable.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 7e75f732-f18f-42a7-b1e2-a034c03596eb

Author: ulugbekna

src/vs/sessions/contrib/automations/test/browser/providerAutomationService.test.ts

@@ -1257,16 +1257,16 @@ suite('ProviderAutomationService', () => {
 			runs: [],
 		});
 		const { service, providerStore, storage } = createService(futureLedger);
-		const initialDiscoveryState = service.initialDiscoveryState.get();
+		const catalogueState = service.catalogueState.get();
 
 		await assert.rejects(service.waitForMigrationForTesting(), /cannot be migrated safely/);
 
 		assert.deepStrictEqual({
-			initialDiscoveryState,
+			catalogueState,
 			providerAutomations: providerStore.automations.get(),
 			persisted: storage.get(AUTOMATION_STORAGE_KEY, StorageScope.APPLICATION),
 		}, {
-			initialDiscoveryState: 'unavailable',
+			catalogueState: 'error',
 			providerAutomations: [],
 			persisted: futureLedger,
 		});

src/vs/sessions/contrib/providers/agentHost/test/browser/localAgentHostSessionsProvider.test.ts

@@ -18,7 +18,9 @@ import { runWithFakedTimers } from '../../../../../../base/test/common/timeTrave
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
 import { AgentSession, type IAgentCreateChatRequestOptions, type IAgentCreateSessionConfig, type IAgentSessionMetadata } from '../../../../../../platform/agentHost/common/agent.js';
 import { AgentHostCodexAgentEnabledSettingId, IAgentHostService } from '../../../../../../platform/agentHost/common/agentService.js';
+import { AGENT_HOST_AUTOMATION_CATALOG_MIGRATED_META_KEY } from '../../../../../../platform/agentHost/common/automationMigration.js';
 import type { IAgentSubscription } from '../../../../../../platform/agentHost/common/state/agentSubscription.js';
+import type { InitializeResult } from '../../../../../../platform/agentHost/common/state/protocol/common/commands.js';
 import type { ResolveSessionConfigResult } from '../../../../../../platform/agentHost/common/state/protocol/commands.js';
 import { ChatInteractivity as ProtocolChatInteractivity, ChatOriginKind as ProtocolChatOriginKind, CustomizationEnablementKind, CustomizationLoadStatus, CustomizationType, McpServerStatus, MessageKind, SessionLifecycle, type AgentCustomization, type AgentInfo, type AutomationState, type ChangesSummary, type Customization, type RootState, type SessionActiveClient, type SessionConfigState, type SessionState } from '../../../../../../platform/agentHost/common/state/protocol/state.js';
 import { buildChatUri, buildDefaultChatUri, buildSubagentChatUri, ChangesetStatus, isAhpAutomationCatalogChannel, ResponsePartKind, SessionSourceControlOutcome, SessionStatus as ProtocolSessionStatus, StateComponents, ToolCallConfirmationReason, ToolCallStatus, ToolResultContentType, TurnState, withSessionCreationReference, withSessionEhcliAdoptable, withSessionGitHubState, withSessionGitState, withSessionMultiRootMetadata, withSessionSourceControlState, withSessionWorkspaceless, type ChangesetState, type ChatState, type ChatSummary } from '../../../../../../platform/agentHost/common/state/sessionState.js';
@@ -91,7 +93,7 @@ class MockAgentHostService extends mock<IAgentHostService>() {
 	override readonly onAgentHostStart = this._onAgentHostStart.event;
 	private readonly _onAgentHostExit = new Emitter<number>();
 	override readonly onAgentHostExit = this._onAgentHostExit.event;
-	override readonly initializeResult = constObservable({
+	override readonly initializeResult = observableValue<InitializeResult>(this, {
 		protocolVersion: '1',
 		serverSeq: 0,
 		snapshots: [],
@@ -100,6 +102,7 @@ class MockAgentHostService extends mock<IAgentHostService>() {
 
 	override readonly clientId = 'test-local-client';
 	private readonly _sessions = new Map<string, IAgentSessionMetadata>();
+	public automationCatalog: AutomationState = { entries: [] };
 	public disposedSessions: URI[] = [];
 	public onDisposeSession: ((session: URI) => void) | undefined;
 	public failDisposeSessionFor: string | undefined;
@@ -278,7 +281,7 @@ class MockAgentHostService extends mock<IAgentHostService>() {
 	override getSubscription<T>(_kind: StateComponents, resource: URI): IReference<IAgentSubscription<T>> {
 		const key = resource.toString();
 		if (isAhpAutomationCatalogChannel(key) && !this._sessionStateValues.has(key)) {
-			this._sessionStateValues.set(key, { entries: [] });
+			this._sessionStateValues.set(key, this.automationCatalog);
 		}
 		return this._getSubscription<T>(key);
 	}
@@ -680,20 +683,22 @@ suite('LocalAgentHostSessionsProvider', () => {
 
 	// ---- Provider identity -------
 
-	test('Automation discovery follows local Agent Host connection lifetime', () => {
+	test('Automation catalogue state follows local Agent Host connection lifetime', () => {
+		agentHost.automationCatalog = { entries: [], _meta: { [AGENT_HOST_AUTOMATION_CATALOG_MIGRATED_META_KEY]: true } };
+		agentHost.initializeResult.set({ ...agentHost.initializeResult.get(), automations: { create: {} } }, undefined);
 		const provider = createProvider(disposables, agentHost, undefined, {
 			configurationService: new TestConfigurationService({ [CHAT_AUTOMATIONS_ENABLED_SETTING]: true }),
 		});
-		const initial = provider.automations.initialDiscoveryState?.get();
+		const initial = provider.automations.catalogueState.get();
 
 		agentHost.fireAgentHostExit();
-		const disconnected = provider.automations.initialDiscoveryState?.get();
+		const disconnected = provider.automations.catalogueState.get();
 		agentHost.fireAgentHostStart();
 
 		assert.deepStrictEqual({
 			initial,
 			disconnected,
-			reconnected: provider.automations.initialDiscoveryState?.get(),
+			reconnected: provider.automations.catalogueState.get(),
 		}, {
 			initial: 'ready',
 			disconnected: 'unavailable',

src/vs/sessions/contrib/sessions/browser/automationsNewBadge.ts

@@ -96,7 +96,7 @@ export class AutomationsNewBadgeState extends Disposable {
 				if (this.forcePreview.read(reader) || this.seen.read(reader) || this.startupDecision.read(reader) !== 'eligible') {
 					return;
 				}
-				if (this.automationService.initialDiscoveryState.read(reader) !== 'ready') {
+				if (this.automationService.catalogueState.read(reader) !== 'ready') {
 					this.startupDecision.set('suppressed', undefined);
 				}
 			}));
@@ -138,7 +138,7 @@ export class AutomationsNewBadgeState extends Disposable {
 			return;
 		}
 
-		if (this.automationService.initialDiscoveryState.get() !== 'ready') {
+		if (this.automationService.catalogueState.get() !== 'ready') {
 			this.startupDecision.set('suppressed', undefined);
 			return;
 		}

src/vs/sessions/contrib/sessions/test/browser/automationsNewBadge.test.ts

@@ -14,7 +14,7 @@ import { TestConfigurationService } from '../../../../../platform/configuration/
 import { NullLogService } from '../../../../../platform/log/common/log.js';
 import { InMemoryStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
 import type { IAutomationDescriptor, IAutomationRun } from '../../../../../workbench/contrib/chat/common/automations/automation.js';
-import { AutomationInitialDiscoveryState, IAutomationService } from '../../../../../workbench/contrib/chat/common/automations/automationService.js';
+import { type AutomationCatalogueState, IAutomationService } from '../../../../../workbench/contrib/chat/common/automations/automationService.js';
 import { IWorkbenchAssignmentService } from '../../../../../workbench/services/assignment/common/assignmentService.js';
 import { ILifecycleService, LifecyclePhase } from '../../../../../workbench/services/lifecycle/common/lifecycle.js';
 import type { ICustomViewDescriptor } from '../../../../services/customView/browser/customView.js';
@@ -54,7 +54,7 @@ suite('AutomationsNewBadgeState', () => {
 		readonly activeView?: ICustomViewDescriptor;
 		readonly seen?: boolean;
 		readonly hadPriorWindowOpen?: boolean;
-		readonly initialDiscoveryState?: AutomationInitialDiscoveryState;
+		readonly catalogueState?: AutomationCatalogueState;
 		readonly eventuallyReady?: boolean;
 		readonly style?: AutomationsNewBadgeStyle;
 		readonly configuredStyle?: AutomationsNewBadgeStyle;
@@ -67,11 +67,11 @@ suite('AutomationsNewBadgeState', () => {
 		const automations = observableValue<readonly IAutomationDescriptor[]>(disposables, options.automations ?? []);
 		const runs = observableValue<readonly IAutomationRun[]>(disposables, options.runs ?? []);
 		const activeView = observableValue<ICustomViewDescriptor | undefined>(disposables, options.activeView);
-		const initialDiscoveryState = observableValue<AutomationInitialDiscoveryState>(disposables, options.initialDiscoveryState ?? 'ready');
+		const catalogueState = observableValue<AutomationCatalogueState>(disposables, options.catalogueState ?? 'ready');
 		const automationService = new class extends mock<IAutomationService>() {
 			override readonly automations = automations;
 			override readonly runs = runs;
-			override readonly initialDiscoveryState = initialDiscoveryState;
+			override readonly catalogueState = catalogueState;
 		};
 		const customViewService = new class extends mock<ICustomViewService>() {
 			override readonly activeCustomView = activeView;
@@ -115,7 +115,7 @@ suite('AutomationsNewBadgeState', () => {
 			assignmentService,
 			configurationService,
 			refetchAssignments,
-			initialDiscoveryState,
+			catalogueState,
 			completeEventually: () => eventually.complete(),
 		};
 	}
@@ -156,13 +156,13 @@ suite('AutomationsNewBadgeState', () => {
 		]);
 	});
 
-	test('never reveals after initial provider discovery is suppressed', async () => {
+	test('never reveals after initial catalogue discovery is suppressed', async () => {
 		const snapshots = [];
-		for (const initialState of ['pending', 'unavailable'] as const) {
-			const fixture = createState({ initialDiscoveryState: initialState, style: 'accent' });
+		for (const initialState of ['loading', 'unavailable', 'error'] as const) {
+			const fixture = createState({ catalogueState: initialState, style: 'accent' });
 
 			await fixture.state.initialize();
-			fixture.initialDiscoveryState.set('ready', undefined);
+			fixture.catalogueState.set('ready', undefined);
 			await fixture.configurationService.setUserConfiguration(AUTOMATIONS_NEW_BADGE_STYLE_SETTING, 'soft');
 			fixture.configurationService.onDidChangeConfigurationEmitter.fire(upcastPartial<IConfigurationChangeEvent>({
 				affectsConfiguration: key => key === AUTOMATIONS_NEW_BADGE_STYLE_SETTING,
@@ -178,8 +178,9 @@ suite('AutomationsNewBadgeState', () => {
 		}
 
 		assert.deepStrictEqual(snapshots, [
-			{ initialState: 'pending', showNewBadge: false, stored: undefined, treatments: [] },
+			{ initialState: 'loading', showNewBadge: false, stored: undefined, treatments: [] },
 			{ initialState: 'unavailable', showNewBadge: false, stored: undefined, treatments: [] },
+			{ initialState: 'error', showNewBadge: false, stored: undefined, treatments: [] },
 		]);
 	});
 
@@ -220,13 +221,13 @@ suite('AutomationsNewBadgeState', () => {
 		});
 	});
 
-	test('suppresses for the window when aggregate discovery becomes pending after presentation', async () => {
+	test('suppresses for the window when the aggregate catalogue starts loading after presentation', async () => {
 		const fixture = createState();
 		await fixture.state.initialize();
 		const beforeDiscoveryChange = fixture.state.presentation.get();
 
-		fixture.initialDiscoveryState.set('pending', undefined);
-		fixture.initialDiscoveryState.set('ready', undefined);
+		fixture.catalogueState.set('loading', undefined);
+		fixture.catalogueState.set('ready', undefined);
 		fixture.refetchAssignments.fire();
 		await Promise.resolve();
 
@@ -241,22 +242,28 @@ suite('AutomationsNewBadgeState', () => {
 		});
 	});
 
-	test('suppresses for the window when aggregate discovery becomes unavailable', async () => {
-		const fixture = createState();
-		await fixture.state.initialize();
-		const beforeDiscoveryChange = fixture.state.presentation.get();
+	test('suppresses for the window when the aggregate catalogue becomes unavailable or errors', async () => {
+		const snapshots = [];
+		for (const catalogueState of ['unavailable', 'error'] as const) {
+			const fixture = createState();
+			await fixture.state.initialize();
+			const beforeDiscoveryChange = fixture.state.presentation.get();
 
-		fixture.initialDiscoveryState.set('unavailable', undefined);
+			fixture.catalogueState.set(catalogueState, undefined);
+			fixture.catalogueState.set('ready', undefined);
 
-		assert.deepStrictEqual({
-			beforeDiscoveryChange,
-			afterDiscoveryChange: fixture.state.presentation.get(),
-			stored: fixture.storageService.get(AUTOMATIONS_NEW_BADGE_SEEN_STORAGE_KEY, StorageScope.APPLICATION),
-		}, {
-			beforeDiscoveryChange: 'outline',
-			afterDiscoveryChange: undefined,
-			stored: undefined,
-		});
+			snapshots.push({
+				catalogueState,
+				beforeDiscoveryChange,
+				afterDiscoveryChange: fixture.state.presentation.get(),
+				stored: fixture.storageService.get(AUTOMATIONS_NEW_BADGE_SEEN_STORAGE_KEY, StorageScope.APPLICATION),
+			});
+		}
+
+		assert.deepStrictEqual(snapshots, [
+			{ catalogueState: 'unavailable', beforeDiscoveryChange: 'outline', afterDiscoveryChange: undefined, stored: undefined },
+			{ catalogueState: 'error', beforeDiscoveryChange: 'outline', afterDiscoveryChange: undefined, stored: undefined },
+		]);
 	});
 
 	test('lets the hidden setting override and live-update the treatment', async () => {

src/vs/sessions/contrib/sessions/test/browser/sessionsList.test.ts

@@ -283,7 +283,7 @@ suite('Sessions - SessionsList', () => {
 				instantiationService.stub(IAutomationService, new class extends mock<IAutomationService>() {
 					override readonly automations = constObservable([]);
 					override readonly runs = constObservable([]);
-					override readonly initialDiscoveryState = constObservable('ready' as const);
+					override readonly catalogueState = constObservable('ready' as const);
 				});
 				instantiationService.stub(ICustomViewService, new class extends mock<ICustomViewService>() {
 					override readonly activeCustomView = activeCustomView;

src/vs/workbench/test/browser/componentFixtures/sessions/sessionsList.fixture.ts

@@ -368,7 +368,7 @@ async function renderSessionsList(ctx: ComponentFixtureContext, options: IRender
 			reg.defineInstance(IAutomationService, new class extends mock<IAutomationService>() {
 				override readonly automations = constObservable([]);
 				override readonly runs = automationRuns;
-				override readonly initialDiscoveryState = constObservable('ready' as const);
+				override readonly catalogueState = constObservable('ready' as const);
 			}());
 			reg.defineInstance(IWorkbenchAssignmentService, new class extends mock<IWorkbenchAssignmentService>() {
 				override readonly onDidRefetchAssignments = Event.None;