@kody-ade/kody-engine 0.4.37 → 0.4.39

package/dist/bin/kody.js

@@ -3,7 +3,7 @@
 // package.json
 var package_default = {
   name: "@kody-ade/kody-engine",
-  version: "0.4.37",
+  version: "0.4.39",
   description: "kody \u2014 autonomous development engine. Single-session Claude Code agent behind a generic executor + declarative executable profiles.",
   license: "MIT",
   type: "module",
@@ -51,7 +51,7 @@ var package_default = {
 };
 
 // src/chat-cli.ts
-import { execFileSync as execFileSync32 } from "child_process";
+import { execFileSync as execFileSync31 } from "child_process";
 import * as fs30 from "fs";
 import * as path28 from "path";
 
@@ -912,7 +912,7 @@ async function emit2(sink, type, sessionId, suffix, payload) {
 }
 
 // src/kody-cli.ts
-import { execFileSync as execFileSync31 } from "child_process";
+import { execFileSync as execFileSync30 } from "child_process";
 import * as fs29 from "fs";
 import * as path27 from "path";
 
@@ -1492,7 +1492,7 @@ function postPrReviewComment(prNumber, body, cwd) {
 }
 
 // src/executor.ts
-import { execFileSync as execFileSync30, spawn as spawn5 } from "child_process";
+import { execFileSync as execFileSync29, spawn as spawn5 } from "child_process";
 import * as fs28 from "fs";
 import * as path26 from "path";
 
@@ -2801,301 +2801,6 @@ function defaultLabelMap() {
   };
 }
 
