CRW-965: accept and integrate implementation nodes by commit without a pull request

cmd/crw/main.go

@@ -37,6 +37,7 @@ import (
 	"github.com/thisisjun786/codex-relay-workflow/internal/relay/childcleanup"
 	_ "github.com/thisisjun786/codex-relay-workflow/internal/relay/dag"
 	_ "github.com/thisisjun786/codex-relay-workflow/internal/relay/dagsched"
+	_ "github.com/thisisjun786/codex-relay-workflow/internal/relay/integrate"
 	_ "github.com/thisisjun786/codex-relay-workflow/internal/relay/managed"
 	_ "github.com/thisisjun786/codex-relay-workflow/internal/relay/mergeturn"
 	_ "github.com/thisisjun786/codex-relay-workflow/internal/relay/routing"

contract/schema/relay-exit-codes.json

@@ -60,6 +60,7 @@
     "CRITERIA_SET_CHANGED": "criteria_set_changed",
     "UNKNOWN_CRITERION": "unknown_criterion",
     "FINDINGS_REQUIRED": "findings_required",
+    "HEAD_NOT_RECEIPT_HEAD": "head_not_receipt_head",
     "DUPLICATE_ASSIGNMENT": "duplicate_assignment",
     "READBACK_MISMATCH": "readback_mismatch",
     "SYNC_NOT_CLAIMABLE": "sync_not_claimable",

internal/contracttest/cli.go

@@ -23,6 +23,7 @@ import (
 	_ "github.com/thisisjun786/codex-relay-workflow/internal/relay/cli"
 	_ "github.com/thisisjun786/codex-relay-workflow/internal/relay/dag"
 	_ "github.com/thisisjun786/codex-relay-workflow/internal/relay/dagsched"
+	_ "github.com/thisisjun786/codex-relay-workflow/internal/relay/integrate"
 	_ "github.com/thisisjun786/codex-relay-workflow/internal/relay/managed"
 	_ "github.com/thisisjun786/codex-relay-workflow/internal/relay/mergeturn"
 	_ "github.com/thisisjun786/codex-relay-workflow/internal/relay/routing"

internal/contracttest/dag_integrate_cli_test.go

@@ -0,0 +1,11 @@
+package contracttest
+
+import "testing"
+
+// The commit-acceptance and integration commands (CRW-965) are proved against the built crw, every case of
+// testdata/fixtures/dag-integrate-cli-cases.json replayed through `crw relay`: each prints the stdout bytes and exit code its
+// golden holds. The cases cover each new command's usage and absent-store refusal, the refusal family a host without a
+// store answers before any git or verification runs.
+func TestDagIntegrateCommands_the_built_crw_prints_its_frozen_answers(t *testing.T) {
+	replayCLICases(t, "dag-integrate-cli-cases.json", false, []string{"dag-integrate", "dag-integrate-push", "dag-integration-observe", "dag-accept"})
+}

internal/contracttest/testdata/fixtures/dag-integrate-cli-cases.json

@@ -0,0 +1,98 @@
+{
+  "integrate-missing-plan": [
+    {
+      "argv": [
+        "dag-integrate",
+        "--actor",
+        "parent",
+        "--checkout",
+        "/nonexistent/checkout",
+        "--integration-ref",
+        "dev-int",
+        "--base",
+        "dev",
+        "--verify",
+        "true"
+      ]
+    }
+  ],
+  "integrate-absent-store": [
+    {
+      "argv": [
+        "dag-integrate",
+        "--plan",
+        "p",
+        "--actor",
+        "parent",
+        "--checkout",
+        "/nonexistent/checkout",
+        "--integration-ref",
+        "dev-int",
+        "--base",
+        "dev",
+        "--verify",
+        "true"
+      ]
+    }
+  ],
+  "push-missing-checkout": [
+    {
+      "argv": [
+        "dag-integrate-push",
+        "--checkout",
+        "/nonexistent/checkout",
+        "--integration-ref",
+        "dev-int",
+        "--remote",
+        "origin",
+        "--remote-ref",
+        "dev"
+      ]
+    }
+  ],
+  "push-missing-remote": [
+    {
+      "argv": [
+        "dag-integrate-push",
+        "--checkout",
+        "/nonexistent/checkout",
+        "--integration-ref",
+        "dev-int",
+        "--remote-ref",
+        "dev"
+      ]
+    }
+  ],
+  "observe-absent-store": [
+    {
+      "argv": [
+        "dag-integration-observe",
+        "--plan",
+        "p",
+        "--node",
+        "a",
+        "--actor",
+        "parent"
+      ]
+    }
+  ],
+  "accept-commit-absent-store": [
+    {
+      "argv": [
+        "dag-accept",
+        "--plan",
+        "p",
+        "--node",
+        "a",
+        "--actor",
+        "parent",
+        "--commit",
+        "0123456789abcdef0123456789abcdef01234567",
+        "--base",
+        "0123456789abcdef0123456789abcdef01234567",
+        "--verification",
+        "/nonexistent/record.json"
+      ]
+    }
+  ]
+}

internal/relay/argparse/specs.json

@@ -907,6 +907,10 @@
   {"flag":"--repository","help":"an implementation node's pull request repository (owner/name)"},
   {"flag":"--pull-request","type":"int","help":"an implementation node's pull request number"},
   {"flag":"--supersedes","help":"the active acceptance of another output this one replaces"},
+  {"flag":"--commit","help":"an implementation node accepted without a pull request: the commit that is the receipt head of its generation (full lower-case hex). Needs --base, --checkout and --verification; not with --repository or --pull-request"},
+  {"flag":"--base","help":"with --commit: the commit the head must descend from"},
+  {"flag":"--checkout","help":"with --commit: an absolute path to the local checkout that holds both commits"},
+  {"flag":"--verification","help":"with --commit: the verification-record/1 document (JSON or @file) that names this commit tree with a PASS it may reuse"},
   {"flag":"--rule-version","required":true,"help":"the rules the result was verified under, {skills_digest, model, effort} as JSON or @file"},
   {"flag":"--expect-epoch","type":"int","help":"the coordinator epoch this session holds (dag-coordinator-claim answers it); a write from another epoch is refused stale_coordinator_epoch. 0 names none, which only a plan nobody claimed takes"}]},
 {"name":"dag-integration-observe","summary":"records whether an accepted implementation node's head is contained in the branches it has to land on, read by the relay itself (git merge-base --is-ancestor for a local checkout, the compare API for a forge repository). Integration needs every required target to contain the head and the parent's merged mark on the same revision; the node's slot is returned when it does. A landing also runs the conflict sweep it owes (conflict_sweep in the answer), once per landing","options":[
@@ -915,6 +919,20 @@
   {"flag":"--actor","required":true},
   {"flag":"--target","kind":"append","help":"repository@ref to observe (repeatable); the targets of the node's outgoing edges by default. A terminal node needs it"},
   {"flag":"--expect-epoch","type":"int","help":"the coordinator epoch this session holds (dag-coordinator-claim answers it); a write from another epoch is refused stale_coordinator_epoch. 0 names none, which only a plan nobody claimed takes"}]},
