dorfl 0.14.2 → 0.15.0

package/dist/agent-stop.js

@@ -306,6 +306,68 @@ export function emptyDiffStopReason(slug) {
     return (`the agent produced no source change building '${slug}' (empty diff vs the ` +
         'arbiter main); treating as a no-op/stop — re-scope or re-claim.');
 }
+/**
+ * The provider error text is capped at this many characters in the failure
+ * detail: pi records the raw provider body (often a JSON blob), and the detail
+ * becomes the needs-attention reason on the lock, which must stay one readable
+ * line rather than a pasted payload.
+ */
+const MAX_CUT_OFF_ERROR_LENGTH = 300;
+/**
+ * The `agent-failed` detail for a run whose FINAL model turn was CUT OFF
+ * ({@link CutOffTurn}) and which left no source change (task
+ * `a-truncated-agent-turn-routes-as-agent-failed`). Names the stop cause so the
+ * operator reads a harness failure, never "the agent found nothing to build".
+ * The provider's `errorMessage` (an `error` stop) is appended VERBATIM (bounded)
+ * so the shared failure-cause classifier can still recognise an infra signature
+ * in it (an overloaded provider reads `transient-infra`).
+ */
+export function cutOffTurnFailureDetail(slug, cutOff) {
+    const cause = cutOff.cause === 'length'
+        ? "stopReason 'length': the turn hit the model's per-turn output-token cap"
+        : "stopReason 'error': the provider ended the turn with an error";
+    const error = cutOff.errorMessage === undefined
+        ? ''
+        : ` (${boundErrorMessage(cutOff.errorMessage)})`;
+    return (`the agent's final model turn was cut off (${cause}${error}) before it ` +
+        `produced any source change building '${slug}'; this is a harness failure, ` +
+        'not a judgement that there is nothing to build. Requeue to retry.');
+}
+function boundErrorMessage(text) {
+    const oneLine = text.replace(/\s+/g, ' ').trim();
+    return oneLine.length <= MAX_CUT_OFF_ERROR_LENGTH
+        ? oneLine
+        : `${oneLine.slice(0, MAX_CUT_OFF_ERROR_LENGTH)}…`;
+}
+/**
+ * The CUT-OFF-TURN guard in front of the empty-diff STOP backstop (task
+ * `a-truncated-agent-turn-routes-as-agent-failed`): returns the `agent-failed`
+ * detail when the run's final model turn was cut off ({@link CutOffTurn}), the
+ * agent raised NO in-band STOP sentinel, AND the work branch is empty; else
+ * `undefined` (the caller proceeds to its usual STOP resolution / gate).
+ *
+ * Only a NORMAL end of turn may reach the empty-diff backstop: that route reads
+ * an empty diff as the agent's deliberate "nothing to build" and surfaces a
+ * DISPOSE-defaulted question, which for a truncated turn puts a real, unbuilt
+ * task one default answer away from `tasks/cancelled/`. A sentinel still wins
+ * (the agent DID report a deliberate STOP), and a non-empty diff still goes to
+ * the gate (the gate, not the stop reason, judges built work). Shared by `do`
+ * (in-place and remote, hence the CI agent phase) and `run` so every path with
+ * the empty-diff backstop applies the same rule.
+ */
+export async function resolveCutOffTurnFailure(params) {
+    const { cutOffTurn, output, slug, cwd, arbiter, env } = params;
+    if (cutOffTurn === undefined) {
+        return undefined;
+    }
+    if (parseStopSentinel(output) !== undefined) {
+        return undefined;
+    }
+    if (!(await isWorkBranchDiffEmpty({ cwd, arbiter, env }))) {
+        return undefined;
+    }
+    return cutOffTurnFailureDetail(slug, cutOffTurn);
+}
 /**
  * The DISPOSE-DEFAULTED disposition question the empty-diff bounce path surfaces
  * as its engine-authored envelope entry (spec resolved decision #2). The engine

package/dist/agent-stop.js.map

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

package/dist/apply-merge-action.d.ts

@@ -1,4 +1,3 @@
-import { type SidecarEntry } from './sidecar.js';
 import { type IntegrationCoreResult } from './integration-core.js';
 import type { VerifyConfig } from './verify.js';
 /**
@@ -43,9 +42,9 @@ import type { VerifyConfig } from './verify.js';
  * "HONOUR the prior approval + land on a green re-verify" path; opt-in
  * `strictMergeApproval` (resolved per-repo via the gate-family precedence chain
  * by the sibling task `strict-merge-approval-gate`, default OFF) RE-SURFACES
- * the merge-question instead of landing when the merge-base moved between the
- * surfacer's question and this apply. The RED-re-verify refusal is unchanged
- * in both modes.
+ * the merge-question instead of landing when `main`'s code moved since the
+ * question was asked (its recorded `askedAtMain`; see `approvedBaseMoved`).
+ * The RED-re-verify refusal is unchanged in both modes.
  *
  * House-style boundary: this module is the DETERMINISTIC DISPATCH LAYER. It
  * does NOT re-implement rebase / verify / integrate (it drives the EXISTING
@@ -56,31 +55,8 @@ import type { VerifyConfig } from './verify.js';
  * they assert on EXTERNAL behaviour (what lands on `main`, what routes to
  * needs-attention, that `verify` ran on the rebased tip).
  */
