dorfl 0.14.2 → 0.15.0

package/dist/item-lock.d.ts

@@ -106,7 +106,25 @@ export interface LockEntry {
     state: LockState;
     holder: string;
     since: string;
+    /**
+     * Why a finished build still holds the lock, when it does (task
+     * `wire-merge-questions-into-the-advance-tick`, decision 4). Absent on every
+     * live hold. See {@link LockKeptFor}.
+     */
+    keptFor?: LockKeptFor;
 }
+/**
+ * The PROPOSE-KEPT marker a lock entry may carry. `propose-pr`: a propose land
+ * pushed the work branch (and opened a PR where the host allows it) but the
+ * work is not on `main` yet, so the build's `implement` lock is KEPT HELD
+ * "until the PR merges" (task `propose-keep-lock-until-pr-merge`). No build is
+ * running under it. It is what lets the merge-question surfacer tell a finished
+ * propose build (ask) from a live build (skip), and what the answered-merge
+ * lock phase may take over (for the same item) instead of backing off. A lock
+ * WITHOUT the marker is a live build, including the rebuild of a bounced task's
+ * kept branch, whose tip can already carry the done-move.
+ */
+export type LockKeptFor = 'propose-pr';
 /** Outcome of an acquire attempt. `acquired` = we hold it; `lost` = someone else
  * does (a genuine same-item conflict). `error` = environment/usage. */
 export type AcquireOutcome = 'acquired' | 'lost' | 'error';
@@ -126,12 +144,12 @@ export interface ReleaseResult {
     message: string;
 }
 /**
- * Outcome of an AMEND-style transition (resume-crash-orphan / requeue) — the
+ * Outcome of an AMEND-style transition (resume-crash-orphan) — the
  * lock-entry STATE MACHINE's interior moves. Post-CONTRACT step (task
  * `retire-stuck-lock-state`) the `mark-stuck` transition + the `wrong-state`
  * verdict are retired with the `stuck` state itself.
  *   - `transitioned` — we won the CAS; the entry is now at the target state
- *                      (or removed, for requeue).
+ *                      (or removed, for the crash-orphan clear).
  *   - `not-held`     — there is no entry to transition (the move's precondition
  *                      is a held entry; absent ⇒ illegal here).
  *   - `lost`         — the leased CAS was rejected because a CONCURRENT writer
@@ -146,7 +164,7 @@ export interface TransitionResult {
     entry: string;
     ref: string;
     message: string;
-    /** The lock entry AFTER a successful `transitioned` (absent for requeue's removal). */
+    /** The lock entry AFTER a successful `transitioned` (absent for a removal). */
     lock?: LockEntry;
 }
 /**
@@ -180,6 +198,13 @@ export interface AcquireOptions {
  * contention.
  */
 export declare function acquireItemLock(opts: AcquireOptions): Promise<AcquireResult>;
