@codingame/monaco-vscode-api 26.2.1 → 27.0.0

package/vscode/src/vs/workbench/contrib/chat/common/participants/chatAgents.d.ts

@@ -9,15 +9,12 @@ import { Command } from "../../../../../editor/common/languages.js";
 import { IConfigurationService } from "../../../../../platform/configuration/common/configuration.service.js";
 import { IContextKeyService } from "../../../../../platform/contextkey/common/contextkey.service.js";
 import { ExtensionIdentifier } from "../../../../../platform/extensions/common/extensions.js";
-import { ILogService } from "../../../../../platform/log/common/log.service.js";
-import { IProductService } from "../../../../../platform/product/common/productService.service.js";
-import { IRequestService } from "../../../../../platform/request/common/request.service.js";
-import { IStorageService } from "../../../../../platform/storage/common/storage.service.js";
 import { IChatAgentEditedFileEvent, IChatProgressHistoryResponseContent, IChatRequestModeInstructions, IChatRequestVariableData, ISerializableChatAgentData } from "../model/chatModel.js";
 import { IChatRequestHooks } from "../promptSyntax/hookSchema.js";
 import { IRawChatCommandContribution } from "./chatParticipantContribTypes.js";
 import { IChatFollowup, IChatLocationData, IChatProgress, IChatResponseErrorDetails, IChatTaskDto } from "../chatService/chatService.js";
 import { ChatAgentLocation, ChatModeKind } from "../constants.js";
