@codingame/monaco-vscode-chat-service-override 25.1.2 → 26.0.0

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

@@ -7,7 +7,7 @@ import { isGithubTarget } from './promptValidator.js';
 let PromptDocumentSemanticTokensProvider = class PromptDocumentSemanticTokensProvider {
     constructor(promptsService) {
         this.promptsService = promptsService;
-        this._debugDisplayName = 'PromptDocumentSemanticTokensProvider';
+        this._debugDisplayName = "PromptDocumentSemanticTokensProvider";
     }
     provideDocumentSemanticTokens(model, lastResultId, token) {
         const promptType = getPromptsTypeForLanguageId(model.getLanguageId());
@@ -28,33 +28,41 @@ let PromptDocumentSemanticTokensProvider = class PromptDocumentSemanticTokensPro
         const data = [];
         let lastLine = 0;
         let lastChar = 0;
-        const ordered = [...variableReferences].sort((a, b) => a.range.startLineNumber === b.range.startLineNumber
-            ? a.range.startColumn - b.range.startColumn
-            : a.range.startLineNumber - b.range.startLineNumber);
+        const ordered = [...variableReferences].sort(
+            (a, b) => a.range.startLineNumber === b.range.startLineNumber ? a.range.startColumn - b.range.startColumn : a.range.startLineNumber - b.range.startLineNumber
+        );
         for (const ref of ordered) {
-            const extraCharCount = '#tool:'.length;
+            const extraCharCount = "#tool:".length;
             const line = ref.range.startLineNumber - 1;
             const char = ref.range.startColumn - extraCharCount - 1;
             const length = ref.range.endColumn - ref.range.startColumn + extraCharCount;
             const deltaLine = line - lastLine;
             const deltaChar = deltaLine === 0 ? char - lastChar : char;
-            data.push(deltaLine, deltaChar, length, 0 , 0 );
+            data.push(
+                deltaLine,
+                deltaChar,
+                length,
+                0,
+                0
+            );
             lastLine = line;
             lastChar = char;
             if (token.isCancellationRequested) {
                 break;
             }
         }
-        return { data: ( new Uint32Array(data)) };
+        return {
+            data: ( new Uint32Array(data))
+        };
     }
     getLegend() {
-        return { tokenTypes: ['variable'], tokenModifiers: [] };
-    }
-    releaseDocumentSemanticTokens(resultId) {
+        return {
+            tokenTypes: ["variable"],
+            tokenModifiers: []
+        };
     }
+    releaseDocumentSemanticTokens(resultId) {}
 };
-PromptDocumentSemanticTokensProvider = ( __decorate([
-    ( __param(0, IPromptsService))
-], PromptDocumentSemanticTokensProvider));
+PromptDocumentSemanticTokensProvider = ( __decorate([( __param(0, IPromptsService))], PromptDocumentSemanticTokensProvider));
 
 export { PromptDocumentSemanticTokensProvider };

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

@@ -29,5 +29,5 @@ export declare class PromptHeaderAutocompletion implements CompletionItemProvide
     private provideValueCompletions;
     private getValueSuggestions;
     private getModelNames;
-    private provideToolCompletions;
+    private provideArrayCompletions;
 }

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

