@kody-ade/kody-engine 0.4.132 → 0.4.133

package/dist/bin/kody.js

@@ -880,7 +880,7 @@ var init_loadPriorArt = __esm({
 // package.json
 var package_default = {
   name: "@kody-ade/kody-engine",
-  version: "0.4.132",
+  version: "0.4.133",
   description: "kody \u2014 autonomous development engine. Single-session Claude Code agent behind a generic executor + declarative executable profiles.",
   license: "MIT",
   type: "module",
@@ -5736,6 +5736,14 @@ function closePr(prNumber, comment, cwd) {
     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 editPrBase(prNumber, baseBranch, cwd) {
   try {
     gh(
@@ -8831,6 +8839,122 @@ var markFlowSuccess = async (ctx) => {
   }
 };
 
+// src/scripts/mergeFlow.ts
+init_issue();
+function readPr(prNumber, cwd) {
+  const out = gh(
+    [
+      "pr",
+      "view",
+      String(prNumber),
+      "--json",
+      "state,isDraft,mergeable,mergeStateStatus,title,url"
+    ],
+    { cwd }
+  );
+  const p = JSON.parse(out);
+  return {
+    state: p.state ?? "UNKNOWN",
+    isDraft: p.isDraft ?? false,
+    mergeable: p.mergeable ?? "UNKNOWN",
+    mergeStateStatus: p.mergeStateStatus ?? "UNKNOWN",
+    title: p.title ?? "",
+    url: p.url ?? ""
+  };
+}
+function evaluateMergeGate(pr) {
+  if (pr.state !== "OPEN") {
+    return {
+      ok: false,
+      action: "MERGE_SKIPPED",
+      reason: `PR is ${pr.state.toLowerCase()}, not open \u2014 nothing to merge.`
+    };
+  }
+  if (pr.isDraft) {
+    return { ok: false, action: "MERGE_BLOCKED", reason: "PR is still a draft." };
+  }
+  if (pr.mergeable === "CONFLICTING" || pr.mergeStateStatus === "DIRTY") {
+    return {
+      ok: false,
+      action: "MERGE_BLOCKED",
+      reason: "PR has conflicts with its base branch \u2014 resolve them first."
+    };
+  }
+  if (pr.mergeable === "UNKNOWN" || pr.mergeStateStatus === "UNKNOWN") {
+    return {
+      ok: false,
+      action: "MERGE_BLOCKED",
+      reason: "GitHub is still computing mergeability \u2014 will retry next tick."
+    };
+  }
+  if (pr.mergeStateStatus === "BEHIND") {
+    return {
+      ok: false,
+      action: "MERGE_BLOCKED",
+      reason: "PR branch is behind its base \u2014 update it before merging."
+    };
+  }
+  if (pr.mergeStateStatus !== "CLEAN") {
+    return {
+      ok: false,
+      action: "MERGE_BLOCKED",
+      reason: `PR is not green (status: ${pr.mergeStateStatus}) \u2014 required checks or reviews are not satisfied.`
+    };
+  }
+  return { ok: true };
+}
+var mergeFlow = async (ctx) => {
+  ctx.skipAgent = true;
+  const prNumber = Number(ctx.args.pr);
+  if (!Number.isInteger(prNumber) || prNumber <= 0) {
+    process.stderr.write(`[merge] invalid --pr value: ${String(ctx.args.pr)}
+`);
+    ctx.data.mergeAction = "MERGE_BLOCKED";
+    return;
+  }
+  let pr;
+  try {
+    pr = readPr(prNumber, ctx.cwd);
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    process.stderr.write(`[merge] could not read PR #${prNumber}: ${msg}
+`);
+    ctx.data.mergeAction = "MERGE_BLOCKED";
+    return;
+  }
+  const verdict = evaluateMergeGate(pr);
+  if (!verdict.ok) {
+    process.stdout.write(`[merge] PR #${prNumber} not merged \u2014 ${verdict.reason}
+`);
+    ctx.data.mergeAction = verdict.action;
+    if (verdict.action === "MERGE_BLOCKED") {
+      commentOnIssue(
+        prNumber,
+        `\u{1F6A6} _Auto-merge held: ${verdict.reason} Kody will retry once the PR is CLEAN._`,
+        ctx.cwd
+      );
+    }
+    return;
+  }
+  process.stdout.write(`[merge] PR #${prNumber} is CLEAN \u2014 squash-merging
+`);
+  const merged = mergePrSquash(prNumber, ctx.cwd);
+  if (!merged.ok) {
+    process.stderr.write(`[merge] squash-merge of PR #${prNumber} failed: ${merged.error}
+`);
+    ctx.data.mergeAction = "MERGE_BLOCKED";
+    commentOnIssue(
+      prNumber,
+      `\u{1F6A6} _Auto-merge attempted but failed: ${merged.error}. Kody will retry next tick._`,
+      ctx.cwd
+    );
+    return;
+  }
+  process.stdout.write(`[merge] PR #${prNumber} merged \u2705
+`);
+  ctx.data.mergeAction = "MERGE_COMPLETED";
+};
+
 // src/scripts/mergeReleasePr.ts
 import { execFileSync as execFileSync20 } from "child_process";
 var API_TIMEOUT_MS7 = 6e4;
@@ -11950,7 +12074,7 @@ function appendLine(owner, repo, cwd, record) {
   let existing = "";
   let sha;
   try {
-    const out = gh(["api", `/repos/${owner}/${repo}/contents/${filePath}`], { cwd });
+    const out = gh(["api", `/repos/${owner}/${repo}/contents/${filePath}?ref=${STATE_BRANCH}`], { cwd });
     const json = JSON.parse(out);
     if (json.sha) sha = json.sha;
     if (json.content) existing = Buffer.from(json.content, "base64").toString("utf-8");
@@ -11960,9 +12084,12 @@ function appendLine(owner, repo, cwd, record) {
 `;
   const payload = {
     message: `chore(activity): ${record.action}`,
-    content: Buffer.from(body, "utf-8").toString("base64")
+    content: Buffer.from(body, "utf-8").toString("base64"),
+    // Keep this high-frequency feed off the default branch.
+    branch: STATE_BRANCH
   };
   if (sha) payload.sha = sha;
+  ensureStateBranch(owner, repo, cwd);
   gh(
     ["api", "--method", "PUT", `/repos/${owner}/${repo}/contents/${filePath}`, "--input", "-"],
     { cwd, input: JSON.stringify(payload) }
@@ -12252,6 +12379,7 @@ var preflightScripts = {
   revertFlow,
   reviewFlow,
   syncFlow,
+  mergeFlow,
   initFlow,
   loadTaskState,
   loadTaskContext,
@@ -14028,6 +14156,7 @@ Usage:
   kody-engine fix     --pr    <N> [--feedback "..."] [--cwd <path>] [--verbose|--quiet]
   kody-engine fix-ci  --pr    <N> [--run-id <ID>]    [--cwd <path>] [--verbose|--quiet]
   kody-engine resolve --pr    <N>                    [--cwd <path>] [--verbose|--quiet]
+  kody-engine merge   --pr    <N>                    [--cwd <path>] [--verbose|--quiet]
   kody-engine review  --pr    <N>                    [--cwd <path>] [--verbose|--quiet]
   kody-engine <other>                                [--cwd <path>] [--verbose|--quiet]
   kody-engine ci      --issue <N> [preflight flags \u2014 see: kody-engine ci --help]

package/dist/executables/merge/profile.json

@@ -0,0 +1,54 @@
+{
+  "name": "merge",
+  "role": "primitive",
+  "kind": "oneshot",
+  "describe": "Self-gating squash-merge of an open PR into its base. Deterministic, no agent: merges only when GitHub reports the PR CLEAN (mergeable + required checks/reviews satisfied); otherwise refuses and comments why. Used by the CTO qa-merge duty once a QA-goal PR has graduated.",
+  "inputs": [
+    {
+      "name": "pr",
+      "flag": "--pr",
+      "type": "int",
+      "required": true,
+      "describe": "GitHub PR number to merge. No-op (MERGE_SKIPPED) if already closed/merged; refuses (MERGE_BLOCKED) if draft, conflicting, or not yet CLEAN."
+    }
+  ],
+  "claudeCode": {
+    "model": "inherit",
+    "permissionMode": "default",
+    "maxTurns": null,
+    "maxThinkingTokens": null,
+    "systemPromptAppend": null,
+    "tools": [],
+    "hooks": [],
+    "skills": [],
+    "commands": [],
+    "subagents": [],
+    "plugins": [],
+    "mcpServers": []
+  },
+  "cliTools": [
+    {
+      "name": "gh",
+      "install": {
+        "required": true,
+        "checkCommand": "command -v gh"
+      },
+      "verify": "gh auth status",
+      "usage": "Reads PR mergeability (`gh pr view --json`) and merges (`gh pr merge --squash --delete-branch`).",
+      "allowedUses": ["pr", "api"]
+    }
+  ],
+  "inputArtifacts": [],
+  "outputArtifacts": [],
+  "scripts": {
+    "preflight": [
+      {
+        "script": "mergeFlow"
+      }
+    ],
+    "postflight": []
+  },
+  "output": {
+    "actionTypes": ["MERGE_COMPLETED", "MERGE_BLOCKED", "MERGE_SKIPPED"]
+  }
+}

package/package.json

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