@codingame/monaco-vscode-api 34.1.2 → 35.0.0

package/vscode/src/vs/workbench/contrib/chat/common/model/chatModel.js

@@ -246,10 +246,19 @@ class AbstractResponse {
             case "hook":
             case "multiDiffData":
             case "mcpServersStarting":
+            case "mcpAuthenticationRequired":
+            case "mcpServersStartingSlow":
             case "questionCarousel":
             case "planReview":
             case "disabledClaudeHooks":
+            case "autoModeResolution":
                 continue;
+            case "systemNotification":
+                segment = {
+                    text: part.content.value,
+                    isBlock: true
+                };
+                break;
             case "toolInvocation":
             case "toolInvocationSerialized":
                 segment = this.getToolInvocationText(part);
@@ -309,7 +318,7 @@ class AbstractResponse {
             blocks.push(currentBlockSegments.join(""));
         }
         if (hasEditGroupsAfterLastClear) {
-            blocks.push(( localize(7967, "Made changes.")));
+            blocks.push(( localize(8573, "Made changes.")));
         }
         return blocks.join("\n\n");
     }
@@ -418,12 +427,12 @@ class Response extends AbstractResponse {
         if (progress.kind === "clearToPreviousToolInvocation") {
             if (progress.reason === ChatResponseClearToPreviousToolInvocationReason.CopyrightContentRetry) {
                 this.clearToPreviousToolInvocation(( localize(
-                    7968,
+                    8574,
                     "Response cleared due to possible match to public code, retrying with modified prompt."
                 )));
             } else if (progress.reason === ChatResponseClearToPreviousToolInvocationReason.FilteredContentRetry) {
                 this.clearToPreviousToolInvocation(( localize(
-                    7969,
+                    8575,
                     "Response cleared due to content safety filters, retrying with modified prompt."
                 )));
             } else {
@@ -771,17 +780,17 @@ class ChatResponseModel extends Disposable {
                         return title ? (isMarkdownString(title) ? title.value : title) : undefined;
                     }
                     if (state.type === IChatToolInvocation.StateKind.WaitingForPostApproval) {
-                        return localize(7970, "Approve tool result?");
+                        return localize(8576, "Approve tool result?");
                     }
                 }
                 if (part.kind === "confirmation" && !part.isUsed) {
                     return part.title;
                 }
                 if (part.kind === "questionCarousel" && !part.isUsed) {
-                    return localize(7971, "Answer questions to continue...");
+                    return localize(8577, "Answer questions to continue...");
                 }
                 if (part.kind === "planReview" && !part.isUsed) {
-                    return localize(7972, "Review the plan to continue...");
+                    return localize(8578, "Review the plan to continue...");
                 }
                 if (part.kind === "elicitation2" && part.state.read(r) === ElicitationState.Pending) {
                     const title = part.title;
@@ -870,7 +879,15 @@ class ChatResponseModel extends Disposable {
         this._onDidChange.fire(defaultChatResponseModelChangeReason);
     }
     setResult(result) {
-        this._result = result;
+        if (this.isCanceled && result.errorDetails) {
+            const {
+                errorDetails: _errorDetails,
+                ...rest
+            } = result;
+            this._result = rest;
+        } else {
+            this._result = result;
+        }
         this._onDidChange.fire(defaultChatResponseModelChangeReason);
     }
     setUsage(usage) {
@@ -884,7 +901,7 @@ class ChatResponseModel extends Disposable {
     }
     isSameUsage(usage) {
         const currentUsage = this._usageObs.get();
-        return !!currentUsage && currentUsage.promptTokens === usage.promptTokens && currentUsage.completionTokens === usage.completionTokens && currentUsage.outputBuffer === usage.outputBuffer && equals(currentUsage.promptTokenDetails, usage.promptTokenDetails);
+        return !!currentUsage && currentUsage.promptTokens === usage.promptTokens && currentUsage.completionTokens === usage.completionTokens && currentUsage.outputBuffer === usage.outputBuffer && currentUsage.copilotCredits === usage.copilotCredits && equals(currentUsage.promptTokenDetails, usage.promptTokenDetails);
     }
     complete() {
         if (this.isComplete) {
@@ -977,7 +994,11 @@ class ChatResponseModel extends Disposable {
             codeCitations: this.codeCitations,
             timestamp: this._timestamp,
             timeSpentWaiting: (pendingConfirmation ? Date.now() - pendingConfirmation.startedWaitingAt : 0) + this._timeSpentWaitingAccumulator,
+            promptTokens: this.usage?.promptTokens,
             completionTokens: this.completionTokenCount,
+            outputBuffer: this.usage?.outputBuffer,
+            promptTokenDetails: this.usage?.promptTokenDetails,
+            copilotCredits: this.usage?.copilotCredits,
             elapsedMs: this.elapsedMs ?? (this.completedAt ? Math.max(0, this.completedAt - this.confirmationAdjustedTimestamp.get()) : undefined)
         };
     }
@@ -1081,7 +1102,8 @@ class InputModel {
             mode: value.mode,
             selectedModel: value.selectedModel ? {
                 identifier: value.selectedModel.identifier,
-                metadata: value.selectedModel.metadata
+                metadata: value.selectedModel.metadata,
+                modelConfiguration: value.modelConfiguration
             } : undefined,
             inputText: value.inputText,
             selections: value.selections,
@@ -1194,6 +1216,16 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
     get lastRequest() {
         return this._requests.at(-1);
     }
+    get sessionCost() {
+        let totalCredits = 0;
+        for (const request of this._requests) {
+            const credits = request.response?.usage?.copilotCredits;
+            if (typeof credits === "number") {
+                totalCredits += credits;
+            }
+        }
+        return totalCredits;
+    }
     get timestamp() {
         return this._timestamp;
     }
@@ -1303,6 +1335,7 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
                 identifier: serializedInputState.selectedModel.identifier,
                 metadata: serializedInputState.selectedModel.metadata
             },
+            modelConfiguration: serializedInputState.selectedModel ? (serializedInputState.selectedModel.modelConfiguration ?? serializedInputState.modelConfiguration) : undefined,
             contrib: serializedInputState.contrib,
             inputText: serializedInputState.inputText,
             selections: serializedInputState.selections,
@@ -1480,8 +1513,11 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
             if (typeof raw.completionTokens === "number") {
                 request.response.setUsage({
                     kind: "usage",
-                    promptTokens: 0,
-                    completionTokens: raw.completionTokens
+                    promptTokens: raw.promptTokens ?? 0,
+                    completionTokens: raw.completionTokens,
+                    outputBuffer: raw.outputBuffer,
+                    promptTokenDetails: raw.promptTokenDetails,
+                    copilotCredits: raw.copilotCredits
                 });
             }
             if (raw.usedContext) {
@@ -1858,13 +1894,14 @@ function getCodeCitationsMessage(citations) {
         return "";
     }
     const licenseTypes = citations.reduce((set, c) => set.add(c.license), ( new Set()));
-    const label = licenseTypes.size === 1 ? ( localize(7973, "Similar code found with 1 license type", licenseTypes.size)) : ( localize(7974, "Similar code found with {0} license types", licenseTypes.size));
+    const label = licenseTypes.size === 1 ? ( localize(8579, "Similar code found with 1 license type", licenseTypes.size)) : ( localize(8580, "Similar code found with {0} license types", licenseTypes.size));
     return label;
 }
 function serializeSendOptions(options) {
     return {
         modeInfo: options.modeInfo,
         userSelectedModelId: options.userSelectedModelId,
+        userSelectedModelConfiguration: options.userSelectedModelConfiguration,
         userSelectedTools: options.userSelectedTools?.get(),
         location: options.location,
         locationData: options.locationData,

package/vscode/src/vs/workbench/contrib/chat/common/model/chatProgressTypes/chatToolInvocation.js

@@ -69,7 +69,7 @@ class ChatToolInvocation {
         if (startOptions.startInStreaming) {
             defaultMessage = toolData.displayName;
         } else if (startOptions.startInCancelled) {
-            defaultMessage = startOptions.cancelReasonMessage ?? ( localize(7975, "Tool \"{0}\" was denied", toolData.displayName));
+            defaultMessage = startOptions.cancelReasonMessage ?? ( localize(8581, "Tool \"{0}\" was denied", toolData.displayName));
         }
         this.invocationMessage = preparedInvocation?.invocationMessage ?? defaultMessage;
         this.pastTenseMessage = preparedInvocation?.pastTenseMessage;

package/vscode/src/vs/workbench/contrib/chat/common/model/chatViewModel.d.ts

@@ -6,7 +6,7 @@ import { ThemeIcon } from "../../../../../base/common/themables.js";
 import { URI } from "../../../../../base/common/uri.js";
 import { IInstantiationService } from "../../../../../platform/instantiation/common/instantiation.js";
 import { IChatRequestVariableEntry } from "../attachments/chatVariableEntries.js";
-import { ChatAgentVoteDirection, ChatRequestQueueKind, IChatCodeCitation, IChatContentReference, IChatDisabledClaudeHooksPart, IChatFollowup, IChatMcpServersStarting, IChatPlanReview, IChatProgressMessage, IChatQuestionCarousel, IChatResponseErrorDetails, IChatTask, IChatUsage, IChatUsedContext } from "../chatService/chatService.js";
+import { ChatAgentVoteDirection, ChatRequestQueueKind, IChatCodeCitation, IChatContentReference, IChatDisabledClaudeHooksPart, IChatFollowup, IChatMcpAuthenticationRequired, IChatMcpServersStarting, IChatMcpServersStartingSlow, IChatPlanReview, IChatProgressMessage, IChatQuestionCarousel, IChatResponseErrorDetails, IChatTask, IChatUsage, IChatUsedContext } from "../chatService/chatService.js";
 import { IChatAgentCommand, IChatAgentData, IChatAgentResult } from "../participants/chatAgents.js";
 import { IChatAgentNameService } from "../participants/chatAgents.service.js";
 import { IParsedChatRequest } from "../requestParser/chatParserTypes.js";
@@ -64,6 +64,7 @@ export interface IChatRequestViewModel {
     readonly shouldBeBlocked: IObservable<boolean>;
     readonly attachedContext?: readonly IChatRequestVariableEntry[];
     readonly modelId?: string;
+    readonly resolvedModelId?: string;
     readonly timestamp: number;
     /** The kind of pending request, or undefined if not pending */
     readonly pendingKind?: ChatRequestQueueKind;
@@ -153,10 +154,15 @@ export interface IChatChangesSummaryPart {
     readonly requestId: string;
     readonly sessionResource: URI;
 }
+export interface IChatTurnPillsPart {
+    readonly kind: "turnPills";
+    readonly requestId: string;
+    readonly sessionResource: URI;
+}
 /**
  * Type for content parts rendered by IChatListRenderer (not necessarily in the model)
  */
-export type IChatRendererContent = IChatProgressRenderableResponseContent | IChatReferences | IChatCodeCitations | IChatErrorDetailsPart | IChatChangesSummaryPart | IChatWorkingProgress | IChatMcpServersStarting | IChatQuestionCarousel | IChatPlanReview | IChatDisabledClaudeHooksPart;
+export type IChatRendererContent = IChatProgressRenderableResponseContent | IChatReferences | IChatCodeCitations | IChatErrorDetailsPart | IChatChangesSummaryPart | IChatWorkingProgress | IChatMcpServersStarting | IChatMcpAuthenticationRequired | IChatMcpServersStartingSlow | IChatQuestionCarousel | IChatPlanReview | IChatDisabledClaudeHooksPart | IChatTurnPillsPart;
 export interface IChatResponseViewModel {
     readonly model: IChatResponseModel;
     readonly id: string;
@@ -261,6 +267,7 @@ export declare class ChatRequestViewModel implements IChatRequestViewModel {
     currentRenderedHeight: number | undefined;
     get attachedContext(): IChatRequestVariableEntry[] | undefined;
     get modelId(): string | undefined;
+    get resolvedModelId(): string | undefined;
     get timestamp(): number;
     get pendingKind(): ChatRequestQueueKind | undefined;
     get isSystemInitiated(): boolean | undefined;

package/vscode/src/vs/workbench/contrib/chat/common/model/chatViewModel.js

@@ -232,6 +232,10 @@ class ChatRequestViewModel {
     get modelId() {
         return this._model.modelId;
     }
+    get resolvedModelId() {
+        const resolvedModel = this._model.response?.result?.metadata?.resolvedModel;
+        return typeof resolvedModel === "string" ? resolvedModel : undefined;
+    }
     get timestamp() {
         return this._model.timestamp;
     }

package/vscode/src/vs/workbench/contrib/chat/common/plugins/agentPluginService.d.ts

@@ -42,16 +42,28 @@ export interface IAgentPlugin {
     readonly fromMarketplace?: IMarketplacePlugin;
 }
 export interface IAgentPluginDiscovery extends IDisposable {
-    readonly plugins: IObservable<readonly IAgentPlugin[]>;
+    readonly plugins: IObservable<readonly IAgentPlugin[] | undefined>;
     start(enablementModel: IEnablementModel): void;
 }
+export declare enum AgentPluginDiscoveryPriority {
+    Configured = 10,
+    Marketplace = 20,
+    Extension = 30,
+    CopilotCli = 40
+}
 export declare function getCanonicalPluginCommandId(plugin: {
     readonly uri: URI;
+    readonly label?: string;
 }, commandName: string): string;
 declare class AgentPluginDiscoveryRegistry {
     private readonly _discovery;
-    register(descriptor: SyncDescriptor0<IAgentPluginDiscovery>): void;
-    getAll(): readonly SyncDescriptor0<IAgentPluginDiscovery>[];
+    private _order;
+    register(descriptor: SyncDescriptor0<IAgentPluginDiscovery>, priority: AgentPluginDiscoveryPriority): IDisposable;
+    getAll(): readonly {
+        readonly descriptor: SyncDescriptor0<IAgentPluginDiscovery>;
+        readonly priority: AgentPluginDiscoveryPriority;
+        readonly order: number;
+    }[];
 }
 export declare const agentPluginDiscoveryRegistry: AgentPluginDiscoveryRegistry;
 export {};

package/vscode/src/vs/workbench/contrib/chat/common/plugins/agentPluginService.js

@@ -1,9 +1,16 @@
 
+import { toDisposable } from '../../../../../base/common/lifecycle.js';
 import { basename } from '../../../../../base/common/resources.js';
 
+var AgentPluginDiscoveryPriority;
+(function(AgentPluginDiscoveryPriority) {
+    AgentPluginDiscoveryPriority[AgentPluginDiscoveryPriority["Configured"] = 10] = "Configured";
+    AgentPluginDiscoveryPriority[AgentPluginDiscoveryPriority["Marketplace"] = 20] = "Marketplace";
+    AgentPluginDiscoveryPriority[AgentPluginDiscoveryPriority["Extension"] = 30] = "Extension";
+    AgentPluginDiscoveryPriority[AgentPluginDiscoveryPriority["CopilotCli"] = 40] = "CopilotCli";
+})(AgentPluginDiscoveryPriority || (AgentPluginDiscoveryPriority = {}));
 function getCanonicalPluginCommandId(plugin, commandName) {
-    const pluginSegment = basename(plugin.uri);
-    const prefix = normalizePluginToken(pluginSegment);
+    const prefix = (plugin.label ? normalizePluginToken(plugin.label) : "") || normalizePluginToken(basename(plugin.uri));
     const normalizedCommand = normalizePluginToken(commandName);
     if (normalizedCommand.startsWith(`${prefix}:`)) {
         return normalizedCommand;
@@ -19,14 +26,26 @@ function normalizePluginToken(value) {
 class AgentPluginDiscoveryRegistry {
     constructor() {
         this._discovery = [];
+        this._order = 0;
     }
-    register(descriptor) {
-        this._discovery.push(descriptor);
+    register(descriptor, priority) {
+        const registration = {
+            descriptor,
+            priority,
+            order: this._order++
+        };
+        this._discovery.push(registration);
+        return toDisposable(() => {
+            const index = this._discovery.indexOf(registration);
+            if (index >= 0) {
+                this._discovery.splice(index, 1);
+            }
+        });
     }
     getAll() {
-        return this._discovery;
+        return [...this._discovery].sort((a, b) => a.priority - b.priority || a.order - b.order);
     }
 }
 const agentPluginDiscoveryRegistry = ( new AgentPluginDiscoveryRegistry());
 
-export { agentPluginDiscoveryRegistry, getCanonicalPluginCommandId };
+export { AgentPluginDiscoveryPriority, agentPluginDiscoveryRegistry, getCanonicalPluginCommandId };

package/vscode/src/vs/workbench/contrib/chat/common/plugins/pluginInstallService.service.d.ts

@@ -12,30 +12,26 @@ export interface IPluginInstallService {
     installPlugin(plugin: IMarketplacePlugin): Promise<void>;
     /**
     * Installs a plugin directly from a source location string. Accepts
-    * GitHub shorthand (`owner/repo`) or a full git clone URL. Clones the
-    * repository, reads marketplace metadata to discover plugins, and
-    * registers the selected plugin.
+    * GitHub shorthand (`owner/repo`), a full git clone URL, or a local
+    * folder path (`file://` URI, absolute path, or `~`-prefixed path).
+    * For git sources, clones the repository, reads marketplace metadata to
+    * discover plugins, and registers the selected plugin. For local folders,
+    * detects whether the folder is a marketplace or a standalone plugin and
+    * registers it under the appropriate configuration.
     *
-    * When {@link IInstallPluginFromSourceOptions.plugin} is set, targets
-    * a specific plugin, installs it, and returns it.
+    * Returns a result with an optional error message (e.g. invalid source or
+    * no plugins found); callers are responsible for surfacing it. When
+    * {@link IInstallPluginFromSourceOptions.plugin} is set, targets a specific
+    * plugin, installs it, and returns it in
+    * {@link IInstallPluginFromSourceResult.matchedPlugin}.
     */
-    installPluginFromSource(source: string, options?: IInstallPluginFromSourceOptions): Promise<void>;
+    installPluginFromSource(source: string, options?: IInstallPluginFromSourceOptions): Promise<IInstallPluginFromSourceResult>;
     /**
     * Synchronously validates the format of a plugin source string.
     * Returns an error message if the format is invalid, or undefined if valid.
     */
     validatePluginSource(source: string): string | undefined;
     /**
-    * Installs a plugin from an already-validated source string.
-    * Handles trust, cloning, scanning, and registration. Returns a result
-    * with an optional error message (e.g. no plugins found).
-    *
-    * When {@link IInstallPluginFromSourceOptions.plugin} is set, targets
-    * a specific plugin, installs it, and returns it in
-    * {@link IInstallPluginFromSourceResult.matchedPlugin}.
-    */
-    installPluginFromValidatedSource(source: string, options?: IInstallPluginFromSourceOptions): Promise<IInstallPluginFromSourceResult>;
-    /**
     * Pulls the latest changes for an already-cloned marketplace repository.
     */
     updatePlugin(plugin: IMarketplacePlugin): Promise<boolean>;

package/vscode/src/vs/workbench/contrib/chat/common/plugins/pluginMarketplaceService.service.d.ts

@@ -34,8 +34,14 @@ export interface IPluginMarketplaceService {
     getMarketplacePluginMetadata(pluginUri: URI): IMarketplacePlugin | undefined;
     addInstalledPlugin(pluginUri: URI, plugin: IMarketplacePlugin): void;
     removeInstalledPlugin(pluginUri: URI): void;
-    /** Returns whether the given marketplace has been explicitly trusted by the user. */
+    /** Returns whether the given marketplace is trusted — either explicitly trusted by the user, or allowed by the enterprise allowlist when strict mode is active. */
     isMarketplaceTrusted(ref: IMarketplaceReference): boolean;
+    /**
+    * Returns whether the strict-marketplace enterprise policy
+    * (`chat.plugins.strictMarketplaces`) is active — i.e. an allowlist is
+    * configured. When active, blocked marketplaces cannot be trusted by the user.
+    */
+    isStrictMarketplacePolicyActive(): boolean;
     /** Records that the user trusts the given marketplace, persisted permanently. */
     trustMarketplace(ref: IMarketplaceReference): void;
     /**
@@ -55,4 +61,12 @@ export interface IPluginMarketplaceService {
     * root.
     */
     readSinglePluginManifest(repoDir: URI, reference: IMarketplaceReference): Promise<IMarketplacePlugin | undefined>;
+    /**
+    * Returns whether the given directory is a standalone plugin — i.e. it
+    * contains a single-plugin manifest (e.g. `.plugin/plugin.json`,
+    * `.claude-plugin/plugin.json`, or `plugin.json`) at its root but is not a
+    * marketplace. Used by direct-install flows to route a local folder to the
+    * appropriate configuration.
+    */
+    isPluginDirectory(repoDir: URI): Promise<boolean>;
 }

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

@@ -60,4 +60,4 @@ export declare class ComputeAutomaticInstructions {
     private _getCustomizationsIndex;
     private _addReferencedInstructions;
 }
-export declare function getFilePath(uri: URI, remoteOS: OperatingSystem | undefined): string;
+export declare function getFilePath(uri: URI, remoteOS: OperatingSystem | undefined, isRemote?: boolean): string;

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

@@ -155,7 +155,7 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
                     category: "skipped",
                     name: ( basename(uri).toString()),
                     uri,
-                    reason: ( localize(8014, "no applyTo pattern"))
+                    reason: ( localize(8620, "no applyTo pattern"))
                 });
                 continue;
             }
@@ -168,7 +168,7 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
                     category: "skipped",
                     name: ( basename(uri).toString()),
                     uri,
-                    reason: ( localize(8015, "already processed"))
+                    reason: ( localize(8621, "already processed"))
                 });
                 continue;
             }
@@ -177,8 +177,8 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
                 this._logService.trace(
                     `[InstructionsContextComputer] Match for ${uri} with ${match.pattern}${match.file ? ` for file ${match.file}` : ""}`
                 );
-                const reason = !match.file ? ( localize(8016, "automatically attached as pattern is **")) : ( localize(
-                    8017,
+                const reason = !match.file ? ( localize(8622, "automatically attached as pattern is **")) : ( localize(
+                    8623,
                     "automatically attached as pattern {0} matches {1}",
                     pattern,
                     this._labelService.getUriLabel(match.file, {
@@ -204,7 +204,7 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
                     category: "skipped",
                     name: ( basename(uri).toString()),
                     uri,
-                    reason: ( localize(8018, "applyTo '{0}' did not match any attached files", pattern))
+                    reason: ( localize(8624, "applyTo '{0}' did not match any attached files", pattern))
                 });
             }
         }
@@ -251,7 +251,7 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
                 category: "applying",
                 name: ( basename(uri).toString()),
                 uri,
-                reason: ( localize(8019, "always added"))
+                reason: ( localize(8625, "always added"))
             });
             logger.logInfo(`Agent instruction file added: ${( uri.toString())}`);
         }
@@ -322,7 +322,8 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
         const currentSessionType = this._currentSessionType;
         const remoteEnv = await this._remoteAgentService.getEnvironment();
         const remoteOS = remoteEnv?.os;
-        const filePath = uri => getFilePath(uri, remoteOS);
+        const isRemote = this._remoteAgentService.getConnection() !== null;
+        const filePath = uri => getFilePath(uri, remoteOS, isRemote);
         const entries = [];
         if (fileReadTool) {
             const searchNestedAgentMd = this._configurationService.getValue(PromptsConfig.USE_NESTED_AGENT_MD);
@@ -369,7 +370,7 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
                 const folderName = this._labelService.getUriLabel(dirname(uri), {
                     relative: true
                 });
-                const description = folderName.trim().length === 0 ? ( localize(8020, "Instructions for the workspace")) : ( localize(8021, "Instructions for folder '{0}'", folderName));
+                const description = folderName.trim().length === 0 ? ( localize(8626, "Instructions for the workspace")) : ( localize(8627, "Instructions for folder '{0}'", folderName));
                 entries.push("<instruction>");
                 entries.push(`<file>${filePath(uri)}</file>`);
                 entries.push(`<description>${description}</description>`);
@@ -389,7 +390,7 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
                         category: "skipped",
                         name: skill.name,
                         uri: skill.uri,
-                        reason: ( localize(8022, "no description for model invocation"))
+                        reason: ( localize(8628, "no description for model invocation"))
                     });
                     return false;
                 }
@@ -398,7 +399,7 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
                         category: "skipped",
                         name: skill.name,
                         uri: skill.uri,
-                        reason: ( localize(8023, "model invocation disabled"))
+                        reason: ( localize(8629, "model invocation disabled"))
                     });
                     return false;
                 }
@@ -407,7 +408,7 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
                         category: "skipped",
                         name: skill.name,
                         uri: skill.uri,
-                        reason: ( localize(8024, "session type not matched"))
+                        reason: ( localize(8630, "session type not matched"))
                     });
                     return false;
                 }
@@ -416,7 +417,7 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
                         category: "skipped",
                         name: skill.name,
                         uri: skill.uri,
-                        reason: ( localize(8025, "debug logging disabled"))
+                        reason: ( localize(8631, "debug logging disabled"))
                     });
                     return false;
                 }
