@ai-dossier/sched 0.57.1 → 0.57.3

package/README.md

@@ -536,8 +536,10 @@ validating → attributing → fixing (ONE bounded attempt) → validating
   suite report unreadable, after the fallback retry when one applied
                          → blocked → validating (nothing requeued/reverted; #562)
 awaiting-merge (CONFLICTING | auto-merge-blocked)
-                         → rebasing → re-validating → shipping
-                         → (2nd occurrence) dissolving into two half-batches
+                          → rebasing → re-validating → shipping
+                          → (2nd occurrence) dissolving into two half-batches
+                          #840: with VALIDATED members, keep them landed;
+                          #867: the PR watch automatically enters this rail
 ```
 
 1. **Attribution (AC1)** — `attributeByOverlap` maps each failing test to a member by
@@ -602,10 +604,14 @@ awaiting-merge (CONFLICTING | auto-merge-blocked)
    batch branch is simply left behind unmerged, since sched deletes nothing. Every dissolve
    decision — all three strategies — journals its policy inputs (`N=`, `evictions=`,
    `threshold=`), so it is explainable without re-deriving the formula.
-5. **PR conflict (AC4)** — `handlePrConflict` rebases the batch branch, re-runs the suite
-   and re-ships ONCE. A second occurrence, a conflicting rebase, a failed fetch, an
-   unusable `base_branch`, a checkout that is not on the batch branch, or a red suite
-   after a clean rebase dissolves into two half-batches.
+5. **PR conflict (AC4)** — the PR watch routes a CONFLICTING or auto-merge-blocked batch
+   into `handlePrConflict`, which rebases the integration branch, re-runs the suite, and
+   force-pushes the rewritten branch with a lease before resuming the existing PR watch. A second occurrence,
+   a conflicting rebase, a failed fetch, an unusable branch, a checkout that is not on the
+   batch branch, or a red suite after a clean rebase dissolves into two half-batches when no
+   member is validated. With validated members, #840 keeps their landed work: a clean rebase
+   and red suite re-gates the retained batch; every other give-up case blocks it as
+   `dissolve-refused:<reason>`.
 6. **Milestones (AC5)** — every eviction and dissolve posts a `batch-validate` /
    `batch-ship` milestone to the batch ANCHOR issue via `ai-dossier runstate post`, with
    the reason, the evicted/requeued/preserved members and the attribution method (a
@@ -1029,9 +1035,9 @@ Dissolve never throws validated work away:
   `batch-regate`, `executing_member` pinned to the end — the shape of `sched resume
   --batch`); anything else blocks `dissolve-refused:<reason>` (milestone `batch-ship`,
   `validated=`; the recorded PR can be resolved by hand, or closed before `sched resume
-  --batch`). With no validated member it still dissolves into halves. **Library behaviour
-  only:** the engine does not yet route a CONFLICTING batch PR into `handlePrConflict`
-  (#867).
+   --batch`). With no validated member it still dissolves into halves. Since #867,
+   `reconcilePrWatch` routes a CONFLICTING or auto-merge-blocked batch PR into this recovery
+   path automatically.
 
 #### Member branches live until the batch ends; a requeue resumes on them (#840)
 
