@codingame/monaco-vscode-chat-service-override 30.0.0 → 31.0.0

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

@@ -3,12 +3,12 @@ import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/fi
 import { IWorkspaceFolder } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace";
 import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
-import { IResolvedPromptSourceFolder } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations";
+import { IPromptSourceFolder, IResolvedPromptSourceFolder } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations";
 import { PromptsType } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes";
 import { IWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service";
 import { ISearchService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/search/common/search.service";
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
-import { AgentFileType, IPromptPath, IResolvedAgentFile, Logger, PromptsStorage } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService";
+import { AgentInstructionFileType, IPromptPath, IAgentInstructionFile, Logger, PromptsStorage } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService";
 import { IUserDataProfileService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service";
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
@@ -16,7 +16,7 @@ import { IPathService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/s
 import { IWorkspaceTrustManagementService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspaceTrust.service";
 export interface IWorkspaceInstructionFile {
     readonly fileName: string;
-    readonly type: AgentFileType;
+    readonly type: AgentInstructionFileType;
 }
 /**
  * Utility class to locate prompt files.
@@ -36,6 +36,16 @@ export declare class PromptFilesLocator {
     protected getWorkspaceFolders(): readonly IWorkspaceFolder[];
     protected getWorkspaceFolder(resource: URI): IWorkspaceFolder | undefined;
     protected onDidChangeWorkspaceFolders(): Event<void>;
+    /**
+     * Returns the configured prompt source folders for the given type.
+     * Subclasses can override to filter out unsupported sources.
+     */
+    protected getPromptSourceFolders(type: PromptsType): IPromptSourceFolder[];
+    /**
+     * Returns the default prompt source folders for the given type.
+     * Subclasses can override to filter out unsupported sources.
+     */
+    protected getDefaultSourceFolders(type: PromptsType): readonly IPromptSourceFolder[];
     getWorkspaceFolderRoots(includeParents: boolean, logger?: Logger): Promise<URI[]>;
     /**
      * Walks up from {@link folderUri} collecting parent folders until a
@@ -57,7 +67,7 @@ export declare class PromptFilesLocator {
     };
     /**
      * Gets the hook source folders for creating new hooks.
-     * Returns folders from config, excluding user storage and Claude paths (which are read-only).
+     * Returns configured hook folders, excluding Claude paths (which are read-only).
      */
     getHookSourceFolders(): Promise<readonly URI[]>;
     /**
@@ -124,14 +134,14 @@ export declare class PromptFilesLocator {
     /**
      * Gets list of `AGENTS.md` files anywhere in the workspace.
      */
-    findAgentMDsInWorkspace(token: CancellationToken): Promise<IResolvedAgentFile[]>;
+    findAgentMDsInWorkspace(token: CancellationToken): Promise<IAgentInstructionFile[]>;
     private findAgentMDsInFolder;
     /**
      * Recursively traverses a folder using the file service to find AGENTS.md files.
      * This is used as a fallback when no FileSearchProvider is available for the scheme.
      */
     private findAgentMDsUsingFileService;
-    findFilesInRoots(roots: URI[], folder: string | undefined, paths: IWorkspaceInstructionFile[], token: CancellationToken, result?: IResolvedAgentFile[]): Promise<IResolvedAgentFile[]>;
+    findFilesInRoots(roots: URI[], folder: string | undefined, paths: IWorkspaceInstructionFile[], token: CancellationToken, result?: IAgentInstructionFile[]): Promise<IAgentInstructionFile[]>;
     getAgentFileURIFromModeFile(oldURI: URI): URI | undefined;
     private findAgentSkillsInFolder;
     /**

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

@@ -10,7 +10,7 @@ import { PromptsConfig, getPromptFileLocationsConfigKey, isTildePath } from '@co
 import { joinPath, dirname, isEqual, basename, isEqualOrParent, extname } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
-import { getPromptFileType, getPromptFileExtension, getPromptFileDefaultLocations, LEGACY_MODE_FILE_EXTENSION, AGENTS_SOURCE_FOLDER, getCleanPromptName, AGENT_FILE_EXTENSION, SKILL_FILENAME } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
+import { getPromptFileDefaultLocations, getPromptFileType, getPromptFileExtension, LEGACY_MODE_FILE_EXTENSION, AGENTS_SOURCE_FOLDER, getCleanPromptName, AGENT_FILE_EXTENSION, SKILL_FILENAME } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
 import { PromptFileSource, PromptsType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
@@ -18,7 +18,7 @@ import { getExcludes, QueryType } from '@codingame/monaco-vscode-api/vscode/vs/w
 import { ISearchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/search/common/search.service';
 import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { isCancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
-import { PromptsStorage, AgentFileType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService';
+import { PromptsStorage, AgentInstructionFileType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService';
 import { IUserDataProfileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
 import { Event, Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
@@ -56,7 +56,7 @@ let PromptFilesLocator = class PromptFilesLocator {
             filePattern: undefined,
             source: PromptFileSource.CopilotPersonal,
             storage: PromptsStorage.user,
-            displayPath: ( localize(7639, "User Data")),
+            displayPath: ( localize(7749, "User Data")),
             isDefault: true
         };
     }
@@ -69,6 +69,12 @@ let PromptFilesLocator = class PromptFilesLocator {
     onDidChangeWorkspaceFolders() {
         return ( Event.map(this.workspaceService.onDidChangeWorkspaceFolders, () => undefined));
     }
+    getPromptSourceFolders(type) {
+        return PromptsConfig.promptSourceFolders(this.configService, type);
+    }
+    getDefaultSourceFolders(type) {
+        return getPromptFileDefaultLocations(type);
+    }
     async getWorkspaceFolderRoots(includeParents, logger) {
         const workspaceFolders = this.getWorkspaceFolders();
         if (includeParents) {
@@ -118,7 +124,7 @@ let PromptFilesLocator = class PromptFilesLocator {
         if (storage !== PromptsStorage.user && storage !== PromptsStorage.local) {
             throw ( new Error(`Unsupported prompt file storage: ${storage}`));
         }
-        const configuredLocations = PromptsConfig.promptSourceFolders(this.configService, type);
+        const configuredLocations = this.getPromptSourceFolders(type);
         const absoluteLocations = await this.toAbsoluteLocations(type, configuredLocations.filter(loc => loc.storage === storage));
         if (storage === PromptsStorage.user && (type === PromptsType.agent || type === PromptsType.instructions || type === PromptsType.prompt)) {
             absoluteLocations.push(this.userDataFolder);
@@ -163,7 +169,7 @@ let PromptFilesLocator = class PromptFilesLocator {
         };
         const update = async () => {
             try {
-                const configuredLocations = PromptsConfig.promptSourceFolders(this.configService, type);
+                const configuredLocations = this.getPromptSourceFolders(type);
                 parentFolders = await this.toAbsoluteLocations(type, configuredLocations, undefined);
                 if (token.isCancellationRequested) {
                     return;
@@ -205,7 +211,7 @@ let PromptFilesLocator = class PromptFilesLocator {
         };
     }
     async getHookSourceFolders() {
-        const configuredLocations = PromptsConfig.promptSourceFolders(this.configService, PromptsType.hook);
+        const configuredLocations = this.getPromptSourceFolders(PromptsType.hook);
         const allowedHookFolders = configuredLocations.filter(loc => !loc.path.startsWith(".claude/") && !loc.path.includes("/.claude/"));
         const result = ( new ResourceSet());
         const absoluteLocations = await this.toAbsoluteLocations(PromptsType.hook, allowedHookFolders);
@@ -215,7 +221,7 @@ let PromptFilesLocator = class PromptFilesLocator {
         return [...result];
     }
     async getConfigBasedSourceFolders(type) {
-        const configuredLocations = PromptsConfig.promptSourceFolders(this.configService, type);
+        const configuredLocations = this.getPromptSourceFolders(type);
         const absoluteLocations = await this.toAbsoluteLocations(type, configuredLocations);
         if (type !== PromptsType.prompt && type !== PromptsType.instructions) {
             return ( absoluteLocations.map(l => l.uri));
@@ -254,8 +260,8 @@ let PromptFilesLocator = class PromptFilesLocator {
         return this.dedupeSourceFolders([...userFolders, ...localFolders]);
     }
     async getLocalStorageFolders(type) {
-        const configuredLocations = PromptsConfig.promptSourceFolders(this.configService, type);
-        const defaultFolders = getPromptFileDefaultLocations(type);
+        const configuredLocations = this.getPromptSourceFolders(type);
+        const defaultFolders = this.getDefaultSourceFolders(type);
         const allFolders = [...defaultFolders, ...configuredLocations.filter(loc => !( defaultFolders.some(df => df.path === loc.path)))];
         const absoluteLocations = await this.toAbsoluteLocations(type, allFolders, defaultFolders);
         if (type === PromptsType.agent || type === PromptsType.instructions || type === PromptsType.prompt) {
@@ -485,7 +491,7 @@ let PromptFilesLocator = class PromptFilesLocator {
                     results.push({
                         uri: r.resource,
                         realPath,
-                        type: AgentFileType.agentsMd
+                        type: AgentInstructionFileType.agentsMd
                     });
                 }
                 return results;
@@ -513,7 +519,7 @@ let PromptFilesLocator = class PromptFilesLocator {
                     result.push({
                         uri: stat.resource,
                         realPath,
-                        type: AgentFileType.agentsMd
+                        type: AgentInstructionFileType.agentsMd
                     });
                 } else if (stat.isDirectory && stat.children) {
                     for (const child of stat.children) {
@@ -603,7 +609,7 @@ let PromptFilesLocator = class PromptFilesLocator {
         }
     }
     async findAgentSkills(token) {
-        const configuredLocations = PromptsConfig.promptSourceFolders(this.configService, PromptsType.skill);
+        const configuredLocations = this.getPromptSourceFolders(PromptsType.skill);
         const absoluteLocations = await this.toAbsoluteLocations(PromptsType.skill, configuredLocations);
         const allResults = [];
         for (const {

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

@@ -18,11 +18,31 @@ export interface IChatArtifact {
     readonly groupName?: string;
     readonly onlyShowGroup?: boolean;
 }
+export type ArtifactSource = {
+    readonly kind: "rules";
+} | {
+    readonly kind: "agent";
+} | {
+    readonly kind: "subagent";
+    readonly invocationId: string;
+    readonly name: string | undefined;
+};
+export interface IArtifactSourceGroup {
+    readonly source: ArtifactSource;
+    readonly artifacts: readonly IChatArtifact[];
+}
+export interface IArtifactRuleOverrides {
+    readonly byMimeType?: Record<string, IArtifactGroupConfig>;
+    readonly byFilePath?: Record<string, IArtifactGroupConfig>;
+    readonly byMemoryFilePath?: Record<string, IArtifactGroupConfig>;
+}
 export interface IChatArtifacts {
-    readonly artifacts: IObservable<readonly IChatArtifact[]>;
-    readonly mutable: IObservable<boolean>;
-    set(artifacts: IChatArtifact[]): void;
-    clear(): void;
+    readonly artifactGroups: IObservable<readonly IArtifactSourceGroup[]>;
+    setAgentArtifacts(artifacts: IChatArtifact[]): void;
+    setSubagentArtifacts(invocationId: string, name: string | undefined, artifacts: IChatArtifact[]): void;
+    setRuleOverrides(rules: IArtifactRuleOverrides | undefined): void;
+    clearAgentArtifacts(): void;
+    clearSubagentArtifacts(invocationId: string): void;
     migrate(target: IChatArtifacts): void;
 }
 export declare class ChatArtifactsService extends Disposable implements IChatArtifactsService {

package/vscode/src/vs/workbench/contrib/chat/common/tools/chatArtifactsService.js

@@ -6,16 +6,15 @@ import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 import { Memento } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/memento';
-import { extractArtifactsFromResponse } from '../chatArtifactExtraction.js';
+import { extractArtifactsFromResponse } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/common/chatArtifactExtraction';
 import { IChatToolInvocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
 import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { chatSessionResourceToId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
+import { observableValueOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValueOpts';
 import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
 import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
-import { constObservable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/constObservable';
 import { observableSignalFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableSignalFromEvent';
-import { observableValueOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValueOpts';
 
 let ChatArtifactsStorage = class ChatArtifactsStorage {
     constructor(storageService) {
@@ -37,11 +36,32 @@ let ChatArtifactsStorage = class ChatArtifactsStorage {
     }
 };
 ChatArtifactsStorage = ( __decorate([( __param(0, IStorageService))], ChatArtifactsStorage));
-class RulesChatArtifacts extends Disposable {
-    constructor(sessionResource, chatService, configurationService) {
+class UnifiedChatArtifacts extends Disposable {
+    constructor(sessionResource, _storageKey, _storage, chatService, configurationService) {
         super();
-        this.mutable = constObservable(false);
+        this._storageKey = _storageKey;
+        this._storage = _storage;
         this._responseCache = ( new Map());
+        this._ruleOverrides = observableValueOpts({
+            owner: this,
+            equalsFn: () => false
+        }, undefined);
+        this._agentArtifacts = observableValueOpts({
+            owner: this,
+            equalsFn: () => false
+        }, []);
+        this._subagentArtifacts = observableValueOpts({
+            owner: this,
+            equalsFn: () => false
+        }, ( new Map()));
+        this._nextSequence = 1;
+        this._sourceSequences = ( new Map());
+        const restored = this._storage.get(this._storageKey);
+        this._agentArtifacts.set(restored, undefined);
+        this._sourceSequences.set("rules", 0);
+        if (restored.length > 0) {
+            this._sourceSequences.set("agent", this._nextSequence++);
+        }
         const configByMimeType = observableFromEvent(
             this,
             configurationService.onDidChangeConfiguration,
@@ -52,14 +72,21 @@ class RulesChatArtifacts extends Disposable {
             configurationService.onDidChangeConfiguration,
             () => configurationService.getValue(ChatConfiguration.ArtifactsRulesByFilePath) ?? {}
         );
+        const configByMemoryFilePath = observableFromEvent(
+            this,
+            configurationService.onDidChangeConfiguration,
+            () => configurationService.getValue(ChatConfiguration.ArtifactsRulesByMemoryFilePath) ?? {}
+        );
         const modelSignal = observableFromEvent(
             this,
             chatService.onDidCreateModel,
             () => chatService.getSession(sessionResource)
         );
-        this.artifacts = derived(reader => {
-            const byMimeType = configByMimeType.read(reader);
-            const byFilePath = configByFilePath.read(reader);
+        const rulesArtifacts = derived(reader => {
+            const overrides = this._ruleOverrides.read(reader);
+            const byMimeType = overrides?.byMimeType ?? configByMimeType.read(reader);
+            const byFilePath = overrides?.byFilePath ?? configByFilePath.read(reader);
+            const byMemoryFilePath = overrides?.byMemoryFilePath ?? configByMemoryFilePath.read(reader);
             const model = modelSignal.read(reader);
             if (!model) {
                 return [];
@@ -86,15 +113,16 @@ class RulesChatArtifacts extends Disposable {
                 }
                 const cached = this._responseCache.get(response.id);
                 let extracted;
-                if (cached && cached.partsLength === partsLength && cached.completedToolCount === completedToolCount && cached.byMimeType === byMimeType && cached.byFilePath === byFilePath) {
+                if (cached && cached.partsLength === partsLength && cached.completedToolCount === completedToolCount && cached.byMimeType === byMimeType && cached.byFilePath === byFilePath && cached.byMemoryFilePath === byMemoryFilePath) {
                     extracted = cached.artifacts;
                 } else {
-                    extracted = extractArtifactsFromResponse(responseValue, sessionResource, byMimeType, byFilePath);
+                    extracted = extractArtifactsFromResponse(responseValue, sessionResource, byMimeType, byFilePath, byMemoryFilePath);
                     this._responseCache.set(response.id, {
                         partsLength,
                         completedToolCount,
                         byMimeType,
                         byFilePath,
+                        byMemoryFilePath,
                         artifacts: extracted
                     });
                 }
@@ -119,71 +147,120 @@ class RulesChatArtifacts extends Disposable {
             }
             return allArtifacts;
         });
+        this.artifactGroups = derived(reader => {
+            const entries = [];
+            const rules = rulesArtifacts.read(reader);
+            if (rules.length > 0) {
+                entries.push({
+                    key: "rules",
+                    seq: this._sourceSequences.get("rules") ?? 0,
+                    group: {
+                        source: {
+                            kind: "rules"
+                        },
+                        artifacts: rules
+                    }
+                });
+            }
+            const agent = this._agentArtifacts.read(reader);
+            if (agent.length > 0) {
+                entries.push({
+                    key: "agent",
+                    seq: this._sourceSequences.get("agent") ?? Infinity,
+                    group: {
+                        source: {
+                            kind: "agent"
+                        },
+                        artifacts: agent
+                    }
+                });
+            }
+            const subagents = this._subagentArtifacts.read(reader);
+            for (const [invocationId, entry] of subagents) {
+                if (entry.artifacts.length > 0) {
+                    const key = `subagent:${invocationId}`;
+                    entries.push({
+                        key,
+                        seq: this._sourceSequences.get(key) ?? Infinity,
+                        group: {
+                            source: {
+                                kind: "subagent",
+                                invocationId,
+                                name: entry.name
+                            },
+                            artifacts: entry.artifacts
+                        }
+                    });
+                }
+            }
+            entries.sort((a, b) => a.seq - b.seq);
+            const seenKeys = ( new Set());
+            const groups = [];
+            for (const entry of entries) {
+                const filtered = entry.group.artifacts.filter(a => {
+                    const k = a.toolCallId ? `${a.toolCallId}:${a.dataPartIndex}` : a.uri;
+                    if (!k) {
+                        return false;
+                    }
+                    const normalized = k.toLowerCase();
+                    if (( seenKeys.has(normalized))) {
+                        return false;
+                    }
+                    seenKeys.add(normalized);
+                    return true;
+                });
+                if (filtered.length > 0) {
+                    groups.push({
+                        source: entry.group.source,
+                        artifacts: filtered
+                    });
+                }
+            }
+            return groups;
+        });
     }
-    set() {
-        throw ( new Error("Artifacts are not mutable in rules mode"));
-    }
-    clear() {
-        throw ( new Error("Artifacts are not mutable in rules mode"));
-    }
-    migrate() {}
-}
-class StorageChatArtifacts {
-    constructor(_storageKey, _storage) {
-        this._storageKey = _storageKey;
-        this._storage = _storage;
-        this.mutable = constObservable(true);
-        this._artifacts = observableValueOpts({
-            owner: this,
-            equalsFn: () => false
-        }, []);
-        this.artifacts = this._artifacts;
-        this._artifacts.set(this._storage.get(this._storageKey), undefined);
-    }
-    set(artifacts) {
-        this._artifacts.set(artifacts, undefined);
+    setAgentArtifacts(artifacts) {
+        if (!( this._sourceSequences.has("agent"))) {
+            this._sourceSequences.set("agent", this._nextSequence++);
+        }
+        this._agentArtifacts.set(artifacts, undefined);
         this._storage.set(this._storageKey, artifacts);
     }
-    clear() {
-        this._artifacts.set([], undefined);
-        this._storage.set(this._storageKey, []);
-    }
-    migrate(target) {
-        const current = this._artifacts.get();
-        if (current.length > 0 && target.mutable.get()) {
-            target.set([...current]);
+    setSubagentArtifacts(invocationId, name, artifacts) {
+        const key = `subagent:${invocationId}`;
+        if (!( this._sourceSequences.has(key))) {
+            this._sourceSequences.set(key, this._nextSequence++);
         }
-        this._artifacts.set([], undefined);
-        this._storage.delete(this._storageKey);
+        const map = ( new Map(this._subagentArtifacts.get()));
+        if (artifacts.length === 0) {
+            map.delete(invocationId);
+        } else {
+            map.set(invocationId, {
+                name,
+                artifacts
+            });
+        }
+        this._subagentArtifacts.set(map, undefined);
     }
-}
-class SwitchingChatArtifacts extends Disposable {
-    constructor(sessionResource, storageKey, storage, chatService, configurationService) {
-        super();
-        this._rules = this._register(( new RulesChatArtifacts(sessionResource, chatService, configurationService)));
-        this._storage = ( new StorageChatArtifacts(storageKey, storage));
-        const modeObs = observableFromEvent(
-            this,
-            configurationService.onDidChangeConfiguration,
-            () => configurationService.getValue(ChatConfiguration.ArtifactsMode) ?? "rules"
-        );
-        this._active = derived(reader => {
-            const mode = modeObs.read(reader);
-            return mode === "tool" ? this._storage : this._rules;
-        });
-        this.mutable = derived(reader => this._active.read(reader).mutable.read(reader));
-        this.artifacts = derived(reader => this._active.read(reader).artifacts.read(reader));
+    setRuleOverrides(rules) {
+        this._ruleOverrides.set(rules, undefined);
     }
-    set(artifacts) {
-        const active = this._active.get();
-        active.set(artifacts);
+    clearAgentArtifacts() {
+        this._agentArtifacts.set([], undefined);
+        this._storage.set(this._storageKey, []);
     }
-    clear() {
-        const active = this._active.get();
-        active.clear();
+    clearSubagentArtifacts(invocationId) {
+        const map = ( new Map(this._subagentArtifacts.get()));
+        map.delete(invocationId);
+        this._subagentArtifacts.set(map, undefined);
     }
     migrate(target) {
-        this._storage.migrate(target);
+        const current = this._agentArtifacts.get();
+        if (current.length > 0) {
+            target.setAgentArtifacts([...current]);
+        }
+        this._agentArtifacts.set([], undefined);
+        this._storage.delete(this._storageKey);
     }
 }
 let ChatArtifactsService = class ChatArtifactsService extends Disposable {
@@ -198,7 +275,7 @@ let ChatArtifactsService = class ChatArtifactsService extends Disposable {
         const key = chatSessionResourceToId(sessionResource);
         let instance = this._instances.get(key);
         if (!instance) {
-            instance = ( new SwitchingChatArtifacts(
+            instance = ( new UnifiedChatArtifacts(
                 sessionResource,
                 key,
                 this._storage,

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

@@ -20,7 +20,7 @@ var PhraseTextType;
 })(PhraseTextType || (PhraseTextType = {}));
 const VoiceChatInProgress = ( new RawContextKey("voiceChatInProgress", false, {
     type: "boolean",
-    description: ( localize(7697, "A speech-to-text session is in progress for chat."))
+    description: ( localize(7816, "A speech-to-text session is in progress for chat."))
 }));
 let VoiceChatService = class VoiceChatService extends Disposable {
     static {

package/vscode/src/vs/workbench/contrib/editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryServiceImpl.js

@@ -27,7 +27,7 @@ let AiEditTelemetryServiceImpl = class AiEditTelemetryServiceImpl {
             editLinesInserted: data.editDeltaInfo?.linesAdded,
             editLinesDeleted: data.editDeltaInfo?.linesRemoved,
             modeId: data.modeId,
-            modelId: data.modelId?.replace(/[\/\\]/g, "_"),
+            modelId: data.modelId?.replace(/[\/\\]/g, "|"),
             applyCodeBlockSuggestionId: data.applyCodeBlockSuggestionId,
             ...forwardToChannelIf(isCopilotLikeExtension(data.source?.extensionId))
         });
@@ -48,7 +48,7 @@ let AiEditTelemetryServiceImpl = class AiEditTelemetryServiceImpl {
             editLinesInserted: data.editDeltaInfo?.linesAdded,
             editLinesDeleted: data.editDeltaInfo?.linesRemoved,
             modeId: data.modeId,
-            modelId: data.modelId?.replace(/[\/\\]/g, "_"),
+            modelId: data.modelId?.replace(/[\/\\]/g, "|"),
             applyCodeBlockSuggestionId: data.applyCodeBlockSuggestionId,
             acceptanceMethod: data.acceptanceMethod,
             ...forwardToChannelIf(isCopilotLikeExtension(data.source?.extensionId))

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChat.contribution.js

@@ -36,7 +36,7 @@ const editActionMenuItem = {
     order: 0,
     command: {
         id: ChatSubmitAction.ID,
-        title: ( localize(9925, "Edit Code"))
+        title: ( localize(10063, "Edit Code"))
     },
     when: ( ContextKeyExpr.and(ChatContextKeys.inputHasText, ( CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.toNegated()), CTX_INLINE_CHAT_EDITING, CTX_INLINE_CHAT_V1_ENABLED))
 };
@@ -45,7 +45,7 @@ const generateActionMenuItem = {
     order: 0,
     command: {
         id: ChatSubmitAction.ID,
-        title: ( localize(9926, "Generate"))
+        title: ( localize(10064, "Generate"))
     },
     when: ( ContextKeyExpr.and(ChatContextKeys.inputHasText, ( CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.toNegated()), ( CTX_INLINE_CHAT_EDITING.toNegated()), CTX_INLINE_CHAT_V1_ENABLED))
 };
@@ -56,8 +56,8 @@ const cancelActionMenuItem = {
     order: 0,
     command: {
         id: CancelAction.ID,
-        title: ( localize(9927, "Cancel Request")),
-        shortTitle: ( localize(9928, "Cancel"))
+        title: ( localize(10065, "Cancel Request")),
+        shortTitle: ( localize(10066, "Cancel"))
     },
     when: ( ContextKeyExpr.and(CTX_INLINE_CHAT_REQUEST_IN_PROGRESS))
 };