dorfl 0.14.3 → 0.15.0

package/dist/config.d.ts

@@ -69,31 +69,28 @@ export type SpecsLandIn = 'proposed' | 'ready';
  */
 export type ObservationTriage = 'off' | 'ask' | 'auto';
 /**
- * **The `mergeQuestions` gate axis** — the 3-state member of the question-
+ * **The `mergeQuestions` gate axis**: the 2-state member of the question-
  * surfacing gate family that governs the MERGE-QUESTION surfacer (spec
  * `land-time-reverify-and-parallel-merge-ceiling` Story 17 / task
- * `merge-questions-gate-axis`). MIRRORS `observationTriage`'s shape
- * (`off | ask | auto`) but is a SEPARATE axis — "should this built work merge?"
- * is materially more consequential than "is this observation worth promoting?",
- * so a merge-question must NEVER ride `observationTriage` and must NOT default
- * `off` (a silently-dropped merge-question means finished, pushed work never
- * lands). The states:
+ * `merge-questions-gate-axis`). A SEPARATE axis from `observationTriage`:
+ * "should this built work merge?" is materially more consequential than "is
+ * this observation worth promoting?", so a merge-question must NEVER ride
+ * `observationTriage` and must NOT default `off` (a silently-dropped
+ * merge-question means finished, pushed work never lands). The states:
  *   - `off` ⇒ the merge-question surfacer is not invoked (only correct for a
  *     repo that lands by some other means);
- *   - `ask` (DEFAULT) ⇒ the surfacer enumerates unmerged `work/*` branches +
- *     emits a merge-question sidecar; a human's plain `merge | hold | drop`
- *     answer is required before the land. The conservative default that honours
- *     propose semantics and never silently drops pushed work;
- *   - `auto` ⇒ the runner self-supplies the `merge` answer without surfacing
- *     and lands through the SAME deterministic answer-driven runner-action
- *     dispatch + apply-time re-verify (the merge-mode-like fast path). Does NOT
- *     invoke the agentic decider — a merge-land is never an agent decision.
- * Resolved through the SAME precedence chain as the other gates (flag > env >
- * per-repo > global > default `ask`). The exact name + default + shape were
- * answered in this task's Applied answers 2026-06-26 (q1/q2/q3) + SPEC sidecar
- * Q3.
+ *   - `ask` (DEFAULT) ⇒ the surfacer enumerates unmerged `work/*` branches with
+ *     no open PR + emits a merge-question sidecar; a human's plain
+ *     `merge | hold | drop` answer is required before the land. The
+ *     conservative default that honours propose semantics and never silently
+ *     drops pushed work.
+ * There is NO `auto` (task `wire-merge-questions-into-the-advance-tick`,
+ * decision 3): unattended landing is what merge mode (`integration: merge`) is
+ * for. Resolved through the precedence chain env > per-repo > global > default
+ * `ask` (there is no CLI flag). The surfacer runs in the laptop bare `advance`
+ * tick and in the CI `surface-merge-questions` job (`merge-question-tick.ts`).
  */
-export type MergeQuestions = 'off' | 'ask' | 'auto';
+export type MergeQuestions = 'off' | 'ask';
 /**
  * Which harness adapter (ADR §5) launches a job's agent and reports its
  * liveness: `null` (shell out to `agentCmd`) or `pi` (the pi CLI). Selected via
@@ -209,23 +206,20 @@ export interface Config {
      */
     observationTriage: ObservationTriage;
     /**
-     * Per-repo policy governing the MERGE-QUESTION SURFACER — the 3-state member
+     * Per-repo policy governing the MERGE-QUESTION SURFACER, the 2-state member
      * of the question-surfacing gate family (spec
      * `land-time-reverify-and-parallel-merge-ceiling` Story 17 / task
-     * `merge-questions-gate-axis`). MIRRORS `observationTriage`'s SHAPE
-     * (`off | ask | auto`) but is a SEPARATE axis with a DIFFERENT default —
-     * `observationTriage` defaults `off` (a dropped observation is safely
-     * ignorable), `mergeQuestions` defaults `ask` (a dropped merge-question means
-     * pushed work never lands). `off` ⇒ the surfacer is NOT invoked (only for a
-     * repo that lands by some other means); `ask` (default) ⇒ the surfacer
-     * enumerates unmerged `work/*` branches and emits a merge-question sidecar a
-     * human answers; `auto` ⇒ the runner self-supplies the `merge` answer without
-     * surfacing and lands via the SAME deterministic answer-driven runner-action
-     * dispatch + apply-time re-verify (the merge-mode-like fast path; NOT the
-     * agentic decider). Resolved like `observationTriage`/`integration`: flag
-     * (`--merge-questions`) > `DORFL_MERGE_QUESTIONS` env > per-repo > global >
-     * default `ask`. Gates the SURFACE phase of the merge-question loop only;
-     * APPLY (consume a committed merge-answer) stays ALWAYS allowed (the
+     * `merge-questions-gate-axis`). A SEPARATE axis from `observationTriage` with
+     * a DIFFERENT default: `observationTriage` defaults `off` (a dropped
+     * observation is safely ignorable), `mergeQuestions` defaults `ask` (a
+     * dropped merge-question means pushed work never lands). `off` ⇒ the
+     * surfacer is NOT invoked (only for a repo that lands by some other means);
+     * `ask` (default) ⇒ the surfacer enumerates unmerged `work/*` branches with no
+     * open PR and emits a merge-question sidecar a human answers. No `auto` (task
+     * `wire-merge-questions-into-the-advance-tick`, decision 3: unattended landing
+     * is merge mode's job). Resolved `DORFL_MERGE_QUESTIONS` env > per-repo >
+     * global > default `ask`. Gates the SURFACE phase of the merge-question loop
+     * only; APPLY (consume a committed merge-answer) stays ALWAYS allowed (the
      * create-vs-consume invariant the gate family obeys, ADR
      * `ci-config-policy-and-gate-family` §4).
      */
