multi-agents-cli 1.0.60 → 1.0.62

package/core/workflow/agent.js

@@ -170,12 +170,13 @@ const openIDE = (worktreePath) => {
 };
 
 
-// ── Open new OS terminal with Claude Code CLI ─────────────────────────────────
+
+// ── Open new OS terminal with Claude Code CLI ───────────────────────────────
 
 const openTerminal = (worktreePath) => {
   try {
     if (process.platform === 'darwin') {
-      execSync(`osascript -e 'tell app "Terminal" to do script "cd \\"${worktreePath}\\" && claude"'`, { stdio: 'pipe' });
+      execSync(`osascript -e 'tell app "Terminal" to do script "cd \"${worktreePath}\" && claude"'`, { stdio: 'pipe' });
     } else if (process.platform === 'win32') {
       execSync(`start cmd /k "cd /d "${worktreePath}" && claude"`, { stdio: 'pipe' });
     } else {
@@ -185,8 +186,7 @@ const openTerminal = (worktreePath) => {
   } catch { return false; }
 };
 
-
-// ── Workspace tree display ────────────────────────────────────────────────────
+// ── Workspace tree display ──────────────────────────────────────────────────
 
 const displayWorkspaceTree = (worktreeName, worktreePath, project, agent, framework) => {
   const fwFile = framework ? framework.toLowerCase().replace(/[^a-z0-9]/g, '-') + '.md' : null;
@@ -1228,15 +1228,6 @@ Mark each step complete. Only proceed to the task below when all are checked.
   );
   console.log(`  ${green('✓')} .claude-scope written`);
 
-  // ── Write scope.json ─────────────────────────────────────────────────────────
-
-  fs.writeFileSync(
-    path.join(worktreePath, 'scope.json'),
-    JSON.stringify({ agent, scope: project, branch: branchName, policy: project }, null, 2),
-    'utf8'
-  );
-  console.log(`  ${green('✓')} scope.json written`);
-
   // ── Generate IDE settings ─────────────────────────────────────────────────────
 
   const excludedFolders = {
@@ -1389,16 +1380,17 @@ ${excludedUrls}
     }
   }
 
-  // ── Session start selection ──────────────────────────────────────────────────
+  // ── Session start selection ─────────────────────────────────────────────────
 
   separator();
   console.log(`\n${bold('  Workspace is set up and ready.')}\n`);
 
+  sessionLoop: while (true) {
   const sessionIdx = await arrowSelect('How would you like to start the session?', [
     { label: `${green('→')} IDE + new terminal ${dim('(Claude Code CLI)')}  ${dim('← recommended')}` },
     { label: `${green('→')} IDE only` },
     { label: `${green('→')} Claude Code CLI only ${dim('(new terminal)')}` },
-    { label: `${dim('?')} I\'ll continue from here, where do I start?` },
+    { label: `${dim('?')} I'll continue from here, where do I start?` },
   ], rl);
 
   if (sessionIdx === 0) {
@@ -1410,6 +1402,7 @@ ${excludedUrls}
     else console.log(`  ${yellow('!')} Could not open terminal - run ${cyan('claude')} manually in: ${dim(worktreePath)}`);
     separator();
     console.log(`\n  ${dim('When the agent is done, run:')} ${cyan('npm run complete')}\n`);
+    break sessionLoop;
 
   } else if (sessionIdx === 1) {
     const openedIDE = openIDE(worktreePath);
@@ -1418,6 +1411,7 @@ ${excludedUrls}
     separator();
     console.log(`\n  ${dim('Open a NEW Claude Code session and type')} ${cyan('go')} ${dim('to start.')}\n`);
     console.log(`  ${dim('When done, run:')} ${cyan('npm run complete')}\n`);
+    break sessionLoop;
 
   } else if (sessionIdx === 2) {
     const termOpened = openTerminal(worktreePath);
@@ -1425,6 +1419,7 @@ ${excludedUrls}
     else console.log(`  ${yellow('!')} Could not open terminal - run ${cyan('claude')} manually in: ${dim(worktreePath)}`);
     separator();
     console.log(`\n  ${dim('When the agent is done, run:')} ${cyan('npm run complete')}\n`);
+    break sessionLoop;
 
   } else {
     separator();
@@ -1432,8 +1427,11 @@ ${excludedUrls}
       { label: 'View instructions' },
       { label: 'View folder structure' },
       { label: 'View available agents' },
+      { label: `${dim('←')} Back to session options` },
     ], rl);
 
+    if (subIdx === 3) { continue sessionLoop; }
+
     if (subIdx === 0) {
       separator();
       console.log(`\n  ${bold('How to start your agent session:')}\n`);
@@ -1443,12 +1441,20 @@ ${excludedUrls}
       console.log(dim('     Do NOT reuse a previous session.\n'));
       console.log(`  ${bold('3.')} Let the agent run autonomously\n`);
       console.log(`  ${bold('4.')} When done, run: ${cyan('npm run complete')} to merge into main\n`);
+      separator();
+      console.log('');
+      await arrowSelect('Press enter to continue', [{ label: 'OK, got it' }], rl);
+      continue sessionLoop;
 
     } else if (subIdx === 1) {
       const framework = config.client?.framework || config.backend?.framework || '';
       displayWorkspaceTree(worktreeName, worktreePath, project, agent, framework);
+      separator();
+      console.log('');
+      await arrowSelect('Press enter to continue', [{ label: 'OK, got it' }], rl);
+      continue sessionLoop;
 
-    } else {
+    } else if (subIdx === 2) {
       const allAgents = AGENTS[project] || [];
       const completed = buildEntries.filter(e => e.scope === project && e.status === 'COMPLETED').map(e => e.agent);
       separator();
@@ -1461,72 +1467,99 @@ ${excludedUrls}
         console.log(`  ${icon}  ${label}`);
       });
       console.log('');
