@codingame/monaco-vscode-api 36.2.6 → 37.0.0

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

@@ -2,20 +2,16 @@ import { CancellationToken } from "../../../../../base/common/cancellation.js";
 import { Event } from "../../../../../base/common/event.js";
 import { IObservable } from "../../../../../base/common/observable.js";
 import { URI } from "../../../../../base/common/uri.js";
-import { IMarketplaceReference } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/workbench/contrib/chat/common/plugins/marketplaceReference";
-import { IMarketplaceInstalledPlugin, IMarketplacePlugin } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/workbench/contrib/chat/common/plugins/pluginMarketplaceService";
+import { IMarketplaceReference } from "./marketplaceReference.js";
+import { IMarketplaceInstalledPlugin, IMarketplacePlugin, IFetchMarketplacePluginsOptions } from "./pluginMarketplaceService.js";
 export declare const IPluginMarketplaceService: import("../../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IPluginMarketplaceService>;
 export interface IPluginMarketplaceService {
     readonly _serviceBrand: undefined;
     readonly onDidChangeMarketplaces: Event<void>;
     /** Installed marketplace plugins, backed by storage. */
     readonly installedPlugins: IObservable<readonly IMarketplaceInstalledPlugin[]>;
-    /**
-    * Observable that is `true` when at least one cloned marketplace
-    * repository has upstream changes available. Checked periodically
-    * (approximately once per day) when `extensions.autoUpdate` is enabled.
-    */
-    readonly hasUpdatesAvailable: IObservable<boolean>;
+    /** Canonical IDs of marketplaces with updates detected by the periodic check. */
+    readonly marketplacesWithUpdates: IObservable<ReadonlySet<string>>;
     /**
     * Observable snapshot of the last {@link fetchMarketplacePlugins} result.
     * Empty until the first fetch completes. Views should use this for
@@ -28,9 +24,9 @@ export interface IPluginMarketplaceService {
     * may be added over time; consumers should not assume a specific source.
     */
     readonly recommendedPlugins: IObservable<ReadonlySet<string>>;
-    /** Resets {@link hasUpdatesAvailable} to `false`. */
-    clearUpdatesAvailable(): void;
-    fetchMarketplacePlugins(token: CancellationToken): Promise<IMarketplacePlugin[]>;
+    /** Clears all reported marketplaces, or only the provided canonical IDs. */
+    clearUpdatesAvailable(marketplaceIds?: ReadonlySet<string>): void;
+    fetchMarketplacePlugins(token: CancellationToken, marketplaceIds?: ReadonlySet<string>, options?: IFetchMarketplacePluginsOptions): Promise<IMarketplacePlugin[]>;
     getMarketplacePluginMetadata(pluginUri: URI): IMarketplacePlugin | undefined;
     addInstalledPlugin(pluginUri: URI, plugin: IMarketplacePlugin): void;
     removeInstalledPlugin(pluginUri: URI): void;
@@ -42,6 +38,8 @@ export interface IPluginMarketplaceService {
     * configured. When active, blocked marketplaces cannot be trusted by the user.
     */
     isStrictMarketplacePolicyActive(): boolean;
+    /** Returns the effective automatic-update policy for a marketplace. */
+    isMarketplaceAutoUpdateEnabled(ref: IMarketplaceReference): boolean;
     /** Records that the user trusts the given marketplace, persisted permanently. */
     trustMarketplace(ref: IMarketplaceReference): void;
     /**

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

@@ -1,6 +1,6 @@
 import { URI } from "../../../../../base/common/uri.js";
 import { IEnsureRepositoryOptions, IPullRepositoryOptions } from "./agentPluginRepositoryService.js";
-import { IMarketplacePlugin, IPluginSourceDescriptor, PluginSourceKind } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/workbench/contrib/chat/common/plugins/pluginMarketplaceService";
+import { IMarketplacePlugin, IPluginSourceDescriptor, PluginSourceKind } from "./pluginMarketplaceService.js";
 /**
  * Per-kind strategy that centralizes install-path computation, source
  * provisioning, update, label formatting, and uninstall cleanup for a

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

@@ -0,0 +1,31 @@
+import { IStrictMarketplaceSource } from "../../../../../base/common/managedSettings.js";
+import { IMarketplaceReference } from "./marketplaceReference.js";
+/**
+ * The allowlist entry type for `chat.plugins.strictMarketplaces`. Re-exported
+ * from `base/common` so chat plugin code can import it alongside the matcher it
+ * operates with; the same type is consumed by the managed-settings adapter.
+ */
+export type { IStrictMarketplaceSource };
+/**
+ * The value of the `chat.plugins.strictMarketplaces` allowlist.
+ * - `undefined`: no restrictions — all marketplaces are allowed.
+ * - `[]`: complete lockdown — no marketplace is allowed.
+ * - non-empty array: only marketplaces matching an entry are allowed.
+ */
+export type StrictKnownMarketplaces = readonly IStrictMarketplaceSource[];
+/**
+ * Coerces a resolved configuration value into a {@link StrictKnownMarketplaces}
+ * allowlist. Returns `undefined` (meaning "no restrictions") when the value is
+ * not an array — which is also how an unset policy surfaces (the registered
+ * `null` default). Malformed entries (non-objects or entries without a string
+ * `source`) are dropped so a bad managed-settings payload degrades to "no match"
+ * rather than throwing during matching.
+ */
+export declare function getStrictKnownMarketplaces(value: unknown): StrictKnownMarketplaces | undefined;
+/**
+ * Checks whether a marketplace reference is allowed by the strict allowlist.
+ *
+ * @param allowlist `undefined` allows everything, `[]` blocks everything,
+ * otherwise the reference must match at least one entry.
+ */
+export declare function isMarketplaceReferenceAllowed(allowlist: StrictKnownMarketplaces | undefined, ref: IMarketplaceReference): boolean;

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

@@ -0,0 +1,122 @@
+
+import { isEqual } from '../../../../../base/common/resources.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { MarketplaceReferenceKind, parseMarketplaceReference } from './marketplaceReference.js';
+
+function getStrictKnownMarketplaces(value) {
+    if (!Array.isArray(value)) {
+        return undefined;
+    }
+    return value.filter(
+        entry => typeof entry === "object" && entry !== null && typeof entry.source === "string"
+    );
+}
+function isMarketplaceReferenceAllowed(allowlist, ref) {
+    if (allowlist === undefined) {
+        return true;
+    }
+    if (allowlist.length === 0) {
+        return false;
+    }
+    return ( allowlist.some(entry => matchesAllowlistEntry(entry, ref)));
+}
+function matchesAllowlistEntry(entry, ref) {
+    switch (entry.source) {
+    case "github":
+        {
+            if (typeof entry.repo !== "string" || entry.path !== undefined) {
+                return false;
+            }
+            const candidate = parseMarketplaceReference(appendRef(entry.repo, entry.ref));
+            return !!candidate && candidate.canonicalId === ref.canonicalId;
+        }
+    case "git":
+        {
+            if (typeof entry.url !== "string" || entry.path !== undefined) {
+                return false;
+            }
+            const candidate = parseMarketplaceReference(appendRef(entry.url, entry.ref));
+            return !!candidate && candidate.canonicalId === ref.canonicalId;
+        }
+    case "url":
+        {
+            if (typeof entry.url !== "string") {
+                return false;
+            }
+            const candidate = parseMarketplaceReference(appendRef(entry.url, entry.ref));
+            return !!candidate && candidate.canonicalId === ref.canonicalId;
+        }
+    case "npm":
+        {
+            return false;
+        }
+    case "file":
+    case "directory":
+        {
+            if (ref.kind !== MarketplaceReferenceKind.LocalFileUri || !ref.localRepositoryUri || typeof entry.path !== "string") {
+                return false;
+            }
+            return isEqual(ref.localRepositoryUri, URI.file(entry.path));
+        }
+    case "hostPattern":
+        {
+            if (typeof entry.hostPattern !== "string") {
+                return false;
+            }
+            const host = extractHost(ref);
+            return !!host && testPattern(entry.hostPattern, host);
+        }
+    case "pathPattern":
+        {
+            if (typeof entry.pathPattern !== "string" || ref.kind !== MarketplaceReferenceKind.LocalFileUri || !ref.localRepositoryUri) {
+                return false;
+            }
+            return testPattern(entry.pathPattern, ref.localRepositoryUri.fsPath);
+        }
+    default:
+        return false;
+    }
+}
+function appendRef(value, ref) {
+    if (!ref) {
+        return value;
+    }
+    const fragmentIndex = value.indexOf("#");
+    const base = fragmentIndex === -1 ? value : value.slice(0, fragmentIndex);
+    return `${base}#${ref}`;
+}
+function extractHost(ref) {
+    if (ref.kind === MarketplaceReferenceKind.GitHubShorthand) {
+        return "github.com";
+    }
+    if (ref.kind !== MarketplaceReferenceKind.GitUri) {
+        return undefined;
+    }
+    const scpMatch = /^[\w._-]+@([\w.-]+):/.exec(ref.cloneUrl);
+    if (scpMatch) {
+        return scpMatch[1].toLowerCase();
+    }
+    try {
+        let authority = ( URI.parse(ref.cloneUrl)).authority.toLowerCase();
+        const at = authority.lastIndexOf("@");
+        if (at !== -1) {
+            authority = authority.slice(at + 1);
+        }
+        const colon = authority.indexOf(":");
+        if (colon !== -1) {
+            authority = authority.slice(0, colon);
+        }
+        return authority || undefined;
+    } catch {
+        return undefined;
+    }
+}
+function testPattern(pattern, value) {
+    try {
+        return ( new RegExp(pattern)).test(value);
+    } catch {
+        return false;
+    }
+}
+
+export { getStrictKnownMarketplaces, isMarketplaceReferenceAllowed };

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

@@ -18,6 +18,7 @@ export { newInstructionsCollectionEvent, newInstructionsCollectionDebugInfo } fr
 import { ChatModeKind } from "../constants.js";
 import { UserSelectedTools } from "../participants/chatAgents.js";
 import { IAgentPluginService } from "../plugins/agentPluginService.service.js";
+import { IPathService } from "../../../../services/path/common/pathService.service.js";
 export interface InstructionsCollectionResult {
     readonly telemetryEvent: InstructionsCollectionEvent;
     readonly debugInfo: InstructionsCollectionDebugInfo;
@@ -42,8 +43,9 @@ export declare class ComputeAutomaticInstructions {
     private readonly _telemetryService;
     private readonly _languageModelToolsService;
     private readonly _agentPluginService;
+    private readonly _pathService;
     private _parseResults;
-    constructor(_modeKind: ChatModeKind, _enabledTools: UserSelectedTools | undefined, _enabledSubagents: (readonly string[]) | undefined, _currentSessionType: string, _promptsService: IPromptsService, _logService: ILogService, _labelService: ILabelService, _configurationService: IConfigurationService, _workspaceService: IWorkspaceContextService, _fileService: IFileService, _remoteAgentService: IRemoteAgentService, _telemetryService: ITelemetryService, _languageModelToolsService: ILanguageModelToolsService, _agentPluginService: IAgentPluginService);
+    constructor(_modeKind: ChatModeKind, _enabledTools: UserSelectedTools | undefined, _enabledSubagents: (readonly string[]) | undefined, _currentSessionType: string, _promptsService: IPromptsService, _logService: ILogService, _labelService: ILabelService, _configurationService: IConfigurationService, _workspaceService: IWorkspaceContextService, _fileService: IFileService, _remoteAgentService: IRemoteAgentService, _telemetryService: ITelemetryService, _languageModelToolsService: ILanguageModelToolsService, _agentPluginService: IAgentPluginService, _pathService: IPathService);
     private _parseInstructionsFile;
     collect(variables: ChatRequestVariableSet, token: CancellationToken): Promise<void>;
     private sendTelemetry;

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

@@ -5,6 +5,7 @@ import { ResourceMap, ResourceSet } from '../../../../../base/common/map.js';
 import { Schemas } from '../../../../../base/common/network.js';
 import { OperatingSystem } from '../../../../../base/common/platform.js';
 import { basename, dirname } from '../../../../../base/common/resources.js';
+import { escape } from '../../../../../base/common/strings.js';
 import { localize } from '../../../../../nls.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.service.js';
 import { IFileService } from '../../../../../platform/files/common/files.service.js';
@@ -18,13 +19,15 @@ import { VSCodeToolReference } from '../tools/languageModelToolsService.js';
 import { ILanguageModelToolsService } from '../tools/languageModelToolsService.service.js';
 import { PromptsConfig } from './config/config.js';
 import { isInClaudeRulesFolder, isInClaudeAgentsFolder, isPromptOrInstructionsFile } from './config/promptFileLocations.js';
+import { isPromptFileTildePath } from './promptFileParser.js';
 import { newInstructionsCollectionEvent, newInstructionsCollectionDebugInfo, matchesSessionType, AgentInstructionFileType } from './service/promptsService.js';
 import { IPromptsService } from './service/promptsService.service.js';
 import { AGENT_DEBUG_LOG_FILE_LOGGING_ENABLED_SETTING, TROUBLESHOOT_SKILL_PATH } from './promptTypes.js';
 import { OffsetRange } from '../../../../../editor/common/core/ranges/offsetRange.js';
-import { ChatModeKind, ChatConfiguration, GeneralPurposeAgentName } from '../constants.js';
+import { ChatModeKind } from '../constants.js';
 import { hash } from '../../../../../base/common/hash.js';
 import { IAgentPluginService } from '../plugins/agentPluginService.service.js';
+import { IPathService } from '../../../../services/path/common/pathService.service.js';
 
 let lastInstructionsCollectionResult;
 let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
@@ -42,7 +45,8 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
         _remoteAgentService,
         _telemetryService,
         _languageModelToolsService,
-        _agentPluginService
+        _agentPluginService,
+        _pathService
     ) {
         this._modeKind = _modeKind;
         this._enabledTools = _enabledTools;
@@ -58,6 +62,7 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
         this._telemetryService = _telemetryService;
         this._languageModelToolsService = _languageModelToolsService;
         this._agentPluginService = _agentPluginService;
+        this._pathService = _pathService;
         this._parseResults = ( new ResourceMap());
     }
     async _parseInstructionsFile(uri, token) {
@@ -155,7 +160,7 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
                     category: "skipped",
                     name: ( basename(uri).toString()),
                     uri,
-                    reason: ( localize(8620, "no applyTo pattern"))
+                    reason: ( localize(10337, "no applyTo pattern"))
                 });
                 continue;
             }
@@ -168,7 +173,7 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
                     category: "skipped",
                     name: ( basename(uri).toString()),
                     uri,
-                    reason: ( localize(8621, "already processed"))
+                    reason: ( localize(10338, "already processed"))
                 });
                 continue;
             }
