fix: address 10 bugs from fifth comprehensive audit

B1: Strip specifier-level type modifiers in legacy mode output
B2: legacyMode guard now checks each workspace folder individually
B3: Migration flag set in finally block to prevent retry loop
B4: "Disable for Me" button only shown for actual conflicts
B5: Old extension on-save conflict no longer suppressed
B6: isStandaloneComment no longer matches non-comment * lines
B7: Invalid user regex gracefully falls back instead of crashing
B8: Regex flag validation supports ES2022/2024 d and v flags
B9: Error message passed to super() instead of set after
B10: Renamed isOldExtensionActive to isOldExtensionInstalled

Author: JohannesHoppe

src/configuration/conflict-detector.ts

@@ -56,9 +56,8 @@ export function detectConflicts(): ConflictInfo {
   const oldOrganizeOnSaveEnabled = oldOrganizeOnSave && ourOrganizeOnSave;
 
   if (oldOrganizeOnSaveEnabled) {
-    if (!conflicts.some(c => c.includes('Old TypeScript Hero extension'))) {
-      conflicts.push('• Old TypeScript Hero "organizeOnSave" is enabled (will run on save alongside this extension)');
-    }
+    // Always add on-save conflict (separate from keyboard conflict — both can coexist)
+    conflicts.push('• Old TypeScript Hero "organizeOnSave" is enabled (will run on save alongside this extension)');
   }
 
   // Check 3: VS Code built-in organize imports enabled

src/configuration/settings-migration.ts

@@ -75,23 +75,29 @@ export async function migrateSettings(context: Pick<ExtensionContext, 'globalSta
   }
 
   // Try to migrate settings
-  const migratedCount = await performMigration();
-
-  // Mark migration as attempted (always, even if no settings found)
-  await context.globalState.update(MIGRATION_KEY, true);
-
-  // Show notification if settings were migrated
-  if (migratedCount > 0) {
-    const oldExtension = extensions.getExtension(OLD_EXTENSION_ID);
-    const isOldExtensionActive = oldExtension !== undefined;
-
-    if (isOldExtensionActive) {
-      const message = `Mini TypeScript Hero: Migrated ${migratedCount} setting(s) from TypeScript Hero. You can now disable the old extension if you want.`;
-      window.showInformationMessage(message);
-    } else {
-      const message = `Mini TypeScript Hero: Migrated ${migratedCount} setting(s) from TypeScript Hero.`;
-      window.showInformationMessage(message);
+  // CRITICAL: Always set migration flag in finally block to prevent retry loop
+  // if any config.update() call fails during migration
+  try {
+    const migratedCount = await performMigration();
+
+    // Show notification if settings were migrated
+    if (migratedCount > 0) {
+      const oldExtension = extensions.getExtension(OLD_EXTENSION_ID);
+      const isOldExtensionInstalled = oldExtension !== undefined;
+
+      if (isOldExtensionInstalled) {
+        const message = `Mini TypeScript Hero: Migrated ${migratedCount} setting(s) from TypeScript Hero. You can now disable the old extension if you want.`;
+        window.showInformationMessage(message);
+      } else {
+        const message = `Mini TypeScript Hero: Migrated ${migratedCount} setting(s) from TypeScript Hero.`;
+        window.showInformationMessage(message);
+      }
     }
+  } catch {
+    // Migration failed — swallow silently, finally block sets the flag to prevent retry loop
+  } finally {
+    // Mark migration as attempted (always, even if migration failed)
+    await context.globalState.update(MIGRATION_KEY, true);
   }
 }
 
@@ -165,10 +171,21 @@ async function performMigration(): Promise<number> {
     // - Blank line preservation (uses 'preserve' mode, keeps existing blank lines from source)
     // - Merge timing: When mergeImportsFromSameModule is true, merges BEFORE removeTrailingIndex (matches old bug)
     // - Type-only merging: Strips 'import type' keywords and allows merging type-only with value imports (old behavior)
+    // Check if legacyMode is already set at any scope
+    // NOTE: unscoped inspect() can't see workspaceFolderValue in multi-root workspaces,
+    // so we must iterate each folder individually to detect folder-level settings
     const legacyModeInspect = newConfig.inspect('legacyMode');
+    let folderLevelLegacyModeExists = false;
+    for (const folder of workspace.workspaceFolders ?? []) {
+      const scopedInspect = workspace.getConfiguration(NEW_SECTION, folder.uri).inspect('legacyMode');
+      if (scopedInspect?.workspaceFolderValue !== undefined) {
+        folderLevelLegacyModeExists = true;
+        break;
+      }
+    }
     if (legacyModeInspect?.globalValue === undefined &&
         legacyModeInspect?.workspaceValue === undefined &&
-        legacyModeInspect?.workspaceFolderValue === undefined) {
+        !folderLevelLegacyModeExists) {
 
       // Write legacyMode to the scopes where old settings were migrated
       if (migratedGlobalCount > 0) {

src/extension.ts

@@ -61,7 +61,7 @@ async function checkForConflicts(
     ).length;
 
     const hasKeyboardConflict = conflicts.some(c => c.includes('Ctrl+Alt+O'));
-    const hasVSCodeBuiltIn = vsCodeBuiltInEnabled;
+    const hasVSCodeBuiltIn = vsCodeBuiltInEnabled && ourOrganizeOnSaveEnabled;
     const hasOldExtension = oldExtensionInstalled || oldOrganizeOnSaveEnabled;
 
     if (conflicts.length === 1 && hasKeyboardConflict && !onSaveCount) {
@@ -102,8 +102,8 @@ async function checkForConflicts(
     // Determine which buttons to show based on conflict type
     const buttons: string[] = [];
 
-    // Can we auto-fix VSCode built-in?
-    const canAutoFixVSCode = vsCodeBuiltInEnabled;
+    // Can we auto-fix VSCode built-in? Only offer if it's an actual conflict (not just enabled)
+    const canAutoFixVSCode = vsCodeBuiltInEnabled && ourOrganizeOnSaveEnabled;
 
     if (canAutoFixVSCode) {
       buttons.push('Disable for Me');

src/imports/import-grouping/import-group-identifier-invalid-error.ts

@@ -3,7 +3,6 @@
  */
 export class ImportGroupIdentifierInvalidError extends Error {
   constructor(identifier: string) {
-    super();
-    this.message = `The identifier "${identifier}" does not match a keyword or a regex pattern (/ .. /).`;
+    super(`The identifier "${identifier}" does not match a keyword or a regex pattern (/ .. /).`);
   }
 }

src/imports/import-grouping/import-group-setting-parser.ts

@@ -14,7 +14,7 @@ export type ImportGroupSetting =
   | string
   | { identifier: ImportGroupKeyword | string; order: ImportGroupOrder };
 
-const REGEX_REGEX_GROUP = /^\/.+\/[gimsuy]*$/;
+const REGEX_REGEX_GROUP = /^\/.+\/[dgimsuyv]*$/;
 
 /**
  * Parser that takes the vscode - setting and creates import groups out of it.

src/imports/import-grouping/regex-import-group.ts

@@ -35,11 +35,16 @@ export class RegexImportGroup implements ImportGroup {
   ) {
     // Compile regex once in constructor for performance
     // Parse /pattern/flags syntax (e.g., '/^@angular/i' -> pattern='^@angular', flags='i')
-    const slashMatch = this.regex.match(/^\/(.+)\/([gimsuy]*)$/);
-    if (slashMatch) {
-      this.compiledRegex = new RegExp(slashMatch[1], slashMatch[2]);
-    } else {
-      this.compiledRegex = new RegExp(this.regex);
+    try {
+      const slashMatch = this.regex.match(/^\/(.+)\/([dgimsuyv]*)$/);
+      if (slashMatch) {
+        this.compiledRegex = new RegExp(slashMatch[1], slashMatch[2]);
+      } else {
+        this.compiledRegex = new RegExp(this.regex);
+      }
+    } catch {
+      // Invalid regex pattern from user config — use a never-matching regex as fallback
+      this.compiledRegex = /(?!)/;
     }
   }
 

src/imports/import-manager.ts

@@ -879,9 +879,12 @@ export class ImportManager {
         }
 
         // Check for standalone comments
+        // Match block comment continuation lines (* or */) but not code starting with * (e.g., generator calls)
+        const isBlockCommentContinuation = trimmedText.startsWith('*') &&
+          (trimmedText.length === 1 || trimmedText[1] === ' ' || trimmedText[1] === '/' || trimmedText[1] === '*');
         const isStandaloneComment = trimmedText.startsWith('//') ||
                                      trimmedText.startsWith('/*') ||
-                                     trimmedText.startsWith('*');
+                                     isBlockCommentContinuation;
 
         if (isStandaloneComment) {
           commentsBetweenImports.push(lineText);
@@ -1159,7 +1162,9 @@ export class ImportManager {
 
         const specifierStrings = imp.specifiers.map(spec => {
           const baseSpec = spec.alias ? `${spec.specifier} as ${spec.alias}` : spec.specifier;
-          const typePrefix = spec.isTypeOnly ? 'type ' : '';
+          // In legacy mode, strip specifier-level type modifiers (old extension doesn't support them)
+          const isSpecTypeOnly = spec.isTypeOnly && !this.config.legacyMode(this.document.uri);
+          const typePrefix = isSpecTypeOnly ? 'type ' : '';
           let result = `${typePrefix}${baseSpec}`;
 
           // Preserve comments (in both modes — GOLDEN RULE: never delete user content)
@@ -1194,7 +1199,9 @@ export class ImportManager {
           // e.g., "B, // end" not "B // end,"
           const formattedSpecifiers = imp.specifiers.map((spec, index) => {
             const baseSpec = spec.alias ? `${spec.specifier} as ${spec.alias}` : spec.specifier;
-            const typePrefix = spec.isTypeOnly ? 'type ' : '';
+            // In legacy mode, strip specifier-level type modifiers
+            const isSpecTypeOnly = spec.isTypeOnly && !this.config.legacyMode(this.document.uri);
+            const typePrefix = isSpecTypeOnly ? 'type ' : '';
             let result = `${typePrefix}${baseSpec}`;
 
             // Preserve comments with proper comma placement (GOLDEN RULE: never delete user content)