@codingame/monaco-vscode-chat-service-override 37.0.0 → 37.2.0

package/vscode/src/vs/workbench/contrib/chat/browser/agentPluginsView.js

@@ -46,7 +46,7 @@ import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbenc
 import { IAgentPluginService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginService.service';
 import { isContributionEnabled } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/enablement';
 import { IPluginInstallService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginInstallService.service';
-import { hasSourceChanged } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginMarketplaceService';
+import { hasSourceChanged } from '../common/plugins/pluginMarketplaceService.js';
 import { IPluginMarketplaceService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginMarketplaceService.service';
 import { AgentPluginEditorInput } from './agentPluginEditor/agentPluginEditorInput.js';
 import { AgentPluginItemKind } from './agentPluginEditor/agentPluginItems.js';
@@ -98,7 +98,7 @@ let UpdatePluginAction = class UpdatePluginAction extends Action {
         pluginInstallService,
         pluginMarketplaceService
     ) {
-        super(UpdatePluginAction_1.ID, ( localize(5917, "Update")), "extension-action label prominent install");
+        super(UpdatePluginAction_1.ID, ( localize(5969, "Update")), "extension-action label prominent install");
         this.plugin = plugin;
         this.liveMarketplacePlugin = liveMarketplacePlugin;
         this.pluginInstallService = pluginInstallService;
@@ -126,7 +126,7 @@ let ManagePluginAction = class ManagePluginAction extends Action {
         this.getActionGroups = getActionGroups;
         this.instantiationService = instantiationService;
         this._actionViewItem = null;
-        this.tooltip = ( localize(5918, "Manage"));
+        this.tooltip = ( localize(5970, "Manage"));
     }
     createActionViewItem(options) {
         this._actionViewItem = this.instantiationService.createInstance(DropDownActionViewItem, this, options);
@@ -355,7 +355,7 @@ let AgentPluginsListView = class AgentPluginsListView extends AbstractExtensions
                         return item?.name ?? "";
                     },
                     getWidgetAriaLabel() {
-                        return localize(5919, "Agent Plugins");
+                        return localize(5971, "Agent Plugins");
                     }
                 },
                 overrideStyles: getLocationBasedViewColors(this.viewDescriptorService.getViewLocationById(this.id)).listOverrideStyles
@@ -530,7 +530,7 @@ let AgentPluginsListView = class AgentPluginsListView extends AbstractExtensions
             this.bodyTemplate.pluginsList.classList.toggle("hidden", count === 0);
             this.bodyTemplate.messageContainer.classList.toggle("hidden", count > 0);
             if (count === 0 && this.isBodyVisible()) {
-                this.bodyTemplate.messageBox.textContent = ( localize(5920, "No agent plugins found."));
+                this.bodyTemplate.messageBox.textContent = ( localize(5972, "No agent plugins found."));
             }
         }
     }
@@ -540,8 +540,8 @@ class AgentPluginsBrowseCommand extends Action2 {
     constructor() {
         super({
             id: "workbench.agentPlugins.browse",
-            title: ( localize2(5921, "Agent Plugins")),
-            tooltip: ( localize2(5922, "Browse Agent Plugins")),
+            title: ( localize2(5973, "Agent Plugins")),
+            tooltip: ( localize2(5974, "Browse Agent Plugins")),
             icon: Codicon.search,
             precondition: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()))),
             menu: [{
@@ -564,8 +564,8 @@ class RefreshPluginMarketplacesCommand extends Action2 {
     constructor() {
         super({
             id: RefreshAgentPluginMarketplacesCommandId,
-            title: ( localize2(5923, "Refresh Plugin Marketplaces")),
-            category: ( localize2(5924, "Chat")),
+            title: ( localize2(5975, "Refresh Plugin Marketplaces")),
+            category: ( localize2(5976, "Chat")),
             icon: Codicon.refresh,
             precondition: ChatContextKeys.enabled,
             f1: true
@@ -580,7 +580,7 @@ class RefreshPluginMarketplacesCommand extends Action2 {
         try {
             await progressService.withProgress({
                 location: ProgressLocation.Notification,
-                title: ( localize(5925, "Refreshing plugin marketplaces...")),
+                title: ( localize(5977, "Refreshing plugin marketplaces...")),
                 cancellable: true
             }, () => marketplaceService.fetchMarketplacePlugins(cts.token, undefined, {
                 refresh: true,
@@ -591,16 +591,16 @@ class RefreshPluginMarketplacesCommand extends Action2 {
             }
             if (failedLabels.length > 0) {
                 notificationService.warn(( localize(
-                    5926,
+                    5978,
                     "Refreshed plugin marketplaces, but {0} could not be read: {1}",
                     failedLabels.length,
                     failedLabels.join(", ")
                 )));
             } else {
-                notificationService.info(( localize(5927, "Plugin marketplaces refreshed.")));
+                notificationService.info(( localize(5979, "Plugin marketplaces refreshed.")));
             }
         } catch (error) {
-            notificationService.error(( localize(5928, "Failed to refresh plugin marketplaces: {0}", getErrorMessage(error))));
+            notificationService.error(( localize(5980, "Failed to refresh plugin marketplaces: {0}", getErrorMessage(error))));
             throw error;
         } finally {
             cts.dispose();
@@ -621,7 +621,7 @@ let AgentPluginsViewsContribution = class AgentPluginsViewsContribution extends
         registerAction2(RefreshPluginMarketplacesCommand);
         ( Registry.as(Extensions.ViewsRegistry)).registerViews([{
             id: InstalledAgentPluginsViewId,
-            name: ( localize2(5929, "Agent Plugins - Installed")),
+            name: ( localize2(5981, "Agent Plugins - Installed")),
             ctorDescriptor: ( new SyncDescriptor(AgentPluginsListView, [{
                 installedOnly: true
             }])),
@@ -631,7 +631,7 @@ let AgentPluginsViewsContribution = class AgentPluginsViewsContribution extends
             canToggleVisibility: true
         }, {
             id: "workbench.views.agentPlugins.default.marketplace",
-            name: ( localize2(5930, "Agent Plugins")),
+            name: ( localize2(5982, "Agent Plugins")),
             ctorDescriptor: ( new SyncDescriptor(AgentPluginsListView, [{}])),
             when: ( ContextKeyExpr.and(DefaultViewsContext, ( HasInstalledAgentPluginsContext.toNegated()), ( ChatContextKeys.Setup.hidden.negate()))),
             weight: 30,
@@ -640,7 +640,7 @@ let AgentPluginsViewsContribution = class AgentPluginsViewsContribution extends
             hideByDefault: true
         }, {
             id: "workbench.views.agentPlugins.marketplace",
-            name: ( localize2(5930, "Agent Plugins")),
+            name: ( localize2(5982, "Agent Plugins")),
             ctorDescriptor: ( new SyncDescriptor(AgentPluginsListView, [{}])),
             when: ( ContextKeyExpr.and(SearchAgentPluginsContext, ( ChatContextKeys.Setup.hidden.negate())))
         }], VIEW_CONTAINER);

package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentCustomizationContentExpander.d.ts

@@ -0,0 +1,34 @@
+import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
+import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
+import { AICustomizationSource } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/aiCustomizationWorkspaceService";
+import { ICustomizationItem } from "../../../common/customizationHarnessService.js";
+/**
+ * Expands plugin roots into individual customization items by scanning the
+ * canonical subfolders (agents/skills/commands/rules).
+ */
+export declare class AgentCustomizationContentExpander {
+    private readonly fileService;
+    private readonly logService;
+    constructor(fileService: IFileService, logService: ILogService);
+    expandPluginContents(pluginUri: URI, groupKey: string, isBundleItem: boolean, source: AICustomizationSource, pluginLabel: string | undefined, token: CancellationToken): Promise<readonly ICustomizationItem[]>;
+    /**
+     * Emits one item per skill subfolder that contains a SKILL.md file.
+     * The skill metadata comes from SKILL.md frontmatter.
+     */
+    private collectFromSkillDir;
+    /**
+     * Emits one item per markdown file for agent/rules/command folders.
+     * Agents and instructions read frontmatter name/description, and
+     * agents additionally surface userInvocable. Instruction (rules)
+     * folders additionally accept `.mdc` files per the Open Plugins spec.
+     */
+    private collectFromRegularDir;
+    /**
+     * Reads a prompt markdown file and returns selected frontmatter
+     * metadata. Returns `undefined` when the file is not markdown, or
+     * when it cannot be read/parsed.
+     */
+    private readPromptMetadata;
+}

package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentCustomizationContentExpander.js

@@ -0,0 +1,229 @@
+
+import { isCancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
+import { extname } from '@codingame/monaco-vscode-api/vscode/vs/base/common/path';
+import { joinPath } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { parseFrontMatter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/yaml';
+import { toFileOperationResult, FileOperationResult } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files';
+import { SKILL_FILENAME } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
+import { PromptsType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
+
+class AgentCustomizationContentExpander {
+    constructor(fileService, logService) {
+        this.fileService = fileService;
+        this.logService = logService;
+    }
+    async expandPluginContents(pluginUri, groupKey, isBundleItem, source, pluginLabel, token) {
+        const fsRoot = pluginUri;
+        const children = [];
+        try {
+            if (!(await this.fileService.canHandleResource(fsRoot))) {
+                return [];
+            }
+            if (token.isCancellationRequested) {
+                return [];
+            }
+            const dirNames = ["agents", "skills", "commands", "rules"];
+            const promptTypes = [
+                PromptsType.agent,
+                PromptsType.skill,
+                PromptsType.prompt,
+                PromptsType.instructions
+            ];
+            const stats = await Promise.all(( dirNames.map(async name => {
+                const resource = URI.joinPath(fsRoot, name);
+                try {
+                    return await this.fileService.resolve(resource);
+                } catch (err) {
+                    if (!isExpectedFileAccessError(err, token)) {
+                        this.logService.trace(
+                            `[AgentCustomizationContentExpander] Failed to resolve customization directory ${( resource.toString())}: ${err}`
+                        );
+                    }
+                    return undefined;
+                }
+            })));
+            if (token.isCancellationRequested) {
+                return [];
+            }
+            for (let i = 0; i < dirNames.length; i++) {
+                const stat = stats[i];
+                const promptType = promptTypes[i];
+                if (!stat?.isDirectory || !stat.children) {
+                    continue;
+                }
+                if (promptType === PromptsType.skill) {
+                    children.push(...(await this.collectFromSkillDir(
+                        stat.children,
+                        pluginUri,
+                        source,
+                        groupKey,
+                        isBundleItem,
+                        pluginLabel,
+                        token
+                    )));
+                } else {
+                    children.push(...(await this.collectFromRegularDir(
+                        stat.children,
+                        pluginUri,
+                        source,
+                        promptType,
+                        groupKey,
+                        isBundleItem,
+                        pluginLabel,
+                        token
+                    )));
+                }
+            }
+            children.sort((a, b) => `${a.type}:${a.name}`.localeCompare(`${b.type}:${b.name}`));
+        } catch (err) {
+            if (!isExpectedFileAccessError(err, token)) {
+                this.logService.trace(
+                    `[AgentCustomizationContentExpander] Failed to expand plugin ${( pluginUri.toString())}: ${err}`
+                );
+            }
+            return [];
+        }
+        return children;
+    }
+    async collectFromSkillDir(entries, pluginUri, source, groupKey, isBundleItem, pluginLabel, token) {
+        const eligible = [];
+        const readMetaDataPromises = [];
+        for (const child of entries) {
+            if (child.name.startsWith(".")) {
+                continue;
+            }
+            if (!child.isDirectory) {
+                continue;
+            }
+            eligible.push(child);
+            readMetaDataPromises.push(this.readPromptMetadata(joinPath(child.resource, SKILL_FILENAME), token));
+        }
+        const promptMetadata = await Promise.all(readMetaDataPromises);
+        if (token.isCancellationRequested) {
+            return [];
+        }
+        const items = [];
+        for (let i = 0; i < eligible.length; i++) {
+            const child = eligible[i];
+            const meta = promptMetadata[i];
+            if (!meta) {
+                continue;
+            }
+            const uri = joinPath(child.resource, SKILL_FILENAME);
+            const name = meta.name ?? child.name;
+            const description = meta.description;
+            const userInvocable = meta.userInvocable;
+            items.push({
+                uri,
+                type: PromptsType.skill,
+                name: name,
+                description,
+                source,
+                groupKey,
+                extensionId: undefined,
+                pluginUri: isBundleItem ? undefined : pluginUri,
+                pluginLabel: isBundleItem ? undefined : pluginLabel,
+                userInvocable
+            });
+        }
+        return items;
+    }
+    async collectFromRegularDir(
+        entries,
+        pluginUri,
+        source,
+        promptType,
+        groupKey,
+        isBundleItem,
+        pluginLabel,
+        token
+    ) {
+        const eligible = [];
+        for (const child of entries) {
+            if (child.name.startsWith(".")) {
+                continue;
+            }
+            if (child.isDirectory) {
+                continue;
+            }
+            const ext = extname(child.name);
+            if (ext !== ".md" && !(promptType === PromptsType.instructions && ext === ".mdc")) {
+                continue;
+            }
+            eligible.push(child);
+        }
+        const parseMetadata = promptType === PromptsType.agent || promptType === PromptsType.instructions;
+        const promptMetadata = parseMetadata ? await Promise.all(( eligible.map(child => this.readPromptMetadata(child.resource, token)))) : undefined;
+        if (token.isCancellationRequested) {
+            return [];
+        }
+        const items = [];
+        for (let i = 0; i < eligible.length; i++) {
+            const child = eligible[i];
+            const meta = promptMetadata?.[i];
+            items.push({
+                uri: child.resource,
+                type: promptType,
+                name: meta?.name ?? stripPromptFileExtensions(child.name),
+                description: meta?.description,
+                source,
+                groupKey,
+                extensionId: undefined,
+                pluginUri: isBundleItem ? undefined : pluginUri,
+                pluginLabel: isBundleItem ? undefined : pluginLabel,
+                userInvocable: promptType === PromptsType.agent ? meta?.userInvocable : undefined
+            });
+        }
+        return items;
+    }
+    async readPromptMetadata(promptFileUri, token) {
+        if (extname(promptFileUri.path) !== ".md") {
+            return undefined;
+        }
+        try {
+            const content = await this.fileService.readFile(promptFileUri);
+            if (token.isCancellationRequested) {
+                return undefined;
+            }
+            const frontmatter = parseFrontMatter(( content.value.toString()));
+            if (frontmatter) {
+                const name = frontmatter.getStringValue("name");
+                const description = frontmatter.getStringValue("description");
+                const userInvocableStr = frontmatter.getStringValue("user-invocable");
+                const userInvocable = userInvocableStr === "true" ? true : userInvocableStr === "false" ? false : undefined;
+                return {
+                    name,
+                    description,
+                    userInvocable
+                };
+            }
+            return {
+                name: undefined,
+                description: undefined,
+                userInvocable: undefined
+            };
+        } catch (err) {
+            if (!isExpectedFileAccessError(err, token)) {
+                this.logService.trace(
+                    `[AgentCustomizationContentExpander] Failed to read prompt metadata ${( promptFileUri.toString())}: ${err}`
+                );
+            }
+            return undefined;
+        }
+    }
+}
+function isExpectedFileAccessError(error, token) {
+    return token.isCancellationRequested || isCancellationError(error) || toFileOperationResult(error) === FileOperationResult.FILE_NOT_FOUND;
+}
+function stripPromptFileExtensions(filename) {
+    const ext = extname(filename);
+    if (!ext) {
+        return filename;
+    }
+    const stem = filename.slice(0, -ext.length);
+    const dotInStem = stem.lastIndexOf(".");
+    return dotInStem > 0 ? stem.slice(0, dotInStem) : stem;
+}
+
+export { AgentCustomizationContentExpander };

package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentCustomizationItemProvider.d.ts

@@ -0,0 +1,57 @@
+import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
+import { type IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { type AgentCustomization, type ClientPluginCustomization, PluginCustomization } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/sessionState";
+import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
+import { ICustomizationItem, ICustomizationItemAction, ICustomizationItemProvider, ICustomizationSourceFolder } from "../../../common/customizationHarnessService.js";
+import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
+import { PromptsType } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes";
+import { IAgentHostCustomizationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostCustomizationService.service";
+import { type ISyncedCustomizationOrigin } from "./syncedCustomizationBundler.js";
+import { ICustomAgent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService";
+import { IPromptsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service";
+export declare class AgentCustomizationItemProvider extends Disposable implements ICustomizationItemProvider {
+    private readonly _connectionAuthority;
+    private readonly _getItemActions;
+    private readonly _resolveSyncedOrigin;
+    private readonly _fileService;
+    private readonly _logService;
+    private readonly _customAgentsService;
+    private readonly _promptsService;
+    private readonly _onDidChange;
+    readonly onDidChange: Event<void>;
+    /** Cache: pluginUri → last expansion (keyed by nonce and label so we re-fetch on content or display-name changes). */
+    private readonly _expansionCache;
+    private readonly _contentExpander;
+    private _draftCustomAgents;
+    private _draftCustomizations;
+    constructor(_connectionAuthority: string, _getItemActions: ((customization: PluginCustomization, clientId: string | undefined) => ICustomizationItemAction[] | undefined) | undefined, _resolveSyncedOrigin: ((syncedUri: URI) => ISyncedCustomizationOrigin | undefined) | undefined, _fileService: IFileService, _logService: ILogService, _customAgentsService: IAgentHostCustomizationService, _promptsService: IPromptsService);
+    setDraftCustomAgents(customAgents: IObservable<readonly AgentCustomization[]>): void;
+    setDraftCustomizations(customizations: IObservable<readonly ClientPluginCustomization[]>): void;
+    private toRemoteUri;
+    private toBadge;
+    private toItem;
+    private toDirectoryItems;
+    private toDirectoryChildItem;
+    provideSourceFolders(sessionResource: URI, type: PromptsType, token: CancellationToken): Promise<readonly ICustomizationSourceFolder[]>;
+    provideCustomAgents(sessionResource: URI): Promise<readonly ICustomAgent[]>;
+    provideChatSessionCustomizations(sessionResource: URI, token: CancellationToken): Promise<ICustomizationItem[]>;
+    private getCustomAgents;
+    private getCustomizations;
+    /**
+     * Rewrites a bundle child item to reflect the original source location of
+     * the flattened file, when it can be recovered from the synthetic bundle's
+     * reverse map. The synced (in-memory) URI is replaced with the real local
+     * URI so the item points at its true origin, and the source/extension/plugin
+     * metadata is restored. Returns the item unchanged when no origin is known.
+     */
+    private _applySyncedOrigin;
+    /**
+     * Reads a plugin's directory contents through the agent-host
+     * filesystem provider and returns one {@link ICustomizationItem} per
+     * supported file (agents/skills/instructions/prompts).
+     */
+    private _expandPluginContents;
+}