@codingame/monaco-vscode-chat-service-override 29.1.1 → 30.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 { IResolvedPromptFile, IResolvedPromptSourceFolder } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations";
+import { 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, IResolvedAgentFile, Logger, PromptsStorage } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService";
+import { AgentFileType, IPromptPath, IResolvedAgentFile, 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";
@@ -137,7 +137,7 @@ export declare class PromptFilesLocator {
     /**
      * Searches for skills in all configured locations.
      */
-    findAgentSkills(token: CancellationToken): Promise<IResolvedPromptFile[]>;
+    findAgentSkills(token: CancellationToken): Promise<IPromptPath[]>;
 }
 /**
  * Checks if the provided path contains a glob pattern (* or **).

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

@@ -7,11 +7,11 @@ import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { FileOperationError, FileOperationResult } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { PromptsConfig, getPromptFileLocationsConfigKey, isTildePath } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/config';
-import { dirname, isEqual, joinPath, basename, isEqualOrParent, extname } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+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 { PromptFileSource, 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 { PromptsType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
+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 { 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';
 import { getExcludes, QueryType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/search/common/search';
@@ -56,7 +56,7 @@ let PromptFilesLocator = class PromptFilesLocator {
             filePattern: undefined,
             source: PromptFileSource.CopilotPersonal,
             storage: PromptsStorage.user,
-            displayPath: ( localize(7574, "User Data")),
+            displayPath: ( localize(7639, "User Data")),
             isDefault: true
         };
     }
@@ -88,8 +88,7 @@ let PromptFilesLocator = class PromptFilesLocator {
     async findParentRepoFolders(folderUri, userHome, seen, logger) {
         const candidates = [];
         let current = folderUri;
-        let parent = dirname(current);
-        do {
+        while (true) {
             try {
                 const isRepoRoot = await this.fileService.exists(joinPath(current, ".git"));
                 if (isRepoRoot) {
@@ -106,9 +105,12 @@ let PromptFilesLocator = class PromptFilesLocator {
                 return [];
             }
             candidates.push(current);
+            const parent = dirname(current);
+            if (isEqual(current, parent) || current.path === "/" || isEqual(userHome, parent) || ( seen.has(parent))) {
+                break;
+            }
             current = parent;
-            parent = dirname(current);
-        } while (!( seen.has(current)) && current.path !== "/" && !isEqual(userHome, current));
+        }
         logger?.logInfo(`No repository root found for folder ${( folderUri.toString())}.`);
         return [];
     }
@@ -159,7 +161,7 @@ let PromptFilesLocator = class PromptFilesLocator {
                 }
             }
         };
-        const update = async emitEvent => {
+        const update = async () => {
             try {
                 const configuredLocations = PromptsConfig.promptSourceFolders(this.configService, type);
                 parentFolders = await this.toAbsoluteLocations(type, configuredLocations, undefined);
@@ -167,23 +169,23 @@ let PromptFilesLocator = class PromptFilesLocator {
                     return;
                 }
                 updateExternalFolderWatchers();
-                if (emitEvent) {
-                    eventEmitter.fire();
-                }
             } catch (err) {
                 this.logService.error(`Error updating prompt file watchers after config change:`, err);
             }
         };
         disposables.add(this.configService.onDidChangeConfiguration(e => {
-            if (e.affectsConfiguration(key)) {
-                void update(true);
+            if (e.affectsConfiguration(key) || e.affectsConfiguration(PromptsConfig.USE_CUSTOMIZATIONS_IN_PARENT_REPOS)) {
+                void update();
+                eventEmitter.fire();
             }
         }));
         disposables.add(this.onDidChangeWorkspaceFolders()(() => {
-            void update(true);
+            void update();
+            eventEmitter.fire();
         }));
         disposables.add(this.workspaceTrustManagementService.onDidChangeTrustedFolders(() => {
-            void update(true);
+            void update();
+            eventEmitter.fire();
         }));
         disposables.add(this.fileService.onDidFilesChange(e => {
             if (e.affects(userDataFolder)) {
@@ -196,7 +198,7 @@ let PromptFilesLocator = class PromptFilesLocator {
             }
         }));
         disposables.add(this.fileService.watch(userDataFolder));
-        void update(false);
+        void update();
         return {
             event: eventEmitter.event,
             dispose: () => disposables.dispose()
@@ -613,11 +615,14 @@ let PromptFilesLocator = class PromptFilesLocator {
                 return [];
             }
             const results = await this.findAgentSkillsInFolder(uri, token);
-            allResults.push(...( results.map(uri => ({
-                fileUri: uri,
-                source,
-                storage
-            }))));
+            for (const skillUri of results) {
+                allResults.push({
+                    uri: skillUri,
+                    source,
+                    storage,
+                    type: PromptsType.skill
+                });
+            }
         }
         return allResults;
     }

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

@@ -1,24 +1,36 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
+import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
 import { IChatArtifactsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/chatArtifactsService.service";
+export interface IArtifactGroupConfig {
+    readonly groupName: string;
+    readonly onlyShowGroup?: boolean;
+}
 export interface IChatArtifact {
     readonly label: string;
     readonly uri: string;
     readonly toolCallId?: string;
     readonly dataPartIndex?: number;
     readonly type: "devServer" | "screenshot" | "plan" | undefined;
+    readonly groupName?: string;
+    readonly onlyShowGroup?: boolean;
+}
+export interface IChatArtifacts {
+    readonly artifacts: IObservable<readonly IChatArtifact[]>;
+    readonly mutable: IObservable<boolean>;
+    set(artifacts: IChatArtifact[]): void;
+    clear(): void;
+    migrate(target: IChatArtifacts): void;
 }
 export declare class ChatArtifactsService extends Disposable implements IChatArtifactsService {
+    private readonly _chatService;
+    private readonly _configurationService;
     readonly _serviceBrand: undefined;
-    private readonly _onDidUpdateArtifacts;
-    readonly onDidUpdateArtifacts: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<URI>;
     private readonly _storage;
-    private readonly _observables;
-    constructor(storageService: IStorageService);
-    getArtifacts(sessionResource: URI): readonly IChatArtifact[];
-    setArtifacts(sessionResource: URI, artifacts: IChatArtifact[]): void;
-    migrateArtifacts(oldSessionResource: URI, newSessionResource: URI): void;
-    artifacts(sessionResource: URI): IObservable<readonly IChatArtifact[]>;
+    private readonly _instances;
+    constructor(storageService: IStorageService, _chatService: IChatService, _configurationService: IConfigurationService);
+    getArtifacts(sessionResource: URI): IChatArtifacts;
 }

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

@@ -1,75 +1,215 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
-import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Disposable, DisposableMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 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 { 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 { 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) {
         this._memento = ( new Memento("chat-artifacts", storageService));
     }
-    getArtifacts(sessionResource) {
+    get(key) {
         const storage = this._memento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
-        return storage[this._toKey(sessionResource)] || [];
+        return storage[key] || [];
     }
-    setArtifacts(sessionResource, artifacts) {
+    set(key, artifacts) {
         const storage = this._memento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
-        storage[this._toKey(sessionResource)] = artifacts;
+        storage[key] = artifacts;
         this._memento.saveMemento();
     }
-    migrateArtifacts(oldSessionResource, newSessionResource) {
-        const artifacts = this.getArtifacts(oldSessionResource);
-        if (artifacts.length > 0) {
-            this.setArtifacts(newSessionResource, artifacts);
-            const storage = this._memento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
-            delete storage[this._toKey(oldSessionResource)];
-            this._memento.saveMemento();
-        }
-    }
-    _toKey(sessionResource) {
-        return chatSessionResourceToId(sessionResource);
+    delete(key) {
+        const storage = this._memento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
+        delete storage[key];
+        this._memento.saveMemento();
     }
 };
 ChatArtifactsStorage = ( __decorate([( __param(0, IStorageService))], ChatArtifactsStorage));
-let ChatArtifactsService = class ChatArtifactsService extends Disposable {
-    constructor(storageService) {
+class RulesChatArtifacts extends Disposable {
+    constructor(sessionResource, chatService, configurationService) {
         super();
-        this._onDidUpdateArtifacts = this._register(( new Emitter()));
-        this.onDidUpdateArtifacts = this._onDidUpdateArtifacts.event;
-        this._observables = ( new Map());
-        this._storage = ( new ChatArtifactsStorage(storageService));
+        this.mutable = constObservable(false);
+        this._responseCache = ( new Map());
+        const configByMimeType = observableFromEvent(
+            this,
+            configurationService.onDidChangeConfiguration,
+            () => configurationService.getValue(ChatConfiguration.ArtifactsRulesByMimeType) ?? {}
+        );
+        const configByFilePath = observableFromEvent(
+            this,
+            configurationService.onDidChangeConfiguration,
+            () => configurationService.getValue(ChatConfiguration.ArtifactsRulesByFilePath) ?? {}
+        );
+        const modelSignal = observableFromEvent(
+            this,
+            chatService.onDidCreateModel,
+            () => chatService.getSession(sessionResource)
+        );
+        this.artifacts = derived(reader => {
+            const byMimeType = configByMimeType.read(reader);
+            const byFilePath = configByFilePath.read(reader);
+            const model = modelSignal.read(reader);
+            if (!model) {
+                return [];
+            }
+            const requestsSignal = observableSignalFromEvent(this, model.onDidChange);
+            requestsSignal.read(reader);
+            const requests = model.getRequests();
+            const allArtifacts = [];
+            const activeResponseIds = ( new Set());
+            const seenKeys = ( new Set());
+            for (const request of requests) {
+                const response = request.response;
+                if (!response) {
+                    continue;
+                }
+                activeResponseIds.add(response.id);
+                const responseValue = response.response;
+                const partsLength = responseValue.value.length;
+                let completedToolCount = 0;
+                for (const part of responseValue.value) {
+                    if ((part.kind === "toolInvocation" || part.kind === "toolInvocationSerialized") && IChatToolInvocation.resultDetails(part) !== undefined) {
+                        completedToolCount++;
+                    }
+                }
+                const cached = this._responseCache.get(response.id);
+                let extracted;
+                if (cached && cached.partsLength === partsLength && cached.completedToolCount === completedToolCount && cached.byMimeType === byMimeType && cached.byFilePath === byFilePath) {
+                    extracted = cached.artifacts;
+                } else {
+                    extracted = extractArtifactsFromResponse(responseValue, sessionResource, byMimeType, byFilePath);
+                    this._responseCache.set(response.id, {
+                        partsLength,
+                        completedToolCount,
+                        byMimeType,
+                        byFilePath,
+                        artifacts: extracted
+                    });
+                }
+                for (const artifact of extracted) {
+                    const key = artifact.toolCallId ? `${artifact.toolCallId}:${artifact.dataPartIndex}` : artifact.uri;
+                    if (( seenKeys.has(key))) {
+                        const idx = allArtifacts.findIndex(
+                            a => a.toolCallId ? `${a.toolCallId}:${a.dataPartIndex}` === key : a.uri === key
+                        );
+                        if (idx !== -1) {
+                            allArtifacts.splice(idx, 1);
+                        }
+                    }
+                    seenKeys.add(key);
+                    allArtifacts.push(artifact);
+                }
+            }
+            for (const key of ( this._responseCache.keys())) {
+                if (!( activeResponseIds.has(key))) {
+                    this._responseCache.delete(key);
+                }
+            }
+            return allArtifacts;
+        });
     }
-    getArtifacts(sessionResource) {
-        return this._storage.getArtifacts(sessionResource);
+    set() {
+        throw ( new Error("Artifacts are not mutable in rules mode"));
     }
-    setArtifacts(sessionResource, artifacts) {
-        this._storage.setArtifacts(sessionResource, artifacts);
-        const key = chatSessionResourceToId(sessionResource);
-        this._observables.get(key)?.set(artifacts, undefined);
-        this._onDidUpdateArtifacts.fire(sessionResource);
+    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);
+        this._storage.set(this._storageKey, artifacts);
     }
-    migrateArtifacts(oldSessionResource, newSessionResource) {
-        this._storage.migrateArtifacts(oldSessionResource, newSessionResource);
-        this._onDidUpdateArtifacts.fire(newSessionResource);
+    clear() {
+        this._artifacts.set([], undefined);
+        this._storage.set(this._storageKey, []);
     }
-    artifacts(sessionResource) {
+    migrate(target) {
+        const current = this._artifacts.get();
+        if (current.length > 0 && target.mutable.get()) {
+            target.set([...current]);
+        }
+        this._artifacts.set([], undefined);
+        this._storage.delete(this._storageKey);
+    }
+}
+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));
+    }
+    set(artifacts) {
+        const active = this._active.get();
+        active.set(artifacts);
+    }
+    clear() {
+        const active = this._active.get();
+        active.clear();
+    }
+    migrate(target) {
+        this._storage.migrate(target);
+    }
+}
+let ChatArtifactsService = class ChatArtifactsService extends Disposable {
+    constructor(storageService, _chatService, _configurationService) {
+        super();
+        this._chatService = _chatService;
+        this._configurationService = _configurationService;
+        this._instances = this._register(( new DisposableMap()));
+        this._storage = ( new ChatArtifactsStorage(storageService));
+    }
+    getArtifacts(sessionResource) {
         const key = chatSessionResourceToId(sessionResource);
-        let obs = this._observables.get(key);
-        if (!obs) {
-            obs = observableValueOpts({
-                owner: this,
-                equalsFn: () => false
-            }, this._storage.getArtifacts(sessionResource));
-            this._observables.set(key, obs);
+        let instance = this._instances.get(key);
+        if (!instance) {
+            instance = ( new SwitchingChatArtifacts(
+                sessionResource,
+                key,
+                this._storage,
+                this._chatService,
+                this._configurationService
+            ));
+            this._instances.set(key, instance);
         }
-        return obs;
+        return instance;
     }
 };
-ChatArtifactsService = ( __decorate([( __param(0, IStorageService))], ChatArtifactsService));
+ChatArtifactsService = ( __decorate([( __param(0, IStorageService)), ( __param(1, IChatService)), ( __param(2, IConfigurationService))], ChatArtifactsService));
 
 export { ChatArtifactsService };

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(7632, "A speech-to-text session is in progress for chat."))
+    description: ( localize(7697, "A speech-to-text session is in progress for chat."))
 }));
 let VoiceChatService = class VoiceChatService extends Disposable {
     static {

package/vscode/src/vs/workbench/contrib/chat/common/widget/chatResponseResourceFileSystemProvider.js

@@ -26,7 +26,7 @@ let ChatResponseResourceFileSystemProvider = class ChatResponseResourceFileSyste
         this._associated = ( new ResourceMap());
         this._sessionAssociations = ( new ResourceMap());
         this._register(this.chatService.onDidDisposeSession(e => {
-            for (const sessionResource of e.sessionResource) {
+            for (const sessionResource of e.sessionResources) {
                 const uris = this._sessionAssociations.get(sessionResource);
                 if (uris) {
                     for (const uri of uris) {

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

@@ -2,7 +2,6 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { EditSuggestionId } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/textModelEditSource';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
-import { TelemetryTrustedValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetryUtils';
 import { DataChannelForwardingTelemetryService, forwardToChannelIf, isCopilotLikeExtension } from '@codingame/monaco-vscode-api/vscode/vs/platform/dataChannel/browser/forwardingTelemetryService';
 import { IRandomService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/editTelemetry/browser/randomService.service';
 
@@ -28,7 +27,7 @@ let AiEditTelemetryServiceImpl = class AiEditTelemetryServiceImpl {
             editLinesInserted: data.editDeltaInfo?.linesAdded,
             editLinesDeleted: data.editDeltaInfo?.linesRemoved,
             modeId: data.modeId,
-            modelId: ( new TelemetryTrustedValue(data.modelId)),
+            modelId: data.modelId?.replace(/[\/\\]/g, "_"),
             applyCodeBlockSuggestionId: data.applyCodeBlockSuggestionId,
             ...forwardToChannelIf(isCopilotLikeExtension(data.source?.extensionId))
         });
@@ -49,7 +48,7 @@ let AiEditTelemetryServiceImpl = class AiEditTelemetryServiceImpl {
             editLinesInserted: data.editDeltaInfo?.linesAdded,
             editLinesDeleted: data.editDeltaInfo?.linesRemoved,
             modeId: data.modeId,
-            modelId: ( new TelemetryTrustedValue(data.modelId)),
+            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(9860, "Edit Code"))
+        title: ( localize(9925, "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(9861, "Generate"))
+        title: ( localize(9926, "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(9862, "Cancel Request")),
-        shortTitle: ( localize(9863, "Cancel"))
+        title: ( localize(9927, "Cancel Request")),
+        shortTitle: ( localize(9928, "Cancel"))
     },
     when: ( ContextKeyExpr.and(CTX_INLINE_CHAT_REQUEST_IN_PROGRESS))
 };