@codingame/monaco-vscode-chat-service-override 26.2.2 → 27.0.0

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

@@ -1,5 +1,6 @@
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
+import { IWorkspaceFolder } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace";
 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 { IResolvedPromptFile, IResolvedPromptSourceFolder } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations";
@@ -25,6 +26,9 @@ export declare class PromptFilesLocator {
     private readonly logService;
     private readonly pathService;
     constructor(fileService: IFileService, configService: IConfigurationService, workspaceService: IWorkspaceContextService, environmentService: IWorkbenchEnvironmentService, searchService: ISearchService, userDataService: IUserDataProfileService, logService: ILogService, pathService: IPathService);
+    protected getWorkspaceFolders(): readonly IWorkspaceFolder[];
+    protected getWorkspaceFolder(resource: URI): IWorkspaceFolder | undefined;
+    protected onDidChangeWorkspaceFolders(): Event<void>;
     /**
      * List all prompt files from the filesystem.
      *
@@ -46,7 +50,6 @@ export declare class PromptFilesLocator {
         readonly event: Event<void>;
         dispose: () => void;
     };
-    getAgentSourceFolders(): Promise<readonly URI[]>;
     /**
      * Gets the hook source folders for creating new hooks.
      * Returns folders from config, excluding user storage and Claude paths (which are read-only).
@@ -70,10 +73,20 @@ export declare class PromptFilesLocator {
      * This method merges configured locations with default locations and resolves them
      * to absolute paths, including displayPath and isDefault information.
      *
+     * The returned order prefers workspace (local) folders first, then user folders.
+     * This is used for UX like the "Create Prompt" command where workspace is preferred.
+     *
      * @param type The type of prompt files.
      * @returns List of resolved source folders with metadata.
      */
     getResolvedSourceFolders(type: PromptsType): Promise<readonly IResolvedPromptSourceFolder[]>;
+    /**
+     * Gets all resolved source folders in the same order that file discovery
+     * searches them (user folders first, then local/workspace folders).
+     * This matches the order used by {@link listFiles} and should be used
+     * for debug/diagnostic output so the displayed order is accurate.
+     */
+    getSourceFoldersInDiscoveryOrder(type: PromptsType): Promise<readonly IResolvedPromptSourceFolder[]>;
     /**
      * Gets all local (workspace) storage folders for the given prompt type.
      * This merges default folders with configured locations.

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

@@ -10,7 +10,7 @@ import { PromptsConfig, isTildePath, getPromptFileLocationsConfigKey } from '@co
 import { dirname, joinPath, basename, isEqualOrParent } 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, DEFAULT_AGENT_SOURCE_FOLDERS, getPromptFileExtension, isInClaudeRulesFolder, 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 { getPromptFileType, PromptFileSource, getPromptFileDefaultLocations, getPromptFileExtension, isInClaudeRulesFolder, 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 { 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';
@@ -19,7 +19,7 @@ import { ISearchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 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';
-import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { Event, Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 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';
@@ -44,6 +44,15 @@ let PromptFilesLocator = class PromptFilesLocator {
         this.logService = logService;
         this.pathService = pathService;
     }
+    getWorkspaceFolders() {
+        return this.workspaceService.getWorkspace().folders;
+    }
+    getWorkspaceFolder(resource) {
+        return this.workspaceService.getWorkspaceFolder(resource) ?? undefined;
+    }
+    onDidChangeWorkspaceFolders() {
+        return ( Event.map(this.workspaceService.onDidChangeWorkspaceFolders, () => undefined));
+    }
     async listFiles(type, storage, token) {
         if (storage === PromptsStorage.local) {
             return await this.listFilesInLocal(type, token);
@@ -81,7 +90,7 @@ let PromptFilesLocator = class PromptFilesLocator {
                 uri: userDataPromptsHome,
                 source: PromptFileSource.CopilotPersonal,
                 storage: PromptsStorage.user,
-                displayPath: ( localize(6571, "User Data")),
+                displayPath: ( localize(7168, "User Data")),
                 isDefault: true
             }];
         }
@@ -89,9 +98,7 @@ let PromptFilesLocator = class PromptFilesLocator {
     }
     getSourceFoldersSync(type, userHome) {
         const result = [];
-        const {
-            folders
-        } = this.workspaceService.getWorkspace();
+        const folders = this.getWorkspaceFolders();
         const defaultFileOrFolders = getPromptFileDefaultLocations(type);
         const getFolderUri = (type, fileOrFolderPath) => {
             if (type === PromptsType.hook && fileOrFolderPath.path.toLowerCase().endsWith(".json")) {
@@ -125,7 +132,7 @@ let PromptFilesLocator = class PromptFilesLocator {
         const updateExternalFolderWatchers = () => {
             externalFolderWatchers.clear();
             for (const folder of parentFolders) {
-                if (!this.workspaceService.getWorkspaceFolder(folder.parent)) {
+                if (!this.getWorkspaceFolder(folder.parent)) {
                     const recursive = folder.filePattern !== undefined;
                     externalFolderWatchers.add(this.fileService.watch(folder.parent, {
                         recursive,
@@ -134,7 +141,7 @@ let PromptFilesLocator = class PromptFilesLocator {
                 }
             }
             for (const folder of allSourceFolders) {
-                if (!this.workspaceService.getWorkspaceFolder(folder)) {
+                if (!this.getWorkspaceFolder(folder)) {
                     externalFolderWatchers.add(this.fileService.watch(folder, {
                         recursive: true,
                         excludes: []
@@ -153,6 +160,14 @@ let PromptFilesLocator = class PromptFilesLocator {
                 eventEmitter.fire();
             }
         }));
+        disposables.add(this.onDidChangeWorkspaceFolders()(() => {
+            parentFolders = this.getLocalParentFolders(type);
+            this.pathService.userHome().then(userHome => {
+                allSourceFolders = [...this.getSourceFoldersSync(type, userHome)];
+                updateExternalFolderWatchers();
+            });
+            eventEmitter.fire();
+        }));
         disposables.add(this.fileService.onDidFilesChange(e => {
             if (e.affects(userDataFolder)) {
                 eventEmitter.fire();
@@ -173,10 +188,6 @@ let PromptFilesLocator = class PromptFilesLocator {
             dispose: () => disposables.dispose()
         };
     }
-    async getAgentSourceFolders() {
-        const userHome = await this.pathService.userHome();
-        return ( this.toAbsoluteLocations(PromptsType.agent, DEFAULT_AGENT_SOURCE_FOLDERS, userHome).map(l => l.uri));
-    }
     async getHookSourceFolders() {
         const userHome = await this.pathService.userHome();
         const configuredLocations = PromptsConfig.promptSourceFolders(this.configService, PromptsType.hook);
@@ -225,6 +236,11 @@ let PromptFilesLocator = class PromptFilesLocator {
         const userFolders = await this.getUserStorageFolders(type);
         return this.dedupeSourceFolders([...localFolders, ...userFolders]);
     }
+    async getSourceFoldersInDiscoveryOrder(type) {
+        const userFolders = await this.getUserStorageFolders(type);
+        const localFolders = await this.getLocalStorageFolders(type);
+        return this.dedupeSourceFolders([...userFolders, ...localFolders]);
+    }
     async getLocalStorageFolders(type) {
         const userHome = await this.pathService.userHome();
         const configuredLocations = PromptsConfig.promptSourceFolders(this.configService, type);
@@ -270,9 +286,7 @@ let PromptFilesLocator = class PromptFilesLocator {
     toAbsoluteLocations(type, configuredLocations, userHome, defaultLocations) {
         const result = [];
         const seen = ( new ResourceSet());
-        const {
-            folders
-        } = this.workspaceService.getWorkspace();
+        const folders = this.getWorkspaceFolders();
         const defaultPaths = ( new Set(defaultLocations?.map(loc => loc.path)));
         const validLocations = configuredLocations.filter(sourceFolder => {
             if (type === PromptsType.instructions || type === PromptsType.prompt) {
@@ -399,7 +413,7 @@ let PromptFilesLocator = class PromptFilesLocator {
             return [];
         }
         const disregardIgnoreFiles = this.configService.getValue("explorer.excludeGitIgnore");
-        const workspaceRoot = this.workspaceService.getWorkspaceFolder(folder);
+        const workspaceRoot = this.getWorkspaceFolder(folder);
         const getExcludePattern = folder => getExcludes(this.configService.getValue({
             resource: folder
         })) || {};
@@ -430,9 +444,7 @@ let PromptFilesLocator = class PromptFilesLocator {
     }
     async findCopilotInstructionsMDsInWorkspace(token) {
         const result = [];
-        const {
-            folders
-        } = this.workspaceService.getWorkspace();
+        const folders = this.getWorkspaceFolders();
         for (const folder of folders) {
             const file = joinPath(folder.uri, `.github/` + COPILOT_CUSTOM_INSTRUCTIONS_FILENAME);
             try {
@@ -452,7 +464,7 @@ let PromptFilesLocator = class PromptFilesLocator {
         return result;
     }
     async findAgentMDsInWorkspace(token) {
-        const result = await Promise.all(( this.workspaceService.getWorkspace().folders.map(folder => this.findAgentMDsInFolder(folder.uri, token))));
+        const result = await Promise.all(( this.getWorkspaceFolders().map(folder => this.findAgentMDsInFolder(folder.uri, token))));
         return result.flat(1);
     }
     async findAgentMDsInFolder(folder, token) {
@@ -526,9 +538,7 @@ let PromptFilesLocator = class PromptFilesLocator {
         return result;
     }
     async findFilesInWorkspaceRoots(fileName, folder, type, token, result = []) {
-        const {
-            folders
-        } = this.workspaceService.getWorkspace();
+        const folders = this.getWorkspaceFolders();
         if (folder) {
             return this.findFilesInRoots(( folders.map(f => joinPath(f.uri, folder))), fileName, type, token, result);
         }
@@ -560,7 +570,7 @@ let PromptFilesLocator = class PromptFilesLocator {
     getAgentFileURIFromModeFile(oldURI) {
         if (oldURI.path.endsWith(LEGACY_MODE_FILE_EXTENSION)) {
             let newLocation;
-            const workspaceFolder = this.workspaceService.getWorkspaceFolder(oldURI);
+            const workspaceFolder = this.getWorkspaceFolder(oldURI);
             if (workspaceFolder) {
                 newLocation = joinPath(
                     workspaceFolder.uri,

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

@@ -10,6 +10,7 @@ export interface IChatTodo {
 export interface IChatTodoListStorage {
     getTodoList(sessionResource: URI): IChatTodo[];
     setTodoList(sessionResource: URI, todoList: IChatTodo[]): void;
+    migrateTodoList(oldSessionResource: URI, newSessionResource: URI): void;
 }
 export declare class ChatTodoListStorage implements IChatTodoListStorage {
     private memento;
@@ -18,6 +19,7 @@ export declare class ChatTodoListStorage implements IChatTodoListStorage {
     private setSessionData;
     getTodoList(sessionResource: URI): IChatTodo[];
     setTodoList(sessionResource: URI, todoList: IChatTodo[]): void;
+    migrateTodoList(oldSessionResource: URI, newSessionResource: URI): void;
     private toKey;
 }
 export declare class ChatTodoListService extends Disposable implements IChatTodoListService {
@@ -28,4 +30,5 @@ export declare class ChatTodoListService extends Disposable implements IChatTodo
     constructor(storageService: IStorageService);
     getTodos(sessionResource: URI): IChatTodo[];
     setTodos(sessionResource: URI, todos: IChatTodo[]): void;
+    migrateTodos(oldSessionResource: URI, newSessionResource: URI): void;
 }

package/vscode/src/vs/workbench/contrib/chat/common/tools/chatTodoListService.js

@@ -26,6 +26,15 @@ let ChatTodoListStorage = class ChatTodoListStorage {
     setTodoList(sessionResource, todoList) {
         this.setSessionData(sessionResource, todoList);
     }
+    migrateTodoList(oldSessionResource, newSessionResource) {
+        const todos = this.getSessionData(oldSessionResource);
+        if (todos.length > 0) {
+            this.setSessionData(newSessionResource, todos);
+            const storage = this.memento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
+            delete storage[this.toKey(oldSessionResource)];
+            this.memento.saveMemento();
+        }
+    }
     toKey(sessionResource) {
         return chatSessionResourceToId(sessionResource);
     }
@@ -45,6 +54,10 @@ let ChatTodoListService = class ChatTodoListService extends Disposable {
         this.todoListStorage.setTodoList(sessionResource, todos);
         this._onDidUpdateTodos.fire(sessionResource);
     }
+    migrateTodos(oldSessionResource, newSessionResource) {
+        this.todoListStorage.migrateTodoList(oldSessionResource, newSessionResource);
+        this._onDidUpdateTodos.fire(newSessionResource);
+    }
 };
 ChatTodoListService = ( __decorate([( __param(0, IStorageService))], ChatTodoListService));
 

package/vscode/src/vs/workbench/contrib/chat/common/voiceChatService.js

@@ -20,7 +20,7 @@ var PhraseTextType;
 })(PhraseTextType || (PhraseTextType = {}));
 const VoiceChatInProgress = ( new RawContextKey("voiceChatInProgress", false, {
     type: "boolean",
-    description: ( localize(6615, "A speech-to-text session is in progress for chat."))
+    description: ( localize(7221, "A speech-to-text session is in progress for chat."))
 }));
 let VoiceChatService = class VoiceChatService extends Disposable {
     static {

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChat.contribution.js

@@ -3,7 +3,7 @@ import './inlineChatDefaultModel.js';
 import { registerEditorContribution, EditorContributionInstantiation } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions';
 import { registerAction2, MenuRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { InlineChatController } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
-import { KeepSessionAction2, UndoSessionAction2, UndoAndCloseSessionAction2, StartSessionAction, FocusInlineChat } from './inlineChatActions.js';
+import { KeepSessionAction2, UndoSessionAction2, UndoAndCloseSessionAction2, CancelSessionAction, StartSessionAction, AskInChatAction, FocusInlineChat, SubmitInlineChatInputAction, QueueInChatAction, HideInlineChatInputAction, FixDiagnosticsAction } from './inlineChatActions.js';
 import { CTX_INLINE_CHAT_REQUEST_IN_PROGRESS, CTX_INLINE_CHAT_EDITING, CTX_INLINE_CHAT_V1_ENABLED, MENU_INLINE_CHAT_WIDGET_STATUS } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
@@ -27,12 +27,13 @@ registerEditorContribution(
 registerAction2(KeepSessionAction2);
 registerAction2(UndoSessionAction2);
 registerAction2(UndoAndCloseSessionAction2);
+registerAction2(CancelSessionAction);
 const editActionMenuItem = {
     group: "0_main",
     order: 0,
     command: {
         id: ChatSubmitAction.ID,
-        title: ( localize(8807, "Edit Code"))
+        title: ( localize(9449, "Edit Code"))
     },
     when: ( ContextKeyExpr.and(ChatContextKeys.inputHasText, ( CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.toNegated()), CTX_INLINE_CHAT_EDITING, CTX_INLINE_CHAT_V1_ENABLED))
 };
@@ -41,7 +42,7 @@ const generateActionMenuItem = {
     order: 0,
     command: {
         id: ChatSubmitAction.ID,
-        title: ( localize(8808, "Generate"))
+        title: ( localize(9450, "Generate"))
     },
     when: ( ContextKeyExpr.and(ChatContextKeys.inputHasText, ( CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.toNegated()), ( CTX_INLINE_CHAT_EDITING.toNegated()), CTX_INLINE_CHAT_V1_ENABLED))
 };
@@ -52,14 +53,19 @@ const cancelActionMenuItem = {
     order: 0,
     command: {
         id: CancelAction.ID,
-        title: ( localize(8809, "Cancel Request")),
-        shortTitle: ( localize(8810, "Cancel"))
+        title: ( localize(9451, "Cancel Request")),
+        shortTitle: ( localize(9452, "Cancel"))
     },
     when: ( ContextKeyExpr.and(CTX_INLINE_CHAT_REQUEST_IN_PROGRESS))
 };
 MenuRegistry.appendMenuItem(MENU_INLINE_CHAT_WIDGET_STATUS, cancelActionMenuItem);
 registerAction2(StartSessionAction);
+registerAction2(AskInChatAction);
 registerAction2(FocusInlineChat);
+registerAction2(SubmitInlineChatInputAction);
+registerAction2(QueueInChatAction);
+registerAction2(HideInlineChatInputAction);
+registerAction2(FixDiagnosticsAction);
 const workbenchContributionsRegistry = ( Registry.as(Extensions.Workbench));
 workbenchContributionsRegistry.registerWorkbenchContribution(InlineChatNotebookContribution, LifecyclePhase.Restored);
 registerWorkbenchContribution2(InlineChatEnabler.Id, InlineChatEnabler, WorkbenchPhase.AfterRestored);

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.d.ts

@@ -23,6 +23,10 @@ export declare abstract class AbstractInlineChatAction extends EditorAction2 {
     runEditorCommand(accessor: ServicesAccessor, editor: ICodeEditor, ..._args: unknown[]): void;
     abstract runInlineChatCommand(accessor: ServicesAccessor, ctrl: InlineChatController, editor: ICodeEditor, ...args: unknown[]): void;
 }
+export declare class FixDiagnosticsAction extends AbstractInlineChatAction {
+    constructor();
+    runInlineChatCommand(_accessor: ServicesAccessor, ctrl: InlineChatController, _editor: ICodeEditor, ..._args: unknown[]): void;
+}
 declare class KeepOrUndoSessionAction extends AbstractInlineChatAction {
     private readonly _keep;
     constructor(_keep: boolean, desc: IAction2Options);
@@ -37,4 +41,23 @@ export declare class UndoSessionAction2 extends KeepOrUndoSessionAction {
 export declare class UndoAndCloseSessionAction2 extends KeepOrUndoSessionAction {
     constructor();
 }
+export declare class CancelSessionAction extends KeepOrUndoSessionAction {
+    constructor();
+}
+export declare class SubmitInlineChatInputAction extends AbstractInlineChatAction {
+    constructor();
+    runInlineChatCommand(_accessor: ServicesAccessor, ctrl: InlineChatController, _editor: ICodeEditor, ..._args: unknown[]): void;
+}
+export declare class HideInlineChatInputAction extends AbstractInlineChatAction {
+    constructor();
+    runInlineChatCommand(_accessor: ServicesAccessor, ctrl: InlineChatController, _editor: ICodeEditor, ..._args: unknown[]): void;
+}
+export declare class AskInChatAction extends EditorAction2 {
+    constructor();
+    runEditorCommand(accessor: ServicesAccessor, editor: ICodeEditor): Promise<void>;
+}
+export declare class QueueInChatAction extends AbstractInlineChatAction {
+    constructor();
+    runInlineChatCommand(accessor: ServicesAccessor, ctrl: InlineChatController, editor: ICodeEditor): Promise<void>;
+}
 export {};