+      separator();
+      console.log('');
+      await arrowSelect('Press enter to continue', [{ label: 'OK, got it' }], rl);
+      continue sessionLoop;
     }
   }
+  } // end sessionLoop
+  // ── Session start selection ─────────────────────────────────────────────────
 
   separator();
-  console.log('');
-  rl.close();
-  // ── Ready to open workspace? ──────────────────────────────────────────────────
-
-  separator();
-  console.log(`\n${bold('  Workspace is set up and ready.')}`);
-  console.log(dim(`  Worktree: worktrees/${worktreeName}\n`));
-  console.log(`  ${yellow('⚠')}  ${bold('Once your IDE opens and is ready, open a NEW session in Claude Code CLI or Claude Code Extension - and type go or start to initiate')}`);
-  console.log(dim('     Do NOT reuse a previous session - the agent needs a clean context.'));
+  console.log(`\n${bold('  Workspace is set up and ready.')}\n`);
 
-  const openNow = await arrowConfirm('Open workspace now?', rl);
+  const sessionIdx = await arrowSelect('How would you like to start the session?', [
+    { label: `${green('→')} IDE + new terminal ${dim('(Claude Code CLI)')}  ${dim('← recommended')}` },
+    { label: `${green('→')} IDE only` },
+    { label: `${green('→')} Claude Code CLI only ${dim('(new terminal)')}` },
+    { label: `${dim('?')} I'll continue from here, where do I start?` },
+  ], rl);
 
