multi-agents-cli 1.1.68 → 1.1.70

package/lib/data-config.js

@@ -250,7 +250,16 @@ const IDE_CANDIDATES = [
 
 // ── Exports ───────────────────────────────────────────────────────────────────
 
+// ── Block identifiers ────────────────────────────────────────────────────────
+
+const BLOCKS = {
+  CLIENT:  'client',
+  BACKEND: 'backend',
+  SHARED:  'shared',
+};
+
 module.exports = {
+  BLOCKS,
   FRAMEWORK_CONVENTIONS,
   CLIENT_FRAMEWORKS,
   BACKEND_FRAMEWORKS,

package/lib/questions-flow.js

@@ -3,6 +3,7 @@
 // ── Imports ───────────────────────────────────────────────────────────────────
 
 const { dim, bold, blue, green, cyan, separator, arrowSelect, arrowConfirm, selectRequired, selectOptional, stepHeader } = require('./ui');
+const { BLOCKS } = require('./data-config');
 const { BACK, RESTART } = require('./steps');
 const {
   CLIENT_FRAMEWORKS, BACKEND_FRAMEWORKS, FRAMEWORK_VERSION_FALLBACK,
@@ -23,7 +24,7 @@ const buildStepDefs = (IDE_CANDIDATES) => [
     run: async (machine, answers) => {
       stepHeader(1, 12);
       console.log(`\n${bold(blue('Client configuration'))}`);
-      return await selectRequired('* Client framework (required):', CLIENT_FRAMEWORKS, machine, 0, answers);
+      return await selectRequired('* Client framework (required):', CLIENT_FRAMEWORKS, machine, 0, answers, BLOCKS.CLIENT);
     },
   },
 
@@ -60,7 +61,7 @@ const buildStepDefs = (IDE_CANDIDATES) => [
     run: async (machine, answers) => {
       stepHeader(3, 12);
       const opts = STATE_OPTIONS[answers.clientFw.value] || [];
-      return await selectOptional('State management:', opts, machine, 2, answers);
+      return await selectOptional('State management:', opts, machine, 2, answers, BLOCKS.CLIENT);
     },
   },
 
@@ -70,7 +71,7 @@ const buildStepDefs = (IDE_CANDIDATES) => [
     run: async (machine, answers) => {
       stepHeader(4, 12);
       const opts = UI_OPTIONS[answers.clientFw.value] || [];
-      return await selectOptional('UI library:', opts, machine, 3, answers);
+      return await selectOptional('UI library:', opts, machine, 3, answers, BLOCKS.CLIENT);
     },
   },
 
@@ -79,7 +80,7 @@ const buildStepDefs = (IDE_CANDIDATES) => [
     name: 'clientStyle',
     run: async (machine, answers) => {
       stepHeader(5, 12);
-      return await selectOptional('Styling:', STYLING_OPTIONS, machine, 4, answers);
+      return await selectOptional('Styling:', STYLING_OPTIONS, machine, 4, answers, BLOCKS.CLIENT);
     },
   },
 
@@ -157,7 +158,7 @@ const buildStepDefs = (IDE_CANDIDATES) => [
     run: async (machine, answers) => {
       stepHeader(9, 12);
       if (!answers.backendFwObj) return null;
-      return await selectOptional('Database type:', DB_OPTIONS, machine, 8, answers);
+      return await selectOptional('Database type:', DB_OPTIONS, machine, 8, answers, BLOCKS.BACKEND);
     },
   },
 
@@ -171,7 +172,7 @@ const buildStepDefs = (IDE_CANDIDATES) => [
       const byDb = ORM_OPTIONS_BY_DB[backendDb] || [];
       const byFw = ORM_OPTIONS[backendFwObj.value] || [];
       const ormChoices = byDb.length && byFw.length ? byDb.filter(o => byFw.includes(o)) : byDb.length ? byDb : byFw;
-      return await selectOptional('ORM / query layer:', ormChoices, machine, 9, answers);
+      return await selectOptional('ORM / query layer:', ormChoices, machine, 9, answers, BLOCKS.BACKEND);
     },
   },
 
@@ -182,7 +183,7 @@ const buildStepDefs = (IDE_CANDIDATES) => [
       stepHeader(11, 12);
       const { backendFwObj } = answers;
       if (!backendFwObj) return null;
-      return await selectOptional('Auth strategy:', AUTH_OPTIONS[backendFwObj.value] || [], machine, 10, answers);
+      return await selectOptional('Auth strategy:', AUTH_OPTIONS[backendFwObj.value] || [], machine, 10, answers, BLOCKS.BACKEND);
     },
   },
 
@@ -208,7 +209,7 @@ const buildStepDefs = (IDE_CANDIDATES) => [
       else                               console.log(`\n  ${'\x1b[33m'}No IDEs detected.${'\x1b[0m'}\n`);
 
       while (true) {
-        const ideChoice = await selectRequired('* IDE / editor (required):', sorted, machine, 11, answers);
+        const ideChoice = await selectRequired('* IDE / editor (required):', sorted, machine, 11, answers, null);
         if (ideChoice === RESTART || ideChoice === BACK) return ideChoice;
 
         if (ideChoice.cmd && !ideChoice.detected) {

package/lib/ui.js

@@ -122,6 +122,7 @@ const stepHeader = (stepIndex, totalSteps) => {
 
 const { BACK, RESTART } = require('./steps');
 const { validateCombination, checkFrameworkExists, fuzzyMatchFramework } = require('./validate');
+const { BLOCKS } = require('./data-config');
 
 const NONE_LABEL = '→ None of these - I\'ll specify my own';
 
@@ -130,34 +131,33 @@ const NONE_LABEL = '→ None of these - I\'ll specify my own';
 const handleFreeText = async (prompt, items, stepMachine, stepIndex, context, isOptional) => {
   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 : (isOptional === false ? handleFreeText(prompt, items, stepMachine, stepIndex, context, isOptional) : null);
+  if (!typed) return isOptional ? null : handleFreeText(prompt, items, stepMachine, stepIndex, context, isOptional);
+
+  // Fuzzy match first - before registry check
+  const matches = fuzzyMatchFramework(typed, block);
+  if (matches.length > 0) {
+    const didYouMeanOpts = [
+      ...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);
+  }
 
-  // Live registry check
+  // Live registry check - only when no fuzzy match
   console.log(dim('  Verifying...'));
   const existence = await checkFrameworkExists(typed);
 
   if (!existence.exists) {
-    const matches = fuzzyMatchFramework(typed);
     console.log('');
-    if (matches.length > 0) {
-      const didYouMeanOpts = [
-        ...matches.map(m => `→ ${m}`),
-        `→ Type a different value`,
-        `→ Proceed with "${typed}" - I accept the risks`,
-      ];
-      const choice = await arrowSelect(`"${typed}" couldn't be verified. Did you mean:`, didYouMeanOpts.map(o => ({ label: o })));
-      if (choice < matches.length) return matches[choice];
-      if (choice === matches.length) return handleFreeText(prompt, items, stepMachine, stepIndex, context, isOptional);
-      // Proceed with risks
-    } else {
-      const riskOpts = [
-        `→ Proceed with "${typed}" - I accept the risks`,
-        `→ 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 before proceeding
+    const riskOpts = [
+      `→ Proceed with "${typed}" - I accept the risks`,
+      `→ 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'));
@@ -173,8 +173,7 @@ const handleFreeText = async (prompt, items, stepMachine, stepIndex, context, is
     return typed;
   }
 
-  // Valid framework - check compatibility for backend block
-  const isBackend = context.backendFwObj !== undefined || context.clientFw !== undefined;
+  // Valid + verified - check compatibility
   const check = validateCombination(typed, context);
   if (!check.valid) {
     console.log(`
@@ -195,41 +194,44 @@ const handleFreeText = async (prompt, items, stepMachine, stepIndex, context, is
   return typed;
 };
 
-const selectRequired = async (prompt, items, stepMachine, stepIndex, context = {}) => {
+const selectRequired = async (prompt, items, stepMachine, stepIndex, context = {}, block = null) => {
   const isFirstStep = stepIndex <= 1;
   const navOpts = stepMachine ? stepMachine.navOptions(stepIndex, isFirstStep) : [];
-  const noneOpt = { label: NONE_LABEL };
-  const allItems = [...items, noneOpt, ...navOpts];
+  const allItems = block !== null ? [...items, { label: NONE_LABEL }, ...navOpts] : [...items, ...navOpts];
 
   const idx = await arrowSelect(prompt, allItems.map(i => ({ label: typeof i === 'string' ? i : i.label })));
 
-  if (idx === items.length) return handleFreeText(prompt, items, stepMachine, stepIndex, context, false);
+  if (block !== null && idx === items.length) return handleFreeText(prompt, items, stepMachine, stepIndex, context, false, block);
 
-  if (idx > items.length) {
-    const nav = navOpts[idx - items.length - 1];
+  const navStart = block !== null ? items.length + 1 : items.length;
+  if (idx >= navStart) {
+    const nav = navOpts[idx - navStart];
     return nav ? nav.value : RESTART;
   }
   return items[idx];
 };
 
-const selectOptional = async (prompt, items, stepMachine, stepIndex, context = {}) => {
+const selectOptional = async (prompt, items, stepMachine, stepIndex, context = {}, block = null) => {
   if (!items || items.length === 0) return null;
   const isFirstStep = stepIndex <= 1;
   const navOpts = stepMachine ? stepMachine.navOptions(stepIndex, isFirstStep) : [];
   const choices = [
     ...items.map(i => ({ label: typeof i === 'string' ? i : i.label })),
     { label: dim('Skip (agent will propose when needed)') },
-    { label: NONE_LABEL },
+    ...(block !== null ? [{ label: NONE_LABEL }] : []),
     ...navOpts.map(n => ({ label: n.label })),
   ];
 
   const idx = await arrowSelect(prompt, choices);
 
   if (idx === items.length) return null; // skip
-  if (idx === items.length + 1) return handleFreeText(prompt, items, stepMachine, stepIndex, context, true);
 
-  if (idx > items.length + 1) {
-    const nav = navOpts[idx - items.length - 2];
+  const noneIdx = block !== null ? items.length + 1 : -1;
+  if (block !== null && idx === noneIdx) return handleFreeText(prompt, items, stepMachine, stepIndex, context, true, block);
+
+  const navStart = block !== null ? items.length + 2 : items.length + 1;
+  if (idx >= navStart) {
+    const nav = navOpts[idx - navStart];
     return nav ? nav.value : RESTART;
   }
   return typeof items[idx] === 'string' ? items[idx] : items[idx].value;

package/lib/validate.js

@@ -1,6 +1,8 @@
 'use strict';
 
-const { FRAMEWORK_REGISTRY } = require('./data-config');
+const { FRAMEWORK_REGISTRY, CLIENT_FRAMEWORKS, BACKEND_FRAMEWORKS, BLOCKS } = require('./data-config');
+
+const ALL_FRAMEWORKS = [...CLIENT_FRAMEWORKS, ...BACKEND_FRAMEWORKS];
 
 // ── Compatibility matrix ──────────────────────────────────────────────────────
 
@@ -15,12 +17,17 @@ const MONGO_DBS        = ['MongoDB'];
 // ── fuzzyMatchFramework ───────────────────────────────────────────────────────
 // Returns up to 3 known framework names that loosely match the typed value
 
-const fuzzyMatchFramework = (typed) => {
+const fuzzyMatchFramework = (typed, block = null) => {
+  const pool = block === BLOCKS.CLIENT  ? CLIENT_FRAMEWORKS
+             : block === BLOCKS.BACKEND ? BACKEND_FRAMEWORKS
+             : ALL_FRAMEWORKS;
   const lower = typed.toLowerCase().replace(/[^a-z0-9]/g, '');
-  return Object.keys(FRAMEWORK_REGISTRY).filter(name => {
+  const matchedNames = Object.keys(FRAMEWORK_REGISTRY).filter(name => {
     const n = name.toLowerCase().replace(/[^a-z0-9]/g, '');
-    return n.includes(lower) || lower.includes(n) || (lower.length >= 3 && n.startsWith(lower.slice(0, 3)));
+    return pool.some(f => f.value === name) &&
+      (n.includes(lower) || lower.includes(n) || (lower.length >= 3 && n.startsWith(lower.slice(0, 3))));
   }).slice(0, 3);
+  return matchedNames.map(name => pool.find(f => f.value === name) || { label: name, value: name });
 };
 
 // ── checkFrameworkExists ──────────────────────────────────────────────────────

package/package.json

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