lobstah 0.7.0 → 0.7.1

package/dist/main.js

@@ -11363,16 +11363,23 @@ function rebaseBrief(pr, id, trunk) {
     conflictUpdate(pr.baseRef, pr.headRef, standalone),
     pushRule(pr.headRef, id, standalone ? "merge" : "rebase"),
     `Do not merge the PR. Do not change anything beyond conflict resolution.`,
-    // A reviewed PR's review goes stale at the new head: ask its reviewers again and park.
-    pr.reviews.length > 0 ? rerequestReview({ url: pr.url, number: pr.number }, id, [...new Set(pr.reviews.map((r) => r.author))]) : `When pushed, report status done.`
+    `When pushed, report status done.`
   ].join(" ");
 }
-function choreVerdict(uuid) {
+function choreVerdict(uuid, pr) {
+  const last = readStatusLog(uuid, "chore").at(-1);
+  const pausedOnReview = last?.verb === "paused" && last.waitingOn === "review";
+  if (last?.verb === "done" || pausedOnReview) {
+    const startedHead = storedDescriptor(uuid, "chore")?.pr?.headSha;
+    const unchangedConflict = pr.mergeableState === "dirty" && startedHead === pr.headSha;
+    return { state: unchangedConflict ? "failed" : "done", pausedOnReview };
+  }
+  if (last?.verb === "paused")
+    return { state: "active" };
   const d = laneDirs("chore");
   if (fs46.existsSync(path41.join(d.active, uuid)) || fs46.existsSync(path41.join(d.queue, `${uuid}.json`)))
-    return "active";
-  const last = readStatusLog(uuid, "chore").at(-1)?.verb;
-  return last === "done" ? "done" : "failed";
+    return { state: "active" };
+  return { state: "failed" };
 }
 async function mergeLoop(ms, policy, state, log = () => {
 }) {
@@ -11416,12 +11423,12 @@ async function mergeLoop(ms, policy, state, log = () => {
         observe(candidate, "rebase-failed");
         continue;
       }
-      const verdict = choreVerdict(rebase.uuid);
-      if (verdict === "active") {
+      const verdict = choreVerdict(rebase.uuid, candidate);
+      if (verdict.state === "active") {
         observe(candidate, `conflict-chore:${rebase.uuid}`);
         continue;
       }
-      if (verdict === "failed") {
+      if (verdict.state === "failed") {
         await ms.comment(candidate.number, `Automated rebase failed (dispatch ${rebase.uuid}) \u2014 needs a human.`);
         await ms.addLabel(candidate.number, "needs-human");
         state.failRebase(prKey);
@@ -11429,6 +11436,8 @@ async function mergeLoop(ms, policy, state, log = () => {
         observe(candidate, "rebase-failed");
         continue;
       }
+      if (verdict.pausedOnReview)
+        log(`${prKey}: rebase chore ${rebase.uuid} paused on review \u2014 treating as finished; the merge gate owns the review wait`);
       state.clearRebase(prKey);
     }
     const provisional = qualifiedApproval(policy, candidate);

package/docs/pickup.md

@@ -282,7 +282,7 @@ A PR behind its base splits deterministically:
 | Condition | Action |
 |---|---|
 | Behind, no conflict | Update the branch through the forge API, re-enter the gate next tick |
-| Behind, real conflict | Write a rebase chore — brief: rebase onto base, resolve, push to the PR's branch — and re-enter the gate when it completes |
+| Behind, real conflict | Write a rebase chore — resolve, push to the PR's branch, report `done` — then re-enter the gate, which re-requests stale review once per head |
 
 Rebase chores go through the **chore lane** (`~/.lobstah/chores/`, defined in
 the [design's queue contract](design.md#queue-contract)), never the primary queue. Same descriptor schema,
@@ -293,6 +293,12 @@ queue, and `lobstah ls` stays a list of things a human asked for.
 Chores report to no tracker. The merge loop consumes the chore's status file
 directly, holds its own PR-to-chore mapping, and bounds the attempt at one: a
 failed rebase comments on the PR, applies the `needs-human` label, and stops.
+A rebase chore reports `done` after its push, even on a reviewed PR; the gate
+re-requests stale review once per head. Older chores parked on review are
+treated as finished by the gate and finish their own wait when the PR merges
+or closes. They hold no chore slot while parked. A reported push that leaves
+the original head unchanged and still conflicting fails the one attempt,
+whether the report was `done` or a legacy review pause.
 A rebase chore's descriptor names its PR (`pr`): the runner pushes no branch
 and opens no PR for it. The brief tells the worker to push to the PR's head
 branch only and, on a non-fast-forward rejection, to fetch, rebase onto the

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lobstah",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "Harness-agnostic, token-efficient supervision framework for coding agents",
   "license": "MIT",
   "author": "aequitas labs LLC",