wildcrane-runner 0.6.18 → 0.6.19

package/dist/akb/package.json

@@ -1 +1 @@
-{"name":"wildcrane","version":"0.11.16","akbContract":5,"type":"module","private":true}
+{"name":"wildcrane","version":"0.11.17","akbContract":5,"type":"module","private":true}

package/dist/launcher.mjs

@@ -1,4 +1,4 @@
-// wildcrane-runner 0.6.18 — built by runner/scripts/build.mjs. Do not edit.
+// wildcrane-runner 0.6.19 — built by runner/scripts/build.mjs. Do not edit.
 import { createRequire as __ai4kanbanRequire } from 'node:module'
 const require = __ai4kanbanRequire(import.meta.url)
 
@@ -108,7 +108,7 @@ function status(line) {
 }
 
 // src/protocol.ts
-var VERSION = true ? "0.6.18" : "0.0.0";
+var VERSION = true ? "0.6.19" : "0.0.0";
 var EXIT_REFUSED = 10;
 var EXIT_OUTDATED = 11;
 var EXIT_UPDATE = 12;
@@ -2612,7 +2612,7 @@ function createTail(log) {
 // ../cli/package.json
 var package_default = {
   name: "wildcrane",
-  version: "0.11.16",
+  version: "0.11.17",
   akbContract: 5,
   description: "WildCrane's `akb` command \u2014 scaffold the Markdown board under docs/kanban/, put an agent on a card, and carry the flows the agent works by.",
   keywords: [
@@ -3694,12 +3694,27 @@ function codexProxyEnv(env2 = process.env, platform = process.platform, read = (
 // ../cli/src/lib/agent/worktree.ts
 import { spawnSync as spawnSync3 } from "node:child_process";
 var MAX_OUTPUT = 64 * 1024 * 1024;
+var gitLimits = { timeoutMs: 3e4 };
+var GitTimeoutError = class extends Error {
+};
+function spawnGit(args, options) {
+  const out = spawnSync3("git", args, {
+    ...options,
+    encoding: "utf8",
+    stdio: ["ignore", "pipe", "pipe"],
+    timeout: gitLimits.timeoutMs,
+    killSignal: "SIGKILL"
+  });
+  if (out.error?.code === "ETIMEDOUT") throw new GitTimeoutError(`Git ${args[0]} timed out after ${gitLimits.timeoutMs / 1e3}s; the command was killed.`);
+  return out;
+}
 function git(args, cwd = REPO_ROOT) {
   try {
-    const out = spawnSync3("git", args, { cwd, encoding: "utf8", maxBuffer: MAX_OUTPUT, windowsHide: true });
+    const out = spawnGit(args, { cwd, encoding: "utf8", maxBuffer: MAX_OUTPUT, windowsHide: true });
     if (out.error || out.status !== 0) return null;
     return out.stdout;
-  } catch {
+  } catch (error) {
+    if (error instanceof GitTimeoutError) throw error;
     return null;
   }
 }

package/dist/runner.mjs

@@ -1,4 +1,4 @@
-// wildcrane-runner 0.6.18 — built by runner/scripts/build.mjs. Do not edit.
+// wildcrane-runner 0.6.19 — built by runner/scripts/build.mjs. Do not edit.
 import { createRequire as __ai4kanbanRequire } from 'node:module'
 const require = __ai4kanbanRequire(import.meta.url)
 var __create = Object.create;
@@ -84438,8 +84438,8 @@ function status(line) {
 }
 
 // src/protocol.ts
-var VERSION = true ? "0.6.18" : "0.0.0";
-var AKB_VERSION = true ? "0.11.16" : "0.0.0";
+var VERSION = true ? "0.6.19" : "0.0.0";
+var AKB_VERSION = true ? "0.11.17" : "0.0.0";
 var AKB_CONTRACT = true ? 5 : 0;
 var EXIT_REFUSED = 10;
 var EXIT_OUTDATED = 11;
@@ -85964,7 +85964,7 @@ function createTail(log) {
 // ../cli/package.json
 var package_default = {
   name: "wildcrane",
-  version: "0.11.16",
+  version: "0.11.17",
   akbContract: 5,
   description: "WildCrane's `akb` command \u2014 scaffold the Markdown board under docs/kanban/, put an agent on a card, and carry the flows the agent works by.",
   keywords: [
@@ -87096,12 +87096,27 @@ function codexProxyEnv(env2 = process.env, platform = process.platform, read2 =
 // ../cli/src/lib/agent/worktree.ts
 import { spawnSync as spawnSync2 } from "node:child_process";
 var MAX_OUTPUT = 64 * 1024 * 1024;
+var gitLimits = { timeoutMs: 3e4 };
+var GitTimeoutError = class extends Error {
+};
+function spawnGit(args, options) {
+  const out = spawnSync2("git", args, {
+    ...options,
+    encoding: "utf8",
+    stdio: ["ignore", "pipe", "pipe"],
+    timeout: gitLimits.timeoutMs,
+    killSignal: "SIGKILL"
+  });
+  if (out.error?.code === "ETIMEDOUT") throw new GitTimeoutError(`Git ${args[0]} timed out after ${gitLimits.timeoutMs / 1e3}s; the command was killed.`);
+  return out;
+}
 function git(args, cwd = REPO_ROOT) {
   try {
-    const out = spawnSync2("git", args, { cwd, encoding: "utf8", maxBuffer: MAX_OUTPUT, windowsHide: true });
+    const out = spawnGit(args, { cwd, encoding: "utf8", maxBuffer: MAX_OUTPUT, windowsHide: true });
     if (out.error || out.status !== 0) return null;
     return out.stdout;
-  } catch {
+  } catch (error) {
+    if (error instanceof GitTimeoutError) throw error;
     return null;
   }
 }
@@ -92371,16 +92386,25 @@ function prepareKanbanSkill(root) {
 import { spawnSync as spawnSync6 } from "node:child_process";
 import fs28 from "node:fs";
 import path31 from "node:path";
+
+// ../cli/src/lib/agent/landing-lock.ts
+var landingLimits = { staleMs: 5 * 6e4 };
+
+// ../cli/src/lib/skill/hook.ts
 var MARKER = "# ai4kanban commit guard";
 var MARKER_LINE = new RegExp(`^${MARKER}\\b`, "m");
 var CHECK = [
   "try{",
   'const[top,branch]=require("child_process")',
-  '.execFileSync("git",["rev-parse","--show-toplevel","--abbrev-ref","HEAD"],{encoding:"utf8"}).trim().split("\\n");',
+  '.execFileSync("git",["rev-parse","--show-toplevel","--abbrev-ref","HEAD"],{encoding:"utf8",timeout:3000,killSignal:"SIGKILL"}).trim().split("\\n");',
   'if(/\\/\\.akb\\/worktrees\\//.test(top+"/"))process.exit(0);',
   'const d=(JSON.parse(require("fs").readFileSync(process.argv[1],"utf8")).deliveries||[])',
-  '.find((x)=>x&&x.status==="active"&&x.commitMode==="auto"&&x.targetBranch===branch&&(!x.landing||x.landing.status!=="landed"));',
+  '.find((x)=>x&&x.status==="active"&&x.commitMode==="auto"&&x.targetBranch===branch&&x.landing&&x.landing.status==="landing");',
   "if(!d)process.exit(0);",
+  'const fs=require("fs"),lock=process.argv[2],entries=fs.readdirSync(lock);',
+  `if(Date.now()-fs.statSync(lock).mtimeMs>${landingLimits.staleMs})process.exit(0);`,
+  "if(entries.length!==1||!/^\\d+-[a-f0-9-]{36}$/.test(entries[0]))process.exit(0);",
+  'try{process.kill(Number(entries[0].split("-")[0]),0)}catch(e){if(e.code!=="EPERM")process.exit(0)}',
   "process.stderr.write(",
   '"ai4kanban: delivery "+d.deliveryId+" is landing #"+d.cardId+" on "+branch+", so a commit here moves the target under it\\n"',
   '+"  \u2014 commit on another branch, or `git commit --no-verify` to commit anyway.\\n");',
@@ -92388,7 +92412,7 @@ var CHECK = [
   "}catch(e){process.exit(0)}"
 ].join("");
 var quoted = (p2) => `"${p2.replace(/(["$`\\])/g, "\\$1")}"`;
-var guardLine = (sessions) => `if command -v node >/dev/null 2>&1; then node -e '${CHECK}' ${quoted(sessions)} || exit 1; fi`;
+var guardLine = (sessions) => `if command -v node >/dev/null 2>&1; then node -e '${CHECK}' ${quoted(sessions)} ${quoted(path31.join(path31.dirname(sessions), SESSIONS_FOLDER, ".landing.lock"))} || exit 1; fi`;
 function hookScript(sessions) {
   return [
     "#!/bin/sh",
@@ -93083,18 +93107,31 @@ ${draftLine(ws)}
     }
     if (verb === "revise" && !text3) return fail("Say what to change.");
     let note = verb === "resolve" || verb === "revise" ? text3 : "";
+    let continuation;
+    let expectedDelivery;
     if (verb === "implement" && flow.resume) {
-      const resumed = answerOf2(await akb(["delivery", "resume", String(id2), "--json"]));
+      const restored = await akb(["delivery", "resume", String(id2), "--json"]);
+      const resumed = answerOf2(restored);
       if (io.lost()) return fail("");
       if (resumed?.landed) return { ok: true, report: { card: id2 } };
+      if (restored.code !== 0 && resumed?.error?.reason !== "deliveryActive") return fail(resumed?.error?.message ?? refusal(restored));
+      const deliveryId = resumed?.deliveryId ?? resumed?.error?.args?.id;
+      if (!deliveryId) return fail("\u627E\u4E0D\u5230\u4E0A\u6B21\u6784\u5EFA\u7684\u4EA4\u4ED8\u8BB0\u5F55\uFF0C\u65E0\u6CD5\u6062\u590D\u539F\u5BF9\u8BDD\u3002");
+      expectedDelivery = deliveryId;
+      const previous = answerOf2(await akb(["run", "list", "--card", String(id2), "--all", "--json"]))?.runs?.filter((r2) => ["implement", "conflict", "hook"].includes(r2.action ?? "") && r2.deliveryId === deliveryId).sort((a3, b2) => (b2.startedAt ?? 0) - (a3.startedAt ?? 0))[0];
+      if (!previous) return fail("\u627E\u4E0D\u5230\u4E0A\u6B21\u6784\u5EFA\u7684\u8FD0\u884C\u8BB0\u5F55\uFF0C\u65E0\u6CD5\u6062\u590D\u539F\u5BF9\u8BDD\u3002");
+      continuation = previous.status === "done" ? ["run", "log", previous.sessionId] : ["run", "resume", previous.sessionId, "--require-session"];
     } else if (verb === "implement" && text3) {
       const resolved = await akb(["card", "resolve", String(id2), "--follow", "--events", "--json", "--", text3], true);
       if (io.lost()) return fail("");
       if (resolved.code !== 0) note = text3;
     }
-    const ran = await akb(["card", verb, String(id2), "--follow", "--events", "--json", ...carryArgs(verb), ...note ? ["--", note] : []], true);
+    const ran = await akb(continuation ? [...continuation, "--follow", "--events", "--json"] : ["card", verb, String(id2), "--follow", "--events", "--json", ...carryArgs(verb), ...note ? ["--", note] : []], true);
     if (io.lost()) return fail("");
     const answer = answerOf2(ran);
+    if (expectedDelivery && answer?.delivery?.id && answer.delivery.id !== expectedDelivery) {
+      return fail("\u7EED\u8DD1\u8FD4\u56DE\u4E86\u5176\u4ED6\u4EA4\u4ED8\u7684\u7ED3\u679C\uFF0C\u539F\u4EA4\u4ED8\u4FDD\u6301\u672A\u5B8C\u6210\u3002");
+    }
     if (verb === "implement") {
       const ending = deliveryEnding(ws, answer?.delivery?.id ?? answer?.error?.delivery?.id);
       if (ending) return ending;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wildcrane-runner",
-  "version": "0.6.18",
+  "version": "0.6.19",
   "description": "WildCrane's Local Runner — connects this computer to WildCrane and runs its jobs on your local Claude Code, Codex, OpenCode or Cursor.",
   "license": "FSL-1.1-ALv2",
   "homepage": "https://wildcrane.ai/",