kantban-cli 0.1.10 → 0.1.11

package/dist/index.js

@@ -163,10 +163,10 @@ async function main() {
     }
     case "pipeline": {
       if (args[0] === "stop") {
-        const { stopPipeline } = await import("./pipeline-HTGCXNPL.js");
+        const { stopPipeline } = await import("./pipeline-7LG74YA2.js");
         await stopPipeline(args.slice(1));
       } else {
-        const { runPipeline } = await import("./pipeline-HTGCXNPL.js");
+        const { runPipeline } = await import("./pipeline-7LG74YA2.js");
         await runPipeline(client, args);
       }
       break;

package/dist/{pipeline-HTGCXNPL.js → pipeline-7LG74YA2.js}

@@ -53,6 +53,43 @@ async function cleanupWorktree(worktreeName, exec = defaultExecFile) {
     });
   });
 }
+function execPromise(exec, cmd, args) {
+  return new Promise((resolve, reject) => {
+    exec(cmd, args, (err, stdout, stderr) => {
+      if (err) reject(Object.assign(err, { stdout, stderr }));
+      else resolve({ stdout, stderr });
+    });
+  });
+}
+async function mergeWorktreeBranch(worktreeName, integrationBranch, exec = defaultExecFile) {
+  try {
+    await execPromise(exec, "git", ["branch", integrationBranch, "HEAD"]).catch(() => {
+    });
+    const { stdout: baseOut } = await execPromise(exec, "git", ["merge-base", integrationBranch, worktreeName]);
+    const mergeBase = baseOut.trim();
+    const { stdout: integrationSha } = await execPromise(exec, "git", ["rev-parse", integrationBranch]);
+    if (integrationSha.trim() === mergeBase) {
+      const { stdout: worktreeSha } = await execPromise(exec, "git", ["rev-parse", worktreeName]);
+      await execPromise(exec, "git", ["update-ref", `refs/heads/${integrationBranch}`, worktreeSha.trim()]);
+      console.error(`[worktree] fast-forward merged ${worktreeName} \u2192 ${integrationBranch}`);
+      return true;
+    }
+    const tmpWorktree = `merge-tmp-${Date.now()}`;
+    try {
+      await execPromise(exec, "git", ["worktree", "add", tmpWorktree, integrationBranch]);
+      await execPromise(exec, "git", ["-C", tmpWorktree, "merge", "--no-edit", worktreeName]);
+      console.error(`[worktree] merged ${worktreeName} \u2192 ${integrationBranch}`);
+    } finally {
+      await execPromise(exec, "git", ["worktree", "remove", "--force", tmpWorktree]).catch(() => {
+      });
+    }
+    return true;
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    console.error(`[worktree] merge failed for ${worktreeName} \u2192 ${integrationBranch}: ${msg}`);
+    return false;
+  }
+}
 
 // src/lib/constraint-evaluator.ts
 function resolveColumn(board, columnId, subjectRef) {
@@ -457,6 +494,7 @@ var PipelineOrchestrator = class {
           worktreeEnabled: cfg?.worktree?.enabled,
           worktreeOnMove: cfg?.worktree?.on_move,
           worktreeOnDone: cfg?.worktree?.on_done,
+          worktreeIntegrationBranch: cfg?.worktree?.integration_branch,
           invocationTier: cfg?.invocation_tier,
           lookaheadColumnId: cfg?.lookahead_column_id,
           runMemory: cfg?.run_memory,
@@ -1597,18 +1635,28 @@ ${findingsText}`)
           );
         }
         const isTerminal = result.reason === "moved" || result.reason === "max_iterations" || result.reason === "error" || result.reason === "stalled" || result.reason === "stopped" || result.reason === "deleted";
-        if (isTerminal && colConfig?.worktreeOnDone === "cleanup" && this.deps.cleanupWorktree) {
+        if (isTerminal && colConfig) {
           const colScope2 = this.columnScopes.get(columnId);
           const ticket2 = colScope2?.tickets.find((t) => t.id === ticketId);
           if (ticket2) {
             const worktreeName = generateWorktreeName(ticket2.ticket_number, colConfig.name);
-            void this.deps.cleanupWorktree(worktreeName).then((success) => {
-              if (!success) {
-                console.error(`  [warn] Worktree cleanup failed for ${worktreeName} \u2014 may need manual removal`);
-              }
-            }).catch((err) => {
-              console.error(`  [warn] Worktree cleanup error for ${worktreeName}: ${err instanceof Error ? err.message : String(err)}`);
-            });
+            if (colConfig.worktreeOnDone === "merge" && colConfig.worktreeIntegrationBranch && this.deps.mergeWorktree) {
+              void this.deps.mergeWorktree(worktreeName, colConfig.worktreeIntegrationBranch).then((success) => {
+                if (!success) {
+                  console.error(`  [warn] Worktree merge failed for ${worktreeName} \u2192 ${colConfig.worktreeIntegrationBranch} \u2014 may need manual resolution`);
+                }
+              }).catch((err) => {
+                console.error(`  [warn] Worktree merge error for ${worktreeName}: ${err instanceof Error ? err.message : String(err)}`);
+              });
+            } else if (colConfig.worktreeOnDone === "cleanup" && this.deps.cleanupWorktree) {
+              void this.deps.cleanupWorktree(worktreeName).then((success) => {
+                if (!success) {
+                  console.error(`  [warn] Worktree cleanup failed for ${worktreeName} \u2014 may need manual removal`);
+                }
+              }).catch((err) => {
+                console.error(`  [warn] Worktree cleanup error for ${worktreeName}: ${err instanceof Error ? err.message : String(err)}`);
+              });
+            }
           }
         }
         this.deps.gateSnapshotStore?.clear(ticketId);
@@ -3663,6 +3711,7 @@ async function runPipeline(client, args) {
     // Run memory append — closure captures runMemory by reference (set after initialization)
     appendRunMemory: (section, content) => runMemory ? runMemory.append(section, content) : Promise.resolve(),
     cleanupWorktree: (name) => cleanupWorktree(name),
+    mergeWorktree: (name, integrationBranch) => mergeWorktreeBranch(name, integrationBranch),
     // Pipeline event emission — wsClient captured by reference (set later before any loops run)
     emitPipelineEvent: (event) => {
       wsClient?.send(event);
@@ -4046,4 +4095,4 @@ export {
   runPipeline,
   stopPipeline
 };
-//# sourceMappingURL=pipeline-HTGCXNPL.js.map
+//# sourceMappingURL=pipeline-7LG74YA2.js.map