@@ -726,8 +720,10 @@ export interface Config {
      * INTEGRATES in ONE process; across separate CI jobs the CAS loop IS the queue,
      * and this cap is what determines how wide a matrix burst converges before any
      * spurious bounce. A wide-matrix CI raises it; the default stays modest. Race-1
-     * safety is unchanged (a lost CAS costs only a re-rebase + re-gate retry, never a
-     * `--force`, never a both-land-broken) — scaling the cap only changes WHEN a
+     * safety is unchanged (a lost CAS costs only a re-rebase and a retried push, never
+     * a `--force`, never a both-land-broken; it does NOT re-run the gate, and the CI
+     * apply phase reports a land whose tree differs from the gated tree, ADR
+     * `ci-agent-job-holds-no-write-token` decision 2) — scaling the cap only changes WHEN a
      * genuinely-stuck loser gives up. Resolved per-repo like `freshWorktreeGate`:
      * flag (`--merge-retries`) > env (`DORFL_MERGE_RETRIES`) > per-repo > global >
      * default. The default matches `integration-core.ts`'s built-in fallback (1000 —
@@ -742,13 +738,14 @@ export interface Config {
      * **Per-repo OPT-IN strictness layered on the OQ6 stale-approval default**
      * (spec `land-time-reverify-and-parallel-merge-ceiling`, sidecar OQ6 / task
      * `strict-merge-approval-gate`). Controls how the apply rung treats a prior
-     * merge-answer when the merge-base CHANGED between the human's answer and
-     * the apply step. The default (`false`) honours the prior answer and lands
-     * when the rebased tip re-verifies GREEN — a green re-verify is trusted as
-     * sufficient (the cheap fast-path). `true` re-surfaces the merge-question
-     * (clears the answer back to no-answer and re-authors the question on
-     * `main`/runner under the `advancing` lock — no branch-side mutation)
-     * instead of auto-landing on a merge-base change, even on a green re-verify
+     * merge-answer when `main`'s code (outside `work/`) moved since the question
+     * was asked (the `askedAtMain` the question records). The default (`false`)
+     * honours the prior answer and lands when the rebased tip re-verifies GREEN
+     * (a green re-verify is trusted as sufficient: the cheap fast-path). `true`
+     * re-surfaces the merge-question (appends a follow-up asked against the
+     * current `main`, under the `advancing` lock, before any checkout or
+     * rebase: no branch-side mutation) instead of auto-landing when `main`
+     * moved, even on a green re-verify
      * — the host-agnostic analogue of GitHub's "dismiss stale approvals when
      * the base changes". Story #16's RED-re-verify refusal is UNCHANGED and
      * independent of this flag.

package/dist/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,KAAK,QAAQ,EAAmB,MAAM,eAAe,CAAC;AAC9D,OAAO,EAEN,KAAK,oBAAoB,EACzB,MAAM,mBAAmB,CAAC;AAE3B;;;;;GAKG;AACH,MAAM,MAAM,eAAe,GAAG,SAAS,GAAG,OAAO,CAAC;AAElD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,MAAM,WAAW,GAAG,SAAS,GAAG,OAAO,CAAC;AAE9C;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,MAAM,WAAW,GAAG,UAAU,GAAG,OAAO,CAAC;AAE/C;;;;;;;;;;;;;;;GAeG;AACH,MAAM,MAAM,iBAAiB,GAAG,KAAK,GAAG,KAAK,GAAG,MAAM,CAAC;AAEvD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,MAAM,cAAc,GAAG,KAAK,GAAG,KAAK,GAAG,MAAM,CAAC;AAEpD;;;;GAIG;AACH,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,IAAI,CAAC;AAE3C;;;;;;;;;GASG;AACH,MAAM,MAAM,kBAAkB,GAAG,MAAM,GAAG,QAAQ,CAAC;AAEnD;;;GAGG;AACH,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,MAAM,EAAE,CAAC;AAE7C;;;;;;;;GAQG;AACH,MAAM,WAAW,cAAc;IAC9B;;;;;;;;;;;;OAYG;IACH,SAAS,EAAE,OAAO,CAAC;CACnB;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,CAEjE;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,MAAM;IACtB;;;;;;;;OAQG;IACH,SAAS,EAAE,OAAO,CAAC;IACnB;;;;;;;;;;OAUG;IACH,cAAc,EAAE,cAAc,CAAC;IAC/B;;;;;;;;OAQG;IACH,QAAQ,EAAE,OAAO,CAAC;IAClB;;;;;;;;;;;;;;;OAeG;IACH,iBAAiB,EAAE,iBAAiB,CAAC;IACrC;;;;;;;;;;;;;;;;;;;;OAoBG;IACH,cAAc,EAAE,cAAc,CAAC;IAC/B;;;;;;;;;;;;;;;;;;;OAmBG;IACH,eAAe,EAAE,OAAO,CAAC;IACzB;;;;;;;;;;;;;;;;OAgBG;IACH,cAAc,EAAE,OAAO,CAAC;IACxB;;;;;;;;;;;;;;;;OAgBG;IACH,cAAc,EAAE,oBAAoB,CAAC;IACrC,uEAAuE;IACvE,WAAW,EAAE,MAAM,CAAC;IACpB,mEAAmE;IACnE,UAAU,EAAE,MAAM,CAAC;IACnB,mEAAmE;IACnE,cAAc,EAAE,MAAM,CAAC;IACvB;;;;;OAKG;IACH,aAAa,EAAE,MAAM,CAAC;IACtB;;;;;;;OAOG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB;;;;;;;;;OASG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,4EAA4E;IAC5E,WAAW,EAAE,eAAe,CAAC;IAC7B;;;;;;;;;;;;;;;OAeG;IACH,kBAAkB,CAAC,EAAE,eAAe,CAAC;IACrC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA6BG;IACH,iBAAiB,CAAC,EAAE,eAAe,CAAC;IACpC;;;;;;;;;;;;;OAaG;IACH,WAAW,EAAE,WAAW,CAAC;IACzB;;;;;;;;;;;;;;;;;OAiBG;IACH,WAAW,EAAE,WAAW,CAAC;IACzB;;;;;;;;;;;;;;;;;;;;;OAqBG;IACH,oBAAoB,EAAE,WAAW,CAAC;IAClC;;;;;;;;;;;;;;;;;OAiBG;IACH,oBAAoB,EAAE,WAAW,CAAC;IAClC;;;;;;;;;;;;;OAaG;IACH,IAAI,EAAE,OAAO,CAAC;IACd;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA4BG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;;;OAMG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB;;;;;;;;;;;;;;OAcG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;;;;;;;;OAUG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB;;;;OAIG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;;;;;;;;;;OAYG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;;;;;;;;;;;;;OAgBG;IACH,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB;;;;;;;;;OASG;IACH,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB;;;;;;;;OAQG;IACH,MAAM,EAAE,OAAO,CAAC;IAChB;;;;;;;;;;OAUG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;;;;;;;;;;;OAcG;IACH,eAAe,EAAE,MAAM,CAAC;IACxB;;;;;;;;OAQG;IACH,UAAU,EAAE,OAAO,CAAC;IACpB;;;;;;;;;;;;;OAaG;IACH,aAAa,EAAE,MAAM,CAAC;IACtB;;;;;;;;;;;OAWG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;;;;;;;;;;;OAYG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;;;;;;;;OAWG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;;;;;;;;;;;;;;;;;;;;;;;;OA2BG;IACH,iBAAiB,EAAE,OAAO,CAAC;IAC3B;;;;;;;;;;;;;;;;;;;;OAoBG;IACH,YAAY,EAAE,MAAM,CAAC;IACrB;;;;;;;;;;;;;;;;;;;;;OAqBG;IACH,mBAAmB,EAAE,OAAO,CAAC;IAC7B;;;;;;;;;;OAUG;IACH,oBAAoB,EAAE,MAAM,CAAC;IAC7B;;;;;;;;OAQG;IACH,yBAAyB,EAAE,MAAM,CAAC;IAClC;;;;;;;;;;OAUG;IACH,kBAAkB,EAAE,MAAM,CAAC;IAC3B;;;;;;;;;OASG;IACH,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACpB;AAED,8EAA8E;AAC9E,MAAM,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAE5C;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAMnE,CAAC;AAEF;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CACvC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,MAAM,EAAE,MAAM,EACd,IAAI,GAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAsC,GAC/D,IAAI,CAeN;AAED;;;;;GAKG;AACH,eAAO,MAAM,cAAc,EAAE,MAwI5B,CAAC;AAEF;;;;;;;;;GASG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CA+B3D;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAoB3D;AAED,wEAAwE;AACxE,wBAAgB,iBAAiB,IAAI,MAAM,CAE1C;AAED,8EAA8E;AAC9E,wBAAgB,WAAW,CAAC,SAAS,EAAE,aAAa,GAAG,MAAM,CAY5D;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAgBxD;AAED;;;;;;GAMG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAGpE;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,IAAI,GAAE,MAA4B,GAAG,MAAM,CA0CrE"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}

package/dist/config.js

@@ -80,10 +80,8 @@ export const DEFAULT_CONFIG = {
     // a silently-dropped merge-question means finished, pushed work never lands —
     // strictly more consequential than a dropped observation-promote prompt, so
     // this gate axis is DELIBERATELY HIGHER than `observationTriage`'s `off`. A
-    // trusted-repo fast path opts into `auto` (runner self-supplies the `merge`
-    // answer + lands via the SAME deterministic apply-time re-verify); a repo that
-    // lands by some other means opts into `off`. Resolved per-repo through the
-    // SAME precedence chain (flag > env > per-repo > global > default).
+    // repo that lands by some other means opts into `off`. Resolved per-repo
+    // through the SAME precedence chain (env > per-repo > global > default).
     mergeQuestions: 'ask',
     // DECLARED blocked work is calm by default (`false`): the `needsAnswers`-blocked
     // pool is dropped from the auto-pick selection, so `advance` does NOT proactively

package/dist/config.js.map

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

package/dist/continue-branch.d.ts

@@ -56,12 +56,58 @@ export declare function branchAheadOfArbiter(options: {
     mainRef: string;
     env: NodeJS.ProcessEnv | undefined;
 }): boolean;
+/**
+ * Why a continue rebase did not apply (task
+ * `a-failed-rebase-reports-its-real-cause`). Either way the rebase was
+ * `--abort`ed (NEVER auto-resolved) and the kept branch is back on its
+ * un-rebased tip; the two kinds differ only in what the report says:
+ *
+ *  - `conflict`: git stopped on conflicting paths (`paths`, the unmerged index
+ *    entries; empty only when git printed a `CONFLICT (...)` line but left no
+ *    unmerged entry). A genuine content conflict for a human to resolve.
+ *  - `failed`: the rebase exited non-zero WITHOUT a conflict (a missing
+ *    committer identity, an unresolvable `main`, a dirty tree, a hook, ...).
+ *    Calling it "conflicted" hid the real cause (observation
+ *    `ci-answered-merge-reports-a-conflict-a-plain-rebase-does-not-have`).
+ *
+ * `onto` is the sha `mainRef` resolved to when the rebase ran (`''` when it did
+ * not resolve), and `output` is git's own report (stderr, then stdout),
+ * condensed to one line by {@link condenseGitOutput}.
+ */
+export type ContinueRebaseFailure = {
+    kind: 'conflict';
+    onto: string;
+    paths: string[];
+    output: string;
+} | {
+    kind: 'failed';
+    onto: string;
+    output: string;
+};
 /** The result of rebasing a continued branch onto the freshly-fetched main. */
-export interface ContinueRebaseResult {
-    /** `clean` — the rebase replayed onto main with no conflict. */
-    /** `conflict` — the rebase conflicted; it was `--abort`ed (never auto-resolved). */
-    kind: 'clean' | 'conflict';
-}
+export type ContinueRebaseResult = {
+    kind: 'clean';
+} | ContinueRebaseFailure;
+/**
+ * Condense git's multi-line report into one line for a reason / note: split
+ * on newlines and on the carriage returns of git's progress lines, drop blank
+ * and `hint:` lines, join the rest with ` / `, and cap the length.
+ */
+export declare function condenseGitOutput(text: string): string;
+/**
+ * What happened to a continue rebase, as the tail of a sentence that starts
+ * "rebasing `<branch>` onto current main ...". A conflict names its paths and
+ * the `main` sha; any other failure says so and quotes git. Both say the rebase
+ * was aborted, so the kept work is intact.
+ */
+export declare function describeContinueRebaseFailure(failure: ContinueRebaseFailure): string;
+/**
+ * The whole sentence for a continue rebase that did not apply: "rebasing
+ * `<branch>` onto current main (<sha>) conflicted on <paths> ..." or "... failed
+ * without a conflict (aborted); git: <report>". `failure` is optional only so a
+ * caller holding just the legacy boolean still gets a sentence.
+ */
+export declare function continueRebaseSentence(branch: string, failure: ContinueRebaseFailure | undefined): string;
 /**
  * Rebase the CURRENTLY-CHECKED-OUT continued `work/<slug>` branch onto
  * `mainRef` (the freshly-fetched main), so the agent builds on a CURRENT base
@@ -78,10 +124,13 @@ export interface ContinueRebaseResult {
  * rename/rename ledger conflict that inheritance caused) is deleted. The ONLY
  * commits replayed are the agent's own wip / `→done` commits.
  *
- * A CLEAN rebase returns `{kind: 'clean'}`; a CONFLICTING rebase (a GENUINE code
- * conflict) is `--abort`ed (NEVER auto-resolved) and returns `{kind: 'conflict'}`
- * so the caller can route the item to needs-attention via the §10 path. Must be
- * called while HEAD is the continued branch.
+ * A CLEAN rebase returns `{kind: 'clean'}`. Any other outcome is `--abort`ed
+ * (NEVER auto-resolved) and returns a {@link ContinueRebaseFailure} carrying the
+ * `main` sha rebased onto and git's report: `conflict` (with the conflicting
+ * paths) when git stopped on a GENUINE conflict, `failed` for every other
+ * non-zero exit. The caller routes either to needs-attention via the §10 path,
+ * naming the real cause ({@link describeContinueRebaseFailure}). Must be called
+ * while HEAD is the continued branch.
  *
  * RENAME-DETECTION-OFF (task `disable-rename-detection-on-continue-rebase`): the
  * rebase is invoked with `-c merge.directoryRenames=false` SCOPED to the
@@ -187,13 +236,12 @@ export type ContinuedPushResult =
     kind: 'pushed';
 }
 /**
- * A re-rebase onto the freshly-fetched main CONFLICTED on a retry; it was
- * `--abort`ed (NEVER auto-resolved). The caller routes the item to
- * needs-attention via the §10 path — the green work stays intact on the branch.
+ * A re-rebase onto the freshly-fetched main did not apply on a retry (a
+ * `conflict`, or a non-conflict `failed`); it was `--abort`ed (NEVER
+ * auto-resolved). The caller routes the item to needs-attention via the §10
+ * path, naming the cause; the green work stays intact on the branch.
  */
- | {
-    kind: 'conflict';
-};
+ | ContinueRebaseFailure;
 /**
  * Push the CONTINUED `work/<slug>` branch to the arbiter with
  * `--force-with-lease`, surviving a STALE-LEASE ("stale info") rejection by

package/dist/continue-branch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"continue-branch.d.ts","sourceRoot":"","sources":["../src/continue-branch.ts"],"names":[],"mappings":"AA6DA;;;;;;;;;;GAUG;AACH,wBAAgB,aAAa,CAC5B,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,MAAM,CAAC,UAAU,GAAG,SAAS,GAChC,OAAO,CAwBT;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE;IAC7C,GAAG,EAAE,MAAM,CAAC;IACZ,0EAA0E;IAC1E,aAAa,EAAE,MAAM,CAAC;IACtB,wEAAwE;IACxE,MAAM,EAAE,MAAM,CAAC;IACf,qFAAqF;IACrF,SAAS,EAAE,MAAM,CAAC;IAClB,6CAA6C;IAC7C,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC,UAAU,GAAG,SAAS,CAAC;CACnC,GAAG,OAAO,CAiBV;AAED,+EAA+E;AAC/E,MAAM,WAAW,oBAAoB;IACpC,gEAAgE;IAChE,oFAAoF;IACpF,IAAI,EAAE,OAAO,GAAG,UAAU,CAAC;CAC3B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,wBAAgB,6BAA6B,CAC5C,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,MAAM,CAAC,UAAU,GAAG,SAAS,GAChC,oBAAoB,CAYtB;AAED;;;;;GAKG;AACH,eAAO,MAAM,2BAA2B,IAAI,CAAC;AAE7C;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAE7D;AAED;;;GAGG;AACH,MAAM,MAAM,iBAAiB;AAC5B,sFAAsF;AACpF;IAAC,IAAI,EAAE,QAAQ,CAAA;CAAC;AAClB;;;;;;;;GAQG;GACD;IAAC,IAAI,EAAE,gBAAgB,CAAA;CAAC,CAAC;AAE5B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AACH,wBAAgB,oCAAoC,CAAC,OAAO,EAAE;IAC7D,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,+EAA+E;IAC/E,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC,UAAU,GAAG,SAAS,CAAC;IACnC,0EAA0E;IAC1E,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACjC,GAAG,iBAAiB,CA6GpB;AAED,qEAAqE;AACrE,MAAM,MAAM,mBAAmB;AAC9B,oFAAoF;AAClF;IAAC,IAAI,EAAE,QAAQ,CAAA;CAAC;AAClB;;;;GAIG;GACD;IAAC,IAAI,EAAE,UAAU,CAAA;CAAC,CAAC;AAEtB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AACH,wBAAgB,sCAAsC,CAAC,OAAO,EAAE;IAC/D,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,0EAA0E;IAC1E,OAAO,EAAE,MAAM,CAAC;IAChB,sEAAsE;IACtE,OAAO,EAAE,MAAM,CAAC;IAChB,+EAA+E;IAC/E,iBAAiB,EAAE,MAAM,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC,UAAU,GAAG,SAAS,CAAC;IACnC,qEAAqE;IACrE,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACjC,GAAG,mBAAmB,CAiFtB"}
+{"version":3,"file":"continue-branch.d.ts","sourceRoot":"","sources":["../src/continue-branch.ts"],"names":[],"mappings":"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"}

package/dist/continue-branch.js

@@ -131,6 +131,53 @@ export function branchAheadOfArbiter(options) {
     // before this backstop existed).
     return branchAheadOf(cwd, branchRef, mainRef, env);
 }
+/** The longest git report a {@link ContinueRebaseFailure} carries. */
+const MAX_GIT_OUTPUT = 600;
+/**
+ * Condense git's multi-line report into one line for a reason / note: split
+ * on newlines and on the carriage returns of git's progress lines, drop blank
+ * and `hint:` lines, join the rest with ` / `, and cap the length.
+ */
+export function condenseGitOutput(text) {
+    const lines = text
+        .split(/[\r\n]+/)
+        .map((l) => l.trim())
+        .filter((l) => l !== '' && !l.startsWith('hint:'));
+    const joined = lines.join(' / ');
+    return joined.length > MAX_GIT_OUTPUT
+        ? `${joined.slice(0, MAX_GIT_OUTPUT)}...`
+        : joined;
+}
+/**
+ * What happened to a continue rebase, as the tail of a sentence that starts
+ * "rebasing `<branch>` onto current main ...". A conflict names its paths and
+ * the `main` sha; any other failure says so and quotes git. Both say the rebase
+ * was aborted, so the kept work is intact.
+ */
+export function describeContinueRebaseFailure(failure) {
+    const onto = failure.onto === '' ? 'an unresolved main' : failure.onto;
+    if (failure.kind === 'conflict') {
+        const on = failure.paths.length > 0 ? ` on ${failure.paths.join(', ')}` : '';
+        return (`(${onto}) conflicted${on} (aborted, never auto-resolved)` +
+            (failure.paths.length > 0 || failure.output === ''
+                ? ''
+                : `; git: ${failure.output}`));
+    }
+    return (`(${onto}) failed without a conflict (aborted); git: ` +
+        (failure.output === '' ? '(no output)' : failure.output));
+}
+/**
+ * The whole sentence for a continue rebase that did not apply: "rebasing
+ * `<branch>` onto current main (<sha>) conflicted on <paths> ..." or "... failed
+ * without a conflict (aborted); git: <report>". `failure` is optional only so a
+ * caller holding just the legacy boolean still gets a sentence.
+ */
+export function continueRebaseSentence(branch, failure) {
+    const tail = failure === undefined
+        ? 'did not apply (aborted, never auto-resolved)'
+        : describeContinueRebaseFailure(failure);
+    return `rebasing \`${branch}\` onto current main ${tail}`;
+}
 /**
  * Rebase the CURRENTLY-CHECKED-OUT continued `work/<slug>` branch onto
  * `mainRef` (the freshly-fetched main), so the agent builds on a CURRENT base
@@ -147,10 +194,13 @@ export function branchAheadOfArbiter(options) {
  * rename/rename ledger conflict that inheritance caused) is deleted. The ONLY
  * commits replayed are the agent's own wip / `→done` commits.
  *
- * A CLEAN rebase returns `{kind: 'clean'}`; a CONFLICTING rebase (a GENUINE code
- * conflict) is `--abort`ed (NEVER auto-resolved) and returns `{kind: 'conflict'}`
- * so the caller can route the item to needs-attention via the §10 path. Must be
- * called while HEAD is the continued branch.
+ * A CLEAN rebase returns `{kind: 'clean'}`. Any other outcome is `--abort`ed
+ * (NEVER auto-resolved) and returns a {@link ContinueRebaseFailure} carrying the
+ * `main` sha rebased onto and git's report: `conflict` (with the conflicting
+ * paths) when git stopped on a GENUINE conflict, `failed` for every other
+ * non-zero exit. The caller routes either to needs-attention via the §10 path,
+ * naming the real cause ({@link describeContinueRebaseFailure}). Must be called
+ * while HEAD is the continued branch.
  *
  * RENAME-DETECTION-OFF (task `disable-rename-detection-on-continue-rebase`): the
  * rebase is invoked with `-c merge.directoryRenames=false` SCOPED to the
@@ -165,13 +215,25 @@ export function branchAheadOfArbiter(options) {
  * conflict still conflicts unchanged.
  */
 export function rebaseContinuedBranchOntoMain(cwd, mainRef, env) {
+    const onto = gitSoft(['rev-parse', '--verify', '--quiet', `${mainRef}^{commit}`], cwd, env).stdout.trim();
     const rebase = gitSoft(['-c', 'merge.directoryRenames=false', 'rebase', mainRef], cwd, env);
     if (rebase.status === 0) {
         return { kind: 'clean' };
     }
-    // NEVER auto-resolve: abort back to a clean continued-branch tip.
+    // Read the conflicting paths (the unmerged index entries) BEFORE the abort
+    // clears them. git prints its `CONFLICT (...)` lines on stdout.
+    const paths = gitSoft(['diff', '--name-only', '--diff-filter=U'], cwd, env)
+        .stdout.split('\n')
+        .map((p) => p.trim())
+        .filter((p) => p !== '');
+    const output = condenseGitOutput([rebase.stderr, rebase.stdout].join('\n'));
+    // NEVER auto-resolve: abort back to a clean continued-branch tip. A failure
+    // that never started a rebase leaves nothing to abort; that exit is harmless.
     gitSoft(['rebase', '--abort'], cwd, env);
-    return { kind: 'conflict' };
+    if (paths.length > 0 || /^CONFLICT \(/m.test(rebase.stdout)) {
+        return { kind: 'conflict', onto, paths, output };
+    }
+    return { kind: 'failed', onto, output };
 }
 /**
  * The default cap on stale-lease push retries — mirrors the claim / tasking-lock
@@ -281,6 +343,9 @@ export function pushProposeBranchWithStaleLeaseRetry(options) {
         // shape is the same create-only `--force-with-lease=<ref>:` form
         // `item-lock.ts` uses for the CAS create.
         const lease = observed === '' ? `${branch}:` : `${branch}:${observed}`;
+        // Write-seam implementation: reached only from the integrator, behind
+        // `ledgerWrite.applyCompleteTransition` (guard:
+        // `write-sites-through-seams.test.ts`).
         const push = gitSoft(['push', arbiter, `${branch}:${branch}`, `--force-with-lease=${lease}`], cwd, env);
         if (push.status === 0) {
             return { kind: 'pushed' };
@@ -360,6 +425,8 @@ export function pushContinuedBranchWithStaleLeaseRetry(options) {
     let attempt = 0;
     // eslint-disable-next-line no-constant-condition
     while (true) {
+        // Write-seam implementation: callers reach this through
+        // `refWrite.pushContinuedBranch` (guard: `write-sites-through-seams.test.ts`).
         const push = gitSoft([
             'push',
             arbiter,
@@ -402,8 +469,8 @@ export function pushContinuedBranchWithStaleLeaseRetry(options) {
         // merge). A CONFLICT is the EXISTING abort → needs-attention path — the retry
         // handles ONLY the clean-rebase stale-lease case (never auto-resolves).
         const rebase = rebaseContinuedBranchOntoMain(cwd, mainRef, env);
-        if (rebase.kind === 'conflict') {
-            return { kind: 'conflict' };
+        if (rebase.kind !== 'clean') {
+            return rebase;
         }
         // Loop: retry the push, now re-leased against the freshly-fetched remote tip.
     }

package/dist/continue-branch.js.map

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

package/dist/crashed-run-save.d.ts

@@ -0,0 +1,73 @@
+import './pi-harness.js';
+import type { BackoffOptions, Sleep } from './retry-backoff.js';
+/**
+ * **Save a CRASHED run's local-only work before its lock is released** (task
+ * `a-crashed-runs-local-work-is-saved-before-its-lock-is-released`).
+ *
+ * A `do --isolated` run that is killed mid-agent (a host restart, an OOM kill)
+ * leaves its per-item lock `active` and its job worktree RETAINED under
+ * `<workspacesDir>/work/<work-id>/`. The runner's own abort handler may already
+ * have made the usual wip commit there, but the process died before pushing it,
+ * so the work exists ONLY in that worktree. A plain `requeue` then released the
+ * lock without saving it, and the next claim (or `gc --force`) cut the worktree
+ * away: the work was lost.
+ *
+ * This is the SAVE step `requeue` runs before it releases a held lock. It
+ * locates the slug's retained job worktree by the SAME arbiter-URL + slug naming
+ * `do --isolated` created it with (`jobWorktreePath`, as `complete --isolated`
+ * locates it), and:
+ *
+ *   - no retained worktree (or one that belongs to a same-slug SPEC run)
+ *     ⇒ `no-worktree`: nothing to do, requeue behaves as before;
+ *   - the run is still ALIVE per its harness (PID/session, never mtime, ADR §5)
+ *     ⇒ `alive`: we never write into a live agent's tree;
+ *   - the gc deletion-safety predicate already holds (clean tree AND tip on the
+ *     arbiter) ⇒ `nothing-unsaved`: requeue behaves as before;
+ *   - otherwise commit any uncommitted residue as the usual wip commit and push
+ *     the work branch through `refWrite.saveWorkBranch` (the SAME save half
+ *     `routeToNeedsAttention` and the deadline checkpoint use: plain push, never
+ *     `--force`, bounded backoff), then RE-CHECK the predicate: holds ⇒ `saved`,
+ *     else `not-saved` with why (the caller keeps the lock and the worktree).
+ *
+ * A worktree whose HEAD is not on its work branch (e.g. a run killed mid-rebase,
+ * detached HEAD) is `not-saved` WITHOUT touching it: committing onto a detached
+ * HEAD would strand the commit, so the human resolves it by hand.
+ */
+export type CrashedRunSaveOutcome = {
+    kind: 'no-worktree';
+} | {
+    kind: 'alive';
+    dir: string;
+    branch: string;
+} | {
+    kind: 'nothing-unsaved';
+    dir: string;
+    branch: string;
+} | {
+    kind: 'saved';
+    dir: string;
+    branch: string;
+    committedResidue: boolean;
+} | {
+    kind: 'not-saved';
+    dir: string;
+    branch: string;
+    detail: string;
+};
+export interface SaveCrashedRunWorkOptions {
+    /** The operator's checkout; its `arbiter` remote names the repo. */
+    cwd: string;
+    /** The arbiter remote NAME in {@link cwd}. */
+    arbiter: string;
+    /** The task slug (the branch is `work/task-<slug>`). */
+    slug: string;
+    /** The execution working area (config `workspacesDir`). */
+    workspacesDir: string;
+    env?: NodeJS.ProcessEnv;
+    note?: (message: string) => void;
+    /** Backoff bounds for the save push (tests pass a no-wait `sleep`). */
+    backoff?: BackoffOptions;
+    sleep?: Sleep;
+}
+export declare function saveCrashedRunWork(options: SaveCrashedRunWorkOptions): Promise<CrashedRunSaveOutcome>;
+//# sourceMappingURL=crashed-run-save.d.ts.map

package/dist/crashed-run-save.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"crashed-run-save.d.ts","sourceRoot":"","sources":["../src/crashed-run-save.ts"],"names":[],"mappings":"AAOA,OAAO,iBAAiB,CAAC;AAIzB,OAAO,KAAK,EAAC,cAAc,EAAE,KAAK,EAAC,MAAM,oBAAoB,CAAC;AAE9D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,MAAM,MAAM,qBAAqB,GAC9B;IAAC,IAAI,EAAE,aAAa,CAAA;CAAC,GACrB;IAAC,IAAI,EAAE,OAAO,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAC,GAC5C;IAAC,IAAI,EAAE,iBAAiB,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAC,GACtD;IAAC,IAAI,EAAE,OAAO,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,gBAAgB,EAAE,OAAO,CAAA;CAAC,GACvE;IAAC,IAAI,EAAE,WAAW,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAC,CAAC;AAEpE,MAAM,WAAW,yBAAyB;IACzC,oEAAoE;IACpE,GAAG,EAAE,MAAM,CAAC;IACZ,8CAA8C;IAC9C,OAAO,EAAE,MAAM,CAAC;IAChB,wDAAwD;IACxD,IAAI,EAAE,MAAM,CAAC;IACb,2DAA2D;IAC3D,aAAa,EAAE,MAAM,CAAC;IACtB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACjC,uEAAuE;IACvE,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB,KAAK,CAAC,EAAE,KAAK,CAAC;CACd;AAKD,wBAAsB,kBAAkB,CACvC,OAAO,EAAE,yBAAyB,GAChC,OAAO,CAAC,qBAAqB,CAAC,CAuFhC"}