multi-agents-cli 1.1.61 → 1.1.63

package/core/workflow/agent.js

@@ -82,7 +82,15 @@ const red    = (s) => `${c.red}${s}${c.reset}`;
 
 // ── Paths ─────────────────────────────────────────────────────────────────────
 
-const ROOT        = path.join(__dirname, '..');
+const ROOT        = (() => {
+  try {
+    const common = execSync('git rev-parse --git-common-dir', { stdio: 'pipe' }).toString().trim();
+    return common.endsWith('/.git') ? common.slice(0, -5) : require('path').resolve(common, '..');
+  } catch {
+    console.error('  Not inside a git repository.\n');
+    process.exit(1);
+  }
+})();
 const CONFIG_PATH = path.join(ROOT, '.scaffold', '.config.json');
 const LOCK_PATH   = path.join(ROOT, '.scaffold', '.initialized');
 
@@ -1510,6 +1518,62 @@ Mark each step complete. Only proceed to the task below when all are checked.
     console.log(`  ${yellow('ℹ Remote setup required')} - agent will handle this first.\n`);
   }
 
+  // ── Defensive check: debris from prior failed launch ─────────────────────────
+
+  const agentBranchPrefix = `agent/${project}/${agent.toLowerCase()}/`;
+  let existingBranches = [];
+  try {
+    const branchOut = execSync(`git branch --list "${agentBranchPrefix}*"`, { cwd: ROOT, stdio: 'pipe' }).toString().trim();
+    existingBranches = branchOut ? branchOut.split('\n').map(b => b.trim()).filter(Boolean) : [];
+  } catch {}
+
+  const worktreeExists = fs.existsSync(worktreePath);
+
+  if (existingBranches.length > 0 || worktreeExists) {
+    console.log(`\n  ${yellow('⚠ Debris detected from a prior launch:')}\n`);
+    if (existingBranches.length > 0) {
+      existingBranches.forEach(b => console.log(`    ${dim('branch  :')} ${yellow(b)}`));
+    }
+    if (worktreeExists) {
+      console.log(`    ${dim('worktree:')} ${yellow(`worktrees/${worktreeName}`)}`);
+    }
+    console.log('');
+
+    const debrisIdx = await arrowSelect('How do you want to proceed?', [
+      { label: `${green('✓')} Clean up debris and continue` },
+      { label: `${yellow('→')} Skip cleanup and continue anyway` },
+      { label: `${red('✗')} Cancel` },
+    ], rl);
+
+    if (debrisIdx === 2) {
+      console.log(yellow('\n  Cancelled.\n'));
+      rl.close();
+      return;
+    }
+
+    if (debrisIdx === 0) {
+      // Remove worktree if it exists
+      if (worktreeExists) {
+        try {
+          execSync(`git worktree remove "${worktreePath}" --force`, { cwd: ROOT, stdio: 'pipe' });
+          console.log(`  ${green('✓')} Worktree removed`);
+        } catch (e) {
+          console.log(`  ${yellow('!')} Could not remove worktree - continuing`);
+        }
+      }
+      // Delete each stale branch
+      for (const staleBranch of existingBranches) {
+        try {
+          execSync(`git branch -D "${staleBranch}"`, { cwd: ROOT, stdio: 'pipe' });
+          console.log(`  ${green('✓')} Branch deleted: ${staleBranch}`);
+        } catch (e) {
+          console.log(`  ${yellow('!')} Could not delete branch ${staleBranch} - continuing`);
+        }
+      }
+      console.log('');
+    }
+  }
+
   // ── Create worktree ───────────────────────────────────────────────────────────
 
   try {

package/core/workflow/complete.js

@@ -37,7 +37,15 @@ const red    = (s) => `${c.red}${s}${c.reset}`;
 
 // ── Paths ─────────────────────────────────────────────────────────────────────
 
-const ROOT        = path.join(__dirname, '..');
+const ROOT        = (() => {
+  try {
+    const common = execSync('git rev-parse --git-common-dir', { stdio: 'pipe' }).toString().trim();
+    return common.endsWith('/.git') ? common.slice(0, -5) : require('path').resolve(common, '..');
+  } catch {
+    console.error('  Not inside a git repository.\n');
+    process.exit(1);
+  }
+})();
 const CONFIG_PATH = path.join(ROOT, '.scaffold', '.config.json');
 const LOCK_PATH   = path.join(ROOT, '.scaffold', '.initialized');
 

package/core/workflow/reset.js

@@ -24,7 +24,15 @@ try { prompts = require('prompts'); } catch { prompts = null; }
 
 // ── Self-relocate to repo root ────────────────────────────────────────────────
 
-const ROOT = path.join(__dirname, '..');
+const ROOT = (() => {
+  try {
+    const common = execSync('git rev-parse --git-common-dir', { stdio: 'pipe' }).toString().trim();
+    return common.endsWith('/.git') ? common.slice(0, -5) : require('path').resolve(common, '..');
+  } catch {
+    console.error('  Not inside a git repository.\n');
+    process.exit(1);
+  }
+})();
 
 // ── Colors ────────────────────────────────────────────────────────────────────
 

package/core/workflow/sync.js

@@ -17,7 +17,15 @@ const fs   = require('fs');
 const path = require('path');
 const { execSync } = require('child_process');
 
-const ROOT     = path.join(__dirname, '..');
+const ROOT     = (() => {
+  try {
+    const common = execSync('git rev-parse --git-common-dir', { stdio: 'pipe' }).toString().trim();
+    return common.endsWith('/.git') ? common.slice(0, -5) : require('path').resolve(common, '..');
+  } catch {
+    console.error('  Not inside a git repository.\n');
+    process.exit(1);
+  }
+})();
 const TRACKING = path.join(ROOT, '.scaffold', '.tracking.json');
 const BUILD    = path.join(ROOT, 'BUILD_STATE.md');
 

package/package.json

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