PR

Author: pwang347

src/vs/workbench/contrib/chat/common/promptSyntax/service/promptsServiceImpl.ts

@@ -26,6 +26,7 @@ import { IStorageService, StorageScope, StorageTarget } from '../../../../../../
 import { IUserDataProfileService } from '../../../../../services/userDataProfile/common/userDataProfile.js';
 import { IVariableReference } from '../../chatModes.js';
 import { PromptsConfig } from '../config/config.js';
+import { IDefaultAccountService } from '../../../../../../platform/defaultAccount/common/defaultAccount.js';
 import { getCleanPromptName } from '../config/promptFileLocations.js';
 import { PROMPT_LANGUAGE_ID, PromptsType, getPromptsTypeForLanguageId } from '../promptTypes.js';
 import { PromptFilesLocator } from '../utils/promptFilesLocator.js';
@@ -93,7 +94,8 @@ export class PromptsService extends Disposable implements IPromptsService {
 		@IFileService private readonly fileService: IFileService,
 		@IFilesConfigurationService private readonly filesConfigService: IFilesConfigurationService,
 		@IStorageService private readonly storageService: IStorageService,
-		@IExtensionService private readonly extensionService: IExtensionService
+		@IExtensionService private readonly extensionService: IExtensionService,
+		@IDefaultAccountService private readonly defaultAccountService: IDefaultAccountService
 	) {
 		super();
 
@@ -579,7 +581,9 @@ export class PromptsService extends Disposable implements IPromptsService {
 
 	public async findAgentSkills(token: CancellationToken): Promise<IAgentSkill[] | undefined> {
 		const useAgentSkills = this.configurationService.getValue(PromptsConfig.USE_AGENT_SKILLS);
-		if (useAgentSkills) {
+		const defaultAccount = await this.defaultAccountService.getDefaultAccount();
+		const previewFeaturesEnabled = defaultAccount?.chat_preview_features_enabled ?? true;
+		if (useAgentSkills && previewFeaturesEnabled) {
 			const result: IAgentSkill[] = [];
 			const process = async (uri: URI, type: 'personal' | 'project'): Promise<void> => {
 				try {

src/vs/workbench/contrib/chat/test/common/promptSyntax/service/promptsService.test.ts

@@ -43,6 +43,8 @@ import { InMemoryStorageService, IStorageService } from '../../../../../../../pl
 import { IPathService } from '../../../../../../services/path/common/pathService.js';
 import { ISearchService } from '../../../../../../services/search/common/search.js';
 import { IExtensionService } from '../../../../../../services/extensions/common/extensions.js';
+import { IDefaultAccountService } from '../../../../../../../platform/defaultAccount/common/defaultAccount.js';
+import { IDefaultAccount } from '../../../../../../../base/common/defaultAccount.js';
 
 suite('PromptsService', () => {
 	const disposables = ensureNoDisposablesAreLeakedInTestSuite();
@@ -78,6 +80,10 @@ suite('PromptsService', () => {
 			activateByEvent: () => Promise.resolve()
 		});
 
+		instaService.stub(IDefaultAccountService, {
+			getDefaultAccount: () => Promise.resolve({ chat_preview_features_enabled: true } as IDefaultAccount)
+		});
+
 		fileService = disposables.add(instaService.createInstance(FileService));
 		instaService.stub(IFileService, fileService);
 
@@ -1267,6 +1273,42 @@ suite('PromptsService', () => {
 			assert.strictEqual(result, undefined);
 		});
 
+		test('should return undefined when chat_preview_features_enabled is false', async () => {
+			testConfigService.setUserConfiguration(PromptsConfig.USE_AGENT_SKILLS, true);
+			instaService.stub(IDefaultAccountService, {
+				getDefaultAccount: () => Promise.resolve({ chat_preview_features_enabled: false } as IDefaultAccount)
+			});
+
+			// Recreate service with new stub
+			service = disposables.add(instaService.createInstance(PromptsService));
+
+			const result = await service.findAgentSkills(CancellationToken.None);
+			assert.strictEqual(result, undefined);
+
+			// Restore default stub for other tests
+			instaService.stub(IDefaultAccountService, {
+				getDefaultAccount: () => Promise.resolve({ chat_preview_features_enabled: true } as IDefaultAccount)
+			});
+		});
+
+		test('should return undefined when USE_AGENT_SKILLS is enabled but chat_preview_features_enabled is false', async () => {
+			testConfigService.setUserConfiguration(PromptsConfig.USE_AGENT_SKILLS, true);
+			instaService.stub(IDefaultAccountService, {
+				getDefaultAccount: () => Promise.resolve({ chat_preview_features_enabled: false } as IDefaultAccount)
+			});
+
+			// Recreate service with new stub
+			service = disposables.add(instaService.createInstance(PromptsService));
+
+			const result = await service.findAgentSkills(CancellationToken.None);
+			assert.strictEqual(result, undefined);
+
+			// Restore default stub for other tests
+			instaService.stub(IDefaultAccountService, {
+				getDefaultAccount: () => Promise.resolve({ chat_preview_features_enabled: true } as IDefaultAccount)
+			});
+		});
+
 		test('should find skills in workspace and user home', async () => {
 			testConfigService.setUserConfiguration(PromptsConfig.USE_AGENT_SKILLS, true);