@@ -1271,7 +1277,7 @@ import {
   dissolveBatch,         // full | halved | partial (#563); preserves everything green
   blockBatch,            // #562: unreadable suite report → blocked; no requeue, no revert
   type BlockOptions,     // { reason, milestonePhase? } for blockBatch
-  handlePrConflict,      // rebase + re-ship once, then dissolve into halves
+  handlePrConflict,      // reship | dissolve; #840: regate | block over validated work
   createExecMilestonePoster, // batch milestones via `ai-dossier runstate post`
   expandEvictionGroups,  // members that must revert together (§E.4 eviction groups)
   requeueMember,         // the one requeue path (abandon, aggregate eviction, dissolve, sched requeue)

package/dist/batch-dispatch.d.ts

@@ -71,8 +71,8 @@ import { type BatchSuiteContext, type SuiteResult } from './recovery';
 import { tailMembersRefusal } from './state';
 import { type FsExists } from './teardown';
 import type { BatchEntry, CapabilityGateResult, MemberDispatchMode, MemberExitKind, SchedConfig, SchedState } from './types';
-export { tailMembersRefusal };
 export type { CapOutcome } from './types';
+export { tailMembersRefusal };
 /** Everything batch dispatch needs from the outside world. */
 export interface BatchDispatchDeps {
     store: SchedStore;

package/dist/batch-dispatch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"batch-dispatch.d.ts","sourceRoot":"","sources":["../src/batch-dispatch.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"batch-dispatch.d.ts","sourceRoot":"","sources":["../src/batch-dispatch.ts"],"names":[],"mappings":"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"}

package/dist/batch-dispatch.js

@@ -3198,7 +3198,7 @@ function advanceBatchDedupStreak(priorReason, priorSince, priorTicks, reason, no
 function clearPrWatchFailed(deps, batch, now) {
     clearBatchDedupMarker(deps, batch, batch.pr_watch_failed_reason, state_1.CLEARED_PR_WATCH_FIELDS, now);
 }
-function reconcilePrWatch(deps, now, result) {
+function reconcilePrWatch(deps, config, now, result) {
     const state = deps.store.load();
     for (const batch of state.batches) {
         if (batch.status !== 'awaiting-merge') {
@@ -3278,9 +3278,65 @@ function reconcilePrWatch(deps, now, result) {
                 }, now, false),
                 result: undefined,
             }));
-            // #472's own rebase-and-reship path (RFC F.9) is a documented follow-up
-            // for the batch PR-conflict rail; for now the batch stays parked and
-            // the block is visible via the journal + `sched status`.
+            // An awaiting-merge record without its integration checkout is an
+            // incomplete/corrupt batch, not safe to rebase. Keep its durable watch
+            // evidence for an operator rather than running recovery in repoDir.
+            if (batch.branch === null || batch.worktree === null)
+                continue;
+            // Recovery runs git and the aggregate suite outside the store lock. Apply
+            // its result to fresh state below so concurrent scheduler updates survive.
+            const recovered = (0, recovery_1.handlePrConflict)(state, batch.id, recoveryDeps(deps, config, batch, now), {
+                reason,
+            });
+            if (recovered.action === 'reship') {
+                // Rebasing rewrites the integration branch. Pin the lease to origin's
+                // current tip so a concurrent push cannot be overwritten.
+                const remote = deps.exec('git', ['ls-remote', 'origin', `refs/heads/${batch.branch ?? ''}`], batch.worktree ?? deps.repoDir);
+                const remoteTip = remote?.trim().split(/\s+/)[0] ?? '';
+                const pushed = batch.branch !== null &&
+                    (remoteTip === '' || groundtruth_1.GIT_OID_RE.test(remoteTip)) &&
+                    deps.exec('git', [
+                        'push',
+                        `--force-with-lease=refs/heads/${batch.branch}:${remoteTip}`,
+                        'origin',
+                        '--',
+                        batch.branch,
+                    ], batch.worktree ?? deps.repoDir) !== null;
+                if (!pushed) {
+                    const blocked = (0, recovery_1.blockBatch)(recovered.state, batch.id, { reason: 'rebase-force-push-failed', milestonePhase: 'batch-ship' }, recoveryDeps(deps, config, batch, now));
+                    deps.store.withLock((s) => ({
+                        state: applyBatchAndIssues(s, blocked.state, batch.id, [], batch.members),
+                        result: undefined,
+                    }));
+                    stopAndReleaseBlocked(deps, batch.id, now);
+                    result.failed.push(unit(batch.id));
+                    continue;
+                }
+                // A force-push updates the recorded PR's head. Re-dispatching the tail
+                // would try to ship a second PR, so resume watching this same PR.
+                const reshipped = (0, state_1.transitionBatch)(recovered.state, batch.id, 'awaiting-merge', { pr }, now);
+                deps.store.withLock((s) => ({
+                    state: applyBatchAndIssues(s, reshipped, batch.id, [], batch.members),
+                    result: undefined,
+                }));
+                continue;
+            }
+            if (recovered.action === 'dissolved' && recovered.dissolve) {
+                applyDissolveOutcome(deps, batch.id, recovered.dissolve, now, batch.members);
+                result.failed.push(unit(batch.id));
+                continue;
+            }
+            const touched = recovered.dissolve
+                ? [...recovered.dissolve.requeued, ...recovered.dissolve.parked]
+                : [];
+            deps.store.withLock((s) => ({
+                state: applyBatchAndIssues(s, recovered.state, batch.id, touched, batch.members),
+                result: undefined,
+            }));
+            if (recovered.action === 'blocked') {
+                stopAndReleaseBlocked(deps, batch.id, now);
+                result.failed.push(unit(batch.id));
+            }
         }
         else {
             // #630: the condition cleared — reset the marker so a future
@@ -4345,7 +4401,11 @@ function reconcileParallelMemberSlot(deps, config, dispatch, batchId, run, slot,
         // into that tree with its pid no longer tracked anywhere (so neither a
         // dissolve nor `sched stop --batch` could stop it). Its work is done —
         // stop it first.
-        killLiveAgent(deps, slot);
+        // The member's tree may be rebased or removed immediately after its slot
+        // is released. Keep this slot draining until the agent is really gone so
+        // the #844 SIGKILL bound remains available to a SIGTERM-ignoring agent.
+        if (stopAgentBeforeDeciding(deps, batchId, run.issue, slot, now))
+            return;
         journalEvent(deps, 'external-advance', unit(batchId), {
             issue: run.issue,
             detail: 'member review done',
@@ -5018,7 +5078,7 @@ function runBatchTick(deps, config, dispatch) {
             containFailure(batch.id, err);
         }
     }
-    reconcilePrWatch(deps, now, result);
+    reconcilePrWatch(deps, config, now, result);
     const anchorCtx = anchorTickContext(deps);
     reconcileStaleBlockedBatches(deps, now, result, anchorCtx);
     reconcileAnchorClosure(deps, now, anchorCtx);