@@ -177,8 +182,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(8622, "automatically attached as pattern is **")) : ( localize(
-                    8623,
+                const reason = !match.file ? ( localize(10339, "automatically attached as pattern is **")) : ( localize(
+                    10340,
                     "automatically attached as pattern {0} matches {1}",
                     pattern,
                     this._labelService.getUriLabel(match.file, {
@@ -204,7 +209,7 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
                     category: "skipped",
                     name: ( basename(uri).toString()),
                     uri,
-                    reason: ( localize(8624, "applyTo '{0}' did not match any attached files", pattern))
+                    reason: ( localize(10341, "applyTo '{0}' did not match any attached files", pattern))
                 });
             }
         }
@@ -251,7 +256,7 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
                 category: "applying",
                 name: ( basename(uri).toString()),
                 uri,
-                reason: ( localize(8625, "always added"))
+                reason: ( localize(10342, "always added"))
             });
             logger.logInfo(`Agent instruction file added: ${( uri.toString())}`);
         }
@@ -355,10 +360,10 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
                 entries.push("<instruction>");
                 entries.push(`<file>${filePath(instruction.uri)}</file>`);
                 if (instruction.description) {
-                    entries.push(`<description>${instruction.description}</description>`);
+                    entries.push(`<description>${escape(instruction.description)}</description>`);
                 }
                 if (instruction.pattern) {
-                    entries.push(`<applyTo>${instruction.pattern}</applyTo>`);
+                    entries.push(`<applyTo>${escape(instruction.pattern)}</applyTo>`);
                 }
                 entries.push("</instruction>");
                 hasContent = true;
