@codingame/monaco-vscode-api 34.1.3 → 35.0.1

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

@@ -67,6 +67,8 @@ export declare class PromptsService extends Disposable implements IPromptsServic
      * Cached instructions.
      */
     private readonly cachedInstructions;
+    private readonly agentInstructionsWatcher;
+    private readonly _onDidChangeAgentInstructions;
     /**
      * Synchronous mirror of the names exposed by {@link getPromptSlashCommands},
      * maintained for {@link hasPromptSlashCommand} so callers (e.g. the chat request
@@ -146,6 +148,7 @@ export declare class PromptsService extends Disposable implements IPromptsServic
      */
     get onDidChangeCustomAgents(): Event<void>;
     get onDidChangeInstructions(): Event<void>;
+    get onDidChangeAgentInstructions(): Event<void>;
     getCustomAgents(token: CancellationToken): Promise<readonly ICustomAgent[]>;
     /**
      * Derives ICustomAgent[] from cached discovery info.
@@ -182,6 +185,12 @@ export declare class PromptsService extends Disposable implements IPromptsServic
     private withPromptPathMetadata;
     private computeInstructionFiles;
     private computeHooks;
+    /**
+     * Precedence used when deduplicating skills that share the same canonical
+     * name: workspace > personal > plugin > extension API > extension contribution.
+     * Lower numbers win.
+     */
+    private getSkillPriority;
     /**
      * Returns the discovery results for skill files.
      */

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/service/promptsServiceImpl.js

@@ -1,10 +1,11 @@
 
 import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
-import { CancellationToken } from '../../../../../../base/common/cancellation.js';
-import { CancellationError } from '../../../../../../base/common/errors.js';
+import { CancellationToken, CancellationTokenPool } from '../../../../../../base/common/cancellation.js';
+import { isCancellationError, CancellationError } from '../../../../../../base/common/errors.js';
 import { Emitter, Event } from '../../../../../../base/common/event.js';
 import { parse } from '../../../../../../base/common/json.js';
-import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { getParseErrorMessage } from '../../../../../../base/common/jsonErrorMessages.js';
+import { Disposable, MutableDisposable, DisposableStore } from '../../../../../../base/common/lifecycle.js';
 import { StopWatch } from '../../../../../../base/common/stopwatch.js';
 import '../../../../../../base/common/observableInternal/index.js';
 import { ResourceMap, ResourceSet } from '../../../../../../base/common/map.js';
@@ -29,7 +30,7 @@ import { PromptsType, PromptFileSource, PROMPT_LANGUAGE_ID, getPromptsTypeForLan
 import { PromptFilesLocator } from '../utils/promptFilesLocator.js';
 import { PromptFileParser, evaluateApplyToPattern, PromptHeaderAttributes } from '../promptFileParser.js';
 import { PromptsStorage, matchesSessionType, IAgentSource, AgentInstructionFileType } from './promptsService.js';
-import { Delayer } from '../../../../../../base/common/async.js';
+import { Delayer, raceCancellationError } from '../../../../../../base/common/async.js';
 import { Schemas } from '../../../../../../base/common/network.js';
 import { parseSubagentHooksFromYaml } from '../hookSchema.js';
 import { parseHooksFromFile, HookSourceFormat } from '../hookCompatibility.js';
@@ -74,6 +75,21 @@ let PromptsService = class PromptsService extends Disposable {
         this.pathService = pathService;
         this.agentPluginService = agentPluginService;
         this.workspaceTrustService = workspaceTrustService;
+        this.agentInstructionsWatcher = this._register(( new MutableDisposable()));
+        this._onDidChangeAgentInstructions = this._register(( new Emitter({
+            onWillAddFirstListener: () => {
+                const store = ( new DisposableStore());
+                const agentInstructionsUpdatedEvent = this.fileLocator.createAgentInstructionsUpdatedEvent();
+                store.add(agentInstructionsUpdatedEvent);
+                store.add(
+                    agentInstructionsUpdatedEvent.event(() => this._onDidChangeAgentInstructions.fire())
+                );
+                this.agentInstructionsWatcher.value = store;
+            },
+            onDidRemoveLastListener: () => {
+                this.agentInstructionsWatcher.clear();
+            }
+        })));
         this.knownPromptSlashCommandNames = ( new Set());
         this.cachedParsedPromptFromModels = ( new ResourceMap());
         this.cachedFileLocations = {};
@@ -164,6 +180,7 @@ let PromptsService = class PromptsService extends Disposable {
                             type: PromptsType.hook,
                             name: getCanonicalPluginCommandId(plugin, hook.originalId),
                             pluginUri: plugin.uri,
+                            pluginLabel: plugin.label,
                             source: PromptFileSource.Plugin
                         });
                     }