@@ -1,5 +1,6 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { CharCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/charCode';
 import { Position } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/position';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
@@ -12,17 +13,22 @@ import { getPromptsTypeForLanguageId, PromptsType } from '@codingame/monaco-vsco
 import { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service';
 import { Iterable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iterator';
 import { PromptHeaderAttributes } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptFileParser';
-import { isGithubTarget, getValidAttributeNames, knownGithubCopilotTools } from './promptValidator.js';
+import { isGithubTarget, getValidAttributeNames, getAttributeDescription, knownGithubCopilotTools } from './promptValidator.js';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 
 let PromptHeaderAutocompletion = class PromptHeaderAutocompletion {
-    constructor(promptsService, languageModelsService, languageModelToolsService, chatModeService) {
+    constructor(
+        promptsService,
+        languageModelsService,
+        languageModelToolsService,
+        chatModeService
+    ) {
         this.promptsService = promptsService;
         this.languageModelsService = languageModelsService;
         this.languageModelToolsService = languageModelToolsService;
         this.chatModeService = chatModeService;
-        this._debugDisplayName = 'PromptHeaderAutocompletion';
-        this.triggerCharacters = [':'];
+        this._debugDisplayName = "PromptHeaderAutocompletion";
+        this.triggerCharacters = [":"];
     }
     async provideCompletionItems(model, position, context, token) {
         const promptType = getPromptsTypeForLanguageId(model.getLanguageId());
@@ -32,17 +38,12 @@ let PromptHeaderAutocompletion = class PromptHeaderAutocompletion {
         if (/^\s*$/.test(model.getValue())) {
             return {
                 suggestions: [{
-                        label: ( localize(5989, "Add Prompt Header")),
-                        kind: CompletionItemKind.Snippet,
-                        insertText: [
-                            `---`,
-                            `description: $1`,
-                            `---`,
-                            `$0`
-                        ].join('\n'),
-                        insertTextRules: CompletionItemInsertTextRule.InsertAsSnippet,
-                        range: model.getFullModelRange(),
-                    }]
+                    label: ( localize(6283, "Add Prompt Header")),
+                    kind: CompletionItemKind.Snippet,
+                    insertText: [`---`, `description: $1`, `---`, `$0`].join("\n"),
+                    insertTextRules: CompletionItemInsertTextRule.InsertAsSnippet,
+                    range: model.getFullModelRange()
+                }]
             };
         }
         const parsedAST = this.promptsService.getParsedPromptFile(model);
@@ -55,12 +56,11 @@ let PromptHeaderAutocompletion = class PromptHeaderAutocompletion {
             return undefined;
         }
         const lineText = model.getLineContent(position.lineNumber);
-        const colonIndex = lineText.indexOf(':');
+        const colonIndex = lineText.indexOf(":");
         const colonPosition = colonIndex !== -1 ? ( new Position(position.lineNumber, colonIndex + 1)) : undefined;
         if (!colonPosition || position.isBeforeOrEqual(colonPosition)) {
             return this.provideAttributeNameCompletions(model, position, header, colonPosition, promptType);
-        }
-        else if (colonPosition && colonPosition.isBefore(position)) {
+        } else if (colonPosition && colonPosition.isBefore(position)) {
             return this.provideValueCompletions(model, position, header, colonPosition, promptType);
         }
         return undefined;
@@ -72,21 +72,21 @@ let PromptHeaderAutocompletion = class PromptHeaderAutocompletion {
         for (const attr of header.attributes) {
             attributesToPropose.delete(attr.key);
         }
-        const getInsertText = (key) => {
+        const getInsertText = key => {
             if (colonPosition) {
                 return key;
             }
             const valueSuggestions = this.getValueSuggestions(promptType, key);
             if (valueSuggestions.length > 0) {
                 return `${key}: \${0:${valueSuggestions[0]}}`;
-            }
-            else {
+            } else {
                 return `${key}: \$0`;
             }
         };
         for (const attribute of attributesToPropose) {
             const item = {
                 label: attribute,
+                documentation: getAttributeDescription(attribute, promptType),
                 kind: CompletionItemKind.Property,
                 insertText: getInsertText(attribute),
                 insertTextRules: CompletionItemInsertTextRule.InsertAsSnippet,
@@ -95,32 +95,48 @@ let PromptHeaderAutocompletion = class PromptHeaderAutocompletion {
                     1,
                     position.lineNumber,
                     !colonPosition ? model.getLineMaxColumn(position.lineNumber) : colonPosition.column
-                )),
+                ))
             };
             suggestions.push(item);
         }
-        return { suggestions };
+        return {
+            suggestions
+        };
     }
     async provideValueCompletions(model, position, header, colonPosition, promptType) {
         const suggestions = [];
-        const lineContent = model.getLineContent(position.lineNumber);
-        const attribute = lineContent.substring(0, colonPosition.column - 1).trim();
+        const attribute = header.attributes.find(attr => attr.range.containsPosition(position));
+        if (!attribute) {
+            return undefined;
+        }
         const isGitHubTarget = isGithubTarget(promptType, header.target);
-        if (!getValidAttributeNames(promptType, true, isGitHubTarget).includes(attribute)) {
+        if (!getValidAttributeNames(promptType, true, isGitHubTarget).includes(attribute.key)) {
             return undefined;
         }
         if (promptType === PromptsType.prompt || promptType === PromptsType.agent) {
-            const result = this.provideToolCompletions(model, position, header, isGitHubTarget);
-            if (result) {
-                return result;
+            if (attribute.key === PromptHeaderAttributes.model) {
+                if (attribute.value.type === "array") {
+                    const getValues = async () => this.getModelNames(promptType === PromptsType.agent);
+                    return this.provideArrayCompletions(model, position, attribute, getValues);
+                }
+            }
+            if (attribute.key === PromptHeaderAttributes.tools) {
+                if (attribute.value.type === "array") {
+                    const getValues = async () => isGitHubTarget ? knownGithubCopilotTools : Array.from(this.languageModelToolsService.getFullReferenceNames());
+                    return this.provideArrayCompletions(model, position, attribute, getValues);
+                }
             }
         }
-        const bracketIndex = lineContent.indexOf('[');
-        if (bracketIndex !== -1 && bracketIndex <= position.column - 1) {
-            return undefined;
+        if (promptType === PromptsType.agent) {
+            if (attribute.key === PromptHeaderAttributes.agents && !isGitHubTarget) {
+                if (attribute.value.type === "array") {
+                    return this.provideArrayCompletions(model, position, attribute, async () => ( (await this.promptsService.getCustomAgents(CancellationToken.None)).map(agent => agent.name)));
+                }
+            }
         }
+        const lineContent = model.getLineContent(attribute.range.startLineNumber);
         const whilespaceAfterColon = (lineContent.substring(colonPosition.column).match(/^\s*/)?.[0].length) ?? 0;
-        const values = this.getValueSuggestions(promptType, attribute);
+        const values = this.getValueSuggestions(promptType, attribute.key);
         for (const value of values) {
             const item = {
                 label: value,
@@ -131,20 +147,20 @@ let PromptHeaderAutocompletion = class PromptHeaderAutocompletion {
                     colonPosition.column + whilespaceAfterColon + 1,
                     position.lineNumber,
                     model.getLineMaxColumn(position.lineNumber)
-                )),
+                ))
             };
             suggestions.push(item);
         }
-        if (attribute === PromptHeaderAttributes.handOffs && (promptType === PromptsType.agent)) {
+        if (attribute.key === PromptHeaderAttributes.handOffs && (promptType === PromptsType.agent)) {
             const value = [
-                '',
-                '  - label: Start Implementation',
-                '    agent: agent',
-                '    prompt: Implement the plan',
-                '    send: true'
-            ].join('\n');
+                "",
+                "  - label: Start Implementation",
+                "    agent: agent",
+                "    prompt: Implement the plan",
+                "    send: true"
+            ].join("\n");
             const item = {
-                label: ( localize(5990, "Handoff Example")),
+                label: ( localize(6284, "Handoff Example")),
                 kind: CompletionItemKind.Value,
                 insertText: whilespaceAfterColon === 0 ? ` ${value}` : value,
                 range: ( new Range(
@@ -152,50 +168,67 @@ let PromptHeaderAutocompletion = class PromptHeaderAutocompletion {
                     colonPosition.column + whilespaceAfterColon + 1,
                     position.lineNumber,
                     model.getLineMaxColumn(position.lineNumber)
-                )),
+                ))
             };
             suggestions.push(item);
         }
-        return { suggestions };
+        return {
+            suggestions
+        };
     }
     getValueSuggestions(promptType, attribute) {
         switch (attribute) {
-            case PromptHeaderAttributes.applyTo:
-                if (promptType === PromptsType.instructions) {
-                    return [`'**'`, `'**/*.ts, **/*.js'`, `'**/*.php'`, `'**/*.py'`];
-                }
-                break;
-            case PromptHeaderAttributes.agent:
-            case PromptHeaderAttributes.mode:
-                if (promptType === PromptsType.prompt) {
-                    const agents = this.chatModeService.getModes();
-                    const suggestions = [];
-                    for (const agent of Iterable.concat(agents.builtin, agents.custom)) {
-                        suggestions.push(agent.name.get());
-                    }
-                    return suggestions;
-                }
-                break;
-            case PromptHeaderAttributes.target:
-                if (promptType === PromptsType.agent) {
-                    return ['vscode', 'github-copilot'];
-                }
-                break;
-            case PromptHeaderAttributes.tools:
-                if (promptType === PromptsType.prompt || promptType === PromptsType.agent) {
-                    return ['[]', `['search', 'edit', 'fetch']`];
-                }
-                break;
-            case PromptHeaderAttributes.model:
-                if (promptType === PromptsType.prompt || promptType === PromptsType.agent) {
-                    return this.getModelNames(promptType === PromptsType.agent);
-                }
-                break;
-            case PromptHeaderAttributes.infer:
-                if (promptType === PromptsType.agent) {
-                    return ['true', 'false'];
+        case PromptHeaderAttributes.applyTo:
+            if (promptType === PromptsType.instructions) {
+                return [`'**'`, `'**/*.ts, **/*.js'`, `'**/*.php'`, `'**/*.py'`];
+            }
+            break;
+        case PromptHeaderAttributes.agent:
+        case PromptHeaderAttributes.mode:
+            if (promptType === PromptsType.prompt) {
+                const agents = this.chatModeService.getModes();
+                const suggestions = [];
+                for (const agent of Iterable.concat(agents.builtin, agents.custom)) {
+                    suggestions.push(agent.name.get());
                 }
-                break;
+                return suggestions;
+            }
+            break;
+        case PromptHeaderAttributes.target:
+            if (promptType === PromptsType.agent) {
+                return ["vscode", "github-copilot"];
+            }
+            break;
+        case PromptHeaderAttributes.tools:
+            if (promptType === PromptsType.prompt || promptType === PromptsType.agent) {
+                return ["[]", `['search', 'edit', 'fetch']`];
+            }
+            break;
+        case PromptHeaderAttributes.model:
+            if (promptType === PromptsType.prompt || promptType === PromptsType.agent) {
+                return this.getModelNames(promptType === PromptsType.agent);
+            }
+            break;
+        case PromptHeaderAttributes.infer:
+            if (promptType === PromptsType.agent) {
+                return ["true", "false"];
+            }
+            break;
+        case PromptHeaderAttributes.agents:
+            if (promptType === PromptsType.agent) {
+                return ["[\"*\"]"];
+            }
+            break;
+        case PromptHeaderAttributes.userInvokable:
+            if (promptType === PromptsType.agent) {
+                return ["true", "false"];
+            }
+            break;
+        case PromptHeaderAttributes.disableModelInvocation:
+            if (promptType === PromptsType.agent) {
+                return ["true", "false"];
+            }
+            break;
         }
         return [];
     }
@@ -211,21 +244,19 @@ let PromptHeaderAutocompletion = class PromptHeaderAutocompletion {
         }
         return result;
     }
-    provideToolCompletions(model, position, header, isGitHubTarget) {
-        const toolsAttr = header.getAttribute(PromptHeaderAttributes.tools);
-        if (!toolsAttr || toolsAttr.value.type !== 'array' || !toolsAttr.range.containsPosition(position)) {
+    async provideArrayCompletions(model, position, agentsAttr, getValues) {
+        if (agentsAttr.value.type !== "array") {
             return undefined;
         }
-        const getSuggestions = (toolRange) => {
+        const getSuggestions = async toolRange => {
             const suggestions = [];
-            const toolNames = isGitHubTarget ? knownGithubCopilotTools : this.languageModelToolsService.getFullReferenceNames();
+            const toolNames = await getValues();
             for (const toolName of toolNames) {
                 let insertText;
                 if (!toolRange.isEmpty()) {
                     const firstChar = model.getValueInRange(toolRange).charCodeAt(0);
                     insertText = firstChar === CharCode.SingleQuote ? `'${toolName}'` : firstChar === CharCode.DoubleQuote ? `"${toolName}"` : toolName;
-                }
-                else {
+                } else {
                     insertText = `'${toolName}'`;
                 }
                 suggestions.push({
@@ -233,28 +264,25 @@ let PromptHeaderAutocompletion = class PromptHeaderAutocompletion {
                     kind: CompletionItemKind.Value,
                     filterText: insertText,
                     insertText: insertText,
-                    range: toolRange,
+                    range: toolRange
                 });
             }
-            return { suggestions };
+            return {
+                suggestions
+            };
         };
-        for (const toolNameNode of toolsAttr.value.items) {
+        for (const toolNameNode of agentsAttr.value.items) {
             if (toolNameNode.range.containsPosition(position)) {
-                return getSuggestions(toolNameNode.range);
+                return await getSuggestions(toolNameNode.range);
             }
         }
         const prefix = model.getValueInRange(( new Range(position.lineNumber, 1, position.lineNumber, position.column)));
         if (prefix.match(/[,[]\s*$/)) {
-            return getSuggestions(( new Range(position.lineNumber, position.column, position.lineNumber, position.column)));
+            return await getSuggestions(( new Range(position.lineNumber, position.column, position.lineNumber, position.column)));
         }
         return undefined;
     }
 };
-PromptHeaderAutocompletion = ( __decorate([
-    ( __param(0, IPromptsService)),
-    ( __param(1, ILanguageModelsService)),
-    ( __param(2, ILanguageModelToolsService)),
-    ( __param(3, IChatModeService))
-], PromptHeaderAutocompletion));
+PromptHeaderAutocompletion = ( __decorate([( __param(0, IPromptsService)), ( __param(1, ILanguageModelsService)), ( __param(2, ILanguageModelToolsService)), ( __param(3, IChatModeService))], PromptHeaderAutocompletion));
 
 export { PromptHeaderAutocompletion };