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

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

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

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

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

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

@@ -3,7 +3,7 @@ import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/
 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 { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
-import { IMarketplaceReference } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/marketplaceReference";
+import { IMarketplaceReference } from "./marketplaceReference.js";
 import { IWorkspacePluginSettingsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/workspacePluginSettingsService.service";
 /**
  * Minimal representation of a marketplace entry from `extraKnownMarketplaces`.

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

@@ -9,7 +9,7 @@ import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/fi
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { CLAUDE_CONFIG_FOLDER } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
-import { parseMarketplaceObjectEntry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/marketplaceReference';
+import { parseMarketplaceObjectEntry } from './marketplaceReference.js';
 import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';

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(10317, "Contributes {0} for chat prompts.", point)),
+            description: ( localize(10512, "Contributes {0} for chat prompts.", point)),
             type: "array",
             items: {
                 additionalProperties: false,
@@ -39,28 +39,28 @@ function registerChatFilesExtensionPoint(point) {
                 properties: {
                     path: {
                         description: point === ChatContributionPoint.chatSkills ? ( localize(
-                            10318,
+                            10513,
                             "Path to the SKILL.md file relative to the extension root. The folder name must match the \"name\" property in SKILL.md."
-                        )) : ( localize(10319, "Path to the file relative to the extension root.")),
+                        )) : ( localize(10514, "Path to the file relative to the extension root.")),
                         type: "string"
                     },
                     name: {
-                        description: ( localize(10320, "(Optional) Name for this entry.")),
-                        deprecationMessage: ( localize(10321, "Specify \"name\" in the prompt file itself instead.")),
+                        description: ( localize(10515, "(Optional) Name for this entry.")),
+                        deprecationMessage: ( localize(10516, "Specify \"name\" in the prompt file itself instead.")),
                         type: "string"
                     },
                     description: {
-                        description: ( localize(10322, "(Optional) Description of the entry.")),
-                        deprecationMessage: ( localize(10323, "Specify \"description\" in the prompt file itself instead.")),
+                        description: ( localize(10517, "(Optional) Description of the entry.")),
+                        deprecationMessage: ( localize(10518, "Specify \"description\" in the prompt file itself instead.")),
                         type: "string"
                     },
                     when: {
-                        description: ( localize(10324, "(Optional) A condition which must be true to enable this entry.")),
+                        description: ( localize(10519, "(Optional) A condition which must be true to enable this entry.")),
                         type: "string"
                     },
                     sessionTypes: {
                         description: ( localize(
-                            10325,
+                            10520,
                             "(Optional) The chat session types where this entry should be offered."
                         )),
                         type: "array",
@@ -116,7 +116,7 @@ let ChatPromptFilesExtensionPointHandler = class ChatPromptFilesExtensionPointHa
                 for (const raw of ext.value) {
                     if (!raw.path) {
                         ext.collector.error(( localize(
-                            10326,
+                            10521,
                             "Extension '{0}' cannot register {1} entry without path.",
                             ext.description.identifier.value,
                             contributionPoint
@@ -126,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(
-                            10327,
+                            10522,
                             "Extension '{0}' {1} entry '{2}' resolves outside the extension.",
                             ext.description.identifier.value,
                             contributionPoint,
@@ -136,7 +136,7 @@ let ChatPromptFilesExtensionPointHandler = class ChatPromptFilesExtensionPointHa
                     }
                     if (raw.when && !ContextKeyExpr.deserialize(raw.when)) {
                         ext.collector.error(( localize(
-                            10328,
+                            10523,
                             "Extension '{0}' {1} entry '{2}' has an invalid when clause: '{3}'.",
                             ext.description.identifier.value,
                             contributionPoint,
@@ -159,7 +159,7 @@ let ChatPromptFilesExtensionPointHandler = class ChatPromptFilesExtensionPointHa
                     } catch (e) {
                         const msg = e instanceof Error ? e.message : String(e);
                         ext.collector.error(( localize(
-                            10329,
+                            10524,
                             "Extension '{0}' {1}. Failed to register {2}: {3}",
                             ext.description.identifier.value,
                             contributionPoint,
@@ -226,7 +226,7 @@ class ChatPromptFilesDataRenderer extends Disposable {
                 dispose: () => {}
             };
         }
-        const headers = [( localize(10330, "Name")), ( localize(10331, "Description")), ( localize(10332, "Path"))];
+        const headers = [( localize(10525, "Name")), ( localize(10526, "Description")), ( localize(10527, "Path"))];
         const rows = ( contributions.map(d => {
             return [d.name ?? "-", d.description ?? "-", d.path];
         }));
@@ -241,7 +241,7 @@ class ChatPromptFilesDataRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: ChatContributionPoint.chatPromptFiles,
-    label: ( localize(10333, "Chat Prompt Files")),
+    label: ( localize(10528, "Chat Prompt Files")),
     access: {
         canToggle: false
     },
@@ -249,7 +249,7 @@ class ChatPromptFilesDataRenderer extends Disposable {
 });
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: ChatContributionPoint.chatInstructions,
-    label: ( localize(10334, "Chat Instructions")),
+    label: ( localize(10529, "Chat Instructions")),
     access: {
         canToggle: false
     },
@@ -257,7 +257,7 @@ class ChatPromptFilesDataRenderer extends Disposable {
 });
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: ChatContributionPoint.chatAgents,
-    label: ( localize(10335, "Chat Agents")),
+    label: ( localize(10530, "Chat Agents")),
     access: {
         canToggle: false
     },
@@ -265,7 +265,7 @@ class ChatPromptFilesDataRenderer extends Disposable {
 });
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: ChatContributionPoint.chatSkills,
-    label: ( localize(10336, "Chat Skills")),
+    label: ( localize(10531, "Chat Skills")),
     access: {
         canToggle: false
     },

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

@@ -0,0 +1,65 @@
+import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
+import { ResourceSet } from "@codingame/monaco-vscode-api/vscode/vs/base/common/map";
+import { OperatingSystem } from "@codingame/monaco-vscode-api/vscode/vs/base/common/platform";
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
+import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service";
+import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
+import { IRemoteAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/remote/common/remoteAgentService.service";
+import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
+import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
+import { ChatRequestVariableSet } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries";
+import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service";
+import { IInstructionFile, type InstructionsCollectionEvent, type InstructionsCollectionDebugInfo } 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 type { InstructionsCollectionEvent, InstructionsCollectionDebugInfo } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService";
+export { newInstructionsCollectionEvent, newInstructionsCollectionDebugInfo } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService";
+import { ChatModeKind } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants";
+import { UserSelectedTools } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents";
+import { IAgentPluginService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginService.service";
+import { IPathService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService.service";
+export interface InstructionsCollectionResult {
+    readonly telemetryEvent: InstructionsCollectionEvent;
+    readonly debugInfo: InstructionsCollectionDebugInfo;
+}
+/**
+ * The result of the most recent {@link ComputeAutomaticInstructions.collect} call.
+ * Consumed by debug contributions for logging; not sent as telemetry.
+ */
+export declare let lastInstructionsCollectionResult: InstructionsCollectionResult | undefined;
+export declare class ComputeAutomaticInstructions {
+    private readonly _modeKind;
+    private readonly _enabledTools;
+    private readonly _enabledSubagents;
+    private readonly _currentSessionType;
+    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 readonly _agentPluginService;
+    private readonly _pathService;
+    private _parseResults;
+    constructor(_modeKind: ChatModeKind, _enabledTools: UserSelectedTools | undefined, _enabledSubagents: (readonly string[]) | undefined, _currentSessionType: string, _promptsService: IPromptsService, _logService: ILogService, _labelService: ILabelService, _configurationService: IConfigurationService, _workspaceService: IWorkspaceContextService, _fileService: IFileService, _remoteAgentService: IRemoteAgentService, _telemetryService: ITelemetryService, _languageModelToolsService: ILanguageModelToolsService, _agentPluginService: IAgentPluginService, _pathService: IPathService);
+    private _parseInstructionsFile;
+    collect(variables: ChatRequestVariableSet, token: CancellationToken): Promise<void>;
+    private sendTelemetry;
+    private _logSkillLoadedTelemetry;
+    /** public for testing */
+    addApplyingInstructions(instructionFiles: readonly IInstructionFile[], context: {
+        files: ResourceSet;
+        instructions: ResourceSet;
+    }, variables: ChatRequestVariableSet, telemetryEvent: InstructionsCollectionEvent, debugInfo: InstructionsCollectionDebugInfo, token: CancellationToken): Promise<void>;
+    private _getContext;
+    private _addAgentInstructions;
+    private _matches;
+    private _getTool;
+    private _getCustomizationsIndex;
+    private _addReferencedInstructions;
+}
+export declare function getFilePath(uri: URI, remoteOS: OperatingSystem | undefined, isRemote?: boolean): string;