@kody-ade/kody-engine 0.4.31 → 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.31",
+  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();
@@ -5304,20 +5328,37 @@ function ensurePr(opts) {
 }
 
 // src/scripts/ensurePr.ts
+function setOutcome(ctx, outcome) {
+  ctx.data.prResult = outcome;
+  if (outcome.kind === "created" || outcome.kind === "updated") {
+    ctx.output.prUrl = outcome.url;
+  }
+}
 var ensurePr2 = async (ctx) => {
   if (ctx.skipAgent && ctx.output.exitCode !== void 0) {
+    setOutcome(ctx, { kind: "skipped", reason: "preflight short-circuited (skipAgent)" });
     return;
   }
   const commitResult = ctx.data.commitResult;
   const hasCommits = Boolean(ctx.data.hasCommitsAhead);
   if (!commitResult?.committed && !hasCommits) {
+    setOutcome(ctx, { kind: "skipped", reason: "no commits to ship" });
     return;
   }
   if (commitResult?.committed && commitResult.pushed === false) {
+    setOutcome(ctx, { kind: "skipped", reason: "local commit succeeded but push failed" });
+    return;
+  }
+  if (ctx.data.verifyOk === false) {
+    const reason = `verify failed: ${ctx.data.verifyReason ?? "unknown"}`;
+    setOutcome(ctx, { kind: "skipped", reason });
     return;
   }
   const branch = ctx.data.branch;
-  if (!branch) return;
+  if (!branch) {
+    setOutcome(ctx, { kind: "skipped", reason: "no branch context (ctx.data.branch missing)" });
+    return;
+  }
   const failureReason = computeFailureReason(ctx);
   const isFailure = failureReason.length > 0;
   const changedFiles = ctx.data.changedFiles ?? [];
@@ -5339,13 +5380,26 @@ var ensurePr2 = async (ctx) => {
       baseBranch,
       cwd: ctx.cwd
     });
-    ctx.output.prUrl = result.url;
-    ctx.data.prResult = result;
+    if (!result.url || result.url.trim().length === 0) {
+      const reason = `gh pr create returned empty URL (action=${result.action}); refusing to claim success`;
+      ctx.data.prCrashReason = reason;
+      ctx.output.exitCode = 4;
+      ctx.output.reason = reason;
+      setOutcome(ctx, { kind: "crashed", reason });
+      return;
+    }
+    setOutcome(ctx, {
+      kind: result.action === "created" ? "created" : "updated",
+      url: result.url,
+      number: result.number,
+      draft: result.draft
+    });
   } catch (err) {
     const reason = `PR creation failed: ${err instanceof Error ? err.message : String(err)}`;
     ctx.data.prCrashReason = reason;
     ctx.output.exitCode = 4;
     ctx.output.reason = reason;
+    setOutcome(ctx, { kind: "crashed", reason });
   }
 };
 function computeFailureReason(ctx) {
@@ -7235,6 +7289,22 @@ var persistFlowState = async (ctx) => {
   }
 };
 
