kantban-cli 0.1.11 → 0.1.12

package/dist/{cron-OKQP6QDF.js → cron-QKX2LAAY.js}

@@ -2,7 +2,7 @@ import {
   RalphLoop,
   cleanupMcpConfig,
   generateMcpConfig
-} from "./chunk-ZCUIGFSP.js";
+} from "./chunk-MTPUHYZV.js";
 
 // src/commands/cron.ts
 import { execFile } from "child_process";
@@ -109,4 +109,4 @@ async function runCron(client, args) {
 export {
   runCron
 };
-//# sourceMappingURL=cron-OKQP6QDF.js.map
+//# sourceMappingURL=cron-QKX2LAAY.js.map

package/dist/index.js

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

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

@@ -13,7 +13,7 @@ import {
   parseStuckDetectionResponse,
   parseTimeout,
   resolveGatesForColumn
-} from "./chunk-ZCUIGFSP.js";
+} from "./chunk-MTPUHYZV.js";
 
 // src/commands/pipeline.ts
 import { spawn as spawn2, execSync } from "child_process";
@@ -61,10 +61,32 @@ function execPromise(exec, cmd, args) {
     });
   });
 }
+async function findWorktreeForBranch(exec, branch) {
+  try {
+    const { stdout } = await execPromise(exec, "git", ["worktree", "list", "--porcelain"]);
+    const targetRef = `refs/heads/${branch}`;
+    let currentPath = null;
+    for (const line of stdout.split("\n")) {
+      if (line.startsWith("worktree ")) currentPath = line.slice("worktree ".length);
+      if (line.startsWith("branch ") && line.slice("branch ".length) === targetRef && currentPath) {
+        return currentPath;
+      }
+    }
+    return null;
+  } catch {
+    return null;
+  }
+}
 async function mergeWorktreeBranch(worktreeName, integrationBranch, exec = defaultExecFile) {
   try {
     await execPromise(exec, "git", ["branch", integrationBranch, "HEAD"]).catch(() => {
     });
+    const checkedOutPath = await findWorktreeForBranch(exec, integrationBranch);
+    if (checkedOutPath) {
+      await execPromise(exec, "git", ["-C", checkedOutPath, "merge", "--no-edit", worktreeName]);
+      console.error(`[worktree] merged ${worktreeName} \u2192 ${integrationBranch}`);
+      return true;
+    }
     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]);
@@ -3691,6 +3713,7 @@ async function runPipeline(client, args) {
     moveTicketToColumn: async (ticketId, columnId, handoff) => {
       await client.patch(`/projects/${projectId}/tickets/${ticketId}/move`, {
         column_id: columnId,
+        position: 0,
         handoff
       });
     },
@@ -4095,4 +4118,4 @@ export {
   runPipeline,
   stopPipeline
 };
-//# sourceMappingURL=pipeline-7LG74YA2.js.map
+//# sourceMappingURL=pipeline-SFXKDLMA.js.map