2 files changed, 52 insertions, 12 deletions

diff --git a/packages/main/src/controllers/__tests__/initConfig.spec.ts b/packages/main/src/controllers/__tests__/initConfig.spec.ts
index 11e7690..241ab2d 100644
--- a/packages/main/src/controllers/__tests__/initConfig.spec.ts
+++ b/packages/main/src/controllers/__tests__/initConfig.spec.ts
@@ -20,6 +20,7 @@
 
 import { jest } from '@jest/globals';
 import { mocked } from 'jest-mock';
+import { getSnapshot } from 'mobx-state-tree';
 import ms from 'ms';
 
 import type ConfigPersistenceService from '../../services/ConfigPersistenceService';
@@ -74,6 +75,8 @@ describe('when initializing', () => {
       mocked(persistenceService.readConfig).mockResolvedValueOnce({
         found: true,
         data: {
+          // Use a default empty config file to not trigger config rewrite.
+          ...getSnapshot(config),
           themeSource: 'dark',
         },
       });
@@ -95,7 +98,21 @@ describe('when initializing', () => {
     });
   });
 
-  it('should not apply an invalid config file', async () => {
+  it('should update the config file if new details are added during read', async () => {
+    mocked(persistenceService.readConfig).mockResolvedValueOnce({
+      found: true,
+      data: {
+        themeSource: 'light',
+        profile: {
+          name: 'Test profile',
+        },
+      },
+    });
+    await initConfig(config, persistenceService);
+    expect(persistenceService.writeConfig).toHaveBeenCalledTimes(1);
+  });
+
+  it('should not apply an invalid config file but should not overwrite it', async () => {
     mocked(persistenceService.readConfig).mockResolvedValueOnce({
       found: true,
       data: {
@@ -104,6 +121,7 @@ describe('when initializing', () => {
     });
     await initConfig(config, persistenceService);
     expect(config.themeSource).not.toBe(-1);
+    expect(persistenceService.writeConfig).not.toHaveBeenCalled();
   });
 
   it('should bail if it cannot determine whether there is a config file', async () => {
@@ -122,7 +140,7 @@ describe('when it has loaded the config', () => {
   beforeEach(async () => {
     mocked(persistenceService.readConfig).mockResolvedValueOnce({
       found: true,
-      data: {},
+      data: getSnapshot(config),
     });
     mocked(persistenceService.watchConfig).mockReturnValueOnce(watcherDisposer);
     sutDisposer = await initConfig(config, persistenceService, throttleMs);
@@ -152,6 +170,8 @@ describe('when it has loaded the config', () => {
     mocked(persistenceService.readConfig).mockResolvedValueOnce({
       found: true,
       data: {
+        // Use a default empty config file to not trigger config rewrite.
+        ...getSnapshot(config),
         themeSource: 'dark',
       },
     });
@@ -161,7 +181,21 @@ describe('when it has loaded the config', () => {
     expect(config.themeSource).toBe('dark');
   });
 
-  it('should not apply an invalid config file when it has changed', async () => {
+  it('should update the config file if new details are added', async () => {
+    mocked(persistenceService.readConfig).mockResolvedValueOnce({
+      found: true,
+      data: {
+        themeSource: 'light',
+        profile: {
+          name: 'Test profile',
+        },
+      },
+    });
+    await configChangedCallback();
+    expect(persistenceService.writeConfig).toHaveBeenCalledTimes(1);
+  });
+
+  it('should not apply an invalid config file when it has changed but should not overwrite it', async () => {
     mocked(persistenceService.readConfig).mockResolvedValueOnce({
       found: true,
       data: {
@@ -170,6 +204,7 @@ describe('when it has loaded the config', () => {
     });
     await configChangedCallback();
     expect(config.themeSource).not.toBe(-1);
+    expect(persistenceService.writeConfig).not.toHaveBeenCalled();
   });
 
   it('should handle config reading errors gracefully', async () => {
diff --git a/packages/main/src/controllers/initConfig.ts b/packages/main/src/controllers/initConfig.ts
index 93be978..2dcabaf 100644
--- a/packages/main/src/controllers/initConfig.ts
+++ b/packages/main/src/controllers/initConfig.ts
@@ -18,12 +18,13 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
+import deepEqual from 'deep-equal';
 import { debounce } from 'lodash-es';
 import { getSnapshot, onSnapshot } from 'mobx-state-tree';
 import ms from 'ms';
 
-import type ConfigPersistenceService from '../services/ConfigPersistenceService.js';
-import { Config, ConfigFileIn, ConfigSnapshotOut } from '../stores/Config.js';
+import type ConfigPersistenceService from '../services/ConfigPersistenceService';
+import { Config, ConfigFileIn, ConfigSnapshotOut } from '../stores/Config';
 import type Disposer from '../utils/Disposer';
 import { getLogger } from '../utils/log';
 
@@ -40,6 +41,12 @@ export default async function initConfig(
 
   let lastSnapshotOnDisk: ConfigSnapshotOut | undefined;
 
+  async function writeConfig(): Promise<void> {
+    const snapshot = getSnapshot(config);
+    await persistenceService.writeConfig(snapshot);
+    lastSnapshotOnDisk = snapshot;
+  }
+
   async function readConfig(): Promise<boolean> {
     const result = await persistenceService.readConfig();
     if (result.found) {
@@ -49,18 +56,16 @@ export default async function initConfig(
         config.loadFromConfigFile(result.data as ConfigFileIn);
       } catch (error) {
         log.error('Failed to apply config snapshot', result.data, error);
+        return true;
+      }
+      lastSnapshotOnDisk = getSnapshot(config);
+      if (!deepEqual(result.data, lastSnapshotOnDisk, { strict: true })) {
+        await writeConfig();
       }
     }
-    lastSnapshotOnDisk = getSnapshot(config);
     return result.found;
   }
 
-  async function writeConfig(): Promise<void> {
-    const snapshot = getSnapshot(config);
-    await persistenceService.writeConfig(snapshot);
-    lastSnapshotOnDisk = snapshot;
-  }
-
   if (!(await readConfig())) {
     log.info('Config file was not found');
     await writeConfig();