multi-agents-cli 1.1.81 → 1.1.83

package/init.js

@@ -28,7 +28,6 @@ const {
   FRAMEWORK_CONVENTIONS,
   CLIENT_FRAMEWORKS,
   BACKEND_FRAMEWORKS,
-  FRAMEWORK_VERSION_FALLBACK,
   fetchLatestVersions, prefetchVersions,
   STATE_OPTIONS,
   UI_OPTIONS,
@@ -364,7 +363,6 @@ const main = async () => {
   // ── Step machine + question runner ──────────────────────────────────────────
 
   const steps    = new StepMachine();
-  const stepDefs = buildStepDefs(IDE_CANDIDATES);
 
   // Project name (free-text, outside the runner)
   let projectName = '';
@@ -398,15 +396,23 @@ const main = async () => {
   for (const blockKey of blockOrder) {
     const block = BLOCK_CONFIG[blockKey];
     block.isActive = true;
-    let isFirstSeg = true;
+    let isBlockEntry = true;
     for (const [segKey, seg] of Object.entries(block)) {
-      if (segKey === 'isActive' || typeof seg !== 'object' || !('step' in seg)) continue;
+      if (segKey === 'isActive' || typeof seg !== 'object' || !('key' in seg)) continue;
       seg.absoluteStep = absoluteStep;
-      if (isFirstSeg) { blockEntries.push(absoluteStep); isFirstSeg = false; }
+      if (isBlockEntry) { blockEntries.push(absoluteStep); isBlockEntry = false; }
       absoluteStep++;
+      // Walk nested properties (framework sub-steps)
+      if (seg.properties) {
+        for (const prop of Object.values(seg.properties)) {
+          prop.absoluteStep = absoluteStep;
+          absoluteStep++;
+        }
+      }
     }
   }
   steps.blockEntries = blockEntries;
+  const stepDefs = buildStepDefs(IDE_CANDIDATES, blockOrder);
 
   // Prefetch versions for active blocks in background
   if (BLOCK_CONFIG.client.isActive) prefetchVersions(CLIENT_FRAMEWORKS);

package/lib/data-config.js

@@ -25,60 +25,26 @@ const FRAMEWORK_CONVENTIONS = {
 // ── Client frameworks ─────────────────────────────────────────────────────────
 
 const CLIENT_FRAMEWORKS = [
-  { label: 'Next.js',       value: 'Next.js',    language: 'TypeScript', integratedBackend: true  },
-  { label: 'Angular',       value: 'Angular',    language: 'TypeScript', integratedBackend: false },
-  { label: 'Vue / Nuxt',    value: 'Nuxt',       language: 'TypeScript', integratedBackend: true  },
-  { label: 'SvelteKit',     value: 'SvelteKit',  language: 'TypeScript', integratedBackend: true  },
-  { label: 'Remix',         value: 'Remix',      language: 'TypeScript', integratedBackend: true  },
-  { label: 'Vite + React',  value: 'Vite+React', language: 'TypeScript', integratedBackend: false },
+  { label: 'Next.js',       value: 'Next.js',    language: 'TypeScript', integratedBackend: true,  registry: 'npm', package: 'next',             versions: ['15','14','13']          },
+  { label: 'Angular',       value: 'Angular',    language: 'TypeScript', integratedBackend: false, registry: 'npm', package: '@angular/core',    versions: ['22','21','20']          },
+  { label: 'Vue / Nuxt',    value: 'Nuxt',       language: 'TypeScript', integratedBackend: true,  registry: 'npm', package: 'nuxt',             versions: ['3','2',null]            },
+  { label: 'SvelteKit',     value: 'SvelteKit',  language: 'TypeScript', integratedBackend: true,  registry: 'npm', package: '@sveltejs/kit',    versions: ['2','1',null]            },
+  { label: 'Remix',         value: 'Remix',      language: 'TypeScript', integratedBackend: true,  registry: 'npm', package: '@remix-run/react', versions: ['2','1',null]            },
+  { label: 'Vite + React',  value: 'Vite+React', language: 'TypeScript', integratedBackend: false, registry: 'npm', package: 'vite',             versions: ['8','7','6']             },
 ];
 
 // ── Backend frameworks ────────────────────────────────────────────────────────
 
 const BACKEND_FRAMEWORKS = [
-  { label: 'NestJS',   value: 'NestJS',   language: 'TypeScript' },
-  { label: 'Express',  value: 'Express',  language: 'TypeScript' },
-  { label: 'Fastify',  value: 'Fastify',  language: 'TypeScript' },
-  { label: 'Django',   value: 'Django',   language: 'Python'     },
-  { label: 'FastAPI',  value: 'FastAPI',  language: 'Python'     },
-  { label: 'Laravel',  value: 'Laravel',  language: 'PHP'        },
-  { label: 'Ruby on Rails', value: 'Rails', language: 'Ruby'       },
+  { label: 'NestJS',        value: 'NestJS',   language: 'TypeScript', registry: 'npm',       package: '@nestjs/core',      versions: ['11','10','9']           },
+  { label: 'Express',       value: 'Express',  language: 'TypeScript', registry: 'npm',       package: 'express',           versions: ['5','4']                 },
+  { label: 'Fastify',       value: 'Fastify',  language: 'TypeScript', registry: 'npm',       package: 'fastify',           versions: ['5','4',null]            },
+  { label: 'Django',        value: 'Django',   language: 'Python',     registry: 'pypi',      package: 'django',            versions: ['5.1','4.2','3.2']       },
+  { label: 'FastAPI',       value: 'FastAPI',  language: 'Python',     registry: 'pypi',      package: 'fastapi',           versions: ['0.115','0.111','0.104'] },
+  { label: 'Laravel',       value: 'Laravel',  language: 'PHP',        registry: 'packagist', package: 'laravel/framework', versions: ['11','10','9']           },
+  { label: 'Ruby on Rails', value: 'Rails',    language: 'Ruby',       registry: 'rubygems',  package: 'rails',             versions: ['7.2','7.1','7.0']       },
 ];
 
-// ── Framework version registry ────────────────────────────────────────────────
-
-const FRAMEWORK_REGISTRY = {
-  'Next.js':    { registry: 'npm',  package: 'next'               },
-  'Angular':    { registry: 'npm',  package: '@angular/core'      },
-  'Nuxt':       { registry: 'npm',  package: 'nuxt'               },
-  'SvelteKit':  { registry: 'npm',  package: '@sveltejs/kit'      },
-  'Remix':      { registry: 'npm',  package: '@remix-run/react'   },
-  'Vite+React': { registry: 'npm',  package: 'vite'               },
-  'NestJS':     { registry: 'npm',  package: '@nestjs/core'       },
-  'Express':    { registry: 'npm',  package: 'express'            },
-  'Fastify':    { registry: 'npm',  package: 'fastify'            },
-  'FastAPI':    { registry: 'pypi', package: 'fastapi'            },
-  'Django':     { registry: 'pypi', package: 'django'             },
-  'Laravel':    { registry: 'packagist', package: 'laravel/framework' },
-  'Rails':      { registry: 'rubygems',   package: 'rails'             },
-};
-
-const FRAMEWORK_VERSION_FALLBACK = {
-  'Next.js':    ['15', '14', '13'],
-  'Angular':    ['22', '21', '20'],
-  'Nuxt':       ['3',  '2',  null],
-  'SvelteKit':  ['2',  '1',  null],
-  'Remix':      ['2',  '1',  null],
-  'Vite+React': ['8',  '7',  '6'],
-  'NestJS':     ['11', '10', '9' ],
-  'Express':    ['5',  '4'],
-  'Fastify':    ['5',  '4',  null],
-  'FastAPI':    ['0.115', '0.111', '0.104'],
-  'Django':     ['5.1', '4.2', '3.2'],
-  'Laravel':    ['11', '10', '9'],
-  'Rails':      ['7.2', '7.1', '7.0'],
-};
-
 const _versionCache = {};
 
 const getVersionCache = (frameworkValue) => _versionCache[frameworkValue] || null;
@@ -92,7 +58,7 @@ const prefetchVersions = (frameworks) => {
 
 const fetchLatestVersions = async (frameworkValue) => {
   if (_versionCache[frameworkValue]) return _versionCache[frameworkValue];
-  const entry = FRAMEWORK_REGISTRY[frameworkValue];
+  const entry = [...CLIENT_FRAMEWORKS, ...BACKEND_FRAMEWORKS].find(fw => fw.value === frameworkValue);
   if (!entry || !entry.package) return null;
 
   try {
@@ -308,17 +274,30 @@ const BLOCKS = {
 const BLOCK_CONFIG = {
   client: {
     isActive: true,
-    framework:       { data: CLIENT_FRAMEWORKS, required: true,  key: 'clientFw',    step: 0 },
-    stateManagement: { data: STATE_OPTIONS,     required: false, key: 'clientState', step: 1 },
-    uiLibrary:       { data: UI_OPTIONS,        required: false, key: 'clientUi',    step: 2 },
-    styling:         { data: STYLING_OPTIONS,   required: false, key: 'clientStyle', step: 3 },
+    framework: {
+      data: CLIENT_FRAMEWORKS, required: true, key: 'clientFw', step: 0,
+      desc: 'Which client framework do you want to use?',
+      properties: {
+        frameworkVersion: { data: CLIENT_FRAMEWORKS,  required: false, key: 'clientFwVersion', step: 0, desc: (fw) => `Which version of ${fw} will you use?`                    },
+        stateManagement:  { data: STATE_OPTIONS,      required: false, key: 'clientState',     step: 1, desc: 'How will your app manage shared data (state management)?'                            },
+        uiLibrary:        { data: UI_OPTIONS,         required: false, key: 'clientUi',        step: 2, desc: 'Which UI library do you want to use?'                            },
+        styling:          { data: STYLING_OPTIONS,    required: false, key: 'clientStyle',     step: 3, desc: (fw) => `How do you want to style your ${fw} app?`              },
+      },
+    },
+    integratedBackend: { data: null, required: false, key: 'useIntegratedBackend', step: 1, desc: (fw) => `Will you use ${fw}'s built-in backend instead of a separate server?` },
   },
   backend: {
     isActive: false,
-    framework:       { data: BACKEND_FRAMEWORKS, required: false, key: 'backendFw',   step: 0 },
-    database:        { data: DB_OPTIONS,         required: false, key: 'backendDb',   step: 1 },
-    orm:             { data: ORM_OPTIONS,        required: false, key: 'backendOrm',  step: 2 },
-    auth:            { data: AUTH_OPTIONS,       required: false, key: 'backendAuth', step: 3 },
+    framework: {
+      data: BACKEND_FRAMEWORKS, required: false, key: 'backendFw', step: 0,
+      desc: 'Which backend framework do you want to use?',
+      properties: {
+        frameworkVersion: { data: BACKEND_FRAMEWORKS, required: false, key: 'backendFwVersion', step: 0, desc: (fw) => `Which version of ${fw} will you use?`                  },
+        database:         { data: DB_OPTIONS,         required: false, key: 'backendDb',        step: 1, desc: 'Which database do you wish to use to store the data?'           },
+        orm:              { data: ORM_OPTIONS,        required: false, key: 'backendOrm',       step: 2, desc: (db) => `How will your app communicate with ${db}?`             },
+        auth:             { data: AUTH_OPTIONS,       required: false, key: 'backendAuth',      step: 3, desc: 'How will your app handle user authentication?'                  },
+      },
+    },
   },
 };
 
@@ -337,8 +316,7 @@ module.exports = {
   FRAMEWORK_CONVENTIONS,
   CLIENT_FRAMEWORKS,
   BACKEND_FRAMEWORKS,
-  FRAMEWORK_REGISTRY,
-  FRAMEWORK_VERSION_FALLBACK,
+
   fetchLatestVersions,
   getVersionCache,
   prefetchVersions,

package/lib/questions-flow.js

@@ -2,11 +2,11 @@
 
 // ── Imports ───────────────────────────────────────────────────────────────────
 
-const { dim, bold, blue, green, cyan, separator, arrowSelect, arrowConfirm, selectRequired, selectOptional, stepHeader, createSpinner } = require('./ui');
+const { dim, bold, blue, yellow, red, green, cyan, separator, arrowSelect, arrowConfirm, selectRequired, selectOptional, stepHeader, createSpinner } = require('./ui');
 const { BLOCKS } = require('./data-config');
 const { BACK, RESTART } = require('./steps');
 const {
-  CLIENT_FRAMEWORKS, BACKEND_FRAMEWORKS, FRAMEWORK_VERSION_FALLBACK,
+  BLOCK_CONFIG, CLIENT_FRAMEWORKS, BACKEND_FRAMEWORKS,
   fetchLatestVersions, getVersionCache, prefetchVersions, STATE_OPTIONS, UI_OPTIONS, STYLING_OPTIONS,
   DB_OPTIONS, ORM_OPTIONS_BY_DB, ORM_OPTIONS, AUTH_OPTIONS,
 } = require('./data-config');
@@ -18,15 +18,17 @@ const { buildIDEOptions, verifyIDE, detectTerminal } = require('./detect');
 
 const fwValue = (fw) => fw && typeof fw === 'object' ? fw.value : (typeof fw === 'string' && fw.length > 0 ? fw : '__custom__');
 
-const buildStepDefs = (IDE_CANDIDATES) => [
+const buildStepDefs = (IDE_CANDIDATES, blockOrder = ['client', 'backend']) => {
+  const clientSteps = [
 
   // ── Step 0: Client framework ────────────────────────────────────────────────
   {
     name: 'clientFw',
     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, BLOCKS.CLIENT);
+      console.log(`\n${bold('CLIENT CONFIGURATION')}`);
+      console.log(bold(cyan(BLOCK_CONFIG.client.framework.desc)));
+      return await selectRequired('* Client framework (required):', CLIENT_FRAMEWORKS, machine, BLOCK_CONFIG.client.framework.absoluteStep, answers, BLOCKS.CLIENT);
     },
   },
 
@@ -42,7 +44,7 @@ const buildStepDefs = (IDE_CANDIDATES) => [
         versions = cached;
       } else {
         const spinner = createSpinner('Fetching latest versions...');
-        versions = await fetchLatestVersions(fwValue(fw)) || FRAMEWORK_VERSION_FALLBACK[fwValue(fw)] || [];
+        versions = await fetchLatestVersions(fwValue(fw)) || CLIENT_FRAMEWORKS.find(f => f.value === fwValue(fw))?.versions?.filter(Boolean) || [];
         spinner.stop();
       }
       if (!versions.length) return null; // skip silently
@@ -50,8 +52,10 @@ const buildStepDefs = (IDE_CANDIDATES) => [
         label: i === 0 ? `v${v}  ${dim('(latest)')}` : `v${v}`,
         value: v,
       }));
+      const desc = BLOCK_CONFIG.client.framework.properties.frameworkVersion.desc;
+      console.log(bold(cyan(typeof desc === 'function' ? desc(fwValue(fw)) : desc)));
       const label = fwValue(fw) === 'Vite+React' ? '* Vite version:' : `* ${fwValue(fw)} version:`;
-      const navOpts = machine.navOptions(1, false);
+      const navOpts = machine.navOptions(BLOCK_CONFIG.client.framework.properties.frameworkVersion.absoluteStep);
       const idx = await arrowSelect(label, [
         ...versionChoices,
         ...navOpts.map(n => ({ label: n.label })),
@@ -68,8 +72,9 @@ const buildStepDefs = (IDE_CANDIDATES) => [
     name: 'clientState',
     run: async (machine, answers) => {
       stepHeader(3, 12);
+      console.log(bold(cyan(BLOCK_CONFIG.client.framework.properties.stateManagement.desc)));
       const opts = STATE_OPTIONS[fwValue(answers.clientFw)] || [];
-      return await selectOptional('State management:', opts, machine, 2, answers, BLOCKS.CLIENT);
+      return await selectOptional('State management:', opts, machine, BLOCK_CONFIG.client.framework.properties.stateManagement.absoluteStep, answers, BLOCKS.CLIENT);
     },
   },
 
@@ -78,8 +83,9 @@ const buildStepDefs = (IDE_CANDIDATES) => [
     name: 'clientUi',
     run: async (machine, answers) => {
       stepHeader(4, 12);
+      console.log(bold(cyan(BLOCK_CONFIG.client.framework.properties.uiLibrary.desc)));
       const opts = UI_OPTIONS[fwValue(answers.clientFw)] || [];
-      return await selectOptional('UI library:', opts, machine, 3, answers, BLOCKS.CLIENT);
+      return await selectOptional('UI library:', opts, machine, BLOCK_CONFIG.client.framework.properties.uiLibrary.absoluteStep, answers, BLOCKS.CLIENT);
     },
   },
 
@@ -88,7 +94,9 @@ const buildStepDefs = (IDE_CANDIDATES) => [
     name: 'clientStyle',
     run: async (machine, answers) => {
       stepHeader(5, 12);
-      return await selectOptional('Styling:', STYLING_OPTIONS, machine, 4, answers, BLOCKS.CLIENT);
+      const styleDesc = BLOCK_CONFIG.client.framework.properties.styling.desc;
+      console.log(bold(cyan(typeof styleDesc === 'function' ? styleDesc(fwValue(answers.clientFw)) : styleDesc)));
+      return await selectOptional('Styling:', STYLING_OPTIONS, machine, BLOCK_CONFIG.client.framework.properties.styling.absoluteStep, answers, BLOCKS.CLIENT);
     },
   },
 
@@ -101,7 +109,7 @@ const buildStepDefs = (IDE_CANDIDATES) => [
       if (!fw || !fw.integratedBackend) return false; // skip — not applicable
 
       separator();
-      console.log(`\n${bold(blue('Backend configuration'))}`);
+      console.log(`\n${bold('BACKEND CONFIGURATION')}`);
       console.log(dim(`  ${fwValue(fw)} supports server-side rendering and API routes.\n`));
       const confirmed = await arrowConfirm(`Use integrated backend (${fwValue(fw)} API routes/SSR) instead of a separate backend?`);
       if (confirmed) console.log(dim(`\n  Using ${fwValue(fw)} integrated backend. No separate backend needed.\n`));
@@ -109,6 +117,10 @@ const buildStepDefs = (IDE_CANDIDATES) => [
     },
   },
 
+  ];
+
+  const backendSteps = [
+
   // ── Step 6: Backend framework ────────────────────────────────────────────────
   {
     name: 'backendFw',
@@ -117,10 +129,11 @@ const buildStepDefs = (IDE_CANDIDATES) => [
       stepHeader(7, 12);
 
       separator();
-      console.log(`\n${bold(blue('Backend configuration'))}`);
+      console.log(`\n${bold('BACKEND CONFIGURATION')}`);
       console.log(dim('  You can skip the backend framework and decide later.\n'));
+      console.log(bold(yellow(BLOCK_CONFIG.backend.framework.desc)));
 
-      return await selectOptional('Backend framework:', BACKEND_FRAMEWORKS, machine, 6, answers, BLOCKS.BACKEND);
+      return await selectOptional('Backend framework:', BACKEND_FRAMEWORKS, machine, BLOCK_CONFIG.backend.framework.absoluteStep, answers, BLOCKS.BACKEND);
     },
   },
 
@@ -138,7 +151,7 @@ const buildStepDefs = (IDE_CANDIDATES) => [
         versions = cached;
       } else {
         const spinner = createSpinner('Fetching latest versions...');
-        versions = await fetchLatestVersions(fwValue(fwObj)) || FRAMEWORK_VERSION_FALLBACK[fwValue(fwObj)] || [];
+        versions = await fetchLatestVersions(fwValue(fwObj)) || BACKEND_FRAMEWORKS.find(f => f.value === fwValue(fwObj))?.versions?.filter(Boolean) || [];
         spinner.stop();
       }
       if (!versions.length) return null;
@@ -147,7 +160,9 @@ const buildStepDefs = (IDE_CANDIDATES) => [
         label: i === 0 ? `v${v}  ${dim('(latest)')}` : `v${v}`,
         value: v,
       }));
-      const navOpts = machine.navOptions(7, false);
+      const bvDesc = BLOCK_CONFIG.backend.framework.properties.frameworkVersion.desc;
+      console.log(bold(yellow(typeof bvDesc === 'function' ? bvDesc(fwValue(fwObj)) : bvDesc)));
+      const navOpts = machine.navOptions(BLOCK_CONFIG.backend.framework.properties.frameworkVersion.absoluteStep);
       const idx = await arrowSelect(`* ${fwValue(fwObj)} version:`, [
         ...vChoices,
         ...navOpts.map(n => ({ label: n.label })),
@@ -165,7 +180,8 @@ const buildStepDefs = (IDE_CANDIDATES) => [
     run: async (machine, answers) => {
       if (!answers.backendFw) return null;
       stepHeader(9, 12);
-      return await selectOptional('Database type:', DB_OPTIONS, machine, 8, answers, BLOCKS.BACKEND);
+      console.log(bold(yellow(BLOCK_CONFIG.backend.framework.properties.database.desc)));
+      return await selectOptional('Database type:', DB_OPTIONS, machine, BLOCK_CONFIG.backend.framework.properties.database.absoluteStep, answers, BLOCKS.BACKEND);
     },
   },
 
@@ -176,10 +192,12 @@ const buildStepDefs = (IDE_CANDIDATES) => [
       const { backendFw, backendDb } = answers;
       if (!backendFw || !backendDb) return null;
       stepHeader(10, 12);
+      const ormDesc = BLOCK_CONFIG.backend.framework.properties.orm.desc;
+      console.log(bold(yellow(typeof ormDesc === 'function' ? ormDesc(fwValue(answers.backendDb)) : ormDesc)));
       const byDb = ORM_OPTIONS_BY_DB[backendDb] || [];
       const byFw = ORM_OPTIONS[fwValue(backendFw)] || [];
       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, BLOCKS.BACKEND);
+      return await selectOptional('ORM / query layer:', ormChoices, machine, BLOCK_CONFIG.backend.framework.properties.orm.absoluteStep, answers, BLOCKS.BACKEND);
     },
   },
 
@@ -190,17 +208,22 @@ const buildStepDefs = (IDE_CANDIDATES) => [
       const { backendFw } = answers;
       if (!backendFw) return null;
       stepHeader(11, 12);
-      return await selectOptional('Auth strategy:', AUTH_OPTIONS[fwValue(backendFw)] || [], machine, 10, answers, BLOCKS.BACKEND);
+      console.log(bold(yellow(BLOCK_CONFIG.backend.framework.properties.auth.desc)));
+      return await selectOptional('Auth strategy:', AUTH_OPTIONS[fwValue(backendFw)] || [], machine, BLOCK_CONFIG.backend.framework.properties.auth.absoluteStep, answers, BLOCKS.BACKEND);
     },
   },
 
+  ];
+
+  const ideSteps = [
+
   // ── Step 11: IDE ─────────────────────────────────────────────────────────────
   {
     name: 'ideChoice',
     run: async (machine, answers) => {
       stepHeader(12, 12);
       separator();
-      console.log(`\n${bold(blue('Environment'))}`);
+      console.log(`\n${bold(red('ENVIRONMENT'))}`);
 
       const osName = { darwin: 'macOS', win32: 'Windows', linux: 'Linux' }[process.platform] || process.platform;
       console.log(`\n  ${dim('OS detected:')} ${bold(osName)}`);
@@ -241,7 +264,13 @@ const buildStepDefs = (IDE_CANDIDATES) => [
       }
     },
   },
-];
+  ];
+
+  return [
+    ...blockOrder.flatMap(b => b === 'client' ? clientSteps : backendSteps),
+    ...ideSteps,
+  ];
+};
 
 // ── Exports ───────────────────────────────────────────────────────────────────
 

package/lib/steps.js

@@ -47,11 +47,11 @@ class StepMachine {
 
   // Build the navigation options to append to a step's choices
   // stepIndex: current step (1-based)
-  // isFirstStep: true if this is step 2 (first real choice after project name)
-  navOptions(stepIndex, isFirstStep = false) {
+  // Build navigation options — back is suppressed at block entry points
+  navOptions(stepIndex) {
     const opts = [];
 
-    if (!isFirstStep) {
+    if (stepIndex !== this.blockEntries[0]) {
       opts.push({ label: '← Back to previous step', value: BACK });
     }
 
@@ -135,7 +135,7 @@ const runQuestions = async (stepDefs, machine) => {
       const popped = machine.pop();
       if (popped) delete answers[popped.stepName];
       // Block boundary checkpoint — fires when back-nav reaches a block entry point
-      if (machine.isBlockEntry(i)) {
+      if (machine.isBlockEntry(i) && i !== machine.blockEntries[0]) {
         const { arrowSelect } = require('./ui');
         const boundaryChoice = await arrowSelect('You\'ve reached the start of this block.', [
           { label: '→ Continue from here (re-answer this block)' },
@@ -162,11 +162,24 @@ const runQuestions = async (stepDefs, machine) => {
     if (result === CONTINUE) {
       // User chose to resume — skip forward to where they first pressed Back
       const resumeTarget = machine.resumeIndex ?? i + 1;
+      machine.restoreSnapshot();
+      Object.keys(answers).forEach(k => delete answers[k]);
+      machine.history.forEach(h => { answers[h.stepName] = h.answer; });
       machine.exitBackNav();
       i = resumeTarget;
       continue;
     }
 
+    // If in back-nav and step auto-skipped (null), keep going back
+    if (result === null && machine.inBackNav) {
+      if (i === 0) return RESTART;
+      i--;
+      while (i > 0 && !machine.history.find(h => h.stepIndex === i) && !machine.isBlockEntry(i)) i--;
+      const popped = machine.pop();
+      if (popped) delete answers[popped.stepName];
+      continue;
+    }
+
     // Normal answer — if re-answering during back-nav, exit back-nav mode
     if (machine.inBackNav) machine.exitBackNav();
 

package/lib/ui.js

@@ -73,7 +73,11 @@ const arrowSelect = async (message, choices, showBack = false, backLabel = '←
   return new Promise(resolve => {
     rl.question(`\n  Select (1-${allChoices.length}): `, ans => {
       const n = parseInt(ans) - 1;
-      resolve(!isNaN(n) && n >= 0 && n < allChoices.length ? n : 0);
+      const idx = !isNaN(n) && n >= 0 && n < allChoices.length ? n : 0;
+      const picked = allChoices[idx];
+      const pickedLabel = typeof picked === 'string' ? picked : picked.label;
+      process.stdout.write(`\r  Select (1-${allChoices.length}): ${pickedLabel}\n`);
+      resolve(idx);
     });
   });
 };
@@ -92,7 +96,18 @@ const arrowConfirm = async (message, initial = true) => {
     }, { onCancel: () => process.exit(0) });
     return res.value ?? initial;
   }
-  return initial;
+  // readline fallback for non-TTY
+  console.log(`  ${message}`);
+  console.log(`  ${dim('1.')} Yes`);
+  console.log(`  ${dim('2.')} No`);
+  return new Promise(resolve => {
+    rl.question(`\n  Select (1-2): `, ans => {
+      const n = parseInt(ans);
+      const result = n === 1 ? true : n === 2 ? false : initial;
+      console.log(dim(`  ${result ? 'Yes' : 'No'}`));
+      resolve(result);
+    });
+  });
 };
 
 // ── Layout helpers ────────────────────────────────────────────────────────────
@@ -201,8 +216,7 @@ const handleFreeText = async (prompt, items, stepMachine, stepIndex, context, is
 };
 
 const selectRequired = async (prompt, items, stepMachine, stepIndex, context = {}, block = null) => {
-  const isFirstStep = stepIndex <= 1;
-  const navOpts = stepMachine ? stepMachine.navOptions(stepIndex, isFirstStep) : [];
+  const navOpts = stepMachine ? stepMachine.navOptions(stepIndex) : [];
   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 })));
@@ -223,8 +237,7 @@ const selectRequired = 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 navOpts = stepMachine ? stepMachine.navOptions(stepIndex) : [];
   const choices = [
     ...items.map(i => ({ label: typeof i === 'string' ? i : i.label })),
     { label: dim('Skip (agent will propose when needed)') },

package/lib/validate.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { FRAMEWORK_REGISTRY, CLIENT_FRAMEWORKS, BACKEND_FRAMEWORKS, BLOCKS } = require('./data-config');
+const { CLIENT_FRAMEWORKS, BACKEND_FRAMEWORKS, BLOCKS } = require('./data-config');
 
 const ALL_FRAMEWORKS = [...CLIENT_FRAMEWORKS, ...BACKEND_FRAMEWORKS];
 
@@ -22,12 +22,11 @@ const fuzzyMatchFramework = (typed, block = null) => {
              : block === BLOCKS.BACKEND ? BACKEND_FRAMEWORKS
              : ALL_FRAMEWORKS;
   const lower = typed.toLowerCase().replace(/[^a-z0-9]/g, '');
-  const matchedNames = Object.keys(FRAMEWORK_REGISTRY).filter(name => {
-    const n = name.toLowerCase().replace(/[^a-z0-9]/g, '');
-    return pool.some(f => f.value === name) &&
-      (n.includes(lower) || lower.includes(n) || (lower.length >= 3 && n.startsWith(lower.slice(0, 3))));
+  const matchedNames = pool.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);
-  return matchedNames.map(name => pool.find(f => f.value === name) || { label: name, value: name });
+  return matchedNames;
 };
 
 // ── checkFrameworkExists ──────────────────────────────────────────────────────
@@ -35,9 +34,8 @@ const fuzzyMatchFramework = (typed, block = null) => {
 // Returns { exists: boolean, registry: string|null }
 
 const checkFrameworkExists = async (name) => {
-  const known = FRAMEWORK_REGISTRY[name];
-  if (known && known.package) return { exists: true, registry: known.registry };
-  if (known && !known.package) return { exists: true, registry: known.registry }; // Laravel/Rails - known but no package
+  const known = [...CLIENT_FRAMEWORKS, ...BACKEND_FRAMEWORKS].find(f => f.value === name);
+  if (known) return { exists: true, registry: known.registry };
 
   const https = require('https');
   const fetch = (url) => new Promise((resolve, reject) => {

package/package.json

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