Improve service reset handling for no workspace folder

Author: HumbleBee14

src/vs/workbench/contrib/roopik/browser/contributions/startupContribution.ts

@@ -57,13 +57,20 @@ export class RoopikStartupContribution extends Disposable implements IWorkbenchC
 
 	/**
 	 * Initialize Roopik services with workspace path
+	 * If no workspace folder, clear services to remove stale data
 	 */
 	private async initializeRoopikServices(): Promise<void> {
 		await this.lifecycleService.when(LifecyclePhase.Restored);
 
 		const workspace = this.workspaceContextService.getWorkspace();
 		if (!workspace.folders || workspace.folders.length === 0) {
-			this.logger.warn('No workspace folder found, services not initialized');
+			this.logger.info('No workspace folder found, clearing services');
+			// Clear services to remove any stale data from previous sessions
+			try {
+				await this.clearServices();
+			} catch (err) {
+				this.logger.error('Failed to clear services on startup', { error: err });
+			}
 			return;
 		}
 
@@ -88,7 +95,7 @@ export class RoopikStartupContribution extends Disposable implements IWorkbenchC
 
 			// If no folders, clear all services (workspace closed)
 			if (!workspace.folders || workspace.folders.length === 0) {
-				this.logger.info('Workspace closed, clearing services');
+				// this.logger.info('Workspace closed, clearing services');
 				try {
 					await this.clearServices();
 				} catch (err) {
@@ -98,7 +105,7 @@ export class RoopikStartupContribution extends Disposable implements IWorkbenchC
 			}
 
 			const newWorkspacePath = workspace.folders[0].uri.fsPath;
-			this.logger.info('Workspace changed, re-initializing services', { workspacePath: newWorkspacePath });
+			// this.logger.info('Workspace changed, re-initializing services', { workspacePath: newWorkspacePath });
 
 			try {
 				// Re-initialize all services with the new workspace path

src/vs/workbench/contrib/roopik/electron-main/canvas/canvasService.ts

@@ -105,10 +105,11 @@ export class CanvasService implements ICanvasService {
 	async initialize(workspacePath: string): Promise<void> {
 		// If already initialized with a DIFFERENT workspace, re-initialize
 		if (this.initialized && this._workspacePath !== workspacePath) {
-			this.logger.info('Workspace changed, re-initializing', {
-				oldPath: this._workspacePath,
-				newPath: workspacePath
-			});
+			// this.logger.info('Workspace changed, re-initializing', {
+			// 	oldPath: this._workspacePath,
+			// 	newPath: workspacePath
+			// });
+
 			// Clear old state
 			this.canvases.clear();
 			this.panelStates.clear();
@@ -169,7 +170,7 @@ export class CanvasService implements ICanvasService {
 	 * Resets to uninitialized state and fires events to update UI
 	 */
 	async clear(): Promise<void> {
-		this.logger.info('Clearing canvas service (workspace closed)');
+		// this.logger.info('Clearing canvas service (workspace closed)');
 
 		// Fire delete events for all canvases so UI updates
 		for (const [canvasId] of this.canvases) {
@@ -182,7 +183,10 @@ export class CanvasService implements ICanvasService {
 		this._workspacePath = '';
 		this.initialized = false;
 
-		this.logger.info('Canvas service cleared');
+		// Fire onDidInitialize to signal UI that service state changed (now uninitialized)
+		this._onDidInitialize.fire();
+
+		// this.logger.info('Canvas service cleared');
 	}
 
 	// ========================================================================
@@ -319,70 +323,17 @@ export class CanvasService implements ICanvasService {
 	}
 
 	async listCanvasesAsync(options?: ListCanvasOptions): Promise<CanvasMeta[]> {
-		// When initialized, use in-memory cache (Map is always in sync with disk)
+		// When not initialized (no workspace), return empty list
+		if (!this.initialized) {
+			this.logger.debug('Not initialized, returning empty canvas list');
+			return [];
+		}
+
+		// Use in-memory cache (Map is always in sync with disk)
 		// This avoids redundant filesystem reads since:
 		// - loadAllCanvases() populates Map during initialize()
 		// - createCanvas(), deleteCanvas(), updateCanvas() keep Map in sync
-		if (this.initialized) {
-			return this.listCanvases(options);
-		}
-
-		try {
-			const canvasIds = await this.storageService.listCanvases();
-
-			const canvases: CanvasMeta[] = [];
-			for (const canvasId of canvasIds) {
-				const meta = await this.storageService.loadCanvasMeta(canvasId);
-				if (meta) {
-					canvases.push(meta);
-					// Also update in-memory cache
-					if (!this.canvases.has(canvasId)) {
-						this.canvases.set(canvasId, {
-							...meta,
-							isOpen: false,
-							isFocused: false
-						});
-					}
-				}
-			}
-
-			this.logger.info('listCanvasesAsync: loaded canvases from storage', { count: canvases.length });
-
-			// Apply name filter
-			let result = canvases;
-			if (options?.nameFilter) {
-				const filter = options.nameFilter.toLowerCase();
-				result = result.filter(c => c.name.toLowerCase().includes(filter));
-			}
-
-			// Apply sorting
-			const sortBy = options?.sortBy || 'updatedAt';
-			const sortDir = options?.sortDirection || 'desc';
-
-			result.sort((a, b) => {
-				let comparison = 0;
-				switch (sortBy) {
-					case 'name':
-						comparison = a.name.localeCompare(b.name);
-						break;
-					case 'createdAt':
-						comparison = a.createdAt - b.createdAt;
-						break;
-					case 'updatedAt':
-						comparison = a.updatedAt - b.updatedAt;
-						break;
-					case 'componentCount':
-						comparison = a.componentCount - b.componentCount;
-						break;
-				}
-				return sortDir === 'asc' ? comparison : -comparison;
-			});
-
-			return result;
-		} catch (err) {
-			this.logger.error('Failed to read canvases from storage', err);
-			return this.listCanvases(options);
-		}
+		return this.listCanvases(options);
 	}
 
 	async updateCanvas(

src/vs/workbench/contrib/roopik/electron-main/component/componentService.ts

@@ -193,10 +193,11 @@ export class ComponentService extends Disposable implements IComponentService {
 	async initialize(workspacePath: string): Promise<void> {
 		// Handle workspace change - reset state
 		if (this.initialized && this._workspacePath !== workspacePath) {
-			this.logger.info('Workspace changed, re-initializing', {
-				oldPath: this._workspacePath,
-				newPath: workspacePath
-			});
+			// this.logger.info('Workspace changed, re-initializing', {
+			// 	oldPath: this._workspacePath,
+			// 	newPath: workspacePath
+			// });
+
 			// Stop file watcher for old workspace
 			this.fileWatcher.stop();
 			// Clear old components

src/vs/workbench/contrib/roopik/electron-main/projectStorage/projectStorageService.ts

@@ -56,10 +56,11 @@ export class ProjectStorageService implements IProjectStorageService {
 	async initialize(workspacePath: string): Promise<void> {
 		// Handle workspace change - reset state
 		if (this.initialized && this._workspacePath !== workspacePath) {
-			this.logger.info('Workspace changed, re-initializing', {
-				oldPath: this._workspacePath,
-				newPath: workspacePath
-			});
+			// this.logger.info('Workspace changed, re-initializing', {
+			// 	oldPath: this._workspacePath,
+			// 	newPath: workspacePath
+			// });
+
 			this.storage = null;
 			this.initialized = false;
 		}
@@ -96,7 +97,7 @@ export class ProjectStorageService implements IProjectStorageService {
 	 * Resets to uninitialized state
 	 */
 	async clear(): Promise<void> {
-		this.logger.info('Clearing project storage service (workspace closed)');
+		// this.logger.info('Clearing project storage service (workspace closed)');
 
 		this.storage = null;
 		this._workspacePath = null;
@@ -105,7 +106,10 @@ export class ProjectStorageService implements IProjectStorageService {
 		// Fire event so UI clears project list
 		this._onProjectsChanged.fire();
 
-		this.logger.info('Project storage service cleared');
+		// Fire onDidInitialize to signal UI that service state changed (now uninitialized)
+		this._onDidInitialize.fire();
+
+		// this.logger.info('Project storage service cleared');
 	}
 
 	// ========================================================================
@@ -117,7 +121,7 @@ export class ProjectStorageService implements IProjectStorageService {
 	 */
 	async getRecentProjects(limit: number = 5): Promise<ProjectInfo[]> {
 		if (!this.storage || !this.initialized) {
-			this.logger.warn('Not initialized, returning empty list');
+			// this.logger.warn('Not initialized, returning empty list');
 			return [];
 		}