-/** The three deterministic actions a merge-question answer encodes. */
-export type MergeActionVerb = 'merge' | 'hold' | 'drop';
-/** A detected, answer-driven merge-action keyed off ONE answered `kind: merge` entry. */
-export interface DetectedMergeAction {
-    /** The deterministic verb parsed from the entry's answer text. */
-    verb: MergeActionVerb;
-    /** The answered `kind: merge` entry the verb came from. */
-    entry: SidecarEntry;
-}
-/**
- * Parse the human's plain free-text answer into the deterministic
- * {@link MergeActionVerb}. The merge-question surfacer renders
- * `merge | hold | drop` in the entry's `default` as a human-readable hint, so
- * the human typically types one of those words verbatim. We accept any text
- * whose first whole word (case-insensitive) is one of `merge` / `hold` / `drop`
- * — this is the same machine-parseable choice shape the surfacer's applied
- * answer q1 documents ("a DETERMINISTIC CHOICE shape … the human picks and the
- * system parses unambiguously").
- *
- * Returns `undefined` on ANYTHING else (an empty answer, a typo, a long
- * narrative without one of the three words at the start) so the caller can
- * route the ambiguity HONESTLY — never default-to-merge on a malformed answer,
- * which would invent a land the human did not authorise.
- */
-export declare function parseMergeAnswer(text: string): MergeActionVerb | undefined;
+export { answeredMergeActionIn, parseMergeAnswer, type DetectedMergeAction, type MergeActionVerb, } from './merge-answer.js';
+import { type DetectedMergeAction } from './merge-answer.js';
 /**
  * Detect the `kind: merge` action verb that should drive the next apply run.
  * The apply rung's pre-decider kind-check; returns `undefined` when there is
@@ -135,8 +111,8 @@ export interface MergeActionInput {
      * `strictMergeApproval` (resolved per-repo by the sibling task
      * `strict-merge-approval-gate`; default OFF). OFF ⇒ honour the prior answer
      * + land on a green re-verify (the cheap default). ON ⇒ re-surface the
-     * merge-question when the merge-base moved between the surfacer's question
-     * and this apply (don't land; the apply rung folds this into a re-pause).
+     * merge-question when `main`'s code moved since the question was asked
+     * (don't land; the apply rung folds this into a re-pause).
      */
     strictMergeApproval?: boolean;
     /** Bounded recovery-rebase retry knob (mirrors the build path). */
@@ -165,9 +141,9 @@ export type MergeActionOutcome =
  */
  | 'refused'
 /**
- * `answer=merge` + `strictMergeApproval` ON + the merge-base moved between
- * the surfacer's question and this apply: the dispatcher RE-SURFACES the
- * merge-question (the apply rung appends a fresh follow-up + re-pauses).
+ * `answer=merge` + `strictMergeApproval` ON + `main`'s code moved since the
+ * question was asked: the dispatcher RE-SURFACES the merge-question (the
+ * apply rung appends a fresh follow-up asked at the new `main` + re-pauses).
  */
  | 'restale'
 /** `answer=hold` ⇒ no land; the apply rung records the answer in body as usual. */
@@ -186,6 +162,12 @@ export interface MergeActionResult {
      * `already-integrated`, …), so callers can branch on it.
      */
     integration?: IntegrationCoreResult;
+    /**
+     * On `restale`: the arbiter `main` the approval was found stale against. The
+     * apply rung records it as the re-surfaced question's `askedAtMain`, so a
+     * re-answer while `main` stays put lands (no re-stale livelock).
+     */
+    main?: string;
 }
 /**
  * The injectable dispatch SEAM. Production wires {@link performMergeAction}
@@ -215,4 +197,64 @@ export type MergeActionHandler = (input: MergeActionInput) => Promise<MergeActio
  * recorded and a future surfacer / human handles the artifact.)
  */
 export declare function performMergeAction(input: MergeActionInput): Promise<MergeActionResult>;
