@sun-asterisk/sungen 2.1.0 → 2.2.0

package/src/generators/test-generator/patterns/assertion-patterns.ts

@@ -419,32 +419,32 @@ export const assertionPatterns: StepPattern[] = [
   {
     name: 'should-contain-text',
     matcher: (step: ParsedStep) =>
-      step.text.includes('should contain') && !!step.selectorRef && !!(step.value || step.dataRef),
+      (step.text.includes('should contain') || step.text.includes('contains')) && !!step.selectorRef && !!(step.value || step.dataRef),
     resolver: (step, context): StepTemplateData => {
       const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType, step.nth);
-      const expectedText = step.value || `\${${step.dataRef}}`;
+      const expectedText = step.value || context.dataResolver.resolveData(step.dataRef!, context.featureName);
       return {
         templateName: 'contain-text-assertion',
         data: { ...resolved, expectedText },
         comment: `Assert ${step.selectorRef} contains "${step.value || step.dataRef}"`,
       };
     },
-    priority: 9,
+    priority: 12,
   },
   {
     name: 'should-have-text',
     matcher: (step: ParsedStep) =>
-      step.text.includes('should have text') && !!step.selectorRef && !!(step.value || step.dataRef),
+      (step.text.includes('should have text') || step.text.includes('has text')) && !!step.selectorRef && !!(step.value || step.dataRef),
     resolver: (step, context): StepTemplateData => {
       const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType, step.nth);
-      const expectedText = step.value || `\${${step.dataRef}}`;
+      const expectedText = step.value || context.dataResolver.resolveData(step.dataRef!, context.featureName);
       return {
         templateName: 'have-text-assertion',
         data: { ...resolved, expectedText },
         comment: `Assert ${step.selectorRef} has text "${step.value || step.dataRef}"`,
       };
     },
-    priority: 10,
+    priority: 12,
   },
   {
     name: 'is-empty',
@@ -591,4 +591,60 @@ export const assertionPatterns: StepPattern[] = [
     },
     priority: 8,
   },
+  {
+    name: 'is-loading',
+    matcher: (step: ParsedStep) =>
+      /\b(see|sees)\s+\[/.test(step.text) && /\bis loading\b/.test(step.text) && !!step.selectorRef,
+    resolver: (step, context): StepTemplateData => {
+      const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType, step.nth);
+      return {
+        templateName: 'loading-assertion',
+        data: { ...resolved, selectorRef: step.selectorRef },
+        comment: `Assert ${step.selectorRef} is loading`,
+      };
+    },
+    priority: 11,
+  },
+  {
+    name: 'is-selected',
+    matcher: (step: ParsedStep) =>
+      /\b(see|sees)\s+\[/.test(step.text) && /\bis selected\b/.test(step.text) && !!step.selectorRef,
+    resolver: (step, context): StepTemplateData => {
+      const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType, step.nth);
+      return {
+        templateName: 'selected-assertion',
+        data: { ...resolved, selectorRef: step.selectorRef },
+        comment: `Assert ${step.selectorRef} is selected`,
+      };
+    },
+    priority: 11,
+  },
+  {
+    name: 'is-sorted-ascending',
+    matcher: (step: ParsedStep) =>
+      /\b(see|sees)\s+\[/.test(step.text) && /\bsorted ascending\b/.test(step.text) && !!step.selectorRef,
+    resolver: (step, context): StepTemplateData => {
+      const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType, step.nth);
+      return {
+        templateName: 'sorted-assertion',
+        data: { ...resolved, selectorRef: step.selectorRef, sortDirection: 'ascending' },
+        comment: `Assert ${step.selectorRef} is sorted ascending`,
+      };
+    },
+    priority: 12,
+  },
+  {
+    name: 'is-sorted-descending',
+    matcher: (step: ParsedStep) =>
+      /\b(see|sees)\s+\[/.test(step.text) && /\bsorted descending\b/.test(step.text) && !!step.selectorRef,
+    resolver: (step, context): StepTemplateData => {
+      const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType, step.nth);
+      return {
+        templateName: 'sorted-assertion',
+        data: { ...resolved, selectorRef: step.selectorRef, sortDirection: 'descending' },
+        comment: `Assert ${step.selectorRef} is sorted descending`,
+      };
+    },
+    priority: 12,
+  },
 ];

