@ai-dossier/sched 0.55.1 → 0.57.0

package/README.md

@@ -985,14 +985,15 @@ A batch member that leaves its batch before landing is **parked**, never auto-re
   batch failure: its `evictions[]` record carries `kind: 'handed-back'` and it **never
   counts toward the dissolve threshold**. Journals `member-handed-back`.
 - **`evicted`** — an engine-decided failure (unverified exit, incremental-gate
-  `task-failed`, landing conflict, worktree prep). Counts toward the threshold. Journals
-  `unit-failed`.
+  `task-failed`, landing conflict, worktree prep, and — since #840 — an aggregate-suite
+  eviction after landing). Counts toward the threshold. Journals `unit-failed` (or
+  `member-evicted ... — parked on <branch>` for the post-landing case).
 
 Both keep `mode: slot` + `batch`, record the member branch (`evictions[].branch`,
 `failure_evidence.branch` — the pushed remote copy survives the member teardown) and stamp
 the batch's `dispatch_profile` onto the entry. Neither is runnable until an operator runs
-`sched requeue --issue <n>` (full-cycle on that profile; the cycle prompt gains a
-`PRIOR WORK` instruction to continue from the member branch) or `sched abandon --issue <n>`.
+`sched requeue --issue <n>` (full-cycle on that profile, based on the member branch — see
+below) or `sched abandon --issue <n>`.
 `sched status` lists them under `== Parked members ==` with reason, branch, profile and
 those exact commands (`parked_members` in `--json`).
 
@@ -1019,10 +1020,46 @@ Dissolve never throws validated work away:
   as before, except that in-flight members with a member branch are parked `evicted` and
   every requeue carries the batch's dispatch profile (`carryDispatchProfile: false` only
   for `dispatch-profile-missing:*`, where the profile itself is what broke).