+/**
+ * Lease every release of `item`'s lock on `expectedSha` until the returned
+ * function is called: a release then deletes the ref only while it still points
+ * at `expectedSha`, and otherwise reports an `error` and leaves it untouched (the
+ * lock was re-taken by another run).
+ */
+export declare function leaseLockReleases(item: string, expectedSha: string): () => void;
 export interface ReleaseOptions {
     /** The NAMESPACED item identity (same forms as {@link AcquireOptions.item}). */
     item: string;
@@ -308,16 +333,53 @@ export interface ResumeOptions {
  * sidecar (via the apply rung), not by "resuming" a lock.
  */
 export declare function resumeItemLock(opts: ResumeOptions): Promise<TransitionResult>;
+export interface MarkProposeKeptOptions {
+    /** The NAMESPACED item identity (same forms as {@link AcquireOptions.item}). */
+    item: string;
+    cwd: string;
+    arbiter?: string;
+    /**
+     * The lock sha the caller holds (the CI apply phase's `lockSha`). When set,
+     * the mark is refused (`lost`) unless the ref still points at it. Unset: the
+     * current sha is read and leased on (the laptop `complete`, which holds the
+     * lock it claimed).
+     */
+    expectedSha?: string;
+    env?: NodeJS.ProcessEnv;
+}
+/**
+ * STAMP the {@link LockKeptFor} `propose-pr` marker on a held lock (task
+ * `wire-merge-questions-into-the-advance-tick`, decision 4): a propose land
+ * that keeps the build's lock held "until the PR merges" calls this, so the lock
+ * says it is kept for a propose PR and no longer covers a live build. The entry
+ * keeps its `action`, `holder` and `since`; the ref is replaced by a leased CAS
+ * (never forced), so a concurrent change is `lost`. Idempotent: a lock that
+ * already carries the marker is `transitioned` without a write.
+ */
+export declare function markLockKeptForProposePr(opts: MarkProposeKeptOptions): Promise<TransitionResult>;
+export interface TakeOverProposeKeptOptions {
+    /** The NAMESPACED item identity (same forms as {@link AcquireOptions.item}). */
+    item: string;
+    /** The action the taken-over lock is held for (the answered merge: `advance`). */
+    action: LockAction;
+    cwd: string;
+    arbiter?: string;
+    holder?: string;
+    env?: NodeJS.ProcessEnv;
+}
 /**
- * requeue: give up on a held lock and return the item to the pool by REMOVING
- * the entry. Post-CONTRACT step (task `retire-stuck-lock-state`) there is NO
- * `stuck` state to guard against — the held lock is always `active`, so
- * requeue works on any held entry (a leased delete; a concurrent change ⇒
- * `lost`). The body never moved (it rests in the pool on `main`), so requeue
- * is purely "release the lock"; the kept `work/<slug>` branch remains for
- * recovery.
+ * TAKE OVER a lock that a finished propose build of the SAME item keeps held
+ * (task `wire-merge-questions-into-the-advance-tick`, decisions 2 and 4): the
+ * answered-merge lock phase calls this when the create-only acquire found the
+ * item locked. It succeeds ONLY when the held entry carries the
+ * {@link LockKeptFor} `propose-pr` marker and was taken for `implement` (the
+ * propose build's own claim); the ref is then replaced, leased on the sha read,
+ * by a fresh `action` hold without the marker, so the rest of the run owns it
+ * exactly like a lock it created. Any other held lock (a live build, a tasking,
+ * another advance) is `lost`, as the plain acquire reports it. A lock released
+ * meanwhile falls back to the plain create-only acquire.
  */
-export declare function requeueItemLock(opts: ReleaseOptions): Promise<TransitionResult>;
+export declare function takeOverProposeKeptLock(opts: TakeOverProposeKeptOptions): Promise<AcquireResult>;
 /**
  * Read the current lock entry for an item from the arbiter (the `status`/`scan`
  * read path): fetch the lock refs, read `lock.md` from the ref's tree. Returns
@@ -839,6 +901,26 @@ export declare function heldTaskSlugs(cwd: string, arbiter?: string, env?: NodeJ
  * read-only surface keeps the graceful {@link heldTaskSlugs}.
  */
 export declare function heldTaskSlugsStrict(cwd: string, arbiter?: string, env?: NodeJS.ProcessEnv): Promise<Set<string>>;
+/**
+ * STRICT (fail-CLOSED) twin of {@link listItemLockEntries}: THROWS when the
+ * lock refs cannot be read (the same fetch {@link listItemLocks} does), so a
+ * caller that ACTS on the absence of a lock (the merge-question surfacer asks
+ * about a branch only when no live build holds its item) never mistakes an
+ * unreadable arbiter for "no locks". A held ref whose body does not parse is
+ * returned as a plain `implement` hold without the marker (a live build: the
+ * safe reading).
+ */
+export declare function listItemLockEntriesStrict(cwd: string, arbiter?: string, env?: NodeJS.ProcessEnv): Promise<LockEntry[]>;
+/**
+ * The TASK slugs whose lock a finished propose build keeps held, i.e. whose
+ * entry carries the {@link LockKeptFor} `propose-pr` marker (task
+ * `wire-merge-questions-into-the-advance-tick`, decision 6). Selection uses it
+ * to let an answered `merge` through the held-slug subtraction; the
+ * merge-question surfacer to tell a finished propose build from a live one.
+ * GRACEFUL: a read fault yields an empty set, so a held lock keeps excluding
+ * its item (the safe direction).
+ */
+export declare function proposeKeptTaskSlugs(cwd: string, arbiter?: string, env?: NodeJS.ProcessEnv): Promise<Set<string>>;
 /**
  * List the SPEC slugs currently lock-held on the arbiter — the held-SPEC set the
  * TASKABLE-spec pool readers SUBTRACT (fix

package/dist/item-lock.d.ts.map

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

package/dist/item-lock.js

@@ -1,5 +1,6 @@
 import { randomUUID } from 'node:crypto';
 import { runAsync } from './git.js';
+import { refWrite } from './ref-write.js';
 import { resolveSidecarIdentity, sidecarPathFor, } from './sidecar.js';
 import { parseFrontmatter } from './frontmatter.js';
 import { workItemRel } from './work-layout.js';
@@ -114,9 +115,12 @@ export function serialiseLockEntry(e) {
         `state: ${e.state}`,
         `holder: ${e.holder}`,
         `since: ${e.since}`,
+        ...(e.keptFor === undefined ? [] : [`keptFor: ${e.keptFor}`]),
         '---',
         '',
-        `Lock held for \`${e.entry}\` (${e.action}/${e.state}).`,
+        e.keptFor === undefined
+            ? `Lock held for \`${e.entry}\` (${e.action}/${e.state}).`
+            : `Lock kept for \`${e.entry}\` (${e.action}/${e.state}, ${e.keptFor}): the build finished; its work is not on main yet.`,
         '',
     ].join('\n');
 }
@@ -184,7 +188,7 @@ export async function acquireItemLock(opts) {
             since: new Date().toISOString(),
         }, cwd, env);
         // CREATE-ONLY push: --force-with-lease=<ref>: (empty) succeeds iff ref absent.
-        const push = await gitSoft(['push', arbiter, `${commit}:${ref}`, `--force-with-lease=${ref}:`], cwd, env);
+        const push = await refWrite.createLockRef({ arbiter, ref, commit, cwd, env });
         if (push.status === 0) {
             return { outcome: 'acquired', entry, ref, message: `locked ${entry}` };
         }
@@ -232,6 +236,39 @@ export async function acquireItemLock(opts) {
         };
     }
 }
+/**
+ * Lock refs whose release is LEASED on a known sha: `<ref>` → the sha this
+ * process last observed for it (spec `ci-agent-job-without-write-token` §8, the
+ * lock-ownership rule; task `ci-split-build-path-non-integrate-intents`).
+ *
+ * The CI apply phase holds the lock the lock JOB took, and every CI run's lock
+ * `holder` is the same bot, so only the sha tells runs apart. Its releases are
+ * reached from deep inside the reused write halves (the surface, the
+ * return-to-backlog, the land's needs-attention routes), which do not carry the
+ * sha, so the apply phase registers it here for its whole run
+ * ({@link leaseLockReleases}) and {@link releaseLockEntry} refuses to delete a
+ * lock that no longer points at it. Process-global for the same reason the
+ * phase is (`phase.ts`): a phase run is a one-shot process. Empty outside the
+ * apply phase, where every release behaves exactly as before.
+ */
+const releaseLeases = new Map();
+/**
+ * Lease every release of `item`'s lock on `expectedSha` until the returned
+ * function is called: a release then deletes the ref only while it still points
+ * at `expectedSha`, and otherwise reports an `error` and leaves it untouched (the
+ * lock was re-taken by another run).
+ */
+export function leaseLockReleases(item, expectedSha) {
+    const ref = itemLockRef(lockEntryFor(item));
+    const previous = releaseLeases.get(ref);
+    releaseLeases.set(ref, expectedSha);
+    return () => {
+        if (previous === undefined)
+            releaseLeases.delete(ref);
+        else
+            releaseLeases.set(ref, previous);
+    };
+}
 /**
  * Release the per-item lock by DELETING the ref (`git push <arbiter>
  * :refs/dorfl/lock/<entry>`). Deleting (not emptying) is what makes the
@@ -280,7 +317,23 @@ async function releaseLockEntry(entry, cwd, arbiter, env) {
         // Delete the ref on the arbiter. Lease on the current value guards against a
         // concurrent change between our fetch and the delete.
         const cur = (await gitHard(['rev-parse', ref], cwd, env)).stdout.trim();
-        const del = await gitSoft(['push', arbiter, '--delete', ref, `--force-with-lease=${ref}:${cur}`], cwd, env);
+        const lease = releaseLeases.get(ref);
+        if (lease !== undefined && lease !== cur) {
+            return {
+                outcome: 'error',
+                entry,
+                ref,
+                message: `not released: ${ref} now points at ${cur}, not the leased ` +
+                    `${lease} (another run holds the lock now)`,
+            };
+        }
+        const del = await refWrite.deleteLockRef({
+            arbiter,
+            ref,
+            expectedSha: cur,
+            cwd,
+            env,
+        });
         if (del.status === 0) {
             // Drop our local copy of the ref too (best-effort).
             await gitSoft(['update-ref', '-d', ref], cwd, env);
@@ -374,7 +427,7 @@ export async function releaseHeldItemLock(opts) {
 /**
  * Fetch the lock refs and return the held entry + its current ref sha, or
  * `undefined` when the item is at REST (no ref). Shared read-before-CAS step for
- * the amend-style transitions (mark-stuck / resume / requeue): they all need BOTH
+ * the amend-style transitions (resume): they need BOTH
  * the current entry (to check the state precondition + carry forward `action` /
  * `holder` / `since`) and the current sha (to lease the CAS on it).
  */
@@ -402,40 +455,6 @@ async function fetchHeldEntry(entry, ref, cwd, arbiter, env) {
     }
     return { lock, sha };
 }
-/**
- * AMEND the held entry in place via a leased CAS: build a NEW parentless commit
- * carrying `next` and push it to the SAME ref with `--force-with-lease=<ref>:<sha>`
- * (the sha we just read). The arbiter accepts ONLY if the ref is unchanged since
- * our read — a concurrent writer who moved it makes our lease fail (`lost`). No
- * retry loop: a rejection is a genuine same-item race the caller should lose.
- */
-async function amendHeldEntry(next, ref, expectedSha, cwd, arbiter, env) {
-    const commit = await buildLockCommit(next, cwd, env);
-    const push = await gitSoft([
-        'push',
-        arbiter,
-        `${commit}:${ref}`,
-        `--force-with-lease=${ref}:${expectedSha}`,
-    ], cwd, env);
-    if (push.status === 0) {
-        // Move our local copy to the new commit too (best-effort) so a subsequent
-        // read in the same clone sees the amended entry without a refetch.
-        await gitSoft(['update-ref', ref, commit], cwd, env);
-        return {
-            outcome: 'transitioned',
-            entry: next.entry,
-            ref,
-            message: `${next.entry} → ${next.action}/${next.state}`,
-            lock: next,
-        };
-    }
-    return {
-        outcome: 'lost',
-        entry: next.entry,
-        ref,
-        message: `'${next.entry}' lock changed concurrently (CAS lost). Back off.`,
-    };
-}
 /**
  * The ONE leased-delete CLEAR path shared by every code path that removes a held
  * lock ref by lease (the recovery {@link reconcileItemLockAgainstMain}, the
@@ -448,13 +467,13 @@ async function amendHeldEntry(next, ref, expectedSha, cwd, arbiter, env) {
  * is no second clear mechanism.
  */
 async function leasedDeleteLockRef(ref, expectedSha, cwd, arbiter, env) {
-    const del = await gitSoft([
-        'push',
+    const del = await refWrite.deleteLockRef({
         arbiter,
-        '--delete',
         ref,
-        `--force-with-lease=${ref}:${expectedSha}`,
-    ], cwd, env);
+        expectedSha,
+        cwd,
+        env,
+    });
     if (del.status !== 0) {
         return 'lost';
     }
@@ -573,18 +592,17 @@ export async function resumeItemLock(opts) {
     }
 }
 /**
- * requeue: give up on a held lock and return the item to the pool by REMOVING
- * the entry. Post-CONTRACT step (task `retire-stuck-lock-state`) there is NO
- * `stuck` state to guard against — the held lock is always `active`, so
- * requeue works on any held entry (a leased delete; a concurrent change ⇒
- * `lost`). The body never moved (it rests in the pool on `main`), so requeue
- * is purely "release the lock"; the kept `work/<slug>` branch remains for
- * recovery.
+ * STAMP the {@link LockKeptFor} `propose-pr` marker on a held lock (task
+ * `wire-merge-questions-into-the-advance-tick`, decision 4): a propose land
+ * that keeps the build's lock held "until the PR merges" calls this, so the lock
+ * says it is kept for a propose PR and no longer covers a live build. The entry
+ * keeps its `action`, `holder` and `since`; the ref is replaced by a leased CAS
+ * (never forced), so a concurrent change is `lost`. Idempotent: a lock that
+ * already carries the marker is `transitioned` without a write.
  */
-export async function requeueItemLock(opts) {
+export async function markLockKeptForProposePr(opts) {
     const arbiter = opts.arbiter ?? 'origin';
-    const env = opts.env;
-    const cwd = opts.cwd;
+    const { cwd, env } = opts;
     if (!opts.item) {
         return { outcome: 'error', entry: '', ref: '', message: 'missing item' };
     }
@@ -597,30 +615,135 @@ export async function requeueItemLock(opts) {
                 outcome: 'not-held',
                 entry,
                 ref,
-                message: `'${entry}' not locked`,
+                message: `'${entry}' not locked; nothing to mark`,
+            };
+        }
+        if (opts.expectedSha !== undefined && held.sha !== opts.expectedSha) {
+            return {
+                outcome: 'lost',
+                entry,
+                ref,
+                message: `'${entry}' now points at ${held.sha}, not ${opts.expectedSha}; not marked`,
+            };
+        }
+        if (held.lock.keptFor === 'propose-pr') {
+            return {
+                outcome: 'transitioned',
+                entry,
+                ref,
+                message: `'${entry}' is already kept for a propose PR`,
+                lock: held.lock,
             };
         }
-        const del = await gitSoft([
-            'push',
+        const lock = { ...held.lock, keptFor: 'propose-pr' };
+        const commit = await buildLockCommit(lock, cwd, env);
+        const push = await refWrite.replaceLockRef({
             arbiter,
-            '--delete',
             ref,
-            `--force-with-lease=${ref}:${held.sha}`,
-        ], cwd, env);
-        if (del.status === 0) {
-            await gitSoft(['update-ref', '-d', ref], cwd, env);
+            commit,
+            expectedSha: held.sha,
+            cwd,
+            env,
+        });
+        if (push.status !== 0) {
             return {
-                outcome: 'transitioned',
+                outcome: 'lost',
                 entry,
                 ref,
-                message: `requeued ${entry} (lock released, body still in pool)`,
+                message: `marking '${entry}' kept for a propose PR was rejected: ${push.stderr.trim()}`,
             };
         }
         return {
-            outcome: 'lost',
+            outcome: 'transitioned',
+            entry,
+            ref,
+            message: `marked '${entry}' kept for a propose PR`,
+            lock,
+        };
+    }
+    catch (err) {
+        return {
+            outcome: 'error',
+            entry,
+            ref,
+            message: err instanceof Error ? err.message : String(err),
+        };
+    }
+}
+/**
+ * TAKE OVER a lock that a finished propose build of the SAME item keeps held
+ * (task `wire-merge-questions-into-the-advance-tick`, decisions 2 and 4): the
+ * answered-merge lock phase calls this when the create-only acquire found the
+ * item locked. It succeeds ONLY when the held entry carries the
+ * {@link LockKeptFor} `propose-pr` marker and was taken for `implement` (the
+ * propose build's own claim); the ref is then replaced, leased on the sha read,
+ * by a fresh `action` hold without the marker, so the rest of the run owns it
+ * exactly like a lock it created. Any other held lock (a live build, a tasking,
+ * another advance) is `lost`, as the plain acquire reports it. A lock released
+ * meanwhile falls back to the plain create-only acquire.
+ */
+export async function takeOverProposeKeptLock(opts) {
+    const arbiter = opts.arbiter ?? 'origin';
+    const { cwd, env } = opts;
+    if (!opts.item) {
+        return { outcome: 'error', entry: '', ref: '', message: 'missing item' };
+    }
+    const entry = lockEntryFor(opts.item);
+    const ref = itemLockRef(entry);
+    try {
+        const held = await fetchHeldEntry(entry, ref, cwd, arbiter, env);
+        if (!held) {
+            return acquireItemLock({
+                item: opts.item,
+                action: opts.action,
+                cwd,
+                arbiter,
+                holder: opts.holder,
+                env,
+            });
+        }
+        if (held.lock.keptFor !== 'propose-pr' ||
+            held.lock.action !== 'implement' ||
+            held.lock.entry !== entry) {
+            return {
+                outcome: 'lost',
+                entry,
+                ref,
+                message: `'${entry}' is already locked (${held.lock.action}, not kept for a ` +
+                    'propose PR): a live hold is never taken over. Back off.',
+            };
+        }
+        const holder = opts.holder ?? (await resolveHolder(cwd, env));
+        const commit = await buildLockCommit({
+            entry,
+            action: opts.action,
+            state: 'active',
+            holder,
+            since: new Date().toISOString(),
+        }, cwd, env);
+        const push = await refWrite.replaceLockRef({
+            arbiter,
+            ref,
+            commit,
+            expectedSha: held.sha,
+            cwd,
+            env,
+        });
+        if (push.status !== 0) {
+            return {
+                outcome: 'lost',
+                entry,
+                ref,
+                message: `taking over '${entry}' lost the race: ${push.stderr.trim()}`,
+            };
+        }
+        // Keep the local copy in step, as the create-only acquire's fetch would.
+        await gitSoft(['update-ref', ref, commit], cwd, env);
+        return {
+            outcome: 'acquired',
             entry,
             ref,
-            message: `'${entry}' lock changed concurrently (CAS lost). Back off.`,
+            message: `took over '${entry}' from its finished propose build (kept for a propose PR)`,
         };
     }
     catch (err) {
@@ -1756,6 +1879,47 @@ export async function heldTaskSlugsStrict(cwd, arbiter = 'origin', env) {
         .filter((e) => e.startsWith(prefix))
         .map((e) => e.slice(prefix.length)));
 }
+/**
+ * STRICT (fail-CLOSED) twin of {@link listItemLockEntries}: THROWS when the
+ * lock refs cannot be read (the same fetch {@link listItemLocks} does), so a
+ * caller that ACTS on the absence of a lock (the merge-question surfacer asks
+ * about a branch only when no live build holds its item) never mistakes an
+ * unreadable arbiter for "no locks". A held ref whose body does not parse is
+ * returned as a plain `implement` hold without the marker (a live build: the
+ * safe reading).
+ */
+export async function listItemLockEntriesStrict(cwd, arbiter = 'origin', env) {
+    const names = await listItemLocks(cwd, arbiter, env);
+    const entries = [];
+    for (const entry of names) {
+        const show = await gitSoft(['show', `${itemLockRef(entry)}:lock.md`], cwd, env);
+        const lock = show.status === 0 ? parseLockEntry(show.stdout) : undefined;
+        entries.push(lock ?? {
+            entry,
+            action: 'implement',
+            state: 'active',
+            holder: '',
+            since: '',
+        });
+    }
+    return entries;
+}
+/**
+ * The TASK slugs whose lock a finished propose build keeps held, i.e. whose
+ * entry carries the {@link LockKeptFor} `propose-pr` marker (task
+ * `wire-merge-questions-into-the-advance-tick`, decision 6). Selection uses it
+ * to let an answered `merge` through the held-slug subtraction; the
+ * merge-question surfacer to tell a finished propose build from a live one.
+ * GRACEFUL: a read fault yields an empty set, so a held lock keeps excluding
+ * its item (the safe direction).
+ */
+export async function proposeKeptTaskSlugs(cwd, arbiter = 'origin', env) {
+    const entries = await listItemLockEntries(cwd, arbiter, env);
+    const prefix = 'task-';
+    return new Set(entries
+        .filter((e) => e.keptFor === 'propose-pr' && e.entry.startsWith(prefix))
+        .map((e) => e.entry.slice(prefix.length)));
+}
 /**
  * List the SPEC slugs currently lock-held on the arbiter — the held-SPEC set the
  * TASKABLE-spec pool readers SUBTRACT (fix
@@ -1827,6 +1991,10 @@ export function parseLockEntry(body) {
         state: 'active',
         holder: fields.holder ?? '',
         since: fields.since ?? '',
+        // Only the one known marker value is read; anything else is a live hold.
+        ...(fields.keptFor === 'propose-pr'
+            ? { keptFor: 'propose-pr' }
+            : {}),
     };
 }
 /**