@h-rig/runtime 0.0.6-alpha.13 → 0.0.6-alpha.14

package/dist/src/control-plane/native/git-ops.js

@@ -1365,6 +1365,30 @@ function sourceTaskConfigCandidates(projectRoot) {
 
 // packages/runtime/src/binary-run.ts
 var runtimeBinaryBuildQueue = Promise.resolve();
+// packages/runtime/src/control-plane/native/pr-review-gate.ts
+function strictMergeHeadShaFromGate(result, prUrl) {
+  if (!result.approved) {
+    throw new Error(`Refusing to merge ${prUrl}: strict merge gate is not approved.`);
+  }
+  if (result.evidence.prUrl !== prUrl) {
+    throw new Error(`Refusing to merge ${prUrl}: strict merge gate evidence belongs to ${result.evidence.prUrl}.`);
+  }
+  const headSha = result.evidence.headSha?.trim();
+  if (!headSha) {
+    throw new Error(`Refusing to merge ${prUrl}: strict merge gate did not provide a current head SHA.`);
+  }
+  if (!/^[0-9a-f]{40}$/i.test(headSha)) {
+    throw new Error(`Refusing to merge ${prUrl}: strict merge gate head is not a raw 40-character commit SHA.`);
+  }
+  if (!result.evidence.greptile.fresh || result.evidence.greptile.currentHeadSha !== headSha) {
+    throw new Error(`Refusing to merge ${prUrl}: strict merge gate approval is not tied to head ${headSha}.`);
+  }
+  if (result.evidence.greptile.mapping !== "score-5-of-5" && result.evidence.greptile.mapping !== "explicit-approved") {
+    throw new Error(`Refusing to merge ${prUrl}: strict merge gate mapping is ${result.evidence.greptile.mapping}.`);
+  }
+  return headSha;
+}
+
 // packages/runtime/src/control-plane/provider/runtime-instructions.ts
 var CLAUDE_ROUTER_TOOL_NAMES = [
   "`mcp__rig_runtime_tools__read`",
@@ -1835,7 +1859,7 @@ function gitOpenPr(options) {
     "",
     "## Review",
     "- Completion verification will run validation, verifier review, and PR policy checks.",
-    "- When repository policy allows it, Rig enables GitHub auto-merge after approval."
+    "- When repository policy allows it, Rig attempts an immediate strict-gated, head-locked merge after approval."
   ].join(`
 `);
   const preCheck = runCapture2(withGhRepo([gh, "pr", "list", "--state", "merged", "--head", branch, "--json", "url,mergedAt", "--jq", ".[0]"], repoNameWithOwner), repoRoot);
@@ -2031,15 +2055,12 @@ function gitMergePr(options) {
     return { status: "already-merged", url: options.pr.url };
   }
   if (state !== "OPEN") {
-    throw new Error(`Cannot auto-merge PR ${options.pr.url}: state is ${state}.`);
+    throw new Error(`Cannot merge PR ${options.pr.url}: state is ${state}.`);
   }
   if (isDraft) {
-    throw new Error(`Cannot auto-merge draft PR ${options.pr.url}.`);
-  }
-  const strictGateHeadSha = options.strictGateHeadSha?.trim();
-  if (!strictGateHeadSha) {
-    throw new Error(`Refusing to merge PR ${options.pr.url}: strict merge gate did not provide a current head SHA.`);
+    throw new Error(`Cannot merge draft PR ${options.pr.url}.`);
   }
+  const strictGateHeadSha = strictMergeHeadShaFromGate(options.strictGate, options.pr.url);
   const mergeArgs = withGhRepo([gh, "pr", "merge", options.pr.url], repoNameWithOwner);
   const method = options.method || "squash";
   mergeArgs.push(method === "merge" ? "--merge" : method === "rebase" ? "--rebase" : "--squash");