multi-agents-cli 1.1.70 → 1.1.72

package/lib/ui.js

@@ -121,59 +121,79 @@ const stepHeader = (stepIndex, totalSteps) => {
 // ── Step selection helpers ────────────────────────────────────────────────────
 
 const { BACK, RESTART } = require('./steps');
-const { validateCombination, checkFrameworkExists, fuzzyMatchFramework } = require('./validate');
+const { validateCombination, resolveFramework } = require('./validate');
 const { BLOCKS } = require('./data-config');
 
 const NONE_LABEL = '→ None of these - I\'ll specify my own';
 
 // ── Free-text handler (shared by selectRequired + selectOptional) ────────────
 
-const handleFreeText = async (prompt, items, stepMachine, stepIndex, context, isOptional) => {
+const handleFreeText = async (prompt, items, stepMachine, stepIndex, context, isOptional, block = null) => {
   const _res = await prompts({ type: 'text', name: 'value', message: 'Type your own value:' }, { onCancel: () => process.exit(0) });
   const typed = (_res.value || '').trim();
-  if (!typed) return isOptional ? null : handleFreeText(prompt, items, stepMachine, stepIndex, context, isOptional);
+  if (!typed) return isOptional ? null : handleFreeText(prompt, items, stepMachine, stepIndex, context, isOptional, block);
 
-  // Fuzzy match first - before registry check
-  const matches = fuzzyMatchFramework(typed, block);
-  if (matches.length > 0) {
-    const didYouMeanOpts = [
-      ...matches.map(m => `→ ${m.label || m}`),
+  console.log(dim('  Verifying...'));
+  const resolved = await resolveFramework(typed, block);
+
+  if (resolved.status === 'fuzzy') {
+    const opts = [
+      ...resolved.matches.map(m => `→ ${m.label || m}`),
       `→ Type a different value`,
     ];
-    const choice = await arrowSelect(`"${typed}" couldn't be verified. Did you mean:`, didYouMeanOpts.map(o => ({ label: o })));
-    if (choice < matches.length) return matches[choice]; // returns full framework object
-    return handleFreeText(prompt, items, stepMachine, stepIndex, context, isOptional);
+    const choice = await arrowSelect(`"${typed}" couldn't be verified. Did you mean:`, opts.map(o => ({ label: o })));
+    if (choice < resolved.matches.length) return resolved.matches[choice];
+    return handleFreeText(prompt, items, stepMachine, stepIndex, context, isOptional, block);
   }
 
-  // Live registry check - only when no fuzzy match
-  console.log(dim('  Verifying...'));
-  const existence = await checkFrameworkExists(typed);
+  if (resolved.status === 'valid') return resolved.match;
 
-  if (!existence.exists) {
-    console.log('');
-    const riskOpts = [
-      `→ Proceed with "${typed}" - I accept the risks`,
+  if (resolved.status === 'partial_cross') {
+    console.log(`
+  ${yellow('⚠')} ${resolved.message}
+`);
+    const opts = [
+      ...resolved.matches.map(m => `→ ${m.label || m}`),
       `→ Type a different value`,
     ];
-    const choice = await arrowSelect(`"${typed}" couldn't be verified.`, riskOpts.map(o => ({ label: o })));
-    if (choice === 1) return handleFreeText(prompt, items, stepMachine, stepIndex, context, isOptional);
-    // Show risk consequence block
-    console.log('');
-    console.log(`  ${yellow('⚠ Proceeding with an unverified framework may result in:')}`);
-    console.log(dim('    · Agent spending excessive tokens resolving unknown setup'));
-    console.log(dim('    · Incorrect scaffold structure for this framework'));
-    console.log(dim('    · Missing contracts and integration points'));
-    console.log(dim('    · Potential mid-flow failures requiring full restart'));
-    console.log('');
-    const confirm = await arrowSelect('Confirm you understand and want to continue?', [
-      { label: `→ Yes - proceed with "${typed}"` },
-      { label: `→ No - let me pick something else` },
+    const choice = await arrowSelect('What would you like to do?', opts.map(o => ({ label: o })));
+    if (choice < resolved.matches.length) return resolved.matches[choice];
+    return handleFreeText(prompt, items, stepMachine, stepIndex, context, isOptional, block);
+  }
+
+  if (resolved.status === 'cross_block') {
+    console.log(`
+  ${yellow('⚠')} ${resolved.message}
+`);
+    const choice = await arrowSelect('How would you like to proceed?', [
+      { label: `→ Continue - I understand the tradeoff` },
+      { label: `→ Type a different value` },
     ]);
-    if (confirm === 1) return handleFreeText(prompt, items, stepMachine, stepIndex, context, isOptional);
+    if (choice === 1) return handleFreeText(prompt, items, stepMachine, stepIndex, context, isOptional, block);
     return typed;
   }
 
-  // Valid + verified - check compatibility
+  // unverified - risk block
+  console.log('');
+  const riskOpts = [
+    `→ Proceed with "${typed}" - I accept the risks`,
+    `→ Type a different value`,
+  ];
+  const riskChoice = await arrowSelect(`"${typed}" couldn't be verified.`, riskOpts.map(o => ({ label: o })));
+  if (riskChoice === 1) return handleFreeText(prompt, items, stepMachine, stepIndex, context, isOptional, block);
+  console.log('');
+  console.log(`  ${yellow('⚠ Proceeding with an unverified framework may result in:')}`);
+  console.log(dim('    · Agent spending excessive tokens resolving unknown setup'));
+  console.log(dim('    · Incorrect scaffold structure for this framework'));
+  console.log(dim('    · Missing contracts and integration points'));
+  console.log(dim('    · Potential mid-flow failures requiring full restart'));
+  console.log('');
+  const confirm = await arrowSelect('Confirm you understand and want to continue?', [
+    { label: `→ Yes - proceed with "${typed}"` },
+    { label: `→ No - let me pick something else` },
+  ]);
+  if (confirm === 1) return handleFreeText(prompt, items, stepMachine, stepIndex, context, isOptional, block);
+
   const check = validateCombination(typed, context);
   if (!check.valid) {
     console.log(`
@@ -186,7 +206,7 @@ const handleFreeText = async (prompt, items, stepMachine, stepIndex, context, is
     ];
     const choice = await arrowSelect('How would you like to proceed?', opts.map(o => ({ label: o })));
     if (choice === 0) return typed;
-    if (choice === opts.length - 1) return handleFreeText(prompt, items, stepMachine, stepIndex, context, isOptional);
+    if (choice === opts.length - 1) return handleFreeText(prompt, items, stepMachine, stepIndex, context, isOptional, block);
     return check.alternatives[choice - 1];
   }
 

package/lib/validate.js

@@ -127,4 +127,47 @@ const validateCombination = (chosen, context = {}) => {
   return { valid: true, reason: null, alternatives: [] };
 };
 
-module.exports = { validateCombination, checkFrameworkExists, fuzzyMatchFramework };
+
+// ── resolveFramework ──────────────────────────────────────────────────────────
+// Full lookup order per block — returns { status, match, message }
+// status: 'match' | 'cross_block' | 'partial_cross' | 'unverified' | 'valid'
+
+const resolveFramework = async (typed, block = null) => {
+  const lower = typed.toLowerCase().replace(/[^a-z0-9]/g, '');
+
+  const primaryPool   = block === BLOCKS.CLIENT  ? CLIENT_FRAMEWORKS
+                      : block === BLOCKS.BACKEND ? BACKEND_FRAMEWORKS
+                      : ALL_FRAMEWORKS;
+  const secondaryPool = block === BLOCKS.CLIENT  ? BACKEND_FRAMEWORKS
+                      : block === BLOCKS.BACKEND ? CLIENT_FRAMEWORKS
+                      : [];
+  const crossLabel    = block === BLOCKS.CLIENT  ? 'backend' : 'client';
+
+  // 1. Fuzzy match in primary pool
+  const primaryFuzzy = primaryPool.filter(f => {
+    const n = f.value.toLowerCase().replace(/[^a-z0-9]/g, '');
+    return n.includes(lower) || lower.includes(n) || (lower.length >= 3 && n.startsWith(lower.slice(0, 3)));
+  }).slice(0, 3);
+  if (primaryFuzzy.length > 0) return { status: 'fuzzy', matches: primaryFuzzy, message: null };
+
+  // 2. Exact match in primary pool
+  const primaryExact = primaryPool.find(f => f.value.toLowerCase() === typed.toLowerCase());
+  if (primaryExact) return { status: 'valid', match: primaryExact, message: null };
+
+  // 3. Partial match in secondary pool
+  const secondaryFuzzy = secondaryPool.filter(f => {
+    const n = f.value.toLowerCase().replace(/[^a-z0-9]/g, '');
+    return n.includes(lower) || lower.includes(n) || (lower.length >= 3 && n.startsWith(lower.slice(0, 3)));
+  });
+  if (secondaryFuzzy.length > 0) return { status: 'partial_cross', matches: secondaryFuzzy, message: `No such ${block} framework found. Did you mean a ${crossLabel} framework?` };
+
+  // 4. Exact match in secondary pool
+  const secondaryExact = secondaryPool.find(f => f.value.toLowerCase() === typed.toLowerCase());
+  if (secondaryExact) return { status: 'cross_block', match: secondaryExact, message: `"${typed}" is a ${crossLabel} framework, not a ${block} framework.` };
+
+  // 5. Registry check
+  const existence = await checkFrameworkExists(typed);
+  return { status: 'unverified', match: null, message: existence.exists ? `"${typed}" was found on ${existence.registry} but could not be confirmed as a ${block || ''} framework.` : `"${typed}" couldn't be verified on any registry.` };
+};
+
+module.exports = { validateCombination, checkFrameworkExists, fuzzyMatchFramework, resolveFramework };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "multi-agents-cli",
-  "version": "1.1.70",
+  "version": "1.1.72",
   "description": "Multi-agent workflow orchestration for Claude Code — isolated git worktrees, structured state tracking, autonomous task chaining",
   "keywords": [
     "claude-code",