@bluewombat/slots 0.9.0 → 0.10.0

package/refreshers/git.mjs

@@ -23,6 +23,12 @@ import {
 // fast-forward has been written to by somebody else, and that is a person's
 // problem, not a merge to attempt.
 //
+// A Feature's line cut from the final branch that has no commit of its own is
+// only a stale copy of it: when `--base` names that branch and the line is an
+// ancestor of it, the line is fast-forwarded to it, here and on the remote, so
+// a Ticket starts from the code as it now is. A line with commits of its own
+// is left alone.
+//
 // The remote is `origin`, like the git Publisher's. Takes no option.
 
 const cwd = process.cwd();
@@ -53,6 +59,34 @@ if (fetched.status !== 0) {
   process.exit(0);
 }
 
+const base = take(process.argv, "--base");
+let goal = `origin/${target}`;
+if (base !== undefined && base.trim().length > 0 && base !== target) {
+  const fetchedBase = git(["fetch", "origin", `+refs/heads/${base}:refs/remotes/origin/${base}`]);
+  if (fetchedBase.status !== 0) {
+    emitRefreshRefusal(
+      `Cannot fetch origin/${base} from ${cwd}: ${fetchedBase.stderr.trim().slice(-500)}`,
+    );
+    process.exit(0);
+  }
+  const behindBase =
+    git(["merge-base", "--is-ancestor", `origin/${target}`, `origin/${base}`]).status === 0;
+  if (
+    behindBase &&
+    git(["rev-parse", `origin/${target}`]).stdout !== git(["rev-parse", `origin/${base}`]).stdout
+  ) {
+    // A plain push: never forced, so it only ever adds history.
+    const pushed = git(["push", "origin", `refs/remotes/origin/${base}:refs/heads/${target}`]);
+    if (pushed.status !== 0) {
+      emitRefreshRefusal(
+        `Cannot move origin/${target} up to origin/${base}: ${pushed.stderr.trim().slice(-500)}`,
+      );
+      process.exit(0);
+    }
+    goal = `origin/${base}`;
+  }
+}
+
 const current = git(["symbolic-ref", "--short", "HEAD"]);
 if (current.status !== 0 || current.stdout.trim() !== target) {
   const exists = git(["rev-parse", "--verify", "--quiet", `refs/heads/${target}`]).status === 0;
@@ -65,7 +99,7 @@ if (current.status !== 0 || current.stdout.trim() !== target) {
   }
 }
 
-const merged = git(["merge", "--ff-only", `origin/${target}`]);
+const merged = git(["merge", "--ff-only", goal]);
 if (merged.status !== 0) {
   // The one way a copy stops fast-forwarding is a commit made into it that
   // the reference does not have. The copy is the system's, not a person's:

package/{assembly → ticket}/fix.mjs

@@ -15,7 +15,7 @@ import {
 } from "@bluewombat/slot-kit";
 import { attemptOf } from "../lib/fill.mjs";
 
-const NAME = "assembly fix";
+const NAME = "ticket fix";
 
 const DEFAULT_TEMPLATE = `You are a coding agent working unattended in a checkout of the project.
 
@@ -60,7 +60,7 @@ A person reads that line and decides. It is a correct answer, not a failure.
 
 const report = (take(process.argv, "--report") ?? "").trim();
 if (report.length === 0) {
-  emitFailure("fail-blocking", "The assembly fix command needs --report.");
+  emitFailure("fail-blocking", "The ticket fix command needs --report.");
   process.exit(1);
 }
 

package/{assembly → ticket}/validate.mjs

@@ -15,7 +15,7 @@ import {
 } from "@bluewombat/slot-kit";
 import { attemptOf } from "../lib/fill.mjs";
 
-const NAME = "assembly validate";
+const NAME = "ticket validate";
 
 const DEFAULT_TEMPLATE = `You are a coding agent working unattended in a checkout of the project.
 
@@ -67,7 +67,7 @@ const report = (take(process.argv, "--report") ?? "").trim();
 if (report.length > 0) {
   emitFailure(
     "fail-blocking",
-    "assembly.validate is a read-only review; it does not take --report — that is assembly.fix's job.",
+    "ticket.validate is a read-only review; it does not take --report — that is ticket.fix's job.",
   );
   process.exit(1);
 }
@@ -149,7 +149,7 @@ function answer(run, bin, name) {
     // next round gets the same prompt again.
     emitFailure(
       "fail-retryable",
-      `assembly.validate found no MASON_VERDICT: line in the answer: ${
+      `ticket.validate found no MASON_VERDICT: line in the answer: ${
         said.length > 0 ? said.slice(0, 500) : "(no answer)"
       }`,
     );
@@ -160,9 +160,7 @@ function answer(run, bin, name) {
     const why = verdict.slice(refused[0].length).trim();
     emitFailure(
       "fail-retryable",
-      why.length > 0
-        ? why
-        : "assembly.validate refused the assembled ticket, with no reason given.",
+      why.length > 0 ? why : "ticket.validate refused the assembled ticket, with no reason given.",
     );
     process.exit(1);
   }
@@ -171,7 +169,7 @@ function answer(run, bin, name) {
   }
   emitFailure(
     "fail-retryable",
-    `assembly.validate's MASON_VERDICT: line was neither VALIDATED nor REFUSED: ${verdict.slice(0, 500)}`,
+    `ticket.validate's MASON_VERDICT: line was neither VALIDATED nor REFUSED: ${verdict.slice(0, 500)}`,
   );
   process.exit(1);
 }