@codingame/monaco-vscode-chat-service-override 16.0.0 → 16.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-chat-service-override",
-  "version": "16.0.0",
+  "version": "16.0.2",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - chat service-override",
   "keywords": [],
@@ -15,31 +15,31 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-1021b67c-93e5-5c78-a270-cbdb2574d980-common": "16.0.0",
-    "@codingame/monaco-vscode-12c5f9eb-72d3-57ca-babd-5bef7aa9de3b-common": "16.0.0",
-    "@codingame/monaco-vscode-1cc4ea0a-c5b6-54ed-bb60-078a99119b55-common": "16.0.0",
-    "@codingame/monaco-vscode-29bc1406-2925-5b8f-b25e-d04a7772d896-common": "16.0.0",
-    "@codingame/monaco-vscode-2b1a9082-790f-527f-b013-d1b29d6265a3-common": "16.0.0",
-    "@codingame/monaco-vscode-42931eb9-e564-530c-bafc-fa23ab43a070-common": "16.0.0",
-    "@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common": "16.0.0",
-    "@codingame/monaco-vscode-68b3311c-eb96-5711-8f72-f5f4b2e31932-common": "16.0.0",
-    "@codingame/monaco-vscode-805e9c2f-56b6-5a43-8b5b-d2dc2d3805fc-common": "16.0.0",
-    "@codingame/monaco-vscode-8c844347-a703-5de1-9eeb-5e0c7f503a58-common": "16.0.0",
-    "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common": "16.0.0",
-    "@codingame/monaco-vscode-9b5a5e82-d649-5455-b4bf-ef90d6afd294-common": "16.0.0",
-    "@codingame/monaco-vscode-a1eb43d5-da63-5f76-8ad4-acf0d6c3b749-common": "16.0.0",
-    "@codingame/monaco-vscode-a7c9ae3c-16d2-5d17-86b2-981be7094566-common": "16.0.0",
-    "@codingame/monaco-vscode-ad89fae6-94f0-5ac2-a185-22dea4b68ee0-common": "16.0.0",
-    "@codingame/monaco-vscode-ae8a8ca1-f243-508b-9c37-c88ebbd295fa-common": "16.0.0",
-    "@codingame/monaco-vscode-aff8bc9b-c6f8-578f-9c8a-f70d14f9c13c-common": "16.0.0",
-    "@codingame/monaco-vscode-api": "16.0.0",
-    "@codingame/monaco-vscode-b1110435-a331-5549-ab1e-aa3d763c3a1f-common": "16.0.0",
-    "@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common": "16.0.0",
-    "@codingame/monaco-vscode-c4e2825a-b5b1-5f0e-b547-068c32e06d50-common": "16.0.0",
-    "@codingame/monaco-vscode-ea14e352-8f1c-5569-b79a-8a96a53e8abe-common": "16.0.0",
-    "@codingame/monaco-vscode-ec21d4de-4d65-574c-8715-bb1a6bbad376-common": "16.0.0",
-    "@codingame/monaco-vscode-f1bbc6d3-6129-583c-a2ba-c80b832993d2-common": "16.0.0",
-    "@codingame/monaco-vscode-fdf643f9-94dd-5510-b97a-408abf26ad92-common": "16.0.0"
+    "@codingame/monaco-vscode-1021b67c-93e5-5c78-a270-cbdb2574d980-common": "16.0.2",
+    "@codingame/monaco-vscode-12c5f9eb-72d3-57ca-babd-5bef7aa9de3b-common": "16.0.2",
+    "@codingame/monaco-vscode-1cc4ea0a-c5b6-54ed-bb60-078a99119b55-common": "16.0.2",
+    "@codingame/monaco-vscode-29bc1406-2925-5b8f-b25e-d04a7772d896-common": "16.0.2",
+    "@codingame/monaco-vscode-2b1a9082-790f-527f-b013-d1b29d6265a3-common": "16.0.2",
+    "@codingame/monaco-vscode-42931eb9-e564-530c-bafc-fa23ab43a070-common": "16.0.2",
+    "@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common": "16.0.2",
+    "@codingame/monaco-vscode-68b3311c-eb96-5711-8f72-f5f4b2e31932-common": "16.0.2",
+    "@codingame/monaco-vscode-805e9c2f-56b6-5a43-8b5b-d2dc2d3805fc-common": "16.0.2",
+    "@codingame/monaco-vscode-8c844347-a703-5de1-9eeb-5e0c7f503a58-common": "16.0.2",
+    "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common": "16.0.2",
+    "@codingame/monaco-vscode-9b5a5e82-d649-5455-b4bf-ef90d6afd294-common": "16.0.2",
+    "@codingame/monaco-vscode-a1eb43d5-da63-5f76-8ad4-acf0d6c3b749-common": "16.0.2",
+    "@codingame/monaco-vscode-a7c9ae3c-16d2-5d17-86b2-981be7094566-common": "16.0.2",
+    "@codingame/monaco-vscode-ad89fae6-94f0-5ac2-a185-22dea4b68ee0-common": "16.0.2",
+    "@codingame/monaco-vscode-ae8a8ca1-f243-508b-9c37-c88ebbd295fa-common": "16.0.2",
+    "@codingame/monaco-vscode-aff8bc9b-c6f8-578f-9c8a-f70d14f9c13c-common": "16.0.2",
+    "@codingame/monaco-vscode-api": "16.0.2",
+    "@codingame/monaco-vscode-b1110435-a331-5549-ab1e-aa3d763c3a1f-common": "16.0.2",
+    "@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common": "16.0.2",
+    "@codingame/monaco-vscode-c4e2825a-b5b1-5f0e-b547-068c32e06d50-common": "16.0.2",
+    "@codingame/monaco-vscode-ea14e352-8f1c-5569-b79a-8a96a53e8abe-common": "16.0.2",
+    "@codingame/monaco-vscode-ec21d4de-4d65-574c-8715-bb1a6bbad376-common": "16.0.2",
+    "@codingame/monaco-vscode-f1bbc6d3-6129-583c-a2ba-c80b832993d2-common": "16.0.2",
+    "@codingame/monaco-vscode-fdf643f9-94dd-5510-b97a-408abf26ad92-common": "16.0.2"
   },
   "main": "index.js",
   "module": "index.js",

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

