@codingame/monaco-vscode-chat-service-override 27.0.0 → 28.0.0

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

@@ -3,12 +3,14 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { parse } from '@codingame/monaco-vscode-api/vscode/vs/base/common/json';
 import { Lazy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lazy';
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { revive } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marshalling';
-import { isEqualOrParent, joinPath, normalizePath, relativePath } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { isEqualOrParent, isEqual, joinPath, normalizePath, relativePath } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 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 { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+import { observableMemento } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/observableMemento';
 import { asJson } from '@codingame/monaco-vscode-api/vscode/vs/platform/request/common/request';
 import { IRequestService } from '@codingame/monaco-vscode-api/vscode/vs/platform/request/common/request.service';
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
@@ -27,6 +29,14 @@ var MarketplaceReferenceKind;
     MarketplaceReferenceKind["GitUri"] = "gitUri";
     MarketplaceReferenceKind["LocalFileUri"] = "localFileUri";
 })(MarketplaceReferenceKind || (MarketplaceReferenceKind = {}));
+var PluginSourceKind;
+(function(PluginSourceKind) {
+    PluginSourceKind["RelativePath"] = "relativePath";
+    PluginSourceKind["GitHub"] = "github";
+    PluginSourceKind["GitUrl"] = "url";
+    PluginSourceKind["Npm"] = "npm";
+    PluginSourceKind["Pip"] = "pip";
+})(PluginSourceKind || (PluginSourceKind = {}));
 const MARKETPLACE_DEFINITIONS = [{
     type: MarketplaceType.Copilot,
     path: ".github/plugin/marketplace.json"
@@ -36,7 +46,37 @@ const MARKETPLACE_DEFINITIONS = [{
 }];
 const GITHUB_MARKETPLACE_CACHE_TTL_MS = 8 * 60 * 60 * 1000;
 const GITHUB_MARKETPLACE_CACHE_STORAGE_KEY = "chat.plugins.marketplaces.githubCache.v1";
-let PluginMarketplaceService = class PluginMarketplaceService {
+function ensureSourceDescriptor(plugin) {
+    if (plugin.sourceDescriptor) {
+        return plugin;
+    }
+    return {
+        ...plugin,
+        sourceDescriptor: {
+            kind: PluginSourceKind.RelativePath,
+            path: plugin.source
+        }
+    };
+}
+const installedPluginsMemento = observableMemento({
+    defaultValue: [],
+    key: "chat.plugins.installed.v1",
+    toStorage: value => JSON.stringify(value),
+    fromStorage: value => {
+        const parsed = JSON.parse(value);
+        return Array.isArray(parsed) ? parsed : [];
+    }
+});
+const trustedMarketplacesMemento = observableMemento({
+    defaultValue: [],
+    key: "chat.plugins.trustedMarketplaces.v1",
+    toStorage: value => JSON.stringify(value),
+    fromStorage: value => {
+        const parsed = JSON.parse(value);
+        return Array.isArray(parsed) ? parsed : [];
+    }
+});
+let PluginMarketplaceService = class PluginMarketplaceService extends Disposable {
     constructor(
         _configurationService,
         _requestService,
@@ -45,6 +85,7 @@ let PluginMarketplaceService = class PluginMarketplaceService {
         _logService,
         _storageService
     ) {
+        super();
         this._configurationService = _configurationService;
         this._requestService = _requestService;
         this._fileService = _fileService;
@@ -52,6 +93,16 @@ let PluginMarketplaceService = class PluginMarketplaceService {
         this._logService = _logService;
         this._storageService = _storageService;
         this._gitHubMarketplaceCache = ( new Lazy(() => this._loadPersistedGitHubMarketplaceCache()));
+        this._installedPluginsStore = this._register(
+            installedPluginsMemento(StorageScope.APPLICATION, StorageTarget.MACHINE, _storageService)
+        );
+        this._trustedMarketplacesStore = this._register(
+            trustedMarketplacesMemento(StorageScope.APPLICATION, StorageTarget.MACHINE, _storageService)
+        );
+        this.installedPlugins = ( this._installedPluginsStore.map(s => ( revive(s).map(e => ({
+            ...e,
+            plugin: ensureSourceDescriptor(e.plugin)
+        })))));
         this.onDidChangeMarketplaces = Event.filter(
             _configurationService.onDidChangeConfiguration,
             e => e.affectsConfiguration(ChatConfiguration.PluginsEnabled) || e.affectsConfiguration(ChatConfiguration.PluginMarketplaces)
@@ -111,18 +162,21 @@ let PluginMarketplaceService = class PluginMarketplaceService {
                     continue;
                 }
                 const plugins = json.plugins.filter(p => typeof p.name === "string" && !!p.name).flatMap(p => {
-                    const source = resolvePluginSource(json.metadata?.pluginRoot, p.source ?? "");
-                    if (source === undefined) {
-                        this._logService.warn(
-                            `[PluginMarketplaceService] Skipping plugin '${p.name}' in ${repo}: invalid source path '${p.source ?? ""}' with pluginRoot '${json.metadata?.pluginRoot ?? ""}'`
-                        );
+                    const sourceDescriptor = parsePluginSource(p.source, json.metadata?.pluginRoot, {
+                        pluginName: p.name,
+                        logService: this._logService,
+                        logPrefix: `[PluginMarketplaceService]`
+                    });
+                    if (!sourceDescriptor) {
                         return [];
                     }
+                    const source = sourceDescriptor.kind === PluginSourceKind.RelativePath ? sourceDescriptor.path : "";
                     return [{
                         name: p.name,
                         description: p.description ?? "",
                         version: p.version ?? "",
                         source,
+                        sourceDescriptor,
                         marketplace: reference.displayLabel,
                         marketplaceReference: reference,
                         marketplaceType: def.type,
@@ -181,7 +235,7 @@ let PluginMarketplaceService = class PluginMarketplaceService {
             if (!reference) {
                 continue;
             }
-            const plugins = ( entry.plugins.map(plugin => ({
+            const plugins = ( entry.plugins.map(plugin => ensureSourceDescriptor({
                 ...plugin,
                 marketplace: reference.displayLabel,
                 marketplaceReference: reference
@@ -217,56 +271,41 @@ let PluginMarketplaceService = class PluginMarketplaceService {
             StorageTarget.MACHINE
         );
     }
-    async getMarketplacePluginMetadata(pluginUri) {
-        const configuredRefs = this._configurationService.getValue(ChatConfiguration.PluginMarketplaces) ?? [];
-        const refs = parseMarketplaceReferences(configuredRefs);
-        for (const ref of refs) {
-            let repoDir;
-            try {
-                repoDir = this._pluginRepositoryService.getRepositoryUri(ref);
-            } catch {
-                continue;
-            }
-            if (!isEqualOrParent(pluginUri, repoDir)) {
-                continue;
-            }
-            for (const def of MARKETPLACE_DEFINITIONS) {
-                const definitionUri = joinPath(repoDir, def.path);
-                let json;
-                try {
-                    const contents = await this._fileService.readFile(definitionUri);
-                    json = parse(( contents.value.toString()));
-                } catch {
-                    continue;
-                }
-                if (!json?.plugins || !Array.isArray(json.plugins)) {
-                    continue;
-                }
-                for (const p of json.plugins) {
-                    if (typeof p.name !== "string" || !p.name) {
-                        continue;
-                    }
-                    const source = resolvePluginSource(json.metadata?.pluginRoot, p.source ?? "");
-                    if (source === undefined) {
-                        continue;
-                    }
-                    const pluginSourceUri = normalizePath(joinPath(repoDir, source));
-                    if (isEqualOrParent(pluginUri, pluginSourceUri)) {
-                        return {
-                            name: p.name,
-                            description: p.description ?? "",
-                            version: p.version ?? "",
-                            source,
-                            marketplace: ref.displayLabel,
-                            marketplaceReference: ref,
-                            marketplaceType: def.type,
-                            readmeUri: getMarketplaceReadmeFileUri(repoDir, source)
-                        };
-                    }
-                }
-            }
+    getMarketplacePluginMetadata(pluginUri) {
+        const installed = this.installedPlugins.get();
+        return installed.find(e => isEqualOrParent(pluginUri, e.pluginUri))?.plugin;
+    }
+    addInstalledPlugin(pluginUri, plugin) {
+        const current = this.installedPlugins.get();
+        if (( current.some(e => isEqual(e.pluginUri, pluginUri)))) {
+            this._installedPluginsStore.set([...current], undefined);
+        } else {
+            this._installedPluginsStore.set([...current, {
+                pluginUri,
+                plugin,
+                enabled: true
+            }], undefined);
+        }
+    }
+    removeInstalledPlugin(pluginUri) {
+        const current = this.installedPlugins.get();
+        this._installedPluginsStore.set(current.filter(e => !isEqual(e.pluginUri, pluginUri)), undefined);
+    }
+    setInstalledPluginEnabled(pluginUri, enabled) {
+        const current = this.installedPlugins.get();
+        this._installedPluginsStore.set(( current.map(e => isEqual(e.pluginUri, pluginUri) ? {
+            ...e,
+            enabled
+        } : e)), undefined);
+    }
+    isMarketplaceTrusted(ref) {
+        return this._trustedMarketplacesStore.get().includes(ref.canonicalId);
+    }
+    trustMarketplace(ref) {
+        const current = this._trustedMarketplacesStore.get();
+        if (!current.includes(ref.canonicalId)) {
+            this._trustedMarketplacesStore.set([...current, ref.canonicalId], undefined);
         }
-        return undefined;
     }
     async _fetchFromClonedRepo(reference, token) {
         let repoDir;
@@ -296,18 +335,21 @@ let PluginMarketplaceService = class PluginMarketplaceService {
                 continue;
             }
             return json.plugins.filter(p => typeof p.name === "string" && !!p.name).flatMap(p => {
-                const source = resolvePluginSource(json.metadata?.pluginRoot, p.source ?? "");
-                if (source === undefined) {
-                    this._logService.warn(
-                        `[PluginMarketplaceService] Skipping plugin '${p.name}' in ${reference.rawValue}: invalid source path '${p.source ?? ""}' with pluginRoot '${json.metadata?.pluginRoot ?? ""}'`
-                    );
+                const sourceDescriptor = parsePluginSource(p.source, json.metadata?.pluginRoot, {
+                    pluginName: p.name,
+                    logService: this._logService,
+                    logPrefix: `[PluginMarketplaceService]`
+                });
+                if (!sourceDescriptor) {
                     return [];
                 }
+                const source = sourceDescriptor.kind === PluginSourceKind.RelativePath ? sourceDescriptor.path : "";
                 return [{
                     name: p.name,
                     description: p.description ?? "",
                     version: p.version ?? "",
                     source,
+                    sourceDescriptor,
                     marketplace: reference.displayLabel,
                     marketplaceReference: reference,
                     marketplaceType: def.type,
@@ -465,6 +507,158 @@ function resolvePluginSource(pluginRoot, source) {
     const resolvedUri = normalizePath(joinPath(pluginRootUri, normalizedSource));
     return relativePath(repoRoot, resolvedUri) ?? undefined;
 }
+function parsePluginSource(rawSource, pluginRoot, logContext) {
+    if (rawSource === undefined || rawSource === null) {
+        const resolved = resolvePluginSource(pluginRoot, "");
+        if (resolved === undefined) {
+            return undefined;
+        }
+        return {
+            kind: PluginSourceKind.RelativePath,
+            path: resolved
+        };
+    }
+    if (typeof rawSource === "string") {
+        const resolved = resolvePluginSource(pluginRoot, rawSource);
+        if (resolved === undefined) {
+            return undefined;
+        }
+        return {
+            kind: PluginSourceKind.RelativePath,
+            path: resolved
+        };
+    }
+    if (typeof rawSource !== "object" || typeof rawSource.source !== "string") {
+        logContext.logService.warn(
+            `${logContext.logPrefix} Skipping plugin '${logContext.pluginName}': source object is missing a 'source' discriminant`
+        );
+        return undefined;
+    }
+    switch (rawSource.source) {
+    case "github":
+        {
+            if (typeof rawSource.repo !== "string" || !rawSource.repo) {
+                logContext.logService.warn(
+                    `${logContext.logPrefix} Skipping plugin '${logContext.pluginName}': github source is missing required 'repo' field`
+                );
+                return undefined;
+            }
+            if (!isValidGitHubRepo(rawSource.repo)) {
+                logContext.logService.warn(
+                    `${logContext.logPrefix} Skipping plugin '${logContext.pluginName}': github source repo must be in 'owner/repo' format`
+                );
+                return undefined;
+            }
+            if (!isOptionalString(rawSource.ref)) {
+                logContext.logService.warn(
+                    `${logContext.logPrefix} Skipping plugin '${logContext.pluginName}': github source 'ref' must be a string when provided`
+                );
+                return undefined;
+            }
+            if (!isOptionalGitSha(rawSource.sha)) {
+                logContext.logService.warn(
+                    `${logContext.logPrefix} Skipping plugin '${logContext.pluginName}': github source 'sha' must be a full 40-character commit hash when provided`
+                );
+                return undefined;
+            }
+            return {
+                kind: PluginSourceKind.GitHub,
+                repo: rawSource.repo,
+                ref: rawSource.ref,
+                sha: rawSource.sha
+            };
+        }
+    case "url":
+        {
+            if (typeof rawSource.url !== "string" || !rawSource.url) {
+                logContext.logService.warn(
+                    `${logContext.logPrefix} Skipping plugin '${logContext.pluginName}': url source is missing required 'url' field`
+                );
+                return undefined;
+            }
+            if (!rawSource.url.toLowerCase().endsWith(".git")) {
+                logContext.logService.warn(
+                    `${logContext.logPrefix} Skipping plugin '${logContext.pluginName}': url source must end with '.git'`
+                );
+                return undefined;
+            }
+            if (!isOptionalString(rawSource.ref)) {
+                logContext.logService.warn(
+                    `${logContext.logPrefix} Skipping plugin '${logContext.pluginName}': url source 'ref' must be a string when provided`
+                );
+                return undefined;
+            }
+            if (!isOptionalGitSha(rawSource.sha)) {
+                logContext.logService.warn(
+                    `${logContext.logPrefix} Skipping plugin '${logContext.pluginName}': url source 'sha' must be a full 40-character commit hash when provided`
+                );
+                return undefined;
+            }
+            return {
+                kind: PluginSourceKind.GitUrl,
+                url: rawSource.url,
+                ref: rawSource.ref,
+                sha: rawSource.sha
+            };
+        }
+    case "npm":
+        {
+            if (typeof rawSource.package !== "string" || !rawSource.package) {
+                logContext.logService.warn(
+                    `${logContext.logPrefix} Skipping plugin '${logContext.pluginName}': npm source is missing required 'package' field`
+                );
+                return undefined;
+            }
+            if (!isOptionalString(rawSource.version) || !isOptionalString(rawSource.registry)) {
+                logContext.logService.warn(
+                    `${logContext.logPrefix} Skipping plugin '${logContext.pluginName}': npm source 'version' and 'registry' must be strings when provided`
+                );
+                return undefined;
+            }
+            return {
+                kind: PluginSourceKind.Npm,
+                package: rawSource.package,
+                version: rawSource.version,
+                registry: rawSource.registry
+            };
+        }
+    case "pip":
+        {
+            if (typeof rawSource.package !== "string" || !rawSource.package) {
+                logContext.logService.warn(
+                    `${logContext.logPrefix} Skipping plugin '${logContext.pluginName}': pip source is missing required 'package' field`
+                );
+                return undefined;
+            }
+            if (!isOptionalString(rawSource.version) || !isOptionalString(rawSource.registry)) {
+                logContext.logService.warn(
+                    `${logContext.logPrefix} Skipping plugin '${logContext.pluginName}': pip source 'version' and 'registry' must be strings when provided`
+                );
+                return undefined;
+            }
+            return {
+                kind: PluginSourceKind.Pip,
+                package: rawSource.package,
+                version: rawSource.version,
+                registry: rawSource.registry
+            };
+        }
+    default:
+        logContext.logService.warn(
+            `${logContext.logPrefix} Skipping plugin '${logContext.pluginName}': unknown source kind '${rawSource.source}'`
+        );
+        return undefined;
+    }
+}
+function isOptionalString(value) {
+    return value === undefined || typeof value === "string";
+}
+function isOptionalGitSha(value) {
+    return value === undefined || (typeof value === "string" && /^[0-9a-fA-F]{40}$/.test(value));
+}
+function isValidGitHubRepo(repo) {
+    return /^[A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+$/.test(repo);
+}
 function getMarketplaceReadmeUri(repo, source) {
     const normalizedSource = source.trim().replace(/^\.?\/+|\/+$/g, "");
     const readmePath = normalizedSource ? `${normalizedSource}/README.md` : "README.md";
@@ -475,4 +669,4 @@ function getMarketplaceReadmeFileUri(repoDir, source) {
     return normalizedSource ? joinPath(repoDir, normalizedSource, "README.md") : joinPath(repoDir, "README.md");
 }
 
-export { MarketplaceReferenceKind, MarketplaceType, PluginMarketplaceService, parseMarketplaceReference, parseMarketplaceReferences };
+export { MarketplaceReferenceKind, MarketplaceType, PluginMarketplaceService, PluginSourceKind, parseMarketplaceReference, parseMarketplaceReferences, parsePluginSource };

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(6906, "Contributes {0} for chat prompts.", point)),
+            description: ( localize(7025, "Contributes {0} for chat prompts.", point)),
             type: "array",
             items: {
                 additionalProperties: false,
@@ -39,23 +39,23 @@ function registerChatFilesExtensionPoint(point) {
                 properties: {
                     path: {
                         description: point === ChatContributionPoint.chatSkills ? ( localize(
-                            6907,
+                            7026,
                             "Path to the SKILL.md file relative to the extension root. The folder name must match the \"name\" property in SKILL.md."
-                        )) : ( localize(6908, "Path to the file relative to the extension root.")),
+                        )) : ( localize(7027, "Path to the file relative to the extension root.")),
                         type: "string"
                     },
                     name: {
-                        description: ( localize(6909, "(Optional) Name for this entry.")),
-                        deprecationMessage: ( localize(6910, "Specify \"name\" in the prompt file itself instead.")),
+                        description: ( localize(7028, "(Optional) Name for this entry.")),
+                        deprecationMessage: ( localize(7029, "Specify \"name\" in the prompt file itself instead.")),
                         type: "string"
                     },
                     description: {
-                        description: ( localize(6911, "(Optional) Description of the entry.")),
-                        deprecationMessage: ( localize(6912, "Specify \"description\" in the prompt file itself instead.")),
+                        description: ( localize(7030, "(Optional) Description of the entry.")),
+                        deprecationMessage: ( localize(7031, "Specify \"description\" in the prompt file itself instead.")),
                         type: "string"
                     },
                     when: {
-                        description: ( localize(6913, "(Optional) A condition which must be true to enable this entry.")),
+                        description: ( localize(7032, "(Optional) A condition which must be true to enable this entry.")),
                         type: "string"
                     }
                 }
@@ -106,7 +106,7 @@ let ChatPromptFilesExtensionPointHandler = class ChatPromptFilesExtensionPointHa
                 for (const raw of ext.value) {
                     if (!raw.path) {
                         ext.collector.error(( localize(
-                            6914,
+                            7033,
                             "Extension '{0}' cannot register {1} entry without path.",
                             ext.description.identifier.value,
                             contributionPoint
@@ -116,7 +116,7 @@ let ChatPromptFilesExtensionPointHandler = class ChatPromptFilesExtensionPointHa
                     const fileUri = joinPath(ext.description.extensionLocation, raw.path);
                     if (!isEqualOrParent(fileUri, ext.description.extensionLocation)) {
                         ext.collector.error(( localize(
-                            6915,
+                            7034,
                             "Extension '{0}' {1} entry '{2}' resolves outside the extension.",
                             ext.description.identifier.value,
                             contributionPoint,
@@ -126,7 +126,7 @@ let ChatPromptFilesExtensionPointHandler = class ChatPromptFilesExtensionPointHa
                     }
                     if (raw.when && !ContextKeyExpr.deserialize(raw.when)) {
                         ext.collector.error(( localize(
-                            6916,
+                            7035,
                             "Extension '{0}' {1} entry '{2}' has an invalid when clause: '{3}'.",
                             ext.description.identifier.value,
                             contributionPoint,
@@ -141,7 +141,7 @@ let ChatPromptFilesExtensionPointHandler = class ChatPromptFilesExtensionPointHa
                     } catch (e) {
                         const msg = e instanceof Error ? e.message : String(e);
                         ext.collector.error(( localize(
-                            6917,
+                            7036,
                             "Extension '{0}' {1}. Failed to register {2}: {3}",
                             ext.description.identifier.value,
                             contributionPoint,
@@ -201,7 +201,7 @@ class ChatPromptFilesDataRenderer extends Disposable {
                 dispose: () => {}
             };
         }
-        const headers = [( localize(6918, "Name")), ( localize(6919, "Description")), ( localize(6920, "Path"))];
+        const headers = [( localize(7037, "Name")), ( localize(7038, "Description")), ( localize(7039, "Path"))];
         const rows = ( contributions.map(d => {
             return [d.name ?? "-", d.description ?? "-", d.path];
         }));
@@ -216,7 +216,7 @@ class ChatPromptFilesDataRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: ChatContributionPoint.chatPromptFiles,
-    label: ( localize(6921, "Chat Prompt Files")),
+    label: ( localize(7040, "Chat Prompt Files")),
     access: {
         canToggle: false
     },
@@ -224,7 +224,7 @@ class ChatPromptFilesDataRenderer extends Disposable {
 });
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: ChatContributionPoint.chatInstructions,
-    label: ( localize(6922, "Chat Instructions")),
+    label: ( localize(7041, "Chat Instructions")),
     access: {
         canToggle: false
     },
@@ -232,7 +232,7 @@ class ChatPromptFilesDataRenderer extends Disposable {
 });
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: ChatContributionPoint.chatAgents,
-    label: ( localize(6923, "Chat Agents")),
+    label: ( localize(7042, "Chat Agents")),
     access: {
         canToggle: false
     },
@@ -240,7 +240,7 @@ class ChatPromptFilesDataRenderer extends Disposable {
 });
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: ChatContributionPoint.chatSkills,
-    label: ( localize(6924, "Chat Skills")),
+    label: ( localize(7043, "Chat Skills")),
     access: {
         canToggle: false
     },

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

@@ -1,11 +1,7 @@
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { HookType, IHookCommand } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookSchema";
-/**
- * Maps Claude hook type names to our abstract HookType.
- * Claude uses PascalCase and slightly different names.
- * @see https://docs.anthropic.com/en/docs/claude-code/hooks
- */
-export declare const CLAUDE_HOOK_TYPE_MAP: Record<string, HookType>;
+import { IHookCommand, extractHookCommandsFromItem } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookSchema";
+import { HookType } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookTypes";
+export { extractHookCommandsFromItem };
 /**
  * Resolves a Claude hook type name to our abstract HookType.
  */
@@ -52,12 +48,3 @@ export interface IParseClaudeHooksResult {
  * If the file has `disableAllHooks: true` at the top level, all hooks are filtered out.
  */
 export declare function parseClaudeHooks(json: unknown, workspaceRootUri: URI | undefined, userHome: string): IParseClaudeHooksResult;
-/**
- * Helper to extract hook commands from an item that could be:
- * 1. A direct command object: { type: 'command', command: '...' }
- * 2. A nested structure with matcher (Claude style): { matcher: '...', hooks: [{ type: 'command', command: '...' }] }
- *
- * This allows Copilot format to handle Claude-style entries if pasted.
- * Also handles Claude's leniency where 'type' field can be omitted.
- */
-export declare function extractHookCommandsFromItem(item: unknown, workspaceRootUri: URI | undefined, userHome: string): IHookCommand[];

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

@@ -1,28 +1,21 @@
 
-import { HookType, toHookType, resolveHookCommand } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookSchema';
+import { toHookType, extractHookCommandsFromItem } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookSchema';
+export { extractHookCommandsFromItem } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookSchema';
+import { HOOKS_BY_TARGET } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookTypes';
+import { Target } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 
-const CLAUDE_HOOK_TYPE_MAP = {
-    "SessionStart": HookType.SessionStart,
-    "UserPromptSubmit": HookType.UserPromptSubmit,
-    "PreToolUse": HookType.PreToolUse,
-    "PostToolUse": HookType.PostToolUse,
-    "PreCompact": HookType.PreCompact,
-    "SubagentStart": HookType.SubagentStart,
-    "SubagentStop": HookType.SubagentStop,
-    "Stop": HookType.Stop
-};
 let _hookTypeToClaudeName;
 function getHookTypeToClaudeNameMap() {
     if (!_hookTypeToClaudeName) {
         _hookTypeToClaudeName = ( new Map());
-        for (const [claudeName, hookType] of Object.entries(CLAUDE_HOOK_TYPE_MAP)) {
+        for (const [claudeName, hookType] of Object.entries(HOOKS_BY_TARGET[Target.Claude])) {
             _hookTypeToClaudeName.set(hookType, claudeName);
         }
     }
     return _hookTypeToClaudeName;
 }
 function resolveClaudeHookType(name) {
-    return CLAUDE_HOOK_TYPE_MAP[name];
+    return HOOKS_BY_TARGET[Target.Claude][name];
 }
 function getClaudeHookTypeName(hookType) {
     return getHookTypeToClaudeNameMap().get(hookType);
@@ -81,41 +74,5 @@ function parseClaudeHooks(json, workspaceRootUri, userHome) {
         disabledAllHooks: false
     };
 }
-function extractHookCommandsFromItem(item, workspaceRootUri, userHome) {
-    if (!item || typeof item !== "object") {
-        return [];
-    }
-    const itemObj = item;
-    const commands = [];
-    const nestedHooks = itemObj.hooks;
-    if (nestedHooks !== undefined && Array.isArray(nestedHooks)) {
-        for (const nestedHook of nestedHooks) {
-            if (!nestedHook || typeof nestedHook !== "object") {
-                continue;
-            }
-            const normalized = normalizeForResolve(nestedHook);
-            const resolved = resolveHookCommand(normalized, workspaceRootUri, userHome);
-            if (resolved) {
-                commands.push(resolved);
-            }
-        }
-    } else {
-        const normalized = normalizeForResolve(itemObj);
-        const resolved = resolveHookCommand(normalized, workspaceRootUri, userHome);
-        if (resolved) {
-            commands.push(resolved);
-        }
-    }
-    return commands;
-}
-function normalizeForResolve(raw) {
-    if (raw.type === undefined || raw.type === "command") {
-        return {
-            ...raw,
-            type: "command"
-        };
-    }
-    return raw;
-}
 
-export { CLAUDE_HOOK_TYPE_MAP, extractHookCommandsFromItem, getClaudeHookTypeName, parseClaudeHooks, resolveClaudeHookType };
+export { getClaudeHookTypeName, parseClaudeHooks, resolveClaudeHookType };

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

@@ -1,5 +1,6 @@
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { HookType, IHookCommand } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookSchema";
+import { IHookCommand } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookSchema";
+import { HookType } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookTypes";
 /**
  * Represents a hook source with its original and normalized properties.
  * Used to display hooks from different formats in a unified view.