@kody-ade/kody-engine 0.4.52 → 0.4.54

package/dist/bin/kody.js

@@ -3,7 +3,7 @@
 // package.json
 var package_default = {
   name: "@kody-ade/kody-engine",
-  version: "0.4.52",
+  version: "0.4.54",
   description: "kody \u2014 autonomous development engine. Single-session Claude Code agent behind a generic executor + declarative executable profiles.",
   license: "MIT",
   type: "module",
@@ -3821,6 +3821,14 @@ function mergePrSquash(prNumber, cwd) {
     return fail(err);
   }
 }
+function editPrBase(prNumber, baseBranch, cwd) {
+  try {
+    gh(["pr", "edit", String(prNumber), "--base", baseBranch], { cwd });
+    return { ok: true };
+  } catch (err) {
+    return fail(err);
+  }
+}
 function markPrReady(prNumber, cwd) {
   try {
     gh(["pr", "ready", String(prNumber)], { cwd });
@@ -5413,32 +5421,53 @@ var finalizeGoal = async (ctx) => {
   if (!goal) return;
   process.stdout.write(`[goal-tick] all task(s) done \u2014 finalising goal ${goal.id}
 `);
-  const leaf = goal.leafPr;
-  if (leaf) {
-    if (leaf.isDraft) {
-      process.stdout.write(`[goal-tick] promoting draft leaf PR #${leaf.number} \u2192 ready
+  const taskPrs = goal.openTaskPrs ?? [];
+  if (taskPrs.length === 0) {
+    process.stdout.write(`[goal-tick] no open task PRs \u2014 marking goal done without merge
 `);
-      const ready = markPrReady(leaf.number, ctx.cwd);
+    goal.state = "done";
+    return;
+  }
+  const ordered = [...taskPrs].sort((a, b) => extractIssueNumber(a) - extractIssueNumber(b));
+  for (const pr of ordered) {
+    if (pr.isDraft) {
+      process.stdout.write(`[goal-tick] promoting draft PR #${pr.number} \u2192 ready
+`);
+      const ready = markPrReady(pr.number, ctx.cwd);
       if (!ready.ok) {
-        process.stderr.write(`[goal-tick] finalizeGoal: markPrReady failed: ${ready.error}
+        process.stderr.write(`[goal-tick] finalizeGoal: markPrReady #${pr.number} failed: ${ready.error}
 `);
         return;
       }
     }
-    process.stdout.write(`[goal-tick] squash-merging leaf PR #${leaf.number}
+    if (pr.baseRefName !== goal.defaultBranch) {
+      process.stdout.write(
+        `[goal-tick] retargeting PR #${pr.number} base ${pr.baseRefName} \u2192 ${goal.defaultBranch}
+`
+      );
+      const retarget = editPrBase(pr.number, goal.defaultBranch, ctx.cwd);
+      if (!retarget.ok) {
+        process.stderr.write(`[goal-tick] finalizeGoal: editPrBase #${pr.number} failed: ${retarget.error}
 `);
-    const merged = mergePrSquash(leaf.number, ctx.cwd);
+        return;
+      }
+    }
+    process.stdout.write(`[goal-tick] squash-merging PR #${pr.number} \u2192 ${goal.defaultBranch} (head=${pr.headRefName})
+`);
+    const merged = mergePrSquash(pr.number, ctx.cwd);
     if (!merged.ok) {
-      process.stderr.write(`[goal-tick] finalizeGoal: mergePrSquash failed: ${merged.error}
+      process.stderr.write(`[goal-tick] finalizeGoal: mergePrSquash #${pr.number} failed: ${merged.error}
 `);
       return;
     }
-  } else {
-    process.stdout.write(`[goal-tick] no leaf PR \u2014 marking goal done without merge
-`);
   }
   goal.state = "done";
 };
+function extractIssueNumber(pr) {
+  const m = pr.headRefName.match(/^(\d+)-/);
+  if (m?.[1]) return Number.parseInt(m[1], 10);
+  return pr.number;
+}
 
 // src/scripts/finishFlow.ts
 import { execFileSync as execFileSync14 } from "child_process";

package/package.json

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