+{"name":"dag-integrate","summary":"merges the plan's ready accepted implementation candidates (or the named --node ones) one after another onto a local integration branch with merge commits, runs one verification (--verify, split into arguments, never a shell) on the merged tree, and moves the branch only to a tree whose verification record is a PASS. A candidate whose merge conflicts or whose verification breaks is left out and returned in split. The branch moves by a compare-and-swap on its old head, so a head that moved under the command is refused. On success the parent's merged mark is recorded for each merged candidate; integration is then observed by dag-integration-observe --target on the integration branch","options":[
+  {"flag":"--plan","required":true},
+  {"flag":"--actor","required":true,"help":"the parent running the batch"},
+  {"flag":"--checkout","required":true,"help":"an absolute path to the local checkout that holds the candidates' commits and the integration branch"},
+  {"flag":"--integration-ref","required":true,"help":"the local branch the batch merges onto"},
+  {"flag":"--base","required":true,"help":"the branch the candidates descend from, read in the same checkout"},
+  {"flag":"--verify","required":true,"help":"the one verification run on the merged tree, a command split into arguments (no shell); it runs in the merged worktree with CRW_VERIFY_RECORD (a fresh path to write a verification-record/1 to), CRW_VERIFY_BASE and CRW_VERIFY_HEAD in its environment; a non-zero exit is a failure"},
+  {"flag":"--node","kind":"append","help":"a candidate to consider (repeatable); none means every ready accepted candidate of the plan"},
+  {"flag":"--expect-epoch","type":"int","help":"the coordinator epoch this session holds (dag-coordinator-claim answers it); a write from another epoch is refused stale_coordinator_epoch. 0 names none, which only a plan nobody claimed takes"}]},
+{"name":"dag-integrate-push","summary":"moves the remote branch to the integration branch's commit by a fast-forward only: nothing is pushed when the remote already holds that commit (up_to_date), when the remote holds a commit the integration branch does not contain (refused merge_base_mismatch), or never by force. When the remote cannot be reached the push is deferred (outcome deferred, exit 0) and the integration recorded by dag-integrate stands; run this command again later to make the push","options":[
+  {"flag":"--checkout","required":true,"help":"an absolute path to the local checkout that holds the integration branch"},
+  {"flag":"--integration-ref","required":true,"help":"the local integration branch whose commit is pushed"},
+  {"flag":"--remote","required":true,"help":"the remote name, for example origin"},
+  {"flag":"--remote-ref","required":true,"help":"the remote branch to fast-forward, for example dev"}]},
 {"name":"dag-base-refresh","summary":"records that an accepted implementation node's acceptance also stands on a later generation of its relationship that only refreshed the base: the relay reads the pull request head from the forge and the base tip from the target, and proves in a local checkout that the head is the accepted head plus merges of the base branch (each merge a two-parent commit whose tree is the tree git merges from its parents; a merge git cannot do cleanly is accepted only when the commit differs from git's tree in the files git could not merge, and files not proved by the node's declared mechanical rule must be named exactly with --resolved). The acceptance is not replaced; integration is then judged on the refreshed head and the merged mark of that generation. A stale node, a landed node and a head that holds anything but base merges are refused","options":[
   {"flag":"--plan","required":true},
   {"flag":"--node","required":true},