multi-agents-cli 1.1.9 → 1.1.11

package/core/workflow/reset.js

@@ -17,7 +17,6 @@
 
 const fs           = require('fs');
 const path         = require('path');
-const readline     = require('readline');
 const { execSync } = require('child_process');
 
 let prompts = null;
@@ -69,6 +68,7 @@ const main = async () => {
 
   // ── Load config and tracking ─────────────────────────────────────────────────
 
+  const confirmed = process.argv.includes('--confirmed');
   const config   = fs.existsSync(CONFIG_PATH)   ? JSON.parse(fs.readFileSync(CONFIG_PATH,   'utf8')) : {};
   const tracking = fs.existsSync(TRACKING_PATH) ? JSON.parse(fs.readFileSync(TRACKING_PATH, 'utf8')) : {};
   const projectName = config.projectName || path.basename(ROOT);
@@ -79,7 +79,7 @@ const main = async () => {
   for (const scope of ['client', 'backend', 'shared']) {
     const agents = tracking[scope] || {};
     for (const [agent, data] of Object.entries(agents)) {
-      if (data && data.branch) {
+      if (data && data.branch && data.status !== 'COMPLETED') {
         activeAgents.push({ scope, agent, data });
       }
     }
@@ -89,11 +89,12 @@ const main = async () => {
 
   let remoteUrl = null;
   try {
-    remoteUrl = execSync('git remote get-url origin', { cwd: ROOT, encoding: 'utf8' }).trim();
+    remoteUrl = execSync('git remote get-url origin', { cwd: ROOT, encoding: 'utf8', stdio: 'pipe' }).trim();
   } catch {}
 
   // ── Display warning ───────────────────────────────────────────────────────────
 
+  if (!confirmed) {
   separator();
   console.log(`${red(bold('  ⚠ FULL PROJECT RESET'))}\n`);
   console.log(`  ${bold('This will permanently delete:')}\n`);
@@ -128,8 +129,7 @@ const main = async () => {
 
   // ── Step 1: First confirmation ────────────────────────────────────────────────
 
-  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-  const ask = (q) => new Promise((resolve) => rl.question(q, (a) => resolve(a.trim())));
+
 
   if (prompts && process.stdin.isTTY) {
     const step1 = await prompts({
@@ -146,13 +146,6 @@ const main = async () => {
       console.log(dim('\n  Reset cancelled.\n'));
       process.exit(0);
     }
-  } else {
-    const ans = await ask(`  ${bold('Are you sure?')} ${dim('(y/N)')}: `);
-    if (ans.toLowerCase() !== 'y') {
-      console.log(dim('\n  Reset cancelled.\n'));
-      rl.close();
-      process.exit(0);
-    }
   }
 
   // ── Step 2: Type project name ─────────────────────────────────────────────────
@@ -161,14 +154,20 @@ const main = async () => {
   console.log(`  ${yellow('To confirm, type the project name exactly:')}`);
   console.log(`  ${cyan(bold(projectName))}\n`);
 
-  const typed = await ask(`  ${bold('Project name')}: `);
-  rl.close();
+  const step2 = await prompts({
+    type:    'text',
+    name:    'value',
+    message: 'Project name',
+  }, { onCancel: () => process.exit(0) });
+  const typed = (step2.value || '').trim();
 
   if (typed !== projectName) {
     console.log(`\n${red('  ✗ Project name does not match. Reset cancelled.')}\n`);
     process.exit(1);
   }
 
+  } // end if (!confirmed)
+
   // ── Execute wipe ──────────────────────────────────────────────────────────────
 
   separator();
@@ -212,7 +211,7 @@ const main = async () => {
     }
   }
 
-  // Wipe project files (keep .git temporarily for branch ops above)
+  // Wipe project files (keep .git — git repo is infrastructure, not framework state)
   const keepList = ['.git'];
   const entries  = fs.readdirSync(ROOT);
   for (const entry of entries) {
@@ -223,18 +222,26 @@ const main = async () => {
   }
   console.log(`  ${green('✓')} Project files removed`);
 
-  // Remove .git
+
+  // ── Re-plant package.json ────────────────────────────────────────────
+
   try {
-    fs.rmSync(path.join(ROOT, '.git'), { recursive: true, force: true });
-    console.log(`  ${green('✓')} Git history removed`);
-  } catch {}
+    const freshPkg = {
+      name:    projectName.toLowerCase().replace(/\s+/g, '-'),
+      version: '1.0.0',
+      scripts: { init: 'multi-agents init' },
+    };
+    fs.writeFileSync(path.join(ROOT, 'package.json'), JSON.stringify(freshPkg, null, 2) + '\n', 'utf8');
+    console.log('  ' + green('\u2713') + ' package.json re-planted');
+  } catch { /* best-effort */ }
 
   // ── Post-wipe instructions ────────────────────────────────────────────────────
 
   separator();
   console.log(`${green(bold('  Project wiped successfully.'))}\n`);
-  console.log(`  To start fresh:\n`);
-  console.log(`  ${cyan(`cd .. && multi-agents init ${projectName}`)}\n`);
+  console.log(`  Run to start fresh:\n`);
+  console.log(`  ${cyan('npm run init')}
+`);
   separator();
 
   process.exit(0);

package/core/workflow/run.js

@@ -56,6 +56,9 @@ const copyWorkflow = (cliRoot) => {
 };
 
 const findCliRoot = () => {
+  // Local node_modules first (npx or local install)
+  const localPkg = path.join(__dirname, '..', 'node_modules', 'multi-agents-cli');
+  if (fs.existsSync(localPkg)) return localPkg;
   try {
     const globalPkg = execSync('npm root -g', { stdio: 'pipe', encoding: 'utf8' }).trim();
     const p = path.join(globalPkg, 'multi-agents-cli');

package/init.js

@@ -78,7 +78,7 @@ const projectArg  = isGlobalCLI ? args[1] : null;
 
 if (isReInit) {
   try {
-    const gitCommonDir = execSync('git rev-parse --git-common-dir', { encoding: 'utf8' }).trim();
+    const gitCommonDir = execSync('git rev-parse --git-common-dir', { encoding: 'utf8', stdio: 'pipe' }).trim();
     const repoRoot = path.resolve(gitCommonDir, '..');
     process.chdir(repoRoot);
   } catch { /* stay in current directory */ }
@@ -275,7 +275,7 @@ const main = async () => {
           ],
         }, { onCancel: () => process.exit(0) });
         if (confirm.value !== 'yes') { console.log(dim('\n  Cancelled.\n')); process.exit(0); }
-        const resetChild = spawn('node', [path.join(ROOT, '.workflow', 'reset.js')], { stdio: 'inherit', cwd: ROOT });
+        const resetChild = spawn('node', [path.join(ROOT, '.workflow', 'reset.js'), '--confirmed'], { stdio: 'inherit', cwd: ROOT });
         resetChild.on('exit', code => process.exit(code ?? 0));
         return;
       } else {

package/lib/questions-flow.js

@@ -2,7 +2,7 @@
 
 // ── Imports ───────────────────────────────────────────────────────────────────
 
-const { dim, bold, blue, green, cyan, separator, arrowSelect, arrowConfirm, selectRequired, selectOptional } = require('./ui');
+const { dim, bold, blue, green, cyan, separator, arrowSelect, arrowConfirm, selectRequired, selectOptional, stepHeader } = require('./ui');
 const { BACK, RESTART } = require('./steps');
 const {
   CLIENT_FRAMEWORKS, BACKEND_FRAMEWORKS, FRAMEWORK_VERSION_FALLBACK,
@@ -21,6 +21,7 @@ const buildStepDefs = (IDE_CANDIDATES) => [
   {
     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);
     },
@@ -30,6 +31,7 @@ const buildStepDefs = (IDE_CANDIDATES) => [
   {
     name: 'clientFwVersion',
     run: async (machine, answers) => {
+      stepHeader(2, 12);
       const fw = answers.clientFw;
       const versions = await fetchLatestVersions(fw.value) || FRAMEWORK_VERSION_FALLBACK[fw.value] || [];
       if (!versions.length) return null; // skip silently
@@ -56,6 +58,7 @@ const buildStepDefs = (IDE_CANDIDATES) => [
   {
     name: 'clientState',
     run: async (machine, answers) => {
+      stepHeader(3, 12);
       const opts = STATE_OPTIONS[answers.clientFw.value] || [];
       return await selectOptional('State management:', opts, machine, 2);
     },
@@ -65,6 +68,7 @@ const buildStepDefs = (IDE_CANDIDATES) => [
   {
     name: 'clientUi',
     run: async (machine, answers) => {
+      stepHeader(4, 12);
       const opts = UI_OPTIONS[answers.clientFw.value] || [];
       return await selectOptional('UI library:', opts, machine, 3);
     },
@@ -74,6 +78,7 @@ const buildStepDefs = (IDE_CANDIDATES) => [
   {
     name: 'clientStyle',
     run: async (machine, answers) => {
+      stepHeader(5, 12);
       return await selectOptional('Styling:', STYLING_OPTIONS, machine, 4);
     },
   },
@@ -82,6 +87,7 @@ const buildStepDefs = (IDE_CANDIDATES) => [
   {
     name: 'useIntegratedBackend',
     run: async (machine, answers) => {
+      stepHeader(6, 12);
       const fw = answers.clientFw;
       if (!fw.integratedBackend) return false; // skip — not applicable
 
@@ -98,6 +104,7 @@ const buildStepDefs = (IDE_CANDIDATES) => [
   {
     name: 'backendFwObj',
     run: async (machine, answers) => {
+      stepHeader(7, 12);
       if (answers.useIntegratedBackend) return null; // skip
 
       separator();
@@ -121,6 +128,7 @@ const buildStepDefs = (IDE_CANDIDATES) => [
   {
     name: 'backendFwVersion',
     run: async (machine, answers) => {
+      stepHeader(8, 12);
       const fwObj = answers.backendFwObj;
       if (!fwObj) return null; // skip — no backend selected
 
@@ -147,6 +155,7 @@ const buildStepDefs = (IDE_CANDIDATES) => [
   {
     name: 'backendDb',
     run: async (machine, answers) => {
+      stepHeader(9, 12);
       if (!answers.backendFwObj) return null;
       return await selectOptional('Database type:', DB_OPTIONS, machine, 8);
     },
@@ -156,6 +165,7 @@ const buildStepDefs = (IDE_CANDIDATES) => [
   {
     name: 'backendOrm',
     run: async (machine, answers) => {
+      stepHeader(10, 12);
       const { backendFwObj, backendDb } = answers;
       if (!backendFwObj || !backendDb) return null;
       const ormChoices = ORM_OPTIONS_BY_DB[backendDb] || ORM_OPTIONS[backendFwObj.value] || [];
@@ -167,6 +177,7 @@ 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);
@@ -177,6 +188,7 @@ const buildStepDefs = (IDE_CANDIDATES) => [
   {
     name: 'ideChoice',
     run: async (machine, answers) => {
+      stepHeader(12, 12);
       separator();
       console.log(`\n${bold(blue('Environment'))}`);
 
@@ -186,7 +198,6 @@ const buildStepDefs = (IDE_CANDIDATES) => [
 
       const ideOptions     = buildIDEOptions(IDE_CANDIDATES);
       const detectedIDEs   = ideOptions.filter(o => o.detected);
-      const undetectedIDEs = ideOptions.filter(o => !o.detected && o.cmd);
       const manualOption   = ideOptions.filter(o => !o.cmd);
       const sorted         = [...detectedIDEs, ...manualOption];
 

package/lib/steps.js

@@ -103,13 +103,25 @@ const runQuestions = async (stepDefs, machine) => {
     if (result === RESTART) return RESTART;
 
     if (result === BACK) {
-      if (i === 0) return RESTART; // nowhere to go back to from step 0
+      if (i === 0) return RESTART; // nowhere to go back from step 0
+      machine.enterBackNav(i);     // record where back-nav started
       const popped = machine.pop();
       if (popped) delete answers[popped.stepName];
       i--;
       continue;
     }
 
+    if (result === CONTINUE) {
+      // User chose to resume — skip forward to where they first pressed Back
+      const resumeTarget = machine.resumeIndex ?? i + 1;
+      machine.exitBackNav();
+      i = resumeTarget;
+      continue;
+    }
+
+    // Normal answer — if re-answering during back-nav, exit back-nav mode
+    if (machine.inBackNav) machine.exitBackNav();
+
     machine.push(i, def.name, result);
     answers[def.name] = result;
     i++;

package/lib/ui.js

@@ -109,6 +109,13 @@ const renderTrajectoryLines = (lines) => {
   });
 };
 
+// ── Step progress header ─────────────────────────────────────────────────────
+
+const stepHeader = (stepIndex, totalSteps) => {
+  console.log(`
+  ${dim(`Step ${stepIndex} of ${totalSteps}`)}`);
+};
+
 // ── Step selection helpers ────────────────────────────────────────────────────
 
 const { BACK, RESTART } = require('./steps');
@@ -150,6 +157,7 @@ const selectOptional = async (prompt, items, stepMachine, stepIndex) => {
 // ── Exports ───────────────────────────────────────────────────────────────────
 
 module.exports = {
+  stepHeader,
   c, bold, green, yellow, dim, cyan, blue, red,
   rl, ask,
   arrowSelect, arrowConfirm,

package/package.json

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