karajan-code 4.61.0 → 4.61.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "karajan-code",
-  "version": "4.61.0",
+  "version": "4.61.1",
   "description": "Local multi-agent coding orchestrator with TDD, SonarQube, and code review pipeline",
   "type": "module",
   "license": "AGPL-3.0",

package/src/review/clean-merge.js

@@ -0,0 +1,23 @@
+/**
+ * KJC-BUG-0391: "Update branch" puts a merge of the base on top of a PR. A
+ * clean merge brings no work of the PR: its tree is exactly what git merges
+ * from its parents, so it needs no cross-AI verdict. A merge whose tree differs
+ * (conflicts resolved by hand, or anything slipped in) is work and still needs
+ * one. Exit codes only, never git's messages, which follow the user's language.
+ */
+import { runCommand } from "../utils/process.js";
+
+/** True when `sha` is a merge whose tree is the clean merge of its two parents. */
+export async function isCleanMerge(projectDir, sha, run = runCommand) {
+  const git = (...args) => run("git", ["-C", projectDir, ...args]);
+  const parents = await git("rev-list", "--parents", "-n", "1", sha);
+  if (parents.exitCode !== 0) throw new Error(`git rev-list ${sha.slice(0, 7)} failed: ${(parents.stderr || "").trim()}`);
+  const ids = parents.stdout.trim().split(/\s+/).slice(1);
+  if (ids.length !== 2) return false;
+  // Exit 1 means conflicts: the merge commit then holds a resolution, which is work.
+  const merged = await git("merge-tree", "--write-tree", ...ids);
+  if (merged.exitCode !== 0) return false;
+  const tree = await git("rev-parse", `${sha}^{tree}`);
+  if (tree.exitCode !== 0) throw new Error(`git rev-parse ${sha.slice(0, 7)} failed: ${(tree.stderr || "").trim()}`);
+  return merged.stdout.trim().split("\n")[0] === tree.stdout.trim();
+}

package/src/review/publish-pr.js

@@ -6,6 +6,7 @@
  */
 import { runCommand } from "../utils/process.js";
 import { diffHash, loadVerdict } from "./verdict-store.js";
+import { isCleanMerge } from "./clean-merge.js";
 
 export const MARKER = (head) => `<!-- kj-review head=${head} -->`;
 
@@ -30,6 +31,8 @@ export async function publishPrReview({ projectDir, pr, run = runCommand }) {
   const rows = [];
   const uncovered = [];
   for (const c of info.commits ?? []) {
+    // KJC-BUG-0391: a clean merge of the base brings no work of the PR and holds no verdict.
+    if (await isCleanMerge(projectDir, c.oid, run)) continue;
     const v = await verdictOf(projectDir, c.oid, run);
     if (v?.verdict === "approved") rows.push({ ...c, v });
     else uncovered.push(`${c.oid.slice(0, 7)} (${c.messageHeadline})`);

package/src/review/verify-pr.js

@@ -8,8 +8,11 @@
 import { runCommand } from "../utils/process.js";
 import { diffHash } from "./verdict-store.js";
 import { MARKER } from "./publish-pr.js";
+import { isCleanMerge } from "./clean-merge.js";
 
 const TRUSTED = new Set(["OWNER", "MEMBER", "COLLABORATOR"]);
+// The marker of a kj review for any head: what MARKER writes up to the head itself.
+const MARKER_PREFIX = MARKER("\0").split("\0")[0];
 // One line per commit, as publish-pr writes it: - `<sha7>` headline: approved by X (diff <hash12>)...
 const LISTED = /^- `([0-9a-f]{7})` .*?\(diff ([0-9a-f]{12})\)/gm;
 
@@ -45,13 +48,17 @@ export async function verifyPrReview({ projectDir, pr, run = runCommand }) {
   const res = await run("gh", ["api", "--paginate", `repos/{owner}/{repo}/pulls/${pr}/reviews`, "--jq", ".[] | {body, author_association}"], { cwd: projectDir });
   if (res.exitCode !== 0) throw new Error(`gh api reviews failed: ${(res.stderr || res.stdout || "").trim()}`);
   const reviews = (res.stdout || "").split("\n").filter(Boolean).map((line) => JSON.parse(line));
-  const review = reviews.findLast((r) => TRUSTED.has(r.author_association) && String(r.body ?? "").includes(MARKER(info.headRefOid)));
-  if (!review) {
-    return { ok: false, commits: commits.length, problems: [`no kj review published by a member for head ${info.headRefOid.slice(0, 7)}: run kj review --publish-pr ${pr}`] };
+  // KJC-BUG-0391: any kj review a member published on the PR counts, not only the one for
+  // today's head: the diff hash of each commit is what proves it, and a commit pushed after
+  // the review is simply not listed. "Update branch" no longer leaves the check red.
+  const kjReviews = reviews.filter((r) => TRUSTED.has(r.author_association) && String(r.body ?? "").includes(MARKER_PREFIX));
+  if (kjReviews.length === 0) {
+    return { ok: false, commits: commits.length, problems: [`no kj review published by a member: run kj review --publish-pr ${pr}`] };
   }
-  const listed = new Map([...review.body.matchAll(LISTED)].map((m) => [m[1], m[2]]));
+  const listed = new Map(kjReviews.flatMap((r) => [...r.body.matchAll(LISTED)].map((m) => [m[1], m[2]])));
   const problems = [];
   for (const c of commits) {
+    if (await isCleanMerge(projectDir, c.oid, run)) continue;
     const hash = listed.get(c.oid.slice(0, 7));
     if (!hash || !(await hashesOf(projectDir, c.oid, run)).has(hash)) problems.push(`${c.oid.slice(0, 7)} (${c.messageHeadline}): no approved verdict for the diff it brings`);
   }