@h-rig/bundle-default-lifecycle 0.0.6-alpha.157 → 0.0.6-alpha.159

package/dist/src/stages/source-closeout.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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@h-rig/bundle-default-lifecycle",
-  "version": "0.0.6-alpha.157",
+  "version": "0.0.6-alpha.159",
   "type": "module",
   "description": "Default Rig run lifecycle stage bundle wrapping the existing closeout runtime.",
   "license": "UNLICENSED",
@@ -13,14 +13,6 @@
       "types": "./dist/src/plugin.d.ts",
       "import": "./dist/src/plugin.js"
     },
-    "./closeout-equivalence": {
-      "types": "./dist/src/closeoutEquivalence.d.ts",
-      "import": "./dist/src/closeoutEquivalence.js"
-    },
-    "./closeout-shadow-harness": {
-      "types": "./dist/src/closeoutShadowHarness.d.ts",
-      "import": "./dist/src/closeoutShadowHarness.js"
-    },
     "./default-pipeline": {
       "types": "./dist/src/defaultPipeline.d.ts",
       "import": "./dist/src/defaultPipeline.js"
@@ -56,6 +48,30 @@
     "./control-plane/verifier": {
       "types": "./dist/src/control-plane/verifier.d.ts",
       "import": "./dist/src/control-plane/verifier.js"
+    },
+    "./control-plane/native/git-ops": {
+      "types": "./dist/src/control-plane/native/git-ops.d.ts",
+      "import": "./dist/src/control-plane/native/git-ops.js"
+    },
+    "./control-plane/materialize-task-config": {
+      "types": "./dist/src/control-plane/materialize-task-config.d.ts",
+      "import": "./dist/src/control-plane/materialize-task-config.js"
+    },
+    "./control-plane/hooks/inject-context": {
+      "types": "./dist/src/control-plane/hooks/inject-context.d.ts",
+      "import": "./dist/src/control-plane/hooks/inject-context.js"
+    },
+    "./control-plane/hooks/task-runtime-start": {
+      "types": "./dist/src/control-plane/hooks/task-runtime-start.d.ts",
+      "import": "./dist/src/control-plane/hooks/task-runtime-start.js"
+    },
+    "./control-plane/hooks/submodule-branch": {
+      "types": "./dist/src/control-plane/hooks/submodule-branch.d.ts",
+      "import": "./dist/src/control-plane/hooks/submodule-branch.js"
+    },
+    "./control-plane/hooks/shared": {
+      "types": "./dist/src/control-plane/hooks/shared.d.ts",
+      "import": "./dist/src/control-plane/hooks/shared.js"
     }
   },
   "engines": {
@@ -65,12 +81,9 @@
   "module": "./dist/src/index.js",
   "types": "./dist/src/index.d.ts",
   "dependencies": {
-    "@rig/contracts": "npm:@h-rig/contracts@0.0.6-alpha.157",
-    "@rig/core": "npm:@h-rig/core@0.0.6-alpha.157",
-    "@rig/hook-kit": "npm:@h-rig/hook-kit@0.0.6-alpha.157",
-    "@rig/kernel": "npm:@h-rig/kernel@0.0.6-alpha.157",
-    "@rig/pr-review-plugin": "npm:@h-rig/pr-review-plugin@0.0.6-alpha.157",
-    "@rig/runtime": "npm:@h-rig/runtime@0.0.6-alpha.157",
-    "@rig/shared": "npm:@h-rig/shared@0.0.6-alpha.157"
+    "@rig/contracts": "npm:@h-rig/contracts@0.0.6-alpha.159",
+    "@rig/core": "npm:@h-rig/core@0.0.6-alpha.159",
+    "@rig/hook-kit": "npm:@h-rig/hook-kit@0.0.6-alpha.159",
+    "@rig/kernel-seed": "npm:@h-rig/kernel-seed@0.0.6-alpha.159"
   }
 }

package/dist/src/branch-naming.d.ts

@@ -1,15 +0,0 @@
-/**
- * Sanitize an arbitrary string into a valid, lowercase git branch fragment.
- * Strips quotes, collapses separators, limits to 64 chars.
- */
-export declare function sanitizeBranchFragment(raw: string): string;
-/**
- * Sanitize a string into a `feature/…` branch name.
- * Preserves an existing `feature/` prefix or slash-separated namespace.
- */
-export declare function sanitizeFeatureBranchName(raw: string): string;
-/**
- * Resolve a unique `feature/…` branch name that doesn't collide with
- * any existing branch. Appends a numeric suffix when needed.
- */
-export declare function resolveAutoFeatureBranchName(existingBranchNames: readonly string[], preferredBranch?: string): string;

package/dist/src/branch-naming.js

