bareloop 0.30.0 → 0.31.0

package/src/planrun.js

@@ -3864,7 +3864,41 @@ export async function runPlan(job, { workdir, provider, nativeProvider, provider
       blindCap: capRuns,
       directions: stageDirections,
     });
-    fixTrend.record({ gap: post.gap ?? '' });
+    // F198: feed the STRUCTURED {stage, value} a declared close already produced
+    // (`closeGrade`, src/declaredclose.js) rather than re-parsing `post.gap` through
+    // `readGrade`'s `\bred\b` scan — a declared close's own gap prose never carries
+    // that word, so the text path read every declared grade as an uncomparable
+    // null. `post` IS `lastCloseVerdict` here (this is the opening grade, straight
+    // off `judgeClose()`, before any crash-message substitution can occur), so
+    // `closeGrade(post)` is exact. `readGrade` stays the fallback INSIDE
+    // `trend.record` for a command close, where `closeGrade` returns `{gap}` only.
+    fixTrend.record(closeGrade(post));
+    // F198 item 2 — TRACE: before this, `middle` (below) handed the fix worker
+    // ONLY the current gap (this iteration's raw close output, or the previous
+    // attempt's — planrun.js's `await w.ask([...])` at the end of `middle`) and
+    // never any history of prior grades. Nothing else about the close's own
+    // numbers travelled between tries.
+    //
+    // The fix: a FACTS-ONLY number history, one entry per grade fixTrend has
+    // already read (never advice, never model-generated text — a prompt
+    // register change, `src/promptregisters.js`'s inventory, `src/planrun.js`
+    // already listed there). `checksHistory` is the "N passed of M declared"
+    // count per grade: N counts the satisfied stages on each declared verdict's
+    // own `stages` list (first-red-wins, so that list holds only the stages that
+    // RAN), and M is the DECLARED stage count (`stagedClose.length`, the same
+    // one source `createTrend`'s stageOrder reads) — never the ran count, or a
+    // 7-stage close red at stage 2 would read "1/2" instead of "1/7". Nothing a
+    // command close's verdict carries, so it stays empty there and the line is
+    // simply omitted. The per-stage number history rides on `fixTrend.report()`
+    // already, so nothing new is stored for that half.
+    /** @type {string[]} */
+    const checksHistory = [];
+    const pushChecks = (/** @type {any} */ v) => {
+      if (Array.isArray(v?.stages)) {
+        checksHistory.push(`${v.stages.filter((/** @type {any} */ s) => s.verdict === 'satisfied').length}/${stagedClose.length}`);
+      }
+    };
+    pushChecks(post);
     /** ralph's `ladder` seam, filled by the trend reader instead of the step
      * ladder's repeat/write pair. ONE exhaustion terminal, two triggers (ralph's own
      * rule): the category stays `cap-halt` and the outcome stays `escalated`, so the
@@ -3883,7 +3917,15 @@ export async function runPlan(job, { workdir, provider, nativeProvider, provider
         if (lastCloseVerdict?.verdict === HUMAN_PAUSE) {
           return { governor: 'close-trend', trend: 'unknown', reading: 'the close is waiting on a person — not a grade', iteration: o.iteration, paused: true };
         }
-        return { governor: 'close-trend', ...fixTrend.record({ gap: o.gap }), iteration: o.iteration };
+        // Same structured-first read as the seed above. `lastCloseVerdict` is THIS
+        // iteration's verdict (judge() ran immediately before ralph calls this
+        // record) UNLESS a worker-crash overwrote `gap` with a synthetic message
+        // (src/ralph.js) that no longer matches `lastCloseVerdict.gap` — guarded by
+        // the equality check so a crash still reads through the text fallback on
+        // its own synthetic gap, exactly as before.
+        const graded = lastCloseVerdict && lastCloseVerdict.gap === o.gap ? closeGrade(lastCloseVerdict) : { gap: o.gap };
+        if (lastCloseVerdict && lastCloseVerdict.gap === o.gap) pushChecks(lastCloseVerdict);
+        return { governor: 'close-trend', ...fixTrend.record(graded), iteration: o.iteration };
       },
       struckOut: fixTrend.struckOut,
       report: fixTrend.report,
@@ -3897,9 +3939,12 @@ export async function runPlan(job, { workdir, provider, nativeProvider, provider
             : `${rep.strikes}/${rep.limit} strikes — the fix loop stopped making progress against the close's own numbers (${t.reading}). Continue, change approach, or stop?`,
           options: [
             'revise the goal/spec so the work is reachable (a spec edit, so the new hash needs re-approval)',
-            resumable
-              ? 'top up budgetUsd and rerun with --resume, if the trend above says it was still converging'
-              : 'resume is `run-u`-only in v1 — top up budgetUsd and re-fire the bundle from the start, if the trend above says it was still converging',
+            // F197/mul5fofw — this terminal is ONE exhaustion terminal, and ralph.js
+            // hardcodes its outcome as `escalated` (a GRADED RED, src/reuse.js's
+            // `REUSE_GRADED_RED`: the close rendered a verdict and it was red).
+            // `escalated` is a graded red, never a checkpoint (F197) — `--resume`
+            // refuses it, so the sentence states that plainly.
+            'this cannot be resumed — the close already rendered its verdict against the tree; revise the goal/spec and rerun fresh (a new hash needs re-approval)',
             'abandon the task',
           ],
         };
@@ -3996,12 +4041,23 @@ export async function runPlan(job, { workdir, provider, nativeProvider, provider
         })
         : null;
       if (rootInj) emit('root-injected', { phase: 'fix', ...rootInj.event });
+      // F198 item 2 — the facts-only history: JOINED numbers only, no prose the
+      // model didn't already earn by writing the close's own output. `values`
+      // joins with `→` (fixTrend's own vocabulary), stages join with `·`; a
+      // stage this leg has read only once still shows its one number (no arrow),
+      // which is still a fact the worker did not otherwise have.
+      const checksFact = checksHistory.length > 0 ? `checks passed ${checksHistory.join(' → ')}` : null;
+      const stageFacts = fixTrend.report().stages
+        .filter((s) => s.values.length > 0)
+        .map((s) => `${s.stage} ${s.values.join(' → ')}`);
+      const factsLine = [checksFact, ...stageFacts].filter(Boolean).join(' · ');
       await w.ask([
         'The job\'s final verification is failing. Fix the repository so it passes.',
         `Repository root (absolute): ${workdir}\nEvery path you pass to a tool MUST be absolute and inside this root.`,
         artifacts.length > 0 && `Working context (read-only) — the plan's steps produced:\n${artifacts.map((a) => `[${a.id}] ${a.text}`).join('\n\n')}`,
         !gap && post.gap && `The verification's output on the tree as it stands (not an attempt of yours):\n${post.gap}`,
         gap && `Previous attempt failed the verification:\n${gap}`,
+        factsLine && `The close's own numbers so far, oldest first (facts only — no advice):\n${factsLine}`,
         rootInj && rootInj.note,
       ].filter(Boolean).join('\n\n'));
     };

package/src/promptregisters.js

@@ -76,6 +76,9 @@ export const PROMPT_REGISTERS = Object.freeze([
 
   // src/planrun.js — the native-surface read-truncation strategy line
   Object.freeze({ file: 'src/planrun.js', name: 'NATIVE_READ_STRATEGY' }),
+  // src/planrun.js — the fix loop's facts-only close-grade history line
+  // (F198 item 2), built inline inside `middle` and appended to `w.ask([...])`
+  Object.freeze({ file: 'src/planrun.js', name: 'middle()\'s facts-only "The close\'s own numbers so far" block (inline template, not a const)' }),
 
   // src/authoring.js — the types-genre close template, interpolated verbatim
   // into the authoring prompt (src/authorflow.js's assembled system message,

package/src/providers.js

@@ -320,6 +320,88 @@ export function buildRunnerProviders({
   return { provider, providerFor, judgeProvider };
 }
 
+/**
+ * A `providerName`'s own models-list GET endpoint — the shape this
+ * function's ONE caller (`checkProviderReachable`, below) needs and nothing
+ * else reads: `anthropic-api` and `openai-api` (the panel's Model select,
+ * PANEL-BUILD.md P3 build item 7) are the only two shapes this build knows
+ * how to ask, both a plain unauthenticated-body GET with the key in a
+ * header — never a completion/chat endpoint, so this never spends a token.
+ * @param {string} providerName
+ * @param {string} [baseUrl]
+ * @returns {{url: string, headers: Record<string,string>}|null} `null` when
+ *   this provider's models-list shape is not known (never guessed at)
+ */
+function modelsListRequest(providerName, baseUrl) {
+  if (providerName === 'anthropic-api') {
+    return {
+      url: `${baseUrl || 'https://api.anthropic.com/v1'}/models`,
+      headers: { 'x-api-key': '', 'anthropic-version': '2023-06-01' },
+    };
+  }
+  if (providerName === 'openai-api') {
+    return { url: `${baseUrl || 'https://api.openai.com/v1'}/models`, headers: {} };
+  }
+  return null;
+}
+
+/**
+ * $0 reachability check: a GET against `providerName`'s own models-list
+ * endpoint, server-side, with the key in a header — NEVER a completion
+ * request, so it never spends a token (PANEL-BUILD.md P3 build item 7: "the
+ * person must get feedback BEFORE drafting if the chosen model can't
+ * work"). Reused, unmodified, by the panel's model-readiness route today
+ * (`src/panel/authorroutes.js`) and by the future Settings providers
+ * table's own "test" column (PANEL-BUILD.md P4) — ONE function, not two
+ * hand-typed copies of the same probe.
+ *
+ * NEVER returns the key, never logs it — the key only ever appears in a
+ * request header sent straight to the provider's own host.
+ * @param {object} o
+ * @param {string} o.providerName
+ * @param {string} o.apiKey
+ * @param {string} [o.model] when given, the response is also checked for this model id
+ * @param {string} [o.baseUrl]
+ * @param {typeof fetch} [o.fetchImpl] TEST SEAM — defaults to the real global `fetch`
+ * @param {number} [o.timeoutMs] defaults to 4000 — a flaky endpoint must never hang the caller
+ * @returns {Promise<{reachable: boolean, modelListed: boolean|null, status: string, note: string|null}>}
+ */
+export async function checkProviderReachable({
+  providerName, apiKey, model, baseUrl, fetchImpl = fetch, timeoutMs = 4000,
+}) {
+  const req = modelsListRequest(providerName, baseUrl);
+  if (!req) {
+    return {
+      reachable: false, modelListed: null, status: 'unsupported-provider',
+      note: `no models-list check known for "${providerName}"`,
+    };
+  }
+  const headers = { ...req.headers };
+  if (providerName === 'anthropic-api') headers['x-api-key'] = apiKey;
+  else headers.Authorization = `Bearer ${apiKey}`;
+
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), timeoutMs);
+  try {
+    // GET ONLY — no body, no completion/chat call, no tokens spent.
+    const res = await fetchImpl(req.url, { method: 'GET', headers, signal: controller.signal });
+    if (!res.ok) {
+      return { reachable: false, modelListed: null, status: `HTTP ${res.status}`, note: `models list returned HTTP ${res.status}` };
+    }
+    /** @type {any} */
+    let body = null;
+    try { body = await res.json(); } catch { body = null; }
+    const ids = Array.isArray(body?.data) ? body.data.map((/** @type {any} */ m) => m?.id).filter(Boolean) : [];
+    const modelListed = model ? ids.includes(model) : null;
+    return { reachable: true, modelListed, status: 'ok', note: null };
+  } catch (/** @type {any} */ e) {
+    const cls = e?.name === 'AbortError' ? 'timeout' : (e?.code || e?.name || 'network-error');
+    return { reachable: false, modelListed: null, status: String(cls), note: `request failed: ${cls}` };
+  } finally {
+    clearTimeout(timer);
+  }
+}
+
 /**
  * The launch-time warning lines for an ADMITTED-PENDING-PROBE provider, or
  * `null` when the provider has paid for its own end-to-end probe (and for an

package/src/replay.js

@@ -462,6 +462,24 @@ export function replayRun(spineEvents, auditEvents = [], { runId = null, auditAv
 
   const spentUsd = jobEnd && typeof jobEnd.spentUsd === 'number' && Number.isFinite(jobEnd.spentUsd) ? jobEnd.spentUsd : null;
   const spendComplete = jobEnd ? jobEnd.spendComplete === true && spentUsd !== null : false;
+
+  // draftSpentUsd (hamr's ruling 2026-09-28, "one cap covers drafting +
+  // run") — the AUTHORING pipeline's own spend on this job before it was
+  // signed, off `job-start`'s dedicated field (never `priorSpentUsd`, which
+  // is the RESUME fold `resumed` above keys on). `null` when the run never
+  // carried one (the common case, and every run predating this field) —
+  // never a decorative 0 a reader could mistake for "drafting spent
+  // nothing".
+  const draftSpentUsd = jobStart && typeof jobStart.draftSpentUsd === 'number' && Number.isFinite(jobStart.draftSpentUsd) && jobStart.draftSpentUsd > 0
+    ? jobStart.draftSpentUsd : null;
+  // draftSpendComplete (hamr's ruling 2026-09-28) — was the drafting fold above
+  // EXACT? `null` when there is no drafting fold at all (the common case, and
+  // every run predating both fields) — never paired with a `draftSpentUsd` of
+  // `null`. An archive whose `job-start` carries `draftSpentUsd` but predates
+  // this companion field (src/run.js's own belt) defaults to `true` — it was
+  // exact then, the field simply didn't exist yet to say so.
+  const draftSpendComplete = draftSpentUsd === null ? null
+    : (jobStart.draftSpendComplete !== false);
   const floorReasonList = floorReasons(spine, jobStart, spendComplete);
 
   const wallMs = windowWallMs(parseTs(jobStart?.ts), parseTs(jobEnd?.ts));
@@ -1112,6 +1130,26 @@ export function replayRun(spineEvents, auditEvents = [], { runId = null, auditAv
     if (planRoundsInitialArr.length > 0) {
       const { spentUsd, unpricedRounds } = windowSpend(planRoundsInitialArr);
       const b = partBehaviour(scoutTsHi, firstTs);
+      // F: the plan part's own wall time (build item 8, 2026-09-28, run
+      // mul5fofw: a $0.28/20623-token paid call read as "0.0s"). Root cause:
+      // `scoutTsHi` is literally `planRoundsInitialArr[0].ts` — the plan
+      // round's OWN completion timestamp (every round record is stamped
+      // AFTER the call returns, never before) — so using it as plan's own
+      // START boundary measures the call against ITSELF, leaving only the
+      // few-ms gap to the next logged record (`firstTs`, the following
+      // step-start) as the "duration". Measured on mul5fofw's real spine:
+      // scout's own last round ts 11:15:00.335Z -> the plan round's ts
+      // 11:16:22.667Z is 82.3s, the plan call's real wall time; the old
+      // window (11:16:22.667Z -> 11:16:22.679Z, the step-start 12ms later)
+      // could never show anything but ~0. Fixed HERE ONLY (the reader/
+      // display side, never the seq-scoped `b`/`attempts` windows above,
+      // which were already correctly bounded and are left untouched): the
+      // wall window now runs from scout's own true end (its last round's
+      // ts, or job-start when there was no scout) to plan's own true end
+      // (its last round's ts) — never the NEXT phase's timestamps on either
+      // side, which is what made this unmeasurable by construction.
+      const scoutEndTs = scoutRoundsArr.length ? parseTs(scoutRoundsArr[scoutRoundsArr.length - 1].ts) : jobStartTs;
+      const planEndTs = parseTs(planRoundsInitialArr[planRoundsInitialArr.length - 1].ts);
       parts.push({
         id: 'plan',
         kind: 'plan',
@@ -1122,7 +1160,7 @@ export function replayRun(spineEvents, auditEvents = [], { runId = null, auditAv
         toolCalls: b ? b.totalCalls : null,
         byTool: b ? b.byTool : null,
         blocked: b ? b.denied : null,
-        wallMs: windowWallMs(scoutTsHi, firstTs),
+        wallMs: windowWallMs(scoutEndTs, planEndTs),
         spentUsd,
         unpricedRounds,
         outcome: null,
@@ -1328,6 +1366,8 @@ export function replayRun(spineEvents, auditEvents = [], { runId = null, auditAv
     stopReason,
     spentUsd,
     spendComplete,
+    draftSpentUsd,
+    draftSpendComplete,
     floorReasons: floorReasonList,
     transportRetryCount: transportRetries.length,
     transportRetriesOutsideWindows,
@@ -1384,6 +1424,44 @@ function money2(n) {
   return n === null ? 'unknown' : `$${n.toFixed(2)}`;
 }
 
+/**
+ * hamr's ruling 2026-09-28 ("one cap covers drafting + run") — the ONE
+ * spend display for a run that may carry a drafting share, so every surface
+ * that shows a run's money (the CLI's own `spent` line, the panel's Run tab
+ * summary/counters, the Runs list row, the Audit header, the Job tab) reads
+ * the same string rather than each hand-composing its own. `spendCore` is
+ * already-formatted text (`money(...)`, or a `died`/floor line's "at least
+ * $X") — this only decides whether to append the `(<draft> drafting)`
+ * clause and the `of $<cap>` tail, never re-derives the money itself.
+ * Unchanged (`spendCore` alone, or `spendCore of $cap`) when there is no
+ * drafting share — a run without one prints exactly what it always did.
+ *
+ * hamr's ruling 2026-09-28 (2nd addendum) — an INCOMPLETE drafting fold
+ * (`draftSpendComplete === false`) is a floor, not a total, and F6's rule
+ * ("unpriced is never free, a floor never dresses as exact") applies here
+ * exactly as it does to `spendCore` itself: the drafting clause reads `at
+ * least $X drafting`, and because a reader summing the two figures would
+ * otherwise take the LEADING number as exact too, `spendCore` itself also
+ * gains the `at least ` prefix — unless it already carries one (a `died`
+ * floor, or an already-prefixed caller), never doubled.
+ * @param {string} spendCore already-formatted spend text (e.g. `$3.71` or `at least $2.00`)
+ * @param {number|null} draftSpentUsd the drafting share, or null when there isn't one
+ * @param {number|null} [budgetUsd] the signed cap, appended as `of $X.XX` when given
+ * @param {boolean|null} [draftSpendComplete] whether the drafting fold above was EXACT;
+ *   `null`/`undefined`/`true` all read as exact (never a new enum value elsewhere) —
+ *   only an explicit `false` triggers the floor wording.
+ * @returns {string}
+ */
+export function moneyWithDraft(spendCore, draftSpentUsd, budgetUsd, draftSpendComplete) {
+  const hasDraft = draftSpentUsd !== null && draftSpentUsd !== undefined;
+  const draftFloor = hasDraft && draftSpendComplete === false;
+  const coreAlreadyFloor = /^(at least |≥)/.test(spendCore);
+  const core = draftFloor && !coreAlreadyFloor ? `at least ${spendCore}` : spendCore;
+  const draftPart = hasDraft ? ` (${draftFloor ? 'at least ' : ''}${money(draftSpentUsd)} drafting)` : '';
+  const capPart = budgetUsd === undefined ? '' : ` of ${money2(budgetUsd)}`;
+  return `${core}${draftPart}${capPart}`;
+}
+
 /**
  * The `$`/`spend` column for one occurrence/iteration row: `unpricedRounds >
  * 0` reads `unknown (N unpriced rounds)` — never `$0`, never a partial sum
@@ -1827,7 +1905,7 @@ export function summarizeForAllLine(summary) {
     // shown on a run with zero retries.
     outcome: `${summary.outcome ?? 'unknown'}${summary.transportRetryCount > 0 ? ` ⟲${summary.transportRetryCount}` : ''}`,
     hadTransportRetries: summary.transportRetryCount > 0,
-    spend: money(summary.spentUsd),
+    spend: moneyWithDraft(money(summary.spentUsd), summary.draftSpentUsd, undefined, summary.draftSpendComplete),
     wall: duration(summary.wallMs),
     steps: stepsCol,
     reason,

package/src/replayio.js

@@ -95,7 +95,8 @@ export function resolveSiblings(spinePath) {
  * Read one run's spine (+ its gate-audit sidecar, when present) off disk and
  * hand both to {@link replayRun}. Read-only, $0, mints no verdict.
  * @param {string} spinePath absolute or cwd-relative path to a `.jsonl` spine
- * @param {{preParsedSpine?: {records: any[], skipped: number}, skipAudit?: boolean}} [opts]
+ * @param {{preParsedSpine?: {records: any[], skipped: number}, skipAudit?: boolean,
+ *   auditPathOverride?: string|null}} [opts]
  *   `preParsedSpine`: avoids a second parse of the same file when the caller
  *   ({@link listSpines}) already read it once to run {@link looksLikeSpine}.
  *   `skipAudit` (PR #23 review item 5, 2026-08-26, carried over): a
@@ -103,11 +104,21 @@ export function resolveSiblings(spinePath) {
  *   `summarizeForAllLine` reads none of the fields that sidecar feeds inside
  *   `replayRun`, so reading every run's sidecar in a directory listing was
  *   pure unused I/O, multiplied by every spine found.
+ *   `auditPathOverride` (build item 7, 2026-09-28): when a caller has ALREADY
+ *   resolved the real audit path through the one shared resolver
+ *   (`src/panel/server.js`'s `resolveAuditPathForRow`, which also covers a
+ *   still-LIVE run's during-run sidecar location — this function's own
+ *   `resolveSiblings` call only ever finds the FINISHED-run convention), it
+ *   passes that path here (`null` included) instead of letting this
+ *   function re-derive a finished-only path on its own. `undefined` (the
+ *   default) keeps the original resolveSiblings-only behaviour — every
+ *   existing caller is unaffected.
  * @returns {ReturnType<typeof replayRun>}
  */
 export function replayOne(spinePath, opts = {}) {
-  const { preParsedSpine, skipAudit = false } = opts;
-  const { runId, auditPath } = resolveSiblings(spinePath);
+  const { preParsedSpine, skipAudit = false, auditPathOverride } = opts;
+  const { runId, auditPath: resolvedAuditPath } = resolveSiblings(spinePath);
+  const auditPath = auditPathOverride !== undefined ? auditPathOverride : resolvedAuditPath;
   const spine = preParsedSpine ?? parseJsonl(spinePath);
   const audit = (!skipAudit && auditPath) ? parseJsonl(auditPath) : { records: [], skipped: 0 };
   // `auditAvailable`: true only when a sidecar was actually FOUND AND READ.

package/src/run.js

@@ -134,6 +134,29 @@ async function primitiveSmoke(workdir) {
  *   load gate refuses one: a refusal returns the distinct `recipe-stale` outcome with zero
  *   spend rather than silently drafting cold, because starting a paid run on a decision
  *   nobody made is the same class of error as widening a cap to manufacture a green.
+ * @param {number} [opts.draftSpentUsd=0] hamr's ruling 2026-09-28 ("one cap covers
+ *   drafting + run") — money the AUTHORING pipeline (`authorCloseForJob`/
+ *   `prepareSigning`, run under the SAME signed `budgetUsd` as its ceiling) already
+ *   spent on THIS job before it was ever signed. The signed `budgetUsd` stays the
+ *   one number in the spec hash; this shrinks the RUN's own enforced ceiling by
+ *   what drafting already took, so the two phases never spend more than the one
+ *   cap together. Deliberately NOT `priorSpentUsd` — that key means "a previous
+ *   ATTEMPT of this same run died and folded its spend forward" and is read by
+ *   `readResume`/`replay.js`'s `resumed` flag; a drafting spend is not a resume and
+ *   must never make an ordinary first run of a job read as one. It is also never
+ *   folded into `spentUsd` (the run's own ledger, cumulative-so-far and what a
+ *   resume's `priorSpentUsd` seeds) or into `engagementSpentUsd` — drafting is a
+ *   DIFFERENT phase's spend, reported beside the run's, never inside it. A garbage
+ *   value (non-finite, negative) is read as 0, belted exactly like `priorSpentUsd`.
+ * @param {boolean} [opts.draftSpendComplete=true] hamr's ruling 2026-09-28 — was the
+ *   `draftSpentUsd` fold above EXACT? The authoring pipeline's own metered-call list can
+ *   go unpriced (F6) exactly like a resumed attempt's can, and the unknown does not heal
+ *   by folding forward. A NEW field beside `draftSpentUsd`, never a new state inside
+ *   `spendComplete`/`priorSpendComplete` — those answer "is THIS run's own ledger exact,"
+ *   this answers "was the OTHER phase's ledger exact," and the two must never merge into
+ *   one flag or a floor drafting spend could read as an exact run. Read only when
+ *   `draftSpentUsd` itself is emitted; a garbage value is read as `true` (the same belt
+ *   `priorSpendComplete` gets — an unreadable flag never manufactures a false floor).
  * @param {number} [opts.priorSpentUsd=0] RESUME (module C) — money a PREVIOUS, killed
  *   attempt of this same try already spent. It seeds the ledger, so the restarted
  *   attempt runs under the REMAINDER of the signed `budgetUsd` and the terminal
@@ -242,7 +265,7 @@ async function primitiveSmoke(workdir) {
  *   deliberately NOT in the resumable/checkpoint set (`src/reuse.js`) — an
  *   unknown in-flight state is not a known-safe resume point.
  */
-export async function runJob(rawSpec, { approvals, workdir, provider, nativeProvider, providerFor, judgeProvider = null, judgeModel = null, emit, capRuns = 3, strikeLimit, shellCapUsd = 2, closeTimeoutMs, closeDir = null, layerRoot = false, readShim = false, scout = true, bridge = null, priorSpentUsd = 0, priorSpendComplete = true, priorWallMs = 0, resumeSeed = null, resumeGrades = [], resumeReplans = null, resumeBranch = null, humanRuling = null, heldRuling = null, reviewDoor = null, doorRerun = null, resumable = true }) {
+export async function runJob(rawSpec, { approvals, workdir, provider, nativeProvider, providerFor, judgeProvider = null, judgeModel = null, emit, capRuns = 3, strikeLimit, shellCapUsd = 2, closeTimeoutMs, closeDir = null, layerRoot = false, readShim = false, scout = true, bridge = null, draftSpentUsd = 0, draftSpendComplete = true, priorSpentUsd = 0, priorSpendComplete = true, priorWallMs = 0, resumeSeed = null, resumeGrades = [], resumeReplans = null, resumeBranch = null, humanRuling = null, heldRuling = null, reviewDoor = null, doorRerun = null, resumable = true }) {
   // THE READ SHIM's ARM, resolved at the door — the FIRST thing this entry does,
   // before the ledger, before the approval gate, before a byte of the spec is read.
   // An unrecognised spelling throws here at zero cost instead of being coerced by
@@ -270,6 +293,18 @@ export async function runJob(rawSpec, { approvals, workdir, provider, nativeProv
    * ENGAGEMENT's spend can be stated side by side on every terminal. Two things
    * counted by one number will eventually be asked to disagree. */
   const chainFoldUsd = spentUsd;
+  // hamr's ruling 2026-09-28 — the DRAFTING fold, kept apart from the RESUME
+  // fold above on purpose (see the param's own doc): it shrinks the run's
+  // enforced ceiling below but never seeds `spentUsd`/`chainFoldUsd`, so it
+  // can never be read as "a previous attempt of THIS run died" by `readResume`
+  // or by `replay.js`'s `resumed` flag (which keys on `priorSpentUsd`'s
+  // presence alone). Belted exactly like `priorSpentUsd`: a garbage value
+  // (non-finite, negative) reads as 0 rather than poisoning the ceiling
+  // arithmetic into "no cap" or "already over".
+  const draftFoldUsd = typeof draftSpentUsd === 'number' && Number.isFinite(draftSpentUsd) && draftSpentUsd > 0 ? draftSpentUsd : 0;
+  // Belted exactly like `priorSpendComplete`'s own read below: a garbage value
+  // (non-boolean) reads as `true` rather than manufacturing a false floor.
+  const draftFoldComplete = draftSpendComplete !== false;
   let unpriced = false;
   // RESUME (v1.46 §3): was the FOLD itself exact? `readResume` marks it false when any
   // round inside the dead attempt came back unpriced, and that unknown does not heal by
@@ -379,6 +414,11 @@ export async function runJob(rawSpec, { approvals, workdir, provider, nativeProv
     // A fold of $0 that is NOT exact is still a fold — the unknown is the whole of what
     // it inherited, and it is the only field that can carry it forward.
     ...(spentUsd > 0 || priorFloor ? { priorSpentUsd: spentUsd, priorSpendComplete: !priorFloor } : {}),
+    // …and the DRAFTING fold, on its own dedicated field — never `priorSpentUsd`
+    // (see the param's own doc above: that key means "resumed", and this run
+    // was not). Emitted only when there is one, same "a decorative 0 is
+    // indistinguishable from none" rule every other fold field here follows.
+    ...(draftFoldUsd > 0 ? { draftSpentUsd: draftFoldUsd, draftSpendComplete: draftFoldComplete } : {}),
     // …and the TIME fold, which F103 splits in two. `priorWallMs` is what the next
     // reader ADDS to (the bound), and it is engagement-scoped: a rerun opens a fresh
     // engagement, so the minutes the person did not commission are not a bound on
@@ -493,7 +533,13 @@ export async function runJob(rawSpec, { approvals, workdir, provider, nativeProv
   {
     const outcome = await runPlan(job, {
       workdir, provider, nativeProvider, providerFor, judgeProvider, judgeModel, emit: meter, capRuns, ...(strikeLimit !== undefined ? { strikeLimit } : {}), closeTimeoutMs, closeDir, layerRoot, readShim, scout, bridge, priorWallMs: chainWallMs, resumeSeed, resumeGrades, resumeReplans, resumeBranch, humanRuling, heldRuling, reviewDoor, doorRerun, priorSpentUsd: chainFoldUsd, resumable,
-      remainingUsd: () => Math.min(shellCapUsd, job.budgetUsd - spentUsd),
+      // hamr's ruling 2026-09-28 — ONE cap covers drafting + run: the run's
+      // enforced ceiling is the signed `budgetUsd` (unchanged, still in the
+      // spec hash) MINUS whatever drafting already spent on this job before
+      // signing. Advertised = enforced: this is the ONE place the ceiling
+      // arithmetic lives, so every readout of "what's left" is this same
+      // subtraction, never a second one computed elsewhere.
+      remainingUsd: () => Math.min(shellCapUsd, job.budgetUsd - draftFoldUsd - spentUsd),
       isUnpriced: () => unpriced, // F6: let the plan flow bail in-flight, not just after it returns
       spendComplete, // …and let its money-halt readout say whether the remaining it quotes is exact
     });

package/src/userrun.js

@@ -30,6 +30,7 @@ import { fileURLToPath } from 'node:url';
 import { execFileSync, spawn } from 'node:child_process';
 import { join, resolve, dirname } from 'node:path';
 import { runJob } from './run.js';
+import { moneyWithDraft } from './replay.js';
 import { jobSpecHash, resolveWorkerModel, validateJob } from './job.js';
 import { readShimArm } from './readshim.js';
 import { closeStagesOf } from './plan.js';
@@ -242,6 +243,15 @@ class ExitSignal extends Error {
  * @property {string|null} [model] the raw `--model` tier name (`sonnet`/`haiku`), or null for the default
  * @property {string|null} [readShim] the raw `--read-shim` arm name, or null for the default
  * @property {string|null} [scout] the raw `--scout` value (`on`/`off`), or null for the default
+ * @property {string|null} [draftSpentUsd] the raw `--draft-spent-usd` value (hamr's
+ *   ruling 2026-09-28, "one cap covers drafting + run"), or null when the job never
+ *   drafted through the panel/`bareloop author`. Parsed and validated in `execute`
+ *   (finite, >= 0, else refused) — never coerced silently, the same param-guard
+ *   class `--read-shim`/`--scout` already are.
+ * @property {boolean} [draftSpendIncomplete] the raw `--draft-spend-incomplete` presence-
+ *   flag (hamr's ruling 2026-09-28, 2nd addendum) — whether the drafting fold above was a
+ *   FLOOR, never an exact figure. A new field beside `draftSpentUsd`, same param-guard
+ *   class, no value to misread.
  * @property {string|null} [registry] a bridge registry directory
  * @property {string|null} [workflow] the registry's workflow name (defaults to `spec.job`)
  * @property {string|null} [approve] the spec hash being signed; omitted previews only
@@ -263,6 +273,8 @@ class ExitSignal extends Error {
  * @property {string|null} model
  * @property {string|null} readShim
  * @property {string|null} scout
+ * @property {string|null} draftSpentUsd
+ * @property {boolean} draftSpendIncomplete
  * @property {string|null} registry
  * @property {string|null} workflow
  * @property {string|null} approve
@@ -394,6 +406,39 @@ async function execute(ctx) {
    * so a resume never silently drops it and runs the default under the arm's label. */
   const SCOUT_TAIL = scoutArg !== null && !SCOUT ? ' --scout off' : '';
 
+  // --draft-spent-usd (hamr's ruling 2026-09-28, "one cap covers drafting +
+  // run") — runner territory exactly like --read-shim/--scout above: the
+  // spec's signed budgetUsd is unaffected, this only shrinks THIS leg's own
+  // enforced ceiling. Same param-guard class and the same reason: an
+  // unreadable value here would either silently widen the ceiling (garbage
+  // read as 0) or silently narrow it (garbage read as Infinity) — neither is
+  // acceptable, so this refuses at argv, before the approval gate, rather
+  // than coercing.
+  const draftSpentArg = ctx.draftSpentUsd ?? null;
+  let DRAFT_SPENT_USD = 0;
+  if (draftSpentArg !== null) {
+    const v = Number(draftSpentArg);
+    if (draftSpentArg.trim() === '' || !Number.isFinite(v) || v < 0) {
+      err(`--draft-spent-usd "${draftSpentArg}" is not a finite number >= 0 — refusing rather than coercing it into $0 (which would widen the ceiling) or letting a NaN poison the ceiling arithmetic`);
+      throw new ExitSignal(2);
+    }
+    DRAFT_SPENT_USD = v;
+  }
+  // --draft-spend-incomplete (hamr's ruling 2026-09-28, 2nd addendum) — a NEW
+  // field beside --draft-spent-usd, never a value inside it: whether the
+  // drafting fold above was EXACT. Boolean presence-flag, same class as
+  // --review-door above (no argument, no value to misread as 0/Infinity).
+  // Meaningless alone (no drafting fold to qualify) but never refused for
+  // being passed without --draft-spent-usd — a re-invocation tail that always
+  // pairs the two never needs a second guard to prove it did.
+  const DRAFT_SPEND_INCOMPLETE = ctx.draftSpendIncomplete === true;
+  /** every re-invocation this script PRINTS carries the drafting fold, the
+   * same SHIM_TAIL/SCOUT_TAIL rule: a resume that dropped it would silently
+   * WIDEN the ceiling back up by the drafting spend on its next leg (and
+   * dropping the incomplete flag would silently turn a floor into an exact
+   * figure on the next leg's own job-start). */
+  const DRAFT_TAIL = DRAFT_SPENT_USD > 0 ? ` --draft-spent-usd ${DRAFT_SPENT_USD}${DRAFT_SPEND_INCOMPLETE ? ' --draft-spend-incomplete' : ''}` : '';
+
   const WORKDIR = target.workdir;
   const SEED = target.seed;
   const specHash = jobSpecHash(spec);
@@ -1040,7 +1085,7 @@ async function execute(ctx) {
     // right key only by accident of the runner's own generic error message,
     // never from this hint. `providerEntry.envKey` is the same resolved name
     // the real key check at launch (`:1157-1158` below) reads.
-    const invoke = (/** @type {string} */ tail) => `  ${providerEntry.envKey}=... node scripts/run-u.mjs ${SELECTOR}${dead ? ` --resume ${RESUME}` : ''}${SHIM_TAIL}${SCOUT_TAIL}${tail} --approve ${specHash}`;
+    const invoke = (/** @type {string} */ tail) => `  ${providerEntry.envKey}=... node scripts/run-u.mjs ${SELECTOR}${dead ? ` --resume ${RESUME}` : ''}${SHIM_TAIL}${SCOUT_TAIL}${DRAFT_TAIL}${tail} --approve ${specHash}`;
     /** the door the operator has already picked, as flags — hoisted out of the else
      * below so the inhibitor line at the bottom can print the WHOLE command rather
      * than a shape the operator has to assemble. Empty on an ordinary run and on the
@@ -1205,8 +1250,8 @@ async function execute(ctx) {
     out(`\nPAUSED BY YOU — nothing was run and nothing was spent. The checkpoint stands exactly as it was: the work is on the run's own branch, the plan and the money are where the paused leg left them.`);
     out(`  keeps    ${PAUSE_TTL_MS / 86_400_000} days from the pause on the record — after that the checkpoint expires on its own, and nothing has to be decided today to let that happen`);
     out('  resume   the SAME runid, whenever you want, with the door you pick then:');
-    out(`           node scripts/run-u.mjs ${SELECTOR} --resume ${RESUME}${SHIM_TAIL}${SCOUT_TAIL} --decide accept --approve ${specHash}`);
-    out(`           node scripts/run-u.mjs ${SELECTOR} --resume ${RESUME}${SHIM_TAIL}${SCOUT_TAIL} --decide rerun --text "<what you want done differently>" --approve ${specHash}`);
+    out(`           node scripts/run-u.mjs ${SELECTOR} --resume ${RESUME}${SHIM_TAIL}${SCOUT_TAIL}${DRAFT_TAIL} --decide accept --approve ${specHash}`);
+    out(`           node scripts/run-u.mjs ${SELECTOR} --resume ${RESUME}${SHIM_TAIL}${SCOUT_TAIL}${DRAFT_TAIL} --decide rerun --text "<what you want done differently>" --approve ${specHash}`);
     out(`  read     the same command with no --decide re-prints the evidence package you just looked at`);
     throw new ExitSignal(0);
   }
@@ -1458,6 +1503,14 @@ async function execute(ctx) {
   // driver's plan is a row nobody can audit from its own log.
   out(`   ${READ_SHIM_LABEL}`);
   out(`   ${SCOUT_LABEL}`);
+  // hamr's ruling 2026-09-28 — advertised = enforced: the banner states the
+  // SIGNED cap above unconditionally (it never changes, same spec hash), and
+  // this line states the drafting fold whenever there is one, so the number
+  // this run actually enforces (Cap $ − drafting spent) is never a second,
+  // silent figure a reader has to compute themselves.
+  if (DRAFT_SPENT_USD > 0) {
+    out(`   drafting spent $${DRAFT_SPENT_USD.toFixed(4)} — this run's own enforced ceiling is $${(spec.budgetUsd - DRAFT_SPENT_USD).toFixed(4)} of the signed $${spec.budgetUsd}`);
+  }
 
   // F67 — the OUTSIDE watchdog, started before the run and sharing nothing with it.
   // Every guard bareloop had lived inside this process, and ms3197n8/ms3jh76q proved
@@ -1642,6 +1695,8 @@ async function execute(ctx) {
       closeDir: spineDir,
       readShim: READ_SHIM,
       scout: SCOUT,
+      draftSpentUsd: DRAFT_SPENT_USD,
+      draftSpendComplete: !DRAFT_SPEND_INCOMPLETE,
       // RESUME: the money and the wall the halted run already burned are FOLDED IN (so
       // the signed ceiling cannot widen by being re-invoked), and the checkpoint it
       // reached is handed over so the plan is reloaded rather than re-drafted and the
@@ -1731,7 +1786,15 @@ async function execute(ctx) {
   const writes = audit.filter((e) => e.decision === 'allow' && (e.action?.type === 'write' || e.action?.type === 'edit'));
 
   out(`\noutcome   ${outcome}`);
-  out(`spent     ${je?.spentUsd == null ? 'UNKNOWN' : `${je.spendComplete === false ? '≥' : ''}$${je.spentUsd.toFixed(4)}`} of $${spec.budgetUsd}`);
+  // hamr's ruling 2026-09-28 — the drafting share (this leg's own job-start
+  // record) rides beside the run's own spend via the ONE shared formatter,
+  // so this line never disagrees with the panel's Run tab/Runs list about
+  // what "$X of $Y" means for a job that drafted through the panel/author.
+  const jobStartRec = events.find((e) => e.type === 'job-start');
+  const legDraftSpentUsd = typeof jobStartRec?.draftSpentUsd === 'number' && jobStartRec.draftSpentUsd > 0 ? jobStartRec.draftSpentUsd : null;
+  const legDraftSpendComplete = legDraftSpentUsd === null ? null : jobStartRec.draftSpendComplete !== false;
+  const spendCore = je?.spentUsd == null ? 'UNKNOWN' : `${je.spendComplete === false ? '≥' : ''}$${je.spentUsd.toFixed(4)}`;
+  out(`spent     ${moneyWithDraft(spendCore, legDraftSpentUsd, spec.budgetUsd, legDraftSpendComplete)}`);
   // FOLDED, exactly like the money line above it: on a resume the cap governs both legs
   // together, and a leg-only wall next to a folded spend is two framings on one cap with
   // no label to tell them apart (F83). The leg stays on the line beside it.
@@ -1768,7 +1831,7 @@ async function execute(ctx) {
     out(`  trend   ${mh.trend} — ${mh.reading}`);
     out(`  lever   ${mh.lever}`);
     for (const o of mh.options ?? []) out(`          · ${o}`);
-    out(`  resume  node scripts/run-u.mjs ${SELECTOR} --resume ${runid}${SHIM_TAIL}${SCOUT_TAIL} --approve <the NEW hash after you edit budgetUsd>`);
+    out(`  resume  node scripts/run-u.mjs ${SELECTOR} --resume ${runid}${SHIM_TAIL}${SCOUT_TAIL}${DRAFT_TAIL} --approve <the NEW hash after you edit budgetUsd>`);
     out('          (the top-up is yours to sign — nothing in the run may widen its own budget)');
   }
   // A STALL is a checkpoint too (hamr's go, 2026-08-13). Its own escalation prints one
@@ -1778,7 +1841,7 @@ async function execute(ctx) {
   // the hash already approved is the hash that resumes.
   if (outcome === 'step-stalled') {
     out('\nSTALL HALT — the model stopped producing rounds and reissuing the call did not recover it. The tree, the plan and the steps already finished STAND.');
-    out(`  resume  node scripts/run-u.mjs ${SELECTOR} --resume ${runid}${SHIM_TAIL}${SCOUT_TAIL} --approve ${specHash}`);
+    out(`  resume  node scripts/run-u.mjs ${SELECTOR} --resume ${runid}${SHIM_TAIL}${SCOUT_TAIL}${DRAFT_TAIL} --approve ${specHash}`);
     out('          (no spec edit, so the hash is unchanged — this re-enters at the stalled step and re-pays for none of the ones before it)');
     out('          (if the allowance is what actually ran out underneath the stall, that preview says so and refuses — it is read there, not asserted here)');
   }
@@ -1799,7 +1862,7 @@ async function execute(ctx) {
     out(`  died    ${total === null ? 'before a plan was accepted — nothing paid is re-payable'
       : done >= total ? `at the close — all ${total} step(s) finished`
         : `in step ${done + 1} of ${total}`}`);
-    out(`  resume  node scripts/run-u.mjs ${SELECTOR} --resume ${runid}${SHIM_TAIL}${SCOUT_TAIL} --approve ${specHash}`);
+    out(`  resume  node scripts/run-u.mjs ${SELECTOR} --resume ${runid}${SHIM_TAIL}${SCOUT_TAIL}${DRAFT_TAIL} --approve ${specHash}`);
     out('          (no spec edit, so the hash is unchanged — this re-enters at the recorded step and re-pays for none of the ones before it)');
     out('          (if the allowance is what actually ran out underneath the transport fault, that preview says so and refuses — it is read there, not asserted here)');
   }
@@ -1820,7 +1883,7 @@ async function execute(ctx) {
     ]);
     out('  clock    STOPPED — the wall does not run while a person is reading (W-2), and this leg\'s elapsed is what folds into the resume');
     out('');
-    const answer = (/** @type {string} */ tail) => `node scripts/run-u.mjs ${SELECTOR} --resume ${runid}${SHIM_TAIL}${SCOUT_TAIL}${tail} --approve ${specHash}`;
+    const answer = (/** @type {string} */ tail) => `node scripts/run-u.mjs ${SELECTOR} --resume ${runid}${SHIM_TAIL}${SCOUT_TAIL}${DRAFT_TAIL}${tail} --approve ${specHash}`;
     for (const l of doorLines({
       rerun: answer(' --decide rerun --text "<what you want done differently>"'),
       accept: answer(' --decide accept'),
@@ -2057,6 +2120,8 @@ function buildCtx(mode, opts) {
     model: opts.model ?? null,
     readShim: opts.readShim ?? null,
     scout: opts.scout ?? null,
+    draftSpentUsd: opts.draftSpentUsd ?? null,
+    draftSpendIncomplete: opts.draftSpendIncomplete === true,
     registry: opts.registry ?? null,
     workflow: opts.workflow ?? null,
     approve: opts.approve ?? null,
@@ -2275,6 +2340,8 @@ export async function main(argv, deps = {}) {
       model: argFlag('model'),
       readShim: argFlag('read-shim'),
       scout: argFlag('scout'),
+      draftSpentUsd: argFlag('draft-spent-usd'),
+      draftSpendIncomplete: argv.includes('--draft-spend-incomplete'),
       registry: argFlag('registry'),
       workflow: argFlag('workflow'),
       approve: argFlag('approve'),