korext 0.9.10 → 0.9.12

package/bin/korext.js

@@ -296,13 +296,22 @@ async function fetchAndCacheRules() {
  * Mirrors korext-core/src/engine/localEngine.ts analyzeLocally().
  */
 function analyzeLocally(code, packId, definitions) {
-  const pack = definitions.packs[packId];
-  if (!pack) return [];
+  // Normalize packId to array to support multi-pack (e.g. ["web", "pci-dss-v1"])
+  const packIdList = Array.isArray(packId) ? packId : [packId];
+  // Merge rules from all requested packs via Set
+  const mergedRuleIds = new Set();
+  for (const pid of packIdList) {
+    const pack = definitions.packs[pid];
+    if (pack && pack.rules) {
+      for (const rid of pack.rules) mergedRuleIds.add(rid);
+    }
+  }
+  if (mergedRuleIds.size === 0) return [];
 
   const violations = [];
   const lines = code.split('\n');
 
-  for (const ruleId of pack.rules) {
+  for (const ruleId of mergedRuleIds) {
     const rule = definitions.rules[ruleId];
     if (!rule) continue;
     if (rule.checkMode === 'server-only') continue;
@@ -630,18 +639,65 @@ program
       });
 
       console.log();
-      const industryInput = await ask(chalk.bold('  Select industries (comma-separated numbers or IDs): '));
+      const industryInput = await ask(chalk.bold('  Select industries or packs (numbers, IDs, or names): '));
+
+      // Parse user input: accept numbers, industry IDs, industry names (fuzzy), or pack IDs
+      const rawTokens = industryInput.split(',').map(s => s.trim()).filter(Boolean);
+      const selectedIndustries = [];
+      const directPacks = [];
 
-      // Parse user input (numbers or IDs)
-      const selectedIndustries = industryInput.split(',').map(s => s.trim()).filter(Boolean).map(s => {
-        const num = parseInt(s, 10);
+      for (const token of rawTokens) {
+        const lower = token.toLowerCase();
+
+        // Strategy 1: Number (e.g., "8" for Finance)
+        const num = parseInt(token, 10);
         if (!isNaN(num) && num >= 1 && num <= sortedIndustries.length) {
-          return sortedIndustries[num - 1][0];
+          selectedIndustries.push(sortedIndustries[num - 1][0]);
+          continue;
+        }
+
+        // Strategy 2: Industry ID exact match (e.g., "finance")
+        if (taxonomy.industries[lower]) {
+          selectedIndustries.push(lower);
+          continue;
         }
-        return s.toLowerCase();
-      }).filter(id => taxonomy.industries[id]);
 
-      if (selectedIndustries.length === 0) {
+        // Strategy 3: Industry label fuzzy match (e.g., "Finance", "health", "aero")
+        const labelMatch = sortedIndustries.find(([id, group]) =>
+          group.label.toLowerCase().startsWith(lower)
+        );
+        if (labelMatch) {
+          selectedIndustries.push(labelMatch[0]);
+          console.log(chalk.dim(`  "${token}" matched industry: ${labelMatch[1].label}`));
+          continue;
+        }
+
+        // Strategy 4: Direct pack ID (e.g., "web", "pci-dss-v1", "security")
+        const allPackIds = Object.keys(defs.packs);
+        if (allPackIds.includes(lower)) {
+          directPacks.push(lower);
+          console.log(chalk.dim(`  "${token}" is a pack ID, adding directly.`));
+          continue;
+        }
+
+        // Nothing matched
+        console.log(chalk.yellow(`  Unknown input: "${token}" (not an industry, pack ID, or name)`));
+      }
+
+      // If user typed only pack IDs (e.g., "web" or "web, security"), skip region prompt
+      if (selectedIndustries.length === 0 && directPacks.length > 0) {
+        const config = {
+          targetPacks: directPacks,
+          exclude: ['node_modules', 'dist', 'build', '.next']
+        };
+        fs.writeFileSync(outputPath, JSON.stringify(config, null, 2));
+        console.log(chalk.green(`\n  Created ${outputPath} with packs: ${directPacks.join(', ')}\n`));
+        console.log(chalk.dim(`  Run: ${chalk.green('korext enforce .')} to enforce these packs.\n`));
+        rl.close();
+        process.exit(0);
+      }
+
+      if (selectedIndustries.length === 0 && directPacks.length === 0) {
         console.log(chalk.yellow('\n  No valid industries selected. Using default: web\n'));
         const config = {
           targetPacks: ['web'],
@@ -676,22 +732,25 @@ program
         }
       }
 
-      // Resolve packs
+      // Resolve packs from industries
       const resolvedPacks = resolvePacksForIndustryRegion(
         selectedIndustries.join(','),
         selectedRegion,
         taxonomy
       );
 
-      console.log(chalk.green(`\n  Resolved ${resolvedPacks.length} packs for ${selectedIndustries.map(id => INDUSTRY_LABELS[id]).join(', ')}${selectedRegion ? ` (${REGION_LABELS[selectedRegion] || selectedRegion})` : ''}:`));
-      for (const pid of resolvedPacks) {
+      // Merge any direct pack IDs the user typed alongside industries
+      const allPacks = [...new Set([...resolvedPacks, ...directPacks])];
+
+      console.log(chalk.green(`\n  Resolved ${allPacks.length} packs for ${selectedIndustries.map(id => INDUSTRY_LABELS[id]).join(', ')}${selectedRegion ? ` (${REGION_LABELS[selectedRegion] || selectedRegion})` : ''}${directPacks.length > 0 ? ` + ${directPacks.join(', ')}` : ''}:`));
+      for (const pid of allPacks) {
         console.log(`    ${chalk.cyan(pid)}`);
       }
 
       const config = {
         industry: selectedIndustries.join(','),
         ...(selectedRegion && { region: selectedRegion }),
-        targetPacks: resolvedPacks,
+        targetPacks: allPacks,
         exclude: ['node_modules', 'dist', 'build', '.next']
       };
 
@@ -980,7 +1039,14 @@ program
         console.log(chalk.yellow('\n⚡ Offline mode: using local rule engine (regex-based analysis)'));
         console.log(chalk.dim(`   Cached rules: v${localDefinitions.version} · ${localDefinitions.ruleCount} rules · ${localDefinitions.packCount} packs`));
         // Show rule coverage breakdown
-        const packRules = localDefinitions.packs?.[pack]?.rules || [];
+        // Merge rules from all packs for coverage display
+        const coveragePackList = Array.isArray(pack) ? pack : [pack];
+        const allPackRuleIds = new Set();
+        for (const pid of coveragePackList) {
+          const pr = localDefinitions.packs?.[pid]?.rules || [];
+          for (const rid of pr) allPackRuleIds.add(rid);
+        }
+        const packRules = [...allPackRuleIds];
         const availableCount = packRules.filter(r => localDefinitions.rules?.[r]).length;
         const serverOnlyCount = packRules.length - availableCount;
         console.log(chalk.dim(`   Offline mode: ${availableCount} of ${packRules.length} rules available. ${serverOnlyCount} rules require server analysis.`));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "korext",
-  "version": "0.9.10",
+  "version": "0.9.12",
   "mcpName": "io.github.Korext/governance",
   "description": "Korext Command Line Interface",
   "type": "module",