-// src/goal/operations.ts
-import { execFileSync as execFileSync9 } from "child_process";
-
-// src/goal/labels.ts
-function goalLabel(goalId) {
-  return `goal:${goalId}`;
-}
-var DISPATCHED_LABEL = "goal-runner:dispatched";
-var FAILED_LABEL = "goal-runner:failed";
-var UMBRELLA_BUILDING_LABEL = "kody:building";
-var TICK_LABELS = [
-  {
-    name: DISPATCHED_LABEL,
-    color: "ededed",
-    description: "kody goal-runner: already dispatched this tick"
-  },
-  {
-    name: FAILED_LABEL,
-    color: "b60205",
-    description: "kody goal-runner: task failed; needs human attention"
-  }
-];
-
-// src/goal/operations.ts
-function fail(err) {
-  if (err instanceof Error) {
-    const lines = err.message.split("\n").filter(Boolean);
-    return { ok: false, error: lines[0] ?? err.message };
-  }
-  return { ok: false, error: String(err) };
-}
-function listGoalIssues(goalId, excludeIssueNumber, cwd) {
-  try {
-    const out = gh(
-      [
-        "api",
-        `repos/{owner}/{repo}/issues?labels=${goalLabel(goalId)}&state=all&per_page=100`,
-        "--jq",
-        "[.[] | select(.pull_request == null) | {number, state: (.state | ascii_upcase), labels: [.labels[].name]}]"
-      ],
-      { cwd }
-    );
-    const arr = JSON.parse(out);
-    const filtered = excludeIssueNumber !== void 0 ? arr.filter((i) => i.number !== excludeIssueNumber) : arr;
-    return { ok: true, value: filtered };
-  } catch (err) {
-    return fail(err);
-  }
-}
-function ensureLabel(name, color, description, cwd) {
-  try {
-    gh(["label", "create", name, "--color", color, "--description", description, "--force"], { cwd });
-    return { ok: true };
-  } catch (err) {
-    return fail(err);
-  }
-}
-function addLabel2(issueNumber, label, cwd) {
-  try {
-    gh(["issue", "edit", String(issueNumber), "--add-label", label], { cwd });
-    return { ok: true };
-  } catch (err) {
-    return fail(err);
-  }
-}
-function commentOnIssue(issueNumber, body, cwd) {
-  try {
-    gh(["issue", "comment", String(issueNumber), "--body", body], { cwd });
-    return { ok: true };
-  } catch (err) {
-    return fail(err);
-  }
-}
-function closeIssue(issueNumber, options, cwd) {
-  try {
-    if (options.comment) {
-      gh(["issue", "comment", String(issueNumber), "--body", options.comment], { cwd });
-    }
-    const args = ["issue", "close", String(issueNumber)];
-    if (options.reason) args.push("--reason", options.reason);
-    gh(args, { cwd });
-    return { ok: true };
-  } catch (err) {
-    return fail(err);
-  }
-}
-function getIssueState(issueNumber, cwd) {
-  try {
-    const out = gh(["issue", "view", String(issueNumber), "--json", "state", "--jq", ".state"], {
-      cwd
-    });
-    const norm = out.trim().toUpperCase();
-    if (norm !== "OPEN" && norm !== "CLOSED") {
-      return { ok: false, error: `unexpected state: ${out}` };
-    }
-    return { ok: true, value: norm };
-  } catch (err) {
-    return fail(err);
-  }
-}
-function findUmbrellaByTitle(goalId, title, cwd) {
-  try {
-    const out = gh(
-      [
-        "api",
-        `repos/{owner}/{repo}/issues?labels=${goalLabel(goalId)}&state=all&per_page=100`,
-        "--jq",
-        `[.[] | select(.pull_request == null) | select(.title == "${title.replace(/"/g, '\\"')}")] | (map(select(.state == "open")) + map(select(.state != "open")))[0].number // empty`
-      ],
-      { cwd }
-    );
-    const trimmed = out.trim();
-    if (!trimmed) return { ok: true, value: null };
-    const n = Number.parseInt(trimmed, 10);
-    if (!Number.isFinite(n)) return { ok: true, value: null };
-    return { ok: true, value: n };
-  } catch (err) {
-    return fail(err);
-  }
-}
-function createIssue(args, cwd) {
-  try {
-    const cliArgs = ["issue", "create", "--title", args.title, "--body", args.body];
-    for (const l of args.labels) cliArgs.push("--label", l);
-    const url = gh(cliArgs, { cwd });
-    const match = url.match(/\/issues\/(\d+)/);
-    if (!match?.[1]) return { ok: false, error: `couldn't parse issue number from URL: ${url}` };
-    return { ok: true, value: Number.parseInt(match[1], 10) };
-  } catch (err) {
-    return fail(err);
-  }
-}
-function listPrsByBase(base, state, cwd) {
-  try {
-    const out = gh(
-      [
-        "pr",
-        "list",
-        "--base",
-        base,
-        "--state",
-        state,
-        "--limit",
-        "50",
-        "--json",
-        "number,isDraft,mergeable,mergeStateStatus,url,headRefName,body"
-      ],
-      { cwd }
-    );
-    return { ok: true, value: JSON.parse(out) };
-  } catch (err) {
-    return fail(err);
-  }
-}
-function listPrsByHead(head, state, cwd) {
-  try {
-    const out = gh(
-      [
-        "pr",
-        "list",
-        "--head",
-        head,
-        "--state",
-        state,
-        "--json",
-        "number,isDraft,mergeable,mergeStateStatus,url,headRefName,body"
-      ],
-      { cwd }
-    );
-    return { ok: true, value: JSON.parse(out) };
-  } catch (err) {
-    return fail(err);
-  }
-}
-function mergePrSquash(prNumber, cwd) {
-  try {
-    gh(["pr", "merge", String(prNumber), "--squash", "--delete-branch"], { cwd });
-    return { ok: true };
-  } catch (err) {
-    return fail(err);
-  }
-}
-function closePr(prNumber, comment, cwd) {
-  try {
-    gh(["pr", "close", String(prNumber), "--comment", comment], { cwd });
-    return { ok: true };
-  } catch (err) {
-    return fail(err);
-  }
-}
-function createPr(args, cwd) {
-  try {
-    const cli = ["pr", "create", "--head", args.head, "--base", args.base, "--title", args.title, "--body", args.body];
-    if (args.draft) cli.push("--draft");
-    const url = gh(cli, { cwd });
-    if (!url.includes("/pull/")) return { ok: false, error: `gh pr create returned unexpected output: ${url}` };
-    return { ok: true, value: url.trim() };
-  } catch (err) {
-    return fail(err);
-  }
-}
-function editPrBody(prNumber, body, cwd) {
-  try {
-    gh(["pr", "edit", String(prNumber), "--body", body], { cwd });
-    return { ok: true };
-  } catch (err) {
-    return fail(err);
-  }
-}
-function markPrReady(prNumber, cwd) {
-  try {
-    gh(["pr", "ready", String(prNumber)], { cwd });
-    return { ok: true };
-  } catch (err) {
-    return fail(err);
-  }
-}
-function ghTokenEnv() {
-  const token = process.env.GH_PAT?.trim() || process.env.GH_TOKEN;
-  return token ? { ...process.env, GH_TOKEN: token } : { ...process.env };
-}
-function remoteBranchExists(ref, cwd) {
-  try {
-    execFileSync9("git", ["rev-parse", "--verify", "--quiet", `refs/remotes/origin/${ref}`], {
-      cwd,
-      stdio: "pipe",
-      env: ghTokenEnv()
-    });
-    return true;
-  } catch {
-    return false;
-  }
-}
-function fetchOrigin(cwd) {
-  try {
-    execFileSync9("git", ["fetch", "origin", "--quiet"], { cwd, stdio: "pipe", env: ghTokenEnv() });
-  } catch {
-  }
-}
-function createBranchFrom(branch, base, cwd) {
-  try {
-    execFileSync9("git", ["push", "origin", `refs/remotes/origin/${base}:refs/heads/${branch}`, "--quiet"], {
-      cwd,
-      stdio: "pipe",
-      env: ghTokenEnv()
-    });
-    return { ok: true };
-  } catch (err) {
-    return fail(err);
-  }
-}
-function inferLinkedIssue(pr) {
-  const body = pr.body ?? "";
-  const m = body.match(/\b(?:close[sd]?|fix(?:e[sd])?|resolve[sd]?)\s+#(\d+)\b/i);
-  if (m?.[1]) return Number.parseInt(m[1], 10);
-  const ref = pr.headRefName ?? "";
-  const bm = ref.match(/^(\d+)-/);
-  if (bm?.[1]) return Number.parseInt(bm[1], 10);
-  return void 0;
-}
-
-// src/scripts/closeMergedTaskIssues.ts
-var closeMergedTaskIssues = async (ctx) => {
-  const goal = ctx.data.goal;
-  if (!goal) return;
-  const merged = listPrsByBase(goal.goalBranch, "merged", ctx.cwd);
-  if (!merged.ok) {
-    process.stderr.write(`[goal-tick] closeMergedTaskIssues: list failed: ${merged.error}
-`);
-    return;
-  }
-  const seen = /* @__PURE__ */ new Set();
-  for (const pr of merged.value ?? []) {
-    const linked = inferLinkedIssue(pr);
-    if (linked === void 0 || seen.has(linked)) continue;
-    seen.add(linked);
-    const stateRes = getIssueState(linked, ctx.cwd);
-    if (!stateRes.ok || stateRes.value !== "OPEN") continue;
-    process.stdout.write(`[goal-tick] closing #${linked} (PR merged into ${goal.goalBranch})
-`);
-    const r = closeIssue(
-      linked,
-      {
-        comment: `_Closed by goal-tick: PR for this task merged into \`${goal.goalBranch}\`._`,
-        reason: "completed"
-      },
-      ctx.cwd
-    );
-    if (!r.ok) {
-      process.stderr.write(`[goal-tick] failed to close #${linked}: ${r.error} (continuing)
-`);
-    }
-  }
-};
-
 // src/scripts/commitAndPush.ts
 var DEFAULT_COMMIT_MESSAGE = "chore: kody changes";
 var commitAndPush2 = async (ctx) => {
@@ -3140,14 +2845,14 @@ var commitAndPush2 = async (ctx) => {
 };
 
 // src/scripts/commitGoalState.ts
-import { execFileSync as execFileSync10 } from "child_process";
+import { execFileSync as execFileSync9 } from "child_process";
 import * as path12 from "path";
 var commitGoalState = async (ctx) => {
   const goal = ctx.data.goal;
   if (!goal) return;
   const stateRel = path12.posix.join(".kody", "goals", goal.id, "state.json");
   try {
-    execFileSync10("git", ["add", stateRel], { cwd: ctx.cwd, stdio: "pipe" });
+    execFileSync9("git", ["add", stateRel], { cwd: ctx.cwd, stdio: "pipe" });
   } catch (err) {
     process.stderr.write(
       `[goal-tick] commitGoalState: git add failed: ${err instanceof Error ? err.message : String(err)}
@@ -3156,13 +2861,13 @@ var commitGoalState = async (ctx) => {
     return;
   }
   try {
-    execFileSync10("git", ["diff", "--cached", "--quiet"], { cwd: ctx.cwd, stdio: "pipe" });
+    execFileSync9("git", ["diff", "--cached", "--quiet"], { cwd: ctx.cwd, stdio: "pipe" });
     return;
   } catch {
   }
   const msg = describeCommitMessage(goal);
   try {
-    execFileSync10("git", ["commit", "-m", msg, "--quiet"], { cwd: ctx.cwd, stdio: "pipe" });
+    execFileSync9("git", ["commit", "-m", msg, "--quiet"], { cwd: ctx.cwd, stdio: "pipe" });
   } catch (err) {
     process.stderr.write(
       `[goal-tick] commitGoalState: git commit failed: ${err instanceof Error ? err.message : String(err)}
@@ -3171,7 +2876,7 @@ var commitGoalState = async (ctx) => {
     return;
   }
   try {
-    execFileSync10("git", ["push", "--quiet"], { cwd: ctx.cwd, stdio: "pipe" });
+    execFileSync9("git", ["push", "--quiet"], { cwd: ctx.cwd, stdio: "pipe" });
   } catch {
     process.stderr.write("[goal-tick] commitGoalState: push failed (will retry next tick)\n");
   }
@@ -3185,9 +2890,6 @@ function describeCommitMessage(goal) {
   if (goal.phase === "in-flight") {
     return `chore(goals): tick ${goal.id} (waiting for in-flight task)`;
   }
-  if (goal.phase === "blocked-by-failure") {
-    return `chore(goals): tick ${goal.id} (blocked by failed task)`;
-  }
   return `chore(goals): tick ${goal.id} (idle)`;
 }
 
@@ -3290,7 +2992,7 @@ function formatToolsUsage(profile) {
 }
 
 // src/scripts/createQaGoal.ts
-import { execFileSync as execFileSync11 } from "child_process";
+import { execFileSync as execFileSync10 } from "child_process";
 import * as fs14 from "fs";
 import * as path14 from "path";
 
@@ -3474,7 +3176,7 @@ ${json}
 ${MANIFEST_END}
 `;
 }
-function ensureLabel2(name, color, description, cwd) {
+function ensureLabel(name, color, description, cwd) {
   try {
     gh(["label", "create", name, "--color", color, "--description", description, "--force"], { cwd });
   } catch {
@@ -3494,7 +3196,7 @@ function ensureSeverityLabels(findings, cwd) {
   for (const f of findings) {
     if (seen.has(f.severity)) continue;
     seen.add(f.severity);
-    ensureLabel2(severityLabel(f.severity), SEVERITY_COLORS[f.severity], `kody QA finding severity ${f.severity}`, cwd);
+    ensureLabel(severityLabel(f.severity), SEVERITY_COLORS[f.severity], `kody QA finding severity ${f.severity}`, cwd);
   }
 }
 function buildIssueBody(f, goalId, parentManifestNumber) {
@@ -3528,7 +3230,7 @@ function buildIssueBody(f, goalId, parentManifestNumber) {
   return lines.join("\n");
 }
 function createOrUpdateManifestIssue(number, manifest, cwd) {
-  ensureLabel2(MANIFEST_LABEL, "8b5cf6", "kody: goals manifest", cwd);
+  ensureLabel(MANIFEST_LABEL, "8b5cf6", "kody: goals manifest", cwd);
   const body = serializeManifestBody(manifest);
   if (number !== null) {
     gh(["issue", "edit", String(number), "--body-file", "-"], { input: body, cwd });
@@ -3561,7 +3263,7 @@ function writeStateFile(cwd, goalId, lastDispatchedIssue) {
 function gitTry(args, cwd) {
   const env = { ...process.env, SKIP_HOOKS: "1", HUSKY: "0" };
   try {
-    execFileSync11("git", args, { cwd, stdio: ["ignore", "pipe", "pipe"], env });
+    execFileSync10("git", args, { cwd, stdio: ["ignore", "pipe", "pipe"], env });
     return { ok: true, stderr: "" };
   } catch (err) {
     const e = err;
@@ -3643,8 +3345,8 @@ ${tail}
 }
 function createTaskIssue(finding, goalId, manifestNumber, cwd) {
   const labels = [`goal:${goalId}`, severityLabel(finding.severity), FINDING_LABEL];
-  ensureLabel2(`goal:${goalId}`, "1d76db", `goal: ${goalId}`, cwd);
-  ensureLabel2(FINDING_LABEL, "ededed", "kody: QA finding", cwd);
+  ensureLabel(`goal:${goalId}`, "1d76db", `goal: ${goalId}`, cwd);
+  ensureLabel(FINDING_LABEL, "ededed", "kody: QA finding", cwd);
   const title = `[${finding.severity}] ${finding.title}`.slice(0, 240);
   const body = buildIssueBody(finding, goalId, manifestNumber);
   const args = ["issue", "create", "--title", title, "--body-file", "-"];
@@ -3703,7 +3405,7 @@ QA_REPORT_POSTED=https://github.com/${ctx.config.github.owner}/${ctx.config.gith
       ctx.output.exitCode = verdict === "FAIL" ? 1 : 0;
       return;
     }
-    ensureLabel2(FINDING_LABEL, "ededed", "kody: QA finding", ctx.cwd);
+    ensureLabel(FINDING_LABEL, "ededed", "kody: QA finding", ctx.cwd);
     const scope2 = ctx.args.scope;
     const title = `QA [${verdict}]: ${scope2?.trim() || "smoke"} \u2014 ${todayIso()}`.slice(0, 240);
     let url = "";
@@ -3833,51 +3535,209 @@ QA_GOAL_TARGETED=(no manifest issue) (id: ${goalId}, verdict: ${verdict})
   ctx.output.exitCode = verdict === "FAIL" ? 1 : 0;
 };
 
+// src/goal/labels.ts
+function goalLabel(goalId) {
+  return `goal:${goalId}`;
+}
+
+// src/goal/operations.ts
+function fail(err) {
+  if (err instanceof Error) {
+    const lines = err.message.split("\n").filter(Boolean);
+    return { ok: false, error: lines[0] ?? err.message };
+  }
+  return { ok: false, error: String(err) };
+}
+function listGoalIssues(goalId, cwd) {
+  try {
+    const out = gh(
+      [
+        "api",
+        `repos/{owner}/{repo}/issues?labels=${goalLabel(goalId)}&state=all&per_page=100`,
+        "--jq",
+        "[.[] | select(.pull_request == null) | {number, state: (.state | ascii_upcase)}]"
+      ],
+      { cwd }
+    );
+    return { ok: true, value: JSON.parse(out) };
+  } catch (err) {
+    return fail(err);
+  }
+}
+function listOpenPrs(cwd) {
+  try {
+    const out = gh(
+      [
+        "pr",
+        "list",
+        "--state",
+        "open",
+        "--limit",
+        "200",
+        "--json",
+        "number,url,isDraft,headRefName,baseRefName,body"
+      ],
+      { cwd }
+    );
+    return { ok: true, value: JSON.parse(out) };
+  } catch (err) {
+    return fail(err);
+  }
+}
+function pairIssuesWithPrs(issues, openPrs) {
+  const prByIssue = /* @__PURE__ */ new Map();
+  for (const pr of openPrs) claimPrForIssue(pr, prByIssue);
+  return issues.map((i) => {
+    const pr = prByIssue.get(i.number);
+    let prState = "absent";
+    if (pr) prState = pr.isDraft ? "draft" : "ready";
+    return { number: i.number, state: i.state, prState };
+  });
+}
+function claimPrForIssue(pr, prByIssue) {
+  for (const issueNum of extractClosesIssues(pr.body)) {
+    if (!prByIssue.has(issueNum)) {
+      prByIssue.set(issueNum, pr);
+      return;
+    }
+  }
+  const headMatch = pr.headRefName.match(/^(\d+)-/);
+  if (headMatch) {
+    const n = Number.parseInt(headMatch[1], 10);
+    if (Number.isFinite(n) && !prByIssue.has(n)) prByIssue.set(n, pr);
+  }
+}
+function extractClosesIssues(body) {
+  const out = [];
+  const re = /\b(?:close[sd]?|fix(?:e[sd])?|resolve[sd]?)\s+#(\d+)\b/gi;
+  for (let m = re.exec(body); m !== null; m = re.exec(body)) {
+    const n = Number.parseInt(m[1], 10);
+    if (Number.isFinite(n)) out.push(n);
+  }
+  return out;
+}
+function pickLeafPr(prs) {
+  if (prs.length === 0) return void 0;
+  const bases = new Set(prs.map((p) => p.baseRefName));
+  const leaves = prs.filter((p) => !bases.has(p.headRefName));
+  return leaves.sort((a, b) => b.number - a.number)[0];
+}
+function commentOnIssue(issueNumber, body, cwd) {
+  try {
+    gh(["issue", "comment", String(issueNumber), "--body", body], { cwd });
+    return { ok: true };
+  } catch (err) {
+    return fail(err);
+  }
+}
+function closeIssue(issueNumber, options, cwd) {
+  try {
+    if (options.comment) {
+      gh(["issue", "comment", String(issueNumber), "--body", options.comment], { cwd });
+    }
+    const args = ["issue", "close", String(issueNumber)];
+    if (options.reason) args.push("--reason", options.reason);
+    gh(args, { cwd });
+    return { ok: true };
+  } catch (err) {
+    return fail(err);
+  }
+}
+function closePr(prNumber, comment, cwd) {
+  try {
+    gh(["pr", "close", String(prNumber), "--comment", comment], { cwd });
+    return { ok: true };
+  } catch (err) {
+    return fail(err);
+  }
+}
+function mergePrSquash(prNumber, cwd) {
+  try {
+    gh(["pr", "merge", String(prNumber), "--squash", "--delete-branch"], { cwd });
+    return { ok: true };
+  } catch (err) {
+    return fail(err);
+  }
+}
+function markPrReady(prNumber, cwd) {
+  try {
+    gh(["pr", "ready", String(prNumber)], { cwd });
+    return { ok: true };
+  } catch (err) {
+    return fail(err);
+  }
+}
+
 // src/goal/phase.ts
 function derivePhase(snap) {
-  if (snap.lifecycleState === void 0) return "missing";
+  if (!snap.lifecycleState) return "missing";
   if (snap.lifecycleState === "abandoned") return "abandoned";
   if (snap.lifecycleState === "closed" || snap.lifecycleState === "done") return "terminal";
-  if (snap.childTasks.length === 0) return "no-tasks";
-  const allClosed = snap.childTasks.every((t) => t.state === "CLOSED");
-  if (allClosed) return "all-done";
-  const anyFailed = snap.childTasks.some((t) => t.labels.includes(FAILED_LABEL));
-  if (anyFailed) return "blocked-by-failure";
-  const inFlight = snap.childTasks.some((t) => t.state === "OPEN" && t.labels.includes(DISPATCHED_LABEL));
-  if (inFlight) return "in-flight";
-  const dispatchable = snap.childTasks.some((t) => t.state === "OPEN" && !t.labels.includes(DISPATCHED_LABEL));
+  const hasInFlight = snap.childTasks.some((t) => t.state === "OPEN" && t.prState === "draft");
+  if (hasInFlight) return "in-flight";
+  if (snap.childTasks.length === 0) return "idle";
+  const allDone = snap.childTasks.every((t) => t.state === "CLOSED" || t.prState === "ready");
+  if (allDone) return "all-done";
+  const dispatchable = snap.childTasks.some((t) => t.state === "OPEN" && t.prState === "absent");
   if (dispatchable) return "ready-to-dispatch";
   return "idle";
 }
 function pickNextDispatchable(snap) {
-  const candidates = snap.childTasks.filter((t) => t.state === "OPEN" && !t.labels.includes(DISPATCHED_LABEL)).sort((a, b) => a.number - b.number);
-  return candidates[0];
+  return snap.childTasks.filter((t) => t.state === "OPEN" && t.prState === "absent").sort((a, b) => a.number - b.number)[0];
 }
 
 // src/scripts/deriveGoalPhase.ts
 var deriveGoalPhase = async (ctx) => {
   const goal = ctx.data.goal;
   if (!goal) return;
-  const issues = listGoalIssues(goal.id, goal.goalIssueNumber, ctx.cwd);
+  const issues = listGoalIssues(goal.id, ctx.cwd);
   if (!issues.ok) {
-    process.stderr.write(`[goal-tick] deriveGoalPhase: list failed: ${issues.error}
+    process.stderr.write(`[goal-tick] deriveGoalPhase: list issues failed: ${issues.error}
 `);
     goal.childTasks = [];
+    goal.openTaskPrs = [];
+    goal.phase = "idle";
+    return;
+  }
+  const rawIssues = issues.value ?? [];
+  const allPrs = listOpenPrs(ctx.cwd);
+  if (!allPrs.ok) {
+    process.stderr.write(`[goal-tick] deriveGoalPhase: list PRs failed: ${allPrs.error}
+`);
+    goal.childTasks = rawIssues.map((i) => ({ ...i, prState: "absent" }));
+    goal.openTaskPrs = [];
     goal.phase = "idle";
     return;
   }
-  const childTasks = issues.value ?? [];
-  goal.childTasks = childTasks;
+  const taskPrs = filterGoalTaskPrs(allPrs.value ?? [], rawIssues.map((i) => i.number));
+  goal.openTaskPrs = taskPrs;
+  goal.leafPr = pickLeafPr(taskPrs);
+  goal.childTasks = pairIssuesWithPrs(rawIssues, taskPrs);
   goal.phase = derivePhase({
     lifecycleState: goal.state,
-    childTasks
+    childTasks: goal.childTasks
   });
-  process.stdout.write(`[goal-tick] phase=${goal.phase} goal=${goal.id} tasks=${childTasks.length}
-`);
+  process.stdout.write(
+    `[goal-tick] phase=${goal.phase} goal=${goal.id} tasks=${rawIssues.length} stack=${taskPrs.length}` + (goal.leafPr ? ` leaf=#${goal.leafPr.number}` : "") + "\n"
+  );
 };
+function filterGoalTaskPrs(prs, taskIssueNumbers) {
+  const taskSet = new Set(taskIssueNumbers);
+  return prs.filter((pr) => {
+    for (const n of extractClosesIssues(pr.body)) {
+      if (taskSet.has(n)) return true;
+    }
+    const headMatch = pr.headRefName.match(/^(\d+)-/);
+    if (headMatch) {
+      const n = Number.parseInt(headMatch[1], 10);
+      if (Number.isFinite(n) && taskSet.has(n)) return true;
+    }
+    return false;
+  });
+}
 
 // src/scripts/diagMcp.ts
-import { execFileSync as execFileSync12 } from "child_process";
+import { execFileSync as execFileSync11 } from "child_process";
 import * as fs15 from "fs";
 import * as os3 from "os";
 import * as path15 from "path";
@@ -3897,7 +3757,7 @@ var diagMcp = async (_ctx) => {
   process.stderr.write(`[kody diag] chromium present: ${hasChromium ? "yes" : "no"}
 `);
   try {
-    const v = execFileSync12("npx", ["-y", "--package=@playwright/mcp@latest", "--", "playwright-mcp", "--version"], {
+    const v = execFileSync11("npx", ["-y", "--package=@playwright/mcp@latest", "--", "playwright-mcp", "--version"], {
       stdio: "pipe",
       timeout: 6e4,
       encoding: "utf8"
@@ -4399,7 +4259,7 @@ var discoverQaContext = async (ctx) => {
 };
 
 // src/scripts/dispatch.ts
-import { execFileSync as execFileSync13 } from "child_process";
+import { execFileSync as execFileSync12 } from "child_process";
 var API_TIMEOUT_MS4 = 3e4;
 var dispatch = async (ctx, _profile, _agentResult, args) => {
   const next = args?.next;
@@ -4435,7 +4295,7 @@ var dispatch = async (ctx, _profile, _agentResult, args) => {
   const sub = usePr ? "pr" : "issue";
   const body = `@kody ${next}`;
   try {
-    execFileSync13("gh", [sub, "comment", String(targetNumber), "--body", body], {
+    execFileSync12("gh", [sub, "comment", String(targetNumber), "--body", body], {
       timeout: API_TIMEOUT_MS4,
       cwd: ctx.cwd,
       stdio: ["ignore", "pipe", "pipe"]
@@ -4455,7 +4315,7 @@ function parsePr(url) {
 }
 
 // src/scripts/dispatchClassified.ts
-import { execFileSync as execFileSync14 } from "child_process";
+import { execFileSync as execFileSync13 } from "child_process";
 var API_TIMEOUT_MS5 = 3e4;
 var VALID_CLASSES2 = /* @__PURE__ */ new Set(["feature", "bug", "spec", "chore"]);
 var dispatchClassified = async (ctx) => {
@@ -4464,7 +4324,7 @@ var dispatchClassified = async (ctx) => {
   const classification = ctx.data.classification;
   if (!classification || !VALID_CLASSES2.has(classification)) return;
   try {
-    execFileSync14("gh", ["issue", "comment", String(issueNumber), "--body", `@kody ${classification}`], {
+    execFileSync13("gh", ["issue", "comment", String(issueNumber), "--body", `@kody ${classification}`], {
       cwd: ctx.cwd,
       timeout: API_TIMEOUT_MS5,
       stdio: ["ignore", "pipe", "pipe"]
@@ -5095,129 +4955,25 @@ function listIssuesByLabel(label, cwd) {
 // src/scripts/dispatchNextTask.ts
 var dispatchNextTask = async (ctx) => {
   const goal = ctx.data.goal;
-  if (!goal?.childTasks) return;
-  const next = pickNextDispatchable({
-    lifecycleState: goal.state,
-    childTasks: goal.childTasks
-  });
-  if (!next) {
-    process.stdout.write("[goal-tick] no undispatched open task \u2014 idle\n");
-    return;
-  }
-  process.stdout.write(`[goal-tick] dispatching @kody on task #${next.number} (--base ${goal.goalBranch})
-`);
-  const comment = commentOnIssue(next.number, `@kody --base ${goal.goalBranch}`, ctx.cwd);
-  if (!comment.ok) {
-    process.stderr.write(`[goal-tick] dispatchNextTask: comment failed on #${next.number}: ${comment.error}
-`);
-    return;
-  }
-  const label = addLabel2(next.number, DISPATCHED_LABEL, ctx.cwd);
-  if (!label.ok) {
-    process.stderr.write(
-      `[goal-tick] dispatchNextTask: add-label failed on #${next.number}: ${label.error} (continuing \u2014 comment already posted)
-`
-    );
-  }
-  goal.lastDispatchedIssue = next.number;
-};
-
-// src/scripts/ensureGoalBranch.ts
-var ensureGoalBranch = async (ctx) => {
-  const goal = ctx.data.goal;
-  if (!goal) return;
-  fetchOrigin(ctx.cwd);
-  if (remoteBranchExists(goal.goalBranch, ctx.cwd)) {
-    process.stdout.write(`[goal-tick] origin/${goal.goalBranch} already exists \u2014 leaving as-is
-`);
-    return;
-  }
-  if (!remoteBranchExists(goal.defaultBranch, ctx.cwd)) {
-    process.stderr.write(`[goal-tick] cannot create goal branch: origin/${goal.defaultBranch} missing
-`);
-    return;
-  }
-  process.stdout.write(`[goal-tick] creating origin/${goal.goalBranch} from origin/${goal.defaultBranch}
-`);
-  const r = createBranchFrom(goal.goalBranch, goal.defaultBranch, ctx.cwd);
-  if (!r.ok) {
-    process.stderr.write(
-      `[goal-tick] push of ${goal.goalBranch} failed: ${r.error} \u2014 task dispatch will fall back to defaultBranch
-`
-    );
-  }
-};
-
-// src/scripts/ensureGoalPr.ts
-var ensureGoalPr = async (ctx) => {
-  const goal = ctx.data.goal;
-  if (!goal) return;
-  if (goal.goalPrUrl) return;
-  if (!remoteBranchExists(goal.goalBranch, ctx.cwd)) return;
-  const existing = listPrsByHead(goal.goalBranch, "open", ctx.cwd);
-  if (existing.ok && existing.value && existing.value.length > 0) {
-    goal.goalPrUrl = existing.value[0].url;
-    return;
-  }
-  const title = `goal: ${goal.id}`;
-  const body = goal.goalIssueNumber ? `Tracking integration PR for goal **${goal.id}**.
-
-Child task PRs merge into \`${goal.goalBranch}\`. This PR is held in **draft** until every task is complete, then promoted to ready-for-review by goal-tick.
-
-Closes #${goal.goalIssueNumber}
-` : `Tracking integration PR for goal **${goal.id}**.
-
-Child task PRs merge into \`${goal.goalBranch}\`. Held in **draft** until every task is complete.
-`;
-  const created = createPr(
-    {
-      head: goal.goalBranch,
-      base: goal.defaultBranch,
-      title,
-      body,
-      draft: true
-    },
-    ctx.cwd
-  );
-  if (!created.ok) {
-    process.stderr.write(
-      `[goal-tick] ensureGoalPr: gh pr create failed: ${created.error} (continuing without goal PR)
-`
-    );
-    return;
-  }
-  process.stdout.write(`[goal-tick] opened draft goal PR ${created.value} for ${goal.id}
-`);
-  goal.goalPrUrl = created.value;
-};
-
-// src/scripts/ensureLifecycleLabels.ts
-var ensureLifecycleLabels = async (ctx) => {
-  const goal = ctx.data.goal;
-  if (!goal) return;
-  for (const spec of TICK_LABELS) {
-    const r2 = ensureLabel(spec.name, spec.color, spec.description, ctx.cwd);
-    if (!r2.ok) {
-      process.stderr.write(`[goal-tick] ensureLifecycleLabels: ${spec.name}: ${r2.error}
-`);
-    }
+  if (!goal?.childTasks) return;
+  const next = pickNextDispatchable({
+    lifecycleState: goal.state,
+    childTasks: goal.childTasks
+  });
+  if (!next) {
+    process.stdout.write("[goal-tick] no dispatchable task \u2014 idle\n");
+    return;
   }
-  const goalLbl = goalLabel(goal.id);
-  const r = ensureLabel(goalLbl, "0e8a16", `kody goal task: belongs to goal ${goal.id}`, ctx.cwd);
-  if (!r.ok) {
-    process.stderr.write(`[goal-tick] ensureLifecycleLabels: ${goalLbl}: ${r.error}
+  const base = goal.leafPr?.headRefName ?? goal.defaultBranch;
+  process.stdout.write(`[goal-tick] dispatching @kody on #${next.number} (--base ${base})
 `);
-  }
-  const u = ensureLabel(
-    UMBRELLA_BUILDING_LABEL,
-    "1d76db",
-    "kody: in-flight (work being assembled on a branch)",
-    ctx.cwd
-  );
-  if (!u.ok) {
-    process.stderr.write(`[goal-tick] ensureLifecycleLabels: ${UMBRELLA_BUILDING_LABEL}: ${u.error}
+  const comment = commentOnIssue(next.number, `@kody --base ${base}`, ctx.cwd);
+  if (!comment.ok) {
+    process.stderr.write(`[goal-tick] dispatchNextTask: comment failed on #${next.number}: ${comment.error}
 `);
+    return;
   }
+  goal.lastDispatchedIssue = next.number;
 };
 
 // src/pr.ts
@@ -5487,203 +5243,41 @@ function collectExpectedTests(raw) {
   return out;
 }
 
-// src/scripts/ensureUmbrellaIssue.ts
-var ensureUmbrellaIssue = async (ctx) => {
-  const goal = ctx.data.goal;
-  if (!goal) return;
-  if (goal.goalIssueNumber !== void 0) return;
-  const title = `goal: ${goal.id}`;
-  const body = `Umbrella issue for goal **${goal.id}**.
-
-Closed automatically when the goal PR (\`${goal.goalBranch}\` \u2192 \`${goal.defaultBranch}\`) merges.
-`;
-  const existing = findUmbrellaByTitle(goal.id, title, ctx.cwd);
-  if (existing.ok && existing.value !== null && existing.value !== void 0) {
-    process.stdout.write(`[goal-tick] adopted existing umbrella issue #${existing.value} for ${goal.id}
-`);
-    goal.goalIssueNumber = existing.value;
-    return;
-  }
-  const created = createIssue(
-    {
-      title,
-      body,
-      labels: [goalLabel(goal.id), UMBRELLA_BUILDING_LABEL]
-    },
-    ctx.cwd
-  );
-  if (!created.ok) {
-    process.stderr.write(
-      `[goal-tick] ensureUmbrellaIssue: gh issue create failed: ${created.error} \u2014 continuing without umbrella issue
-`
-    );
-    return;
-  }
-  process.stdout.write(`[goal-tick] opened umbrella issue #${created.value} for ${goal.id}
-`);
-  goal.goalIssueNumber = created.value;
-};
-
-// src/goal/state.ts
-import * as fs20 from "fs";
-import * as path20 from "path";
-var VALID_STATES = /* @__PURE__ */ new Set(["active", "abandoned", "closed", "done"]);
-var GoalStateError = class extends Error {
-  constructor(path29, message) {
-    super(`Invalid goal state at ${path29}:
-  ${message}`);
-    this.path = path29;
-    this.name = "GoalStateError";
-  }
-  path;
-};
-function parseGoalState(filePath, raw) {
-  if (!raw || typeof raw !== "object" || Array.isArray(raw)) {
-    throw new GoalStateError(filePath, "must be a JSON object");
-  }
-  const r = raw;
-  const stateValue = r.state;
-  if (typeof stateValue !== "string" || !VALID_STATES.has(stateValue)) {
-    throw new GoalStateError(
-      filePath,
-      `"state" is required and must be one of: ${[...VALID_STATES].join(" | ")} (got ${JSON.stringify(stateValue)})`
-    );
-  }
-  const parsed = {
-    state: stateValue,
-    extra: {}
-  };
-  if (typeof r.goalIssueNumber === "number" && Number.isFinite(r.goalIssueNumber)) {
-    parsed.goalIssueNumber = r.goalIssueNumber;
-  }
-  if (typeof r.lastDispatchedIssue === "number" && Number.isFinite(r.lastDispatchedIssue)) {
-    parsed.lastDispatchedIssue = r.lastDispatchedIssue;
-  }
-  if (typeof r.goalPrUrl === "string" && r.goalPrUrl.length > 0) {
-    parsed.goalPrUrl = r.goalPrUrl;
-  }
-  for (const ts of ["updatedAt", "createdAt", "startedAt", "completedAt"]) {
-    const v = r[ts];
-    if (typeof v === "string" && v.length > 0) parsed[ts] = v;
-  }
-  const known = /* @__PURE__ */ new Set([
-    "state",
-    "goalIssueNumber",
-    "lastDispatchedIssue",
-    "goalPrUrl",
-    "updatedAt",
-    "createdAt",
-    "startedAt",
-    "completedAt"
-  ]);
-  for (const [k, v] of Object.entries(r)) {
-    if (!known.has(k)) parsed.extra[k] = v;
-  }
-  return parsed;
-}
-function serializeGoalState(s) {
-  const obj = { ...s.extra, state: s.state };
-  if (s.goalIssueNumber !== void 0) obj.goalIssueNumber = s.goalIssueNumber;
-  if (s.lastDispatchedIssue !== void 0) obj.lastDispatchedIssue = s.lastDispatchedIssue;
-  if (s.goalPrUrl !== void 0) obj.goalPrUrl = s.goalPrUrl;
-  if (s.createdAt !== void 0) obj.createdAt = s.createdAt;
-  if (s.startedAt !== void 0) obj.startedAt = s.startedAt;
-  if (s.completedAt !== void 0) obj.completedAt = s.completedAt;
-  if (s.updatedAt !== void 0) obj.updatedAt = s.updatedAt;
-  return `${JSON.stringify(obj, null, 2)}
-`;
-}
-function goalStatePath(cwd, goalId) {
-  return path20.join(cwd, ".kody", "goals", goalId, "state.json");
-}
-function readGoalState(cwd, goalId) {
-  const file = goalStatePath(cwd, goalId);
-  if (!fs20.existsSync(file)) {
-    throw new GoalStateError(file, "file not found");
-  }
-  let raw;
-  try {
-    raw = JSON.parse(fs20.readFileSync(file, "utf-8"));
-  } catch (err) {
-    throw new GoalStateError(file, `invalid JSON: ${err instanceof Error ? err.message : String(err)}`);
-  }
-  return parseGoalState(file, raw);
-}
-function writeGoalState(cwd, goalId, state) {
-  const file = goalStatePath(cwd, goalId);
-  fs20.mkdirSync(path20.dirname(file), { recursive: true });
-  fs20.writeFileSync(file, serializeGoalState(state), "utf-8");
-}
-function nowIso() {
-  return (/* @__PURE__ */ new Date()).toISOString().replace(/\.\d{3}Z$/, "Z");
-}
-
 // src/scripts/finalizeGoal.ts
 var finalizeGoal = async (ctx) => {
   const goal = ctx.data.goal;
   if (!goal) return;
-  process.stdout.write(`[goal-tick] all task(s) closed \u2014 finalising goal ${goal.id}
-`);
-  if (!remoteBranchExists(goal.goalBranch, ctx.cwd)) {
-    process.stderr.write(`[goal-tick] goal branch ${goal.goalBranch} not found on origin \u2014 skipping final PR
-`);
-    finishState(goal);
-    return;
-  }
-  const title = `goal: ${goal.id}`;
-  const closesLine = goal.goalIssueNumber ? `
-
-Closes #${goal.goalIssueNumber}
-` : "\n";
-  const body = `Final integration PR for goal **${goal.id}**.
-
-All task issues are closed and merged into \`${goal.goalBranch}\`. Ready for review.${closesLine}`;
-  const existing = listPrsByHead(goal.goalBranch, "open", ctx.cwd);
-  if (existing.ok && existing.value && existing.value.length > 0) {
-    const pr = existing.value[0];
-    goal.goalPrUrl = pr.url;
-    const edit = editPrBody(pr.number, body, ctx.cwd);
-    if (!edit.ok) {
-      process.stderr.write(`[goal-tick] finalizeGoal: editPrBody failed: ${edit.error}
+  process.stdout.write(`[goal-tick] all task(s) done \u2014 finalising goal ${goal.id}
 `);
-    }
-    if (pr.isDraft) {
-      process.stdout.write(`[goal-tick] promoting draft goal PR #${pr.number} to ready-for-review
+  const leaf = goal.leafPr;
+  if (leaf) {
+    if (leaf.isDraft) {
+      process.stdout.write(`[goal-tick] promoting draft leaf PR #${leaf.number} \u2192 ready
 `);
-      const ready = markPrReady(pr.number, ctx.cwd);
+      const ready = markPrReady(leaf.number, ctx.cwd);
       if (!ready.ok) {
         process.stderr.write(`[goal-tick] finalizeGoal: markPrReady failed: ${ready.error}
 `);
+        return;
       }
     }
-  } else {
-    const created = createPr(
-      {
-        head: goal.goalBranch,
-        base: goal.defaultBranch,
-        title,
-        body,
-        // ready-for-review (not draft) since we're finalizing.
-        draft: false
-      },
-      ctx.cwd
-    );
-    if (!created.ok) {
-      process.stderr.write(`[goal-tick] finalizeGoal: gh pr create failed: ${created.error}
+    process.stdout.write(`[goal-tick] squash-merging leaf PR #${leaf.number}
 `);
-    } else {
-      goal.goalPrUrl = created.value;
+    const merged = mergePrSquash(leaf.number, ctx.cwd);
+    if (!merged.ok) {
+      process.stderr.write(`[goal-tick] finalizeGoal: mergePrSquash failed: ${merged.error}
+`);
+      return;
     }
+  } else {
+    process.stdout.write(`[goal-tick] no leaf PR \u2014 marking goal done without merge
+`);
   }
-  finishState(goal);
-};
-function finishState(goal) {
   goal.state = "done";
-  goal.completedAt = nowIso();
-}
+};
 
 // src/scripts/finishFlow.ts
-import { execFileSync as execFileSync15 } from "child_process";
+import { execFileSync as execFileSync14 } from "child_process";
 var API_TIMEOUT_MS6 = 3e4;
 var STATUS_ICON = {
   "review-passed": "\u2705",
@@ -5717,7 +5311,7 @@ var finishFlow = async (ctx, _profile, _agentResult, args) => {
 **PR:** ${state.core.prUrl}` : "";
   const body = `${icon} kody flow \`${flowName}\` finished \u2014 \`${reason}\`${prSuffix}`;
   try {
-    execFileSync15("gh", ["issue", "comment", String(issueNumber), "--body", body], {
+    execFileSync14("gh", ["issue", "comment", String(issueNumber), "--body", body], {
       timeout: API_TIMEOUT_MS6,
       cwd: ctx.cwd,
       stdio: ["ignore", "pipe", "pipe"]
@@ -5731,7 +5325,7 @@ var finishFlow = async (ctx, _profile, _agentResult, args) => {
 };
 
 // src/branch.ts
-import { execFileSync as execFileSync16 } from "child_process";
+import { execFileSync as execFileSync15 } from "child_process";
 var UncommittedChangesError = class extends Error {
   constructor(branch) {
     super(`Uncommitted changes on branch '${branch}' \u2014 refusing to run to protect work in progress`);
@@ -5741,7 +5335,7 @@ var UncommittedChangesError = class extends Error {
   branch;
 };
 function git2(args, cwd) {
-  return execFileSync16("git", args, {
+  return execFileSync15("git", args, {
     encoding: "utf-8",
     timeout: 3e4,
     cwd,
@@ -5766,7 +5360,15 @@ function checkoutPrBranch(prNumber, cwd) {
     SKIP_HOOKS: "1",
     GH_TOKEN: process.env.GH_PAT?.trim() || process.env.GH_TOKEN || ""
   };
-  execFileSync16("gh", ["pr", "checkout", String(prNumber)], {
+  try {
+    execFileSync15("git", ["reset", "--hard", "HEAD"], { cwd, env, stdio: ["ignore", "pipe", "pipe"], timeout: 3e4 });
+  } catch {
+  }
+  try {
+    execFileSync15("git", ["clean", "-fd"], { cwd, env, stdio: ["ignore", "pipe", "pipe"], timeout: 3e4 });
+  } catch {
+  }
+  execFileSync15("gh", ["pr", "checkout", String(prNumber)], {
     cwd,
     env,
     stdio: ["ignore", "pipe", "pipe"],
@@ -5880,8 +5482,8 @@ function ensureFeatureBranch(issueNumber, title, defaultBranch, cwd, baseBranch)
 }
 
 // src/gha.ts
-import { execFileSync as execFileSync17 } from "child_process";
-import * as fs21 from "fs";
+import { execFileSync as execFileSync16 } from "child_process";
+import * as fs20 from "fs";
 function getRunUrl() {
   const server = process.env.GITHUB_SERVER_URL;
   const repo = process.env.GITHUB_REPOSITORY;
@@ -5892,10 +5494,10 @@ function getRunUrl() {
 function reactToTriggerComment(cwd) {
   if (process.env.GITHUB_EVENT_NAME !== "issue_comment") return;
   const eventPath = process.env.GITHUB_EVENT_PATH;
-  if (!eventPath || !fs21.existsSync(eventPath)) return;
+  if (!eventPath || !fs20.existsSync(eventPath)) return;
   let event = null;
   try {
-    event = JSON.parse(fs21.readFileSync(eventPath, "utf-8"));
+    event = JSON.parse(fs20.readFileSync(eventPath, "utf-8"));
   } catch {
     return;
   }
@@ -5923,7 +5525,7 @@ function reactToTriggerComment(cwd) {
   for (let attempt = 0; attempt < 3; attempt++) {
     if (attempt > 0) sleepMs(attempt === 1 ? 500 : 1500);
     try {
-      execFileSync17("gh", args, opts);
+      execFileSync16("gh", args, opts);
       return;
     } catch (err) {
       lastErr = err;
@@ -5936,13 +5538,13 @@ function reactToTriggerComment(cwd) {
 }
 function sleepMs(ms) {
   try {
-    execFileSync17("sleep", [(ms / 1e3).toString()], { stdio: "ignore", timeout: ms + 1e3 });
+    execFileSync16("sleep", [(ms / 1e3).toString()], { stdio: "ignore", timeout: ms + 1e3 });
   } catch {
   }
 }
 
 // src/workflow.ts
-import { execFileSync as execFileSync18 } from "child_process";
+import { execFileSync as execFileSync17 } from "child_process";
 var GH_TIMEOUT_MS = 3e4;
 function ghToken3() {
   return process.env.GH_PAT?.trim() || process.env.GH_TOKEN;
@@ -5950,7 +5552,7 @@ function ghToken3() {
 function gh3(args, cwd) {
   const token = ghToken3();
   const env = token ? { ...process.env, GH_TOKEN: token } : { ...process.env };
-  return execFileSync18("gh", args, {
+  return execFileSync17("gh", args, {
     encoding: "utf-8",
     timeout: GH_TIMEOUT_MS,
     cwd,
@@ -6139,13 +5741,15 @@ var handleAbandonedGoal = async (ctx) => {
   if (!goal || goal.state !== "abandoned") return;
   process.stdout.write(`[goal-tick] ${goal.id} is abandoned \u2014 running cleanup
 `);
-  const issues = listGoalIssues(goal.id, goal.goalIssueNumber, ctx.cwd);
+  const issues = listGoalIssues(goal.id, ctx.cwd);
   if (!issues.ok) {
-    process.stderr.write(`[goal-tick] handleAbandonedGoal: list failed: ${issues.error}
+    process.stderr.write(`[goal-tick] handleAbandonedGoal: list issues failed: ${issues.error}
 `);
   } else {
+    const issueNumbers = /* @__PURE__ */ new Set();
     for (const i of issues.value ?? []) {
       if (i.state !== "OPEN") continue;
+      issueNumbers.add(i.number);
       const r = closeIssue(
         i.number,
         {
@@ -6159,37 +5763,41 @@ var handleAbandonedGoal = async (ctx) => {
 `);
       }
     }
-  }
-  const goalPrs = listPrsByHead(goal.goalBranch, "open", ctx.cwd);
-  if (goalPrs.ok && goalPrs.value && goalPrs.value.length > 0) {
-    const pr = goalPrs.value[0];
-    const r = closePr(pr.number, "_Goal abandoned by operator \u2014 closing without merge._", ctx.cwd);
-    if (!r.ok) {
-      process.stderr.write(`[goal-tick] handleAbandonedGoal: failed to close goal PR #${pr.number}: ${r.error}
+    const prs = listOpenPrs(ctx.cwd);
+    if (prs.ok) {
+      for (const pr of prs.value ?? []) {
+        const headMatch = pr.headRefName.match(/^(\d+)-/);
+        const headIssue = headMatch ? Number.parseInt(headMatch[1], 10) : NaN;
+        if (!Number.isFinite(headIssue) || !issueNumbers.has(headIssue)) continue;
+        const r = closePr(pr.number, "_Goal abandoned \u2014 closing stacked PR._", ctx.cwd);
+        if (!r.ok) {
+          process.stderr.write(`[goal-tick] handleAbandonedGoal: failed to close PR #${pr.number}: ${r.error}
 `);
+        }
+      }
     }
   }
   goal.state = "closed";
 };
 
 // src/scripts/initFlow.ts
-import { execFileSync as execFileSync19 } from "child_process";
-import * as fs23 from "fs";
-import * as path22 from "path";
-
-// src/scripts/loadQaGuide.ts
+import { execFileSync as execFileSync18 } from "child_process";
 import * as fs22 from "fs";
 import * as path21 from "path";
+
+// src/scripts/loadQaGuide.ts
+import * as fs21 from "fs";
+import * as path20 from "path";
 var QA_GUIDE_REL_PATH = ".kody/qa-guide.md";
 var loadQaGuide = async (ctx) => {
-  const full = path21.join(ctx.cwd, QA_GUIDE_REL_PATH);
-  if (!fs22.existsSync(full)) {
+  const full = path20.join(ctx.cwd, QA_GUIDE_REL_PATH);
+  if (!fs21.existsSync(full)) {
     ctx.data.qaGuide = "";
     ctx.data.qaGuidePath = "";
     return;
   }
   try {
-    ctx.data.qaGuide = fs22.readFileSync(full, "utf-8");
+    ctx.data.qaGuide = fs21.readFileSync(full, "utf-8");
     ctx.data.qaGuidePath = QA_GUIDE_REL_PATH;
   } catch {
     ctx.data.qaGuide = "";
@@ -6199,9 +5807,9 @@ var loadQaGuide = async (ctx) => {
 
 // src/scripts/initFlow.ts
 function detectPackageManager(cwd) {
-  if (fs23.existsSync(path22.join(cwd, "pnpm-lock.yaml"))) return "pnpm";
-  if (fs23.existsSync(path22.join(cwd, "yarn.lock"))) return "yarn";
-  if (fs23.existsSync(path22.join(cwd, "bun.lockb"))) return "bun";
+  if (fs22.existsSync(path21.join(cwd, "pnpm-lock.yaml"))) return "pnpm";
+  if (fs22.existsSync(path21.join(cwd, "yarn.lock"))) return "yarn";
+  if (fs22.existsSync(path21.join(cwd, "bun.lockb"))) return "bun";
   return "npm";
 }
 function qualityCommandsFor(pm) {
@@ -6214,7 +5822,7 @@ function qualityCommandsFor(pm) {
 function detectOwnerRepo(cwd) {
   let url;
   try {
-    url = execFileSync19("git", ["remote", "get-url", "origin"], {
+    url = execFileSync18("git", ["remote", "get-url", "origin"], {
       cwd,
       encoding: "utf-8",
       stdio: ["ignore", "pipe", "pipe"]
@@ -6299,7 +5907,7 @@ jobs:
 `;
 function defaultBranchFromGit(cwd) {
   try {
-    const ref = execFileSync19("git", ["symbolic-ref", "refs/remotes/origin/HEAD"], {
+    const ref = execFileSync18("git", ["symbolic-ref", "refs/remotes/origin/HEAD"], {
       cwd,
       encoding: "utf-8",
       stdio: ["ignore", "pipe", "pipe"]
@@ -6307,7 +5915,7 @@ function defaultBranchFromGit(cwd) {
     return ref.replace("refs/remotes/origin/", "");
   } catch {
     try {
-      return execFileSync19("git", ["branch", "--show-current"], {
+      return execFileSync18("git", ["branch", "--show-current"], {
         cwd,
         encoding: "utf-8",
         stdio: ["ignore", "pipe", "pipe"]
@@ -6323,48 +5931,48 @@ function performInit(cwd, force) {
   const pm = detectPackageManager(cwd);
   const ownerRepo = detectOwnerRepo(cwd);
   const defaultBranch = defaultBranchFromGit(cwd);
-  const configPath = path22.join(cwd, "kody.config.json");
-  if (fs23.existsSync(configPath) && !force) {
+  const configPath = path21.join(cwd, "kody.config.json");
+  if (fs22.existsSync(configPath) && !force) {
     skipped.push("kody.config.json");
   } else {
     const cfg = makeConfig(pm, ownerRepo, defaultBranch);
-    fs23.writeFileSync(configPath, `${JSON.stringify(cfg, null, 2)}
+    fs22.writeFileSync(configPath, `${JSON.stringify(cfg, null, 2)}
 `);
     wrote.push("kody.config.json");
   }
-  const workflowDir = path22.join(cwd, ".github", "workflows");
-  const workflowPath = path22.join(workflowDir, "kody.yml");
-  if (fs23.existsSync(workflowPath) && !force) {
+  const workflowDir = path21.join(cwd, ".github", "workflows");
+  const workflowPath = path21.join(workflowDir, "kody.yml");
+  if (fs22.existsSync(workflowPath) && !force) {
     skipped.push(".github/workflows/kody.yml");
   } else {
-    fs23.mkdirSync(workflowDir, { recursive: true });
-    fs23.writeFileSync(workflowPath, WORKFLOW_TEMPLATE);
+    fs22.mkdirSync(workflowDir, { recursive: true });
+    fs22.writeFileSync(workflowPath, WORKFLOW_TEMPLATE);
     wrote.push(".github/workflows/kody.yml");
   }
-  const hasUi = fs23.existsSync(path22.join(cwd, "src/app")) || fs23.existsSync(path22.join(cwd, "app")) || fs23.existsSync(path22.join(cwd, "pages"));
+  const hasUi = fs22.existsSync(path21.join(cwd, "src/app")) || fs22.existsSync(path21.join(cwd, "app")) || fs22.existsSync(path21.join(cwd, "pages"));
   if (hasUi) {
-    const qaGuidePath = path22.join(cwd, QA_GUIDE_REL_PATH);
-    if (fs23.existsSync(qaGuidePath) && !force) {
+    const qaGuidePath = path21.join(cwd, QA_GUIDE_REL_PATH);
+    if (fs22.existsSync(qaGuidePath) && !force) {
       skipped.push(QA_GUIDE_REL_PATH);
     } else {
-      fs23.mkdirSync(path22.dirname(qaGuidePath), { recursive: true });
+      fs22.mkdirSync(path21.dirname(qaGuidePath), { recursive: true });
       const discovery = runQaDiscovery(cwd);
-      fs23.writeFileSync(qaGuidePath, generateQaGuideTemplate(discovery));
+      fs22.writeFileSync(qaGuidePath, generateQaGuideTemplate(discovery));
       wrote.push(QA_GUIDE_REL_PATH);
     }
   }
   const builtinJobs = listBuiltinJobs();
   if (builtinJobs.length > 0) {
-    const jobsDir = path22.join(cwd, ".kody", "jobs");
-    fs23.mkdirSync(jobsDir, { recursive: true });
+    const jobsDir = path21.join(cwd, ".kody", "jobs");
+    fs22.mkdirSync(jobsDir, { recursive: true });
     for (const job of builtinJobs) {
-      const rel = path22.join(".kody", "jobs", `${job.slug}.md`);
-      const target = path22.join(cwd, rel);
-      if (fs23.existsSync(target) && !force) {
+      const rel = path21.join(".kody", "jobs", `${job.slug}.md`);
+      const target = path21.join(cwd, rel);
+      if (fs22.existsSync(target) && !force) {
         skipped.push(rel);
         continue;
       }
-      fs23.writeFileSync(target, fs23.readFileSync(job.filePath, "utf-8"));
+      fs22.writeFileSync(target, fs22.readFileSync(job.filePath, "utf-8"));
       wrote.push(rel);
     }
   }
@@ -6376,12 +5984,12 @@ function performInit(cwd, force) {
       continue;
     }
     if (profile.kind !== "scheduled" || !profile.schedule) continue;
-    const target = path22.join(workflowDir, `kody-${exe.name}.yml`);
-    if (fs23.existsSync(target) && !force) {
+    const target = path21.join(workflowDir, `kody-${exe.name}.yml`);
+    if (fs22.existsSync(target) && !force) {
       skipped.push(`.github/workflows/kody-${exe.name}.yml`);
       continue;
     }
-    fs23.writeFileSync(target, renderScheduledWorkflow(exe.name, profile.schedule));
+    fs22.writeFileSync(target, renderScheduledWorkflow(exe.name, profile.schedule));
     wrote.push(`.github/workflows/kody-${exe.name}.yml`);
   }
   let labels;
@@ -6469,6 +6077,82 @@ var loadCoverageRules = async (ctx) => {
   ctx.data.coverageRules = ctx.config.testRequirements ?? [];
 };
 
+// src/goal/state.ts
+import * as fs23 from "fs";
+import * as path22 from "path";
+var VALID_STATES = /* @__PURE__ */ new Set(["active", "abandoned", "closed", "done"]);
+var GoalStateError = class extends Error {
+  constructor(path29, message) {
+    super(`Invalid goal state at ${path29}:
+  ${message}`);
+    this.path = path29;
+    this.name = "GoalStateError";
+  }
+  path;
+};
+function parseGoalState(filePath, raw) {
+  if (!raw || typeof raw !== "object" || Array.isArray(raw)) {
+    throw new GoalStateError(filePath, "must be a JSON object");
+  }
+  const r = raw;
+  const stateValue = r.state;
+  if (typeof stateValue !== "string" || !VALID_STATES.has(stateValue)) {
+    throw new GoalStateError(
+      filePath,
+      `"state" is required and must be one of: ${[...VALID_STATES].join(" | ")} (got ${JSON.stringify(stateValue)})`
+    );
+  }
+  const parsed = {
+    state: stateValue,
+    extra: {}
+  };
+  if (typeof r.lastDispatchedIssue === "number" && Number.isFinite(r.lastDispatchedIssue)) {
+    parsed.lastDispatchedIssue = r.lastDispatchedIssue;
+  }
+  for (const ts of ["updatedAt", "createdAt", "startedAt"]) {
+    const v = r[ts];
+    if (typeof v === "string" && v.length > 0) parsed[ts] = v;
+  }
+  const known = /* @__PURE__ */ new Set(["state", "lastDispatchedIssue", "updatedAt", "createdAt", "startedAt"]);
+  for (const [k, v] of Object.entries(r)) {
+    if (!known.has(k)) parsed.extra[k] = v;
+  }
+  return parsed;
+}
+function serializeGoalState(s) {
+  const obj = { ...s.extra, state: s.state };
+  if (s.lastDispatchedIssue !== void 0) obj.lastDispatchedIssue = s.lastDispatchedIssue;
+  if (s.createdAt !== void 0) obj.createdAt = s.createdAt;
+  if (s.startedAt !== void 0) obj.startedAt = s.startedAt;
+  if (s.updatedAt !== void 0) obj.updatedAt = s.updatedAt;
+  return `${JSON.stringify(obj, null, 2)}
+`;
+}
+function goalStatePath(cwd, goalId) {
+  return path22.join(cwd, ".kody", "goals", goalId, "state.json");
+}
+function readGoalState(cwd, goalId) {
+  const file = goalStatePath(cwd, goalId);
+  if (!fs23.existsSync(file)) {
+    throw new GoalStateError(file, "file not found");
+  }
+  let raw;
+  try {
+    raw = JSON.parse(fs23.readFileSync(file, "utf-8"));
+  } catch (err) {
+    throw new GoalStateError(file, `invalid JSON: ${err instanceof Error ? err.message : String(err)}`);
+  }
+  return parseGoalState(file, raw);
+}
+function writeGoalState(cwd, goalId, state) {
+  const file = goalStatePath(cwd, goalId);
+  fs23.mkdirSync(path22.dirname(file), { recursive: true });
+  fs23.writeFileSync(file, serializeGoalState(state), "utf-8");
+}
+function nowIso() {
+  return (/* @__PURE__ */ new Date()).toISOString().replace(/\.\d{3}Z$/, "Z");
+}
+
 // src/scripts/loadGoalState.ts
 var loadGoalState = async (ctx) => {
   const goalId = ctx.args.goal;
@@ -6489,18 +6173,14 @@ var loadGoalState = async (ctx) => {
     ctx.data.goal = {
       id: goalId,
       state: state.state,
-      goalIssueNumber: state.goalIssueNumber,
       lastDispatchedIssue: state.lastDispatchedIssue,
-      goalPrUrl: state.goalPrUrl,
       // Cache the full parsed object so saveGoalState can preserve `extra`.
       raw: state,
-      // `phase` is populated by deriveGoalPhase later in the chain. Initialize
-      // to undefined so runWhen on `data.goal.phase` can match correctly.
+      // `phase`, `childTasks`, `openTaskPrs`, `leafPr` are populated by
+      // deriveGoalPhase later in the chain. Initialize to undefined so
+      // runWhen on `data.goal.phase` can match correctly.
       phase: void 0,
-      // Populated by ensureGoalBranch / configured by config.git.defaultBranch.
-      defaultBranch: ctx.config.git.defaultBranch,
-      // Convenience derivations.
-      goalBranch: `goal-${goalId}`
+      defaultBranch: ctx.config.git.defaultBranch
     };
   } catch (err) {
     process.stdout.write(`[goal-tick] ${err instanceof Error ? err.message : String(err)}
@@ -6854,32 +6534,8 @@ var markFlowSuccess = async (ctx) => {
   }
 };
 
-// src/scripts/mergeReadyTaskPRs.ts
-var mergeReadyTaskPRs = async (ctx) => {
-  const goal = ctx.data.goal;
-  if (!goal) return;
-  const open = listPrsByBase(goal.goalBranch, "open", ctx.cwd);
-  if (!open.ok) {
-    process.stderr.write(`[goal-tick] mergeReadyTaskPRs: list failed: ${open.error}
-`);
-    return;
-  }
-  for (const pr of open.value ?? []) {
-    if (pr.isDraft) continue;
-    if (pr.mergeable !== "MERGEABLE") continue;
-    if (pr.mergeStateStatus !== "CLEAN") continue;
-    process.stdout.write(`[goal-tick] merging PR #${pr.number} into ${goal.goalBranch}
-`);
-    const r = mergePrSquash(pr.number, ctx.cwd);
-    if (!r.ok) {
-      process.stderr.write(`[goal-tick] failed to merge PR #${pr.number}: ${r.error} (continuing)
-`);
-    }
-  }
-};
-
 // src/scripts/mergeReleasePr.ts
-import { execFileSync as execFileSync20 } from "child_process";
+import { execFileSync as execFileSync19 } from "child_process";
 var API_TIMEOUT_MS7 = 6e4;
 var mergeReleasePr = async (ctx) => {
   const state = ctx.data.taskState;
@@ -6898,7 +6554,7 @@ var mergeReleasePr = async (ctx) => {
   process.stderr.write(`[kody mergeReleasePr] merging PR #${prNumber} (${prUrl})
 `);
   try {
-    const out = execFileSync20("gh", ["pr", "merge", String(prNumber), "--merge"], {
+    const out = execFileSync19("gh", ["pr", "merge", String(prNumber), "--merge"], {
       timeout: API_TIMEOUT_MS7,
       cwd: ctx.cwd,
       stdio: ["ignore", "pipe", "pipe"]
@@ -7016,7 +6672,7 @@ function buildIssueTitle(scope, verdict) {
   const verdictTag = verdict === "UNKNOWN" ? "REPORT" : verdict;
   return `QA [${verdictTag}]: ${focus} \u2014 ${date}`.slice(0, 240);
 }
-function ensureLabel3(cwd) {
+function ensureLabel2(cwd) {
   try {
     gh(["label", "create", QA_LABEL, "--color", "8b5cf6", "--description", "kody: QA report", "--force"], { cwd });
     return true;
@@ -7076,7 +6732,7 @@ QA_REPORT_POSTED=https://github.com/${ctx.config.github.owner}/${ctx.config.gith
   }
   const scope = ctx.args.scope;
   const title = buildIssueTitle(scope, verdict);
-  const hasLabel = ensureLabel3(ctx.cwd);
+  const hasLabel = ensureLabel2(ctx.cwd);
   let created;
   try {
     created = createQaIssue(title, reportBody, hasLabel, ctx.cwd);
@@ -7512,7 +7168,7 @@ ${body}`;
 }
 
 // src/scripts/recordClassification.ts
-import { execFileSync as execFileSync21 } from "child_process";
+import { execFileSync as execFileSync20 } from "child_process";
 var API_TIMEOUT_MS8 = 3e4;
 var VALID_CLASSES3 = /* @__PURE__ */ new Set(["feature", "bug", "spec", "chore"]);
 var recordClassification = async (ctx) => {
@@ -7560,7 +7216,7 @@ function parseClassification(prSummary) {
 }
 function tryAuditComment(issueNumber, body, cwd) {
   try {
-    execFileSync21("gh", ["issue", "comment", String(issueNumber), "--body", body], {
+    execFileSync20("gh", ["issue", "comment", String(issueNumber), "--body", body], {
       cwd,
       timeout: API_TIMEOUT_MS8,
       stdio: ["ignore", "pipe", "pipe"]
@@ -7683,7 +7339,7 @@ var resolveArtifacts = async (ctx, profile) => {
 };
 
 // src/scripts/resolveFlow.ts
-import { execFileSync as execFileSync22 } from "child_process";
+import { execFileSync as execFileSync21 } from "child_process";
 var CONFLICT_DIFF_MAX_BYTES = 4e4;
 var resolveFlow = async (ctx) => {
   const prNumber = ctx.args.pr;
@@ -7776,7 +7432,7 @@ function buildPreferBlock(prefer, baseBranch) {
 }
 function getConflictedFiles(cwd) {
   try {
-    const out = execFileSync22("git", ["diff", "--name-only", "--diff-filter=U"], {
+    const out = execFileSync21("git", ["diff", "--name-only", "--diff-filter=U"], {
       encoding: "utf-8",
       cwd,
       env: { ...process.env, HUSKY: "0" }
@@ -7791,7 +7447,7 @@ function getConflictMarkersPreview(files, cwd, maxBytes = CONFLICT_DIFF_MAX_BYTE
   let total = 0;
   for (const f of files) {
     try {
-      const content = execFileSync22("cat", [f], { encoding: "utf-8", cwd }).toString();
+      const content = execFileSync21("cat", [f], { encoding: "utf-8", cwd }).toString();
       const snippet = `### ${f}
 
 \`\`\`
@@ -7815,12 +7471,12 @@ function tryPostPr3(prNumber, body, cwd) {
 function pushEmptyCommit(branch, cwd) {
   const env = { ...process.env, HUSKY: "0", SKIP_HOOKS: "1" };
   try {
-    execFileSync22(
+    execFileSync21(
       "git",
       ["commit", "--allow-empty", "-m", "chore: kody resolve refresh \u2014 empty commit to recompute mergeable status"],
       { cwd, env, stdio: ["ignore", "pipe", "pipe"] }
     );
-    execFileSync22("git", ["push", "-u", "origin", branch], {
+    execFileSync21("git", ["push", "-u", "origin", branch], {
       cwd,
       env,
       stdio: ["ignore", "pipe", "pipe"]
@@ -7910,10 +7566,10 @@ var resolvePreviewUrl = async (ctx) => {
 };
 
 // src/scripts/resolveQaUrl.ts
-import { execFileSync as execFileSync23 } from "child_process";
+import { execFileSync as execFileSync22 } from "child_process";
 function ghQuery(args, cwd) {
   try {
-    const out = execFileSync23("gh", args, {
+    const out = execFileSync22("gh", args, {
       cwd,
       stdio: ["ignore", "pipe", "pipe"],
       encoding: "utf-8",
@@ -7983,7 +7639,7 @@ var resolveQaUrl = async (ctx) => {
 };
 
 // src/scripts/revertFlow.ts
-import { execFileSync as execFileSync24 } from "child_process";
+import { execFileSync as execFileSync23 } from "child_process";
 var SHA_RE = /^[0-9a-f]{4,40}$/i;
 var revertFlow = async (ctx) => {
   const prNumber = ctx.args.pr;
@@ -8065,7 +7721,7 @@ function buildPrSummary(resolved) {
   return resolved.map((r) => `- Reverted \`${r.full.slice(0, 7)}\`${r.subject ? ` \u2014 ${r.subject}` : ""}`).join("\n");
 }
 function git3(args, cwd) {
-  return execFileSync24("git", args, {
+  return execFileSync23("git", args, {
     encoding: "utf-8",
     timeout: 3e4,
     cwd,
@@ -8075,7 +7731,7 @@ function git3(args, cwd) {
 }
 function isAncestorOfHead(sha, cwd) {
   try {
-    execFileSync24("git", ["merge-base", "--is-ancestor", sha, "HEAD"], {
+    execFileSync23("git", ["merge-base", "--is-ancestor", sha, "HEAD"], {
       cwd,
       env: { ...process.env, HUSKY: "0", SKIP_HOOKS: "1" },
       stdio: ["ignore", "ignore", "ignore"]
@@ -8319,10 +7975,7 @@ var saveGoalState = async (ctx) => {
   const updated = {
     ...goal.raw ?? { state: goal.state, extra: {} },
     state: goal.state,
-    goalIssueNumber: goal.goalIssueNumber,
     lastDispatchedIssue: goal.lastDispatchedIssue,
-    goalPrUrl: goal.goalPrUrl,
-    completedAt: goal.completedAt ?? goal.raw?.completedAt,
     updatedAt: nowIso()
   };
   writeGoalState(ctx.cwd, goal.id, updated);
@@ -8404,11 +8057,11 @@ var skipAgent = async (ctx) => {
 };
 
 // src/scripts/stageMergeConflicts.ts
-import { execFileSync as execFileSync25 } from "child_process";
+import { execFileSync as execFileSync24 } from "child_process";
 var stageMergeConflicts = async (ctx) => {
   if (ctx.data.agentDone === false) return;
   try {
-    execFileSync25("git", ["add", "-A"], {
+    execFileSync24("git", ["add", "-A"], {
       cwd: ctx.cwd,
       env: { ...process.env, HUSKY: "0", SKIP_HOOKS: "1" },
       stdio: "pipe"
@@ -8418,7 +8071,7 @@ var stageMergeConflicts = async (ctx) => {
 };
 
 // src/scripts/startFlow.ts
-import { execFileSync as execFileSync26 } from "child_process";
+import { execFileSync as execFileSync25 } from "child_process";
 var API_TIMEOUT_MS9 = 3e4;
 var startFlow = async (ctx, profile, _agentResult, args) => {
   const entry = args?.entry;
@@ -8452,7 +8105,7 @@ function postKodyComment(target, issueNumber, state, next, cwd) {
   const sub = target === "pr" && state?.core.prUrl ? "pr" : "issue";
   const body = `@kody ${next}`;
   try {
-    execFileSync26("gh", [sub, "comment", String(targetNumber), "--body", body], {
+    execFileSync25("gh", [sub, "comment", String(targetNumber), "--body", body], {
       timeout: API_TIMEOUT_MS9,
       cwd,
       stdio: ["ignore", "pipe", "pipe"]
@@ -8466,7 +8119,7 @@ function postKodyComment(target, issueNumber, state, next, cwd) {
 }
 
 // src/scripts/syncFlow.ts
-import { execFileSync as execFileSync27 } from "child_process";
+import { execFileSync as execFileSync26 } from "child_process";
 var syncFlow = async (ctx, _profile, args) => {
   const announceOnSuccess = Boolean(args?.announceOnSuccess);
   const prNumber = ctx.args.pr;
@@ -8538,7 +8191,7 @@ function bail2(ctx, prNumber, reason) {
 }
 function revParseHead(cwd) {
   try {
-    return execFileSync27("git", ["rev-parse", "HEAD"], { cwd, encoding: "utf-8", stdio: ["ignore", "pipe", "pipe"] }).toString().trim();
+    return execFileSync26("git", ["rev-parse", "HEAD"], { cwd, encoding: "utf-8", stdio: ["ignore", "pipe", "pipe"] }).toString().trim();
   } catch {
     return "";
   }
@@ -8546,9 +8199,9 @@ function revParseHead(cwd) {
 function pushBranch(branch, cwd) {
   const env = { ...process.env, HUSKY: "0", SKIP_HOOKS: "1" };
   try {
-    execFileSync27("git", ["push", "-u", "origin", branch], { cwd, env, stdio: ["ignore", "pipe", "pipe"] });
+    execFileSync26("git", ["push", "-u", "origin", branch], { cwd, env, stdio: ["ignore", "pipe", "pipe"] });
   } catch {
-    execFileSync27("git", ["push", "--force-with-lease", "-u", "origin", branch], {
+    execFileSync26("git", ["push", "--force-with-lease", "-u", "origin", branch], {
       cwd,
       env,
       stdio: ["ignore", "pipe", "pipe"]
@@ -8812,7 +8465,7 @@ function downgrade2(ctx, reason) {
 }
 
 // src/scripts/waitForCi.ts
-import { execFileSync as execFileSync28 } from "child_process";
+import { execFileSync as execFileSync27 } from "child_process";
 var API_TIMEOUT_MS10 = 3e4;
 var waitForCi = async (ctx, _profile, _agentResult, args) => {
   const timeoutMinutes = numArg(args, "timeoutMinutes", 30);
@@ -8890,7 +8543,7 @@ var waitForCi = async (ctx, _profile, _agentResult, args) => {
 };
 function fetchChecks(prNumber, cwd) {
   try {
-    const raw = execFileSync28("gh", ["pr", "checks", String(prNumber), "--json", "bucket,state,name,workflow,link"], {
+    const raw = execFileSync27("gh", ["pr", "checks", String(prNumber), "--json", "bucket,state,name,workflow,link"], {
       encoding: "utf-8",
       timeout: API_TIMEOUT_MS10,
       cwd,
@@ -9212,13 +8865,7 @@ var preflightScripts = {
   runTickScript,
   loadGoalState,
   handleAbandonedGoal,
-  ensureLifecycleLabels,
-  ensureUmbrellaIssue,
-  ensureGoalPr,
-  mergeReadyTaskPRs,
-  closeMergedTaskIssues,
   deriveGoalPhase,
-  ensureGoalBranch,
   dispatchNextTask,
   finalizeGoal,
   saveGoalState
@@ -9269,7 +8916,7 @@ var allScriptNames = /* @__PURE__ */ new Set([
 ]);
 
 // src/tools.ts
-import { execFileSync as execFileSync29 } from "child_process";
+import { execFileSync as execFileSync28 } from "child_process";
 function verifyCliTools(tools, cwd) {
   const out = [];
   for (const t of tools) out.push(verifyOne(t, cwd));
@@ -9302,7 +8949,7 @@ function verifyOne(tool, cwd) {
 }
 function runShell(cmd, cwd, timeoutMs = 3e4) {
   try {
-    execFileSync29("sh", ["-c", cmd], { cwd, stdio: "pipe", timeout: timeoutMs });
+    execFileSync28("sh", ["-c", cmd], { cwd, stdio: "pipe", timeout: timeoutMs });
     return true;
   } catch {
     return false;
@@ -9858,7 +9505,7 @@ async function runContainerLoop(profile, ctx, input) {
 }
 function resetWorkingTree(cwd) {
   try {
-    execFileSync30("git", ["reset", "--hard", "HEAD"], {
+    execFileSync29("git", ["reset", "--hard", "HEAD"], {
       cwd,
       stdio: ["ignore", "pipe", "pipe"],
       timeout: 3e4
@@ -10017,7 +9664,7 @@ function detectPackageManager2(cwd) {
 }
 function shellOut(cmd, args, cwd, stream = true) {
   try {
-    execFileSync31(cmd, args, {
+    execFileSync30(cmd, args, {
       cwd,
       stdio: stream ? "inherit" : "pipe",
       env: { ...process.env, HUSKY: "0", SKIP_HOOKS: "1", CI: process.env.CI ?? "1" }
@@ -10030,7 +9677,7 @@ function shellOut(cmd, args, cwd, stream = true) {
 }
 function isOnPath(bin) {
   try {
-    execFileSync31("which", [bin], { stdio: "pipe" });
+    execFileSync30("which", [bin], { stdio: "pipe" });
     return true;
   } catch {
     return false;
@@ -10071,7 +9718,7 @@ function installLitellmIfNeeded(cwd) {
   } catch {
   }
   try {
-    execFileSync31("python3", ["-c", "import litellm"], { stdio: "pipe" });
+    execFileSync30("python3", ["-c", "import litellm"], { stdio: "pipe" });
     process.stdout.write("\u2192 kody: litellm already installed\n");
     return 0;
   } catch {
@@ -10081,16 +9728,16 @@ function installLitellmIfNeeded(cwd) {
 }
 function configureGitIdentity(cwd) {
   try {
-    const name = execFileSync31("git", ["config", "user.name"], { cwd, stdio: "pipe", encoding: "utf-8" }).trim();
+    const name = execFileSync30("git", ["config", "user.name"], { cwd, stdio: "pipe", encoding: "utf-8" }).trim();
     if (name) return;
   } catch {
   }
   try {
-    execFileSync31("git", ["config", "user.name", "github-actions[bot]"], { cwd, stdio: "pipe" });
+    execFileSync30("git", ["config", "user.name", "github-actions[bot]"], { cwd, stdio: "pipe" });
   } catch {
   }
   try {
-    execFileSync31("git", ["config", "user.email", "41898282+github-actions[bot]@users.noreply.github.com"], {
+    execFileSync30("git", ["config", "user.email", "41898282+github-actions[bot]@users.noreply.github.com"], {
       cwd,
       stdio: "pipe"
     });
@@ -10391,9 +10038,9 @@ function commitChatFiles(cwd, sessionId, verbose) {
   if (paths.length === 0) return;
   const opts = { cwd, stdio: verbose ? "inherit" : "pipe" };
   try {
-    execFileSync32("git", ["add", "-f", ...paths], opts);
-    execFileSync32("git", ["commit", "--quiet", "-m", `chat: reply for ${sessionId}`], opts);
-    execFileSync32("git", ["push", "--quiet", "origin", "HEAD"], opts);
+    execFileSync31("git", ["add", "-f", ...paths], opts);
+    execFileSync31("git", ["commit", "--quiet", "-m", `chat: reply for ${sessionId}`], opts);
+    execFileSync31("git", ["push", "--quiet", "origin", "HEAD"], opts);
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
     process.stderr.write(`[kody:chat] commit/push skipped: ${msg}