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

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

@@ -1,25 +1,35 @@
 
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/charCode';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/marshallingIds';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/path';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/hash';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import '../../../../../../platform/agentHost/common/agentHostSchema.js';
-import '../../../../../../platform/agentHost/common/agentService.js';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/remoteAgentHostService';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostSchema';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-root/state';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-session/state';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-chat/state';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-terminal/state';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-changeset/state';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-resource-watch/state';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-automation/state';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-automation-run/state';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/common/actions';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/sessionState';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
+import '@codingame/monaco-vscode-api/vscode/vs/nls';
 import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/oauth';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/charCode';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/marshallingIds';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/path';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
+import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 
 class NullAgentHostCustomizationService {
     constructor() {
@@ -32,9 +42,21 @@ class NullAgentHostCustomizationService {
     getCustomizations(_sessionResource) {
         return [];
     }
+    whenCustomizationsReady(_sessionResource, _token) {
+        return Promise.resolve();
+    }
+    getFolderPickerDecision(_sessionResource) {
+        return undefined;
+    }
     getWorkingDirectory(sessionResource) {
         return undefined;
     }
+    getWorkingDirectories(_sessionResource) {
+        return [];
+    }
+    getClientWorkingDirectoryUris(_sessionResource) {
+        return [];
+    }
     getMcpServers(_sessionResource) {
         return [];
     }
@@ -42,6 +64,10 @@ class NullAgentHostCustomizationService {
     authenticateMcpServer(_sessionResource, _serverId) {
         return Promise.resolve(false);
     }
+    setCustomizationEnablement(_sessionResource, _customizationId, _currentEnablement, _kind, _enabled) {}
+    async showMcpServerLog(_sessionResource, _serverId, beforeShow) {
+        await beforeShow?.();
+    }
 }
 
 export { NullAgentHostCustomizationService };

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

@@ -0,0 +1,20 @@
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import type { Turn } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/sessionState";
+import type { ModelSelection } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/state";
+import { IAgentHostImportConversationStore } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostImportConversationStore.service";
+/**
+ * A conversation being imported ("Continue in…") into a new agent-host session:
+ * the translated {@link Turn}s plus the source session's selected model, so the
+ * new session resumes on the same model instead of the host's default.
+ */
+export interface IAgentHostImportConversation {
+    readonly turns: readonly Turn[];
+    readonly model?: ModelSelection;
+}
+export declare class AgentHostImportConversationStore implements IAgentHostImportConversationStore {
+    readonly _serviceBrand: undefined;
+    private readonly _pending;
+    set(resource: URI, conversation: IAgentHostImportConversation): void;
+    take(resource: URI): IAgentHostImportConversation | undefined;
+    rename(oldResource: URI, newResource: URI): void;
+}

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

@@ -0,0 +1,26 @@
+
+
+class AgentHostImportConversationStore {
+    constructor() {
+        this._pending = ( new Map());
+    }
+    set(resource, conversation) {
+        if (conversation.turns.length > 0) {
+            this._pending.set(( resource.toString()), conversation);
+        }
+    }
+    take(resource) {
+        const key = ( resource.toString());
+        const conversation = this._pending.get(key);
+        this._pending.delete(key);
+        return conversation;
+    }
+    rename(oldResource, newResource) {
+        const conversation = this.take(oldResource);
+        if (conversation) {
+            this._pending.set(( newResource.toString()), conversation);
+        }
+    }
+}
+
+export { AgentHostImportConversationStore };

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

@@ -1,5 +1,6 @@
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { type AgentCustomization } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/state";
 import { type ClientPluginCustomization } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/sessionState";
 import { AICustomizationSource } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/aiCustomizationWorkspaceService";
 import { PromptsType } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes";
@@ -19,11 +20,17 @@ import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/fi
  */
 export declare const SYNCABLE_PROMPT_TYPES: readonly PromptsType[];
 /**
- * Storage sources whose contents are auto-synced. Extension and built-in
- * customizations are included so the agent host has the same skills,
- * instructions, and agents available as the local VS Code client.
+ * Storage sources whose contents are auto-synced by default. Remote agent
+ * registrations can additionally include user storage.
+ *
+ * `builtin` only yields skills bundled with the Agents app (e.g. `/create-pr`,
+ * `/merge`); for every other prompt type the prompts service returns nothing,
+ * and in the regular VS Code workbench window it returns nothing at all.
  */
 export declare const SYNCABLE_STORAGE_SOURCES: readonly PromptsStorage[];
+export interface ILocalCustomizationSyncOptions {
+    readonly includeUserStorage?: boolean;
+}
 export interface ILocalCustomizationFile {
     readonly uri: URI;
     readonly type: PromptsType;
@@ -46,23 +53,34 @@ export interface ILocalCustomizationFile {
  * any per-provider plumbing. In the regular VS Code workbench window the
  * built-in lookup returns nothing and this is a no-op.
  */
-export declare function enumerateLocalCustomizationsForHarness(promptsService: IPromptsService, syncProvider: ICustomizationSyncProvider, sessionType: string, token: CancellationToken): Promise<readonly ILocalCustomizationFile[]>;
+export declare function enumerateLocalCustomizationsForHarness(promptsService: IPromptsService, syncProvider: ICustomizationSyncProvider, sessionType: string, token: CancellationToken, options: ILocalCustomizationSyncOptions | undefined): Promise<readonly ILocalCustomizationFile[]>;
+/**
+ * Resolves the selectable custom-agent metadata that the client has already
+ * discovered and will publish to an agent host for `sessionType`.
+ *
+ * Client customization refs intentionally omit parsed children; the host adds
+ * those later in `SessionState.customizations`. New Agents-window drafts need
+ * the picker before that state exists, so this mirrors the same eligibility
+ * rules used by {@link resolveCustomizationRefs} without waiting for the host
+ * to parse the plugin or synthetic bundle.
+ */
+export declare function resolveLocalCustomAgents(fileService: IFileService, promptsService: IPromptsService, syncProvider: ICustomizationSyncProvider, agentPluginService: IAgentPluginService, sessionType: string, options: ILocalCustomizationSyncOptions | undefined): Promise<readonly AgentCustomization[]>;
 /**
  * Enumerates MCP servers configured directly in VS Code — i.e. those that
  * are not contributed by an agent plugin — so they can be bundled into the
  * synthetic synced plugin. Plugin-sourced servers are excluded because they
- * are already synced via their owning plugin's customization ref. Disabled
- * servers and servers whose launch cannot be expressed declaratively are
- * skipped.
+ * are already synced via their owning plugin's customization ref. Servers whose
+ * launch cannot be expressed declaratively are skipped.
  *
  * Workspace-discovered servers are also excluded by default: the agent host
  * discovers workspace `.mcp.json` itself, so syncing them would duplicate. The
  * exception is `.vscode/mcp.json`, which the agent host does not discover
  * (despite what the SDK's `enableConfigDiscovery` docs imply) — those are
  * synced, but only when their config can be resolved without requiring user
- * interaction.
+ * interaction. For agent-host providers with their own GitHub MCP server, the
+ * Copilot Chat extension's duplicate provider is excluded.
  */
-export declare function collectNonPluginMcpServers(mcpService: IMcpService, configurationResolverService: IConfigurationResolverService): Promise<ISyncableMcpServer[]>;
+export declare function collectNonPluginMcpServers(mcpService: IMcpService, configurationResolverService: IConfigurationResolverService, sessionType: string, workingDirectories: readonly URI[]): Promise<ISyncableMcpServer[]>;
 /**
  * Resolves the customization refs to include in an `activeClientSet`
  * message.
@@ -72,4 +90,4 @@ export declare function collectNonPluginMcpServers(mcpService: IMcpService, conf
  * remaining loose files — together with MCP servers configured directly in
  * VS Code — are bundled into a synthetic Open Plugin.
  */
-export declare function resolveCustomizationRefs(fileService: IFileService, promptsService: IPromptsService, syncProvider: ICustomizationSyncProvider, agentPluginService: IAgentPluginService, mcpService: IMcpService, configurationResolverService: IConfigurationResolverService, bundler: SyncedCustomizationBundler, sessionType: string): Promise<ClientPluginCustomization[]>;
+export declare function resolveCustomizationRefs(fileService: IFileService, promptsService: IPromptsService, syncProvider: ICustomizationSyncProvider, agentPluginService: IAgentPluginService, mcpService: IMcpService, configurationResolverService: IConfigurationResolverService, bundler: SyncedCustomizationBundler, sessionType: string, options: ILocalCustomizationSyncOptions | undefined, workingDirectories?: readonly URI[]): Promise<ClientPluginCustomization[]>;

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

@@ -1,23 +1,23 @@
 
 import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
-import { Iterable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iterator';
-import { isEqualOrParent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { ResourceSet } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
+import { isEqualOrParent, basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-root/state';
-import { CustomizationType } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-session/state';
+import { CustomizationType, CustomizationEnablementKind } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-session/state';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-chat/state';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-terminal/state';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-changeset/state';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-resource-watch/state';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-automation/state';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-automation-run/state';
 import { customizationId } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/sessionState';
-import { McpServerType } from '@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpPlatformTypes';
-import { BUILTIN_STORAGE, AICustomizationSources } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/aiCustomizationWorkspaceService';
+import { withCustomizationEnablement } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/customizationEnablement';
+import { AICustomizationSources } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/aiCustomizationWorkspaceService';
 import { PromptsType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
-import { PromptsStorage, matchesSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService';
-import { isContributionEnabled } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/enablement';
-import { MCP_PLUGIN_COLLECTION_ID_PREFIX } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/discovery/pluginMcpDiscovery';
-import { McpServerTransportType, McpCollectionDefinition } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
-import { ConfigurationResolverExpression } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/configurationResolver/common/configurationResolverExpression';
+import { PromptsStorage, isUserToggleableCustomization, matchesSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService';
 import { isDefined } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
+import { PromptFileParser } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptFileParser';
+import { resolveMcpServersForAgentHostDelivery, AgentHostMcpServerDelivery } from './agentHostMcpServerSupport.js';
 
 const SYNCABLE_PROMPT_TYPES = [
     PromptsType.agent,
@@ -25,126 +25,111 @@ const SYNCABLE_PROMPT_TYPES = [
     PromptsType.instructions,
     PromptsType.prompt
 ];
-const SYNCABLE_STORAGE_SOURCES = [PromptsStorage.plugin, PromptsStorage.extension];
-async function enumerateLocalCustomizationsForHarness(promptsService, syncProvider, sessionType, token) {
+const SYNCABLE_STORAGE_SOURCES = [PromptsStorage.plugin, PromptsStorage.extension, PromptsStorage.builtIn];
+async function enumerateLocalCustomizationsForHarness(promptsService, syncProvider, sessionType, token, options) {
     const result = [];
+    const seenUris = ( new ResourceSet());
+    const storageSources = options?.includeUserStorage ? [PromptsStorage.user, ...SYNCABLE_STORAGE_SOURCES] : SYNCABLE_STORAGE_SOURCES;
     for (const type of SYNCABLE_PROMPT_TYPES) {
-        const lists = await Promise.all(( SYNCABLE_STORAGE_SOURCES.map(storage => promptsService.listPromptFilesForStorage(type, storage, token))));
+        const userDisabled = promptsService.getDisabledPromptFiles(type);
+        const lists = await Promise.all(( storageSources.map(storage => promptsService.listPromptFilesForStorage(type, storage, token))));
         for (let i = 0; i < lists.length; i++) {
-            const source = SYNCABLE_STORAGE_SOURCES[i];
+            const source = storageSources[i];
+            const userToggleable = isUserToggleableCustomization(type, source);
             for (const file of lists[i]) {
-                if (matchesSessionType(file.sessionTypes, sessionType)) {
+                if (matchesSessionType(file.sessionTypes, sessionType) && !( seenUris.has(file.uri))) {
+                    seenUris.add(file.uri);
                     result.push({
                         uri: file.uri,
                         type,
                         source,
                         pluginUri: file.pluginUri,
                         extensionId: file.extension?.identifier.value,
-                        disabled: syncProvider.isDisabled(file.uri)
+                        disabled: syncProvider.isDisabled(file.uri) || (userToggleable && ( userDisabled.has(file.uri)))
                     });
                 }
             }
         }
     }
-    let builtinSkills = [];
-    try {
-        builtinSkills = await promptsService.listPromptFilesForStorage(PromptsType.skill, BUILTIN_STORAGE, token);
-    } catch {
-        builtinSkills = [];
-    }
-    for (const file of builtinSkills) {
-        if (matchesSessionType(file.sessionTypes, sessionType)) {
-            result.push({
-                uri: file.uri,
-                type: PromptsType.skill,
-                source: BUILTIN_STORAGE,
-                disabled: syncProvider.isDisabled(file.uri)
-            });
-        }
-    }
     return result;
 }
-function launchToMcpServerConfiguration(launch) {
-    switch (launch.type) {
-    case McpServerTransportType.Stdio:
-        if (!launch.command) {
-            return undefined;
-        }
-        return {
-            type: McpServerType.LOCAL,
-            command: launch.command,
-            args: launch.args.length > 0 ? [...launch.args] : undefined,
-            env: ( Object.keys(launch.env)).length > 0 ? {
-                ...launch.env
-            } : undefined,
-            envFile: launch.envFile,
-            cwd: launch.cwd
-        };
-    case McpServerTransportType.HTTP:
-        return {
-            type: McpServerType.REMOTE,
-            url: ( launch.uri.toString()),
-            headers: launch.headers.length > 0 ? Object.fromEntries(launch.headers) : undefined
-        };
-    }
-}
-async function resolveConfigurationForSync(configurationResolverService, folder, configuration) {
-    const expr = ConfigurationResolverExpression.parse(configuration);
-    for (const replacement of expr.unresolved()) {
-        if (replacement.name === "input" || replacement.name === "command") {
-            return undefined;
-        }
-    }
-    try {
-        await configurationResolverService.resolveAsync(folder, expr);
-    } catch {
-        return undefined;
-    }
-    if (!Iterable.isEmpty(expr.unresolved())) {
-        return undefined;
-    }
-    return expr.toObject();
-}
-async function collectNonPluginMcpServers(mcpService, configurationResolverService) {
+async function resolveLocalCustomAgents(
+    fileService,
+    promptsService,
+    syncProvider,
+    agentPluginService,
+    sessionType,
+    options
+) {
+    const plugins = agentPluginService.plugins.get();
     const result = [];
-    for (const server of mcpService.servers.get()) {
-        if (server.collection.id.startsWith(MCP_PLUGIN_COLLECTION_ID_PREFIX)) {
-            continue;
-        }
-        if (!isContributionEnabled(server.enablement.get())) {
+    const parser = ( new PromptFileParser());
+    const pending = [];
+    const enumerated = await enumerateLocalCustomizationsForHarness(promptsService, syncProvider, sessionType, CancellationToken.None, options);
+    for (const agent of enumerated) {
+        if (agent.type !== PromptsType.agent || agent.disabled) {
             continue;
         }
-        const definitions = server.readDefinitions().get();
-        const definition = definitions.server;
-        const launch = definition?.launch;
-        if (!launch) {
+        const plugin = agent.source === AICustomizationSources.plugin ? plugins.find(candidate => isEqualOrParent(agent.uri, candidate.uri)) : undefined;
+        if (agent.source === AICustomizationSources.plugin && !plugin) {
             continue;
         }
-        let configuration = launchToMcpServerConfiguration(launch);
-        if (!configuration) {
-            continue;
+        const pluginAgent = plugin?.agents.get().find(candidate => ( candidate.uri.toString()) === ( agent.uri.toString()));
+        pending.push((async () => {
+            let name = pluginAgent?.name ?? basename(agent.uri, ".agent.md");
+            let description = pluginAgent?.description;
+            let disableUserInvocation;
+            try {
+                const content = await fileService.readFile(agent.uri);
+                const header = parser.parse(agent.uri, ( content.value.toString())).header;
+                name = header?.name ?? name;
+                description = header?.description ?? description;
+                disableUserInvocation = header?.userInvocable === false || undefined;
+            } catch {}
+            result.push({
+                type: CustomizationType.Agent,
+                id: ( agent.uri.toString()),
+                uri: ( agent.uri.toString()),
+                name,
+                description,
+                disableUserInvocation
+            });
+        })());
+    }
+    await Promise.all(pending);
+    result.sort((a, b) => a.name.localeCompare(b.name) || ( a.uri.toString()).localeCompare(( b.uri.toString())));
+    return result;
+}
+async function collectNonPluginMcpServers(mcpService, configurationResolverService, sessionType, workingDirectories) {
+    const resolved = await resolveMcpServersForAgentHostDelivery(
+        mcpService.servers.get(),
+        configurationResolverService,
+        sessionType,
+        workingDirectories
+    );
+    return resolved.flatMap((
+        {
+            server,
+            definition,
+            delivery,
+            projectedConfiguration
         }
-        const collection = definitions.collection;
-        if (collection && McpCollectionDefinition.isWorkspaceDiscovered(collection)) {
-            if (!McpCollectionDefinition.isVscodeMcpJson(collection)) {
-                continue;
-            }
-            const resolved = await resolveConfigurationForSync(
-                configurationResolverService,
-                definition.variableReplacement?.folder,
-                configuration
-            );
-            if (!resolved) {
-                continue;
-            }
-            configuration = resolved;
+    ) => {
+        if (delivery !== AgentHostMcpServerDelivery.ClientForwarded || !definition || !projectedConfiguration) {
+            return [];
         }
-        result.push({
+        return [{
             name: server.definition.label,
-            configuration
-        });
-    }
-    return result;
+            configuration: projectedConfiguration,
+            ...(definition.defaultCwd && {
+                defaultCwd: definition.defaultCwd
+            }),
+            enablement: withCustomizationEnablement(undefined, CustomizationEnablementKind.Global, {
+                kind: CustomizationEnablementKind.Global,
+                enabled: mcpService.enablementModel.readProfileEnabled(server.definition.id)
+            })
+        }];
+    });
 }
 async function resolveCustomizationRefs(
     fileService,
@@ -154,9 +139,11 @@ async function resolveCustomizationRefs(
     mcpService,
     configurationResolverService,
     bundler,
-    sessionType
+    sessionType,
+    options,
+    workingDirectories = []
 ) {
-    const enumerated = await enumerateLocalCustomizationsForHarness(promptsService, syncProvider, sessionType, CancellationToken.None);
+    const enumerated = await enumerateLocalCustomizationsForHarness(promptsService, syncProvider, sessionType, CancellationToken.None, options);
     const enabled = enumerated.filter(e => !e.disabled);
     const plugins = agentPluginService.plugins.get();
     const pluginRefs = ( new Map());
@@ -169,14 +156,20 @@ async function resolveCustomizationRefs(
                 try {
                     nonce = (await fileService.stat(plugin.uri)).mtime;
                 } catch {}
-                return {
+                const ref = {
                     type: CustomizationType.Plugin,
                     id: customizationId(key),
                     uri: key,
                     name: plugin.label,
-                    nonce: nonce?.toString(16),
-                    enabled: true
+                    enablement: withCustomizationEnablement(undefined, CustomizationEnablementKind.Global, {
+                        kind: CustomizationEnablementKind.Global,
+                        enabled: agentPluginService.enablementModel.readProfileEnabled(key)
+                    })
                 };
+                if (nonce !== undefined) {
+                    ref.nonce = ( nonce.toString(16));
+                }
+                return ref;
             })();
             pluginRefs.set(key, promise);
         }
@@ -187,17 +180,14 @@ async function resolveCustomizationRefs(
             if (!plugin) {
                 continue;
             }
-            if (syncProvider.isDisabled(plugin.uri)) {
-                continue;
-            }
-            if (!isContributionEnabled(plugin.enablement.get())) {
-                continue;
-            }
             addPluginRef(plugin);
         } else {
             looseFiles.push({
                 uri: entry.uri,
-                type: entry.type
+                type: entry.type,
+                source: entry.source,
+                extensionId: entry.extensionId,
+                pluginUri: entry.pluginUri
             });
         }
     }
@@ -205,23 +195,17 @@ async function resolveCustomizationRefs(
         if (( pluginRefs.has(( plugin.uri.toString())))) {
             continue;
         }
-        if (syncProvider.isDisabled(plugin.uri)) {
-            continue;
-        }
-        if (!isContributionEnabled(plugin.enablement.get())) {
-            continue;
-        }
-        if (plugin.mcpServerDefinitions.get().length === 0) {
+        if (plugin.hooks.get().length === 0 && plugin.commands.get().length === 0 && plugin.skills.get().length === 0 && plugin.agents.get().length === 0 && plugin.instructions.get().length === 0 && plugin.mcpServerDefinitions.get().length === 0) {
             continue;
         }
         addPluginRef(plugin);
     }
     const refs = [...( pluginRefs.values())];
-    const mcpServers = await collectNonPluginMcpServers(mcpService, configurationResolverService);
+    const mcpServers = await collectNonPluginMcpServers(mcpService, configurationResolverService, sessionType, workingDirectories);
     if (looseFiles.length > 0 || mcpServers.length > 0) {
         refs.push(bundler.bundle(looseFiles, mcpServers).then(r => r?.ref));
     }
     return await Promise.all(refs).then(r => r.filter(isDefined));
 }
 
-export { SYNCABLE_PROMPT_TYPES, SYNCABLE_STORAGE_SOURCES, collectNonPluginMcpServers, enumerateLocalCustomizationsForHarness, resolveCustomizationRefs };
+export { SYNCABLE_PROMPT_TYPES, SYNCABLE_STORAGE_SOURCES, collectNonPluginMcpServers, enumerateLocalCustomizationsForHarness, resolveCustomizationRefs, resolveLocalCustomAgents };