@@ -5,6 +5,7 @@ import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/fi
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
+import { IUserDataProfilesService } from "@codingame/monaco-vscode-api/vscode/vs/platform/userDataProfile/common/userDataProfile.service";
 import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
 import { ILifecycleService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service";
 import { ChatModel, ISerializableChatData, ISerializableChatsData } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatModel";
@@ -17,11 +18,13 @@ export declare class ChatSessionStore extends Disposable {
     private readonly telemetryService;
     private readonly storageService;
     private readonly lifecycleService;
+    private readonly userDataProfilesService;
     private readonly storageRoot;
+    private readonly previousEmptyWindowStorageRoot;
     private readonly storeQueue;
     private storeTask;
     private shuttingDown;
-    constructor(fileService: IFileService, environmentService: IEnvironmentService, logService: ILogService, workspaceContextService: IWorkspaceContextService, telemetryService: ITelemetryService, storageService: IStorageService, lifecycleService: ILifecycleService);
+    constructor(fileService: IFileService, environmentService: IEnvironmentService, logService: ILogService, workspaceContextService: IWorkspaceContextService, telemetryService: ITelemetryService, storageService: IStorageService, lifecycleService: ILifecycleService, userDataProfilesService: IUserDataProfilesService);
     storeSessions(sessions: ChatModel[]): Promise<void>;
     private writeSession;
     private flushIndex;
@@ -41,6 +44,7 @@ export declare class ChatSessionStore extends Disposable {
     migrateDataIfNeeded(getInitialData: () => ISerializableChatsData | undefined): Promise<void>;
     private migrate;
     readSession(sessionId: string): Promise<ISerializableChatData | undefined>;
+    private readSessionFromPreviousLocation;
     private getStorageLocation;
     getChatStorageFolder(): URI;
 }

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

@@ -15,6 +15,7 @@ import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log
 import { StorageTarget, StorageScope } 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 { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
+import { IUserDataProfilesService } from '@codingame/monaco-vscode-api/vscode/vs/platform/userDataProfile/common/userDataProfile.service';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { ILifecycleService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
 import { normalizeSerializableChatData, ChatModel } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatModel';
@@ -22,7 +23,7 @@ import { normalizeSerializableChatData, ChatModel } from '@codingame/monaco-vsco
 const maxPersistedSessions = 25;
 const ChatIndexStorageKey = 'chat.ChatSessionStore.index';
 let ChatSessionStore = class ChatSessionStore extends Disposable {
-    constructor(fileService, environmentService, logService, workspaceContextService, telemetryService, storageService, lifecycleService) {
+    constructor(fileService, environmentService, logService, workspaceContextService, telemetryService, storageService, lifecycleService, userDataProfilesService) {
         super();
         this.fileService = fileService;
         this.environmentService = environmentService;
@@ -31,14 +32,18 @@ let ChatSessionStore = class ChatSessionStore extends Disposable {
         this.telemetryService = telemetryService;
         this.storageService = storageService;
         this.lifecycleService = lifecycleService;
+        this.userDataProfilesService = userDataProfilesService;
         this.storeQueue = ( new Sequencer());
         this.shuttingDown = false;
         const workspace = this.workspaceContextService.getWorkspace();
         const isEmptyWindow = !workspace.configuration && workspace.folders.length === 0;
-        const workspaceId = isEmptyWindow ?
-            'no-workspace' :
-            this.workspaceContextService.getWorkspace().id;
-        this.storageRoot = joinPath(this.environmentService.workspaceStorageHome, workspaceId, 'chatSessions');
+        const workspaceId = this.workspaceContextService.getWorkspace().id;
+        this.storageRoot = isEmptyWindow ?
+            joinPath(this.userDataProfilesService.defaultProfile.globalStorageHome, 'emptyWindowChatSessions') :
+            joinPath(this.environmentService.workspaceStorageHome, workspaceId, 'chatSessions');
+        this.previousEmptyWindowStorageRoot = isEmptyWindow ?
+            joinPath(this.environmentService.workspaceStorageHome, 'no-workspace', 'chatSessions') :
+            undefined;
         this._register(this.lifecycleService.onWillShutdown(e => {
             this.shuttingDown = true;
             if (!this.storeTask) {
@@ -230,7 +235,12 @@ let ChatSessionStore = class ChatSessionStore extends Disposable {
             }
             catch (e) {
                 this.reportError('sessionReadFile', `Error reading chat session file ${sessionId}`, e);
-                return undefined;
+                if (toFileOperationResult(e) === FileOperationResult.FILE_NOT_FOUND && this.previousEmptyWindowStorageRoot) {
+                    rawData = await this.readSessionFromPreviousLocation(sessionId);
+                }
+                if (!rawData) {
+                    return undefined;
+                }
             }
             try {
                 const session = revive(JSON.parse(rawData));
@@ -255,6 +265,21 @@ let ChatSessionStore = class ChatSessionStore extends Disposable {
             }
         });
     }
+    async readSessionFromPreviousLocation(sessionId) {
+        let rawData;
+        if (this.previousEmptyWindowStorageRoot) {
+            const storageLocation2 = joinPath(this.previousEmptyWindowStorageRoot, `${sessionId}.json`);
+            try {
+                rawData = ( (await this.fileService.readFile(storageLocation2)).value.toString());
+                this.logService.info(`ChatSessionStore: Read chat session ${sessionId} from previous location`);
+            }
+            catch (e) {
+                this.reportError('sessionReadFile', `Error reading chat session file ${sessionId} from previous location`, e);
+                return undefined;
+            }
+        }
+        return rawData;
+    }
     getStorageLocation(chatSessionId) {
         return joinPath(this.storageRoot, `${chatSessionId}.json`);
     }
@@ -269,7 +294,8 @@ ChatSessionStore = ( __decorate([
     ( __param(3, IWorkspaceContextService)),
     ( __param(4, ITelemetryService)),
     ( __param(5, IStorageService)),
-    ( __param(6, ILifecycleService))
+    ( __param(6, ILifecycleService)),
+    ( __param(7, IUserDataProfilesService))
 ], ChatSessionStore));
 function isChatSessionEntryMetadata(obj) {
     return (!!obj &&