kantban-cli 0.1.38 → 0.1.40

package/dist/{pipeline-IAKINX5A.js → pipeline-ILE7LMGI.js}

@@ -12,7 +12,7 @@ import {
   generateMcpConfig,
   parseJsonFromLlmOutput,
   parseStuckDetectionResponse
-} from "./chunk-2CY5OPZN.js";
+} from "./chunk-FOVFBT7C.js";
 import {
   LoopCheckpointSchema,
   VerdictSchema,
@@ -50,9 +50,17 @@ function resolveToolRestrictions(builtinTools, allowedTools, disallowedTools) {
 // src/lib/worktree.ts
 import { execFile as defaultExecFile, execFileSync } from "child_process";
 function generateWorktreeName(ticketNumber, columnName) {
-  const slug = columnName.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "");
+  const slug = columnSlug(columnName);
   return `kantban-${ticketNumber}-${slug}`;
 }
+function columnSlug(columnName) {
+  return columnName.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "");
+}
+function renderWorktreePath(ticketNumber, columnName, pathPattern) {
+  const worktreeName = generateWorktreeName(ticketNumber, columnName);
+  if (!pathPattern) return worktreeName;
+  return pathPattern.replace(/\{ticket_number\}/g, String(ticketNumber)).replace(/\{column_slug\}/g, columnSlug(columnName)).replace(/\{worktree_name\}/g, worktreeName);
+}
 function isPlausibleRemoteUrl(url) {
   return url.includes("/") || url.includes("@") || url.includes("://");
 }