@@ -370,10 +375,10 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
                 const folderName = this._labelService.getUriLabel(dirname(uri), {
                     relative: true
                 });
-                const description = folderName.trim().length === 0 ? ( localize(8626, "Instructions for the workspace")) : ( localize(8627, "Instructions for folder '{0}'", folderName));
+                const description = folderName.trim().length === 0 ? ( localize(10343, "Instructions for the workspace")) : ( localize(10344, "Instructions for folder '{0}'", folderName));
                 entries.push("<instruction>");
                 entries.push(`<file>${filePath(uri)}</file>`);
-                entries.push(`<description>${description}</description>`);
+                entries.push(`<description>${escape(description)}</description>`);
                 entries.push("</instruction>");
                 hasContent = true;
             }
@@ -390,7 +395,7 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
                         category: "skipped",
                         name: skill.name,
                         uri: skill.uri,
-                        reason: ( localize(8628, "no description for model invocation"))
+                        reason: ( localize(10345, "no description for model invocation"))
                     });
                     return false;
                 }
@@ -399,7 +404,7 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
                         category: "skipped",
                         name: skill.name,
                         uri: skill.uri,
-                        reason: ( localize(8629, "model invocation disabled"))
+                        reason: ( localize(10346, "model invocation disabled"))
                     });
                     return false;
                 }