-- Not changed: the `halved` PR-conflict split still re-batches its members, and
-  aggregate-suite evictions (`evictMembers`, post-landing, member branch already deleted)
-  still requeue full-cycle — now on the batch profile. Both, plus an engine-set requeue base,
-  are tracked in #840.
+- #840: a PR-conflict give-up (`handlePrConflict`: a recurred conflict, a conflicting or
+  failed rebase, a red suite after a clean rebase) never re-batches a validated member.
+  Validated members stay landed in the batch; only the unshipped, UNVALIDATED members with
+  no commits on the integration branch are split into half-batches (`batch-split`) and
+  trimmed out of it. A clean rebase with a red
+  suite re-runs the gate over the landed members (`re-validating → validating`,
+  `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).
+
+#### Member branches live until the batch ends; a requeue resumes on them (#840)
+
+- A member's remote branch (`batch/<id>-m<n>-<issue>`) is **kept after it lands** — only
+  its tree and local branch go. `teardownBatch` (batch `done`, or dissolved) deletes the
+  batch's member branches from origin (`pruneMemberBranches`, one delete per ref,
+  `member-branches-deleted`), except any a NON-terminal queue entry's
+  `failure_evidence.branch` still names (a parked or branch-requeued member's work);
+  `sched abandon --batch` prunes the same way (verified project repo only). A kept batch
+  (`worktree_kept`) keeps them.
+- An aggregate-suite eviction (`evictMembers`, after `beginAttribution`) therefore PARKS the
+  reverted member `evicted` with `branch=` recorded (`EvictionOutcome.parked`, milestone
+  `parked=`), like a pre-landing eviction, instead of requeueing it from the base. A member
+  whose branch is no longer on origin (a pre-#840 landing) still requeues full-cycle; when
+  origin cannot be listed only a recorded branch is parked on (journaled `git-failed`).
+- `sched requeue` of a parked member is based on its branch **by the engine**: at the
+  entry's first dispatch, `EngineDeps.resumeSeeder` (`createExecResumeSeeder`: `runstate
+  mint` + `runstate post`) seeds the issue's trail with a `setup done` milestone
+  (`branch=<member branch> base_branch=<batch base> pool_claimed=false remote=pushed
+  seeded_by=sched from_batch=<id>`). The agent's gate (`runstate verify`) then resumes at
+  `plan` on that branch, and full-cycle's Resuming path builds the worktree from it — the
+  documented resume contract, no dossier change. The run id is stamped on
+  `failure_evidence.resume_run` so a respawn never re-seeds; `resume-seeded` /
+  `resume-seed-failed` journal it (a failure falls back to the `PRIOR WORK` prompt
+  instruction, which now names the seeded run when there is one, and — for a post-landing
+  eviction — the commits reverted on the integration branch, which a rebase onto a base
+  carrying those reverts would silently drop; engine-side re-application is #866). A branch
+  gone from origin makes `verify` answer `resume_from=setup` — a fresh run off the base.
 
 State schema 1.24.0: `IssueStatus` gains `handed-back`; `EvictionRecord` gains optional
 `kind`/`branch`, `FailureEvidence` optional `branch`.
@@ -1097,7 +1134,13 @@ hand-back shape (`blocked`, `review partial`) never counts: it keeps its own pat
 member rails then:
 
 - stop a live agent and wait for it to be gone before anything else (a dying full-cycle run
-  could still push, post or open a PR in that worktree);
+  could still push, post or open a PR in that worktree). The first sight sends SIGTERM
+  (re-sent each tick), stamps `SlotEntry.kill_sent_at` and journals `member-stop-requested`
+  once; an agent still alive `KILL_ESCALATION_MS` (120 s) later
+  is sent SIGKILL — to its process group when its recorded start time confirms its identity
+  (every agent is spawned detached, so it leads one), else to the pid alone — and
+  `kill-escalated` is journaled once (#844). Pre-#844 an agent ignoring SIGTERM held its
+  member here indefinitely;
 - if the milestone shows the run already SHIPPED (a `ship`/`report` phase or a `pr=` key —
   `wrongProcedureShippedPr`), evict it at once `wrong-procedure-shipped`, naming the stray PR
   (`stray_pr`) for the operator to close or reconcile — a re-prompt cannot undo a PR;
@@ -1109,6 +1152,21 @@ member rails then:
   the killed first dispatch's milestones would otherwise still count inside the 60s fence)
   evicts it `wrong-procedure` (parked `evicted`, branch kept, #810).
 
+### A member's slot release and its eviction are one write (#844)
+
+Every member-failure rail — serial dead/blocked, the incremental gate's `task-failed`, both
+wrong-procedure evictions, and their parallel twins — hands the slot release to
+`evictMemberDirectly`, which applies it inside the same lock that parks the member and
+appends its `evictions[]` record. Pre-#844 the release was its own earlier write, and an
+engine exit between the two left the member in-work with no slot: the serial wedge arm or
+`spawnParallelMembers` then dispatched it once more, with no eviction in the journal. An exit
+AFTER the combined write but before the serial advance is recovered too: the wedge arm finds
+the current member already in `evictions[]`, journals `member-advance-recovered` (carrying the
+record's `reason`/`kind`, since the exit may have beaten the `unit-failed` line), and finishes
+what the eviction would have done — the dissolve its threshold tripped, or the advance —
+instead of respawning it. The same one-write rule covers the parallel run's `evicted` status
+and `sched resume --batch`'s `blocked → executing` transition before a recheck eviction.
+
 ## API surface
 
 ```ts
@@ -1137,6 +1195,10 @@ import {
                          //   truth/clock/repoDir/teardownExec/fencer/batchExec/runBatchSuite/
                          //   runBatchCapability — #523)
   createSpawnDeps,       // real detached-spawn process I/O
+  KILL_ESCALATION_MS,    // #844: SIGTERM → SIGKILL bound (120 s) for an agent the batch
+                         //   wrong-procedure wait is stopping
+  type KillSignal,       // #844: 'SIGTERM' | 'SIGKILL' — SpawnDeps.kill's optional 3rd arg
+                         //   (SIGKILL targets the agent's process group on confirmed identity)
   createExecGroundTruth, // runstate/gh/git ground truth via subprocesses (injectable exec);
                          //   since #468 also gh pr view PR state + setup info from comments;
                          //   since #789 also mergedPrForBranch, and since #824
@@ -1431,7 +1493,7 @@ after-the-fact recovery, not a missing-data bug.
   queue data.
 - **Schema**: state/config files from #460 (schema 1.0.0), #464 (1.1.0), #468 (1.2.0),
   #472 (1.3.0), #500 (1.4.0), #505 (1.5.0), #504 (1.6.0), #523 (1.7.0) and #524 (1.8.0)
-  load and migrate to the current schema (1.28.0 — 1.24.0 was #810: no backfill,
+  load and migrate to the current schema (1.29.0 — 1.24.0 was #810: no backfill,
   `kind`/`branch` optional, absent = an `evicted` record with no branch) automatically
   (slot `branch`/`last_head`/`pid_start`, slot `role` (inferred from the
   unit's queue entry, with the persisted `phase` as a fallback — #500), entry
@@ -1458,6 +1520,9 @@ after-the-fact recovery, not a missing-data bug.
   decision, persisted; `false` backfilled) and `MemberRun` gains `teardown_failed_at`
   (`null` backfilled). A 1.27.0 `done` batch still carrying a live member run loads as
   kept — the old engine never recorded the decision, so the default is to keep.
+  Schema 1.29.0 (#844): `SlotEntry` gains `kill_sent_at`/`kill_escalated_at` (the
+  SIGTERM → SIGKILL escalation anchor and its journal dedup marker; `null`/`null`
+  backfilled, cleared when the slot goes idle).
 - **`max_slots`** bounds live units (`assigned | running | recovering`); dependency
   edges gate readiness — an issue with an unmerged dependency, and a batch behind an
   unmerged batch, are never runnable.

package/dist/batch-dispatch.d.ts

@@ -176,8 +176,14 @@ export interface MemberFailure {
 export declare function memberBranchFor(batchId: string, memberIndex: number, issue: number): string;
 /**
  * Evict the current member and either dissolve, or continue the batch via
- * `advanceMemberOrValidate` — the shared tail of both member-failure rails
- * (self-reported blocked, and the incremental gate below).
+ * `advanceMemberOrValidate` — the shared tail of the serial member-failure
+ * rails (dead/blocked, the incremental gate below, the wrong-procedure
+ * evictions, and `sched resume --batch`'s recheck).
+ *
+ * #844: a caller whose member still holds its slot MUST pass its release as
+ * `preWrite` — never release under a separate lock first. `evictMemberDirectly` commits
+ * the release with the park/eviction record in one write, so an engine exit
+ * cannot leave the member slotless and un-evicted (and so respawned).
  *
  * #613: `evictMemberDirectly`'s duplicate check (#595) is the one atomic,
  * lock-protected claim on "did THIS member's eviction already happen" — so
@@ -199,7 +205,9 @@ export declare function memberBranchFor(batchId: string, memberIndex: number, is
  * `runBatchTick`/`resumeBlockedGate` entry points cannot reproduce since
  * both always read state fresh.
  */
-export declare function evictMemberAndContinue(deps: BatchDispatchDeps, config: SchedConfig, dispatch: ResolvedDispatch, batchId: string, batch: BatchEntry, memberIssue: number, failure: MemberFailure, now: Date, result: BatchTickResult): void;
+export declare function evictMemberAndContinue(deps: BatchDispatchDeps, config: SchedConfig, dispatch: ResolvedDispatch, batchId: string, batch: BatchEntry, memberIssue: number, failure: MemberFailure, now: Date, result: BatchTickResult, 
+/** #844: the member's slot release (or any pre-write) — committed in the eviction's own write. */
+preWrite?: (s: SchedState) => SchedState): void;
 /**
  * `sched resume --batch <id>` (#583 AC4): an operator-triggered, synchronous
  * one-shot recheck of a batch blocked on `gate-inconclusive:<capabilityId>`

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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"}