@@ -189,6 +206,7 @@ let PromptsService = class PromptsService extends Disposable {
                         type,
                         name: getCanonicalPluginCommandId(plugin, item.name),
                         pluginUri: plugin.uri,
+                        pluginLabel: plugin.label,
                         source: PromptFileSource.Plugin
                     });
                 }
@@ -341,7 +359,8 @@ let PromptsService = class PromptsService extends Disposable {
         const useAgentSkills = this.configurationService.getValue(PromptsConfig.USE_AGENT_SKILLS);
         const skills = useAgentSkills ? await this.listPromptFiles(PromptsType.skill, token) : [];
         const disabledSkills = this.getDisabledPromptFiles(PromptsType.skill);
-        const slashCommandFiles = [...promptFiles, ...skills.filter(s => !( disabledSkills.has(s.uri)))];
+        const enabledSkills = skills.filter(s => !( disabledSkills.has(s.uri))).sort((a, b) => this.getSkillPriority(a) - this.getSkillPriority(b));
+        const slashCommandFiles = [...promptFiles, ...enabledSkills];
         const parseResults = await Promise.all(( slashCommandFiles.map(async promptPath => {
             try {
                 const parsedPromptFile = await this.parseNew(promptPath.uri, token);
@@ -352,7 +371,8 @@ let PromptsService = class PromptsService extends Disposable {
                     rawName = parsedPromptFile?.header?.name ?? promptPath.name ?? getCleanPromptName(promptPath.uri);
                 }
                 const name = promptPath.source === PromptFileSource.Plugin && promptPath.pluginUri ? getCanonicalPluginCommandId({
-                    uri: promptPath.pluginUri
+                    uri: promptPath.pluginUri,
+                    label: promptPath.pluginLabel
                 }, rawName) : rawName;
                 const description = parsedPromptFile?.header?.description ?? promptPath.description;
                 const argumentHint = parsedPromptFile?.header?.argumentHint;
@@ -376,7 +396,25 @@ let PromptsService = class PromptsService extends Disposable {
                 };
             }
         })));
-        const files = parseResults;
+        const seenSkillNames = ( new Set());
+        const files = [];
+        for (const result of parseResults) {
+            if (result.status === "loaded" && result.promptPath.type === PromptsType.skill) {
+                const name = result.promptPath.name;
+                if (name !== undefined) {
+                    if (( seenSkillNames.has(name))) {
+                        files.push({
+                            status: "skipped",
+                            skipReason: "duplicate-name",
+                            promptPath: result.promptPath
+                        });
+                        continue;
+                    }
+                    seenSkillNames.add(name);
+                }
+            }
+            files.push(result);
+        }
         const promptSourceFolders = await this._collectSourceFolderDiagnostics(PromptsType.prompt);
         const sourceFolders = [...promptSourceFolders];
         if (useAgentSkills) {
@@ -466,6 +504,7 @@ let PromptsService = class PromptsService extends Disposable {
             type: promptPath.type,
             extension: promptPath.extension,
             pluginUri: promptPath.pluginUri,
+            pluginLabel: promptPath.pluginLabel,
             description: promptPath.description,
             argumentHint: argumentHint,
             userInvocable: userInvocable ?? true,
@@ -486,6 +525,9 @@ let PromptsService = class PromptsService extends Disposable {
     get onDidChangeInstructions() {
         return this.cachedInstructions.onDidChangePromise;
     }
+    get onDidChangeAgentInstructions() {
+        return this._onDidChangeAgentInstructions.event;
+    }
     async getCustomAgents(token) {
         const discoveryInfo = await this.cachedCustomAgents.get(token);
         const result = this.agentsFromDiscoveryInfo(discoveryInfo);
@@ -546,7 +588,7 @@ let PromptsService = class PromptsService extends Disposable {
                         `[computeAgentDiscoveryInfo] Skipping agent file that does not exist: ${uri}`,
                         error.message
                     );
-                } else {
+                } else if (!isCancellationError(e)) {
                     this.logger.error(`[computeAgentDiscoveryInfo] Failed to parse agent file: ${uri}`, error);
                 }
                 return {
@@ -586,17 +628,17 @@ let PromptsService = class PromptsService extends Disposable {
                 relative: true
             });
         case PromptsStorage.user:
-            return localize(8323, "User Data");
+            return localize(8940, "User Data");
         case PromptsStorage.extension:
             {
                 return localize(
-                    8324,
+                    8941,
                     "Extension: {0}",
                     promptPath.extension.displayName ?? promptPath.extension.id
                 );
             }
         case PromptsStorage.plugin:
-            return localize(8325, "Plugin");
+            return localize(8942, "Plugin");
         default:
             assertNever(promptPath, "Unknown prompt storage type");
         }
@@ -808,6 +850,7 @@ let PromptsService = class PromptsService extends Disposable {
                     disableModelInvocation: file.disableModelInvocation ?? false,
                     userInvocable: file.userInvocable ?? true,
                     pluginUri: file.promptPath.pluginUri,
+                    pluginLabel: file.promptPath.pluginLabel,
                     extension: file.promptPath.extension,
                     sessionTypes: file.promptPath.sessionTypes
                 });
@@ -972,7 +1015,20 @@ let PromptsService = class PromptsService extends Disposable {
             }
             try {
                 const content = await this.fileService.readFile(hookFile.uri);
-                const json = parse(( content.value.toString()));
+                const parseErrors = [];
+                const json = parse(( content.value.toString()), parseErrors);
+                if (parseErrors.length > 0) {
+                    const first = parseErrors[0];
+                    const message = getParseErrorMessage(first.error) || "Invalid JSON";
+                    return {
+                        file: {
+                            status: "skipped",
+                            skipReason: "parse-error",
+                            errorMessage: `${message} at offset ${first.offset}`,
+                            promptPath: this.withPromptPathMetadata(hookFile, name, hookFile.description)
+                        }
+                    };
+                }
                 if (!json || typeof json !== "object") {
                     return {
                         file: {
@@ -1131,6 +1187,24 @@ let PromptsService = class PromptsService extends Disposable {
             durationInMillis: stopWatch.elapsed()
         };
     }
+    getSkillPriority(skill) {
+        if (skill.storage === PromptsStorage.local) {
+            return 0;
+        }
+        if (skill.storage === PromptsStorage.user) {
+            return 1;
+        }
+        if (skill.storage === PromptsStorage.plugin) {
+            return 2;
+        }
+        if (skill.source === PromptFileSource.ExtensionAPI) {
+            return 3;
+        }
+        if (skill.source === PromptFileSource.ExtensionContribution) {
+            return 4;
+        }
+        return 5;
+    }
     async computeSkillDiscoveryInfo(token) {
         const files = [];
         const seenNames = ( new Set());
@@ -1140,25 +1214,7 @@ let PromptsService = class PromptsService extends Disposable {
         const extensionSkills = await this.getExtensionPromptFiles(PromptsType.skill, token);
         const pluginSkills = this._pluginPromptFilesByType.get(PromptsType.skill) ?? [];
         allSkills.push(...discoveredSkills, ...extensionSkills, ...pluginSkills);
-        const getPriority = skill => {
-            if (skill.storage === PromptsStorage.local) {
-                return 0;
-            }
-            if (skill.storage === PromptsStorage.user) {
-                return 1;
-            }
-            if (skill.storage === PromptsStorage.plugin) {
-                return 2;
-            }
-            if (skill.source === PromptFileSource.ExtensionAPI) {
-                return 3;
-            }
-            if (skill.source === PromptFileSource.ExtensionContribution) {
-                return 4;
-            }
-            return 5;
-        };
-        allSkills.sort((a, b) => getPriority(a) - getPriority(b));
+        allSkills.sort((a, b) => this.getSkillPriority(a) - this.getSkillPriority(b));
         for (const skill of allSkills) {
             const uri = skill.uri;
             const promptPath = skill;
@@ -1260,6 +1316,7 @@ class CachedPromise extends Disposable {
         this.getEvent = getEvent;
         this.delay = delay;
         this.cachedPromise = undefined;
+        this.cachedPool = undefined;
         this.onDidUpdatePromiseEmitter = this._register(( new Emitter()));
         const delayer = this._register(( new Delayer(this.delay)));
         this._register(this.getEvent()(() => {
@@ -1271,17 +1328,30 @@ class CachedPromise extends Disposable {
         return this.onDidUpdatePromiseEmitter.event;
     }
     get(token) {
-        if (this.cachedPromise !== undefined) {
-            return this.cachedPromise;
+        if (this.cachedPool?.token.isCancellationRequested) {
+            this.cachedPromise = undefined;
+            this.cachedPool = undefined;
         }
-        const promise = this.computeFn(token).catch(err => {
-            if (this.cachedPromise === promise) {
-                this.cachedPromise = undefined;
-            }
-            throw err;
-        });
-        this.cachedPromise = promise;
-        return promise;
+        let pool = this.cachedPool;
+        if (this.cachedPromise === undefined) {
+            pool = ( new CancellationTokenPool());
+            const promise = this.computeFn(pool.token).catch(err => {
+                if (this.cachedPromise === promise) {
+                    this.cachedPromise = undefined;
+                }
+                throw err;
+            });
+            promise.finally(() => {
+                if (this.cachedPool === pool) {
+                    this.cachedPool = undefined;
+                }
+                pool.dispose();
+            });
+            this.cachedPromise = promise;
+            this.cachedPool = pool;
+        }
+        pool?.add(token);
+        return raceCancellationError(this.cachedPromise, token);
     }
     refresh() {
         this.cachedPromise = undefined;

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

@@ -65,6 +65,10 @@ export declare class PromptFilesLocator {
         readonly event: Event<void>;
         dispose: () => void;
     };
+    createAgentInstructionsUpdatedEvent(): {
+        readonly event: Event<void>;
+        dispose: () => void;
+    };
     /**
      * Gets the hook source folders for creating new hooks.
      * Returns configured hook folders, excluding Claude paths (which are read-only).

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

@@ -4,13 +4,13 @@ import { URI } from '../../../../../../base/common/uri.js';
 import { isAbsolute } from '../../../../../../base/common/path.js';
 import { ResourceSet } from '../../../../../../base/common/map.js';
 import { localize } from '../../../../../../nls.js';
-import { FileOperationError, FileOperationResult } from '../../../../../../platform/files/common/files.js';
+import { FileOperation, FileOperationError, FileOperationResult } from '../../../../../../platform/files/common/files.js';
 import { IFileService } from '../../../../../../platform/files/common/files.service.js';
 import { PromptsConfig, getPromptFileLocationsConfigKey, isTildePath } from '../config/config.js';
-import { joinPath, dirname, isEqual, basename, isEqualOrParent } from '../../../../../../base/common/resources.js';
+import { joinPath, dirname, isEqual, isEqualOrParent, basename } from '../../../../../../base/common/resources.js';
 import { IWorkspaceContextService } from '../../../../../../platform/workspace/common/workspace.service.js';
 import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.service.js';
-import { getPromptFileDefaultLocations, getPromptFileType, getPromptFileExtension, LEGACY_MODE_FILE_EXTENSION, AGENTS_SOURCE_FOLDER, getCleanPromptName, AGENT_FILE_EXTENSION, SKILL_FILENAME } from '../config/promptFileLocations.js';
+import { getPromptFileDefaultLocations, getPromptFileType, CLAUDE_CONFIG_FOLDER, GITHUB_CONFIG_FOLDER, COPILOT_CONFIG_FOLDER, getPromptFileExtension, LEGACY_MODE_FILE_EXTENSION, AGENTS_SOURCE_FOLDER, getCleanPromptName, AGENT_FILE_EXTENSION, SKILL_FILENAME } from '../config/promptFileLocations.js';
 import { PromptFileSource, PromptsType } from '../promptTypes.js';
 import { IWorkbenchEnvironmentService } from '../../../../../services/environment/common/environmentService.service.js';
 import { Schemas } from '../../../../../../base/common/network.js';
@@ -21,7 +21,7 @@ import { isCancellationError } from '../../../../../../base/common/errors.js';
 import { PromptsStorage, AgentInstructionFileType } from '../service/promptsService.js';
 import { IUserDataProfileService } from '../../../../../services/userDataProfile/common/userDataProfile.service.js';
 import { Event, Emitter } from '../../../../../../base/common/event.js';
-import { DisposableStore } from '../../../../../../base/common/lifecycle.js';
+import { DisposableStore, toDisposable } from '../../../../../../base/common/lifecycle.js';
 import { ILogService } from '../../../../../../platform/log/common/log.service.js';
 import { IPathService } from '../../../../../services/path/common/pathService.service.js';
 import { equalsIgnoreCase } from '../../../../../../base/common/strings.js';
@@ -57,7 +57,7 @@ let PromptFilesLocator = class PromptFilesLocator {
             filePattern: undefined,
             source: PromptFileSource.UserData,
             storage: PromptsStorage.user,
-            displayPath: ( localize(8326, "User Data")),
+            displayPath: ( localize(8943, "User Data")),
             isDefault: true
         };
     }
@@ -211,6 +211,100 @@ let PromptFilesLocator = class PromptFilesLocator {
             dispose: () => disposables.dispose()
         };
     }
+    createAgentInstructionsUpdatedEvent() {
+        const disposables = ( new DisposableStore());
+        const eventEmitter = disposables.add(( new Emitter()));
+        const cts = ( new CancellationTokenSource());
+        disposables.add(toDisposable(() => cts.dispose(true)));
+        const token = cts.token;
+        const watchers = disposables.add(( new DisposableStore()));
+        const watchedRoots = ( new ResourceSet());
+        const addWatch = resource => {
+            if (token.isCancellationRequested) {
+                return;
+            }
+            if (( watchedRoots.has(resource))) {
+                return;
+            }
+            watchedRoots.add(resource);
+            watchers.add(this.fileService.watch(resource));
+        };
+        const updateWatchers = async () => {
+            watchers.clear();
+            watchedRoots.clear();
+            const watchWorkspaceRoots = this.configService.getValue(PromptsConfig.USE_AGENT_MD) || this.configService.getValue(PromptsConfig.USE_CLAUDE_MD);
+            const watchClaudeFolders = this.configService.getValue(PromptsConfig.USE_CLAUDE_MD);
+            const watchCopilotFolders = this.configService.getValue(PromptsConfig.USE_COPILOT_INSTRUCTION_FILES);
+            const includeParents = this.configService.getValue(PromptsConfig.USE_CUSTOMIZATIONS_IN_PARENT_REPOS) === true;
+            const workspaceRoots = await this.getWorkspaceFolderRoots(includeParents);
+            if (token.isCancellationRequested) {
+                return;
+            }
+            const userHome = await this.pathService.userHome();
+            if (token.isCancellationRequested) {
+                return;
+            }
+            for (const workspaceRoot of workspaceRoots) {
+                if (watchWorkspaceRoots) {
+                    addWatch(workspaceRoot);
+                }
+                if (watchClaudeFolders) {
+                    addWatch(joinPath(workspaceRoot, CLAUDE_CONFIG_FOLDER));
+                }
+                if (watchCopilotFolders) {
+                    addWatch(joinPath(workspaceRoot, GITHUB_CONFIG_FOLDER));
+                }
+            }
+            if (watchClaudeFolders) {
+                addWatch(joinPath(userHome, CLAUDE_CONFIG_FOLDER));
+            }
+            if (watchCopilotFolders) {
+                addWatch(joinPath(userHome, COPILOT_CONFIG_FOLDER));
+            }
+        };
+        const refresh = () => {
+            void updateWatchers();
+            eventEmitter.fire();
+        };
+        disposables.add(this.configService.onDidChangeConfiguration(e => {
+            if (e.affectsConfiguration(PromptsConfig.USE_AGENT_MD) || e.affectsConfiguration(PromptsConfig.USE_CLAUDE_MD) || e.affectsConfiguration(PromptsConfig.USE_COPILOT_INSTRUCTION_FILES) || e.affectsConfiguration(PromptsConfig.USE_CUSTOMIZATIONS_IN_PARENT_REPOS)) {
+                refresh();
+            }
+        }));
+        disposables.add(this.onDidChangeWorkspaceFolders()(() => {
+            refresh();
+        }));
+        disposables.add(this.workspaceTrustManagementService.onDidChangeTrustedFolders(() => {
+            refresh();
+        }));
+        disposables.add(this.fileService.onDidFilesChange(e => {
+            for (const watchedRoot of watchedRoots) {
+                if (e.affects(watchedRoot)) {
+                    eventEmitter.fire();
+                    return;
+                }
+            }
+        }));
+        disposables.add(this.fileService.onDidRunOperation(e => {
+            for (const watchedRoot of watchedRoots) {
+                if (isEqualOrParent(e.resource, watchedRoot)) {
+                    eventEmitter.fire();
+                    return;
+                }
+                if (e.isOperation(FileOperation.CREATE) || e.isOperation(FileOperation.MOVE) || e.isOperation(FileOperation.COPY)) {
+                    if (isEqualOrParent(e.target.resource, watchedRoot)) {
+                        eventEmitter.fire();
+                        return;
+                    }
+                }
+            }
+        }));
+        void updateWatchers();
+        return {
+            event: eventEmitter.event,
+            dispose: () => disposables.dispose()
+        };
+    }
     async getHookSourceFolders() {
         const configuredLocations = this.getPromptSourceFolders(PromptsType.hook);
         const allowedHookFolders = configuredLocations.filter(loc => !loc.path.startsWith(".claude/") && !loc.path.includes("/.claude/"));

package/vscode/src/vs/workbench/contrib/chat/common/requestParser/chatRequestParser.d.ts

@@ -6,7 +6,7 @@ import { IChatAgentAttachmentCapabilities, IChatAgentData } from "../participant
 import { IChatAgentService } from "../participants/chatAgents.service.js";
 import { IChatSlashCommandService } from "../participants/chatSlashCommands.service.js";
 import { IPromptsService } from "../promptSyntax/service/promptsService.service.js";
-import { IToolAndToolSetEnablementMap } from "../tools/languageModelToolsService.js";
+import { ToolAndToolSetEnablementMap } from "../tools/languageModelToolsService.js";
 import { IParsedChatRequest } from "./chatParserTypes.js";
 export declare const agentReg: RegExp;
 export declare const variableReg: RegExp;
@@ -27,7 +27,7 @@ export declare class ChatRequestParser {
     private readonly promptsService;
     constructor(agentService: IChatAgentService, variableService: IChatVariablesService, slashCommandService: IChatSlashCommandService, promptsService: IPromptsService);
     parseChatRequest(sessionResource: URI, message: string, location?: ChatAgentLocation, context?: IChatParserContext): IParsedChatRequest;
-    parseChatRequestWithReferences(references: ReadonlyArray<IDynamicVariable>, selectedToolAndToolSets: IToolAndToolSetEnablementMap, message: string, location?: ChatAgentLocation, context?: IChatParserContext): IParsedChatRequest;
+    parseChatRequestWithReferences(references: ReadonlyArray<IDynamicVariable>, selectedToolAndToolSets: ToolAndToolSetEnablementMap, message: string, location?: ChatAgentLocation, context?: IChatParserContext): IParsedChatRequest;
     private tryToParseAgent;
     private tryToParseVariable;
     private tryToParseSlashCommand;

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

@@ -107,9 +107,9 @@ function createAskQuestionsToolData() {
         legacyToolReferenceFullNames: [AskQuestionsToolId, "vscode/askQuestions"],
         canBeReferencedInPrompt: false,
         icon: ThemeIcon.fromId(Codicon.question.id),
-        displayName: ( localize(8327, "Ask Clarifying Questions")),
+        displayName: ( localize(8944, "Ask Clarifying Questions")),
         userDescription: ( localize(
-            8328,
+            8945,
             "Ask structured clarifying questions using single select, multi-select, or freeform inputs to collect task requirements before proceeding."
         )),
         modelDescription: "Use this tool to ask the user a small number of clarifying questions before proceeding. Provide the questions array with concise headers and prompts. Use options for fixed choices, set multiSelect when multiple selections are allowed. Users can always provide a freeform text answer alongside options unless you set allowFreeformInput to false.",
@@ -135,7 +135,7 @@ let AskQuestionsTool = class AskQuestionsTool extends Disposable {
         this.logService.trace(`[AskQuestionsTool] Invoking with ${questions?.length ?? 0} question(s)`);
         if (!questions || questions.length === 0) {
             throw ( new Error(( localize(
-                8329,
+                8946,
                 "No questions provided. The questions array must contain at least one question."
             ))));
         }
@@ -210,7 +210,7 @@ let AskQuestionsTool = class AskQuestionsTool extends Disposable {
             };
         }
         progress.report({
-            message: ( localize(8330, "Analyzing your answers..."))
+            message: ( localize(8947, "Analyzing your answers..."))
         });
         const converted = this.convertCarouselAnswers(questions, answerResult?.answers, idToHeaderMap);
         const {
@@ -248,23 +248,23 @@ let AskQuestionsTool = class AskQuestionsTool extends Disposable {
         } = parameters;
         if (!questions || questions.length === 0) {
             throw ( new Error(( localize(
-                8329,
+                8946,
                 "No questions provided. The questions array must contain at least one question."
             ))));
         }
         for (const question of questions) {
-            if (question.options && question.options.length === 1) {
+            if (question.options && question.options.length === 1 && !question.allowFreeformInput) {
                 throw ( new Error(( localize(
-                    8331,
-                    "Question \"{0}\" must have at least two options, or none for free text input.",
+                    8948,
+                    "Question \"{0}\" must have at least two options, or set allowFreeformInput when providing a single option, or omit options for free text input.",
                     question.header
                 ))));
             }
         }
         const questionCount = questions.length;
         const headers = ( questions.map(q => q.header)).join(", ");
-        const message = questionCount === 1 ? ( localize(8332, "Asking a question ({0})", headers)) : ( localize(8333, "Asking {0} questions ({1})", questionCount, headers));
-        const pastMessage = questionCount === 1 ? ( localize(8334, "Asked a question ({0})", headers)) : ( localize(8335, "Asked {0} questions ({1})", questionCount, headers));
+        const message = questionCount === 1 ? ( localize(8949, "Asking a question ({0})", headers)) : ( localize(8950, "Asking {0} questions ({1})", questionCount, headers));
+        const pastMessage = questionCount === 1 ? ( localize(8951, "Asked a question ({0})", headers)) : ( localize(8952, "Asked {0} questions ({1})", questionCount, headers));
         return {
             invocationMessage: ( new MarkdownString(message)),
             pastTenseMessage: ( new MarkdownString(pastMessage))

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

@@ -2,7 +2,8 @@
 import { MarkdownString } from '../../../../../../base/common/htmlContent.js';
 import { URI } from '../../../../../../base/common/uri.js';
 import '../../../../../../platform/agentHost/common/state/protocol/channels-root/state.js';
-import { ConfirmationOptionKind } from '../../../../../../platform/agentHost/common/state/protocol/channels-session/state.js';
+import '../../../../../../platform/agentHost/common/state/protocol/channels-session/state.js';
+import { ConfirmationOptionKind } from '../../../../../../platform/agentHost/common/state/protocol/channels-chat/state.js';
 import '../../../../../../platform/agentHost/common/state/protocol/channels-terminal/state.js';
 import '../../../../../../platform/agentHost/common/state/protocol/channels-changeset/state.js';
 import '../../../../../../platform/agentHost/common/state/protocol/channels-resource-watch/state.js';

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

@@ -48,8 +48,8 @@ function createManageTodoListToolData() {
         legacyToolReferenceFullNames: ["todos"],
         canBeReferencedInPrompt: true,
         icon: ThemeIcon.fromId(Codicon.checklist.id),
-        displayName: ( localize(8336, "Manage and track todo items for task planning")),
-        userDescription: ( localize(8337, "Manage and track todo items for task planning")),
+        displayName: ( localize(8953, "Manage and track todo items for task planning")),
+        userDescription: ( localize(8954, "Manage and track todo items for task planning")),
         modelDescription: "Manage a structured todo list to track progress and plan tasks throughout your coding session. Use this tool VERY frequently to ensure task visibility and proper planning.\n\nWhen to use this tool:\n- Complex multi-step work requiring planning and tracking\n- When user provides multiple tasks or requests (numbered/comma-separated)\n- After receiving new instructions that require multiple steps\n- BEFORE starting work on any todo (mark as in-progress)\n- IMMEDIATELY after completing each todo (mark completed individually)\n- When breaking down larger tasks into smaller actionable steps\n- To give users visibility into your progress and planning\n\nWhen NOT to use:\n- Single, trivial tasks that can be completed in one step\n- Purely conversational/informational requests\n- When just reading files or performing simple searches\n\nCRITICAL workflow:\n1. Plan tasks by writing todo list with specific, actionable items\n2. Mark ONE todo as in-progress before starting work\n3. Complete the work for that specific todo\n4. Mark that todo as completed IMMEDIATELY\n5. Move to next todo and repeat\n\nTodo states:\n- not-started: Todo not yet begun\n- in-progress: Currently working (limit ONE at a time)\n- completed: Finished successfully\n\nIMPORTANT: Mark todos completed as soon as they are done. Do not batch completions.",
         source: ToolDataSource.Internal,
         inputSchema: inputSchema
@@ -107,7 +107,7 @@ let ManageTodoListTool = class ManageTodoListTool extends Disposable {
         const currentTodoItems = this.chatTodoListService.getTodos(chatSessionResource);
         let message;
         if (args.operation === "read") {
-            message = ( localize(8338, "Read todo list"));
+            message = ( localize(8955, "Read todo list"));
         } else if (args.todoList) {
             message = this.generatePastTenseMessage(currentTodoItems, args.todoList);
         }
@@ -117,12 +117,12 @@ let ManageTodoListTool = class ManageTodoListTool extends Disposable {
             title: todo.title,
             status: todo.status
         })));
-        const invocationLabel = message?.replace(/^(Starting|Completed): /i, "") ?? ( localize(8339, "Updating todo list"));
+        const invocationLabel = message?.replace(/^(Starting|Completed): /i, "") ?? ( localize(8956, "Updating todo list"));
         const invocationMessage = ( new MarkdownString(invocationLabel));
         return {
             invocationMessage,
             presentation: items.length ? undefined : ToolInvocationPresentation.Hidden,
-            pastTenseMessage: ( new MarkdownString(message ?? ( localize(8340, "Updated todo list")))),
+            pastTenseMessage: ( new MarkdownString(message ?? ( localize(8957, "Updated todo list")))),
             toolSpecificData: {
                 kind: "todoList",
                 todoList: todoList
@@ -131,7 +131,7 @@ let ManageTodoListTool = class ManageTodoListTool extends Disposable {
     }
     generatePastTenseMessage(currentTodos, newTodos) {
         if (currentTodos.length === 0 && newTodos.length > 0) {
-            return newTodos.length === 1 ? ( localize(8341, "Created 1 todo")) : ( localize(8342, "Created {0} todos", newTodos.length));
+            return newTodos.length === 1 ? ( localize(8958, "Created 1 todo")) : ( localize(8959, "Created {0} todos", newTodos.length));
         }
         const currentTodoMap = ( new Map(( currentTodos.map(todo => [todo.id, todo]))));
         const startedTodos = newTodos.filter(newTodo => {
@@ -143,7 +143,7 @@ let ManageTodoListTool = class ManageTodoListTool extends Disposable {
             const totalTodos = newTodos.length;
             const currentPosition = newTodos.findIndex(todo => todo.id === startedTodo.id) + 1;
             return localize(
-                8343,
+                8960,
                 "Starting: *{0}* ({1}/{2})",
                 startedTodo.title,
                 currentPosition,
@@ -159,7 +159,7 @@ let ManageTodoListTool = class ManageTodoListTool extends Disposable {
             const totalTodos = newTodos.length;
             const currentPosition = newTodos.findIndex(todo => todo.id === completedTodo.id) + 1;
             return localize(
-                8344,
+                8961,
                 "Completed: *{0}* ({1}/{2})",
                 completedTodo.title,
                 currentPosition,
@@ -168,9 +168,9 @@ let ManageTodoListTool = class ManageTodoListTool extends Disposable {
         }
         const addedTodos = newTodos.filter(newTodo => !( currentTodoMap.has(newTodo.id)));
         if (addedTodos.length > 0) {
-            return addedTodos.length === 1 ? ( localize(8345, "Added 1 todo")) : ( localize(8346, "Added {0} todos", addedTodos.length));
+            return addedTodos.length === 1 ? ( localize(8962, "Added 1 todo")) : ( localize(8963, "Added {0} todos", addedTodos.length));
         }
-        return localize(8347, "Updated todo list");
+        return localize(8964, "Updated todo list");
     }
     handleRead(todoItems, sessionResource) {
         if (todoItems.length === 0) {