@codingame/monaco-vscode-api 34.1.3 → 35.0.0

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

@@ -2,6 +2,12 @@ import { IChatSessionsService } from "./chatSessionsService.service.js";
 import { IConfigurationService } from "../../../../platform/configuration/common/configuration.service.js";
 import { ServicesAccessor } from "../../../../platform/instantiation/common/instantiation.js";
 import { RawContextKey } from "../../../../platform/contextkey/common/contextkey.js";
+import { URI } from "../../../../base/common/uri.js";
+export declare enum BYOKUtilityModelDefault {
+    None = "none",
+    MainAgent = "mainAgent",
+    Copilot = "copilot"
+}
 export declare enum ChatConfiguration {
     AIDisabled = "chat.disableAIFeatures",
     PluginsEnabled = "chat.plugins.enabled",
@@ -15,12 +21,12 @@ export declare enum ChatConfiguration {
     ExploreAgentDefaultModel = "chat.exploreAgent.defaultModel",
     UtilityModel = "chat.utilityModel",
     UtilitySmallModel = "chat.utilitySmallModel",
+    BYOKUtilityModelDefault = "chat.byokUtilityModelDefault",
     RequestQueueingDefaultAction = "chat.requestQueuing.defaultAction",
     AgentStatusEnabled = "chat.agentsControl.enabled",
     EditorAssociations = "chat.editorAssociations",
     UnifiedAgentsBar = "chat.unifiedAgentsBar.enabled",
     AgentSessionProjectionEnabled = "chat.agentSessionProjection.enabled",
-    EditModeHidden = "chat.editMode.hidden",
     ExtensionToolsEnabled = "chat.extensionTools.enabled",
     RepoInfoEnabled = "chat.repoInfo.enabled",
     EditRequests = "chat.editRequests",
@@ -59,14 +65,17 @@ export declare enum ChatConfiguration {
     ExitAfterDelegation = "chat.exitAfterDelegation",
     ExplainChangesEnabled = "chat.editing.explainChanges.enabled",
     RevealNextChangeOnResolve = "chat.editing.revealNextChangeOnResolve",
+    OpenChangedFileInDiffEditor = "chat.editing.openChangedFileInDiffEditor",
     GrowthNotificationEnabled = "chat.growthNotification.enabled",
     TitleBarSignInEnabled = "chat.titleBar.signIn.enabled",
     TitleBarOpenInAgentsWindowEnabled = "chat.titleBar.openInAgentsWindow.enabled",
-    ChatCustomizationHarnessSelectorEnabled = "chat.customizations.harnessSelector.enabled",
     ChatCustomizationsStructuredPreviewEnabled = "chat.customizations.structuredPreview.enabled",
     AutopilotAdvancedEnabled = "chat.autopilot.advanced.enabled",
     PlanReviewInlineEditorEnabled = "chat.planReview.inlineEditor.enabled",
     DefaultPermissionLevel = "chat.permissions.default",
+    PermissionsSandboxToggleEnabled = "chat.experimental.permissionsSandboxToggle.enabled",
+    DefaultConfiguration = "chat.defaultConfiguration",
+    DefaultModel = "chat.defaultModel",
     ImageCarouselEnabled = "imageCarousel.chat.enabled",
     ArtifactsEnabled = "chat.artifacts.enabled",
     ArtifactsRulesByMimeType = "chat.artifacts.rules.byMimeType",
@@ -76,12 +85,17 @@ export declare enum ChatConfiguration {
     ToolRiskAssessmentEnabled = "chat.tools.riskAssessment.enabled",
     ToolRiskAssessmentModel = "chat.tools.riskAssessment.model",
     DefaultNewSessionMode = "chat.newSession.defaultMode",
-    AgentHostClientTools = "chat.agentHost.clientTools",
-    AgentHostDefaultChatProvider = "chat.agentHost.defaultChatProvider",
+    CopilotCliHideExtensionHostAgents = "chat.agents.copilotCli.hideExtensionHost",
+    EditorDefaultProvider = "chat.editor.defaultProvider",
+    EditorLocalAgentEnabled = "chat.editor.localAgent.enabled",
+    CopilotCliHideExtensionHostEditor = "chat.editor.copilotCli.hideExtensionHost",
     AgentsHandoffTipMode = "chat.agentsHandoffTip.mode",
+    TurnStatusPills = "chat.turnStatusPills",
     IncrementalRendering = "chat.experimental.incrementalRendering.enabled",
     IncrementalRenderingStyle = "chat.experimental.incrementalRendering.animationStyle",
-    IncrementalRenderingBuffering = "chat.experimental.incrementalRendering.buffering"
+    IncrementalRenderingBuffering = "chat.experimental.incrementalRendering.buffering",
+    CollectInstructionsInExtension = "chat.experimental.collectInstructionsInExtension",
+    ImplicitContextActiveEditor = "chat.implicitContext.includeActiveEditor"
 }
 /**
  * The "kind" of agents for custom agents.
@@ -103,11 +117,30 @@ export declare enum ChatPermissionLevel {
     Autopilot = "autopilot"
 }
 export declare function isChatPermissionLevel(level: unknown | undefined): level is ChatPermissionLevel;
+/**
+ * Shape of the {@link ChatConfiguration.DefaultConfiguration}
+ * object setting. Controls the starting `mode` and `approvals` for new agent-host
+ * sessions (such as Copilot CLI). All properties are optional — a missing property
+ * falls back to the per-axis default.
+ */
+export type AgentSessionMode = "interactive" | "plan" | "autopilot";
+export interface IChatDefaultConfiguration {
+    /** Starting agent mode: `interactive` / `plan` / `autopilot`. */
+    readonly mode?: AgentSessionMode;
+    /** Starting approval level: `default` / `autoApprove`. */
+    readonly approvals?: ChatPermissionLevel.Default | ChatPermissionLevel.AutoApprove;
+}
 /**
  * Returns true if the permission level enables auto-approval of all tool calls.
  * Both {@link ChatPermissionLevel.AutoApprove} and {@link ChatPermissionLevel.Autopilot} enable auto-approval.
  */
 export declare function isAutoApproveLevel(level: ChatPermissionLevel | undefined): boolean;
+/**
+ * True for {@link ChatPermissionLevel.Autopilot} only. Unlike {@link isAutoApproveLevel}, this
+ * excludes {@link ChatPermissionLevel.AutoApprove}, so it can gate Autopilot-only behavior such as
+ * risk-based skipping of tool calls.
+ */
+export declare function isAutopilotLevel(level: ChatPermissionLevel | undefined): boolean;
 export declare enum ThinkingDisplayMode {
     Collapsed = "collapsed",
     CollapsedPreview = "collapsedPreview",
@@ -143,12 +176,19 @@ export declare namespace ChatAgentLocation {
 export declare function isSupportedChatFileScheme(accessor: ServicesAccessor, scheme: string): boolean;
 /**
  * Returns the effective default session type for a new chat in the VS Code
- * window, honoring the experimental
- * {@link ChatConfiguration.AgentHostDefaultChatProvider} setting. Falls back to
- * {@link localChatSessionType} when the setting is disabled or the agent host
- * contribution is not registered.
+ * editor window, honoring the experimental
+ * {@link ChatConfiguration.EditorDefaultProvider} setting:
+ * - `'copilotAh'` selects the Agent Host Copilot CLI when its contribution is registered.
+ * - `'copilotEh'` selects the Extension Host Copilot CLI when its contribution is
+ *   registered and it is not hidden by {@link ChatConfiguration.CopilotCliHideExtensionHostEditor}.
+ *
+ * Falls back to {@link localChatSessionType} when local is enabled, or when no
+ * visible non-local provider is available.
  */
-export declare function getDefaultNewChatSessionType(configurationService: IConfigurationService, chatSessionsService: Pick<IChatSessionsService, "getChatSessionContribution">): string;
+export declare function getDefaultNewChatSessionType(configurationService: IConfigurationService, chatSessionsService: Pick<IChatSessionsService, "getChatSessionContribution" | "getAllChatSessionContributions">): string;
+export declare function getDefaultNewChatSessionResource(configurationService: IConfigurationService, chatSessionsService: Pick<IChatSessionsService, "getChatSessionContribution" | "getAllChatSessionContributions">): URI;
+export declare function isEditorLocalAgentEnabled(configurationService: IConfigurationService): boolean;
+export declare function isVisibleEditorChatSessionType(sessionType: string, configurationService: IConfigurationService, chatSessionsService: Pick<IChatSessionsService, "getChatSessionContribution" | "getAllChatSessionContributions">): boolean;
 export declare const MANAGE_CHAT_COMMAND_ID = "workbench.action.chat.manage";
 export declare const OPEN_WORKSPACE_IN_AGENTS_WINDOW_COMMAND_ID = "workbench.action.openWorkspaceInAgentsWindow";
 export declare const OPEN_AGENTS_WINDOW_COMMAND_ID = "workbench.action.openAgentsWindow";

package/vscode/src/vs/workbench/contrib/chat/common/constants.js

@@ -5,7 +5,16 @@ import { IChatSessionsService } from './chatSessionsService.service.js';
 import { ContextKeyExpr, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { ChatEntitlementContextKeys } from '../../../services/chat/common/chatEntitlementService.js';
 import { IsSessionsWindowContext, IsAuxiliaryWindowContext } from '../../../common/contextkeys.js';
+import { URI } from '../../../../base/common/uri.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { LocalChatSessionUri } from './model/chatUri.js';
 
+var BYOKUtilityModelDefault;
+(function(BYOKUtilityModelDefault) {
+    BYOKUtilityModelDefault["None"] = "none";
+    BYOKUtilityModelDefault["MainAgent"] = "mainAgent";
+    BYOKUtilityModelDefault["Copilot"] = "copilot";
+})(BYOKUtilityModelDefault || (BYOKUtilityModelDefault = {}));
 var ChatConfiguration;
 (function(ChatConfiguration) {
     ChatConfiguration["AIDisabled"] = "chat.disableAIFeatures";
@@ -20,12 +29,12 @@ var ChatConfiguration;
     ChatConfiguration["ExploreAgentDefaultModel"] = "chat.exploreAgent.defaultModel";
     ChatConfiguration["UtilityModel"] = "chat.utilityModel";
     ChatConfiguration["UtilitySmallModel"] = "chat.utilitySmallModel";
+    ChatConfiguration["BYOKUtilityModelDefault"] = "chat.byokUtilityModelDefault";
     ChatConfiguration["RequestQueueingDefaultAction"] = "chat.requestQueuing.defaultAction";
     ChatConfiguration["AgentStatusEnabled"] = "chat.agentsControl.enabled";
     ChatConfiguration["EditorAssociations"] = "chat.editorAssociations";
     ChatConfiguration["UnifiedAgentsBar"] = "chat.unifiedAgentsBar.enabled";
     ChatConfiguration["AgentSessionProjectionEnabled"] = "chat.agentSessionProjection.enabled";
-    ChatConfiguration["EditModeHidden"] = "chat.editMode.hidden";
     ChatConfiguration["ExtensionToolsEnabled"] = "chat.extensionTools.enabled";
     ChatConfiguration["RepoInfoEnabled"] = "chat.repoInfo.enabled";
     ChatConfiguration["EditRequests"] = "chat.editRequests";
@@ -64,14 +73,17 @@ var ChatConfiguration;
     ChatConfiguration["ExitAfterDelegation"] = "chat.exitAfterDelegation";
     ChatConfiguration["ExplainChangesEnabled"] = "chat.editing.explainChanges.enabled";
     ChatConfiguration["RevealNextChangeOnResolve"] = "chat.editing.revealNextChangeOnResolve";
+    ChatConfiguration["OpenChangedFileInDiffEditor"] = "chat.editing.openChangedFileInDiffEditor";
     ChatConfiguration["GrowthNotificationEnabled"] = "chat.growthNotification.enabled";
     ChatConfiguration["TitleBarSignInEnabled"] = "chat.titleBar.signIn.enabled";
     ChatConfiguration["TitleBarOpenInAgentsWindowEnabled"] = "chat.titleBar.openInAgentsWindow.enabled";
-    ChatConfiguration["ChatCustomizationHarnessSelectorEnabled"] = "chat.customizations.harnessSelector.enabled";
     ChatConfiguration["ChatCustomizationsStructuredPreviewEnabled"] = "chat.customizations.structuredPreview.enabled";
     ChatConfiguration["AutopilotAdvancedEnabled"] = "chat.autopilot.advanced.enabled";
     ChatConfiguration["PlanReviewInlineEditorEnabled"] = "chat.planReview.inlineEditor.enabled";
     ChatConfiguration["DefaultPermissionLevel"] = "chat.permissions.default";
+    ChatConfiguration["PermissionsSandboxToggleEnabled"] = "chat.experimental.permissionsSandboxToggle.enabled";
+    ChatConfiguration["DefaultConfiguration"] = "chat.defaultConfiguration";
+    ChatConfiguration["DefaultModel"] = "chat.defaultModel";
     ChatConfiguration["ImageCarouselEnabled"] = "imageCarousel.chat.enabled";
     ChatConfiguration["ArtifactsEnabled"] = "chat.artifacts.enabled";
     ChatConfiguration["ArtifactsRulesByMimeType"] = "chat.artifacts.rules.byMimeType";
@@ -81,12 +93,17 @@ var ChatConfiguration;
     ChatConfiguration["ToolRiskAssessmentEnabled"] = "chat.tools.riskAssessment.enabled";
     ChatConfiguration["ToolRiskAssessmentModel"] = "chat.tools.riskAssessment.model";
     ChatConfiguration["DefaultNewSessionMode"] = "chat.newSession.defaultMode";
-    ChatConfiguration["AgentHostClientTools"] = "chat.agentHost.clientTools";
-    ChatConfiguration["AgentHostDefaultChatProvider"] = "chat.agentHost.defaultChatProvider";
+    ChatConfiguration["CopilotCliHideExtensionHostAgents"] = "chat.agents.copilotCli.hideExtensionHost";
+    ChatConfiguration["EditorDefaultProvider"] = "chat.editor.defaultProvider";
+    ChatConfiguration["EditorLocalAgentEnabled"] = "chat.editor.localAgent.enabled";
+    ChatConfiguration["CopilotCliHideExtensionHostEditor"] = "chat.editor.copilotCli.hideExtensionHost";
     ChatConfiguration["AgentsHandoffTipMode"] = "chat.agentsHandoffTip.mode";
+    ChatConfiguration["TurnStatusPills"] = "chat.turnStatusPills";
     ChatConfiguration["IncrementalRendering"] = "chat.experimental.incrementalRendering.enabled";
     ChatConfiguration["IncrementalRenderingStyle"] = "chat.experimental.incrementalRendering.animationStyle";
     ChatConfiguration["IncrementalRenderingBuffering"] = "chat.experimental.incrementalRendering.buffering";
+    ChatConfiguration["CollectInstructionsInExtension"] = "chat.experimental.collectInstructionsInExtension";
+    ChatConfiguration["ImplicitContextActiveEditor"] = "chat.implicitContext.includeActiveEditor";
 })(ChatConfiguration || (ChatConfiguration = {}));
 var ChatModeKind;
 (function(ChatModeKind) {
@@ -107,6 +124,9 @@ function isChatPermissionLevel(level) {
 function isAutoApproveLevel(level) {
     return level === ChatPermissionLevel.AutoApprove || level === ChatPermissionLevel.Autopilot;
 }
+function isAutopilotLevel(level) {
+    return level === ChatPermissionLevel.Autopilot;
+}
 var ThinkingDisplayMode;
 (function(ThinkingDisplayMode) {
     ThinkingDisplayMode["Collapsed"] = "collapsed";
@@ -170,10 +190,61 @@ function isSupportedChatFileScheme(accessor, scheme) {
     return true;
 }
 function getDefaultNewChatSessionType(configurationService, chatSessionsService) {
-    if (configurationService.getValue(ChatConfiguration.AgentHostDefaultChatProvider) && chatSessionsService.getChatSessionContribution(SessionType.AgentHostCopilot)) {
+    const defaultProvider = configurationService.getValue(ChatConfiguration.EditorDefaultProvider);
+    const defaultType = getConfiguredEditorDefaultSessionType(defaultProvider);
+    if (defaultType === SessionType.AgentHostCopilot && !isEditorLocalAgentEnabled(configurationService)) {
+        return defaultType;
+    }
+    if (defaultType && isVisibleEditorChatSessionType(defaultType, configurationService, chatSessionsService)) {
+        return defaultType;
+    }
+    if (isEditorLocalAgentEnabled(configurationService)) {
+        return localChatSessionType;
+    }
+    return getVisibleNonLocalEditorChatSessionTypes(configurationService, chatSessionsService)[0] ?? localChatSessionType;
+}
+function getDefaultNewChatSessionResource(configurationService, chatSessionsService) {
+    const defaultType = getDefaultNewChatSessionType(configurationService, chatSessionsService);
+    return defaultType === localChatSessionType ? LocalChatSessionUri.getNewSessionUri() : ( URI.from({
+        scheme: defaultType,
+        path: `/untitled-${generateUuid()}`
+    }));
+}
+function isEditorLocalAgentEnabled(configurationService) {
+    return configurationService.getValue(ChatConfiguration.EditorLocalAgentEnabled) ?? true;
+}
+function isVisibleEditorChatSessionType(sessionType, configurationService, chatSessionsService) {
+    if (sessionType === localChatSessionType) {
+        if (!isEditorLocalAgentEnabled(configurationService) && configurationService.getValue(ChatConfiguration.EditorDefaultProvider) === "copilotAh") {
+            return false;
+        }
+        return isEditorLocalAgentEnabled(configurationService) || getVisibleNonLocalEditorChatSessionTypes(configurationService, chatSessionsService).length === 0;
+    }
+    if (sessionType === SessionType.CopilotCLI && configurationService.getValue(ChatConfiguration.CopilotCliHideExtensionHostEditor)) {
+        return false;
+    }
+    return !!chatSessionsService.getChatSessionContribution(sessionType);
+}
+function getConfiguredEditorDefaultSessionType(defaultProvider) {
+    switch (defaultProvider) {
+    case "local":
+        return localChatSessionType;
+    case "copilotAh":
         return SessionType.AgentHostCopilot;
+    case "copilotEh":
+        return SessionType.CopilotCLI;
+    default:
+        return undefined;
+    }
+}
+function getVisibleNonLocalEditorChatSessionTypes(configurationService, chatSessionsService) {
+    const sessionTypes = ( new Set());
+    for (const contribution of chatSessionsService.getAllChatSessionContributions()) {
+        if (contribution.type !== localChatSessionType && isVisibleEditorChatSessionType(contribution.type, configurationService, chatSessionsService)) {
+            sessionTypes.add(contribution.type);
+        }
     }
-    return localChatSessionType;
+    return Array.from(sessionTypes);
 }
 const MANAGE_CHAT_COMMAND_ID = "workbench.action.chat.manage";
 const OPEN_WORKSPACE_IN_AGENTS_WINDOW_COMMAND_ID = "workbench.action.openWorkspaceInAgentsWindow";
@@ -184,4 +255,4 @@ const CONTEXT_MODELS_EDITOR = ( new RawContextKey("inModelsEditor", false));
 const CONTEXT_MODELS_SEARCH_FOCUS = ( new RawContextKey("inModelsSearch", false));
 const GeneralPurposeAgentName = "General Purpose";
 
-export { CONTEXT_MODELS_EDITOR, CONTEXT_MODELS_SEARCH_FOCUS, ChatAgentLocation, ChatConfiguration, ChatEditorTitleMaxLength, ChatModeKind, ChatNotificationMode, ChatPermissionLevel, CollapsedToolsDisplayMode, GeneralPurposeAgentName, MANAGE_CHAT_COMMAND_ID, OPEN_AGENTS_WINDOW_COMMAND_ID, OPEN_AGENTS_WINDOW_PRECONDITION, OPEN_WORKSPACE_IN_AGENTS_WINDOW_COMMAND_ID, ThinkingDisplayMode, getDefaultNewChatSessionType, isAutoApproveLevel, isChatPermissionLevel, isSupportedChatFileScheme };
+export { BYOKUtilityModelDefault, CONTEXT_MODELS_EDITOR, CONTEXT_MODELS_SEARCH_FOCUS, ChatAgentLocation, ChatConfiguration, ChatEditorTitleMaxLength, ChatModeKind, ChatNotificationMode, ChatPermissionLevel, CollapsedToolsDisplayMode, GeneralPurposeAgentName, MANAGE_CHAT_COMMAND_ID, OPEN_AGENTS_WINDOW_COMMAND_ID, OPEN_AGENTS_WINDOW_PRECONDITION, OPEN_WORKSPACE_IN_AGENTS_WINDOW_COMMAND_ID, ThinkingDisplayMode, getDefaultNewChatSessionResource, getDefaultNewChatSessionType, isAutoApproveLevel, isAutopilotLevel, isChatPermissionLevel, isEditorLocalAgentEnabled, isSupportedChatFileScheme, isVisibleEditorChatSessionType };

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

@@ -66,13 +66,6 @@ export interface IHarnessDescriptor {
      * section is hidden.
      */
     readonly hiddenSections?: readonly string[];
-    /**
-     * Workspace sub-paths that this harness recognizes for file creation.
-     * When set, the directory picker for new customization files only offers
-     * workspace directories under these sub-paths (e.g. `.claude` for Claude).
-     * When `undefined`, all workspace directories are shown (Local harness).
-     */
-    readonly workspaceSubpaths?: readonly string[];
     /**
      * When `true`, the "Generate with AI" sparkle button is hidden and replaced
      * with a plain "New X" manual-creation button (like sessions).
@@ -96,14 +89,6 @@ export interface IHarnessDescriptor {
      * When `undefined`, the harness is always available (e.g. Local).
      */
     readonly requiredAgentId?: string;
-    /**
-     * Instruction file patterns that this harness recognizes.
-     * Each entry is either an exact filename (e.g. `'CLAUDE.md'`) or a
-     * path prefix ending with `/` (e.g. `'.claude/rules/'`).
-     * When set, instruction items that don't match any pattern are filtered out.
-     * When `undefined`, all instruction files are shown.
-     */
-    readonly instructionFileFilter?: readonly string[];
     /**
      * Returns the storage source filter that should be applied to customization
      * items of the given type when this harness is active.
@@ -151,6 +136,8 @@ export interface ICustomizationItem {
     readonly extensionId: string | undefined;
     /** The URI of the plugin that contributed this customization, if any. */
     readonly pluginUri: URI | undefined;
+    /** Human-readable name of the plugin that contributed this customization, if any. */
+    readonly pluginLabel?: string;
     /** Server-reported loading status for this customization. */
     readonly status?: "loading" | "loaded" | "degraded" | "error";
     /** Human-readable status detail (e.g. error message or warning). */
@@ -209,6 +196,24 @@ export interface ICustomizationItemProvider {
      *   this session.
      */
     provideCustomAgents?(sessionResource: URI, token: CancellationToken): Promise<readonly ICustomAgent[]>;
+    /**
+     * Provide the directories where new customization files of the given
+     * type can be created for this session. The result includes both
+     * workspace-scoped and user-scoped folders; the caller is responsible
+     * for partitioning them by storage target.
+     *
+     * @param sessionResource URI of the chat session whose
+     *   creation locations should be returned.
+     */
+    provideSourceFolders?(sessionResource: URI, type: PromptsType, token: CancellationToken): Promise<readonly ICustomizationSourceFolder[] | undefined>;
+}
+/**
+ * A directory where new customization files of a given type can be created.
+ */
+export interface ICustomizationSourceFolder {
+    readonly uri: URI;
+    /** Display label for the picker when multiple folders are offered. */
+    readonly label: string;
 }
 /**
  * Provider interface for harnesses that use an opt-out sync model.
@@ -234,31 +239,17 @@ export interface ICustomizationSlashCommand {
     readonly sessionTypes?: readonly string[];
 }
 /**
- * Returns the user-home directories accessible to the Copilot CLI harness.
+ * Builds the full source list from the base set (local, user, plugin)
+ * plus any additional sources specific to the window type.
+ *
+ * Core passes `[PromptsStorage.extension]`; sessions passes its
+ * BUILTIN_STORAGE constant.
  */
-export declare function getCliUserRoots(userHome: URI): readonly URI[];
 /**
  * Creates a "VS Code" harness descriptor that shows all storage sources
  * with no user-root restrictions.
  */
-export declare function createVSCodeHarnessDescriptor(sources: readonly AICustomizationSource[]): IHarnessDescriptor;
-/**
- * Creates a "Copilot CLI" harness descriptor.
- */
-export declare function createCliHarnessDescriptor(cliUserRoots: readonly URI[], extras: readonly AICustomizationSource[]): IHarnessDescriptor;
-/**
- * Tests whether a file path belongs to one of the given workspace sub-paths.
- * Matches on path segment boundaries to avoid false positives
- * (e.g. `.claude` must appear as `/.claude/` in the path, not as part of
- * a longer segment like `not.claude`).
- */
-export declare function matchesWorkspaceSubpath(filePath: string, subpaths: readonly string[]): boolean;
-/**
- * Tests whether an instruction file matches one of the harness's recognized
- * instruction file patterns. Patterns can be exact filenames (e.g. `CLAUDE.md`)
- * or path prefixes ending with `/` (e.g. `.claude/rules/`).
- */
-export declare function matchesInstructionFileFilter(filePath: string, filters: readonly string[]): boolean;
+export declare function createVSCodeHarnessDescriptor(): IHarnessDescriptor;
 /**
  * Reusable base implementation of {@link ICustomizationHarnessService}.
  * Concrete registrations only need to supply the list of harness
@@ -293,7 +284,6 @@ export declare class CustomizationHarnessServiceBase implements ICustomizationHa
     registerExternalHarness(descriptor: IHarnessDescriptor): IDisposable;
     findHarnessById(id: string): IHarnessDescriptor | undefined;
     setActiveSession(sessionResource: URI): void;
-    getStorageSourceFilter(type: PromptsType): IStorageSourceFilter;
     getActiveDescriptor(): IHarnessDescriptor;
     getSlashCommands(sessionResource: URI, token: CancellationToken): Promise<readonly IChatPromptSlashCommand[]>;
     getCustomAgents(sessionResource: URI, token: CancellationToken): Promise<readonly ICustomAgent[]>;

package/vscode/src/vs/workbench/contrib/chat/common/customizationHarnessService.js

@@ -2,7 +2,6 @@
 import { Codicon } from '../../../../base/common/codicons.js';
 import '../../../../base/common/observableInternal/index.js';
 import { Emitter } from '../../../../base/common/event.js';
-import '../../../../base/common/resources.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { URI } from '../../../../base/common/uri.js';
 import { localize } from '../../../../nls.js';
@@ -28,36 +27,24 @@ const EMPTY_DESCRIPTOR = {
     id: "",
     label: "",
     icon: Codicon.sparkle,
-    getStorageSourceFilter: () => ({
-        sources: []
-    })
+    getStorageSourceFilter: () => EMPTY_FILTER
 };
-function buildAllSources(extras) {
-    return [
-        AICustomizationSources.local,
-        AICustomizationSources.user,
-        AICustomizationSources.plugin,
-        ...extras
-    ];
-}
-function createVSCodeHarnessDescriptor(sources) {
+function createVSCodeHarnessDescriptor() {
     const filter = {
-        sources: buildAllSources(sources)
+        sources: AICustomizationSources.all
     };
     return {
         id: SessionType.Local,
-        label: ( localize(7942, "Local")),
+        label: ( localize(8541, "Local")),
         icon: ThemeIcon.fromId(Codicon.vm.id),
         supportsTroubleshoot: true,
+        hiddenSections: [AICustomizationManagementSection.Tools],
         sectionOverrides: ( new Map([[AICustomizationManagementSection.Instructions, {
             rootFileShortcuts: [AGENT_MD_FILENAME]
         }]])),
         getStorageSourceFilter: () => filter
     };
 }
-function matchesWorkspaceSubpath(filePath, subpaths) {
-    return ( subpaths.some(sp => filePath.includes(`/${sp}/`) || filePath.endsWith(`/${sp}`)));
-}
 class CustomizationHarnessServiceBase {
     constructor(staticHarnesses, defaultHarness, promptsService) {
         this.promptsService = promptsService;
@@ -151,11 +138,6 @@ class CustomizationHarnessServiceBase {
     setActiveSession(sessionResource) {
         this._activeSessionResource.set(sessionResource, undefined);
     }
-    getStorageSourceFilter(type) {
-        const activeId = this._activeHarness.get();
-        const descriptor = this.findHarnessById(activeId);
-        return descriptor?.getStorageSourceFilter(type) ?? EMPTY_FILTER;
-    }
     getActiveDescriptor() {
         const activeId = this._activeHarness.get();
         const descriptor = this.findHarnessById(activeId);
@@ -181,7 +163,8 @@ class CustomizationHarnessServiceBase {
                     uri: item.uri,
                     type: item.type,
                     name: item.pluginUri ? getCanonicalPluginCommandId({
-                        uri: item.pluginUri
+                        uri: item.pluginUri,
+                        label: item.pluginLabel
                     }, item.name) : item.name,
                     description: item.description,
                     userInvocable: item.userInvocable ?? true,
@@ -268,4 +251,4 @@ class CustomizationHarnessServiceBase {
     }
 }
 
-export { CustomizationHarnessServiceBase, createVSCodeHarnessDescriptor, isPluginCustomizationItem, matchesWorkspaceSubpath };
+export { CustomizationHarnessServiceBase, createVSCodeHarnessDescriptor, isPluginCustomizationItem };

package/vscode/src/vs/workbench/contrib/chat/common/customizationHarnessService.service.d.ts

@@ -3,9 +3,7 @@ import { Event } from "../../../../base/common/event.js";
 import { IDisposable } from "../../../../base/common/lifecycle.js";
 import { IObservable } from "../../../../base/common/observable.js";
 import { URI } from "../../../../base/common/uri.js";
-import { IStorageSourceFilter } from "./aiCustomizationWorkspaceService.js";
 import { IHarnessDescriptor } from "./customizationHarnessService.js";
-import { PromptsType } from "./promptSyntax/promptTypes.js";
 import { IChatPromptSlashCommand, ICustomAgent, IResolvedChatPromptSlashCommand } from "./promptSyntax/service/promptsService.js";
 export declare const ICustomizationHarnessService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<ICustomizationHarnessService>;
 /**
@@ -42,11 +40,6 @@ export interface ICustomizationHarnessService {
     */
     setActiveSession(sessionResource: URI): void;
     /**
-    * Convenience: returns the storage source filter for the active harness
-    * and the given customization type.
-    */
-    getStorageSourceFilter(type: PromptsType): IStorageSourceFilter;
-    /**
     * Returns the descriptor of the currently active harness.
     */
     getActiveDescriptor(): IHarnessDescriptor;

package/vscode/src/vs/workbench/contrib/chat/common/editing/chatEditingService.js

@@ -45,9 +45,9 @@ var ChatEditingSessionState;
     ChatEditingSessionState[ChatEditingSessionState["Disposed"] = 3] = "Disposed";
 })(ChatEditingSessionState || (ChatEditingSessionState = {}));
 const CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME = "chat-editing-multi-diff-source";
-const chatEditingWidgetFileStateContextKey = ( new RawContextKey("chatEditingWidgetFileState", undefined, ( localize(7943, "The current state of the file in the chat editing widget"))));
+const chatEditingWidgetFileStateContextKey = ( new RawContextKey("chatEditingWidgetFileState", undefined, ( localize(8542, "The current state of the file in the chat editing widget"))));
 const chatEditingAgentSupportsReadonlyReferencesContextKey = ( new RawContextKey("chatEditingAgentSupportsReadonlyReferences", undefined, ( localize(
-    7944,
+    8543,
     "Whether the chat editing agent supports readonly references (temporary)"
 ))));
 const decidedChatEditingResourceContextKey = ( new RawContextKey("decidedChatEditingResource", []));

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

@@ -1,5 +1,5 @@
 import { Disposable } from "../../../../base/common/lifecycle.js";
-import { IReader, ITransaction } from "../../../../base/common/observable.js";
+import { IObservable, IReader, ITransaction } from "../../../../base/common/observable.js";
 import { IStorageService } from "../../../../platform/storage/common/storage.service.js";
 export declare enum ContributionEnablementState {
     DisabledProfile = 0,
@@ -33,3 +33,11 @@ export declare class EnablementModel extends Disposable implements IEnablementMo
     private _setInMap;
     private _deleteFromMap;
 }
+export declare class CollisionEnablementModel implements IEnablementModel {
+    private readonly _base;
+    private readonly _collisionGroups;
+    constructor(_base: IEnablementModel, _collisionGroups: IObservable<ReadonlyMap<string, readonly string[]>>);
+    readEnabled(key: string, reader?: IReader): ContributionEnablementState;
+    setEnabled(key: string, state: ContributionEnablementState, tx?: ITransaction): void;
+    remove(key: string): void;
+}

package/vscode/src/vs/workbench/contrib/chat/common/enablement.js

@@ -1,9 +1,11 @@
 
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
+import '../../../../base/common/observableInternal/index.js';
 import { observableMemento } from '../../../../platform/observable/common/observableMemento.js';
 import { StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
+import { transaction } from '../../../../base/common/observableInternal/transaction.js';
 
 var ContributionEnablementState;
 (function(ContributionEnablementState) {
@@ -98,5 +100,54 @@ let EnablementModel = class EnablementModel extends Disposable {
     }
 };
 EnablementModel = ( __decorate([( __param(1, IStorageService))], EnablementModel));
+class CollisionEnablementModel {
+    constructor(_base, _collisionGroups) {
+        this._base = _base;
+        this._collisionGroups = _collisionGroups;
+    }
+    readEnabled(key, reader) {
+        const baseState = this._base.readEnabled(key, reader);
+        if (!isContributionEnabled(baseState)) {
+            return baseState;
+        }
+        const group = this._collisionGroups.read(reader).get(key);
+        if (!group) {
+            return baseState;
+        }
+        for (const otherId of group) {
+            if (otherId === key) {
+                return baseState;
+            }
+            if (isContributionEnabled(this._base.readEnabled(otherId, reader))) {
+                return ContributionEnablementState.DisabledProfile;
+            }
+        }
+        return baseState;
+    }
+    setEnabled(key, state, tx) {
+        const isEnabling = state === ContributionEnablementState.EnabledProfile || state === ContributionEnablementState.EnabledWorkspace;
+        const group = isEnabling ? this._collisionGroups.get().get(key) : undefined;
+        if (!group) {
+            this._base.setEnabled(key, state, tx);
+            return;
+        }
+        const updateGroup = innerTx => {
+            this._base.setEnabled(key, state, innerTx);
+            for (const otherId of group) {
+                if (otherId !== key) {
+                    this._base.setEnabled(otherId, ContributionEnablementState.DisabledWorkspace, innerTx);
+                }
+            }
+        };
+        if (tx) {
+            updateGroup(tx);
+        } else {
+            transaction(innerTx => updateGroup(innerTx));
+        }
+    }
+    remove(key) {
+        this._base.remove(key);
+    }
+}
 
-export { ContributionEnablementState, EnablementModel, isContributionDisabled, isContributionEnabled };
+export { CollisionEnablementModel, ContributionEnablementState, EnablementModel, isContributionDisabled, isContributionEnabled };

package/vscode/src/vs/workbench/contrib/chat/common/languageModelStats.js

@@ -27,13 +27,13 @@ LanguageModelStatsService = ( __decorate([( __param(0, IExtensionFeaturesManagem
 const CopilotUsageExtensionFeatureId = "copilot";
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: CopilotUsageExtensionFeatureId,
-    label: ( localize(7945, "Copilot")),
-    description: ( localize(7946, "Language models usage statistics of this extension.")),
+    label: ( localize(8544, "Copilot")),
+    description: ( localize(8545, "Language models usage statistics of this extension.")),
     icon: Codicon.copilot,
     access: {
         canToggle: false
     },
-    accessDataLabel: ( localize(7947, "chat"))
+    accessDataLabel: ( localize(8546, "chat"))
 });
 
 export { CopilotUsageExtensionFeatureId, LanguageModelStatsService };