@@ -91,16 +99,18 @@ function ensureWorktreeRemote(worktreePath) {
   }
 }
 async function cleanupWorktree(worktreeName, exec = defaultExecFile) {
+  let target = worktreeName;
   try {
     const path = await findWorktreeForBranch(exec, worktreeName);
     if (!path) return true;
+    target = path;
   } catch {
     return true;
   }
   return new Promise((resolve) => {
-    exec("git", ["worktree", "remove", "--force", worktreeName], (err) => {
+    exec("git", ["worktree", "remove", "--force", target], (err) => {
       if (err) {
-        console.error(`[worktree] cleanup failed for ${worktreeName}: ${err.message}`);
+        console.error(`[worktree] cleanup failed for ${worktreeName} (${target}): ${err.message}`);
         resolve(false);
       } else {
         resolve(true);
@@ -486,6 +496,8 @@ var PipelineOrchestrator = class {
   spawning = /* @__PURE__ */ new Set();
   /** Ticket IDs currently in onLoopComplete (prevents double-spawn during async advisor recovery) */
   completing = /* @__PURE__ */ new Set();
+  /** Ticket IDs aborted due to ticket:moved — suppresses onLoopComplete comment/advisor */
+  abortedForMove = /* @__PURE__ */ new Set();
   /** Per-column reservation count for in-flight spawns (prevents concurrency overshoot) */
   columnReservations = /* @__PURE__ */ new Map();
   /** Cached board scope for constraint evaluation — refreshed each scan cycle */
@@ -592,6 +604,7 @@ var PipelineOrchestrator = class {
           modelPreference: cfg?.model_preference,
           maxBudgetUsd: cfg?.max_budget_usd,
           worktreeEnabled: cfg?.worktree?.enabled,
+          worktreePathPattern: cfg?.worktree?.path_pattern,
           worktreeOnMove: cfg?.worktree?.on_move,
           worktreeOnDone: cfg?.worktree?.on_done,
           worktreeIntegrationBranch: cfg?.worktree?.integration_branch,
@@ -924,6 +937,26 @@ var PipelineOrchestrator = class {
     switch (event.type) {
       case "ticket:moved":
       case "ticket:created": {
+        if (event.type === "ticket:moved" && event.fromColumnId) {
+          const oldLoop = this.activeLoops.get(event.ticketId);
+          if (oldLoop) {
+            oldLoop.abort.abort();
+            this.activeLoops.delete(event.ticketId);
+            this.abortedForMove.add(event.ticketId);
+          }
+          this.knownTickets.delete(event.ticketId);
+          this.spawning.delete(event.ticketId);
+          this.deferredTickets.delete(event.ticketId);
+          const oldQueue = this.loopQueues.get(event.fromColumnId);
+          if (oldQueue) {
+            const idx = oldQueue.indexOf(event.ticketId);
+            if (idx !== -1) oldQueue.splice(idx, 1);
+          }
+          void this.drainQueue(event.fromColumnId).catch((err) => {
+            const msg = err instanceof Error ? err.message : String(err);
+            console.error(`  [error] drainQueue failed for old column ${event.fromColumnId}: ${msg}`);
+          });
+        }
         if (event.columnId && this.pipelineColumns.has(event.columnId)) {
           if (this.isColumnBlocked(event.columnId)) {
             console.error(`  [event] ${event.type} ${event.ticketId} \u2192 column ${event.columnId}: BLOCKED by firing constraints \u2014 deferred`);
@@ -1113,7 +1146,8 @@ var PipelineOrchestrator = class {
           lastError: err instanceof Error ? err.message : String(err)
         })
       );
-      this.activeLoops.set(ticketId, { columnId, promise });
+      const abort = new AbortController();
+      this.activeLoops.set(ticketId, { columnId, promise, abort });
       this.lastFiredAt.set(columnId, /* @__PURE__ */ new Date());
       void promise.then(
         (result) => this.onLoopComplete(ticketId, columnId, result).catch((err) => {
@@ -1138,7 +1172,8 @@ var PipelineOrchestrator = class {
       });
       placeholder.catch(() => {
       });
-      this.activeLoops.set(ticketId, { columnId, promise: placeholder });
+      const abort = new AbortController();
+      this.activeLoops.set(ticketId, { columnId, promise: placeholder, abort });
       this.lastFiredAt.set(columnId, /* @__PURE__ */ new Date());
       void readCheckpoint(
         {
@@ -1150,6 +1185,7 @@ var PipelineOrchestrator = class {
         columnId
       ).then((checkpoint) => {
         clearTimeout(timeoutId);
+        if (!this.activeLoops.has(ticketId)) return;
         if (checkpoint) {
           console.error(`  [checkpoint] Resuming ${ticketId} at iteration ${String(checkpoint.iteration + 1)} (model: ${checkpoint.model_tier})`);
           this.startLoopWithConfig(ticketId, columnId, config, checkpoint.iteration + 1, checkpoint.gutter_count, modelOverride ?? checkpoint.model_tier, checkpoint.last_fingerprint);
@@ -1158,6 +1194,7 @@ var PipelineOrchestrator = class {
         }
       }).catch((err) => {
         clearTimeout(timeoutId);
+        if (!this.activeLoops.has(ticketId)) return;
         const msg = err instanceof Error ? err.message : String(err);
         console.error(`  [warn] Checkpoint read failed for ${ticketId} (starting fresh): ${msg}`);
         this.startLoopWithConfig(ticketId, columnId, config, void 0, void 0, modelOverride);
@@ -1177,12 +1214,16 @@ var PipelineOrchestrator = class {
       gutterThreshold: config.gutterThreshold,
       ...effectiveModel !== void 0 && { model: effectiveModel },
       ...config.maxBudgetUsd !== void 0 && { maxBudgetUsd: config.maxBudgetUsd },
-      // Resolve worktree name from ticket context
+      // Resolve worktree name (branch) and path from ticket context. When the
+      // column's agent_config specifies a path_pattern, the filesystem path is
+      // rendered from it — otherwise the name doubles as a relative path.
       ...(() => {
         const colScope = this.columnScopes.get(columnId);
         const ticket = colScope?.tickets.find((t) => t.id === ticketId);
-        const wName = config.worktreeEnabled && ticket ? generateWorktreeName(ticket.ticket_number, config.name) : void 0;
-        return wName !== void 0 ? { worktreeName: wName } : {};
+        if (!config.worktreeEnabled || !ticket) return {};
+        const wName = generateWorktreeName(ticket.ticket_number, config.name);
+        const wPath = renderWorktreePath(ticket.ticket_number, config.name, config.worktreePathPattern);
+        return wPath !== wName ? { worktreeName: wName, worktreePath: wPath } : { worktreeName: wName };
       })(),
       ...config.lookaheadColumnId !== void 0 && { lookaheadColumnId: config.lookaheadColumnId },
       // Resume from checkpoint iteration/gutter if provided
@@ -1200,8 +1241,10 @@ var PipelineOrchestrator = class {
     if (toolRestrictions.tools !== void 0 || toolRestrictions.allowedTools || toolRestrictions.disallowedTools) {
       loopConfig.toolRestrictions = toolRestrictions;
     }
+    const abort = new AbortController();
+    loopConfig.abortSignal = abort.signal;
     const promise = this.deps.startLoop(ticketId, columnId, loopConfig);
-    this.activeLoops.set(ticketId, { columnId, promise });
+    this.activeLoops.set(ticketId, { columnId, promise, abort });
     this.lastFiredAt.set(columnId, /* @__PURE__ */ new Date());
     void promise.then(
       (result) => this.onLoopComplete(ticketId, columnId, result).catch((err) => {
@@ -1661,6 +1704,11 @@ ${findingsText}`)
   async onLoopComplete(ticketId, columnId, result) {
     this.completing.add(ticketId);
     this.activeLoops.delete(ticketId);
+    if (this.abortedForMove.has(ticketId)) {
+      this.abortedForMove.delete(ticketId);
+      this.completing.delete(ticketId);
+      return;
+    }
     try {
       const colScope = this.columnScopes.get(columnId);
       const ticket = colScope?.tickets.find((t) => t.id === ticketId);
@@ -3301,14 +3349,15 @@ var CodexProvider = class {
     const env = this.buildEnv();
     const startTime = Date.now();
     if (request.workingDirectory) {
+      const branch = request.branch ?? request.workingDirectory;
       if (!existsSync(request.workingDirectory)) {
         try {
-          execFileSync2("git", ["worktree", "add", "-b", request.workingDirectory, request.workingDirectory, "HEAD"], {
+          execFileSync2("git", ["worktree", "add", "-b", branch, request.workingDirectory, "HEAD"], {
             stdio: "pipe"
           });
         } catch {
           try {
-            execFileSync2("git", ["worktree", "add", request.workingDirectory, request.workingDirectory], {
+            execFileSync2("git", ["worktree", "add", request.workingDirectory, branch], {
               stdio: "pipe"
             });
           } catch {
@@ -3323,12 +3372,12 @@ var CodexProvider = class {
         } catch {
           try {
             rmSync2(request.workingDirectory, { recursive: true, force: true });
-            execFileSync2("git", ["worktree", "add", "-b", request.workingDirectory, request.workingDirectory, "HEAD"], {
+            execFileSync2("git", ["worktree", "add", "-b", branch, request.workingDirectory, "HEAD"], {
               stdio: "pipe"
             });
           } catch {
             try {
-              execFileSync2("git", ["worktree", "add", request.workingDirectory, request.workingDirectory], {
+              execFileSync2("git", ["worktree", "add", request.workingDirectory, branch], {
                 stdio: "pipe"
               });
             } catch {
@@ -3423,6 +3472,8 @@ var CodexProvider = class {
       for (const [name, server] of Object.entries(request.mcpConfig.servers)) {
         args.push("-c", `mcp_servers.${name}.command=${JSON.stringify(server.command)}`);
         args.push("-c", `mcp_servers.${name}.args=${JSON.stringify(server.args)}`);
+        args.push("-c", `mcp_servers.${name}.tool_timeout_sec=1800`);
+        args.push("-c", `mcp_servers.${name}.startup_timeout_sec=120`);
         if (Object.keys(server.env).length > 0) {
           for (const [key, value] of Object.entries(server.env)) {
             args.push("-c", `mcp_servers.${name}.env.${key}=${JSON.stringify(value)}`);
@@ -4740,6 +4791,7 @@ Received ${signal}. Shutting down gracefully...`);
       const ticket = payload["ticket"];
       const ticketId = (typeof payload["ticketId"] === "string" ? payload["ticketId"] : null) ?? (ticket && typeof ticket["id"] === "string" ? ticket["id"] : null);
       const columnId = (typeof payload["columnId"] === "string" ? payload["columnId"] : null) ?? (ticket && typeof ticket["column_id"] === "string" ? ticket["column_id"] : null);
+      const fromColumnId = typeof payload["fromColumnId"] === "string" ? payload["fromColumnId"] : null;
       if (wsEvent.type === "firing_constraint:created" || wsEvent.type === "firing_constraint:updated" || wsEvent.type === "firing_constraint:deleted") {
         logger.orchestrator(`WS event: ${wsEvent.type} \u2014 refreshing constraint caches`);
         void orchestrator.refreshConstraints().catch((err) => {
@@ -4751,9 +4803,9 @@ Received ${signal}. Shutting down gracefully...`);
       if (!ticketId) return;
       const eventType = wsEvent.type;
       if (eventType === "ticket:created" || eventType === "ticket:moved" || eventType === "ticket:updated" || eventType === "ticket:archived" || eventType === "ticket:deleted") {
-        const pipelineEvent = { type: eventType, ticketId, columnId };
+        const pipelineEvent = { type: eventType, ticketId, columnId, fromColumnId };
         eventQueue.push(pipelineEvent);
-        logger.orchestrator(`WS event: ${eventType} ticket=${ticketId} column=${columnId ?? "null"}`);
+        logger.orchestrator(`WS event: ${eventType} ticket=${ticketId} column=${columnId ?? "null"} from=${fromColumnId ?? "null"}`);
       }
     },
     onConnect: () => {
@@ -4896,4 +4948,4 @@ export {
   runPipeline,
   stopPipeline
 };
-//# sourceMappingURL=pipeline-IAKINX5A.js.map
+//# sourceMappingURL=pipeline-ILE7LMGI.js.map