@kody-ade/kody-engine 0.4.32 → 0.4.33

package/dist/bin/kody.js

@@ -3,7 +3,7 @@
 // package.json
 var package_default = {
   name: "@kody-ade/kody-engine",
-  version: "0.4.32",
+  version: "0.4.33",
   description: "kody \u2014 autonomous development engine. Single-session Claude Code agent behind a generic executor + declarative executable profiles.",
   license: "MIT",
   type: "module",
@@ -5169,6 +5169,30 @@ var ensureLifecycleLabels = async (ctx) => {
 };
 
 // src/pr.ts
+function prMergeStatus(prNumber, cwd) {
+  try {
+    const out = gh(
+      ["pr", "view", String(prNumber), "--json", "mergeable,mergeStateStatus"],
+      { cwd }
+    );
+    const parsed = JSON.parse(out);
+    const mergeable = parsed.mergeable ?? "UNKNOWN";
+    const mergeStateStatus = parsed.mergeStateStatus ?? "UNKNOWN";
+    return { status: classifyMergeStatus(mergeable, mergeStateStatus), mergeable, mergeStateStatus };
+  } catch {
+    return { status: "ERROR", mergeable: "", mergeStateStatus: "" };
+  }
+}
+function classifyMergeStatus(mergeable, mergeStateStatus) {
+  if (mergeable === "CONFLICTING") return "CONFLICTING";
+  if (mergeable === "UNKNOWN") return "UNKNOWN";
+  if (mergeable === "MERGEABLE") {
+    if (mergeStateStatus === "CLEAN") return "MERGEABLE";
+    if (mergeStateStatus === "DIRTY") return "CONFLICTING";
+    return "BLOCKED";
+  }
+  return "UNKNOWN";
+}
 var TITLE_MAX = 72;
 function stripTitlePrefixes(raw) {
   let s = raw.trim();
@@ -7621,12 +7645,35 @@ var resolveFlow = async (ctx) => {
   ctx.data.pr = pr;
   ctx.data.commentTargetType = "pr";
   ctx.data.commentTargetNumber = prNumber;
-  checkoutPrBranch(prNumber, ctx.cwd);
-  ctx.data.branch = getCurrentBranch(ctx.cwd);
   const baseBranch = pr.baseRefName || ctx.config.git.defaultBranch;
   ctx.data.baseBranch = baseBranch;
+  const ghStatus = prMergeStatus(prNumber, ctx.cwd);
+  if (ghStatus.status === "MERGEABLE") {
+    ctx.output.exitCode = 0;
+    ctx.output.reason = `PR #${prNumber} is mergeable (no conflicts) \u2014 nothing to resolve`;
+    ctx.skipAgent = true;
+    tryPostPr3(prNumber, `\u2139\uFE0F kody resolve: ${ctx.output.reason}`, ctx.cwd);
+    return;
+  }
+  if (ghStatus.status === "BLOCKED") {
+    ctx.output.exitCode = 0;
+    ctx.output.reason = `PR #${prNumber} is mergeable but blocked by checks/reviews (mergeStateStatus=${ghStatus.mergeStateStatus}) \u2014 nothing for resolve to do`;
+    ctx.skipAgent = true;
+    tryPostPr3(prNumber, `\u2139\uFE0F kody resolve: ${ctx.output.reason}`, ctx.cwd);
+    return;
+  }
+  checkoutPrBranch(prNumber, ctx.cwd);
+  ctx.data.branch = getCurrentBranch(ctx.cwd);
   const mergeStatus = mergeBase(baseBranch, ctx.cwd);
   if (mergeStatus === "clean") {
+    if (ghStatus.status === "CONFLICTING") {
+      const pushed = pushEmptyCommit(ctx.data.branch, ctx.cwd);
+      ctx.output.exitCode = 0;
+      ctx.output.reason = pushed ? `local merge clean despite GitHub reporting CONFLICTING \u2014 pushed empty commit to force re-evaluation` : `local merge clean despite GitHub reporting CONFLICTING \u2014 couldn't refresh GitHub cache (push failed)`;
+      ctx.skipAgent = true;
+      tryPostPr3(prNumber, `\u2139\uFE0F kody resolve: ${ctx.output.reason}`, ctx.cwd);
+      return;
+    }
     ctx.output.exitCode = 0;
     ctx.output.reason = `already up to date with origin/${baseBranch} \u2014 nothing to resolve`;
     ctx.skipAgent = true;
@@ -7713,6 +7760,24 @@ function tryPostPr3(prNumber, body, cwd) {
   } catch {
   }
 }
+function pushEmptyCommit(branch, cwd) {
+  const env = { ...process.env, HUSKY: "0", SKIP_HOOKS: "1" };
+  try {
+    execFileSync22(
+      "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], {
+      cwd,
+      env,
+      stdio: ["ignore", "pipe", "pipe"]
+    });
+    return true;
+  } catch {
+    return false;
+  }
+}
 
 // src/deployments.ts
 function findPreviewDeploymentUrl(prNumber, cwd) {

package/package.json

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