+// src/scripts/prOutcome.ts
+function readPrOutcome(data) {
+  const raw = data.prResult;
+  if (!raw || typeof raw !== "object") return null;
+  const r = raw;
+  switch (r.kind) {
+    case "created":
+    case "updated":
+    case "skipped":
+    case "crashed":
+      return raw;
+    default:
+      return null;
+  }
+}
+
 // src/scripts/postIssueComment.ts
 var FAILED_LABEL_SPEC = {
   label: "kody:failed",
@@ -7248,8 +7318,7 @@ var postIssueComment2 = async (ctx) => {
   if (!targetType || !targetNumber) return;
   const commitResult = ctx.data.commitResult;
   const hasCommits = Boolean(ctx.data.hasCommitsAhead);
-  const prUrl = ctx.output.prUrl;
-  const prAction = ctx.data.prResult?.action;
+  const prResult = readPrOutcome(ctx.data);
   if (!commitResult?.committed && !hasCommits) {
     const specific = computeFailureReason2(ctx);
     const reason = specific.length > 0 ? specific : "no changes to commit";
@@ -7267,18 +7336,17 @@ var postIssueComment2 = async (ctx) => {
   }
   const failureReason = computeFailureReason2(ctx);
   const isFailure = failureReason.length > 0;
-  const justPushedToExistingPr = prAction === "updated" && commitResult?.committed === true;
-  const successMsg = justPushedToExistingPr ? `\u2705 kody pushed to ${prUrl}` : prAction === "updated" ? `\u2139\uFE0F kody made no changes \u2014 PR: ${prUrl}` : `\u2705 kody PR opened: ${prUrl}`;
   const branch = ctx.data.branch;
-  const failurePrSuffix = computeFailureSuffix({
-    prUrl,
-    prAction,
+  const msg = renderMessage({
+    prResult,
+    isFailure,
+    failureReason,
+    justPushedToExistingPr: prResult?.kind === "updated" && commitResult?.committed === true,
     branch,
     branchPushed: commitResult?.committed === true,
     githubOwner: ctx.config.github?.owner,
     githubRepo: ctx.config.github?.repo
   });
-  const msg = isFailure ? `\u26A0\uFE0F kody FAILED: ${truncate2(failureReason, 1500)}${failurePrSuffix}` : successMsg;
   postWith(targetType, targetNumber, msg, ctx.cwd);
   let exitCode = 0;
   const agentDone = Boolean(ctx.data.agentDone);
@@ -7302,12 +7370,29 @@ function markRunFailed(ctx) {
   }
 }
 function computeFailureSuffix(input) {
-  if (input.prUrl) {
-    return input.prAction === "updated" ? ` \u2014 PR: ${input.prUrl}` : ` \u2014 draft PR: ${input.prUrl}`;
-  }
+  if (input.prResult?.kind === "created") return ` \u2014 draft PR: ${input.prResult.url}`;
+  if (input.prResult?.kind === "updated") return ` \u2014 PR: ${input.prResult.url}`;
   if (!input.branchPushed || !input.branch || !input.githubOwner || !input.githubRepo) return "";
   return ` \u2014 branch: https://github.com/${input.githubOwner}/${input.githubRepo}/tree/${input.branch}`;
 }
+function renderMessage(input) {
+  const suffix = computeFailureSuffix(input);
+  if (input.isFailure) {
+    return `\u26A0\uFE0F kody FAILED: ${truncate2(input.failureReason, 1500)}${suffix}`;
+  }
+  switch (input.prResult?.kind) {
+    case "created":
+      return `\u2705 kody PR opened: ${input.prResult.url}`;
+    case "updated":
+      return input.justPushedToExistingPr ? `\u2705 kody pushed to ${input.prResult.url}` : `\u2139\uFE0F kody made no changes \u2014 PR: ${input.prResult.url}`;
+    case "skipped":
+      return `\u26A0\uFE0F kody finished but did not open a PR \u2014 ${input.prResult.reason}${suffix}`;
+    case "crashed":
+      return `\u26A0\uFE0F kody PR step crashed: ${truncate2(input.prResult.reason, 1500)}${suffix}`;
+    case void 0:
+      return `\u26A0\uFE0F kody finished but PR step did not run${suffix}`;
+  }
+}
 function computeFailureReason2(ctx) {
   const misses = ctx.data.coverageMisses ?? [];
   if (misses.length > 0) return `missing tests: ${misses.map((m) => m.expectedTest).join(", ")}`;
@@ -7560,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;
@@ -7652,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/dist/executables/run/profile.json

@@ -65,7 +65,7 @@
       { "script": "checkCoverageWithRetry" },
       { "script": "abortUnfinishedGitOps" },
       { "script": "commitAndPush" },
-      { "script": "ensurePr", "runWhen": { "data.verifyOk": true } },
+      { "script": "ensurePr" },
       { "script": "postIssueComment" },
       { "script": "writeRunSummary" },
       { "script": "saveTaskState" },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kody-ade/kody-engine",
-  "version": "0.4.31",
+  "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",