@@ -1,33 +0,0 @@
-// @bun
-// packages/bundle-default-lifecycle/src/branch-naming.ts
-function sanitizeBranchFragment(raw) {
-  const normalized = raw.trim().toLowerCase().replace(/['"`]/g, "").replace(/^[./\s_-]+|[./\s_-]+$/g, "");
-  const branchFragment = normalized.replace(/[^a-z0-9/_-]+/g, "-").replace(/\/+/g, "/").replace(/-+/g, "-").replace(/^[./_-]+|[./_-]+$/g, "").slice(0, 64).replace(/[./_-]+$/g, "");
-  return branchFragment.length > 0 ? branchFragment : "update";
-}
-function sanitizeFeatureBranchName(raw) {
-  const sanitized = sanitizeBranchFragment(raw);
-  if (sanitized.includes("/")) {
-    return sanitized.startsWith("feature/") ? sanitized : `feature/${sanitized}`;
-  }
-  return `feature/${sanitized}`;
-}
-var AUTO_FEATURE_BRANCH_FALLBACK = "feature/update";
-function resolveAutoFeatureBranchName(existingBranchNames, preferredBranch) {
-  const preferred = preferredBranch?.trim();
-  const resolvedBase = sanitizeFeatureBranchName(preferred && preferred.length > 0 ? preferred : AUTO_FEATURE_BRANCH_FALLBACK);
-  const existingNames = new Set(existingBranchNames.map((branch) => branch.toLowerCase()));
-  if (!existingNames.has(resolvedBase)) {
-    return resolvedBase;
-  }
-  let suffix = 2;
-  while (existingNames.has(`${resolvedBase}-${suffix}`)) {
-    suffix += 1;
-  }
-  return `${resolvedBase}-${suffix}`;
-}
-export {
-  sanitizeFeatureBranchName,
-  sanitizeBranchFragment,
-  resolveAutoFeatureBranchName
-};

package/dist/src/closeoutEquivalence.d.ts

@@ -1,37 +0,0 @@
-import type { InProcessCloseoutResult } from "./native/in-process-closeout";
-export declare const CLOSEOUT_EQUIVALENCE_ARTIFACTS: readonly ["review-status.txt", "review-feedback.md", "review-state.json", "pr-state.json", "git-state.txt", "validation-summary.json"];
-export declare const CLOSEOUT_EQUIVALENCE_STATE_FILES: readonly ["task-repo-commits.json", "failed_approaches.md"];
-export type CloseoutEquivalenceArtifactName = typeof CLOSEOUT_EQUIVALENCE_ARTIFACTS[number] | typeof CLOSEOUT_EQUIVALENCE_STATE_FILES[number];
-export type CloseoutArtifactSnapshot = Readonly<Record<CloseoutEquivalenceArtifactName, string | null>>;
-export type CloseoutTaskSourceCall = {
-    readonly method: string;
-    readonly taskId: string;
-    readonly status?: string;
-    readonly summary?: string;
-};
-export type CloseoutEquivalenceRun = {
-    readonly label: "imperative" | "staged";
-    readonly result: InProcessCloseoutResult;
-    readonly artifacts: CloseoutArtifactSnapshot;
-    readonly taskSourceCalls: readonly CloseoutTaskSourceCall[];
-};
-export type CloseoutEquivalenceDiff = {
-    readonly kind: "artifact" | "task-source" | "result";
-    readonly path: string;
-    readonly imperative: string | null;
-    readonly staged: string | null;
-};
-export type CloseoutEquivalenceReport = {
-    readonly equivalent: boolean;
-    readonly diffs: readonly CloseoutEquivalenceDiff[];
-};
-export declare function snapshotCloseoutArtifacts(input: {
-    readonly projectRoot: string;
-    readonly taskId: string;
-    readonly artifactRoot?: string;
-    readonly stateRoot?: string;
-}): CloseoutArtifactSnapshot;
-export declare function compareCloseoutEquivalence(input: {
-    readonly imperative: CloseoutEquivalenceRun;
-    readonly staged: CloseoutEquivalenceRun;
-}): CloseoutEquivalenceReport;

package/dist/src/closeoutEquivalence.js

@@ -1,78 +0,0 @@
-// @bun
-// packages/bundle-default-lifecycle/src/closeoutEquivalence.ts
-import { existsSync, readFileSync } from "fs";
-import { resolve } from "path";
-var CLOSEOUT_EQUIVALENCE_ARTIFACTS = [
-  "review-status.txt",
-  "review-feedback.md",
-  "review-state.json",
-  "pr-state.json",
-  "git-state.txt",
-  "validation-summary.json"
-];
-var CLOSEOUT_EQUIVALENCE_STATE_FILES = [
-  "task-repo-commits.json",
-  "failed_approaches.md"
-];
-function snapshotCloseoutArtifacts(input) {
-  const artifactRoot = input.artifactRoot ?? resolve(input.projectRoot, "artifacts", input.taskId);
-  const stateRoot = input.stateRoot ?? resolve(input.projectRoot, ".rig", "state");
-  const entries = [
-    ...CLOSEOUT_EQUIVALENCE_ARTIFACTS.map((name) => {
-      const path = resolve(artifactRoot, name);
-      return [name, existsSync(path) ? readFileSync(path, "utf-8") : null];
-    }),
-    ...CLOSEOUT_EQUIVALENCE_STATE_FILES.map((name) => {
-      const path = resolve(stateRoot, name);
-      return [name, existsSync(path) ? readFileSync(path, "utf-8") : null];
-    })
-  ];
-  return Object.fromEntries(entries);
-}
-function compareCloseoutEquivalence(input) {
-  const diffs = [];
-  for (const name of [...CLOSEOUT_EQUIVALENCE_ARTIFACTS, ...CLOSEOUT_EQUIVALENCE_STATE_FILES]) {
-    const imperative = input.imperative.artifacts[name];
-    const staged = input.staged.artifacts[name];
-    if (imperative !== staged) {
-      diffs.push({ kind: "artifact", path: name, imperative, staged });
-    }
-  }
-  const imperativeCalls = JSON.stringify(input.imperative.taskSourceCalls.map((call) => ({
-    method: call.method,
-    taskId: call.taskId,
-    status: call.status ?? null,
-    summary: call.summary ?? null
-  })));
-  const stagedCalls = JSON.stringify(input.staged.taskSourceCalls.map((call) => ({
-    method: call.method,
-    taskId: call.taskId,
-    status: call.status ?? null,
-    summary: call.summary ?? null
-  })));
-  if (imperativeCalls !== stagedCalls) {
-    diffs.push({ kind: "task-source", path: "task-source-calls", imperative: imperativeCalls, staged: stagedCalls });
-  }
-  const imperativeResult = JSON.stringify({
-    status: input.imperative.result.status,
-    prUrl: input.imperative.result.prUrl ?? null,
-    iterations: input.imperative.result.iterations,
-    feedback: [...input.imperative.result.feedback]
-  });
-  const stagedResult = JSON.stringify({
-    status: input.staged.result.status,
-    prUrl: input.staged.result.prUrl ?? null,
-    iterations: input.staged.result.iterations,
-    feedback: [...input.staged.result.feedback]
-  });
-  if (imperativeResult !== stagedResult) {
-    diffs.push({ kind: "result", path: "closeout-result", imperative: imperativeResult, staged: stagedResult });
-  }
-  return { equivalent: diffs.length === 0, diffs };
-}
-export {
-  snapshotCloseoutArtifacts,
-  compareCloseoutEquivalence,
-  CLOSEOUT_EQUIVALENCE_STATE_FILES,
-  CLOSEOUT_EQUIVALENCE_ARTIFACTS
-};

package/dist/src/closeoutShadowHarness.d.ts

@@ -1,27 +0,0 @@
-export type CloseoutShadowEffectKind = "git-push" | "pr-open" | "review-gate" | "merge" | "task-source";
-export type CloseoutShadowEffect = {
-    readonly kind: CloseoutShadowEffectKind;
-    readonly target: string;
-    readonly detail?: string;
-};
-export type CloseoutShadowRun = {
-    readonly label: "imperative" | "staged";
-    readonly effects: readonly CloseoutShadowEffect[];
-};
-export type CloseoutShadowDiff = {
-    readonly index: number;
-    readonly imperative: CloseoutShadowEffect | null;
-    readonly staged: CloseoutShadowEffect | null;
-};
-export type CloseoutShadowComparison = {
-    readonly equivalent: boolean;
-    readonly diffs: readonly CloseoutShadowDiff[];
-};
-export declare function compareCloseoutShadowRuns(input: {
-    readonly imperative: CloseoutShadowRun;
-    readonly staged: CloseoutShadowRun;
-}): CloseoutShadowComparison;
-export declare function assertCloseoutShadowEquivalent(input: {
-    readonly imperative: CloseoutShadowRun;
-    readonly staged: CloseoutShadowRun;
-}): CloseoutShadowComparison;

package/dist/src/closeoutShadowHarness.js

@@ -1,29 +0,0 @@
-// @bun
-// packages/bundle-default-lifecycle/src/closeoutShadowHarness.ts
-function effectKey(effect) {
-  return effect === null ? null : JSON.stringify({ kind: effect.kind, target: effect.target, detail: effect.detail ?? null });
-}
-function compareCloseoutShadowRuns(input) {
-  const max = Math.max(input.imperative.effects.length, input.staged.effects.length);
-  const diffs = [];
-  for (let index = 0;index < max; index += 1) {
-    const imperative = input.imperative.effects[index] ?? null;
-    const staged = input.staged.effects[index] ?? null;
-    if (effectKey(imperative) !== effectKey(staged)) {
-      diffs.push({ index, imperative, staged });
-    }
-  }
-  return { equivalent: diffs.length === 0, diffs };
-}
-function assertCloseoutShadowEquivalent(input) {
-  const comparison = compareCloseoutShadowRuns(input);
-  if (!comparison.equivalent) {
-    const details = comparison.diffs.map((diff) => `#${diff.index}: imperative=${effectKey(diff.imperative) ?? "<missing>"} staged=${effectKey(diff.staged) ?? "<missing>"}`).join("; ");
-    throw new Error(`Closeout shadow side effects differ: ${details}`);
-  }
-  return comparison;
-}
-export {
-  compareCloseoutShadowRuns,
-  assertCloseoutShadowEquivalent
-};