@kody-ade/kody-engine 0.4.87 → 0.4.88

package/dist/bin/kody.js

@@ -877,7 +877,7 @@ var init_loadPriorArt = __esm({
 // package.json
 var package_default = {
   name: "@kody-ade/kody-engine",
-  version: "0.4.87",
+  version: "0.4.88",
   description: "kody \u2014 autonomous development engine. Single-session Claude Code agent behind a generic executor + declarative executable profiles.",
   license: "MIT",
   type: "module",
@@ -5321,6 +5321,23 @@ function editPrBase(prNumber, baseBranch, cwd) {
     return fail(err);
   }
 }
+function branchContains(leafHead, candidateHead, cwd) {
+  if (leafHead === candidateHead) return { ok: true, value: true };
+  try {
+    const out = gh(
+      [
+        "api",
+        `repos/{owner}/{repo}/compare/${encodeURIComponent(leafHead)}...${encodeURIComponent(candidateHead)}`,
+        "--jq",
+        ".ahead_by"
+      ],
+      { cwd }
+    );
+    return { ok: true, value: Number.parseInt(out.trim(), 10) === 0 };
+  } catch (err) {
+    return fail(err);
+  }
+}
 function markPrReady(prNumber, cwd) {
   try {
     gh(["pr", "ready", String(prNumber)], { cwd });
@@ -6928,6 +6945,15 @@ function collectExpectedTests(raw) {
 }
 
 // src/scripts/finalizeGoal.ts
+function prIssueNumbers(pr) {
+  const nums = new Set(extractClosesIssues(pr.body));
+  const headMatch = pr.headRefName.match(/^(\d+)-/);
+  if (headMatch) {
+    const n = Number.parseInt(headMatch[1], 10);
+    if (Number.isFinite(n)) nums.add(n);
+  }
+  return [...nums];
+}
 var finalizeGoal = async (ctx) => {
   const goal = ctx.data.goal;
   if (!goal) return;
@@ -6966,8 +6992,24 @@ var finalizeGoal = async (ctx) => {
     `[goal-tick] leaf PR #${leaf.number} is the deliverable (cumulative goal diff vs ${goal.defaultBranch}) \u2014 left open for human merge
 `
   );
+  const uncarriedIssues = /* @__PURE__ */ new Set();
   const others = (goal.openTaskPrs ?? []).filter((p) => p.number !== leaf.number);
   for (const pr of others) {
+    const contained = branchContains(leaf.headRefName, pr.headRefName, ctx.cwd);
+    if (!contained.ok || contained.value !== true) {
+      const why = contained.ok ? `commits on \`${pr.headRefName}\` are NOT reachable from the deliverable leaf \`${leaf.headRefName}\`` : `could not verify containment (${contained.error})`;
+      process.stderr.write(
+        `[goal-tick] finalizeGoal: NOT closing PR #${pr.number} \u2014 ${why}; leaving it open (broken stack)
+`
+      );
+      for (const n of prIssueNumbers(pr)) uncarriedIssues.add(n);
+      commentOnIssue(
+        pr.number,
+        `\u26A0\uFE0F _Stacked-PR finalize: this PR's commits are **not** carried by the goal's deliverable PR #${leaf.number} (the stack chain was broken). Leaving this PR open so its work isn't lost \u2014 review and land it manually._`,
+        ctx.cwd
+      );
+      continue;
+    }
     process.stdout.write(`[goal-tick] closing intermediate stacked PR #${pr.number} (carried by deliverable leaf)
 `);
     const closed = closePr(
@@ -6982,6 +7024,13 @@ var finalizeGoal = async (ctx) => {
   }
   const openIssues = (goal.childTasks ?? []).filter((t) => t.state === "OPEN");
   for (const t of openIssues) {
+    if (uncarriedIssues.has(t.number)) {
+      process.stderr.write(
+        `[goal-tick] finalizeGoal: NOT closing task issue #${t.number} \u2014 its PR's work is not carried by the deliverable (broken stack)
+`
+      );
+      continue;
+    }
     process.stdout.write(`[goal-tick] closing task issue #${t.number} (goal finalized \u2014 carried by PR #${leaf.number})
 `);
     const closed = closeIssue(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kody-ade/kody-engine",
-  "version": "0.4.87",
+  "version": "0.4.88",
   "description": "kody — autonomous development engine. Single-session Claude Code agent behind a generic executor + declarative executable profiles.",
   "license": "MIT",
   "type": "module",