fix(queue): genesis owner-not-reviewer check, assign wording, queue-commit HEAD-moved message, calendar dates (row 33, #1508)

Built by filbert, approved by darkwing in round 1 (#1508 comment 26651).
Manifest fe7da3ef, 10 paths. Suites green on an index export.

Co-Authored-By: Claude Opus 5.5 <[email protected]>

packages/queue/tests/commit.test.mjs

@@ -223,11 +223,11 @@ test("F1: step 8 with index.lock held exits 3, and ordinary commits stay refused
   assert.equal(r.g("rev-parse", "HEAD^").trim(), c);
 });
 
-test("F1: HEAD moving after commit-tree and before update-ref: refused, nothing published", (t) => {
+test("F1: HEAD moving after the step-7 guard check and before update-ref: refused, nothing published", (t) => {
   const r = ready(t);
   note(r);
   const h = r.head();
-  r.on("git", `if [ "$phase $sub" = "after commit-tree" ] && once move; then
+  r.on("git", `if [ "$phase $sub" = "before update-ref" ] && once move; then
   echo other > "$R/other.txt"; git -C "$R" add other.txt; git -C "$R" commit -q -m other
 fi`);
   const res = r.qc(["-m", "queue rev 1"]);
@@ -238,7 +238,7 @@ fi`);
   assert.equal(r.g("log", "-1", "--format=%s").trim(), "other");
 });
 
-test("F1: H is recorded before the canary, so HEAD moving during the canary makes update-ref fail", (t) => {
+test("F1: H is recorded before the canary, so HEAD moving during the step-1 canary is refused at step 7", (t) => {
   const r = ready(t);
   note(r);
   const h = r.head();
@@ -246,13 +246,58 @@ test("F1: H is recorded before the canary, so HEAD moving during the canary make
   echo other > "$R/other.txt"; git -C "$R" add other.txt; git -C "$R" commit -q -m other
 fi`);
   const res = r.qc(["-m", "queue rev 1"]);
-  assert.equal(res.code, 1, res.err);
-  assert.match(res.err, new RegExp(`moved since ${h}`));
+  assert.equal(res.code, 2, res.err);
+  assert.match(res.err, new RegExp(`refused \\(step7\\): HEAD moved since ${h} was recorded \\(another commit landed\\); run queue-commit.sh again`));
   assert.equal(r.g("log", "-1", "--format=%s").trim(), "other");
   assert.equal(r.g("rev-parse", "HEAD^").trim(), h);
   assert.equal(r.revAt("HEAD"), 0);
-  // Both guard checks ran in full (two canary runs each), so only update-ref caught the move.
-  assert.equal(r.calls("git").filter((c) => c === "before hook").length, 4);
+  // A commit outside the queue files passes the step-1 canary. The step-7
+  // check refuses before its canary, so update-ref never runs.
+  assert.equal(r.calls("git").filter((c) => c === "before hook").length, 2);
+  assert.ok(!r.calls("git").includes("before update-ref"));
+});
+
+// Another queue commit landing after H is recorded. The canary's index
+// holds H's tree and the hook diffs it with the live HEAD, so before
+// 2026-10-04 the clean run failed and the script blamed the guard.
+const NESTED = 'bash "$R/scripts/queue-commit.sh" -m nested >> "$CTL/nested.log" 2>&1; echo $? > "$CTL/nested-exit"';
+
+test("F1: a queue commit landing after H is recorded: step 1 says HEAD moved, not the guard", (t) => {
+  const r = ready(t);
+  note(r);
+  const h = r.head();
+  r.on("git", `if [ "$phase $sub" = "after symbolic-ref" ] && once move; then ${NESTED}; fi`);
+  const res = r.qc(["-m", "queue rev 1"]);
+  assert.equal(r.ctlFile("nested-exit"), "0", r.ctlFile("nested.log"));
+  assert.equal(res.code, 2, res.err);
+  assert.match(res.err, new RegExp(`refused \\(step1\\): HEAD moved since ${h} was recorded \\(another commit landed\\); run queue-commit.sh again`));
+  assert.doesNotMatch(res.err, /not running the queue guard/);
+  assert.equal(r.calls("git").filter((c) => c === "before hook").length, 0);
+  assert.equal(r.g("log", "-1", "--format=%s").trim(), "nested");
+  assert.equal(r.revAt("HEAD"), 1);
+  // Running it again, as the message says, finds the queue already committed.
+  r.off("git");
+  note(r);
+  const again = r.qc(["-m", "queue rev 2"]);
+  assert.equal(again.code, 0, again.err);
+  assert.equal(r.revAt("HEAD"), 2);
+});
+
+test("F1: a queue commit landing between the HEAD check and the canary: the failed clean run is reported as HEAD moved", (t) => {
+  const r = ready(t);
+  note(r);
+  const h = r.head();
+  r.on("git", `if [ "$phase $sub" = "before hook" ] && once move; then ${NESTED}; fi`);
+  const res = r.qc(["-m", "queue rev 1"]);
+  assert.equal(r.ctlFile("nested-exit"), "0", r.ctlFile("nested.log"));
+  assert.equal(res.code, 2, res.err);
+  assert.match(res.err, new RegExp(`refused \\(step1\\): HEAD moved since ${h} was recorded \\(another commit landed\\); run queue-commit.sh again`));
+  assert.doesNotMatch(res.err, /not running the queue guard/);
+  // The clean run did run, and failed on the moved HEAD.
+  assert.equal(r.calls("git").filter((c) => c === "before hook").length, 1);
+  assert.ok(r.calls("git").includes("after hook"));
+  assert.equal(r.g("log", "-1", "--format=%s").trim(), "nested");
+  assert.equal(r.revAt("HEAD"), 1);
 });
 
 test("F1: a shared-index change during the procedure is not committed", (t) => {