@h-rig/bundle-default-lifecycle 0.0.6-alpha.156 → 0.0.6-alpha.158

package/dist/src/stages/auto-merge.js

@@ -15,6 +15,19 @@ var __export = (target, all) => {
 };
 var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
 
+// packages/bundle-default-lifecycle/src/control-plane/pr-merge-gate-cap.ts
+import { PR_MERGE_GATE } from "@rig/contracts";
+import { defineCapability } from "@rig/core/capability";
+import { resolvePluginHost } from "@rig/core/project-plugins";
+async function resolvePrMergeGateService(projectRoot) {
+  const { host } = await resolvePluginHost(projectRoot);
+  return PrMergeGateCap.require(host);
+}
+var PrMergeGateCap;
+var init_pr_merge_gate_cap = __esm(() => {
+  PrMergeGateCap = defineCapability(PR_MERGE_GATE);
+});
+
 // packages/bundle-default-lifecycle/src/control-plane/pr-automation.ts
 var exports_pr_automation = {};
 __export(exports_pr_automation, {
@@ -32,11 +45,7 @@ __export(exports_pr_automation, {
   buildPrAutomationBody: () => buildPrAutomationBody,
   UPLOADED_SNAPSHOT_PR_MARKER: () => UPLOADED_SNAPSHOT_PR_MARKER
 });
-import { assertSafeGitBranchName } from "@rig/shared/safe-identifiers";
-import { runStrictPrMergeGate } from "@rig/pr-review-plugin";
-import {
-  strictMergeHeadShaFromGate
-} from "@rig/contracts";
+import { assertSafeGitBranchName } from "@rig/core/safe-identifiers";
 function positiveInt(value, fallback) {
   return typeof value === "number" && Number.isFinite(value) && value > 0 ? Math.floor(value) : fallback;
 }
@@ -339,7 +348,7 @@ async function commitRunChanges(input) {
 async function closeIssueAfterMergedPr(input) {
   await input.updateTaskSource(input.projectRoot, {
     taskId: input.taskId,
-    sourceTask: input.sourceTask,
+    ...input.sourceTask !== undefined ? { sourceTask: input.sourceTask } : {},
     update: {
       status: "closed",
       comment: [
@@ -385,11 +394,12 @@ async function runRepoDefaultMerge(input) {
   if (merge.mode === "off")
     return;
   const requireGreptile = (input.config?.review?.provider ?? "greptile") === "greptile";
-  const matchHeadSha = strictMergeHeadShaFromGate(input.strictGate, input.prUrl, requireGreptile);
+  const mergeGate = await resolvePrMergeGateService(input.projectRoot ?? input.cwd ?? process.cwd());
+  const matchHeadSha = mergeGate.resolveHeadSha({ result: input.strictGate, prUrl: input.prUrl, requireGreptile });
   const method = merge.method ?? "repo-default";
   const args = ["pr", "merge", input.prUrl];
   if (method === "repo-default") {
-    args.push(await resolveRepoDefaultMergeFlag({ prUrl: input.prUrl, command: input.command, cwd: input.cwd }));
+    args.push(await resolveRepoDefaultMergeFlag({ prUrl: input.prUrl, command: input.command, ...input.cwd !== undefined ? { cwd: input.cwd } : {} }));
   } else {
     args.push(`--${method}`);
   }
@@ -466,6 +476,7 @@ async function syncBranchAfterPrFeedback(input) {
 }
 async function runPrAutomation(input) {
   const branch = assertSafeGitBranchName(input.branch, "PR branch");
+  const mergeGate = await resolvePrMergeGateService(input.projectRoot);
   const prConfig = input.config?.pr ?? {};
   const requireGreptile = (input.config?.review?.provider ?? "greptile") === "greptile";
   if (prConfig.mode === "off" || prConfig.mode === "ask") {
@@ -475,7 +486,7 @@ async function runPrAutomation(input) {
     taskId: input.taskId,
     runId: input.runId,
     summary: input.sourceTask?.title ? `Rig completed: ${input.sourceTask.title}` : null,
-    uploadedSnapshot: input.uploadedSnapshot
+    ...input.uploadedSnapshot !== undefined ? { uploadedSnapshot: input.uploadedSnapshot } : {}
   });
   if (input.gitCommand) {
     await pushBranchSyncedWithOrigin({ projectRoot: input.projectRoot, branch, gitCommand: input.gitCommand });
@@ -547,16 +558,16 @@ ${createResult.stdout ?? ""}`) : null;
       await syncBranchAfterPrFeedback({ projectRoot: input.projectRoot, taskId: input.taskId, branch, gitCommand: input.gitCommand });
       continue;
     }
-    const gate = await runStrictPrMergeGate({
+    const gate = await mergeGate.runGate({
       projectRoot: input.projectRoot,
       prUrl,
       taskId: input.taskId,
       runId: input.runId,
       cycle: iteration,
       command: input.command,
-      artifactRoot: input.artifactRoot,
+      ...input.artifactRoot !== undefined ? { artifactRoot: input.artifactRoot } : {},
       allowedFailures: input.config?.merge?.allowedFailures ?? [],
-      greptileApi: requireGreptile ? input.greptileApi : undefined,
+      ...requireGreptile && input.greptileApi ? { greptileApi: input.greptileApi } : {},
       requireGreptile
     });
     latestFeedback = [...gate.actionableFeedback];
@@ -586,22 +597,22 @@ ${createResult.stdout ?? ""}`) : null;
     }
     if (gate.approved) {
       pendingElapsedMs = 0;
-      const finalGate = await runStrictPrMergeGate({
+      const finalGate = await mergeGate.runGate({
         projectRoot: input.projectRoot,
         prUrl,
         taskId: input.taskId,
         runId: input.runId,
         cycle: iteration,
         command: input.command,
-        artifactRoot: input.artifactRoot,
+        ...input.artifactRoot !== undefined ? { artifactRoot: input.artifactRoot } : {},
         allowedFailures: input.config?.merge?.allowedFailures ?? [],
-        greptileApi: requireGreptile ? input.greptileApi : undefined,
+        ...requireGreptile && input.greptileApi ? { greptileApi: input.greptileApi } : {},
         requireGreptile,
         final: true
       });
       if (finalGate.approved) {
         await input.lifecycle?.onMergeStarted?.({ prUrl });
-        await runRepoDefaultMerge({ prUrl, config: input.config, command: input.command, cwd: input.projectRoot, strictGate: finalGate });
+        await runRepoDefaultMerge({ prUrl, ...input.config !== undefined ? { config: input.config } : {}, command: input.command, cwd: input.projectRoot, strictGate: finalGate });
         await input.lifecycle?.onMerged?.({ prUrl });
         return { status: "merged", prUrl, iterations: iteration, actionableFeedback: [], merged: true };
       }
@@ -648,6 +659,7 @@ ${createResult.stdout ?? ""}`) : null;
 }
 var UPLOADED_SNAPSHOT_PR_MARKER = "<!-- rig:uploaded-snapshot -->", RIG_RUNTIME_COMMIT_EXCLUDES, GREPTILE_REREVIEW_MARKER_PREFIX = "rig:greptile-rereview";
 var init_pr_automation = __esm(() => {
+  init_pr_merge_gate_cap();
   RIG_RUNTIME_COMMIT_EXCLUDES = [
     ".rig",
     "artifacts",

package/dist/src/stages/commit.js

@@ -15,6 +15,19 @@ var __export = (target, all) => {
 };
 var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
 
+// packages/bundle-default-lifecycle/src/control-plane/pr-merge-gate-cap.ts
+import { PR_MERGE_GATE } from "@rig/contracts";
+import { defineCapability } from "@rig/core/capability";
+import { resolvePluginHost } from "@rig/core/project-plugins";
+async function resolvePrMergeGateService(projectRoot) {
+  const { host } = await resolvePluginHost(projectRoot);
+  return PrMergeGateCap.require(host);
+}
+var PrMergeGateCap;
+var init_pr_merge_gate_cap = __esm(() => {
+  PrMergeGateCap = defineCapability(PR_MERGE_GATE);
+});
+
 // packages/bundle-default-lifecycle/src/control-plane/pr-automation.ts
 var exports_pr_automation = {};
 __export(exports_pr_automation, {
@@ -32,11 +45,7 @@ __export(exports_pr_automation, {
   buildPrAutomationBody: () => buildPrAutomationBody,
   UPLOADED_SNAPSHOT_PR_MARKER: () => UPLOADED_SNAPSHOT_PR_MARKER
 });
-import { assertSafeGitBranchName } from "@rig/shared/safe-identifiers";
-import { runStrictPrMergeGate } from "@rig/pr-review-plugin";
-import {
-  strictMergeHeadShaFromGate
-} from "@rig/contracts";
+import { assertSafeGitBranchName } from "@rig/core/safe-identifiers";
 function positiveInt(value, fallback) {
   return typeof value === "number" && Number.isFinite(value) && value > 0 ? Math.floor(value) : fallback;
 }
@@ -339,7 +348,7 @@ async function commitRunChanges(input) {
 async function closeIssueAfterMergedPr(input) {
   await input.updateTaskSource(input.projectRoot, {
     taskId: input.taskId,
-    sourceTask: input.sourceTask,
+    ...input.sourceTask !== undefined ? { sourceTask: input.sourceTask } : {},
     update: {
       status: "closed",
       comment: [
@@ -385,11 +394,12 @@ async function runRepoDefaultMerge(input) {
   if (merge.mode === "off")
     return;
   const requireGreptile = (input.config?.review?.provider ?? "greptile") === "greptile";
-  const matchHeadSha = strictMergeHeadShaFromGate(input.strictGate, input.prUrl, requireGreptile);
+  const mergeGate = await resolvePrMergeGateService(input.projectRoot ?? input.cwd ?? process.cwd());
+  const matchHeadSha = mergeGate.resolveHeadSha({ result: input.strictGate, prUrl: input.prUrl, requireGreptile });
   const method = merge.method ?? "repo-default";
   const args = ["pr", "merge", input.prUrl];
   if (method === "repo-default") {
-    args.push(await resolveRepoDefaultMergeFlag({ prUrl: input.prUrl, command: input.command, cwd: input.cwd }));
+    args.push(await resolveRepoDefaultMergeFlag({ prUrl: input.prUrl, command: input.command, ...input.cwd !== undefined ? { cwd: input.cwd } : {} }));
   } else {
     args.push(`--${method}`);
   }
@@ -466,6 +476,7 @@ async function syncBranchAfterPrFeedback(input) {
 }
 async function runPrAutomation(input) {
   const branch = assertSafeGitBranchName(input.branch, "PR branch");
+  const mergeGate = await resolvePrMergeGateService(input.projectRoot);
   const prConfig = input.config?.pr ?? {};
   const requireGreptile = (input.config?.review?.provider ?? "greptile") === "greptile";
   if (prConfig.mode === "off" || prConfig.mode === "ask") {
@@ -475,7 +486,7 @@ async function runPrAutomation(input) {
     taskId: input.taskId,
     runId: input.runId,
     summary: input.sourceTask?.title ? `Rig completed: ${input.sourceTask.title}` : null,
-    uploadedSnapshot: input.uploadedSnapshot
+    ...input.uploadedSnapshot !== undefined ? { uploadedSnapshot: input.uploadedSnapshot } : {}
   });
   if (input.gitCommand) {
     await pushBranchSyncedWithOrigin({ projectRoot: input.projectRoot, branch, gitCommand: input.gitCommand });
@@ -547,16 +558,16 @@ ${createResult.stdout ?? ""}`) : null;
       await syncBranchAfterPrFeedback({ projectRoot: input.projectRoot, taskId: input.taskId, branch, gitCommand: input.gitCommand });
       continue;
     }
-    const gate = await runStrictPrMergeGate({
+    const gate = await mergeGate.runGate({
       projectRoot: input.projectRoot,
       prUrl,
       taskId: input.taskId,
       runId: input.runId,
       cycle: iteration,
       command: input.command,
-      artifactRoot: input.artifactRoot,
+      ...input.artifactRoot !== undefined ? { artifactRoot: input.artifactRoot } : {},
       allowedFailures: input.config?.merge?.allowedFailures ?? [],
-      greptileApi: requireGreptile ? input.greptileApi : undefined,
+      ...requireGreptile && input.greptileApi ? { greptileApi: input.greptileApi } : {},
       requireGreptile
     });
     latestFeedback = [...gate.actionableFeedback];
@@ -586,22 +597,22 @@ ${createResult.stdout ?? ""}`) : null;
     }
     if (gate.approved) {
       pendingElapsedMs = 0;
-      const finalGate = await runStrictPrMergeGate({
+      const finalGate = await mergeGate.runGate({
         projectRoot: input.projectRoot,
         prUrl,
         taskId: input.taskId,
         runId: input.runId,
         cycle: iteration,
         command: input.command,
-        artifactRoot: input.artifactRoot,
+        ...input.artifactRoot !== undefined ? { artifactRoot: input.artifactRoot } : {},
         allowedFailures: input.config?.merge?.allowedFailures ?? [],
-        greptileApi: requireGreptile ? input.greptileApi : undefined,
+        ...requireGreptile && input.greptileApi ? { greptileApi: input.greptileApi } : {},
         requireGreptile,
         final: true
       });
       if (finalGate.approved) {
         await input.lifecycle?.onMergeStarted?.({ prUrl });
-        await runRepoDefaultMerge({ prUrl, config: input.config, command: input.command, cwd: input.projectRoot, strictGate: finalGate });
+        await runRepoDefaultMerge({ prUrl, ...input.config !== undefined ? { config: input.config } : {}, command: input.command, cwd: input.projectRoot, strictGate: finalGate });
         await input.lifecycle?.onMerged?.({ prUrl });
         return { status: "merged", prUrl, iterations: iteration, actionableFeedback: [], merged: true };
       }
@@ -648,6 +659,7 @@ ${createResult.stdout ?? ""}`) : null;
 }
 var UPLOADED_SNAPSHOT_PR_MARKER = "<!-- rig:uploaded-snapshot -->", RIG_RUNTIME_COMMIT_EXCLUDES, GREPTILE_REREVIEW_MARKER_PREFIX = "rig:greptile-rereview";
 var init_pr_automation = __esm(() => {
+  init_pr_merge_gate_cap();
   RIG_RUNTIME_COMMIT_EXCLUDES = [
     ".rig",
     "artifacts",

package/dist/src/stages/isolation.d.ts

@@ -1,4 +1,4 @@
-import type { AgentRuntime, IsolationMode } from "@rig/runtime/control-plane/runtime/isolation";
+import { type AgentRuntime, type IsolationMode } from "@rig/contracts";
 export type IsolationStageInput = {
     readonly projectRoot: string;
     readonly id: string;

package/dist/src/stages/isolation.js

@@ -1,5 +1,8 @@
 // @bun
-var __require = import.meta.require;
+// packages/bundle-default-lifecycle/src/stages/isolation.ts
+import { ISOLATION_BACKEND } from "@rig/contracts";
+import { defineCapability } from "@rig/core/capability";
+import { requireCapabilityForRoot } from "@rig/core/capability-loaders";
 
 // packages/bundle-default-lifecycle/src/stages/types.ts
 function defineDefaultLifecycleStage(input) {
@@ -18,8 +21,7 @@ var isolationStage = defineDefaultLifecycleStage({
   calls: ["ensureAgentRuntime"]
 });
 async function runIsolationStage(input) {
-  const { requireIsolationBackend } = await import("@rig/runtime/control-plane/isolation-backend-port");
-  const backend = await requireIsolationBackend(input.projectRoot);
+  const backend = await requireCapabilityForRoot(input.projectRoot, defineCapability(ISOLATION_BACKEND), `No ISOLATION_BACKEND capability is registered for project root "${input.projectRoot}". ` + "Install @rig/isolation-plugin (it ships in the default bundle) so runtime provisioning can resolve a backend.");
   return await backend.ensureAgentRuntime(input);
 }
 export {

package/dist/src/stages/merge-gate.js

@@ -1,5 +1,36 @@
 // @bun
-var __require = import.meta.require;
+var __defProp = Object.defineProperty;
+var __returnValue = (v) => v;
+function __exportSetter(name, newValue) {
+  this[name] = __returnValue.bind(null, newValue);
+}
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, {
+      get: all[name],
+      enumerable: true,
+      configurable: true,
+      set: __exportSetter.bind(all, name)
+    });
+};
+var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
+
+// packages/bundle-default-lifecycle/src/control-plane/pr-merge-gate-cap.ts
+var exports_pr_merge_gate_cap = {};
+__export(exports_pr_merge_gate_cap, {
+  resolvePrMergeGateService: () => resolvePrMergeGateService
+});
+import { PR_MERGE_GATE } from "@rig/contracts";
+import { defineCapability } from "@rig/core/capability";
+import { resolvePluginHost } from "@rig/core/project-plugins";
+async function resolvePrMergeGateService(projectRoot) {
+  const { host } = await resolvePluginHost(projectRoot);
+  return PrMergeGateCap.require(host);
+}
+var PrMergeGateCap;
+var init_pr_merge_gate_cap = __esm(() => {
+  PrMergeGateCap = defineCapability(PR_MERGE_GATE);
+});
 
 // packages/bundle-default-lifecycle/src/stages/types.ts
 function defineDefaultLifecycleStage(input) {
@@ -18,8 +49,9 @@ var mergeGateStage = defineDefaultLifecycleStage({
   calls: ["runStrictPrMergeGate"]
 });
 async function runMergeGateStage(input) {
-  const { runStrictPrMergeGate } = await import("@rig/pr-review-plugin");
-  return await runStrictPrMergeGate({
+  const { resolvePrMergeGateService: resolvePrMergeGateService2 } = await Promise.resolve().then(() => (init_pr_merge_gate_cap(), exports_pr_merge_gate_cap));
+  const mergeGate = await resolvePrMergeGateService2(input.projectRoot);
+  return await mergeGate.runGate({
     projectRoot: input.projectRoot,
     prUrl: input.prUrl,
     taskId: input.taskId,

package/dist/src/stages/open-pr.js

@@ -15,6 +15,19 @@ var __export = (target, all) => {
 };
 var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
 
+// packages/bundle-default-lifecycle/src/control-plane/pr-merge-gate-cap.ts
+import { PR_MERGE_GATE } from "@rig/contracts";
+import { defineCapability } from "@rig/core/capability";
+import { resolvePluginHost } from "@rig/core/project-plugins";
+async function resolvePrMergeGateService(projectRoot) {
+  const { host } = await resolvePluginHost(projectRoot);
+  return PrMergeGateCap.require(host);
+}
+var PrMergeGateCap;
+var init_pr_merge_gate_cap = __esm(() => {
+  PrMergeGateCap = defineCapability(PR_MERGE_GATE);
+});
+
 // packages/bundle-default-lifecycle/src/control-plane/pr-automation.ts
 var exports_pr_automation = {};
 __export(exports_pr_automation, {
@@ -32,11 +45,7 @@ __export(exports_pr_automation, {
   buildPrAutomationBody: () => buildPrAutomationBody,
   UPLOADED_SNAPSHOT_PR_MARKER: () => UPLOADED_SNAPSHOT_PR_MARKER
 });
-import { assertSafeGitBranchName } from "@rig/shared/safe-identifiers";
-import { runStrictPrMergeGate } from "@rig/pr-review-plugin";
-import {
-  strictMergeHeadShaFromGate
-} from "@rig/contracts";
+import { assertSafeGitBranchName } from "@rig/core/safe-identifiers";
 function positiveInt(value, fallback) {
   return typeof value === "number" && Number.isFinite(value) && value > 0 ? Math.floor(value) : fallback;
 }
@@ -339,7 +348,7 @@ async function commitRunChanges(input) {
 async function closeIssueAfterMergedPr(input) {
   await input.updateTaskSource(input.projectRoot, {
     taskId: input.taskId,
-    sourceTask: input.sourceTask,
+    ...input.sourceTask !== undefined ? { sourceTask: input.sourceTask } : {},
     update: {
       status: "closed",
       comment: [
@@ -385,11 +394,12 @@ async function runRepoDefaultMerge(input) {
   if (merge.mode === "off")
     return;
   const requireGreptile = (input.config?.review?.provider ?? "greptile") === "greptile";
-  const matchHeadSha = strictMergeHeadShaFromGate(input.strictGate, input.prUrl, requireGreptile);
+  const mergeGate = await resolvePrMergeGateService(input.projectRoot ?? input.cwd ?? process.cwd());
+  const matchHeadSha = mergeGate.resolveHeadSha({ result: input.strictGate, prUrl: input.prUrl, requireGreptile });
   const method = merge.method ?? "repo-default";
   const args = ["pr", "merge", input.prUrl];
   if (method === "repo-default") {
-    args.push(await resolveRepoDefaultMergeFlag({ prUrl: input.prUrl, command: input.command, cwd: input.cwd }));
+    args.push(await resolveRepoDefaultMergeFlag({ prUrl: input.prUrl, command: input.command, ...input.cwd !== undefined ? { cwd: input.cwd } : {} }));
   } else {
     args.push(`--${method}`);
   }
@@ -466,6 +476,7 @@ async function syncBranchAfterPrFeedback(input) {
 }
 async function runPrAutomation(input) {
   const branch = assertSafeGitBranchName(input.branch, "PR branch");
+  const mergeGate = await resolvePrMergeGateService(input.projectRoot);
   const prConfig = input.config?.pr ?? {};
   const requireGreptile = (input.config?.review?.provider ?? "greptile") === "greptile";
   if (prConfig.mode === "off" || prConfig.mode === "ask") {
@@ -475,7 +486,7 @@ async function runPrAutomation(input) {
     taskId: input.taskId,
     runId: input.runId,
     summary: input.sourceTask?.title ? `Rig completed: ${input.sourceTask.title}` : null,
-    uploadedSnapshot: input.uploadedSnapshot
+    ...input.uploadedSnapshot !== undefined ? { uploadedSnapshot: input.uploadedSnapshot } : {}
   });
   if (input.gitCommand) {
     await pushBranchSyncedWithOrigin({ projectRoot: input.projectRoot, branch, gitCommand: input.gitCommand });
@@ -547,16 +558,16 @@ ${createResult.stdout ?? ""}`) : null;
       await syncBranchAfterPrFeedback({ projectRoot: input.projectRoot, taskId: input.taskId, branch, gitCommand: input.gitCommand });
       continue;
     }
-    const gate = await runStrictPrMergeGate({
+    const gate = await mergeGate.runGate({
       projectRoot: input.projectRoot,
       prUrl,
       taskId: input.taskId,
       runId: input.runId,
       cycle: iteration,
       command: input.command,
-      artifactRoot: input.artifactRoot,
+      ...input.artifactRoot !== undefined ? { artifactRoot: input.artifactRoot } : {},
       allowedFailures: input.config?.merge?.allowedFailures ?? [],
-      greptileApi: requireGreptile ? input.greptileApi : undefined,
+      ...requireGreptile && input.greptileApi ? { greptileApi: input.greptileApi } : {},
       requireGreptile
     });
     latestFeedback = [...gate.actionableFeedback];
@@ -586,22 +597,22 @@ ${createResult.stdout ?? ""}`) : null;
     }
     if (gate.approved) {
       pendingElapsedMs = 0;
-      const finalGate = await runStrictPrMergeGate({
+      const finalGate = await mergeGate.runGate({
         projectRoot: input.projectRoot,
         prUrl,
         taskId: input.taskId,
         runId: input.runId,
         cycle: iteration,
         command: input.command,
-        artifactRoot: input.artifactRoot,
+        ...input.artifactRoot !== undefined ? { artifactRoot: input.artifactRoot } : {},
         allowedFailures: input.config?.merge?.allowedFailures ?? [],
-        greptileApi: requireGreptile ? input.greptileApi : undefined,
+        ...requireGreptile && input.greptileApi ? { greptileApi: input.greptileApi } : {},
         requireGreptile,
         final: true
       });
       if (finalGate.approved) {
         await input.lifecycle?.onMergeStarted?.({ prUrl });
-        await runRepoDefaultMerge({ prUrl, config: input.config, command: input.command, cwd: input.projectRoot, strictGate: finalGate });
+        await runRepoDefaultMerge({ prUrl, ...input.config !== undefined ? { config: input.config } : {}, command: input.command, cwd: input.projectRoot, strictGate: finalGate });
         await input.lifecycle?.onMerged?.({ prUrl });
         return { status: "merged", prUrl, iterations: iteration, actionableFeedback: [], merged: true };
       }
@@ -648,6 +659,7 @@ ${createResult.stdout ?? ""}`) : null;
 }
 var UPLOADED_SNAPSHOT_PR_MARKER = "<!-- rig:uploaded-snapshot -->", RIG_RUNTIME_COMMIT_EXCLUDES, GREPTILE_REREVIEW_MARKER_PREFIX = "rig:greptile-rereview";
 var init_pr_automation = __esm(() => {
+  init_pr_merge_gate_cap();
   RIG_RUNTIME_COMMIT_EXCLUDES = [
     ".rig",
     "artifacts",

package/dist/src/stages/push.js

@@ -15,6 +15,19 @@ var __export = (target, all) => {
 };
 var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
 
+// packages/bundle-default-lifecycle/src/control-plane/pr-merge-gate-cap.ts
+import { PR_MERGE_GATE } from "@rig/contracts";
+import { defineCapability } from "@rig/core/capability";
+import { resolvePluginHost } from "@rig/core/project-plugins";
+async function resolvePrMergeGateService(projectRoot) {
+  const { host } = await resolvePluginHost(projectRoot);
+  return PrMergeGateCap.require(host);
+}
+var PrMergeGateCap;
+var init_pr_merge_gate_cap = __esm(() => {
+  PrMergeGateCap = defineCapability(PR_MERGE_GATE);
+});
+
 // packages/bundle-default-lifecycle/src/control-plane/pr-automation.ts
 var exports_pr_automation = {};
 __export(exports_pr_automation, {
@@ -32,11 +45,7 @@ __export(exports_pr_automation, {
   buildPrAutomationBody: () => buildPrAutomationBody,
   UPLOADED_SNAPSHOT_PR_MARKER: () => UPLOADED_SNAPSHOT_PR_MARKER
 });
-import { assertSafeGitBranchName } from "@rig/shared/safe-identifiers";
-import { runStrictPrMergeGate } from "@rig/pr-review-plugin";
-import {
-  strictMergeHeadShaFromGate
-} from "@rig/contracts";
+import { assertSafeGitBranchName } from "@rig/core/safe-identifiers";
 function positiveInt(value, fallback) {
   return typeof value === "number" && Number.isFinite(value) && value > 0 ? Math.floor(value) : fallback;
 }
@@ -339,7 +348,7 @@ async function commitRunChanges(input) {
 async function closeIssueAfterMergedPr(input) {
   await input.updateTaskSource(input.projectRoot, {
     taskId: input.taskId,
-    sourceTask: input.sourceTask,
+    ...input.sourceTask !== undefined ? { sourceTask: input.sourceTask } : {},
     update: {
       status: "closed",
       comment: [
@@ -385,11 +394,12 @@ async function runRepoDefaultMerge(input) {
   if (merge.mode === "off")
     return;
   const requireGreptile = (input.config?.review?.provider ?? "greptile") === "greptile";
-  const matchHeadSha = strictMergeHeadShaFromGate(input.strictGate, input.prUrl, requireGreptile);
+  const mergeGate = await resolvePrMergeGateService(input.projectRoot ?? input.cwd ?? process.cwd());
+  const matchHeadSha = mergeGate.resolveHeadSha({ result: input.strictGate, prUrl: input.prUrl, requireGreptile });
   const method = merge.method ?? "repo-default";
   const args = ["pr", "merge", input.prUrl];
   if (method === "repo-default") {
-    args.push(await resolveRepoDefaultMergeFlag({ prUrl: input.prUrl, command: input.command, cwd: input.cwd }));
+    args.push(await resolveRepoDefaultMergeFlag({ prUrl: input.prUrl, command: input.command, ...input.cwd !== undefined ? { cwd: input.cwd } : {} }));
   } else {
     args.push(`--${method}`);
   }
@@ -466,6 +476,7 @@ async function syncBranchAfterPrFeedback(input) {
 }
 async function runPrAutomation(input) {
   const branch = assertSafeGitBranchName(input.branch, "PR branch");
+  const mergeGate = await resolvePrMergeGateService(input.projectRoot);
   const prConfig = input.config?.pr ?? {};
   const requireGreptile = (input.config?.review?.provider ?? "greptile") === "greptile";
   if (prConfig.mode === "off" || prConfig.mode === "ask") {
@@ -475,7 +486,7 @@ async function runPrAutomation(input) {
     taskId: input.taskId,
     runId: input.runId,
     summary: input.sourceTask?.title ? `Rig completed: ${input.sourceTask.title}` : null,
-    uploadedSnapshot: input.uploadedSnapshot
+    ...input.uploadedSnapshot !== undefined ? { uploadedSnapshot: input.uploadedSnapshot } : {}
   });
   if (input.gitCommand) {
     await pushBranchSyncedWithOrigin({ projectRoot: input.projectRoot, branch, gitCommand: input.gitCommand });
@@ -547,16 +558,16 @@ ${createResult.stdout ?? ""}`) : null;
       await syncBranchAfterPrFeedback({ projectRoot: input.projectRoot, taskId: input.taskId, branch, gitCommand: input.gitCommand });
       continue;
     }
-    const gate = await runStrictPrMergeGate({
+    const gate = await mergeGate.runGate({
       projectRoot: input.projectRoot,
       prUrl,
       taskId: input.taskId,
       runId: input.runId,
       cycle: iteration,
       command: input.command,
-      artifactRoot: input.artifactRoot,
+      ...input.artifactRoot !== undefined ? { artifactRoot: input.artifactRoot } : {},
       allowedFailures: input.config?.merge?.allowedFailures ?? [],
-      greptileApi: requireGreptile ? input.greptileApi : undefined,
+      ...requireGreptile && input.greptileApi ? { greptileApi: input.greptileApi } : {},
       requireGreptile
     });
     latestFeedback = [...gate.actionableFeedback];
@@ -586,22 +597,22 @@ ${createResult.stdout ?? ""}`) : null;
     }
     if (gate.approved) {
       pendingElapsedMs = 0;
-      const finalGate = await runStrictPrMergeGate({
+      const finalGate = await mergeGate.runGate({
         projectRoot: input.projectRoot,
         prUrl,
         taskId: input.taskId,
         runId: input.runId,
         cycle: iteration,
         command: input.command,
-        artifactRoot: input.artifactRoot,
+        ...input.artifactRoot !== undefined ? { artifactRoot: input.artifactRoot } : {},
         allowedFailures: input.config?.merge?.allowedFailures ?? [],
-        greptileApi: requireGreptile ? input.greptileApi : undefined,
+        ...requireGreptile && input.greptileApi ? { greptileApi: input.greptileApi } : {},
         requireGreptile,
         final: true
       });
       if (finalGate.approved) {
         await input.lifecycle?.onMergeStarted?.({ prUrl });
-        await runRepoDefaultMerge({ prUrl, config: input.config, command: input.command, cwd: input.projectRoot, strictGate: finalGate });
+        await runRepoDefaultMerge({ prUrl, ...input.config !== undefined ? { config: input.config } : {}, command: input.command, cwd: input.projectRoot, strictGate: finalGate });
         await input.lifecycle?.onMerged?.({ prUrl });
         return { status: "merged", prUrl, iterations: iteration, actionableFeedback: [], merged: true };
       }
@@ -648,6 +659,7 @@ ${createResult.stdout ?? ""}`) : null;
 }
 var UPLOADED_SNAPSHOT_PR_MARKER = "<!-- rig:uploaded-snapshot -->", RIG_RUNTIME_COMMIT_EXCLUDES, GREPTILE_REREVIEW_MARKER_PREFIX = "rig:greptile-rereview";
 var init_pr_automation = __esm(() => {
+  init_pr_merge_gate_cap();
   RIG_RUNTIME_COMMIT_EXCLUDES = [
     ".rig",
     "artifacts",