@codingame/monaco-vscode-api 30.0.1 → 31.0.1

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

@@ -6,17 +6,36 @@ import { PromptFileSource, PromptsType, Target } from "../promptTypes.js";
 import { IHandOff, ParsedPromptFile } from "../promptFileParser.js";
 import { ChatRequestHooks } from "../hookSchema.js";
 /**
- * Entry emitted by the prompts service when discovery logging occurs.
- * A debug bridge (e.g. contribution) can listen and forward these to IChatDebugService.
+ * A single structured debug detail entry from the instructions context computer.
  */
-export interface IPromptDiscoveryLogEntry {
-    readonly sessionResource: URI;
+export interface InstructionsCollectionDebugEntry {
+    readonly category: "applying" | "skipped" | "referenced" | "skill" | "custom-agent" | "hook";
     readonly name: string;
-    readonly details?: string;
-    readonly category?: string;
-    /** When present, the bridge should store this for later event resolution. */
-    readonly discoveryInfo?: IPromptDiscoveryInfo;
+    readonly uri?: URI;
+    readonly reason?: string;
 }
+export type InstructionsCollectionEvent = {
+    applyingInstructionsCount: number;
+    referencedInstructionsCount: number;
+    agentInstructionsCount: number;
+    listedInstructionsCount: number;
+    totalInstructionsCount: number;
+    claudeRulesCount: number;
+    claudeMdCount: number;
+    claudeAgentsCount: number;
+};
+/**
+ * Debug-only information collected alongside {@link InstructionsCollectionEvent}.
+ * This data is used for debug logging and is not sent as telemetry.
+ */
+export type InstructionsCollectionDebugInfo = {
+    /** Per-file detail entries for debug logging. */
+    debugDetails: InstructionsCollectionDebugEntry[];
+    /** Total wall-clock time of the collect() call in milliseconds. */
+    durationInMillis: number;
+};
+export declare function newInstructionsCollectionEvent(): InstructionsCollectionEvent;
+export declare function newInstructionsCollectionDebugInfo(): InstructionsCollectionDebugInfo;
 /**
  * Activation events for prompt file providers.
  */
@@ -45,7 +64,19 @@ export interface IPromptFileResource {
      * Optional externally provided prompt command description.
      */
     readonly description?: string;
+    /**
+     * Optional condition that must evaluate to true for this resource to be offered.
+     */
+    readonly when?: string;
+    /**
+     * Optional session types that describe when this resource should be offered.
+     */
+    readonly sessionTypes?: readonly string[];
 }
+/**
+ * Returns whether a customization can be used in the provided chat session type.
+ */
+export declare function matchesSessionType(sessionTypes: readonly string[] | undefined, currentSessionType: string | undefined): boolean;
 /**
  * Where the prompt is stored.
  */
@@ -87,6 +118,10 @@ export interface IPromptPathBase {
     readonly source?: PromptFileSource;
     readonly name?: string;
     readonly description?: string;
+    /**
+     * Optional session types that describe when this resource should be offered.
+     */
+    readonly sessionTypes?: readonly string[];
 }
 export interface IExtensionPromptPath extends IPromptPathBase {
     readonly storage: PromptsStorage.extension;
@@ -184,6 +219,15 @@ export interface ICustomAgent {
      * Where the agent was loaded from.
      */
     readonly source: IAgentSource;
+    /**
+     * Optional context key expression. When set, the agent is only available
+     * when this expression evaluates to true against a scoped context.
+     */
+    readonly when?: ContextKeyExpression;
+    /**
+     * Optional session types that describe when this agent should be offered.
+     */
+    readonly sessionTypes?: readonly string[];
 }
 export interface IAgentInstructions {
     readonly content: string;
@@ -191,12 +235,71 @@ export interface IAgentInstructions {
     readonly metadata?: Record<string, boolean | string | number>;
 }
 export interface IChatPromptSlashCommand {
+    readonly uri: URI;
     readonly name: string;
-    readonly description: string | undefined;
-    readonly argumentHint: string | undefined;
-    readonly promptPath: IPromptPath;
-    readonly parsedPromptFile: ParsedPromptFile;
+    readonly type: PromptsType;
+    readonly storage: PromptsStorage;
+    readonly source?: PromptFileSource;
+    readonly description?: string;
+    readonly argumentHint?: string;
+    readonly userInvocable: boolean;
+    readonly extension?: IExtensionDescription;
+    readonly pluginUri?: URI;
     readonly when: ContextKeyExpression | undefined;
+    /**
+     * Optional session types that describe when this slash command should be offered.
+     */
+    readonly sessionTypes?: readonly string[];
+}
+export interface IResolvedChatPromptSlashCommand extends IChatPromptSlashCommand {
+    readonly parsedPromptFile: ParsedPromptFile;
+}
+/**
+ * A fully resolved instruction file with parsed header metadata and provenance information.
+ */
+export interface IInstructionFile {
+    /**
+     * URI of the instruction file.
+     */
+    readonly uri: URI;
+    /**
+     * Name as listed in the instruction file header or derived from the file name
+     */
+    readonly name: string;
+    /**
+     * Description as listed in the instruction file header. Used to load the instruction on-demand and for display in the UI.
+     */
+    readonly description: string | undefined;
+    /**
+     * Storage of the prompt.
+     */
+    readonly storage: PromptsStorage;
+    /**
+     * The "applyTo" pattern (or `paths` when in a Claude rules file) from the instruction file header.
+     * Describes when this instruction file should be applied.
+     */
+    readonly pattern: string | undefined;
+    /**
+     * Identifier of the contributing extension (only when storage === PromptsStorage.extension).
+     */
+    readonly extension?: IExtensionDescription;
+    /**
+     * Identifier of the contributing plugin (only when storage === PromptsStorage.plugin).
+     */
+    readonly pluginUri?: URI;
+    /**
+     * The source that produced this prompt path.
+     */
+    readonly source?: PromptFileSource;
+    /**
+     * Optional context key expression. When set, the instruction file is only available
+     * when this expression evaluates to true against a scoped context.
+     */
+    readonly when?: ContextKeyExpression;
+    /**
+     * Optional session types that describe when this instruction should be offered.
+     */
+    readonly sessionTypes?: readonly string[];
 }
 /**
  * Supply-chain metadata describing where a skill originated.
@@ -229,11 +332,15 @@ export interface IAgentSkill {
      * Optional extension metadata describing where this skill originated.
      */
     readonly extension?: IExtensionDescription;
+    /**
+     * Optional session types that describe when this skill should be offered.
+     */
+    readonly sessionTypes?: readonly string[];
 }
 /**
  * Type of agent instruction file.
  */
-export declare enum AgentFileType {
+export declare enum AgentInstructionFileType {
     agentsMd = "agentsMd",
     claudeMd = "claudeMd",
     copilotInstructionsMd = "copilotInstructionsMd"
@@ -242,13 +349,13 @@ export declare enum AgentFileType {
  * Represents a resolved agent instruction file with its real path for duplicate detection.
  * Used by listAgentInstructions to filter out symlinks pointing to the same file.
  */
-export interface IResolvedAgentFile {
+export interface IAgentInstructionFile {
     readonly uri: URI;
     /**
      * The real path of the file, if it is a symlink.
      */
     readonly realPath: URI | undefined;
-    readonly type: AgentFileType;
+    readonly type: AgentInstructionFileType;
 }
 export interface Logger {
     logInfo(message: string): void;
@@ -287,10 +394,55 @@ export interface IPromptSourceFolderResult {
 export interface IPromptDiscoveryInfo {
     readonly type: PromptsType;
     readonly files: readonly IPromptFileDiscoveryResult[];
+    /** Time in milliseconds required to compute this discovery result. */
+    readonly durationInMillis: number;
     /** Source folders that were searched */
     readonly sourceFolders?: readonly IPromptSourceFolderResult[];
 }
+/**
+ * Discovery result for a slash command file, including the parsed prompt file.
+ */
+export interface ISlashCommandDiscoveryResult extends IPromptFileDiscoveryResult {
+    readonly userInvocable?: boolean;
+    readonly argumentHint?: string;
+}
+/**
+ * Summary of slash command discovery, including parsed prompt files.
+ */
+export interface ISlashCommandDiscoveryInfo extends IPromptDiscoveryInfo {
+    readonly files: readonly ISlashCommandDiscoveryResult[];
+}
+/**
+ * Discovery result for an instruction file, including the resolved applyTo metadata.
+ */
+export interface IInstructionDiscoveryResult extends IPromptFileDiscoveryResult {
+    readonly pattern?: string;
+}
+/**
+ * Summary of instruction discovery, including resolved metadata.
+ */
+export interface IInstructionDiscoveryInfo extends IPromptDiscoveryInfo {
+    readonly files: readonly IInstructionDiscoveryResult[];
+}
+/**
+ * Discovery result for an agent file, including the fully resolved agent.
+ */
+export interface IAgentDiscoveryResult extends IPromptFileDiscoveryResult {
+    readonly agent?: ICustomAgent;
+}
+/**
+ * Summary of agent discovery, including resolved agents.
+ */
+export interface IAgentDiscoveryInfo extends IPromptDiscoveryInfo {
+    readonly files: readonly IAgentDiscoveryResult[];
+}
 export interface IConfiguredHooksInfo {
     readonly hooks: ChatRequestHooks;
     readonly hasDisabledClaudeHooks: boolean;
 }
+/**
+ * Summary of hook discovery, including the resolved hooks info.
+ */
+export interface IHookDiscoveryInfo extends IPromptDiscoveryInfo {
+    readonly hooksInfo: IConfiguredHooksInfo | undefined;
+}

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

@@ -1,9 +1,18 @@
 
 
+function newInstructionsCollectionEvent() {
+    return { applyingInstructionsCount: 0, referencedInstructionsCount: 0, agentInstructionsCount: 0, listedInstructionsCount: 0, totalInstructionsCount: 0, claudeRulesCount: 0, claudeMdCount: 0, claudeAgentsCount: 0 };
+}
+function newInstructionsCollectionDebugInfo() {
+    return { debugDetails: [], durationInMillis: 0 };
+}
 const CUSTOM_AGENT_PROVIDER_ACTIVATION_EVENT = 'onCustomAgentProvider';
 const INSTRUCTIONS_PROVIDER_ACTIVATION_EVENT = 'onInstructionsProvider';
 const PROMPT_FILE_PROVIDER_ACTIVATION_EVENT = 'onPromptFileProvider';
 const SKILL_PROVIDER_ACTIVATION_EVENT = 'onSkillProvider';
+function matchesSessionType(sessionTypes, currentSessionType) {
+    return sessionTypes === undefined || currentSessionType === undefined || sessionTypes.includes(currentSessionType);
+}
 var PromptsStorage;
 (function (PromptsStorage) {
     PromptsStorage["local"] = "local";
@@ -11,6 +20,9 @@ var PromptsStorage;
     PromptsStorage["extension"] = "extension";
     PromptsStorage["plugin"] = "plugin";
 })(PromptsStorage || (PromptsStorage = {}));
+function isExtensionPromptPath(obj) {
+    return obj.storage === PromptsStorage.extension;
+}
 function isCustomAgentVisibility(obj) {
     if (typeof obj !== 'object' || obj === null) {
         return false;
@@ -18,11 +30,11 @@ function isCustomAgentVisibility(obj) {
     const v = obj;
     return typeof v.userInvocable === 'boolean' && typeof v.agentInvocable === 'boolean';
 }
-var AgentFileType;
-(function (AgentFileType) {
-    AgentFileType["agentsMd"] = "agentsMd";
-    AgentFileType["claudeMd"] = "claudeMd";
-    AgentFileType["copilotInstructionsMd"] = "copilotInstructionsMd";
-})(AgentFileType || (AgentFileType = {}));
+var AgentInstructionFileType;
+(function (AgentInstructionFileType) {
+    AgentInstructionFileType["agentsMd"] = "agentsMd";
+    AgentInstructionFileType["claudeMd"] = "claudeMd";
+    AgentInstructionFileType["copilotInstructionsMd"] = "copilotInstructionsMd";
+})(AgentInstructionFileType || (AgentInstructionFileType = {}));
 
-export { AgentFileType, CUSTOM_AGENT_PROVIDER_ACTIVATION_EVENT, INSTRUCTIONS_PROVIDER_ACTIVATION_EVENT, PROMPT_FILE_PROVIDER_ACTIVATION_EVENT, PromptsStorage, SKILL_PROVIDER_ACTIVATION_EVENT, isCustomAgentVisibility };
+export { AgentInstructionFileType, CUSTOM_AGENT_PROVIDER_ACTIVATION_EVENT, INSTRUCTIONS_PROVIDER_ACTIVATION_EVENT, PROMPT_FILE_PROVIDER_ACTIVATION_EVENT, PromptsStorage, SKILL_PROVIDER_ACTIVATION_EVENT, isCustomAgentVisibility, isExtensionPromptPath, matchesSessionType, newInstructionsCollectionDebugInfo, newInstructionsCollectionEvent };

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

@@ -8,7 +8,7 @@ import { IExtensionDescription } from "../../../../../../platform/extensions/com
 import { IResolvedPromptSourceFolder } from "../config/promptFileLocations.js";
 import { ParsedPromptFile } from "../promptFileParser.js";
 import { PromptsType } from "../promptTypes.js";
-import { IPromptPath, PromptsStorage, IChatPromptSlashCommand, ICustomAgent, IResolvedAgentFile, Logger, IPromptFileContext, IPromptFileResource, IAgentSkill, IConfiguredHooksInfo, IPromptDiscoveryLogEntry } from "./promptsService.js";
+import { IPromptPath, PromptsStorage, IResolvedChatPromptSlashCommand, IChatPromptSlashCommand, ICustomAgent, IAgentInstructionFile, Logger, IPromptFileContext, IPromptFileResource, IAgentSkill, IConfiguredHooksInfo, IInstructionFile, IPromptDiscoveryInfo } from "./promptsService.js";
 /**
 * Provides prompt services.
 */
@@ -48,7 +48,7 @@ export interface IPromptsService extends IDisposable {
     /**
     * Gets the prompt file for a slash command.
     */
-    resolvePromptSlashCommand(command: string, token: CancellationToken): Promise<IChatPromptSlashCommand | undefined>;
+    resolvePromptSlashCommand(command: string, token: CancellationToken): Promise<IResolvedChatPromptSlashCommand | undefined>;
     /**
     * Event that is triggered when the slash command to ParsedPromptFile cache is updated.
     * Event handlers can use {@link resolvePromptSlashCommand} to retrieve the latest data.
@@ -56,9 +56,8 @@ export interface IPromptsService extends IDisposable {
     readonly onDidChangeSlashCommands: Event<void>;
     /**
     * Returns a prompt command if the command name is valid.
-    * @param sessionResource Optional session resource to scope debug logging to a specific session.
     */
-    getPromptSlashCommands(token: CancellationToken, sessionResource?: URI): Promise<readonly IChatPromptSlashCommand[]>;
+    getPromptSlashCommands(token: CancellationToken): Promise<readonly IChatPromptSlashCommand[]>;
     /**
     * Returns the prompt command name for the given URI.
     */
@@ -73,9 +72,8 @@ export interface IPromptsService extends IDisposable {
     readonly onDidChangeInstructions: Event<void>;
     /**
     * Finds all available custom agents
-    * @param sessionResource Optional session resource to scope debug logging to a specific session.
     */
-    getCustomAgents(token: CancellationToken, sessionResource?: URI): Promise<readonly ICustomAgent[]>;
+    getCustomAgents(token: CancellationToken): Promise<readonly ICustomAgent[]>;
     /**
     * Parses the provided URI
     * @param uris
@@ -85,17 +83,17 @@ export interface IPromptsService extends IDisposable {
     * Internal: register a contributed file. Returns a disposable that removes the contribution.
     * Not intended for extension authors; used by contribution point handler.
     */
-    registerContributedFile(type: PromptsType, uri: URI, extension: IExtensionDescription, name: string | undefined, description: string | undefined, when?: string): IDisposable;
+    registerContributedFile(type: PromptsType, uri: URI, extension: IExtensionDescription, name: string | undefined, description: string | undefined, when?: string, sessionTypes?: readonly string[]): IDisposable;
     getPromptLocationLabel(promptPath: IPromptPath): string;
     /**
     * Gets list of AGENTS.md files, including optionally nested ones from subfolders.
     */
-    listNestedAgentMDs(token: CancellationToken): Promise<IResolvedAgentFile[]>;
+    listNestedAgentMDs(token: CancellationToken): Promise<IAgentInstructionFile[]>;
     /**
     * Gets combined list of agent instruction files (AGENTS.md, CLAUDE.md, copilot-instructions.md).
     * Combines results from listAgentMDs (non-nested), listClaudeMDs, and listCopilotInstructionsMDs.
     */
-    listAgentInstructions(token: CancellationToken, logger?: Logger): Promise<IResolvedAgentFile[]>;
+    listAgentInstructions(token: CancellationToken, logger?: Logger): Promise<IAgentInstructionFile[]>;
     /**
     * For a chat mode file URI, return the name of the agent file that it should use.
     * @param oldURI
@@ -122,27 +120,27 @@ export interface IPromptsService extends IDisposable {
     }): IDisposable;
     /**
     * Gets list of agent skills files.
-    * @param sessionResource Optional session resource to scope debug logging to a specific session.
     */
-    findAgentSkills(token: CancellationToken, sessionResource?: URI): Promise<IAgentSkill[] | undefined>;
+    findAgentSkills(token: CancellationToken): Promise<IAgentSkill[] | undefined>;
     /**
     * Event that is triggered when the list of skills changes.
     */
     readonly onDidChangeSkills: Event<void>;
     /**
+    * Event that is triggered when the effective hook availability or configuration changes.
+    */
+    readonly onDidChangeHooks: Event<void>;
+    /**
     * Gets all hooks collected from hooks.json files.
-    * The result is cached and invalidated when hook files change.
-    * @param sessionResource Optional session resource to scope debug logging to a specific session.
+    * The result is cached and invalidated when the effective hook availability or configuration changes.
     */
-    getHooks(token: CancellationToken, sessionResource?: URI): Promise<IConfiguredHooksInfo | undefined>;
+    getHooks(token: CancellationToken): Promise<IConfiguredHooksInfo | undefined>;
     /**
-    * Gets all instruction files, logging discovery info to the debug log.
-    * @param sessionResource Optional session resource to scope debug logging to a specific session.
+    * Gets all instruction files
     */
-    getInstructionFiles(token: CancellationToken, sessionResource?: URI): Promise<readonly IPromptPath[]>;
+    getInstructionFiles(token: CancellationToken): Promise<readonly IInstructionFile[]>;
     /**
-    * Fired when a discovery-related log entry is produced.
-    * Listeners (such as a debug bridge) can forward these to IChatDebugService.
+    * Returns the cached discovery info for the given prompt type.
     */
-    readonly onDidLogDiscovery: Event<IPromptDiscoveryLogEntry>;
+    getDiscoveryInfo(type: PromptsType, token: CancellationToken): Promise<IPromptDiscoveryInfo>;
 }

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

@@ -8,6 +8,8 @@ import { IChatSlashCommandService } from "../participants/chatSlashCommands.serv
 import { IPromptsService } from "../promptSyntax/service/promptsService.service.js";
 import { IToolAndToolSetEnablementMap } from "../tools/languageModelToolsService.js";
 import { IParsedChatRequest } from "./chatParserTypes.js";
+export declare const agentReg: RegExp;
+export declare const variableReg: RegExp;
 export declare const slashReg: RegExp;
 export interface IChatParserContext {
     /** Used only as a disambiguator, when the query references an agent that has a duplicate with the same name. */

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

@@ -258,4 +258,4 @@ let ChatRequestParser = class ChatRequestParser {
 };
 ChatRequestParser = ( __decorate([( __param(0, IChatAgentService)), ( __param(1, IChatVariablesService)), ( __param(2, IChatSlashCommandService)), ( __param(3, IPromptsService))], ChatRequestParser));
 
-export { ChatRequestParser, slashReg };
+export { ChatRequestParser, agentReg, slashReg, variableReg };

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

@@ -19,6 +19,7 @@ export interface IQuestionOption {
 export interface IQuestion {
     readonly header: string;
     readonly question: string;
+    readonly message?: string;
     readonly multiSelect?: boolean;
     readonly options?: IQuestionOption[];
     readonly allowFreeformInput?: boolean;
@@ -45,6 +46,15 @@ export declare class AskQuestionsTool extends Disposable implements IToolImpl {
     invoke(invocation: IToolInvocation, _countTokens: CountTokensCallback, progress: ToolProgress, token: CancellationToken): Promise<IToolResult>;
     prepareToolInvocation(context: IToolInvocationPreparationContext, _token: CancellationToken): Promise<IPreparedToolInvocation | undefined>;
     private getRequest;
+    /**
+     * Resolves the terminal execution ID for the request.
+     * Prefer structured metadata and fall back to legacy message parsing for
+     * old sessions that may not carry the metadata yet.
+     * As a final fallback, search completed runInTerminal tool invocations in
+     * the response for the terminal ID (foreground/timeout path where the
+     * model calls ask_questions from the same turn as runInTerminal).
+     */
+    private extractTerminalId;
     private toQuestionCarousel;
     private toChatQuestion;
     protected convertCarouselAnswers(questions: IQuestion[], carouselAnswers: IChatQuestionAnswers | undefined, idToHeaderMap: Map<string, string>): IAnswerResult;

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

@@ -6,6 +6,7 @@ import { Disposable } from '../../../../../../base/common/lifecycle.js';
 import { hasKey } from '../../../../../../base/common/types.js';
 import { generateUuid } from '../../../../../../base/common/uuid.js';
 import { localize } from '../../../../../../nls.js';
+import { IChatToolInvocation } from '../../chatService/chatService.js';
 import { IChatService } from '../../chatService/chatService.service.js';
 import { ChatQuestionCarouselData } from '../../model/chatProgressTypes/chatQuestionCarouselData.js';
 import { ChatPermissionLevel, ChatConfiguration } from '../../constants.js';
@@ -17,6 +18,7 @@ import { ToolDataSource } from '../languageModelToolsService.js';
 import { ThemeIcon } from '../../../../../../base/common/themables.js';
 import { Codicon } from '../../../../../../base/common/codicons.js';
 import { raceCancellation } from '../../../../../../base/common/async.js';
+import { TerminalToolId } from '../terminalToolIds.js';
 
 const AUTOPILOT_ASK_USER_RESPONSE = "The user is not available to respond and will review your work later. Work autonomously and make good decisions.";
 const AskQuestionsToolId = "vscode_askQuestions";
@@ -59,6 +61,10 @@ function createAskQuestionsToolData() {
                 type: "boolean",
                 description: "Allow freeform text answers in addition to option selection. Defaults to true; set to false to restrict to predefined options only."
             },
+            message: {
+                type: "string",
+                description: "Optional markdown message to display below the question text, providing additional context or details."
+            },
             options: {
                 type: "array",
                 description: "Optional list of selectable answers. If omitted, the question is free text.",
@@ -102,9 +108,9 @@ function createAskQuestionsToolData() {
         legacyToolReferenceFullNames: [AskQuestionsToolId, "vscode/askQuestions"],
         canBeReferencedInPrompt: false,
         icon: ThemeIcon.fromId(Codicon.question.id),
-        displayName: ( localize(7640, "Ask Clarifying Questions")),
+        displayName: ( localize(7750, "Ask Clarifying Questions")),
         userDescription: ( localize(
-            7641,
+            7751,
             "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.",
@@ -130,7 +136,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(
-                7642,
+                7752,
                 "No questions provided. The questions array must contain at least one question."
             ))));
         }
@@ -153,6 +159,7 @@ let AskQuestionsTool = class AskQuestionsTool extends Disposable {
                 carousel,
                 idToHeaderMap
             } = this.toQuestionCarousel(questions);
+            carousel.terminalId = this.extractTerminalId(request);
             carousel.data = this.buildAutopilotCarouselAnswers(questions, carousel, idToHeaderMap);
             carousel.isUsed = true;
             this.chatService.appendProgress(request, carousel);
@@ -162,13 +169,28 @@ let AskQuestionsTool = class AskQuestionsTool extends Disposable {
             carousel,
             idToHeaderMap
         } = this.toQuestionCarousel(questions);
+        carousel.terminalId = this.extractTerminalId(request);
+        this.logService.trace(
+            `[AskQuestionsTool] request=${request.id} terminalExecutionId=${request.terminalExecutionId ?? "undefined"} carousel.terminalId=${carousel.terminalId ?? "undefined"}`
+        );
         this.chatService.appendProgress(request, carousel);
         const answerResult = await raceCancellation(carousel.completion.p, token);
         if (token.isCancellationRequested) {
             throw ( new CancellationError());
         }
+        if (carousel.dismissedByTerminalInput && carousel.terminalId) {
+            this.logService.info(
+                `[AskQuestionsTool] Carousel dismissed because user typed directly in terminal ${carousel.terminalId}`
+            );
+            return {
+                content: [{
+                    kind: "text",
+                    value: `The user is replying to the terminal prompts directly. Do not ask more questions or send input to the terminal. You will be automatically notified when the command in terminal ${carousel.terminalId} completes.`
+                }]
+            };
+        }
         progress.report({
-            message: ( localize(7643, "Analyzing your answers..."))
+            message: ( localize(7753, "Analyzing your answers..."))
         });
         const converted = this.convertCarouselAnswers(questions, answerResult?.answers, idToHeaderMap);
         const {
@@ -206,14 +228,14 @@ let AskQuestionsTool = class AskQuestionsTool extends Disposable {
         } = parameters;
         if (!questions || questions.length === 0) {
             throw ( new Error(( localize(
-                7642,
+                7752,
                 "No questions provided. The questions array must contain at least one question."
             ))));
         }
         for (const question of questions) {
             if (question.options && question.options.length === 1) {
                 throw ( new Error(( localize(
-                    7644,
+                    7754,
                     "Question \"{0}\" must have at least two options, or none for free text input.",
                     question.header
                 ))));
@@ -222,8 +244,8 @@ let AskQuestionsTool = class AskQuestionsTool extends Disposable {
         }
         const questionCount = questions.length;
         const headers = ( questions.map(q => q.header)).join(", ");
-        const message = questionCount === 1 ? ( localize(7645, "Asking a question ({0})", headers)) : ( localize(7646, "Asking {0} questions ({1})", questionCount, headers));
-        const pastMessage = questionCount === 1 ? ( localize(7647, "Asked a question ({0})", headers)) : ( localize(7648, "Asked {0} questions ({1})", questionCount, headers));
+        const message = questionCount === 1 ? ( localize(7755, "Asking a question ({0})", headers)) : ( localize(7756, "Asking {0} questions ({1})", questionCount, headers));
+        const pastMessage = questionCount === 1 ? ( localize(7757, "Asked a question ({0})", headers)) : ( localize(7758, "Asked {0} questions ({1})", questionCount, headers));
         return {
             invocationMessage: ( new MarkdownString(message)),
             pastTenseMessage: ( new MarkdownString(pastMessage))
@@ -257,6 +279,36 @@ let AskQuestionsTool = class AskQuestionsTool extends Disposable {
             sessionResource: chatSessionResource
         };
     }
+    extractTerminalId(request) {
+        if (request.terminalExecutionId) {
+            return request.terminalExecutionId;
+        }
+        const match = request.message.text.match(/\[Terminal (?<termId>\S+) notification:/);
+        if (match?.groups?.termId) {
+            return match.groups.termId;
+        }
+        const response = request.response;
+        if (response) {
+            const parts = response.response.value;
+            for (let i = parts.length - 1; i >= 0; i--) {
+                const part = parts[i];
+                if (part.kind === "toolInvocation" && part.toolId === TerminalToolId.RunInTerminal) {
+                    const state = part.state.get();
+                    if (state.type === IChatToolInvocation.StateKind.Completed && state.contentForModel) {
+                        for (const item of state.contentForModel) {
+                            if (item.kind === "text") {
+                                const idMatch = item.value.match(/terminal ID ([0-9a-fA-F-]+)/);
+                                if (idMatch) {
+                                    return idMatch[1];
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return undefined;
+    }
     toQuestionCarousel(questions) {
         const idToHeaderMap = ( new Map());
         const mappedQuestions = ( questions.map(question => this.toChatQuestion(question, idToHeaderMap)));
@@ -289,6 +341,7 @@ let AskQuestionsTool = class AskQuestionsTool extends Disposable {
             type,
             title: displayTitle,
             message: question.question,
+            detailedMessage: question.message,
             options: question.options?.map(opt => ({
                 id: opt.label,
                 label: opt.description ? `${opt.label} - ${opt.description}` : opt.label,