sequant 1.10.0 → 1.10.1

package/dist/src/commands/run.js

@@ -107,8 +107,9 @@ export function getWorktreeChangedFiles(worktreePath) {
 /**
  * Create or reuse a worktree for an issue
  * @param baseBranch - Optional branch to use as base instead of origin/main (for chain mode)
+ * @param chainMode - If true and branch exists, rebase onto baseBranch instead of using as-is
  */
-async function ensureWorktree(issueNumber, title, verbose, packageManager, baseBranch) {
+async function ensureWorktree(issueNumber, title, verbose, packageManager, baseBranch, chainMode) {
     const gitRoot = getGitRoot();
     if (!gitRoot) {
         console.log(chalk.red("    ❌ Not in a git repository"));
@@ -129,6 +130,7 @@ async function ensureWorktree(issueNumber, title, verbose, packageManager, baseB
             path: existingPath,
             branch,
             existed: true,
+            rebased: false,
         };
     }
     // Check if branch exists (but no worktree)
@@ -172,11 +174,16 @@ async function ensureWorktree(issueNumber, title, verbose, packageManager, baseB
     }
     // Create the worktree
     let createResult;
+    let needsRebase = false;
     if (branchExists) {
         // Use existing branch
         createResult = spawnSync("git", ["worktree", "add", worktreePath, branch], {
             stdio: "pipe",
         });
+        // In chain mode with existing branch, mark for rebase onto previous chain link
+        if (chainMode && baseBranch) {
+            needsRebase = true;
+        }
     }
     else {
         // Create new branch from base reference (origin/main or previous branch in chain)
@@ -187,6 +194,39 @@ async function ensureWorktree(issueNumber, title, verbose, packageManager, baseB
         console.log(chalk.red(`    ❌ Failed to create worktree: ${error}`));
         return null;
     }
+    // Rebase existing branch onto chain base if needed
+    let rebased = false;
+    if (needsRebase) {
+        if (verbose) {
+            console.log(chalk.gray(`    🔄 Rebasing existing branch onto previous chain link (${baseRef})...`));
+        }
+        const rebaseResult = spawnSync("git", ["-C", worktreePath, "rebase", baseRef], {
+            stdio: "pipe",
+        });
+        if (rebaseResult.status !== 0) {
+            const rebaseError = rebaseResult.stderr.toString();
+            // Check if it's a conflict
+            if (rebaseError.includes("CONFLICT") ||
+                rebaseError.includes("could not apply")) {
+                console.log(chalk.yellow(`    ⚠️  Rebase conflict detected. Aborting rebase and keeping original branch state.`));
+                console.log(chalk.yellow(`    ℹ️  Branch ${branch} is not properly chained. Manual rebase may be required.`));
+                // Abort the rebase to restore branch state
+                spawnSync("git", ["-C", worktreePath, "rebase", "--abort"], {
+                    stdio: "pipe",
+                });
+            }
+            else {
+                console.log(chalk.yellow(`    ⚠️  Rebase failed: ${rebaseError.trim()}`));
+                console.log(chalk.yellow(`    ℹ️  Continuing with branch in its original state.`));
+            }
+        }
+        else {
+            rebased = true;
+            if (verbose) {
+                console.log(chalk.green(`    ✅ Branch rebased onto ${baseRef}`));
+            }
+        }
+    }
     // Copy .env.local if it exists
     const envLocalSrc = path.join(gitRoot, ".env.local");
     const envLocalDst = path.join(worktreePath, ".env.local");
@@ -225,6 +265,7 @@ async function ensureWorktree(issueNumber, title, verbose, packageManager, baseB
         path: worktreePath,
         branch,
         existed: false,
+        rebased,
     };
 }
 /**
@@ -236,7 +277,7 @@ async function ensureWorktrees(issues, verbose, packageManager, baseBranch) {
     const baseDisplay = baseBranch || "main";
     console.log(chalk.blue(`\n  📂 Preparing worktrees from ${baseDisplay}...`));
     for (const issue of issues) {
-        const worktree = await ensureWorktree(issue.number, issue.title, verbose, packageManager, baseBranch);
+        const worktree = await ensureWorktree(issue.number, issue.title, verbose, packageManager, baseBranch, false);
         if (worktree) {
             worktrees.set(issue.number, worktree);
         }
@@ -260,7 +301,8 @@ async function ensureWorktreesChain(issues, verbose, packageManager, baseBranch)
     // First issue starts from the specified base branch (or main)
     let previousBranch = baseBranch;
     for (const issue of issues) {
-        const worktree = await ensureWorktree(issue.number, issue.title, verbose, packageManager, previousBranch);
+        const worktree = await ensureWorktree(issue.number, issue.title, verbose, packageManager, previousBranch, // Chain from previous branch (or base branch for first issue)
+        true);
         if (worktree) {
             worktrees.set(issue.number, worktree);
             previousBranch = worktree.branch; // Next issue will branch from this
@@ -273,8 +315,13 @@ async function ensureWorktreesChain(issues, verbose, packageManager, baseBranch)
     }
     const created = Array.from(worktrees.values()).filter((w) => !w.existed).length;
     const reused = Array.from(worktrees.values()).filter((w) => w.existed).length;
+    const rebased = Array.from(worktrees.values()).filter((w) => w.rebased).length;
     if (created > 0 || reused > 0) {
-        console.log(chalk.gray(`  Chained worktrees: ${created} created, ${reused} reused`));
+        let msg = `  Chained worktrees: ${created} created, ${reused} reused`;
+        if (rebased > 0) {
+            msg += `, ${rebased} rebased`;
+        }
+        console.log(chalk.gray(msg));
     }
     // Show chain structure
     if (worktrees.size > 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sequant",
-  "version": "1.10.0",
+  "version": "1.10.1",
   "description": "Quantize your development workflow - Sequential AI phases with quality gates",
   "type": "module",
   "bin": {