@@ -408,7 +413,7 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
                         category: "skipped",
                         name: skill.name,
                         uri: skill.uri,
-                        reason: ( localize(8630, "session type not matched"))
+                        reason: ( localize(10347, "session type not matched"))
                     });
                     return false;
                 }
@@ -417,7 +422,7 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
                         category: "skipped",
                         name: skill.name,
                         uri: skill.uri,
-                        reason: ( localize(8631, "debug logging disabled"))
+                        reason: ( localize(10348, "debug logging disabled"))
                     });
                     return false;
                 }
@@ -499,9 +504,9 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
                 let truncatedAtIndex = modelInvocableSkills.length;
                 for (let i = 0; i < modelInvocableSkills.length; i++) {
                     const skill = modelInvocableSkills[i];
-                    const skillEntry = [`<skill>`, `<name>${skill.name}</name>`];
+                    const skillEntry = [`<skill>`, `<name>${escape(skill.name)}</name>`];
                     if (skill.description) {
-                        skillEntry.push(`<description>${skill.description}</description>`);
+                        skillEntry.push(`<description>${escape(skill.description)}</description>`);
                     }
                     skillEntry.push(`<file>${filePath(skill.uri)}</file>`);
                     skillEntry.push(`</skill>`);
@@ -518,12 +523,13 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
                     const names = [];
                     let nameListLength = 0;
                     for (const skill of truncatedSkills) {
-                        const addition = (names.length > 0 ? 2 : 0) + skill.name.length;
+                        const escapedName = escape(skill.name);
+                        const addition = (names.length > 0 ? 2 : 0) + escapedName.length;
                         if (nameListLength + addition > TRUNCATED_NAMES_CHAR_BUDGET) {
                             break;
                         }
                         nameListLength += addition;
-                        names.push(skill.name);
+                        names.push(escapedName);
                     }
                     const remaining = truncatedSkills.length - names.length;
                     const nameList = names.join(", ");
@@ -535,7 +541,6 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
             }
         }
         if (runSubagentTool) {
-            const generalPurposeAgentEnabled = !!this._configurationService.getValue(ChatConfiguration.GeneralPurposeAgentEnabled);
             const canUseAgent = (() => {
                 if (!this._enabledSubagents || this._enabledSubagents.includes("*")) {
                     return agent => agent.visibility.agentInvocable && matchesSessionType(agent.sessionTypes, currentSessionType);
@@ -545,7 +550,7 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
                 }
             })();
             const agents = (await this._promptsService.getCustomAgents(token)).filter(a => a.enabled);
-            if (generalPurposeAgentEnabled || agents.length > 0) {
+            if (agents.length > 0) {
                 entries.push("<agents>");
                 entries.push("Here is a list of agents that can be used when running a subagent.");
                 entries.push(
@@ -554,23 +559,15 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
                 entries.push(
                     `Use the ${runSubagentTool.variable} tool with the agent name to run the subagent.`
                 );
-                if (generalPurposeAgentEnabled) {
-                    entries.push("<agent>");
-                    entries.push(`<name>${GeneralPurposeAgentName}</name>`);
-                    entries.push(
-                        `<description>Full-capability agent for complex multi-step tasks requiring high-quality reasoning. Has access to the same tools and capabilities as the current agent and inherits the parent agent's model and system prompt. Use for tasks that don't fit a more specialized agent.</description>`
-                    );
-                    entries.push("</agent>");
-                }
                 for (const agent of agents) {
                     if (canUseAgent(agent)) {
                         entries.push("<agent>");
-                        entries.push(`<name>${agent.name}</name>`);
+                        entries.push(`<name>${escape(agent.name)}</name>`);
                         if (agent.description) {
-                            entries.push(`<description>${agent.description}</description>`);
+                            entries.push(`<description>${escape(agent.description)}</description>`);
                         }
                         if (agent.argumentHint) {
-                            entries.push(`<argumentHint>${agent.argumentHint}</argumentHint>`);
+                            entries.push(`<argumentHint>${escape(agent.argumentHint)}</argumentHint>`);
                         }
                         entries.push("</agent>");
                         debugInfo.debugDetails.push({
@@ -586,7 +583,7 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
                             category: "skipped",
                             name: agent.name,
                             uri: agent.uri,
-                            reason: ( localize(8632, "not invocable by model"))
+                            reason: ( localize(10349, "not invocable by model"))
                         });
                     }
                 }
@@ -635,8 +632,12 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
             const result = await this._parseInstructionsFile(next, token);
             if (result && result.body) {
                 const refsToCheck = [];
+                let userHome;
                 for (const ref of result.body.fileReferences) {
-                    const url = result.body.resolveFilePath(ref.content);
+                    if (isPromptFileTildePath(ref.content)) {
+                        userHome ??= await this._pathService.userHome();
+                    }
+                    const url = result.body.resolveFilePath(ref.content, userHome);
                     if (url && !( seen.has(url)) && (isPromptOrInstructionsFile(url) || this._workspaceService.getWorkspaceFolder(url) !== undefined)) {
                         refsToCheck.push({
                             resource: url
@@ -653,7 +654,7 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
                             if (isPromptOrInstructionsFile(uri)) {
                                 todo.push(uri);
                             }
-                            const reason = ( localize(8633, "Referenced by {0}", basename(next)));
+                            const reason = ( localize(10350, "Referenced by {0}", basename(next)));
                             attachedContext.add(
                                 toPromptFileVariableEntry(uri, PromptFileVariableKind.InstructionReference, reason, true)
                             );
@@ -673,7 +674,7 @@ 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));
+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)), ( __param(14, IPathService))], ComputeAutomaticInstructions));
 function getFilePath(uri, remoteOS, isRemote = false) {
     if (isRemote && uri.scheme === Schemas.file) {
         return ( uri.with({

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

@@ -53,6 +53,14 @@ export declare const COPILOT_CONFIG_FOLDER = ".copilot";
  * Copilot custom instructions file name.
  */
 export declare const COPILOT_CUSTOM_INSTRUCTIONS_FILENAME = "copilot-instructions.md";
+/**
+ * Voice customization file name.
+ */
+export declare const VOICE_INSTRUCTIONS_FILENAME = "voice.md";
+/**
+ * Dictation customization file name.
+ */
+export declare const DICTATION_INSTRUCTIONS_FILENAME = "dictation.md";
 /**
  * GitHub configuration folder name.
  */

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

@@ -19,6 +19,8 @@ const CLAUDE_LOCAL_MD_FILENAME = "CLAUDE.local.md";
 const CLAUDE_CONFIG_FOLDER = ".claude";
 const COPILOT_CONFIG_FOLDER = ".copilot";
 const COPILOT_CUSTOM_INSTRUCTIONS_FILENAME = "copilot-instructions.md";
+const VOICE_INSTRUCTIONS_FILENAME = "voice.md";
+const DICTATION_INSTRUCTIONS_FILENAME = "dictation.md";
 const GITHUB_CONFIG_FOLDER = ".github";
 const PROMPT_DEFAULT_SOURCE_FOLDER = ".github/prompts";
 const INSTRUCTIONS_DEFAULT_SOURCE_FOLDER = ".github/instructions";
@@ -219,4 +221,4 @@ function getCleanPromptName(fileUri) {
     return basename(fileUri);
 }
 
-export { AGENTS_SOURCE_FOLDER, AGENT_FILE_EXTENSION, AGENT_MD_FILENAME, CLAUDE_AGENTS_SOURCE_FOLDER, CLAUDE_CONFIG_FOLDER, CLAUDE_LOCAL_MD_FILENAME, CLAUDE_MD_FILENAME, CLAUDE_RULES_SOURCE_FOLDER, COPILOT_CONFIG_FOLDER, COPILOT_CUSTOM_INSTRUCTIONS_FILENAME, COPILOT_USER_AGENTS_SOURCE_FOLDER, DEFAULT_AGENT_SOURCE_FOLDERS, DEFAULT_HOOK_FILE_PATHS, DEFAULT_INSTRUCTIONS_SOURCE_FOLDERS, DEFAULT_PROMPT_SOURCE_FOLDERS, DEFAULT_SKILL_SOURCE_FOLDERS, GITHUB_CONFIG_FOLDER, INSTRUCTIONS_DEFAULT_SOURCE_FOLDER, INSTRUCTION_FILE_EXTENSION, LEGACY_MODE_DEFAULT_SOURCE_FOLDER, LEGACY_MODE_FILE_EXTENSION, PROMPT_DEFAULT_SOURCE_FOLDER, PROMPT_FILE_EXTENSION, SKILL_FILENAME, VALID_SKILL_NAME_REGEX, getCleanPromptName, getPromptFileDefaultLocations, getPromptFileExtension, getPromptFileType, getSkillFolderName, isInClaudeAgentsFolder, isInClaudeRulesFolder, isInCopilotAgentsFolder, isPromptOrInstructionsFile, isSkillFilename };
+export { AGENTS_SOURCE_FOLDER, AGENT_FILE_EXTENSION, AGENT_MD_FILENAME, CLAUDE_AGENTS_SOURCE_FOLDER, CLAUDE_CONFIG_FOLDER, CLAUDE_LOCAL_MD_FILENAME, CLAUDE_MD_FILENAME, CLAUDE_RULES_SOURCE_FOLDER, COPILOT_CONFIG_FOLDER, COPILOT_CUSTOM_INSTRUCTIONS_FILENAME, COPILOT_USER_AGENTS_SOURCE_FOLDER, DEFAULT_AGENT_SOURCE_FOLDERS, DEFAULT_HOOK_FILE_PATHS, DEFAULT_INSTRUCTIONS_SOURCE_FOLDERS, DEFAULT_PROMPT_SOURCE_FOLDERS, DEFAULT_SKILL_SOURCE_FOLDERS, DICTATION_INSTRUCTIONS_FILENAME, GITHUB_CONFIG_FOLDER, INSTRUCTIONS_DEFAULT_SOURCE_FOLDER, INSTRUCTION_FILE_EXTENSION, LEGACY_MODE_DEFAULT_SOURCE_FOLDER, LEGACY_MODE_FILE_EXTENSION, PROMPT_DEFAULT_SOURCE_FOLDER, PROMPT_FILE_EXTENSION, SKILL_FILENAME, VALID_SKILL_NAME_REGEX, VOICE_INSTRUCTIONS_FILENAME, getCleanPromptName, getPromptFileDefaultLocations, getPromptFileExtension, getPromptFileType, getSkillFolderName, isInClaudeAgentsFolder, isInClaudeRulesFolder, isInCopilotAgentsFolder, isPromptOrInstructionsFile, isSkillFilename };

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(8634, "Must be \"command\".")),
+    type: ( localize(10351, "Must be \"command\".")),
     command: ( localize(
-        8635,
+        10352,
         "The command to execute. This is the default cross-platform command."
     )),
     windows: ( localize(
-        8636,
+        10353,
         "Windows-specific command. If specified and running on Windows, this overrides the \"command\" field."
     )),
     linux: ( localize(
-        8637,
+        10354,
         "Linux-specific command. If specified and running on Linux, this overrides the \"command\" field."
     )),
     osx: ( localize(
-        8638,
+        10355,
         "macOS-specific command. If specified and running on macOS, this overrides the \"command\" field."
     )),
-    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).")),
+    bash: ( localize(10356, "Bash command for Linux and macOS.")),
+    powershell: ( localize(10357, "PowerShell command for Windows.")),
+    cwd: ( localize(10358, "Working directory for the script (relative to repository root).")),
     env: ( localize(
-        8642,
+        10359,
         "Additional environment variables that are merged with the existing environment."
     )),
-    timeout: ( localize(8643, "Maximum execution time in seconds (default: 30).")),
-    timeoutSec: ( localize(8644, "Maximum execution time in seconds (default: 10)."))
+    timeout: ( localize(10360, "Maximum execution time in seconds (default: 30).")),
+    timeoutSec: ( localize(10361, "Maximum execution time in seconds (default: 10)."))
 };
 const vscodeHookCommandSchema = {
     type: "object",
@@ -98,7 +98,7 @@ const vscodeHookCommandSchema = {
         required: ["powershell"]
     }],
     errorMessage: ( localize(
-        8645,
+        10362,
         "At least one of \"command\", \"windows\", \"linux\", or \"osx\" must be specified."
     )),
     properties: {
@@ -161,7 +161,7 @@ const copilotCliHookCommandSchema = {
     }, {
         required: ["powershell"]
     }],
-    errorMessage: ( localize(8646, "At least one of \"bash\" or \"powershell\" must be specified.")),
+    errorMessage: ( localize(10363, "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(
-        8647,
+        10364,
         "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(8648, "Hook definitions organized by type.")),
+            description: ( localize(10365, "Hook definitions organized by type.")),
             additionalProperties: true
         }
     },
@@ -227,7 +227,7 @@ const hookFileSchema = {
         properties: {
             version: {
                 type: "number",
-                description: ( localize(8649, "Hook configuration format version."))
+                description: ( localize(10366, "Hook configuration format version."))
             },
             hooks: {
                 properties: copilotCliHookProperties
@@ -242,8 +242,8 @@ const hookFileSchema = {
         }
     },
     defaultSnippets: [{
-        label: ( localize(8650, "Basic hook configuration")),
-        description: ( localize(8651, "A basic hook configuration with common hooks")),
+        label: ( localize(10367, "Basic hook configuration")),
+        description: ( localize(10368, "A basic hook configuration with common hooks")),
         body: {
             hooks: {
                 SessionStart: [{