package/src/generators/test-generator/patterns/form-patterns.ts

@@ -70,7 +70,7 @@ export const formPatterns: StepPattern[] = [
   {
     name: 'check-checkbox',
     matcher: (step: ParsedStep) =>
-      step.text.includes('checks') && !!step.selectorRef,
+      (step.text.includes('checks') || step.text.match(/\bcheck\b/)) && !!step.selectorRef,
     resolver: (step, context) => {
       const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType, step.nth);
       return {
@@ -84,7 +84,7 @@ export const formPatterns: StepPattern[] = [
   {
     name: 'uncheck-checkbox',
     matcher: (step: ParsedStep) =>
-      step.text.includes('unchecks') && !!step.selectorRef,
+      (step.text.includes('unchecks') || step.text.match(/\buncheck\b/)) && !!step.selectorRef,
     resolver: (step, context) => {
       const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType, step.nth);
       return {
@@ -151,7 +151,7 @@ export const formPatterns: StepPattern[] = [
   {
     name: 'clear-input',
     matcher: (step: ParsedStep) =>
-      step.text.includes('clears') && !!step.selectorRef,
+      (step.text.includes('clears') || step.text.match(/\bclear\b/)) && !!step.selectorRef,
     resolver: (step, context) => {
       const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType, step.nth);
       return {

package/src/generators/test-generator/patterns/interaction-patterns.ts

@@ -135,7 +135,7 @@ export const interactionPatterns: StepPattern[] = [
   {
     name: 'hover-element',
     matcher: (step: ParsedStep) =>
-      step.text.includes('hovers') && !!step.selectorRef,
+      (step.text.includes('hovers') || step.text.match(/\bhover\b/)) && !!step.selectorRef,
     resolver: (step, context) => {
       const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType, step.nth);
       return {
@@ -305,4 +305,96 @@ export const interactionPatterns: StepPattern[] = [
     },
     priority: 8,
   },
+  {
+    name: 'toggle-switch',
+    matcher: (step: ParsedStep) =>
+      (step.text.includes('toggles') || step.text.match(/\btoggle\b/)) && !!step.selectorRef,
+    resolver: (step, context) => {
+      const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType, step.nth);
+      return {
+        templateName: 'toggle-action',
+        data: { ...resolved, selectorRef: step.selectorRef },
+        comment: `Toggle ${step.selectorRef}`,
+      };
+    },
+    priority: 9,
+  },
+  {
+    name: 'drag-to',
+    matcher: (step: ParsedStep) =>
+      (step.text.includes('drags') || step.text.match(/\bdrag\b/)) &&
+      /\bto\s+\[/.test(step.text) && !!step.selectorRef,
+    resolver: (step, context) => {
+      // Extract both selector refs: [Source] ... to [Target]
+      const allRefs = step.text.match(/\[([^\]]+)\]/g);
+      if (!allRefs || allRefs.length < 2) {
+        return {
+          templateName: 'drag-action',
+          data: { strategy: 'text', value: step.selectorRef, targetLocator: 'page.locator(\'TODO\')' },
+          comment: `Drag ${step.selectorRef} (missing target)`,
+        };
+      }
+      const sourceRef = allRefs[0].slice(1, -1);
+      const targetRef = allRefs[1].slice(1, -1);
+
+      const sourceResolved = context.selectorResolver.resolveSelector(sourceRef, undefined, step.elementType, step.nth);
+      const targetResolved = context.selectorResolver.resolveSelector(targetRef, undefined, undefined, 0);
+
+      // Build target locator expression from resolved selector
+      let targetLocator: string;
+      switch (targetResolved.strategy) {
+        case 'role':
+          targetLocator = targetResolved.name
+            ? `page.getByRole('${targetResolved.role}', { name: '${targetResolved.name}' })`
+            : `page.getByRole('${targetResolved.role}')`;
+          break;
+        case 'testid':
+          targetLocator = `page.getByTestId('${targetResolved.value}')`;
+          break;
+        case 'text':
+          targetLocator = `page.getByText('${targetResolved.value}')`;
+          break;
+        case 'locator':
+          targetLocator = `page.locator('${targetResolved.value}')`;
+          break;
+        default:
+          targetLocator = `page.getByText('${targetRef}')`;
+      }
+
+      return {
+        templateName: 'drag-action',
+        data: { ...sourceResolved, targetLocator },
+        comment: `Drag ${sourceRef} to ${targetRef}`,
+      };
+    },
+    priority: 10,
+  },
+  {
+    name: 'expand-element',
+    matcher: (step: ParsedStep) =>
+      (step.text.includes('expands') || step.text.match(/\bexpand\b/)) && !!step.selectorRef,
+    resolver: (step, context) => {
+      const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType, step.nth);
+      return {
+        templateName: 'expand-action',
+        data: { ...resolved, selectorRef: step.selectorRef, direction: 'expand' },
+        comment: `Expand ${step.selectorRef}`,
+      };
+    },
+    priority: 9,
+  },
+  {
+    name: 'collapse-element',
+    matcher: (step: ParsedStep) =>
+      (step.text.includes('collapses') || step.text.match(/\bcollapse\b/)) && !!step.selectorRef,
+    resolver: (step, context) => {
+      const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType, step.nth);
+      return {
+        templateName: 'expand-action',
+        data: { ...resolved, selectorRef: step.selectorRef, direction: 'collapse' },
+        comment: `Collapse ${step.selectorRef}`,
+      };
+    },
+    priority: 9,
+  },
 ];

package/src/generators/test-generator/patterns/navigation-patterns.ts

@@ -9,7 +9,7 @@ export const navigationPatterns: StepPattern[] = [
   {
     name: 'open-page-type',
     matcher: (step: ParsedStep) =>
-      (step.text.includes('open') || step.text.includes('opens') || step.text.includes('is on')) &&
+      (step.text.includes('open') || step.text.includes('opens') || step.text.includes('is on') || step.text.includes('navigate to')) &&
       step.elementType === 'page',
     resolver: (step, context) => {
       let path = context.featurePath || '/';
@@ -64,7 +64,7 @@ export const navigationPatterns: StepPattern[] = [
   {
     name: 'navigate-to-route',
     matcher: (step: ParsedStep) =>
-      (step.text.includes('navigates to') || step.text.includes('is on')) &&
+      (step.text.includes('navigate to') || step.text.includes('navigates to') || step.text.includes('is on')) &&
       !!(step.selectorRef || step.dataRef),
     resolver: (step, context) => {
       const route = step.selectorRef || step.dataRef;

package/src/generators/test-generator/template-engine.ts

@@ -89,6 +89,7 @@ export class TemplateEngine {
     // Switch/case helpers for cleaner strategy routing
     Handlebars.registerHelper('switch', function(value: any, options: any) {
       this.switchValue = value;
+      this.switchMatched = false;
       this.switchDefaulted = false;
       return options.fn(this);
     });
@@ -238,6 +239,8 @@ export class TemplateEngine {
     featureDescription?: string;
     background?: string;
     scenarios: string[];
+    authGroups?: Array<{ authRole?: string; scenarios: string[] }>;
+    singleAuthRole?: string;
   }): string {
     return this.render('test-file', data);
   }
@@ -251,6 +254,7 @@ export class TemplateEngine {
   renderScenario(data: {
     scenarioName: string;
     steps: Array<{ comment?: string; code: string }>;
+    authRole?: string;
   }): string {
     return this.render('scenario', data);
   }

package/src/generators/test-generator/utils/selector-resolver.ts

@@ -3,191 +3,6 @@ import * as path from 'path';
 import yaml from 'yaml';
 import { readYaml, readYamlIfExists } from '../../../utils/yaml-io';
 
-/**
- * Remove Vietnamese diacritics (accents) from text
- * Example: "Thời gian" → "Thoi gian", "Địa điểm" → "Dia diem"
- */
-function removeVietnameseTones(text: string): string {
-  const vietnameseTones: { [key: string]: string } = {
-    'à': 'a', 'á': 'a', 'ả': 'a', 'ã': 'a', 'ạ': 'a',
-    'ă': 'a', 'ằ': 'a', 'ắ': 'a', 'ẳ': 'a', 'ẵ': 'a', 'ặ': 'a',
-    'â': 'a', 'ầ': 'a', 'ấ': 'a', 'ẩ': 'a', 'ẫ': 'a', 'ậ': 'a',
-    'đ': 'd',
-    'è': 'e', 'é': 'e', 'ẻ': 'e', 'ẽ': 'e', 'ẹ': 'e',
-    'ê': 'e', 'ề': 'e', 'ế': 'e', 'ể': 'e', 'ễ': 'e', 'ệ': 'e',
-    'ì': 'i', 'í': 'i', 'ỉ': 'i', 'ĩ': 'i', 'ị': 'i',
-    'ò': 'o', 'ó': 'o', 'ỏ': 'o', 'õ': 'o', 'ọ': 'o',
-    'ô': 'o', 'ồ': 'o', 'ố': 'o', 'ổ': 'o', 'ỗ': 'o', 'ộ': 'o',
-    'ơ': 'o', 'ờ': 'o', 'ớ': 'o', 'ở': 'o', 'ỡ': 'o', 'ợ': 'o',
-    'ù': 'u', 'ú': 'u', 'ủ': 'u', 'ũ': 'u', 'ụ': 'u',
-    'ư': 'u', 'ừ': 'u', 'ứ': 'u', 'ử': 'u', 'ữ': 'u', 'ự': 'u',
-    'ỳ': 'y', 'ý': 'y', 'ỷ': 'y', 'ỹ': 'y', 'ỵ': 'y',
-    // Uppercase
-    'À': 'A', 'Á': 'A', 'Ả': 'A', 'Ã': 'A', 'Ạ': 'A',
-    'Ă': 'A', 'Ằ': 'A', 'Ắ': 'A', 'Ẳ': 'A', 'Ẵ': 'A', 'Ặ': 'A',
-    'Â': 'A', 'Ầ': 'A', 'Ấ': 'A', 'Ẩ': 'A', 'Ẫ': 'A', 'Ậ': 'A',
-    'Đ': 'D',
-    'È': 'E', 'É': 'E', 'Ẻ': 'E', 'Ẽ': 'E', 'Ẹ': 'E',
-    'Ê': 'E', 'Ề': 'E', 'Ế': 'E', 'Ể': 'E', 'Ễ': 'E', 'Ệ': 'E',
-    'Ì': 'I', 'Í': 'I', 'Ỉ': 'I', 'Ĩ': 'I', 'Ị': 'I',
-    'Ò': 'O', 'Ó': 'O', 'Ỏ': 'O', 'Õ': 'O', 'Ọ': 'O',
-    'Ô': 'O', 'Ồ': 'O', 'Ố': 'O', 'Ổ': 'O', 'Ỗ': 'O', 'Ộ': 'O',
-    'Ơ': 'O', 'Ờ': 'O', 'Ớ': 'O', 'Ở': 'O', 'Ỡ': 'O', 'Ợ': 'O',
-    'Ù': 'U', 'Ú': 'U', 'Ủ': 'U', 'Ũ': 'U', 'Ụ': 'U',
-    'Ư': 'U', 'Ừ': 'U', 'Ứ': 'U', 'Ử': 'U', 'Ữ': 'U', 'Ự': 'U',
-    'Ỳ': 'Y', 'Ý': 'Y', 'Ỷ': 'Y', 'Ỹ': 'Y', 'Ỵ': 'Y',
-  };
-
-  return text.split('').map(char => vietnameseTones[char] || char).join('');
-}
-
-/**
- * Convert Japanese Hiragana and Katakana to Romaji
- * Example: "ひらがな" → "hiragana", "カタカナ" → "katakana"
- */
-function convertJapaneseToRomaji(text: string): string {
-  // Hiragana to Romaji mapping
-  const hiraganaMap: { [key: string]: string } = {
-    // Basic vowels
-    'あ': 'a', 'い': 'i', 'う': 'u', 'え': 'e', 'お': 'o',
-    // K-row
-    'か': 'ka', 'き': 'ki', 'く': 'ku', 'け': 'ke', 'こ': 'ko',
-    'きゃ': 'kya', 'きゅ': 'kyu', 'きょ': 'kyo',
-    // G-row
-    'が': 'ga', 'ぎ': 'gi', 'ぐ': 'gu', 'げ': 'ge', 'ご': 'go',
-    'ぎゃ': 'gya', 'ぎゅ': 'gyu', 'ぎょ': 'gyo',
-    // S-row
-    'さ': 'sa', 'し': 'shi', 'す': 'su', 'せ': 'se', 'そ': 'so',
-    'しゃ': 'sha', 'しゅ': 'shu', 'しょ': 'sho',
-    // Z-row
-    'ざ': 'za', 'じ': 'ji', 'ず': 'zu', 'ぜ': 'ze', 'ぞ': 'zo',
-    'じゃ': 'ja', 'じゅ': 'ju', 'じょ': 'jo',
-    // T-row
-    'た': 'ta', 'ち': 'chi', 'つ': 'tsu', 'て': 'te', 'と': 'to',
-    'ちゃ': 'cha', 'ちゅ': 'chu', 'ちょ': 'cho',
-    // D-row
-    'だ': 'da', 'ぢ': 'ji', 'づ': 'zu', 'で': 'de', 'ど': 'do',
-    // N-row
-    'な': 'na', 'に': 'ni', 'ぬ': 'nu', 'ね': 'ne', 'の': 'no',
-    'にゃ': 'nya', 'にゅ': 'nyu', 'にょ': 'nyo',
-    // H-row
-    'は': 'ha', 'ひ': 'hi', 'ふ': 'fu', 'へ': 'he', 'ほ': 'ho',
-    'ひゃ': 'hya', 'ひゅ': 'hyu', 'ひょ': 'hyo',
-    // B-row
-    'ば': 'ba', 'び': 'bi', 'ぶ': 'bu', 'べ': 'be', 'ぼ': 'bo',
-    'びゃ': 'bya', 'びゅ': 'byu', 'びょ': 'byo',
-    // P-row
-    'ぱ': 'pa', 'ぴ': 'pi', 'ぷ': 'pu', 'ぺ': 'pe', 'ぽ': 'po',
-    'ぴゃ': 'pya', 'ぴゅ': 'pyu', 'ぴょ': 'pyo',
-    // M-row
-    'ま': 'ma', 'み': 'mi', 'む': 'mu', 'め': 'me', 'も': 'mo',
-    'みゃ': 'mya', 'みゅ': 'myu', 'みょ': 'myo',
-    // Y-row
-    'や': 'ya', 'ゆ': 'yu', 'よ': 'yo',
-    // R-row
-    'ら': 'ra', 'り': 'ri', 'る': 'ru', 'れ': 're', 'ろ': 'ro',
-    'りゃ': 'rya', 'りゅ': 'ryu', 'りょ': 'ryo',
-    // W-row
-    'わ': 'wa', 'ゐ': 'wi', 'ゑ': 'we', 'を': 'wo', 'ん': 'n',
-    // Small tsu (doubles next consonant)
-    'っ': '',
-  };
-
-  // Katakana to Romaji mapping
-  const katakanaMap: { [key: string]: string } = {
-    // Basic vowels
-    'ア': 'a', 'イ': 'i', 'ウ': 'u', 'エ': 'e', 'オ': 'o',
-    // K-row
-    'カ': 'ka', 'キ': 'ki', 'ク': 'ku', 'ケ': 'ke', 'コ': 'ko',
-    'キャ': 'kya', 'キュ': 'kyu', 'キョ': 'kyo',
-    // G-row
-    'ガ': 'ga', 'ギ': 'gi', 'グ': 'gu', 'ゲ': 'ge', 'ゴ': 'go',
-    'ギャ': 'gya', 'ギュ': 'gyu', 'ギョ': 'gyo',
-    // S-row
-    'サ': 'sa', 'シ': 'shi', 'ス': 'su', 'セ': 'se', 'ソ': 'so',
-    'シャ': 'sha', 'シュ': 'shu', 'ショ': 'sho',
-    // Z-row
-    'ザ': 'za', 'ジ': 'ji', 'ズ': 'zu', 'ゼ': 'ze', 'ゾ': 'zo',
-    'ジャ': 'ja', 'ジュ': 'ju', 'ジョ': 'jo',
-    // T-row
-    'タ': 'ta', 'チ': 'chi', 'ツ': 'tsu', 'テ': 'te', 'ト': 'to',
-    'チャ': 'cha', 'チュ': 'chu', 'チョ': 'cho',
-    // D-row
-    'ダ': 'da', 'ヂ': 'ji', 'ヅ': 'zu', 'デ': 'de', 'ド': 'do',
-    // N-row
-    'ナ': 'na', 'ニ': 'ni', 'ヌ': 'nu', 'ネ': 'ne', 'ノ': 'no',
-    'ニャ': 'nya', 'ニュ': 'nyu', 'ニョ': 'nyo',
-    // H-row
-    'ハ': 'ha', 'ヒ': 'hi', 'フ': 'fu', 'ヘ': 'he', 'ホ': 'ho',
-    'ヒャ': 'hya', 'ヒュ': 'hyu', 'ヒョ': 'hyo',
-    // B-row
-    'バ': 'ba', 'ビ': 'bi', 'ブ': 'bu', 'ベ': 'be', 'ボ': 'bo',
-    'ビャ': 'bya', 'ビュ': 'byu', 'ビョ': 'byo',
-    // P-row
-    'パ': 'pa', 'ピ': 'pi', 'プ': 'pu', 'ペ': 'pe', 'ポ': 'po',
-    'ピャ': 'pya', 'ピュ': 'pyu', 'ピョ': 'pyo',
-    // M-row
-    'マ': 'ma', 'ミ': 'mi', 'ム': 'mu', 'メ': 'me', 'モ': 'mo',
-    'ミャ': 'mya', 'ミュ': 'myu', 'ミョ': 'myo',
-    // Y-row
-    'ヤ': 'ya', 'ユ': 'yu', 'ヨ': 'yo',
-    // R-row
-    'ラ': 'ra', 'リ': 'ri', 'ル': 'ru', 'レ': 're', 'ロ': 'ro',
-    'リャ': 'rya', 'リュ': 'ryu', 'リョ': 'ryo',
-    // W-row
-    'ワ': 'wa', 'ヰ': 'wi', 'ヱ': 'we', 'ヲ': 'wo', 'ン': 'n',
-    // Small tsu (doubles next consonant)
-    'ッ': '',
-    // Extended katakana for foreign words
-    'ヴ': 'vu',
-    'ファ': 'fa', 'フィ': 'fi', 'フェ': 'fe', 'フォ': 'fo',
-    'ウィ': 'wi', 'ウェ': 'we', 'ウォ': 'wo',
-    'ティ': 'ti', 'ディ': 'di',
-    'トゥ': 'tu', 'ドゥ': 'du',
-  };
-
-  const allMaps = { ...hiraganaMap, ...katakanaMap };
-
-  let result = '';
-  let i = 0;
-
-  while (i < text.length) {
-    // Try to match 2-character combinations first (like きゃ, シャ)
-    if (i < text.length - 1) {
-      const twoChar = text.substring(i, i + 2);
-      if (allMaps[twoChar]) {
-        result += allMaps[twoChar];
-        i += 2;
-        continue;
-      }
-    }
-
-    // Then try single character
-    const oneChar = text[i];
-    if (allMaps[oneChar]) {
-      // Handle small tsu (っ/ッ) - double next consonant
-      if (oneChar === 'っ' || oneChar === 'ッ') {
-        if (i < text.length - 1) {
-          const nextChar = text[i + 1];
-          const nextRomaji = allMaps[nextChar];
-          if (nextRomaji && nextRomaji.length > 0) {
-            result += nextRomaji[0]; // Add first letter of next romaji
-          }
-        }
-      } else {
-        result += allMaps[oneChar];
-      }
-      i++;
-    } else {
-      // Not Japanese character, keep as is
-      result += oneChar;
-      i++;
-    }
-  }
-
-  return result;
-}
-
 import { SelectorType } from '../../../utils/selector-types';
 
 // Structured selector format v2
@@ -288,23 +103,31 @@ export class SelectorResolver {
   }
 
   /**
-   * Generate selector key from natural language label
-   * "Email Address" → "email.address"
-   * "Submit Button" → "submit.button"
-   * "User's Profile" → "users.profile"
-   * "Thời gian" → "thoi.gian"
-   * "Địa điểm" → "dia.diem"
-   * "ログイン" → "roguin"
-   * "パスワード" → "pasuwaado"
+   * Generate selector key from natural language label using Unicode NFC normalization.
+   * Preserves all Unicode characters (Vietnamese, Japanese, etc.) as-is.
+   *
+   * "Email Address"  → "email address"
+   * "Submit Button"  → "submit button"
+   * "User's Profile" → "user's profile"
+   * "Giới thiệu"    → "giới thiệu"
+   * "Thời gian"      → "thời gian"
+   * "ログイン"        → "ログイン"
+   * "書類一覧"        → "書類一覧"
    */
   static generateKey(label: string): string {
-    return convertJapaneseToRomaji(removeVietnameseTones(label))  // Convert Japanese and Vietnamese first
-      .toLowerCase()
-      .replace(/['\u2019]s/g, 's')     // Apostrophe s to just s ("User's" → "users")
-      .replace(/['\u2019]/g, '')        // Remove remaining apostrophes
-      .replace(/[^a-z0-9\s]/g, '')     // Remove special chars except spaces
-      .trim()
-      .replace(/\s+/g, '.');            // Spaces to dots
+    return label.normalize('NFC').toLowerCase().trim().replace(/\s+/g, ' ');
+  }
+
+  /**
+   * Normalize all keys in a SelectorFile through generateKey()
+   * so that YAML keys are case-insensitive and Unicode-normalized on lookup.
+   */
+  private static normalizeKeys(file: SelectorFile): SelectorFile {
+    const normalized: SelectorFile = {};
+    for (const [key, value] of Object.entries(file)) {
+      normalized[SelectorResolver.generateKey(key)] = value;
+    }
+    return normalized;
   }
 
   /**
@@ -742,7 +565,7 @@ export class SelectorResolver {
       if (basePath) {
         const baseSelectors = readYamlIfExists<SelectorFile>(basePath);
         if (baseSelectors) {
-          Object.assign(selectors, baseSelectors);
+          Object.assign(selectors, SelectorResolver.normalizeKeys(baseSelectors));
         }
       }
 
@@ -751,7 +574,7 @@ export class SelectorResolver {
       if (baseOverridePath) {
         const overrideSelectors = readYamlIfExists<SelectorFile>(baseOverridePath);
         if (overrideSelectors) {
-          Object.assign(selectors, overrideSelectors);
+          Object.assign(selectors, SelectorResolver.normalizeKeys(overrideSelectors));
         }
       }
     }
@@ -769,7 +592,7 @@ export class SelectorResolver {
     } else {
       const featureSelectors = readYamlIfExists<SelectorFile>(featurePath);
       if (featureSelectors) {
-        Object.assign(selectors, featureSelectors);
+        Object.assign(selectors, SelectorResolver.normalizeKeys(featureSelectors));
       }
     }
 
@@ -778,7 +601,7 @@ export class SelectorResolver {
     if (featureOverridePath) {
       const overrideSelectors = readYamlIfExists<SelectorFile>(featureOverridePath);
       if (overrideSelectors) {
-        Object.assign(selectors, overrideSelectors);
+        Object.assign(selectors, SelectorResolver.normalizeKeys(overrideSelectors));
       }
     }
 

package/src/orchestrator/project-initializer.ts

@@ -53,6 +53,9 @@ export class ProjectInitializer {
     // Create AI rules files
     this.createAIRules();
 
+    // Create VS Code settings for Copilot auto-attach
+    this.createVSCodeSettings();
+
     // Display summary
     this.displaySummary(normalizedProjectName);
   }
@@ -159,6 +162,54 @@ export class ProjectInitializer {
     this.createdItems.push('README.md');
   }
 
+  /**
+   * Create VS Code settings for Copilot auto-attach
+   */
+  private createVSCodeSettings(): void {
+    const settingsPath = path.join(this.cwd, '.vscode', 'settings.json');
+
+    if (fs.existsSync(settingsPath)) {
+      this.skippedItems.push('.vscode/settings.json');
+      return;
+    }
+
+    const settingsDir = path.dirname(settingsPath);
+    if (!fs.existsSync(settingsDir)) {
+      fs.mkdirSync(settingsDir, { recursive: true });
+    }
+
+    const settings = {
+      'github.copilot.chat.agent.runTasks': true,
+      'chat.tools.terminal.autoApprove': {
+        sungen: true,
+        'npx playwright': true,
+      },
+    };
+
+    fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2) + '\n', 'utf-8');
+    this.createdItems.push('.vscode/settings.json');
+
+    // Create MCP config for Playwright browser tools
+    const mcpPath = path.join(this.cwd, '.vscode', 'mcp.json');
+
+    if (fs.existsSync(mcpPath)) {
+      this.skippedItems.push('.vscode/mcp.json');
+      return;
+    }
+
+    const mcpConfig = {
+      servers: {
+        playwright: {
+          command: 'npx',
+          args: ['@playwright/mcp@latest'],
+        },
+      },
+    };
+
+    fs.writeFileSync(mcpPath, JSON.stringify(mcpConfig, null, 2) + '\n', 'utf-8');
+    this.createdItems.push('.vscode/mcp.json');
+  }
+
   /**
    * Display initialization summary
    */
@@ -216,11 +267,15 @@ export class ProjectInitializer {
       ['claude-skill-gherkin-syntax.md', '.claude/skills/sungen-gherkin-syntax/SKILL.md'],
       ['claude-skill-selector-keys.md', '.claude/skills/sungen-selector-keys/SKILL.md'],
       ['claude-skill-error-mapping.md', '.claude/skills/sungen-error-mapping/SKILL.md'],
-
-      // Skills — GitHub Copilot
-      ['copilot-skill-gherkin-syntax.md', '.github/prompts/sungen-gherkin-syntax.prompt.md'],
-      ['copilot-skill-selector-keys.md', '.github/prompts/sungen-selector-keys.prompt.md'],
-      ['copilot-skill-error-mapping.md', '.github/prompts/sungen-error-mapping.prompt.md'],
+      ['claude-skill-tc-generation.md', '.claude/skills/sungen-tc-generation/SKILL.md'],
+      ['claude-skill-selector-fix.md', '.claude/skills/sungen-selector-fix/SKILL.md'],
+
+      // Skills — GitHub Copilot (separate copies with Copilot-friendly descriptions)
+      ['github-skill-sungen-gherkin-syntax.md', '.github/skills/sungen-gherkin-syntax/SKILL.md'],
+      ['github-skill-sungen-selector-keys.md', '.github/skills/sungen-selector-keys/SKILL.md'],
+      ['github-skill-sungen-error-mapping.md', '.github/skills/sungen-error-mapping/SKILL.md'],
+      ['github-skill-sungen-tc-generation.md', '.github/skills/sungen-tc-generation/SKILL.md'],
+      ['github-skill-sungen-selector-fix.md', '.github/skills/sungen-selector-fix/SKILL.md'],
     ];
 
     for (const [templateFile, outputRelPath] of fileMapping) {

package/src/orchestrator/templates/ai-instructions/claude-cmd-add-screen.md

@@ -2,7 +2,7 @@
 name: add-screen
 description: 'Add a new Sungen screen — scaffolds directories and delegates to make-tc for test case creation'
 argument-hint: [screen-name] [url-path]
-allowed-tools: Read, Grep, Bash, Glob
+allowed-tools: Read, Grep, Bash, Glob, AskUserQuestion
 ---
 
 You are adding a new Sungen screen for test generation.
@@ -37,6 +37,7 @@ If yes, delegate to `/sungen:make-tc <screen>` to handle:
 ### 3. Confirm
 
 Tell the user what was created and next steps:
-- If the page requires authentication before exploring via browser, read `baseURL` from `playwright.config.ts` and tell the user to manually run: `sungen makeauth <role> --url <baseURL>` (e.g., `sungen makeauth admin --url http://localhost:3000`). **Do NOT execute this command yourself.**
+- If the page requires authentication, the user will be asked to log in via the MCP browser during `/sungen:make-tc`
 - Edit the generated files as needed
-- Run `sungen generate --screen <screen>` to compile to Playwright `.spec.ts`
+- Run `/sungen:make-tc <screen>` to create test cases
+- Run `/sungen:make-test <screen>` to generate selectors, compile, and run tests