@@ -585,7 +586,7 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
                             category: "skipped",
                             name: agent.name,
                             uri: agent.uri,
-                            reason: ( localize(8026, "not invocable by model"))
+                            reason: ( localize(8632, "not invocable by model"))
                         });
                     }
                 }
@@ -652,7 +653,7 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
                             if (isPromptOrInstructionsFile(uri)) {
                                 todo.push(uri);
                             }
-                            const reason = ( localize(8027, "Referenced by {0}", basename(next)));
+                            const reason = ( localize(8633, "Referenced by {0}", basename(next)));
                             attachedContext.add(
                                 toPromptFileVariableEntry(uri, PromptFileVariableKind.InstructionReference, reason, true)
                             );
@@ -673,7 +674,12 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
     }
 };
 ComputeAutomaticInstructions = ( __decorate([( __param(4, IPromptsService)), ( __param(5, ILogService)), ( __param(6, ILabelService)), ( __param(7, IConfigurationService)), ( __param(8, IWorkspaceContextService)), ( __param(9, IFileService)), ( __param(10, IRemoteAgentService)), ( __param(11, ITelemetryService)), ( __param(12, ILanguageModelToolsService)), ( __param(13, IAgentPluginService))], ComputeAutomaticInstructions));
-function getFilePath(uri, remoteOS) {
+function getFilePath(uri, remoteOS, isRemote = false) {
+    if (isRemote && uri.scheme === Schemas.file) {
+        return ( uri.with({
+            scheme: "vscode-local"
+        }).toString());
+    }
     if (uri.scheme === Schemas.file || uri.scheme === Schemas.vscodeRemote) {
         const fsPath = uri.fsPath;
         if (remoteOS !== undefined) {

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

@@ -53,32 +53,32 @@ function mergeHooks(base, additional) {
     return result;
 }
 const HOOK_COMMAND_FIELD_DESCRIPTIONS = {
-    type: ( localize(8028, "Must be \"command\".")),
+    type: ( localize(8634, "Must be \"command\".")),
     command: ( localize(
-        8029,
+        8635,
         "The command to execute. This is the default cross-platform command."
     )),
     windows: ( localize(
-        8030,
+        8636,
         "Windows-specific command. If specified and running on Windows, this overrides the \"command\" field."
     )),
     linux: ( localize(
-        8031,
+        8637,
         "Linux-specific command. If specified and running on Linux, this overrides the \"command\" field."
     )),
     osx: ( localize(
-        8032,
+        8638,
         "macOS-specific command. If specified and running on macOS, this overrides the \"command\" field."
     )),
-    bash: ( localize(8033, "Bash command for Linux and macOS.")),
-    powershell: ( localize(8034, "PowerShell command for Windows.")),
-    cwd: ( localize(8035, "Working directory for the script (relative to repository root).")),
+    bash: ( localize(8639, "Bash command for Linux and macOS.")),
+    powershell: ( localize(8640, "PowerShell command for Windows.")),
+    cwd: ( localize(8641, "Working directory for the script (relative to repository root).")),
     env: ( localize(
-        8036,
+        8642,
         "Additional environment variables that are merged with the existing environment."
     )),
-    timeout: ( localize(8037, "Maximum execution time in seconds (default: 30).")),
-    timeoutSec: ( localize(8038, "Maximum execution time in seconds (default: 10)."))
+    timeout: ( localize(8643, "Maximum execution time in seconds (default: 30).")),
+    timeoutSec: ( localize(8644, "Maximum execution time in seconds (default: 10)."))
 };
 const vscodeHookCommandSchema = {
     type: "object",
@@ -98,7 +98,7 @@ const vscodeHookCommandSchema = {
         required: ["powershell"]
     }],
     errorMessage: ( localize(
-        8039,
+        8645,
         "At least one of \"command\", \"windows\", \"linux\", or \"osx\" must be specified."
     )),
     properties: {
@@ -161,7 +161,7 @@ const copilotCliHookCommandSchema = {
     }, {
         required: ["powershell"]
     }],
-    errorMessage: ( localize(8040, "At least one of \"bash\" or \"powershell\" must be specified.")),
+    errorMessage: ( localize(8646, "At least one of \"bash\" or \"powershell\" must be specified.")),
     properties: {
         type: {
             type: "string",
@@ -203,7 +203,7 @@ const hookFileSchema = {
     $schema: "http://json-schema.org/draft-07/schema#",
     type: "object",
     description: ( localize(
-        8041,
+        8647,
         "GitHub Copilot hook configuration file. Hooks enable executing custom shell commands at strategic points in an agent's workflow."
     )),
     additionalProperties: true,
@@ -211,7 +211,7 @@ const hookFileSchema = {
     properties: {
         hooks: {
             type: "object",
-            description: ( localize(8042, "Hook definitions organized by type.")),
+            description: ( localize(8648, "Hook definitions organized by type.")),
             additionalProperties: true
         }
     },
@@ -227,7 +227,7 @@ const hookFileSchema = {
         properties: {
             version: {
                 type: "number",
-                description: ( localize(8043, "Hook configuration format version."))
+                description: ( localize(8649, "Hook configuration format version."))
             },
             hooks: {
                 properties: copilotCliHookProperties
@@ -242,8 +242,8 @@ const hookFileSchema = {
         }
     },
     defaultSnippets: [{
-        label: ( localize(8044, "Basic hook configuration")),
-        description: ( localize(8045, "A basic hook configuration with common hooks")),
+        label: ( localize(8650, "Basic hook configuration")),
+        description: ( localize(8651, "A basic hook configuration with common hooks")),
         body: {
             hooks: {
                 SessionStart: [{