"import chat" fixes (#280089)

Fix #258517

Author: roblourens

src/vs/workbench/contrib/chat/browser/actions/chatImportExport.ts

@@ -18,6 +18,7 @@ import { ChatContextKeys } from '../../common/chatContextKeys.js';
 import { isExportableSessionData } from '../../common/chatModel.js';
 import { IChatService } from '../../common/chatService.js';
 import { URI } from '../../../../../base/common/uri.js';
+import { revive } from '../../../../../base/common/marshalling.js';
 
 const defaultFileName = 'chat.json';
 const filters = [{ name: localize('chat.file.label', "Chat Session"), extensions: ['json'] }];
@@ -94,7 +95,7 @@ export function registerChatExportActions() {
 
 			const content = await fileService.readFile(result[0]);
 			try {
-				const data = JSON.parse(content.value.toString());
+				const data = revive(JSON.parse(content.value.toString()));
 				if (!isExportableSessionData(data)) {
 					throw new Error('Invalid chat session data');
 				}

src/vs/workbench/contrib/chat/common/chatModel.ts

@@ -25,7 +25,6 @@ import { ISelection } from '../../../../editor/common/core/selection.js';
 import { TextEdit } from '../../../../editor/common/languages.js';
 import { EditSuggestionId } from '../../../../editor/common/textModelEditSource.js';
 import { localize } from '../../../../nls.js';
-import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
 import { CellUri, ICellEditOperation } from '../../notebook/common/notebookCommon.js';
 import { migrateLegacyTerminalToolSpecificData } from './chat.js';
@@ -1239,7 +1238,6 @@ export interface IExportableChatData {
 export interface ISerializableChatData1 extends IExportableChatData {
 	sessionId: string;
 	creationDate: number;
-	isImported: boolean;
 
 	/** Indicates that this session was created in this window. Is cleared after the chat has been written to storage once. Needed to sync chat creations/deletions between empty windows. */
 	isNew?: boolean;
@@ -1400,8 +1398,9 @@ function getLastYearDate(): number {
 }
 
 export function isExportableSessionData(obj: unknown): obj is IExportableChatData {
-	const data = obj as IExportableChatData;
-	return typeof data === 'object';
+	return !!obj &&
+		Array.isArray((obj as IExportableChatData).requests) &&
+		typeof (obj as IExportableChatData).responderUsername === 'string';
 }
 
 export function isSerializableSessionData(obj: unknown): obj is ISerializableChatData {
@@ -1652,26 +1651,26 @@ export class ChatModel extends Disposable implements IChatModel {
 		@IChatAgentService private readonly chatAgentService: IChatAgentService,
 		@IChatEditingService private readonly chatEditingService: IChatEditingService,
 		@IChatService chatService: IChatService,
-		@IConfigurationService configurationService: IConfigurationService,
 	) {
 		super();
 
-		const isValid = isSerializableSessionData(initialData);
-		if (initialData && !isValid) {
+		const isValidExportedData = isExportableSessionData(initialData);
+		const isValidFullData = isValidExportedData && isSerializableSessionData(initialData);
+		if (initialData && !isValidExportedData) {
 			this.logService.warn(`ChatModel#constructor: Loaded malformed session data: ${JSON.stringify(initialData)}`);
 		}
 
-		this._isImported = (!!initialData && !isValid) || (initialData?.isImported ?? false);
-		this._sessionId = (isValid && initialData.sessionId) || initialModelProps.sessionId || generateUuid();
+		this._isImported = !!initialData && isValidExportedData && !isValidFullData;
+		this._sessionId = (isValidFullData && initialData.sessionId) || initialModelProps.sessionId || generateUuid();
 		this._sessionResource = initialModelProps.resource ?? LocalChatSessionUri.forSession(this._sessionId);
 
 		this._requests = initialData ? this._deserialize(initialData) : [];
-		this._timestamp = (isValid && initialData.creationDate) || Date.now();
-		this._lastMessageDate = (isValid && initialData.lastMessageDate) || this._timestamp;
-		this._customTitle = isValid ? initialData.customTitle : undefined;
+		this._timestamp = (isValidFullData && initialData.creationDate) || Date.now();
+		this._lastMessageDate = (isValidFullData && initialData.lastMessageDate) || this._timestamp;
+		this._customTitle = isValidFullData ? initialData.customTitle : undefined;
 
 		// Initialize input model from serialized data (undefined for new chats)
-		const serializedInputState = isValid && initialData.inputState ? initialData.inputState : undefined;
+		const serializedInputState = isValidFullData && initialData.inputState ? initialData.inputState : undefined;
 		this.inputModel = new InputModel(serializedInputState && {
 			attachments: serializedInputState.attachments,
 			mode: serializedInputState.mode,
@@ -2121,7 +2120,6 @@ export class ChatModel extends Disposable implements IChatModel {
 			...this.toExport(),
 			sessionId: this.sessionId,
 			creationDate: this._timestamp,
-			isImported: this._isImported,
 			lastMessageDate: this._lastMessageDate,
 			customTitle: this._customTitle,
 			// Only include inputState if it has been set

src/vs/workbench/contrib/chat/common/chatServiceImpl.ts

@@ -168,7 +168,7 @@ export class ChatService extends Disposable implements IChatService {
 			createModel: (props: IStartSessionProps) => this._startSession(props),
 			willDisposeModel: async (model: ChatModel) => {
 				const localSessionId = LocalChatSessionUri.parseLocalSessionId(model.sessionResource);
-				if (localSessionId && (model.initialLocation === ChatAgentLocation.Chat)) {
+				if (localSessionId && this.shouldStoreSession(model)) {
 					// Always preserve sessions that have custom titles, even if empty
 					if (model.getRequests().length === 0 && !model.customTitle) {
 						await this._chatSessionStore.deleteSession(localSessionId);
@@ -234,16 +234,21 @@ export class ChatService extends Disposable implements IChatService {
 
 	private saveState(): void {
 		const liveChats = Array.from(this._sessionModels.values())
-			.filter(session => {
-				if (!LocalChatSessionUri.parseLocalSessionId(session.sessionResource)) {
-					return false;
-				}
-				return session.initialLocation === ChatAgentLocation.Chat;
-			});
+			.filter(session => this.shouldStoreSession(session));
 
 		this._chatSessionStore.storeSessions(liveChats);
 	}
 
+	/**
+	 * Only persist local sessions from chat that are not imported.
+	 */
+	private shouldStoreSession(session: ChatModel): boolean {
+		if (!LocalChatSessionUri.parseLocalSessionId(session.sessionResource)) {
+			return false;
+		}
+		return session.initialLocation === ChatAgentLocation.Chat && !session.isImported;
+	}
+
 	notifyUserAction(action: IChatUserActionEvent): void {
 		this._chatServiceTelemetry.notifyUserAction(action);
 		this._onDidPerformUserAction.fire(action);
@@ -345,7 +350,6 @@ export class ChatService extends Disposable implements IChatService {
 					customTitle: metadata.title,
 					creationDate: Date.now(), // Use current time as fallback
 					lastMessageDate: metadata.lastMessageDate,
-					isImported: metadata.isImported || false,
 					initialLocation: metadata.initialLocation,
 					requests: [], // Empty requests array - this is just for title lookup
 					responderUsername: '',

src/vs/workbench/contrib/chat/common/chatSessionStore.ts

@@ -383,11 +383,10 @@ export class ChatSessionStore extends Disposable {
 	}
 }
 
-interface IChatSessionEntryMetadata {
+export interface IChatSessionEntryMetadata {
 	sessionId: string;
 	title: string;
 	lastMessageDate: number;
-	isImported?: boolean;
 	initialLocation?: ChatAgentLocation;
 
 	/**
@@ -447,7 +446,6 @@ function getSessionMetadata(session: ChatModel | ISerializableChatData): IChatSe
 		sessionId: session.sessionId,
 		title: title || localize('newChat', "New Chat"),
 		lastMessageDate: session.lastMessageDate,
-		isImported: session.isImported,
 		initialLocation: session.initialLocation,
 		isEmpty: session instanceof ChatModel ? session.getRequests().length === 0 : session.requests.length === 0
 	};