+import { ILanguageModelsService } from "../languageModels.service.js";
 import { IChatAgentService, type IChatAgentNameService } from "./chatAgents.service.js";
 export interface IChatAgentHistoryEntry {
     request: IChatAgentRequest;
@@ -35,6 +32,7 @@ export interface IChatAgentAttachmentCapabilities {
     supportsProblemAttachments?: boolean;
     supportsSymbolAttachments?: boolean;
     supportsTerminalAttachments?: boolean;
+    supportsPromptAttachments?: boolean;
 }
 export interface IChatAgentData {
     id: string;
@@ -76,7 +74,7 @@ export interface IChatWelcomeMessageContent {
 export interface IChatAgentImplementation {
     invoke(request: IChatAgentRequest, progress: (parts: IChatProgress[]) => void, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<IChatAgentResult>;
     setRequestTools?(requestId: string, tools: UserSelectedTools): void;
-    setYieldRequested?(requestId: string): void;
+    setYieldRequested?(requestId: string, value: boolean): void;
     provideFollowups?(request: IChatAgentRequest, result: IChatAgentResult, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<IChatFollowup[]>;
     provideChatTitle?: (history: IChatAgentHistoryEntry[], token: CancellationToken) => Promise<string | undefined>;
     provideChatSummary?: (history: IChatAgentHistoryEntry[], token: CancellationToken) => Promise<string | undefined>;
@@ -166,16 +164,6 @@ export interface IChatAgentResultTimings {
     firstProgress?: number;
     totalElapsed: number;
 }
-export interface IChatAgentPromptTokenDetail {
-    category: string;
-    label: string;
-    percentageOfPrompt: number;
-}
-export interface IChatAgentResultUsage {
-    promptTokens: number;
-    completionTokens: number;
-    promptTokenDetails?: readonly IChatAgentPromptTokenDetail[];
-}
 export interface IChatAgentResult {
     errorDetails?: IChatResponseErrorDetails;
     timings?: IChatAgentResultTimings;
@@ -185,8 +173,6 @@ export interface IChatAgentResult {
     };
     readonly details?: string;
     nextQuestion?: IChatQuestion;
-    /** Token usage information for this request */
-    readonly usage?: IChatAgentResultUsage;
 }
 export interface IChatAgentCompletionItem {
     id: string;
@@ -239,7 +225,7 @@ export declare class ChatAgentService extends Disposable implements IChatAgentSe
     agentHasDupeName(id: string): boolean;
     invokeAgent(id: string, request: IChatAgentRequest, progress: (parts: IChatProgress[]) => void, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<IChatAgentResult>;
     setRequestTools(id: string, requestId: string, tools: UserSelectedTools): void;
-    setYieldRequested(id: string, requestId: string): void;
+    setYieldRequested(id: string, requestId: string, value: boolean): void;
     getFollowups(id: string, request: IChatAgentRequest, result: IChatAgentResult, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<IChatFollowup[]>;
     getChatTitle(id: string, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<string | undefined>;
     getChatSummary(id: string, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<string | undefined>;
@@ -281,28 +267,19 @@ export declare class MergedChatAgent implements IChatAgent {
     }[];
     invoke(request: IChatAgentRequest, progress: (parts: IChatProgress[]) => void, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<IChatAgentResult>;
     setRequestTools(requestId: string, tools: UserSelectedTools): void;
-    setYieldRequested(requestId: string): void;
+    setYieldRequested(requestId: string, value: boolean): void;
     provideFollowups(request: IChatAgentRequest, result: IChatAgentResult, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<IChatFollowup[]>;
     toJSON(): IChatAgentData;
 }
 export declare class ChatAgentNameService implements IChatAgentNameService {
-    private readonly requestService;
-    private readonly logService;
-    private readonly storageService;
-    private static readonly StorageKey;
+    private readonly languageModelsService;
     _serviceBrand: undefined;
-    private readonly url;
-    private registry;
-    private disposed;
-    constructor(productService: IProductService, requestService: IRequestService, logService: ILogService, storageService: IStorageService);
-    private refresh;
-    private update;
+    constructor(languageModelsService: ILanguageModelsService);
     /**
      * Returns true if the agent is allowed to use this name
      */
     getAgentNameRestriction(chatAgentData: IChatAgentData): boolean;
     private checkAgentNameRestriction;
-    dispose(): void;
 }
 export declare function getFullyQualifiedId(chatAgentData: IChatAgentData): string;
 /**

package/vscode/src/vs/workbench/contrib/chat/common/participants/chatAgents.js

@@ -1,29 +1,19 @@
 
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
 import { findLast } from '../../../../../base/common/arraysFind.js';
-import { timeout } from '../../../../../base/common/async.js';
-import { CancellationToken } from '../../../../../base/common/cancellation.js';
 import { Emitter } from '../../../../../base/common/event.js';
 import { Iterable } from '../../../../../base/common/iterator.js';
 import { Disposable, toDisposable } from '../../../../../base/common/lifecycle.js';
 import { revive } from '../../../../../base/common/marshalling.js';
-import '../../../../../base/common/observableInternal/index.js';
 import { equalsIgnoreCase } from '../../../../../base/common/strings.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.service.js';
 import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
 import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.service.js';
 import { ExtensionIdentifier } from '../../../../../platform/extensions/common/extensions.js';
-import { ILogService } from '../../../../../platform/log/common/log.service.js';
-import { IProductService } from '../../../../../platform/product/common/productService.service.js';
-import { asJson } from '../../../../../platform/request/common/request.js';
-import { IRequestService } from '../../../../../platform/request/common/request.service.js';
-import { StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
-import { IStorageService } from '../../../../../platform/storage/common/storage.service.js';
 import { ChatContextKeys } from '../actions/chatContextKeys.js';
 import { ChatAgentLocation, ChatModeKind, ChatConfiguration } from '../constants.js';
-import { observableValue } from '../../../../../base/common/observableInternal/observables/observableValue.js';
+import { ILanguageModelsService } from '../languageModels.service.js';
 
-var ChatAgentNameService_1;
 let ChatAgentService = class ChatAgentService extends Disposable {
     static {
         this.AGENT_LEADER = "@";
@@ -33,7 +23,7 @@ let ChatAgentService = class ChatAgentService extends Disposable {
         this.contextKeyService = contextKeyService;
         this.configurationService = configurationService;
         this._agents = ( new Map());
-        this._onDidChangeAgents = ( new Emitter());
+        this._onDidChangeAgents = this._register(( new Emitter()));
         this.onDidChangeAgents = this._onDidChangeAgents.event;
         this._agentsContextKeys = ( new Set());
         this._hasToolsAgent = false;
@@ -237,12 +227,12 @@ let ChatAgentService = class ChatAgentService extends Disposable {
         }
         data.impl.setRequestTools?.(requestId, tools);
     }
-    setYieldRequested(id, requestId) {
+    setYieldRequested(id, requestId, value) {
         const data = this._agents.get(id);
         if (!data?.impl) {
             return;
         }
-        data.impl.setYieldRequested?.(requestId);
+        data.impl.setYieldRequested?.(requestId, value);
     }
     async getFollowups(id, request, result, history, token) {
         const data = this._agents.get(id);
@@ -381,8 +371,8 @@ class MergedChatAgent {
     setRequestTools(requestId, tools) {
         this.impl.setRequestTools?.(requestId, tools);
     }
-    setYieldRequested(requestId) {
-        this.impl.setYieldRequested?.(requestId);
+    setYieldRequested(requestId, value) {
+        this.impl.setYieldRequested?.(requestId, value);
     }
     async provideFollowups(request, result, history, token) {
         if (this.impl.provideFollowups) {
@@ -395,58 +385,8 @@ class MergedChatAgent {
     }
 }
 let ChatAgentNameService = class ChatAgentNameService {
-    static {
-        ChatAgentNameService_1 = this;
-    }
-    static {
-        this.StorageKey = "chat.participantNameRegistry";
-    }
-    constructor(productService, requestService, logService, storageService) {
-        this.requestService = requestService;
-        this.logService = logService;
-        this.storageService = storageService;
-        this.registry = observableValue(this, Object.create(null));
-        this.disposed = false;
-        if (!productService.chatParticipantRegistry) {
-            return;
-        }
-        this.url = productService.chatParticipantRegistry;
-        const raw = storageService.get(ChatAgentNameService_1.StorageKey, StorageScope.APPLICATION);
-        try {
-            this.registry.set(JSON.parse(raw ?? "{}"), undefined);
-        } catch (err) {
-            storageService.remove(ChatAgentNameService_1.StorageKey, StorageScope.APPLICATION);
-        }
-        this.refresh();
-    }
-    refresh() {
-        if (this.disposed) {
-            return;
-        }
-        this.update().catch(
-            err => this.logService.warn("Failed to fetch chat participant registry", err)
-        ).then(() => timeout(5 * 60 * 1000)).then(() => this.refresh());
-    }
-    async update() {
-        const context = await this.requestService.request({
-            type: "GET",
-            url: this.url
-        }, CancellationToken.None);
-        if (context.res.statusCode !== 200) {
-            throw ( new Error("Could not get extensions report."));
-        }
-        const result = await asJson(context);
-        if (!result || result.version !== 1) {
-            throw ( new Error("Unexpected chat participant registry response."));
-        }
-        const registry = result.restrictedChatParticipants;
-        this.registry.set(registry, undefined);
-        this.storageService.store(
-            ChatAgentNameService_1.StorageKey,
-            JSON.stringify(registry),
-            StorageScope.APPLICATION,
-            StorageTarget.MACHINE
-        );
+    constructor(languageModelsService) {
+        this.languageModelsService = languageModelsService;
     }
     getAgentNameRestriction(chatAgentData) {
         if (chatAgentData.isCore) {
@@ -457,7 +397,7 @@ let ChatAgentNameService = class ChatAgentNameService {
         return nameAllowed && fullNameAllowed;
     }
     checkAgentNameRestriction(name, chatAgentData) {
-        const allowList = ( this.registry.map(registry => registry[name.toLowerCase()]));
+        const allowList = ( this.languageModelsService.restrictedChatParticipants.map(registry => registry[name.toLowerCase()]));
         return ( allowList.map(allowList => {
             if (!allowList) {
                 return true;
@@ -468,11 +408,8 @@ let ChatAgentNameService = class ChatAgentNameService {
             )));
         }));
     }
-    dispose() {
-        this.disposed = true;
-    }
 };
-ChatAgentNameService = ChatAgentNameService_1 = ( __decorate([( __param(0, IProductService)), ( __param(1, IRequestService)), ( __param(2, ILogService)), ( __param(3, IStorageService))], ChatAgentNameService));
+ChatAgentNameService = ( __decorate([( __param(0, ILanguageModelsService))], ChatAgentNameService));
 function getFullyQualifiedId(chatAgentData) {
     return `${chatAgentData.extensionId.value}.${chatAgentData.id}`;
 }

package/vscode/src/vs/workbench/contrib/chat/common/participants/chatAgents.service.d.ts

@@ -27,7 +27,7 @@ export interface IChatAgentService {
     hasChatParticipantDetectionProviders(): boolean;
     invokeAgent(agent: string, request: IChatAgentRequest, progress: (parts: IChatProgress[]) => void, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<IChatAgentResult>;
     setRequestTools(agent: string, requestId: string, tools: UserSelectedTools): void;
-    setYieldRequested(agent: string, requestId: string): void;
+    setYieldRequested(agent: string, requestId: string, value: boolean): void;
     getFollowups(id: string, request: IChatAgentRequest, result: IChatAgentResult, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<IChatFollowup[]>;
     getChatTitle(id: string, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<string | undefined>;
     getChatSummary(id: string, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<string | undefined>;

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

@@ -0,0 +1,23 @@
+import { MarketplaceType } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/workbench/contrib/chat/common/plugins/pluginMarketplaceService";
+/**
+ * Options for ensuring a marketplace repository is available locally.
+ */
+export interface IEnsureRepositoryOptions {
+    /** Optional progress notification title shown during clone. */
+    readonly progressTitle?: string;
+    /** Label used in clone failure messaging. */
+    readonly failureLabel?: string;
+    /** Marketplace type metadata to persist in the marketplace index. */
+    readonly marketplaceType?: MarketplaceType;
+}
+/**
+ * Options for pulling the latest changes from a cloned marketplace repository.
+ */
+export interface IPullRepositoryOptions {
+    /** Optional plugin name used in progress messaging. */
+    readonly pluginName?: string;
+    /** Label used in pull failure messaging. */
+    readonly failureLabel?: string;
+    /** Marketplace type metadata for repository index updates. */
+    readonly marketplaceType?: MarketplaceType;
+}

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

@@ -0,0 +1,29 @@
+import { URI } from "../../../../../base/common/uri.js";
+import { IEnsureRepositoryOptions, IPullRepositoryOptions } from "./agentPluginRepositoryService.js";
+import { IMarketplaceReference, MarketplaceType, IMarketplacePlugin } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/workbench/contrib/chat/common/plugins/pluginMarketplaceService";
+export declare const IAgentPluginRepositoryService: import("../../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IAgentPluginRepositoryService>;
+/**
+* Manages cloning, cache location resolution, and update operations for
+* agent plugin marketplace repositories.
+*/
+export interface IAgentPluginRepositoryService {
+    readonly _serviceBrand: undefined;
+    /**
+    * Returns the local cache URI for a marketplace repository reference.
+    * Uses a storage-backed marketplace index when available.
+    */
+    getRepositoryUri(marketplace: IMarketplaceReference, marketplaceType?: MarketplaceType): URI;
+    /**
+    * Returns the local install URI for a plugin source directory inside its
+    * marketplace repository cache.
+    */
+    getPluginInstallUri(plugin: IMarketplacePlugin): URI;
+    /**
+    * Ensures a marketplace repository is cloned locally and returns its cache URI.
+    */
+    ensureRepository(marketplace: IMarketplaceReference, options?: IEnsureRepositoryOptions): Promise<URI>;
+    /**
+    * Pulls latest changes for a cloned marketplace repository.
+    */
+    pullRepository(marketplace: IMarketplaceReference, options?: IPullRepositoryOptions): Promise<void>;
+}

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

@@ -0,0 +1,6 @@
+
+import { createDecorator } from '../../../../../platform/instantiation/common/instantiation.js';
+
+const IAgentPluginRepositoryService = ( createDecorator("agentPluginRepositoryService"));
+
+export { IAgentPluginRepositoryService };

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

@@ -0,0 +1,10 @@
+import { IObservable } from "../../../../../base/common/observable.js";
+import { URI } from "../../../../../base/common/uri.js";
+import { IAgentPlugin } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginService";
+export declare const IAgentPluginService: import("../../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IAgentPluginService>;
+export interface IAgentPluginService {
+    readonly _serviceBrand: undefined;
+    readonly plugins: IObservable<readonly IAgentPlugin[]>;
+    readonly allPlugins: IObservable<readonly IAgentPlugin[]>;
+    setPluginEnabled(pluginUri: URI, enabled: boolean): void;
+}

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

@@ -0,0 +1,6 @@
+
+import { createDecorator } from '../../../../../platform/instantiation/common/instantiation.js';
+
+const IAgentPluginService = ( createDecorator("agentPluginService"));
+
+export { IAgentPluginService };

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

@@ -0,0 +1,24 @@
+import { URI } from "../../../../../base/common/uri.js";
+import { IMarketplacePlugin } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/workbench/contrib/chat/common/plugins/pluginMarketplaceService";
+export declare const IPluginInstallService: import("../../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IPluginInstallService>;
+export interface IPluginInstallService {
+    readonly _serviceBrand: undefined;
+    /**
+    * Clones the marketplace repository (if not already cached) and registers
+    * the plugin's source directory in the user's `chat.plugins.paths` config.
+    */
+    installPlugin(plugin: IMarketplacePlugin): Promise<void>;
+    /**
+    * Removes the plugin from `chat.plugins.paths` config.
+    */
+    uninstallPlugin(pluginUri: URI): Promise<void>;
+    /**
+    * Pulls the latest changes for an already-cloned marketplace repository.
+    */
+    updatePlugin(plugin: IMarketplacePlugin): Promise<void>;
+    /**
+    * Returns the URI where a marketplace plugin would be installed on disk.
+    * Used to determine whether a marketplace plugin is already installed.
+    */
+    getPluginInstallUri(plugin: IMarketplacePlugin): URI;
+}

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

@@ -0,0 +1,6 @@
+
+import { createDecorator } from '../../../../../platform/instantiation/common/instantiation.js';
+
+const IPluginInstallService = ( createDecorator("pluginInstallService"));
+
+export { IPluginInstallService };

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

@@ -0,0 +1,11 @@
+import { CancellationToken } from "../../../../../base/common/cancellation.js";
+import { Event } from "../../../../../base/common/event.js";
+import { URI } from "../../../../../base/common/uri.js";
+import { IMarketplacePlugin } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/workbench/contrib/chat/common/plugins/pluginMarketplaceService";
+export declare const IPluginMarketplaceService: import("../../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IPluginMarketplaceService>;
+export interface IPluginMarketplaceService {
+    readonly _serviceBrand: undefined;
+    readonly onDidChangeMarketplaces: Event<void>;
+    fetchMarketplacePlugins(token: CancellationToken): Promise<IMarketplacePlugin[]>;
+    getMarketplacePluginMetadata(pluginUri: URI): Promise<IMarketplacePlugin | undefined>;
+}

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

@@ -0,0 +1,6 @@
+
+import { createDecorator } from '../../../../../platform/instantiation/common/instantiation.js';
+
+const IPluginMarketplaceService = ( createDecorator("pluginMarketplaceService"));
+
+export { IPluginMarketplaceService };

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

@@ -1,9 +1,12 @@
 import { CancellationToken } from "../../../../../base/common/cancellation.js";
 import { ResourceSet } from "../../../../../base/common/map.js";
+import { OperatingSystem } from "../../../../../base/common/platform.js";
+import { URI } from "../../../../../base/common/uri.js";
 import { IConfigurationService } from "../../../../../platform/configuration/common/configuration.service.js";
 import { IFileService } from "../../../../../platform/files/common/files.service.js";
 import { ILabelService } from "../../../../../platform/label/common/label.service.js";
 import { ILogService } from "../../../../../platform/log/common/log.service.js";
+import { IRemoteAgentService } from "../../../../services/remote/common/remoteAgentService.service.js";
 import { ITelemetryService } from "../../../../../platform/telemetry/common/telemetry.service.js";
 import { IWorkspaceContextService } from "../../../../../platform/workspace/common/workspace.service.js";
 import { ChatRequestVariableSet } from "../attachments/chatVariableEntries.js";
@@ -27,16 +30,18 @@ export declare class ComputeAutomaticInstructions {
     private readonly _modeKind;
     private readonly _enabledTools;
     private readonly _enabledSubagents;
+    private readonly _sessionResource;
     private readonly _promptsService;
     readonly _logService: ILogService;
     private readonly _labelService;
     private readonly _configurationService;
     private readonly _workspaceService;
     private readonly _fileService;
+    private readonly _remoteAgentService;
     private readonly _telemetryService;
     private readonly _languageModelToolsService;
     private _parseResults;
-    constructor(_modeKind: ChatModeKind, _enabledTools: UserSelectedTools | undefined, _enabledSubagents: (readonly string[]) | undefined, _promptsService: IPromptsService, _logService: ILogService, _labelService: ILabelService, _configurationService: IConfigurationService, _workspaceService: IWorkspaceContextService, _fileService: IFileService, _telemetryService: ITelemetryService, _languageModelToolsService: ILanguageModelToolsService);
+    constructor(_modeKind: ChatModeKind, _enabledTools: UserSelectedTools | undefined, _enabledSubagents: (readonly string[]) | undefined, _sessionResource: URI | undefined, _promptsService: IPromptsService, _logService: ILogService, _labelService: ILabelService, _configurationService: IConfigurationService, _workspaceService: IWorkspaceContextService, _fileService: IFileService, _remoteAgentService: IRemoteAgentService, _telemetryService: ITelemetryService, _languageModelToolsService: ILanguageModelToolsService);
     private _parseInstructionsFile;
     collect(variables: ChatRequestVariableSet, token: CancellationToken): Promise<void>;
     private sendTelemetry;
@@ -58,3 +63,4 @@ export declare class ComputeAutomaticInstructions {
     private _getInstructionsWithPatternsList;
     private _addReferencedInstructions;
 }
+export declare function getFilePath(uri: URI, remoteOS: OperatingSystem | undefined): string;

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

@@ -3,12 +3,14 @@ import { __decorate, __param } from '../../../../../../../../external/tslib/tsli
 import { splitGlobAware, match } from '../../../../../base/common/glob.js';
 import { ResourceMap, ResourceSet } from '../../../../../base/common/map.js';
 import { Schemas } from '../../../../../base/common/network.js';
+import { OperatingSystem } from '../../../../../base/common/platform.js';
 import { dirname, basename } from '../../../../../base/common/resources.js';
 import { localize } from '../../../../../nls.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.service.js';
 import { IFileService } from '../../../../../platform/files/common/files.service.js';
 import { ILabelService } from '../../../../../platform/label/common/label.service.js';
 import { ILogService } from '../../../../../platform/log/common/log.service.js';
+import { IRemoteAgentService } from '../../../../services/remote/common/remoteAgentService.service.js';
 import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.service.js';
 import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.service.js';
 import { toPromptFileVariableEntry, PromptFileVariableKind, isPromptFileVariableEntry, IChatRequestVariableEntry, ChatRequestVariableSet, toToolVariableEntry, toPromptTextVariableEntry } from '../attachments/chatVariableEntries.js';
@@ -16,7 +18,6 @@ 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 { PromptsType } from './promptTypes.js';
 import { AgentFileType } from './service/promptsService.js';
 import { IPromptsService } from './service/promptsService.service.js';
 import { OffsetRange } from '../../../../../editor/common/core/ranges/offsetRange.js';
@@ -39,24 +40,28 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
         _modeKind,
         _enabledTools,
         _enabledSubagents,
+        _sessionResource,
         _promptsService,
         _logService,
         _labelService,
         _configurationService,
         _workspaceService,
         _fileService,
+        _remoteAgentService,
         _telemetryService,
         _languageModelToolsService
     ) {
         this._modeKind = _modeKind;
         this._enabledTools = _enabledTools;
         this._enabledSubagents = _enabledSubagents;
+        this._sessionResource = _sessionResource;
         this._promptsService = _promptsService;
         this._logService = _logService;
         this._labelService = _labelService;
         this._configurationService = _configurationService;
         this._workspaceService = _workspaceService;
         this._fileService = _fileService;
+        this._remoteAgentService = _remoteAgentService;
         this._telemetryService = _telemetryService;
         this._languageModelToolsService = _languageModelToolsService;
         this._parseResults = ( new ResourceMap());
@@ -78,7 +83,7 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
         }
     }
     async collect(variables, token) {
-        const instructionFiles = await this._promptsService.listPromptFiles(PromptsType.instructions, token);
+        const instructionFiles = await this._promptsService.getInstructionFiles(token, this._sessionResource);
         this._logService.trace(
             `[InstructionsContextComputer] ${instructionFiles.length} instruction files available.`
         );
@@ -133,8 +138,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(6370, "Automatically attached as pattern is **")) : ( localize(
-                    6371,
+                const reason = !match.file ? ( localize(6925, "Automatically attached as pattern is **")) : ( localize(
+                    6926,
                     "Automatically attached as pattern {0} matches {1}",
                     pattern,
                     this._labelService.getUriLabel(match.file, {
@@ -263,6 +268,9 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
     async _getInstructionsWithPatternsList(instructionFiles, _existingVariables, telemetryEvent, token) {
         const readTool = this._getTool("readFile");
         const runSubagentTool = this._getTool(VSCodeToolReference.runSubagent);
+        const remoteEnv = await this._remoteAgentService.getEnvironment();
+        const remoteOS = remoteEnv?.os;
+        const filePath = uri => getFilePath(uri, remoteOS);
         const entries = [];
         if (readTool) {
             const searchNestedAgentMd = this._configurationService.getValue(PromptsConfig.USE_NESTED_AGENT_MD);
@@ -297,13 +305,13 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
                         if (description) {
                             entries.push(`<description>${description}</description>`);
                         }
-                        entries.push(`<file>${getFilePath(uri)}</file>`);
+                        entries.push(`<file>${filePath(uri)}</file>`);
                         const applyToPattern = this._getApplyToPattern(applyTo, paths);
                         if (applyToPattern) {
                             entries.push(`<applyTo>${applyToPattern}</applyTo>`);
                         }
                     } else {
-                        entries.push(`<file>${getFilePath(uri)}</file>`);
+                        entries.push(`<file>${filePath(uri)}</file>`);
                     }
                     entries.push("</instruction>");
                     hasContent = true;
@@ -316,10 +324,10 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
                 const folderName = this._labelService.getUriLabel(dirname(uri), {
                     relative: true
                 });
-                const description = folderName.trim().length === 0 ? ( localize(6372, "Instructions for the workspace")) : ( localize(6373, "Instructions for folder '{0}'", folderName));
+                const description = folderName.trim().length === 0 ? ( localize(6927, "Instructions for the workspace")) : ( localize(6928, "Instructions for folder '{0}'", folderName));
                 entries.push("<instruction>");
                 entries.push(`<description>${description}</description>`);
-                entries.push(`<file>${getFilePath(uri)}</file>`);
+                entries.push(`<file>${filePath(uri)}</file>`);
                 entries.push("</instruction>");
                 hasContent = true;
             }
@@ -328,9 +336,9 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
             } else {
                 entries.push("</instructions>", "", "");
             }
-            const agentSkills = await this._promptsService.findAgentSkills(token);
-            const modelInvokableSkills = agentSkills?.filter(skill => !skill.disableModelInvocation);
-            if (modelInvokableSkills && modelInvokableSkills.length > 0) {
+            const agentSkills = await this._promptsService.findAgentSkills(token, this._sessionResource);
+            const modelInvocableSkills = agentSkills?.filter(skill => !skill.disableModelInvocation);
+            if (modelInvocableSkills && modelInvocableSkills.length > 0) {
                 const useSkillAdherencePrompt = this._configurationService.getValue(PromptsConfig.USE_SKILL_ADHERENCE_PROMPT);
                 entries.push("<skills>");
                 if (useSkillAdherencePrompt) {
@@ -375,13 +383,13 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
                         `When a user asks you to perform a task that falls within the domain of a skill, use the ${readTool.variable} tool to acquire the full instructions from the file URI.`
                     );
                 }
-                for (const skill of modelInvokableSkills) {
+                for (const skill of modelInvocableSkills) {
                     entries.push("<skill>");
                     entries.push(`<name>${skill.name}</name>`);
                     if (skill.description) {
                         entries.push(`<description>${skill.description}</description>`);
                     }
-                    entries.push(`<file>${getFilePath(skill.uri)}</file>`);
+                    entries.push(`<file>${filePath(skill.uri)}</file>`);
                     entries.push("</skill>");
                 }
                 entries.push("</skills>", "", "");
@@ -390,13 +398,13 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
         if (runSubagentTool && this._configurationService.getValue(ChatConfiguration.SubagentToolCustomAgents)) {
             const canUseAgent = (() => {
                 if (!this._enabledSubagents || this._enabledSubagents.includes("*")) {
-                    return agent => agent.visibility.agentInvokable;
+                    return agent => agent.visibility.agentInvocable;
                 } else {
                     const subagents = this._enabledSubagents;
                     return agent => subagents.includes(agent.name);
                 }
             })();
-            const agents = await this._promptsService.getCustomAgents(token);
+            const agents = await this._promptsService.getCustomAgents(token, this._sessionResource);
             if (agents.length > 0) {
                 entries.push("<agents>");
                 entries.push("Here is a list of agents that can be used when running a subagent.");
@@ -484,7 +492,7 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
                             if (isPromptOrInstructionsFile(uri)) {
                                 todo.push(uri);
                             }
-                            const reason = ( localize(6374, "Referenced by {0}", basename(next)));
+                            const reason = ( localize(6929, "Referenced by {0}", basename(next)));
                             attachedContext.add(
                                 toPromptFileVariableEntry(uri, PromptFileVariableKind.InstructionReference, reason, true)
                             );
@@ -498,12 +506,19 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
         }
     }
 };
-ComputeAutomaticInstructions = ( __decorate([( __param(3, IPromptsService)), ( __param(4, ILogService)), ( __param(5, ILabelService)), ( __param(6, IConfigurationService)), ( __param(7, IWorkspaceContextService)), ( __param(8, IFileService)), ( __param(9, ITelemetryService)), ( __param(10, ILanguageModelToolsService))], ComputeAutomaticInstructions));
-function getFilePath(uri) {
+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))], ComputeAutomaticInstructions));
+function getFilePath(uri, remoteOS) {
     if (uri.scheme === Schemas.file || uri.scheme === Schemas.vscodeRemote) {
-        return uri.fsPath;
+        const fsPath = uri.fsPath;
+        if (remoteOS !== undefined) {
+            if (remoteOS === OperatingSystem.Windows) {
+                return fsPath.replace(/\//g, "\\");
+            }
+            return fsPath.replace(/\\/g, "/");
+        }
+        return fsPath;
     }
     return ( uri.toString());
 }
 
-export { ComputeAutomaticInstructions, newInstructionsCollectionEvent };
+export { ComputeAutomaticInstructions, getFilePath, newInstructionsCollectionEvent };

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

@@ -83,7 +83,8 @@ export declare enum PromptFileSource {
     ConfigWorkspace = "config-workspace",
     ConfigPersonal = "config-personal",
     ExtensionContribution = "extension-contribution",
-    ExtensionAPI = "extension-api"
+    ExtensionAPI = "extension-api",
+    Plugin = "plugin"
 }
 /**
  * Prompt source folder path with source and storage type.