Cleanup pre validation

src/install/installationManager.ts

@@ -25,12 +25,14 @@ export class InstallationManager {
    */
   async ensureInstalled(): Promise<ComfyInstallation> {
     const installation = ComfyInstallation.fromConfig();
+    log.verbose(`Install state: ${installation?.state ?? 'not installed'}`);
 
     // Fresh install
     if (!installation) return await this.freshInstall();
 
     // Validate installation
     const state = await installation.validate();
+    log.verbose(`Validated install state: ${state}`);
     if (state !== 'installed') await this.resumeInstallation(installation);
 
     // Resolve issues and re-run validation
@@ -52,6 +54,7 @@ export class InstallationManager {
    * @param installation The installation to resume
    */
   async resumeInstallation(installation: ComfyInstallation) {
+    log.verbose('Resuming installation.');
     // TODO: Resume install at point of interruption
     if (installation.state === 'started') {
       await this.freshInstall();

src/main-process/comfyDesktopApp.ts

@@ -18,18 +18,20 @@ import { DesktopConfig, useDesktopConfig } from '../store/desktopConfig';
 import { ansiCodes, getModelsDirectory } from '../utils';
 import { ProcessCallbacks, VirtualEnvironment } from '../virtualEnvironment';
 import { AppWindow } from './appWindow';
-import { type ComfyInstallation } from './comfyInstallation';
+import type { ComfyInstallation } from './comfyInstallation';
 import { ComfyServer } from './comfyServer';
 
 export class ComfyDesktopApp implements HasTelemetry {
   public comfyServer: ComfyServer | null = null;
+  public comfySettings: ComfySettings;
   private terminal: Terminal | null = null; // Only created after server starts.
   constructor(
-    public readonly installation: ComfyInstallation,
-    public comfySettings: ComfySettings,
+    public installation: ComfyInstallation,
     public appWindow: AppWindow,
     readonly telemetry: ITelemetry
-  ) {}
+  ) {
+    this.comfySettings = new ComfySettings(installation.basePath);
+  }
 
   get basePath() {
     return this.installation.basePath;
@@ -206,10 +208,6 @@ export class ComfyDesktopApp implements HasTelemetry {
     }
   }
 
-  static create(appWindow: AppWindow, installation: ComfyInstallation, telemetry: ITelemetry): ComfyDesktopApp {
-    return new ComfyDesktopApp(installation, new ComfySettings(installation.basePath), appWindow, telemetry);
-  }
-
   async uninstall(): Promise<void> {
     await rm(ComfyServerConfig.configPath);
     await useDesktopConfig().permanentlyDeleteConfigFile();

src/main-process/comfyInstallation.ts

@@ -105,9 +105,12 @@ If this problem persists, back up and delete the config file, then restart the a
    * Called during app startup, this function ensures that config is in the expected state.
    */
   upgradeConfig() {
+    log.verbose(`Upgrading config to latest format.  Current state: [${this.state}]`);
     // Migrate config
     if (!this.issues.has('invalidBasePath')) {
       useDesktopConfig().set('basePath', this.basePath);
+    } else {
+      log.warn('Skipping save of basePath.');
     }
     this.setState('installed');
   }

src/main.ts

@@ -17,6 +17,7 @@ import { findAvailablePort } from './utils';
 dotenv.config();
 log.initialize();
 log.transports.file.level = (process.env.LOG_LEVEL as LevelOption) ?? 'info';
+log.info(`Starting app v${app.getVersion()}`);
 
 const allowDevVars = app.commandLine.hasSwitch('dev-mode');
 
@@ -40,6 +41,7 @@ app.on('before-quit', () => {
 });
 
 // Sentry needs to be initialized at the top level.
+log.verbose('Initializing Sentry');
 SentryLogging.init();
 
 // Synchronous app start
@@ -99,7 +101,7 @@ async function startApp() {
         throw new Error(`Fatal: Could not validate installation: [${installation.state}/${installation.issues.size}]`);
 
       // Initialize app
-      const comfyDesktopApp = ComfyDesktopApp.create(appWindow, installation, telemetry);
+      const comfyDesktopApp = new ComfyDesktopApp(installation, appWindow, telemetry);
       await comfyDesktopApp.initialize();
 
       // At this point, user has gone through the onboarding flow.

src/store/desktopSettings.ts

@@ -1,7 +1,7 @@
 import type { GpuType, TorchDeviceType } from '../preload';
 
 export type DesktopSettings = {
-  basePath?: string | null;
+  basePath?: string;
   /**
    * The state of the installation.
    * - `started`: The installation has started.