@codingame/monaco-vscode-chat-service-override 30.0.1 → 31.0.0

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

@@ -98,7 +98,9 @@ class WorkspaceSettingsReader extends Disposable {
         const settingsDirs = observableFromEvent(
             this,
             workspaceContextService.onDidChangeWorkspaceFolders,
-            () => ( workspaceContextService.getWorkspace().folders.map(f => joinPath(f.uri, configFolder)))
+            () => ( workspaceContextService.getWorkspace().folders.map(f => f.uri.path ? joinPath(f.uri, configFolder) : joinPath(f.uri.with({
+                path: "/"
+            }), configFolder)))
         );
         const watcherStore = this._register(( new DisposableStore()));
         this._register(autorun(reader => {

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

@@ -25,7 +25,7 @@ function registerChatFilesExtensionPoint(point) {
     return ExtensionsRegistry.registerExtensionPoint({
         extensionPoint: point,
         jsonSchema: {
-            description: ( localize(7315, "Contributes {0} for chat prompts.", point)),
+            description: ( localize(7433, "Contributes {0} for chat prompts.", point)),
             type: "array",
             items: {
                 additionalProperties: false,
@@ -39,24 +39,34 @@ function registerChatFilesExtensionPoint(point) {
                 properties: {
                     path: {
                         description: point === ChatContributionPoint.chatSkills ? ( localize(
-                            7316,
+                            7434,
                             "Path to the SKILL.md file relative to the extension root. The folder name must match the \"name\" property in SKILL.md."
-                        )) : ( localize(7317, "Path to the file relative to the extension root.")),
+                        )) : ( localize(7435, "Path to the file relative to the extension root.")),
                         type: "string"
                     },
                     name: {
-                        description: ( localize(7318, "(Optional) Name for this entry.")),
-                        deprecationMessage: ( localize(7319, "Specify \"name\" in the prompt file itself instead.")),
+                        description: ( localize(7436, "(Optional) Name for this entry.")),
+                        deprecationMessage: ( localize(7437, "Specify \"name\" in the prompt file itself instead.")),
                         type: "string"
                     },
                     description: {
-                        description: ( localize(7320, "(Optional) Description of the entry.")),
-                        deprecationMessage: ( localize(7321, "Specify \"description\" in the prompt file itself instead.")),
+                        description: ( localize(7438, "(Optional) Description of the entry.")),
+                        deprecationMessage: ( localize(7439, "Specify \"description\" in the prompt file itself instead.")),
                         type: "string"
                     },
                     when: {
-                        description: ( localize(7322, "(Optional) A condition which must be true to enable this entry.")),
+                        description: ( localize(7440, "(Optional) A condition which must be true to enable this entry.")),
                         type: "string"
+                    },
+                    sessionTypes: {
+                        description: ( localize(
+                            7441,
+                            "(Optional) The chat session types where this entry should be offered."
+                        )),
+                        type: "array",
+                        items: {
+                            type: "string"
+                        }
                     }
                 }
             }
@@ -106,7 +116,7 @@ let ChatPromptFilesExtensionPointHandler = class ChatPromptFilesExtensionPointHa
                 for (const raw of ext.value) {
                     if (!raw.path) {
                         ext.collector.error(( localize(
-                            7323,
+                            7442,
                             "Extension '{0}' cannot register {1} entry without path.",
                             ext.description.identifier.value,
                             contributionPoint
@@ -116,7 +126,7 @@ let ChatPromptFilesExtensionPointHandler = class ChatPromptFilesExtensionPointHa
                     const fileUri = joinPath(ext.description.extensionLocation, raw.path);
                     if (!isEqualOrParent(fileUri, ext.description.extensionLocation)) {
                         ext.collector.error(( localize(
-                            7324,
+                            7443,
                             "Extension '{0}' {1} entry '{2}' resolves outside the extension.",
                             ext.description.identifier.value,
                             contributionPoint,
@@ -126,7 +136,7 @@ let ChatPromptFilesExtensionPointHandler = class ChatPromptFilesExtensionPointHa
                     }
                     if (raw.when && !ContextKeyExpr.deserialize(raw.when)) {
                         ext.collector.error(( localize(
-                            7325,
+                            7444,
                             "Extension '{0}' {1} entry '{2}' has an invalid when clause: '{3}'.",
                             ext.description.identifier.value,
                             contributionPoint,
@@ -136,12 +146,20 @@ let ChatPromptFilesExtensionPointHandler = class ChatPromptFilesExtensionPointHa
                         continue;
                     }
                     try {
-                        const d = this.promptsService.registerContributedFile(type, fileUri, ext.description, raw.name, raw.description, raw.when);
+                        const d = this.promptsService.registerContributedFile(
+                            type,
+                            fileUri,
+                            ext.description,
+                            raw.name,
+                            raw.description,
+                            raw.when,
+                            raw.sessionTypes
+                        );
                         this.registrations.set(key(ext.description.identifier, type, raw.path), d);
                     } catch (e) {
                         const msg = e instanceof Error ? e.message : String(e);
                         ext.collector.error(( localize(
-                            7326,
+                            7445,
                             "Extension '{0}' {1}. Failed to register {2}: {3}",
                             ext.description.identifier.value,
                             contributionPoint,
@@ -202,7 +220,7 @@ class ChatPromptFilesDataRenderer extends Disposable {
                 dispose: () => {}
             };
         }
-        const headers = [( localize(7327, "Name")), ( localize(7328, "Description")), ( localize(7329, "Path"))];
+        const headers = [( localize(7446, "Name")), ( localize(7447, "Description")), ( localize(7448, "Path"))];
         const rows = ( contributions.map(d => {
             return [d.name ?? "-", d.description ?? "-", d.path];
         }));
@@ -217,7 +235,7 @@ class ChatPromptFilesDataRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: ChatContributionPoint.chatPromptFiles,
-    label: ( localize(7330, "Chat Prompt Files")),
+    label: ( localize(7449, "Chat Prompt Files")),
     access: {
         canToggle: false
     },
@@ -225,7 +243,7 @@ class ChatPromptFilesDataRenderer extends Disposable {
 });
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: ChatContributionPoint.chatInstructions,
-    label: ( localize(7331, "Chat Instructions")),
+    label: ( localize(7450, "Chat Instructions")),
     access: {
         canToggle: false
     },
@@ -233,7 +251,7 @@ class ChatPromptFilesDataRenderer extends Disposable {
 });
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: ChatContributionPoint.chatAgents,
-    label: ( localize(7332, "Chat Agents")),
+    label: ( localize(7451, "Chat Agents")),
     access: {
         canToggle: false
     },
@@ -241,7 +259,7 @@ class ChatPromptFilesDataRenderer extends Disposable {
 });
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: ChatContributionPoint.chatSkills,
-    label: ( localize(7333, "Chat Skills")),
+    label: ( localize(7452, "Chat Skills")),
     access: {
         canToggle: false
     },

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

@@ -76,7 +76,7 @@ let PromptCodeActionProvider = class PromptCodeActionProvider {
             modeAttr.range.startLineNumber,
             modeAttr.range.startColumn + modeAttr.key.length
         ));
-        result.push(this.createCodeAction(model, keyRange, ( localize(7377, "Rename to 'agent'")), [asWorkspaceTextEdit(model, {
+        result.push(this.createCodeAction(model, keyRange, ( localize(7504, "Rename to 'agent'")), [asWorkspaceTextEdit(model, {
             range: keyRange,
             text: "agent"
         })]));
@@ -93,7 +93,7 @@ let PromptCodeActionProvider = class PromptCodeActionProvider {
                         copy: false
                     }
                 };
-                result.push(this.createCodeAction(model, ( new Range(1, 1, 1, 4)), ( localize(7378, "Migrate to custom agent file")), [edit]));
+                result.push(this.createCodeAction(model, ( new Range(1, 1, 1, 4)), ( localize(7505, "Migrate to custom agent file")), [edit]));
             }
         }
     }
@@ -140,7 +140,7 @@ let PromptCodeActionProvider = class PromptCodeActionProvider {
                     };
                     edits.push(edit);
                     if (item.range.containsRange(range)) {
-                        result.push(this.createCodeAction(model, item.range, ( localize(7379, "Update to '{0}'", newName)), [asWorkspaceTextEdit(model, edit)]));
+                        result.push(this.createCodeAction(model, item.range, ( localize(7506, "Update to '{0}'", newName)), [asWorkspaceTextEdit(model, edit)]));
                     }
                 } else {
                     const newNamesArray = Array.from(newNames).sort((a, b) => a.localeCompare(b));
@@ -159,13 +159,13 @@ let PromptCodeActionProvider = class PromptCodeActionProvider {
                     };
                     edits.push(edit);
                     if (item.range.containsRange(range)) {
-                        result.push(this.createCodeAction(model, item.range, ( localize(7380, "Expand to {0} tools", newNames.size)), [asWorkspaceTextEdit(model, edit)]));
+                        result.push(this.createCodeAction(model, item.range, ( localize(7507, "Expand to {0} tools", newNames.size)), [asWorkspaceTextEdit(model, edit)]));
                     }
                 }
             }
         }
         if (edits.length && result.length === 0 || edits.length > 1) {
-            result.push(this.createCodeAction(model, value.range, ( localize(7381, "Update all tool names")), ( edits.map(edit => asWorkspaceTextEdit(model, edit)))));
+            result.push(this.createCodeAction(model, value.range, ( localize(7508, "Update all tool names")), ( edits.map(edit => asWorkspaceTextEdit(model, edit)))));
         }
     }
 };

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

@@ -48,7 +48,7 @@ let PromptHeaderAutocompletion = class PromptHeaderAutocompletion {
         if (/^\s*$/.test(model.getValue())) {
             return {
                 suggestions: [{
-                    label: ( localize(7458, "Add Prompt Header")),
+                    label: ( localize(7585, "Add Prompt Header")),
                     kind: CompletionItemKind.Snippet,
                     insertText: [`---`, `description: $1`, `---`, `$0`].join("\n"),
                     insertTextRules: CompletionItemInsertTextRule.InsertAsSnippet,
@@ -241,7 +241,7 @@ let PromptHeaderAutocompletion = class PromptHeaderAutocompletion {
                 "    send: true"
             ].join("\n");
             const item = {
-                label: ( localize(7459, "Handoff Example")),
+                label: ( localize(7586, "Handoff Example")),
                 kind: CompletionItemKind.Value,
                 insertText: whilespaceAfterColon === 0 ? ` ${value}` : value,
                 range: ( new Range(
@@ -256,7 +256,7 @@ let PromptHeaderAutocompletion = class PromptHeaderAutocompletion {
         if (attribute.key === PromptHeaderAttributes.hooks && promptType === PromptsType.agent) {
             const hookSnippet = ["", "  ${1|" + ( Object.keys(HOOKS_BY_TARGET[target] ?? HOOKS_BY_TARGET[Target.Undefined])).join(",") + "|}:", "    - type: command", "      command: \"$2\""].join("\n");
             const item = {
-                label: ( localize(7460, "New Hook")),
+                label: ( localize(7587, "New Hook")),
                 kind: CompletionItemKind.Snippet,
                 insertText: whilespaceAfterColon === 0 ? ` ${hookSnippet}` : hookSnippet,
                 insertTextRules: CompletionItemInsertTextRule.InsertAsSnippet,
@@ -283,8 +283,8 @@ let PromptHeaderAutocompletion = class PromptHeaderAutocompletion {
                 const commandSnippet = ["", "  - type: command", "    command: \"$1\""].join("\n");
                 return {
                     suggestions: [{
-                        label: ( localize(7461, "New Command")),
-                        documentation: ( localize(7462, "Add a new command entry to this hook.")),
+                        label: ( localize(7588, "New Command")),
+                        documentation: ( localize(7589, "Add a new command entry to this hook.")),
                         kind: CompletionItemKind.Snippet,
                         insertText: whilespaceAfterColon === 0 ? ` ${commandSnippet}` : commandSnippet,
                         insertTextRules: CompletionItemInsertTextRule.InsertAsSnippet,

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

@@ -84,7 +84,7 @@ let PromptHoverProvider = class PromptHoverProvider {
                         return this.getHooksHover(attribute, position, description, target);
                     case PromptHeaderAttributes.infer:
                         return this.createHover(description + "\n\n" + ( localize(
-                            7463,
+                            7590,
                             "Deprecated: Use `user-invocable` and `disable-model-invocation` instead."
                         )), attribute.range);
                     default:
@@ -132,7 +132,7 @@ let PromptHoverProvider = class PromptHoverProvider {
     }
     getToolsetHover(toolSet, range) {
         const lines = [];
-        lines.push(( localize(7464, "ToolSet: {0}\n\n", toolSet.referenceName)));
+        lines.push(( localize(7591, "ToolSet: {0}\n\n", toolSet.referenceName)));
         if (toolSet.description) {
             lines.push(toolSet.description);
         }
@@ -143,7 +143,7 @@ let PromptHoverProvider = class PromptHoverProvider {
     }
     getModelHover(node, position, baseMessage, target) {
         if (target === Target.GitHubCopilot) {
-            return this.createHover(baseMessage + "\n\n" + ( localize(7465, "Note: This attribute is not used when target is github-copilot.")), node.range);
+            return this.createHover(baseMessage + "\n\n" + ( localize(7592, "Note: This attribute is not used when target is github-copilot.")), node.range);
         }
         const modelHoverContent = modelName => {
             const lines = [];
@@ -154,7 +154,7 @@ let PromptHoverProvider = class PromptHoverProvider {
                     return this.createHover(lines.join("\n"), node.range);
                 }
                 if (claudeModel.modelEquivalent) {
-                    lines.push(( localize(7466, "Claude model `{0}` maps to the following model:\n", modelName)));
+                    lines.push(( localize(7593, "Claude model `{0}` maps to the following model:\n", modelName)));
                     modelName = claudeModel.modelEquivalent;
                 } else {
                     lines.push(claudeModel.description);
@@ -164,9 +164,9 @@ let PromptHoverProvider = class PromptHoverProvider {
             const result = this.languageModelsService.lookupLanguageModelByQualifiedName(modelName);
             if (result) {
                 const meta = result.metadata;
-                lines.push(( localize(7467, "- Name: {0}", meta.name)));
-                lines.push(( localize(7468, "- Family: {0}", meta.family)));
-                lines.push(( localize(7469, "- Vendor: {0}", meta.vendor)));
+                lines.push(( localize(7594, "- Name: {0}", meta.name)));
+                lines.push(( localize(7595, "- Family: {0}", meta.family)));
+                lines.push(( localize(7596, "- Vendor: {0}", meta.vendor)));
                 if (meta.tooltip) {
                     lines.push("", "", meta.tooltip);
                 }
@@ -197,14 +197,14 @@ let PromptHoverProvider = class PromptHoverProvider {
         if (value.type === "scalar" && value.range.containsPosition(position)) {
             const agent = this.chatModeService.findModeByName(value.value);
             if (agent) {
-                const description = agent.description.get() || (isBuiltinChatMode(agent) ? ( localize(7470, "Built-in agent")) : ( localize(7471, "Custom agent")));
+                const description = agent.description.get() || (isBuiltinChatMode(agent) ? ( localize(7597, "Built-in agent")) : ( localize(7598, "Custom agent")));
                 lines.push(`\`${agent.name.get()}\`: ${description}`);
             }
         } else {
             const agents = this.chatModeService.getModes();
             lines.push(baseMessage);
             lines.push("");
-            lines.push(( localize(7472, "**Built-in agents:**")));
+            lines.push(( localize(7599, "**Built-in agents:**")));
             for (const agent of agents.builtin) {
                 lines.push(
                     `- \`${agent.name.get()}\`: ${agent.description.get() || agent.label.get()}`
@@ -212,10 +212,10 @@ let PromptHoverProvider = class PromptHoverProvider {
             }
             if (agents.custom.length > 0) {
                 lines.push("");
-                lines.push(( localize(7473, "**Custom agents:**")));
+                lines.push(( localize(7600, "**Custom agents:**")));
                 for (const agent of agents.custom) {
                     const description = agent.description.get();
-                    lines.push(`- \`${agent.name.get()}\`: ${description || ( localize(7471, "Custom agent"))}`);
+                    lines.push(`- \`${agent.name.get()}\`: ${description || ( localize(7598, "Custom agent"))}`);
                 }
             }
         }
@@ -270,7 +270,7 @@ let PromptHoverProvider = class PromptHoverProvider {
         const handoffsBaseMessage = getAttributeDefinition(PromptHeaderAttributes.handOffs, PromptsType.agent, target)?.description;
         if (!isVSCodeOrDefaultTarget(target)) {
             return this.createHover(handoffsBaseMessage + "\n\n" + ( localize(
-                7474,
+                7601,
                 "Note: This attribute is not used in GitHub Copilot or Claude targets."
             )), attribute.range);
         }

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

@@ -46,7 +46,6 @@ export declare class PromptValidator {
     private validateUserInvocable;
     private validateDisableModelInvocation;
     private validateAgentsAttribute;
-    private isCustomAgentInSubagentEnabled;
     private validateGithubPermissions;
 }
 export declare const githubPermissionScopes: Record<string, {