+/**
+ * What the CI agent job found for an answered `merge` (spec
+ * `ci-agent-job-without-write-token` §3, the `apply, kind: merge` row). Each
+ * maps to one handoff intent of the `apply` rung:
+ *
+ *  - `integrate`: the rebased tip passed the fresh-worktree gate; the apply job
+ *    pushes it leased and lands it (`integrate`, the rebased tip bundled);
+ *  - `restale`: `strictMergeApproval` is on and `main`'s code moved since the
+ *    question was asked (`merge-restale`; checked before any checkout);
+ *  - `needs-attention`: a red gate on the rebased tip (the rebased tip bundled)
+ *    or a rebase conflict (nothing bundled: the kept branch is untouched);
+ *  - `already-integrated`: the kept tip is already on `main`; nothing to land
+ *    (the lock job's `needsAgent: false` covers this case, so here it means the
+ *    branch landed between the lock job and this one).
+ */
+export type MergeLandPreparation = {
+    kind: 'integrate';
+    repo: string;
+    workBranch: string;
+    tip: string;
+} | {
+    kind: 'restale';
+    message: string;
+    main: string;
+} | {
+    kind: 'needs-attention';
+    reason: string;
+    questions?: string[];
+    /** The rebased (red) tip to publish, when there is one. */
+    bundle?: {
+        repo: string;
+        workBranch: string;
+    };
+} | {
+    kind: 'already-integrated';
+    message: string;
+};
+/** A {@link MergeLandPreparation} and the job worktree it lives in. */
+export interface PreparedMergeLand {
+    preparation: MergeLandPreparation;
+    /** Remove the job worktree; call it once the handoff (and its bundle) is written. */
+    dispose(): void;
+}
+/**
+ * The AGENT half of the answered-merge land, for the CI agent job, which holds a
+ * read-only token: the SAME optional `strictMergeApproval` re-stale check
+ * (before the checkout), checkout ({@link createJob}), rebase and
+ * fresh-worktree gate (`prepare` +
+ * `verify` run the branch's code) as {@link performMergeAction}, but nothing is
+ * written to the arbiter. The continue rebase stays local (decision 7,
+ * `localContinue`), and `performIntegration` runs under the phase recorder, so
+ * its first write (the land, or the needs-attention route of a red gate) halts
+ * it and names what the apply job performs. Only an answered `merge` gets here
+ * (`hold` / `drop` need no agent job).
+ *
+ * The caller writes the handoff from the returned preparation (a bundle reads
+ * the job worktree) and then calls `dispose`. Throws when the checkout itself
+ * fails (the agent job then fails, and the apply job surfaces the item).
+ */
+export declare function prepareMergeLand(answered: MergeActionInput): Promise<PreparedMergeLand>;
 //# sourceMappingURL=apply-merge-action.d.ts.map

package/dist/apply-merge-action.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apply-merge-action.d.ts","sourceRoot":"","sources":["../src/apply-merge-action.ts"],"names":[],"mappings":"AAEA,OAAO,EAKN,KAAK,YAAY,EAEjB,MAAM,cAAc,CAAC;AAGtB,OAAO,EAEN,KAAK,qBAAqB,EAC1B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AAE9C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsDG;AAEH,uEAAuE;AACvE,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,CAAC;AAExD,yFAAyF;AACzF,MAAM,WAAW,mBAAmB;IACnC,kEAAkE;IAClE,IAAI,EAAE,eAAe,CAAC;IACtB,2DAA2D;IAC3D,KAAK,EAAE,YAAY,CAAC;CACpB;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS,CAe1E;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,yBAAyB,CACxC,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,GACV,mBAAmB,GAAG,SAAS,CAwBjC;AAED,0DAA0D;AAC1D,MAAM,WAAW,gBAAgB;IAChC,iDAAiD;IACjD,MAAM,EAAE,mBAAmB,CAAC;IAC5B,oDAAoD;IACpD,IAAI,EAAE,MAAM,CAAC;IACb,6EAA6E;IAC7E,IAAI,EAAE,MAAM,CAAC;IACb,oFAAoF;IACpF,GAAG,EAAE,MAAM,CAAC;IACZ,+DAA+D;IAC/D,OAAO,EAAE,MAAM,CAAC;IAChB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iFAAiF;IACjF,aAAa,EAAE,MAAM,CAAC;IACtB,6EAA6E;IAC7E,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,2CAA2C;IAC3C,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB;;;;;;OAMG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,mEAAmE;IACnE,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,6EAA6E;IAC7E,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,0EAA0E;IAC1E,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,2CAA2C;IAC3C,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,8CAA8C;IAC9C,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACjC;AAED,mEAAmE;AACnE,MAAM,MAAM,kBAAkB;AAC7B,qFAAqF;AACnF,QAAQ;AACV,yFAAyF;GACvF,oBAAoB;AACtB;;;;;;GAMG;GACD,SAAS;AACX;;;;GAIG;GACD,SAAS;AACX,mFAAmF;GACjF,MAAM;AACR,mFAAmF;GACjF,MAAM,CAAC;AAEV,6DAA6D;AAC7D,MAAM,WAAW,iBAAiB;IACjC,OAAO,EAAE,kBAAkB,CAAC;IAC5B,qDAAqD;IACrD,OAAO,EAAE,MAAM,CAAC;IAChB;;;;;OAKG;IACH,WAAW,CAAC,EAAE,qBAAqB,CAAC;CACpC;AAED;;;;;;GAMG;AACH,MAAM,MAAM,kBAAkB,GAAG,CAChC,KAAK,EAAE,gBAAgB,KACnB,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAmEhC;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAsB,kBAAkB,CACvC,KAAK,EAAE,gBAAgB,GACrB,OAAO,CAAC,iBAAiB,CAAC,CA4L5B"}
+{"version":3,"file":"apply-merge-action.d.ts","sourceRoot":"","sources":["../src/apply-merge-action.ts"],"names":[],"mappings":"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"}