@codingame/monaco-vscode-chat-service-override 28.4.0 → 29.0.0

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/utils/promptFilesLocator.js

@@ -6,16 +6,17 @@ import { ResourceSet } from '@codingame/monaco-vscode-api/vscode/vs/base/common/
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { FileOperationError, FileOperationResult } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
-import { PromptsConfig, isTildePath, getPromptFileLocationsConfigKey } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/config';
-import { dirname, joinPath, basename, isEqual, isEqualOrParent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { PromptsConfig, getPromptFileLocationsConfigKey, isTildePath } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/config';
+import { dirname, isEqual, joinPath, basename, isEqualOrParent, extname } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
-import { getPromptFileType, PromptFileSource, getPromptFileDefaultLocations, getPromptFileExtension, COPILOT_CUSTOM_INSTRUCTIONS_FILENAME, LEGACY_MODE_FILE_EXTENSION, AGENTS_SOURCE_FOLDER, getCleanPromptName, AGENT_FILE_EXTENSION, SKILL_FILENAME } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
+import { PromptFileSource, getPromptFileType, getPromptFileExtension, getPromptFileDefaultLocations, LEGACY_MODE_FILE_EXTENSION, AGENTS_SOURCE_FOLDER, getCleanPromptName, AGENT_FILE_EXTENSION, SKILL_FILENAME } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
 import { PromptsType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { getExcludes, QueryType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/search/common/search';
 import { ISearchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/search/common/search.service';
+import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { isCancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { PromptsStorage, AgentFileType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService';
 import { IUserDataProfileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
@@ -23,6 +24,8 @@ import { Event, Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/comm
 import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { IPathService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService.service';
+import { equalsIgnoreCase } from '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
+import { IWorkspaceTrustManagementService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspaceTrust.service';
 
 const MAX_INSTRUCTIONS_RECURSION_DEPTH = 5;
 let PromptFilesLocator = class PromptFilesLocator {
@@ -34,7 +37,8 @@ let PromptFilesLocator = class PromptFilesLocator {
         searchService,
         userDataService,
         logService,
-        pathService
+        pathService,
+        workspaceTrustManagementService
     ) {
         this.fileService = fileService;
         this.configService = configService;
@@ -44,6 +48,17 @@ let PromptFilesLocator = class PromptFilesLocator {
         this.userDataService = userDataService;
         this.logService = logService;
         this.pathService = pathService;
+        this.workspaceTrustManagementService = workspaceTrustManagementService;
+        const userDataPromptsHome = this.userDataService.currentProfile.promptsHome;
+        this.userDataFolder = {
+            uri: userDataPromptsHome,
+            parent: userDataPromptsHome,
+            filePattern: undefined,
+            source: PromptFileSource.CopilotPersonal,
+            storage: PromptsStorage.user,
+            displayPath: ( localize(7574, "User Data")),
+            isDefault: true
+        };
     }
     getWorkspaceFolders() {
         return this.workspaceService.getWorkspace().folders;
@@ -54,21 +69,65 @@ let PromptFilesLocator = class PromptFilesLocator {
     onDidChangeWorkspaceFolders() {
         return ( Event.map(this.workspaceService.onDidChangeWorkspaceFolders, () => undefined));
     }
-    async listFiles(type, storage, token) {
-        if (storage === PromptsStorage.local) {
-            return await this.listFilesInLocal(type, token);
-        } else if (storage === PromptsStorage.user) {
-            return await this.listFilesInUserData(type, token);
+    async getWorkspaceFolderRoots(includeParents, logger) {
+        const workspaceFolders = this.getWorkspaceFolders();
+        if (includeParents) {
+            const roots = ( new ResourceSet());
+            const userHome = await this.pathService.userHome();
+            for (const workspaceFolder of workspaceFolders) {
+                roots.add(workspaceFolder.uri);
+                const parents = await this.findParentRepoFolders(workspaceFolder.uri, userHome, roots, logger);
+                for (const parent of parents) {
+                    roots.add(parent);
+                }
+            }
+            return [...roots];
         }
-        throw ( new Error(`Unsupported prompt file storage: ${storage}`));
+        return ( workspaceFolders.map(f => f.uri));
+    }
+    async findParentRepoFolders(folderUri, userHome, seen, logger) {
+        const candidates = [];
+        let current = folderUri;
+        let parent = dirname(current);
+        do {
+            try {
+                const isRepoRoot = await this.fileService.exists(joinPath(current, ".git"));
+                if (isRepoRoot) {
+                    if ((await this.workspaceTrustManagementService.getUriTrustInfo(current)).trusted) {
+                        candidates.push(current);
+                        return candidates;
+                    }
+                    logger?.logInfo(`Repository root found at ${( current.toString())}, but it is not trusted. Skipping parent folder inclusion for this workspace folder.`);
+                    return [];
+                }
+            } catch (e) {
+                const msg = e instanceof Error ? e.message : String(e);
+                logger?.logInfo(`No repository root found for folder ${( folderUri.toString())}. Error accessing ${joinPath(current, ".git")}: ${msg}.`);
+                return [];
+            }
+            candidates.push(current);
+            current = parent;
+            parent = dirname(current);
+        } while (!( seen.has(current)) && current.path !== "/" && !isEqual(userHome, current));
+        logger?.logInfo(`No repository root found for folder ${( folderUri.toString())}.`);
+        return [];
     }
-    async listFilesInUserData(type, token) {
-        const userStorageFolders = await this.getUserStorageFolders(type);
+    async listFiles(type, storage, token) {
+        if (storage !== PromptsStorage.user && storage !== PromptsStorage.local) {
+            throw ( new Error(`Unsupported prompt file storage: ${storage}`));
+        }
+        const configuredLocations = PromptsConfig.promptSourceFolders(this.configService, type);
+        const absoluteLocations = await this.toAbsoluteLocations(type, configuredLocations.filter(loc => loc.storage === storage));
+        if (storage === PromptsStorage.user && (type === PromptsType.agent || type === PromptsType.instructions || type === PromptsType.prompt)) {
+            absoluteLocations.push(this.userDataFolder);
+        }
         const paths = ( new ResourceSet());
         for (const {
-            uri
-        } of userStorageFolders) {
-            const files = await this.resolveFilesAtLocation(uri, type, token);
+            parent,
+            filePattern
+        } of absoluteLocations) {
+            const files = (filePattern === undefined) ?
+            await this.resolveFilesAtLocation(parent, type, token) : await this.searchFilesInLocation(parent, filePattern, token);
             for (const file of files) {
                 if (getPromptFileType(file) === type) {
                     paths.add(file);
@@ -80,94 +139,51 @@ let PromptFilesLocator = class PromptFilesLocator {
         }
         return [...paths];
     }
-    async getUserStorageFolders(type) {
-        const userHome = await this.pathService.userHome();
-        const configuredLocations = PromptsConfig.promptSourceFolders(this.configService, type);
-        const absoluteLocations = this.toAbsoluteLocations(type, configuredLocations, userHome);
-        const result = absoluteLocations.filter(loc => loc.storage === PromptsStorage.user);
-        if (type === PromptsType.agent || type === PromptsType.instructions || type === PromptsType.prompt) {
-            const userDataPromptsHome = this.userDataService.currentProfile.promptsHome;
-            return [...result, {
-                uri: userDataPromptsHome,
-                source: PromptFileSource.CopilotPersonal,
-                storage: PromptsStorage.user,
-                displayPath: ( localize(7345, "User Data")),
-                isDefault: true
-            }];
-        }
-        return result;
-    }
-    getSourceFoldersSync(type, userHome) {
-        const result = [];
-        const folders = this.getWorkspaceFolders();
-        const defaultFileOrFolders = getPromptFileDefaultLocations(type);
-        const getFolderUri = (type, fileOrFolderPath) => {
-            if (type === PromptsType.hook && fileOrFolderPath.path.toLowerCase().endsWith(".json")) {
-                return dirname(fileOrFolderPath);
-            }
-            return fileOrFolderPath;
-        };
-        for (const sourceFileOrFolder of defaultFileOrFolders) {
-            let fileOrFolderPath;
-            if (sourceFileOrFolder.storage === PromptsStorage.local) {
-                for (const workspaceFolder of folders) {
-                    fileOrFolderPath = joinPath(workspaceFolder.uri, sourceFileOrFolder.path);
-                    result.push(getFolderUri(type, fileOrFolderPath));
-                }
-            } else if (sourceFileOrFolder.storage === PromptsStorage.user) {
-                const relativePath = isTildePath(sourceFileOrFolder.path) ? sourceFileOrFolder.path.substring(2) : sourceFileOrFolder.path;
-                fileOrFolderPath = joinPath(userHome, relativePath);
-                result.push(getFolderUri(type, fileOrFolderPath));
-            }
-        }
-        return result;
-    }
     createFilesUpdatedEvent(type) {
         const disposables = ( new DisposableStore());
         const eventEmitter = disposables.add(( new Emitter()));
-        const userDataFolder = this.userDataService.currentProfile.promptsHome;
-        const key = getPromptFileLocationsConfigKey(type);
-        let parentFolders = this.getLocalParentFolders(type);
-        let allSourceFolders = [];
+        const token = disposables.add(( new CancellationTokenSource())).token;
         const externalFolderWatchers = disposables.add(( new DisposableStore()));
+        const key = getPromptFileLocationsConfigKey(type);
+        const userDataFolder = this.userDataService.currentProfile.promptsHome;
+        let parentFolders = [];
         const updateExternalFolderWatchers = () => {
             externalFolderWatchers.clear();
             for (const folder of parentFolders) {
                 if (!this.getWorkspaceFolder(folder.parent)) {
-                    const recursive = folder.filePattern !== undefined;
+                    const recursive = folder.filePattern !== undefined || type === PromptsType.instructions;
                     externalFolderWatchers.add(this.fileService.watch(folder.parent, {
                         recursive,
                         excludes: []
                     }));
                 }
             }
-            for (const folder of allSourceFolders) {
-                if (!this.getWorkspaceFolder(folder)) {
-                    externalFolderWatchers.add(this.fileService.watch(folder, {
-                        recursive: true,
-                        excludes: []
-                    }));
+        };
+        const update = async emitEvent => {
+            try {
+                const configuredLocations = PromptsConfig.promptSourceFolders(this.configService, type);
+                parentFolders = await this.toAbsoluteLocations(type, configuredLocations, undefined);
+                if (token.isCancellationRequested) {
+                    return;
+                }
+                updateExternalFolderWatchers();
+                if (emitEvent) {
+                    eventEmitter.fire();
                 }
+            } catch (err) {
+                this.logService.error(`Error updating prompt file watchers after config change:`, err);
             }
         };
-        this.pathService.userHome().then(userHome => {
-            allSourceFolders = [...this.getSourceFoldersSync(type, userHome)];
-            updateExternalFolderWatchers();
-        });
         disposables.add(this.configService.onDidChangeConfiguration(e => {
             if (e.affectsConfiguration(key)) {
-                parentFolders = this.getLocalParentFolders(type);
-                updateExternalFolderWatchers();
-                eventEmitter.fire();
+                void update(true);
             }
         }));
         disposables.add(this.onDidChangeWorkspaceFolders()(() => {
-            parentFolders = this.getLocalParentFolders(type);
-            this.pathService.userHome().then(userHome => {
-                allSourceFolders = [...this.getSourceFoldersSync(type, userHome)];
-                updateExternalFolderWatchers();
-            });
-            eventEmitter.fire();
+            void update(true);
+        }));
+        disposables.add(this.workspaceTrustManagementService.onDidChangeTrustedFolders(() => {
+            void update(true);
         }));
         disposables.add(this.fileService.onDidFilesChange(e => {
             if (e.affects(userDataFolder)) {
@@ -178,76 +194,72 @@ let PromptFilesLocator = class PromptFilesLocator {
                 eventEmitter.fire();
                 return;
             }
-            if (( allSourceFolders.some(folder => e.affects(folder)))) {
-                eventEmitter.fire();
-                return;
-            }
         }));
         disposables.add(this.fileService.watch(userDataFolder));
+        void update(false);
         return {
             event: eventEmitter.event,
             dispose: () => disposables.dispose()
         };
     }
     async getHookSourceFolders() {
-        const userHome = await this.pathService.userHome();
         const configuredLocations = PromptsConfig.promptSourceFolders(this.configService, PromptsType.hook);
         const allowedHookFolders = configuredLocations.filter(loc => !loc.path.startsWith(".claude/") && !loc.path.includes("/.claude/"));
         const result = ( new ResourceSet());
-        const absoluteLocations = this.toAbsoluteLocations(PromptsType.hook, allowedHookFolders, userHome);
+        const absoluteLocations = await this.toAbsoluteLocations(PromptsType.hook, allowedHookFolders);
         for (const location of absoluteLocations) {
-            const isSpecificFile = location.uri.path.endsWith(".json");
-            if (isSpecificFile) {
-                result.add(dirname(location.uri));
-            } else {
-                result.add(location.uri);
-            }
+            result.add(location.parent);
         }
         return [...result];
     }
     async getConfigBasedSourceFolders(type) {
-        const userHome = await this.pathService.userHome();
         const configuredLocations = PromptsConfig.promptSourceFolders(this.configService, type);
-        const absoluteLocations = ( this.toAbsoluteLocations(type, configuredLocations, userHome).map(l => l.uri));
+        const absoluteLocations = await this.toAbsoluteLocations(type, configuredLocations);
         if (type !== PromptsType.prompt && type !== PromptsType.instructions) {
-            return absoluteLocations;
+            return ( absoluteLocations.map(l => l.uri));
         }
         const result = ( new ResourceSet());
-        for (let absoluteLocation of absoluteLocations) {
-            const baseName = basename(absoluteLocation);
+        for (const absoluteLocation of absoluteLocations) {
+            let location = absoluteLocation.uri;
+            const baseName = basename(location);
             const filePatterns = ["*.md", `*${getPromptFileExtension(type)}`];
             for (const filePattern of filePatterns) {
                 if (baseName === filePattern) {
-                    absoluteLocation = dirname(absoluteLocation);
+                    location = dirname(location);
                     continue;
                 }
             }
             if (baseName === "*") {
-                absoluteLocation = dirname(absoluteLocation);
+                location = dirname(location);
             }
-            if (isValidGlob(absoluteLocation.path) === true) {
+            if (isValidGlob(location.path) === true) {
                 continue;
             }
-            result.add(absoluteLocation);
+            result.add(location);
         }
         return [...result];
     }
     async getResolvedSourceFolders(type) {
-        const localFolders = await this.getLocalStorageFolders(type);
-        const userFolders = await this.getUserStorageFolders(type);
+        const absoluteLocations = await this.getLocalStorageFolders(type);
+        const localFolders = absoluteLocations.filter(loc => loc.storage === PromptsStorage.local);
+        const userFolders = absoluteLocations.filter(loc => loc.storage === PromptsStorage.user);
         return this.dedupeSourceFolders([...localFolders, ...userFolders]);
     }
     async getSourceFoldersInDiscoveryOrder(type) {
-        const userFolders = await this.getUserStorageFolders(type);
-        const localFolders = await this.getLocalStorageFolders(type);
+        const absoluteLocations = await this.getLocalStorageFolders(type);
+        const userFolders = absoluteLocations.filter(loc => loc.storage === PromptsStorage.user);
+        const localFolders = absoluteLocations.filter(loc => loc.storage === PromptsStorage.local);
         return this.dedupeSourceFolders([...userFolders, ...localFolders]);
     }
     async getLocalStorageFolders(type) {
-        const userHome = await this.pathService.userHome();
         const configuredLocations = PromptsConfig.promptSourceFolders(this.configService, type);
         const defaultFolders = getPromptFileDefaultLocations(type);
         const allFolders = [...defaultFolders, ...configuredLocations.filter(loc => !( defaultFolders.some(df => df.path === loc.path)))];
-        return this.toAbsoluteLocations(type, allFolders, userHome, defaultFolders);
+        const absoluteLocations = await this.toAbsoluteLocations(type, allFolders, defaultFolders);
+        if (type === PromptsType.agent || type === PromptsType.instructions || type === PromptsType.prompt) {
+            absoluteLocations.push(this.userDataFolder);
+        }
+        return absoluteLocations;
     }
     dedupeSourceFolders(folders) {
         const seen = ( new ResourceSet());
@@ -260,34 +272,13 @@ let PromptFilesLocator = class PromptFilesLocator {
         }
         return result;
     }
-    async listFilesInLocal(type, token) {
-        const paths = ( new ResourceSet());
-        for (const {
-            parent,
-            filePattern
-        } of this.getLocalParentFolders(type)) {
-            const files = (filePattern === undefined) ?
-            await this.resolveFilesAtLocation(parent, type, token) : await this.searchFilesInLocation(parent, filePattern, token);
-            for (const file of files) {
-                if (getPromptFileType(file) === type) {
-                    paths.add(file);
-                }
-            }
-            if (token.isCancellationRequested) {
-                return [];
-            }
-        }
-        return [...paths];
-    }
-    getLocalParentFolders(type) {
-        const configuredLocations = PromptsConfig.promptSourceFolders(this.configService, type);
-        const absoluteLocations = this.toAbsoluteLocations(type, configuredLocations, undefined);
-        return ( absoluteLocations.map(location => firstNonGlobParentAndPattern(location.uri)));
-    }
-    toAbsoluteLocations(type, configuredLocations, userHome, defaultLocations) {
+    async toAbsoluteLocations(type, configuredLocations, defaultLocations) {
         const result = [];
         const seen = ( new ResourceSet());
-        const folders = this.getWorkspaceFolders();
+        const userHome = await this.pathService.userHome();
+        const rootFolders = await this.getWorkspaceFolderRoots(
+            this.configService.getValue(PromptsConfig.USE_CUSTOMIZATIONS_IN_PARENT_REPOS) === true
+        );
         const defaultPaths = ( new Set(defaultLocations?.map(loc => loc.path)));
         const validLocations = configuredLocations.filter(sourceFolder => {
             if (type === PromptsType.instructions || type === PromptsType.prompt) {
@@ -319,18 +310,22 @@ let PromptFilesLocator = class PromptFilesLocator {
             const isDefault = defaultPaths?.has(configuredLocation);
             try {
                 if (isTildePath(configuredLocation)) {
-                    if (userHome) {
-                        const uri = joinPath(userHome, configuredLocation.substring(2));
-                        if (!( seen.has(uri))) {
-                            seen.add(uri);
-                            result.push({
-                                uri,
-                                source: sourceFolder.source,
-                                storage: sourceFolder.storage,
-                                displayPath: configuredLocation,
-                                isDefault
-                            });
-                        }
+                    const uri = joinPath(userHome, configuredLocation.substring(2));
+                    if (!( seen.has(uri))) {
+                        seen.add(uri);
+                        const {
+                            parent,
+                            filePattern
+                        } = getParentFolder(type, uri);
+                        result.push({
+                            uri,
+                            parent,
+                            filePattern,
+                            source: sourceFolder.source,
+                            storage: sourceFolder.storage,
+                            displayPath: configuredLocation,
+                            isDefault
+                        });
                     }
                     continue;
                 }
@@ -345,8 +340,14 @@ let PromptFilesLocator = class PromptFilesLocator {
                     }
                     if (!( seen.has(uri))) {
                         seen.add(uri);
+                        const {
+                            parent,
+                            filePattern
+                        } = getParentFolder(type, uri);
                         result.push({
                             uri,
+                            parent,
+                            filePattern,
                             source: sourceFolder.source,
                             storage: sourceFolder.storage,
                             displayPath: configuredLocation,
@@ -354,12 +355,18 @@ let PromptFilesLocator = class PromptFilesLocator {
                         });
                     }
                 } else {
-                    for (const workspaceFolder of folders) {
-                        const absolutePath = joinPath(workspaceFolder.uri, configuredLocation);
+                    for (const folder of rootFolders) {
+                        const absolutePath = joinPath(folder, configuredLocation);
                         if (!( seen.has(absolutePath))) {
                             seen.add(absolutePath);
+                            const {
+                                parent,
+                                filePattern
+                            } = getParentFolder(type, absolutePath);
                             result.push({
                                 uri: absolutePath,
+                                parent,
+                                filePattern,
                                 source: sourceFolder.source,
                                 storage: sourceFolder.storage,
                                 displayPath: configuredLocation,
@@ -444,27 +451,6 @@ let PromptFilesLocator = class PromptFilesLocator {
         }
         return [];
     }
-    async findCopilotInstructionsMDsInWorkspace(token) {
-        const result = [];
-        const folders = this.getWorkspaceFolders();
-        for (const folder of folders) {
-            const file = joinPath(folder.uri, `.github/` + COPILOT_CUSTOM_INSTRUCTIONS_FILENAME);
-            try {
-                const stat = await this.fileService.stat(file);
-                if (stat.isFile) {
-                    const realPath = stat.isSymbolicLink ? await this.fileService.realpath(file) : undefined;
-                    result.push({
-                        uri: file,
-                        realPath,
-                        type: AgentFileType.copilotInstructionsMd
-                    });
-                }
-            } catch (error) {
-                this.logService.trace(`[PromptFilesLocator] Skipping copilot-instructions.md at ${( file.toString())}: ${error}`);
-            }
-        }
-        return result;
-    }
     async findAgentMDsInWorkspace(token) {
         const result = await Promise.all(( this.getWorkspaceFolders().map(folder => this.findAgentMDsInFolder(folder.uri, token))));
         return result.flat(1);
@@ -539,31 +525,28 @@ let PromptFilesLocator = class PromptFilesLocator {
         await traverse(folder);
         return result;
     }
-    async findFilesInWorkspaceRoots(fileName, folder, type, token, result = []) {
-        const folders = this.getWorkspaceFolders();
-        if (folder) {
-            return this.findFilesInRoots(( folders.map(f => joinPath(f.uri, folder))), fileName, type, token, result);
-        }
-        return this.findFilesInRoots(( folders.map(f => f.uri)), fileName, type, token, result);
-    }
-    async findFilesInRoots(roots, fileName, type, token, result = []) {
-        const fileNameLower = fileName.toLowerCase();
-        const resolvedRoots = await this.fileService.resolveAll(( roots.map(uri => ({
-            resource: uri
-        }))));
+    async findFilesInRoots(roots, folder, paths, token, result = []) {
+        const toResolve = ( roots.map(root => ({
+            resource: folder !== undefined ? joinPath(root, folder) : root
+        })));
+        const resolvedRoots = await this.fileService.resolveAll(toResolve);
         if (token.isCancellationRequested) {
             return result;
         }
         for (const root of resolvedRoots) {
             if (root.success && root.stat?.children) {
-                const file = root.stat.children.find(c => c.isFile && c.name.toLowerCase() === fileNameLower);
-                if (file) {
-                    const realPath = file.isSymbolicLink ? await this.fileService.realpath(file.resource) : undefined;
-                    result.push({
-                        uri: file.resource,
-                        realPath,
-                        type
-                    });
+                for (const child of root.stat.children) {
+                    if (child.isFile) {
+                        const matchingPath = paths.find(p => equalsIgnoreCase(p.fileName, child.name));
+                        if (matchingPath) {
+                            const realPath = child.isSymbolicLink ? await this.fileService.realpath(child.resource) : undefined;
+                            result.push({
+                                uri: child.resource,
+                                realPath,
+                                type: matchingPath.type
+                            });
+                        }
+                    }
                 }
             }
         }
@@ -618,9 +601,8 @@ let PromptFilesLocator = class PromptFilesLocator {
         }
     }
     async findAgentSkills(token) {
-        const userHome = await this.pathService.userHome();
         const configuredLocations = PromptsConfig.promptSourceFolders(this.configService, PromptsType.skill);
-        const absoluteLocations = this.toAbsoluteLocations(PromptsType.skill, configuredLocations, userHome);
+        const absoluteLocations = await this.toAbsoluteLocations(PromptsType.skill, configuredLocations);
         const allResults = [];
         for (const {
             uri,
@@ -640,7 +622,7 @@ let PromptFilesLocator = class PromptFilesLocator {
         return allResults;
     }
 };
-PromptFilesLocator = ( __decorate([( __param(0, IFileService)), ( __param(1, IConfigurationService)), ( __param(2, IWorkspaceContextService)), ( __param(3, IWorkbenchEnvironmentService)), ( __param(4, ISearchService)), ( __param(5, IUserDataProfileService)), ( __param(6, ILogService)), ( __param(7, IPathService))], PromptFilesLocator));
+PromptFilesLocator = ( __decorate([( __param(0, IFileService)), ( __param(1, IConfigurationService)), ( __param(2, IWorkspaceContextService)), ( __param(3, IWorkbenchEnvironmentService)), ( __param(4, ISearchService)), ( __param(5, IUserDataProfileService)), ( __param(6, ILogService)), ( __param(7, IPathService)), ( __param(8, IWorkspaceTrustManagementService))], PromptFilesLocator));
 function hasGlobPattern(path) {
     return path.includes("*");
 }
@@ -694,7 +676,15 @@ function isValidGlob(pattern) {
     }
     return false;
 }
-function firstNonGlobParentAndPattern(location) {
+function getParentFolder(type, location) {
+    if (type === PromptsType.hook && extname(location) === ".json") {
+        location = dirname(location);
+    }
+    if (type !== PromptsType.instructions && type !== PromptsType.prompt) {
+        return {
+            parent: location
+        };
+    }
     const segments = location.path.split("/");
     let i = 0;
     while (i < segments.length && isValidGlob(segments[i]) === false) {

package/vscode/src/vs/workbench/contrib/chat/common/tools/chatArtifactsService.d.ts

@@ -0,0 +1,24 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
+import { IChatArtifactsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/chatArtifactsService.service";
+export interface IChatArtifact {
+    readonly label: string;
+    readonly uri: string;
+    readonly toolCallId?: string;
+    readonly dataPartIndex?: number;
+    readonly type: "devServer" | "screenshot" | "plan" | undefined;
+}
+export declare class ChatArtifactsService extends Disposable implements IChatArtifactsService {
+    readonly _serviceBrand: undefined;
+    private readonly _onDidUpdateArtifacts;
+    readonly onDidUpdateArtifacts: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<URI>;
+    private readonly _storage;
+    private readonly _observables;
+    constructor(storageService: IStorageService);
+    getArtifacts(sessionResource: URI): readonly IChatArtifact[];
+    setArtifacts(sessionResource: URI, artifacts: IChatArtifact[]): void;
+    migrateArtifacts(oldSessionResource: URI, newSessionResource: URI): void;
+    artifacts(sessionResource: URI): IObservable<readonly IChatArtifact[]>;
+}