diff --git a/‎packages/cli/src/config/settings.test.ts‎
Lines changed: 30 additions & 0 deletions b/‎packages/cli/src/config/settings.test.ts‎
Lines changed: 30 additions & 0 deletions
diff --git a/‎packages/cli/src/config/settings.ts‎
Lines changed: 6 additions & 0 deletions b/‎packages/cli/src/config/settings.ts‎
Lines changed: 6 additions & 0 deletions
@@ -634,6 +634,36 @@ describe('Settings Loading and Merging', () => {
       expect(settings.merged.general?.enableAutoUpdate).toBe(false);
     });
 
+    it('should bump version to 3 even when V2 settings already have V3-compatible content', () => {
+      (mockFsExistsSync as Mock).mockImplementation(
+        (p: fs.PathLike) => p === USER_SETTINGS_PATH,
+      );
+      // V2 settings that already have V3-compatible keys (no migration needed)
+      const v2SettingsWithV3Content = {
+        $version: 2,
+        general: {
+          enableAutoUpdate: true,
+        },
+      };
+      (fs.readFileSync as Mock).mockImplementation(
+        (p: fs.PathOrFileDescriptor) => {
+          if (p === USER_SETTINGS_PATH)
+            return JSON.stringify(v2SettingsWithV3Content);
+          return '{}';
+        },
+      );
+
+      loadSettings(MOCK_WORKSPACE_DIR);
+
+      // Version should be bumped to 3 even though no keys needed migration
+      const writeCall = (fs.writeFileSync as Mock).mock.calls.find(
+        (call: unknown[]) => call[0] === USER_SETTINGS_PATH,
+      );
+      expect(writeCall).toBeDefined();
+      const writtenContent = JSON.parse(writeCall[1] as string);
+      expect(writtenContent.$version).toBe(SETTINGS_VERSION);
+    });
+
     it('should correctly merge and migrate legacy array properties from multiple scopes', () => {
       (mockFsExistsSync as Mock).mockReturnValue(true);
       const legacyUserSettings = {
 
@@ -453,6 +453,12 @@ function migrateV2ToV3(
     return result;
   }
 
+  // Even if no changes, bump version to 3 to skip future migration checks
+  if (typeof version === 'number' && version < SETTINGS_VERSION) {
+    result[SETTINGS_VERSION_KEY] = SETTINGS_VERSION;
+    return result;
+  }
+
   return null;
 }
Original file line number	Diff line number	Diff line change
`@@ -453,6 +453,12 @@ function migrateV2ToV3(`
`453`	`453`	`return result;`
`454`	`454`	`}`
`455`	`455`
	`456`	`+ // Even if no changes, bump version to 3 to skip future migration checks`
	`457`	`+ if (typeof version === 'number' && version < SETTINGS_VERSION) {`
	`458`	`+ result[SETTINGS_VERSION_KEY] = SETTINGS_VERSION;`
	`459`	`+ return result;`
	`460`	`+ }`
	`461`	`+`
`456`	`462`	`return null;`
`457`	`463`	`}`
`458`	`464`