multi-agents-cli 1.1.77 → 1.1.79

package/init.js

@@ -38,6 +38,8 @@ const {
   ORM_OPTIONS,
   AUTH_OPTIONS,
   IDE_CANDIDATES,
+  BLOCK_CONFIG,
+  INTENT_MAP,
 } = require('./lib/data-config');
 
 const {
@@ -62,7 +64,7 @@ const {
 } = require('./lib/summary');
 
 const { StepMachine, BACK, CONTINUE, RESTART, runQuestions } = require('./lib/steps');
-const { buildStepDefs } = require('./lib/questions-flow');
+const { buildStepDefs, fwValue } = require('./lib/questions-flow');
 
 // ── Prompts ───────────────────────────────────────────────────────────────────
 
@@ -373,6 +375,41 @@ const main = async () => {
   steps.push(0, 'Project name', projectName);
   separator();
 
+  // ── Intent selection ────────────────────────────────────────────────────────
+  rl.pause();
+  const intentChoices = Object.entries(INTENT_MAP).map(([k, v]) => ({ label: v.label, value: k }));
+  const intentIdx = await arrowSelect('What would you like to build?', intentChoices);
+  const intentKey = intentChoices[intentIdx].value;
+  const intent    = INTENT_MAP[intentKey];
+
+  // Secondary prompt for fullstack order
+  let blockOrder = intent.blocks;
+  if (intentKey === 'fullstack') {
+    const orderIdx = await arrowSelect('Full-stack order?', [
+      { label: 'Client first, then backend' },
+      { label: 'Backend first, then client' },
+    ]);
+    blockOrder = orderIdx === 0 ? ['client', 'backend'] : ['backend', 'client'];
+  }
+
+  // Activate blocks and resolve absolute step indices
+  let absoluteStep = 0;
+  const blockEntries = [];
+  for (const blockKey of blockOrder) {
+    const block = BLOCK_CONFIG[blockKey];
+    block.isActive = true;
+    let isFirstSeg = true;
+    for (const [segKey, seg] of Object.entries(block)) {
+      if (segKey === 'isActive' || typeof seg !== 'object' || !('step' in seg)) continue;
+      seg.absoluteStep = absoluteStep;
+      if (isFirstSeg) { blockEntries.push(absoluteStep); isFirstSeg = false; }
+      absoluteStep++;
+    }
+  }
+  steps.blockEntries = blockEntries;
+
+  separator();
+
   // Run all question steps with back-nav support
   const answers = await runQuestions(stepDefs, steps);
   if (answers === RESTART) {
@@ -389,8 +426,8 @@ const main = async () => {
   const clientUi             = answers.clientUi || null;
   const clientStyle          = answers.clientStyle || null;
   const useIntegratedBackend = answers.useIntegratedBackend || false;
-  const backendFwObj         = answers.backendFwObj || null;
-  const backendFw            = backendFwObj ? backendFwObj.value    : null;
+  const backendFwObj         = answers.backendFw || null;
+  const backendFw            = backendFwObj ? fwValue(backendFwObj)    : null;
   const backendLang          = backendFwObj ? backendFwObj.language : null;
   const backendOrm           = answers.backendOrm || null;
   const backendAuth          = answers.backendAuth || null;
@@ -410,12 +447,12 @@ const main = async () => {
 
   console.log(`\n${bold('Review your configuration:')}\n`);
   summaryLine('Project',           projectName);
-  summaryLine('Client framework',  clientFw.value);
+  summaryLine('Client framework',  fwValue(clientFw));
   summaryLine('Client language',   clientLang);
   summaryLine('State management',  clientState);
   summaryLine('UI library',        clientUi);
   summaryLine('Styling',           clientStyle);
-  summaryLine('Backend type',      backendType === 'integrated' ? `${clientFw.value} integrated` : backendFw || '(skipped)');
+  summaryLine('Backend type',      backendType === 'integrated' ? `${fwValue(clientFw)} integrated` : backendFw || '(skipped)');
   if (backendType !== 'integrated') {
     summaryLine('Backend language',  backendLang);
     summaryLine('ORM',               backendOrm);
@@ -494,7 +531,7 @@ const main = async () => {
 
   writeConfig(path.join(ROOT, 'client', 'CLAUDE.md'), {
     PROJECT_NAME:      projectName,
-    FRAMEWORK:         clientFw.value,
+    FRAMEWORK:         fwValue(clientFw),
     FRAMEWORK_VERSION: clientFwVersion || '',
     LANGUAGE:          clientLang,
     STATE:             clientState,
@@ -508,7 +545,7 @@ const main = async () => {
     const scaffoldConfig = {
       projectName,
       client: {
-        framework:        clientFw.value,
+        framework:        fwValue(clientFw),
         frameworkVersion: clientFwVersion || '',
         language:         clientLang,
         state:            clientState,
@@ -574,7 +611,7 @@ const main = async () => {
       linuxPaths: ideChoice.linux?.paths || [],
     },
     client: {
-      framework: clientFw.value,
+      framework: fwValue(clientFw),
       language:  clientLang,
       state:     clientState,
       uiLibrary: clientUi,
@@ -637,10 +674,10 @@ const main = async () => {
   // ── BUILD_STATE.md ────────────────────────────────────────────────────────────
 
   const backendDisplay = backendType === 'integrated'
-    ? `${clientFw.value} integrated (API routes/SSR)`
+    ? `${fwValue(clientFw)} integrated (API routes/SSR)`
     : backendFw || 'Not configured';
 
-  const clientStack = [clientFw.value, clientLang, clientStyle, clientUi, clientState].filter(Boolean).join(' + ');
+  const clientStack = [fwValue(clientFw), clientLang, clientStyle, clientUi, clientState].filter(Boolean).join(' + ');
   const backendStack = backendType === 'separate'
     ? [backendFw, backendLang, backendOrm, backendAuth].filter(Boolean).join(' + ')
     : backendDisplay;
@@ -668,7 +705,7 @@ Backend : ${backendStack}
 
 ## Backend State
 ${backendType === 'integrated'
-  ? `Type: ${clientFw.value} integrated backend (API routes / SSR)
+  ? `Type: ${fwValue(clientFw)} integrated backend (API routes / SSR)
 - [ ] API routes - server-side endpoints
 - [ ] Auth - authentication strategy
 - [ ] DB - data layer if needed`

package/lib/data-config.js

@@ -258,8 +258,37 @@ const BLOCKS = {
   SHARED:  'shared',
 };
 
+// ── Block config ─────────────────────────────────────────────────────────────
+
+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 },
+  },
+  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 },
+  },
+};
+
+// ── Intent map ────────────────────────────────────────────────────────────────
+
+const INTENT_MAP = {
+  fullstack: { label: 'Full-stack',    blocks: ['client', 'backend'], order: null },
+  frontend:  { label: 'Frontend only', blocks: ['client'],            order: null },
+  backend:   { label: 'Backend only',  blocks: ['backend'],           order: null },
+};
+
 module.exports = {
   BLOCKS,
+  BLOCK_CONFIG,
+  INTENT_MAP,
   FRAMEWORK_CONVENTIONS,
   CLIENT_FRAMEWORKS,
   BACKEND_FRAMEWORKS,

package/lib/questions-flow.js

@@ -16,6 +16,8 @@ const { buildIDEOptions, verifyIDE, detectTerminal } = require('./detect');
 // Each def: { name: string, run: async (machine, answers) => value | BACK | RESTART }
 // Conditional steps return their skip-value immediately when not applicable.
 
+const fwValue = (fw) => fw && typeof fw === 'object' ? fw.value : (typeof fw === 'string' && fw.length > 0 ? fw : '__custom__');
+
 const buildStepDefs = (IDE_CANDIDATES) => [
 
   // ── Step 0: Client framework ────────────────────────────────────────────────
@@ -34,7 +36,7 @@ const buildStepDefs = (IDE_CANDIDATES) => [
     run: async (machine, answers) => {
       stepHeader(2, 12);
       const fw = answers.clientFw;
-      const versions = await fetchLatestVersions(fw.value) || FRAMEWORK_VERSION_FALLBACK[fw.value] || [];
+      const versions = await fetchLatestVersions(fwValue(fw)) || FRAMEWORK_VERSION_FALLBACK[fwValue(fw)] || [];
       if (!versions.length) return null; // skip silently
 
       console.log(dim('  Fetching latest versions...'));
@@ -42,7 +44,7 @@ const buildStepDefs = (IDE_CANDIDATES) => [
         label: i === 0 ? `v${v}  ${dim('(latest)')}` : `v${v}`,
         value: v,
       }));
-      const label = fw.value === 'Vite+React' ? '* Vite version:' : `* ${fw.value} version:`;
+      const label = fwValue(fw) === 'Vite+React' ? '* Vite version:' : `* ${fwValue(fw)} version:`;
       const navOpts = machine.navOptions(1, false);
       const idx = await arrowSelect(label, [
         ...versionChoices,
@@ -60,7 +62,7 @@ const buildStepDefs = (IDE_CANDIDATES) => [
     name: 'clientState',
     run: async (machine, answers) => {
       stepHeader(3, 12);
-      const opts = STATE_OPTIONS[answers.clientFw.value] || [];
+      const opts = STATE_OPTIONS[fwValue(answers.clientFw)] || [];
       return await selectOptional('State management:', opts, machine, 2, answers, BLOCKS.CLIENT);
     },
   },
@@ -70,7 +72,7 @@ const buildStepDefs = (IDE_CANDIDATES) => [
     name: 'clientUi',
     run: async (machine, answers) => {
       stepHeader(4, 12);
-      const opts = UI_OPTIONS[answers.clientFw.value] || [];
+      const opts = UI_OPTIONS[fwValue(answers.clientFw)] || [];
       return await selectOptional('UI library:', opts, machine, 3, answers, BLOCKS.CLIENT);
     },
   },
@@ -90,20 +92,20 @@ const buildStepDefs = (IDE_CANDIDATES) => [
     run: async (machine, answers) => {
       stepHeader(6, 12);
       const fw = answers.clientFw;
-      if (!fw.integratedBackend) return false; // skip — not applicable
+      if (!fw || !fw.integratedBackend) return false; // skip — not applicable
 
       separator();
       console.log(`\n${bold(blue('Backend configuration'))}`);
-      console.log(dim(`  ${fw.value} supports server-side rendering and API routes.\n`));
-      const confirmed = await arrowConfirm(`Use integrated backend (${fw.value} API routes/SSR) instead of a separate backend?`);
-      if (confirmed) console.log(dim(`\n  Using ${fw.value} integrated backend. No separate backend needed.\n`));
+      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`));
       return confirmed;
     },
   },
 
   // ── Step 6: Backend framework ────────────────────────────────────────────────
   {
-    name: 'backendFwObj',
+    name: 'backendFw',
     run: async (machine, answers) => {
       stepHeader(7, 12);
       if (answers.useIntegratedBackend) return null; // skip
@@ -112,16 +114,7 @@ const buildStepDefs = (IDE_CANDIDATES) => [
       console.log(`\n${bold(blue('Backend configuration'))}`);
       console.log(dim('  You can skip the backend framework and decide later.\n'));
 
-      const choices = [
-        ...BACKEND_FRAMEWORKS.map(f => ({ label: f.label || f.value })),
-        { label: dim('Skip (decide later)') },
-      ];
-      const idx = await arrowSelect('Backend framework:', choices);
-
-      // Back nav
-      if (idx >= BACKEND_FRAMEWORKS.length + 1) return BACK;
-
-      return idx === BACKEND_FRAMEWORKS.length ? null : BACKEND_FRAMEWORKS[idx];
+      return await selectOptional('Backend framework:', BACKEND_FRAMEWORKS, machine, 6, answers, BLOCKS.BACKEND);
     },
   },
 
@@ -130,10 +123,10 @@ const buildStepDefs = (IDE_CANDIDATES) => [
     name: 'backendFwVersion',
     run: async (machine, answers) => {
       stepHeader(8, 12);
-      const fwObj = answers.backendFwObj;
+      const fwObj = answers.backendFw;
       if (!fwObj) return null; // skip — no backend selected
 
-      const versions = await fetchLatestVersions(fwObj.value) || FRAMEWORK_VERSION_FALLBACK[fwObj.value] || [];
+      const versions = await fetchLatestVersions(fwValue(fwObj)) || FRAMEWORK_VERSION_FALLBACK[fwValue(fwObj)] || [];
       if (!versions.length) return null;
 
       const vChoices = versions.map((v, i) => ({
@@ -141,7 +134,7 @@ const buildStepDefs = (IDE_CANDIDATES) => [
         value: v,
       }));
       const navOpts = machine.navOptions(7, false);
-      const idx = await arrowSelect(`* ${fwObj.value} version:`, [
+      const idx = await arrowSelect(`* ${fwValue(fwObj)} version:`, [
         ...vChoices,
         ...navOpts.map(n => ({ label: n.label })),
       ]);
@@ -157,7 +150,7 @@ const buildStepDefs = (IDE_CANDIDATES) => [
     name: 'backendDb',
     run: async (machine, answers) => {
       stepHeader(9, 12);
-      if (!answers.backendFwObj) return null;
+      if (!answers.backendFw) return null;
       return await selectOptional('Database type:', DB_OPTIONS, machine, 8, answers, BLOCKS.BACKEND);
     },
   },
@@ -167,10 +160,10 @@ const buildStepDefs = (IDE_CANDIDATES) => [
     name: 'backendOrm',
     run: async (machine, answers) => {
       stepHeader(10, 12);
-      const { backendFwObj, backendDb } = answers;
-      if (!backendFwObj || !backendDb) return null;
+      const { backendFw, backendDb } = answers;
+      if (!backendFw || !backendDb) return null;
       const byDb = ORM_OPTIONS_BY_DB[backendDb] || [];
-      const byFw = ORM_OPTIONS[backendFwObj.value] || [];
+      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);
     },
@@ -181,9 +174,9 @@ const buildStepDefs = (IDE_CANDIDATES) => [
     name: 'backendAuth',
     run: async (machine, answers) => {
       stepHeader(11, 12);
-      const { backendFwObj } = answers;
-      if (!backendFwObj) return null;
-      return await selectOptional('Auth strategy:', AUTH_OPTIONS[backendFwObj.value] || [], machine, 10, answers, BLOCKS.BACKEND);
+      const { backendFw } = answers;
+      if (!backendFw) return null;
+      return await selectOptional('Auth strategy:', AUTH_OPTIONS[fwValue(backendFw)] || [], machine, 10, answers, BLOCKS.BACKEND);
     },
   },
 
@@ -238,4 +231,4 @@ const buildStepDefs = (IDE_CANDIDATES) => [
 
 // ── Exports ───────────────────────────────────────────────────────────────────
 
-module.exports = { buildStepDefs };
+module.exports = { buildStepDefs, fwValue };

package/lib/steps.js

@@ -10,10 +10,12 @@ const SHOW_LIST = Symbol('SHOW_LIST');
 // ── Step machine ──────────────────────────────────────────────────────────────
 
 class StepMachine {
-  constructor() {
+  constructor(blockEntries = []) {
     this.history      = []; // [{ stepIndex, stepName, answer }]
     this.inBackNav    = false;
     this.resumeIndex  = null; // step index where back-nav started
+    this.blockEntries = blockEntries; // absolute step indices that are block entry points
+    this.snapshot     = null; // history snapshot taken at back-nav start
   }
 
   // Push a completed step answer onto the history stack
@@ -63,11 +65,30 @@ class StepMachine {
     return opts;
   }
 
+  // Take a snapshot of current history + answers (for ignore-changes restore)
+  snapshotHistory() {
+    this.snapshot = this.history.map(h => ({ ...h }));
+  }
+
+  // Restore history from snapshot
+  restoreSnapshot() {
+    if (this.snapshot) {
+      this.history  = this.snapshot.map(h => ({ ...h }));
+      this.snapshot = null;
+    }
+  }
+
+  // Check if a step index is a block entry point
+  isBlockEntry(stepIndex) {
+    return this.blockEntries.includes(stepIndex);
+  }
+
   // Enter back-nav mode — record where the user first pressed Back
   enterBackNav(currentStepIndex) {
     if (!this.inBackNav) {
       this.inBackNav   = true;
       this.resumeIndex = currentStepIndex;
+      this.snapshotHistory();
     }
   }
 
@@ -82,6 +103,7 @@ class StepMachine {
     this.history     = [];
     this.inBackNav   = false;
     this.resumeIndex = null;
+    this.snapshot    = null;
   }
 }
 
@@ -106,9 +128,34 @@ const runQuestions = async (stepDefs, machine) => {
     if (result === BACK) {
       if (i === 0) return RESTART; // nowhere to go back from step 0
       machine.enterBackNav(i);     // record where back-nav started
+      i--;
+      // Skip back over auto-skipped steps (not in history), stop at block entry
+      while (i > 0 && !machine.history.find(h => h.stepIndex === i) && !machine.isBlockEntry(i)) i--;
+      // Pop the step we landed on
       const popped = machine.pop();
       if (popped) delete answers[popped.stepName];
-      i--;
+      // Block boundary checkpoint — fires when back-nav reaches a block entry point
+      if (machine.isBlockEntry(i)) {
+        const { arrowSelect } = require('./ui');
+        const boundaryChoice = await arrowSelect('You\'ve reached the start of this block.', [
+          { label: '→ Continue from here (re-answer this block)' },
+          { label: '→ Ignore changes (restore to where you started)' },
+          { label: '← Restart configuration' },
+        ]);
+        if (boundaryChoice === 1) {
+          const resumeTarget = machine.resumeIndex;
+          machine.restoreSnapshot();
+          Object.keys(answers).forEach(k => delete answers[k]);
+          machine.history.forEach(h => { answers[h.stepName] = h.answer; });
+          machine.exitBackNav();
+          const entryStep = machine.blockEntries.find(e => e <= i) ?? 0;
+          i = resumeTarget != null ? resumeTarget : entryStep + 1;
+
+        } else if (boundaryChoice === 2) {
+          return RESTART;
+        }
+        // 'continue' — just proceed from current block entry step
+      }
       continue;
     }
 

package/lib/ui.js

@@ -131,7 +131,7 @@ const NONE_LABEL = '→ None of these - I\'ll specify my own';
 const handleFreeText = async (prompt, items, stepMachine, stepIndex, context, isOptional, block = null) => {
   let typed = '';
   while (!typed) {
-    const _res = await prompts({ type: 'text', name: 'value', message: block ? `Type a ${block} framework:` : 'Type your own value:' }, { onCancel: () => process.exit(0) });
+    const _res = await prompts({ type: 'text', name: 'value', message: prompt.replace(':', '').replace('*', '').trim() + ':' }, { onCancel: () => process.exit(0) });
     typed = (_res.value || '').trim();
     if (!typed && isOptional) return null;
     if (!typed) console.log(dim('  Please enter a value.'));

package/package.json

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