-  if (!openNow) {
-    console.clear();
+  if (sessionIdx === 0) {
+    const openedIDE = openIDE(worktreePath);
+    if (openedIDE) console.log(`  ${green('✓')} ${openedIDE} opened`);
+    else console.log(`  ${yellow('!')} Could not open IDE - open manually at: ${dim(worktreePath)}`);
+    const termOpened = openTerminal(worktreePath);
+    if (termOpened) console.log(`  ${green('✓')} New terminal opened with Claude Code CLI`);
+    else console.log(`  ${yellow('!')} Could not open terminal - run ${cyan('claude')} manually in: ${dim(worktreePath)}`);
     separator();
-    console.log(`\n${bold(yellow('  Workspace saved - resume when ready:'))}\n`);
-    console.log(`  ${bold('1.')} Open your IDE at:`);
-    console.log(`     ${cyan(worktreePath)}\n`);
-    console.log(`  ${bold('2.')} Open a ${bold('NEW')} session in Claude Code CLI or Claude Code Extension - and type go or start to initiate`);
-    console.log(dim('     Do NOT reuse a previous session.\n'));
-    console.log(`  ${bold('3.')} Start the session and let the agent run.\n`);
+    console.log(`\n  ${dim('When the agent is done, run:')} ${cyan('npm run complete')}\n`);
+
+  } else if (sessionIdx === 1) {
+    const openedIDE = openIDE(worktreePath);
+    if (openedIDE) console.log(`  ${green('✓')} ${openedIDE} opened`);
+    else console.log(`  ${yellow('!')} Could not open IDE - open manually at: ${dim(worktreePath)}`);
     separator();
-    console.log('');
-    rl.close();
-    return;
-  }
+    console.log(`\n  ${dim('Open a NEW Claude Code session and type')} ${cyan('go')} ${dim('to start.')}\n`);
+    console.log(`  ${dim('When done, run:')} ${cyan('npm run complete')}\n`);
 
-  // ── Open IDE ──────────────────────────────────────────────────────────────────
+  } else if (sessionIdx === 2) {
+    const termOpened = openTerminal(worktreePath);
+    if (termOpened) console.log(`  ${green('✓')} New terminal opened with Claude Code CLI`);
+    else console.log(`  ${yellow('!')} Could not open terminal - run ${cyan('claude')} manually in: ${dim(worktreePath)}`);
+    separator();
+    console.log(`\n  ${dim('When the agent is done, run:')} ${cyan('npm run complete')}\n`);
 
-  const openedIDE = openIDE(worktreePath);
-  if (openedIDE) {
-    console.log(`  ${green('✓')} ${openedIDE} opened at worktrees/${worktreeName}`);
   } else {
-    console.log(`  ${yellow('!')} Could not open IDE automatically.`);
-    console.log(dim(`     Open manually at: ${worktreePath}`));
-  }
-
-  // ── Launch Claude Code CLI ──────────────────────────────────────────────────
+    separator();
+    const subIdx = await arrowSelect('What would you like to view?', [
+      { label: 'View instructions' },
+      { label: 'View folder structure' },
+      { label: 'View available agents' },
+    ], rl);
 
-  let claudeLaunched = false;
-  try {
-    const { spawn: sp } = require('child_process');
-    const claudeProc = sp('claude', [], { cwd: worktreePath, stdio: 'inherit', detached: false });
-    claudeProc.on('error', () => {});
-    claudeLaunched = true;
-  } catch {}
+    if (subIdx === 0) {
+      separator();
+      console.log(`\n  ${bold('How to start your agent session:')}\n`);
+      console.log(`  ${bold('1.')} Open your IDE at:`);
+      console.log(`     ${cyan(worktreePath)}\n`);
+      console.log(`  ${bold('2.')} Open a NEW Claude Code session and type ${cyan('go')} to start`);
+      console.log(dim('     Do NOT reuse a previous session.\n'));
+      console.log(`  ${bold('3.')} Let the agent run autonomously\n`);
+      console.log(`  ${bold('4.')} When done, run: ${cyan('npm run complete')} to merge into main\n`);
+      separator();
+      console.log('');
+      await arrowSelect('Press enter to continue', [{ label: 'OK, got it' }], rl);
 
-  if (claudeLaunched) { rl.close(); return; }
+    } else if (subIdx === 1) {
+      const framework = config.client?.framework || config.backend?.framework || '';
+      displayWorkspaceTree(worktreeName, worktreePath, project, agent, framework);
+      separator();
+      console.log('');
+      await arrowSelect('Press enter to continue', [{ label: 'OK, got it' }], rl);
 
-  // ── Next steps ────────────────────────────────────────────────────────────────
+    } else {
+      const allAgents = AGENTS[project] || [];
+      const completed = buildEntries.filter(e => e.scope === project && e.status === 'COMPLETED').map(e => e.agent);
+      separator();
+      console.log(`\n  ${bold('Available agents for ' + project + ':')}\n`);
+      allAgents.forEach(a => {
+        const done    = completed.includes(a);
+        const current = a === agent;
+        const icon    = current ? cyan('→') : done ? green('✓') : dim('·');
+        const label   = current ? bold(cyan(a)) : done ? dim(a + ' (completed)') : a;
+        console.log(`  ${icon}  ${label}`);
+      });
+      console.log('');
+      separator();
+      console.log('');
+      await arrowSelect('Press enter to continue', [{ label: 'OK, got it' }], rl);
+    }
+  }
 
-  separator();
-  console.log(`\n${bold(green('  Workspace ready!'))}\n`);
-  console.log(`  ${bold('1.')} Your IDE should be open at: ${cyan(`worktrees/${worktreeName}`)}`);
-  console.log(dim('     If not, open it manually at the path above.\n'));
-  console.log(`  ${bold('2.')} ${bold(yellow('Open a NEW session in Claude Code CLI or Claude Code Extension - and type go or start to initiate'))}`);
-  console.log(dim('     Do NOT reuse a previous session.\n'));
-  console.log(`  ${bold('3.')} Start the session and let the agent run.\n`);
-  console.log(`  ${bold('4.')} When the agent is done, run: ${cyan('npm run complete')} to merge the task into main.\n`);
   separator();
   console.log('');
-
   rl.close();
 };
 

package/package.json

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