dorfl 0.14.2 → 0.15.0

package/dist/merge-question-surfacer.js

@@ -4,6 +4,7 @@ import { run } from './git.js';
 import { isGitHubArbiterUrl, DEFAULT_GH_BIN } from './github.js';
 import { parseSidecar, sidecarPathFor, isEntryAnswered, } from './sidecar.js';
 import { persistSurfacedQuestions, } from './surface-persist.js';
+import { parseWorkBranchRef } from './slug-namespace.js';
 import { workItemRel } from './work-layout.js';
 /** Raised for fatal usage errors (a missing repo, etc.). */
 export class MergeQuestionSurfacerError extends Error {
@@ -13,21 +14,17 @@ export class MergeQuestionSurfacerError extends Error {
     }
 }
 /**
- * The lifecycle folders {@link findTaskItemPath} scans for a task body to flip
- * `needsAnswers:true` on. This set DELIBERATELY DIVERGES from `advance.ts`'s
- * `FOLDERS_FOR_TYPE.task` (`['tasks-backlog','tasks-ready','in-progress','done']`):
- *
- *   - OMITS `in-progress` (and `needs-attention`): an unmerged `work/<slug>`
- *     branch whose body is mid-build should NOT trigger a merge-question — the
- *     build is still active, and surfacing a land-decision now would race the
- *     builder. Such tasks fall through to the `no-item-body` skip.
- *   - ADDS `cancelled`: a cancelled task with a lingering unmerged `work/*`
- *     branch SHOULD surface a merge-question so the operator explicitly decides
- *     whether to merge the branch or drop it.
+ * The lifecycle folders {@link findTaskItemPath} asks about (task
+ * `wire-merge-questions-into-the-advance-tick`, decision 6): the pool and
+ * staging. `in-progress` / `needs-attention` no longer exist as folders (a
+ * build in flight is a held lock, filtered separately).
  */
 const TASK_FOLDERS = [
     'tasks-ready',
     'tasks-backlog',
+];
+/** A body in one of these is TERMINAL: its branch is never asked about. */
+const TERMINAL_TASK_FOLDERS = [
     'done',
     'cancelled',
 ];
@@ -35,9 +32,10 @@ const TASK_FOLDERS = [
  * Surface merge-questions for every unmerged `work/*` branch in `cwd`.
  *
  * The FLOOR (git reachability) is authoritative; the CEILING (`gh pr list`)
- * runs only when {@link isGitHubArbiterUrl} accepts the arbiter URL, and is
- * pure enrichment (a missing/failed `gh` degrades silently — the floor still
- * surfaces the question).
+ * runs only when {@link isGitHubArbiterUrl} accepts the arbiter URL. On GitHub
+ * it is load-bearing (an open PR is the land decision), so a failed listing
+ * asks about NO branch and is reported on
+ * {@link SurfaceMergeQuestionsResult.prListingError}.
  *
  * Idempotency: a branch whose sidecar ALREADY carries a PENDING `kind: merge`
  * entry is SKIPPED (with `already-pending-merge-question`). A branch with no
@@ -53,10 +51,14 @@ export function surfaceMergeQuestions(options) {
     const note = options.note ?? (() => { });
     const persist = options.persist ?? persistSurfacedQuestions;
     const listBranches = options.listUnmergedWorkBranches ?? listUnmergedWorkBranchesViaGit;
-    const branches = listBranches({ cwd, base, env });
+    const branches = listBranches({ cwd, base, arbiter: options.arbiter, env });
     // CEILING: only consult `gh pr list` when the arbiter is GitHub-shaped. A
     // bare / non-GitHub arbiter never spawns `gh` (the floor is sufficient).
+    // On GitHub an open PR is the land decision, so a branch with one is not
+    // asked about; a failed listing asks about NOTHING this pass (a question on
+    // a branch with an open PR would land it behind the PR's back).
     let prs = new Map();
+    let prListingError;
     const ghEnabled = options.arbiterUrl !== undefined && isGitHubArbiterUrl(options.arbiterUrl);
     if (ghEnabled && branches.length > 0) {
         const listPRs = options.listOpenPullRequests ?? listOpenPullRequestsViaGh;
@@ -69,45 +71,76 @@ export function surfaceMergeQuestions(options) {
             });
         }
         catch (err) {
-            // `gh` is the ENRICHMENT layer — a failure must NEVER suppress the
-            // floor's surfacing. Note it and proceed with an empty PR map.
             const detail = err instanceof Error ? err.message : String(err);
-            note(`merge-question surfacer: gh pr list failed (${detail}) — continuing with the git-only floor.`);
-            prs = new Map();
+            note(`merge-question surfacer: gh pr list failed (${detail}); asking about no branch this pass.`);
+            prs = undefined;
+            prListingError = detail;
+        }
+    }
+    // The item locks by task slug (`task-<slug>` entries only).
+    const locks = new Map();
+    for (const lock of options.locks ?? []) {
+        if (lock.entry.startsWith('task-')) {
+            locks.set(lock.entry.slice('task-'.length), lock);
         }
     }
     const surfaced = [];
     const skipped = [];
+    const skip = (branch, reason) => {
+        skipped.push({ ref: branch.ref, slug: branch.slug, reason });
+    };
+    // The `main` every question of this pass is asked against: recorded on the
+    // entry so a `strictMergeApproval` apply can tell whether `main` moved since
+    // (task `strict-merge-approval-restale-check-runs-before-the-continue-rebase`).
+    // Unresolvable (a test seam over a non-repo) ⇒ no base recorded.
+    const askedAtMain = branches.length > 0 ? resolveCommit(cwd, base, env) : undefined;
     for (const branch of branches) {
         const item = `task:${branch.slug}`;
-        // Idempotency: if the sidecar already carries a PENDING `kind: merge`
-        // entry, this surfacer must not append a duplicate. (An ANSWERED merge
-        // entry is fine — apply will dispatch it; appending a new entry would
-        // re-pause the sidecar unnecessarily.)
-        if (alreadyHasPendingMergeQuestion(cwd, item)) {
-            skipped.push({
-                ref: branch.ref,
-                slug: branch.slug,
-                reason: 'already-pending-merge-question',
-            });
-            continue;
-        }
         const itemPath = findTaskItemPath(cwd, branch.slug);
         if (itemPath === undefined) {
+            // A terminal body (done / cancelled): its branch is finished business
+            // (a squash-merged PR whose branch was not deleted rests here too).
+            if (isTerminalTask(cwd, branch.slug)) {
+                skip(branch, 'terminal');
+                continue;
+            }
             // The `branch:`/`ref:`-keyed sidecar identity (SPEC sidecar Q5-i, the
             // cross-cutting open question SHARED with the stuck-lock surfacer) is
-            // OUT OF SCOPE for this task — without a body to flip `needsAnswers`
-            // on, persist would tear the invariant. Skip with the reason so the
-            // case is visible to the caller.
-            skipped.push({
-                ref: branch.ref,
-                slug: branch.slug,
-                reason: 'no-item-body',
-            });
+            // OUT OF SCOPE: without a body to flip `needsAnswers` on, persist would
+            // tear the invariant. Skip with the reason so the case is visible.
+            skip(branch, 'no-item-body');
+            continue;
+        }
+        // Idempotency: never append a second merge question. A PENDING one is
+        // awaiting its answer; an ANSWERED one awaits its apply (appending would
+        // re-pause the sidecar and strand the answer).
+        const existing = existingMergeQuestion(cwd, item);
+        if (existing === 'pending') {
+            skip(branch, 'already-pending-merge-question');
+            continue;
+        }
+        if (existing === 'answered') {
+            skip(branch, 'merge-question-answered');
+            continue;
+        }
+        if (prs === undefined) {
+            skip(branch, 'pr-state-unknown');
+            continue;
+        }
+        if (prs.has(branch.ref)) {
+            skip(branch, 'open-pr');
+            continue;
+        }
+        const lock = locks.get(branch.slug);
+        if (lock !== undefined && lock.keptFor !== 'propose-pr') {
+            skip(branch, 'lock-held');
+            continue;
+        }
+        if (!tipHasDoneMove(cwd, branch, env)) {
+            skip(branch, 'no-done-move');
             continue;
         }
-        const pr = prs.get(branch.ref);
-        const question = buildMergeQuestion(branch, pr);
+        const question = buildMergeQuestion(branch, ghEnabled, askedAtMain);
         const result = persist({
             cwd,
             item,
@@ -117,11 +150,7 @@ export function surfaceMergeQuestions(options) {
             note,
         });
         if (result.outcome === 'nothing') {
-            skipped.push({
-                ref: branch.ref,
-                slug: branch.slug,
-                reason: 'persist-nothing',
-            });
+            skip(branch, 'persist-nothing');
             continue;
         }
         surfaced.push({
@@ -130,10 +159,14 @@ export function surfaceMergeQuestions(options) {
             ref: branch.ref,
             sidecarPath: result.sidecarPath,
             commit: result.commit,
-            prUrl: pr?.url,
         });
     }
-    return { considered: branches.length, surfaced, skipped };
+    return {
+        considered: branches.length,
+        surfaced,
+        skipped,
+        ...(prListingError === undefined ? {} : { prListingError }),
+    };
 }
 /**
  * Build the merge-question for ONE unmerged branch.
@@ -148,19 +181,13 @@ export function surfaceMergeQuestions(options) {
  *     `kind: merge` is what the apply rung reads to route the answer to the
  *     deterministic land primitive.
  */
-function buildMergeQuestion(branch, pr) {
+function buildMergeQuestion(branch, ghEnabled, askedAtMain) {
     const contextLines = [
         `The branch \`${branch.ref}\` is not reachable from \`main\` — it carries pushed work that has not yet landed.`,
+        ghEnabled
+            ? 'It has no open PR (none was opened, or its PR was closed without merging).'
+            : 'No host PR metadata available (git-alone floor: the branch is the source of truth).',
     ];
-    if (pr !== undefined) {
-        const titleSuffix = pr.title ? `: ${pr.title}` : '';
-        const urlSuffix = pr.url ? ` (${pr.url})` : '';
-        const stateSuffix = pr.state ? ` [${pr.state}]` : '';
-        contextLines.push(`Open PR #${pr.number}${stateSuffix}${titleSuffix}${urlSuffix}.`);
-    }
-    else {
-        contextLines.push(`No host PR metadata available (git-alone floor — the branch is the source of truth).`);
-    }
     return {
         question: `Land \`${branch.ref}\`? An unmerged \`work/*\` branch is awaiting an integration decision.`,
         context: contextLines.join('\n'),
@@ -168,25 +195,62 @@ function buildMergeQuestion(branch, pr) {
         default: 'merge | hold | drop',
         // MACHINE dispatch signal — the apply layer routes on this, not on `default`.
         kind: 'merge',
+        ...(askedAtMain === undefined ? {} : { askedAtMain }),
     };
 }
-/** Probe the sidecar for an existing pending `kind: merge` entry. */
-function alreadyHasPendingMergeQuestion(cwd, item) {
+/** The full sha `rev` names in `cwd`, or `undefined` when it does not resolve. */
+function resolveCommit(cwd, rev, env) {
+    let res;
+    try {
+        res = gitSoft(['rev-parse', '--verify', '--quiet', `${rev}^{commit}`], cwd, env);
+    }
+    catch {
+        return undefined;
+    }
+    if (res.status !== 0)
+        return undefined;
+    const sha = res.stdout.trim();
+    return sha === '' ? undefined : sha;
+}
+/**
+ * Probe the sidecar for an existing `kind: merge` entry: `pending` when one is
+ * unanswered, `answered` when every one is answered, `undefined` when there is
+ * none.
+ */
+function existingMergeQuestion(cwd, item) {
     const rel = sidecarPathFor(item);
     const abs = join(cwd, rel);
     if (!existsSync(abs)) {
-        return false;
+        return undefined;
     }
     try {
-        const model = parseSidecar(readFileSync(abs, 'utf8'));
-        return model.entries.some((e) => e.kind === 'merge' && !isEntryAnswered(e));
+        const merge = parseSidecar(readFileSync(abs, 'utf8')).entries.filter((e) => e.kind === 'merge');
+        if (merge.length === 0)
+            return undefined;
+        return merge.some((e) => !isEntryAnswered(e)) ? 'pending' : 'answered';
     }
     catch {
         // A malformed sidecar is not THIS surfacer's problem — pretend there is
-        // no pending merge-question and let the persist write surface the issue.
-        return false;
+        // no merge-question and let the persist write surface the issue.
+        return undefined;
     }
 }
+/** Does the body of `slug` rest in a terminal task folder? */
+function isTerminalTask(cwd, slug) {
+    return TERMINAL_TASK_FOLDERS.some((folder) => existsSync(join(cwd, workItemRel(folder, `${slug}.md`))));
+}
+/**
+ * Does the branch tip carry the task's done-move (its body at
+ * `work/tasks/done/<slug>.md`)? The answered-merge land is the
+ * committed-recovery tail, which presupposes it. Read at the tip sha the
+ * listing gave; a branch listed without one is not asked about.
+ */
+function tipHasDoneMove(cwd, branch, env) {
+    if (branch.sha === undefined)
+        return false;
+    const done = workItemRel('done', `${branch.slug}.md`);
+    return (gitSoft(['cat-file', '-e', `${branch.sha}:${done}`], cwd, env).status === 0);
+}
 /** Locate the task body `work/<folder>/<slug>.md` across lifecycle folders. */
 function findTaskItemPath(cwd, slug) {
     for (const folder of TASK_FOLDERS) {
@@ -202,23 +266,51 @@ function gitSoft(args, cwd, env) {
     return run('git', args, cwd, { env });
 }
 /**
- * Production FLOOR: enumerate every `refs/heads/work/*` whose tip is NOT
- * reachable from `<base>`. A repo with no `<base>` (e.g. a fresh init before
- * the first commit) yields the empty list — the surfacer is a no-op until
- * `main` exists.
+ * Production FLOOR: enumerate the ARBITER's task build branches
+ * (`work/task-<slug>`, the {@link workBranchRef} form) whose tip is NOT
+ * reachable from the arbiter's `<base>`.
+ *
+ * WHERE the arbiter's refs live depends on the repo `cwd` is:
+ *
+ *   - A **clone** (non-bare, with an `<arbiter>` remote): the arbiter's branches
+ *     are the remote-tracking refs `refs/remotes/<arbiter>/work/*`, checked
+ *     against `refs/remotes/<arbiter>/<base>`. Local `refs/heads/work/*` in a
+ *     clone are this machine's own (possibly unpushed or stale) heads, not the
+ *     arbiter's, so they are NOT listed.
+ *   - The **hub mirror** (a `--bare` clone, or a worktree added from one, where
+ *     `core.bare` reads `true`) or a repo with no `<arbiter>` remote (the repo IS
+ *     the arbiter's ref store): the local heads `refs/heads/work/*`, checked
+ *     against the local `<base>`.
+ *
+ * The item slug comes from {@link parseWorkBranchRef}, never from slicing the
+ * ref. Only the plain BUILD branch of a task (`namespace: 'task'`, no producer)
+ * is listed: an intake branch (`work/intake-*`) creates an item rather than
+ * building one, a spec branch (`work/spec-*`) carries tasking, and an
+ * un-namespaced `work/<slug>` is a pre-cutover ref `parseWorkBranchRef` refuses
+ * (the clean-break stance). None of those is what a `kind: merge` answer lands.
+ *
+ * Purely local: it reads refs already in `cwd` (no fetch, no `ls-remote`); the
+ * caller refreshes them. A repo whose `<base>` does not resolve (e.g. a fresh
+ * init before the first commit, or a clone that never fetched `<base>`) yields
+ * the empty list: without a base, "unmerged" is meaningless and every branch
+ * would over-surface.
  */
 export function listUnmergedWorkBranchesViaGit(input) {
     const { cwd, base, env } = input;
-    // Bail if `<base>` does not resolve — without a base, "unmerged" is
-    // meaningless and we'd over-surface every branch as unmerged.
-    const haveBase = gitSoft(['rev-parse', '--verify', '--quiet', base], cwd, env);
+    const arbiter = input.arbiter ?? 'origin';
+    const source = arbiterRefSource(cwd, arbiter, env);
+    const baseRef = source === 'remote-tracking'
+        ? `refs/remotes/${arbiter}/${base}`
+        : `refs/heads/${base}`;
+    const branchPrefix = source === 'remote-tracking' ? `refs/remotes/${arbiter}/` : 'refs/heads/';
+    const haveBase = gitSoft(['rev-parse', '--verify', '--quiet', `${baseRef}^{commit}`], cwd, env);
     if (haveBase.status !== 0) {
         return [];
     }
     const refs = gitSoft([
         'for-each-ref',
-        '--format=%(refname:short) %(objectname)',
-        'refs/heads/work/',
+        '--format=%(refname) %(objectname)',
+        `${branchPrefix}work/`,
     ], cwd, env);
     if (refs.status !== 0) {
         return [];
@@ -233,34 +325,53 @@ export function listUnmergedWorkBranchesViaGit(input) {
         if (space === -1) {
             continue;
         }
-        const ref = line.slice(0, space);
+        const fullRef = line.slice(0, space);
         const sha = line.slice(space + 1).trim();
-        if (!ref.startsWith('work/')) {
+        if (!fullRef.startsWith(branchPrefix)) {
             continue;
         }
-        const slug = ref.slice('work/'.length);
-        if (slug === '') {
+        // The branch name AS IT IS ON THE ARBITER (`work/task-<slug>`), whichever
+        // local namespace it was read from.
+        const ref = fullRef.slice(branchPrefix.length);
+        const parsed = parseWorkBranchRef(ref);
+        if (parsed === undefined ||
+            parsed.namespace !== 'task' ||
+            parsed.producer !== undefined) {
             continue;
         }
-        // `git merge-base --is-ancestor <sha> <base>` — exit 0 ⇒ reachable
+        // `git merge-base --is-ancestor <sha> <base>`: exit 0 ⇒ reachable
         // (merged), exit 1 ⇒ unmerged.
-        const reach = gitSoft(['merge-base', '--is-ancestor', sha, base], cwd, env);
+        const reach = gitSoft(['merge-base', '--is-ancestor', sha, baseRef], cwd, env);
         if (reach.status !== 0) {
-            unmerged.push({ ref, slug, sha });
+            unmerged.push({ ref, slug: parsed.slug, sha });
         }
     }
     return unmerged;
 }
+/**
+ * Which local ref namespace holds the arbiter's branches in `cwd`: the local
+ * heads for the bare hub mirror (and its worktrees, which share its
+ * `core.bare = true` config) or for a repo with no `<arbiter>` remote; the
+ * remote-tracking refs for an ordinary clone.
+ */
+function arbiterRefSource(cwd, arbiter, env) {
+    const bare = gitSoft(['config', '--bool', 'core.bare'], cwd, env);
+    if (bare.status === 0 && bare.stdout.trim() === 'true') {
+        return 'local-heads';
+    }
+    const remote = gitSoft(['remote', 'get-url', arbiter], cwd, env);
+    return remote.status === 0 ? 'remote-tracking' : 'local-heads';
+}
 /**
  * Production CEILING: shell `gh pr list --state open --json …` and index the
- * results by their `headRefName` so the surfacer can enrich the matching
- * branch's question. A non-zero / missing `gh` is treated as "no host
- * metadata available" — the floor still surfaces every unmerged branch.
+ * results by their `headRefName`, so the surfacer can skip a branch with an
+ * open PR. A non-zero `gh` (or output that is not a JSON array) THROWS: the
+ * surfacer then asks about no branch this pass, rather than asking about
+ * branches whose PR it cannot see.
  *
- * Best-effort enrichment. The git-reachability FLOOR is authoritative; the
- * `--state open`, `--base <base>`, and `--limit 200` arguments are DELIBERATE
- * ceilings — a PR targeting a non-`main` base (e.g. a stacked PR) or the case
- * of >200 open PRs degrades to floor-only output, never corrupts it.
+ * The `--state open`, `--base <base>`, and `--limit 200` arguments are
+ * DELIBERATE ceilings: a PR targeting a non-`main` base (e.g. a stacked PR) or
+ * the case of >200 open PRs is not seen, so its branch may still be asked about.
  */
 export function listOpenPullRequestsViaGh(input) {
     const { cwd, ghBin, base, env } = input;
@@ -277,17 +388,17 @@ export function listOpenPullRequestsViaGh(input) {
         'number,url,title,headRefName,state',
     ], cwd, { env });
     if (result.status !== 0) {
-        return new Map();
+        throw new Error(`${ghBin} pr list exited ${result.status}: ${result.stderr.trim().slice(0, 300)}`);
     }
     let parsed;
     try {
         parsed = JSON.parse(result.stdout);
     }
     catch {
-        return new Map();
+        throw new Error(`${ghBin} pr list printed no JSON`);
     }
     if (!Array.isArray(parsed)) {
-        return new Map();
+        throw new Error(`${ghBin} pr list printed no JSON array`);
     }
     const out = new Map();
     for (const raw of parsed) {

package/dist/merge-question-surfacer.js.map

@@ -1 +1 @@
-{"version":3,"file":"merge-question-surfacer.js","sourceRoot":"","sources":["../src/merge-question-surfacer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,YAAY,EAAC,MAAM,SAAS,CAAC;AACjD,OAAO,EAAC,IAAI,EAAC,MAAM,WAAW,CAAC;AAC/B,OAAO,EAAC,GAAG,EAAiB,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAC,kBAAkB,EAAE,cAAc,EAAC,MAAM,aAAa,CAAC;AAC/D,OAAO,EACN,YAAY,EACZ,cAAc,EACd,eAAe,GAEf,MAAM,cAAc,CAAC;AACtB,OAAO,EACN,wBAAwB,GAGxB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAC,WAAW,EAAqB,MAAM,kBAAkB,CAAC;AAwJjE,4DAA4D;AAC5D,MAAM,OAAO,0BAA2B,SAAQ,KAAK;IACpD,YAAY,OAAe;QAC1B,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,4BAA4B,CAAC;IAC1C,CAAC;CACD;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,YAAY,GAA6B;IAC9C,aAAa;IACb,eAAe;IACf,MAAM;IACN,WAAW;CACF,CAAC;AAEX;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,qBAAqB,CACpC,OAAqC;IAErC,MAAM,EAAC,GAAG,EAAC,GAAG,OAAO,CAAC;IACtB,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,MAAM,CAAC;IACpC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;IACxB,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IACxC,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,wBAAwB,CAAC;IAE5D,MAAM,YAAY,GACjB,OAAO,CAAC,wBAAwB,IAAI,8BAA8B,CAAC;IACpE,MAAM,QAAQ,GAAG,YAAY,CAAC,EAAC,GAAG,EAAE,IAAI,EAAE,GAAG,EAAC,CAAC,CAAC;IAEhD,0EAA0E;IAC1E,yEAAyE;IACzE,IAAI,GAAG,GAA0C,IAAI,GAAG,EAAE,CAAC;IAC3D,MAAM,SAAS,GACd,OAAO,CAAC,UAAU,KAAK,SAAS,IAAI,kBAAkB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAC5E,IAAI,SAAS,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtC,MAAM,OAAO,GAAG,OAAO,CAAC,oBAAoB,IAAI,yBAAyB,CAAC;QAC1E,IAAI,CAAC;YACJ,GAAG,GAAG,OAAO,CAAC;gBACb,GAAG;gBACH,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,cAAc;gBACtC,IAAI;gBACJ,GAAG;aACH,CAAC,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACd,mEAAmE;YACnE,+DAA+D;YAC/D,MAAM,MAAM,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAChE,IAAI,CACH,+CAA+C,MAAM,yCAAyC,CAC9F,CAAC;YACF,GAAG,GAAG,IAAI,GAAG,EAAE,CAAC;QACjB,CAAC;IACF,CAAC;IAED,MAAM,QAAQ,GAA4B,EAAE,CAAC;IAC7C,MAAM,OAAO,GAA2B,EAAE,CAAC;IAE3C,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE,CAAC;QAC/B,MAAM,IAAI,GAAG,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;QAEnC,sEAAsE;QACtE,uEAAuE;QACvE,sEAAsE;QACtE,uCAAuC;QACvC,IAAI,8BAA8B,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC;YAC/C,OAAO,CAAC,IAAI,CAAC;gBACZ,GAAG,EAAE,MAAM,CAAC,GAAG;gBACf,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,MAAM,EAAE,gCAAgC;aACxC,CAAC,CAAC;YACH,SAAS;QACV,CAAC;QAED,MAAM,QAAQ,GAAG,gBAAgB,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QACpD,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC5B,sEAAsE;YACtE,sEAAsE;YACtE,qEAAqE;YACrE,oEAAoE;YACpE,iCAAiC;YACjC,OAAO,CAAC,IAAI,CAAC;gBACZ,GAAG,EAAE,MAAM,CAAC,GAAG;gBACf,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,MAAM,EAAE,cAAc;aACtB,CAAC,CAAC;YACH,SAAS;QACV,CAAC;QAED,MAAM,EAAE,GAAG,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC/B,MAAM,QAAQ,GAAG,kBAAkB,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAEhD,MAAM,MAAM,GAAG,OAAO,CAAC;YACtB,GAAG;YACH,IAAI;YACJ,QAAQ;YACR,SAAS,EAAE,CAAC,QAAQ,CAAC;YACrB,GAAG;YACH,IAAI;SACJ,CAAC,CAAC;QACH,IAAI,MAAM,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YAClC,OAAO,CAAC,IAAI,CAAC;gBACZ,GAAG,EAAE,MAAM,CAAC,GAAG;gBACf,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,MAAM,EAAE,iBAAiB;aACzB,CAAC,CAAC;YACH,SAAS;QACV,CAAC;QAED,QAAQ,CAAC,IAAI,CAAC;YACb,IAAI;YACJ,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,GAAG,EAAE,MAAM,CAAC,GAAG;YACf,WAAW,EAAE,MAAM,CAAC,WAAW;YAC/B,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,KAAK,EAAE,EAAE,EAAE,GAAG;SACd,CAAC,CAAC;IACJ,CAAC;IAED,OAAO,EAAC,UAAU,EAAE,QAAQ,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAC,CAAC;AACzD,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,SAAS,kBAAkB,CAC1B,MAA0B,EAC1B,EAAwC;IAExC,MAAM,YAAY,GAAa;QAC9B,gBAAgB,MAAM,CAAC,GAAG,qFAAqF;KAC/G,CAAC;IACF,IAAI,EAAE,KAAK,SAAS,EAAE,CAAC;QACtB,MAAM,WAAW,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACpD,MAAM,SAAS,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/C,MAAM,WAAW,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACrD,YAAY,CAAC,IAAI,CAChB,YAAY,EAAE,CAAC,MAAM,GAAG,WAAW,GAAG,WAAW,GAAG,SAAS,GAAG,CAChE,CAAC;IACH,CAAC;SAAM,CAAC;QACP,YAAY,CAAC,IAAI,CAChB,sFAAsF,CACtF,CAAC;IACH,CAAC;IACD,OAAO;QACN,QAAQ,EAAE,UAAU,MAAM,CAAC,GAAG,wEAAwE;QACtG,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC;QAChC,gEAAgE;QAChE,OAAO,EAAE,qBAAqB;QAC9B,8EAA8E;QAC9E,IAAI,EAAE,OAAO;KACb,CAAC;AACH,CAAC;AAED,qEAAqE;AACrE,SAAS,8BAA8B,CAAC,GAAW,EAAE,IAAY;IAChE,MAAM,GAAG,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;IACjC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC3B,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QACtB,OAAO,KAAK,CAAC;IACd,CAAC;IACD,IAAI,CAAC;QACJ,MAAM,KAAK,GAAG,YAAY,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC;QACtD,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7E,CAAC;IAAC,MAAM,CAAC;QACR,wEAAwE;QACxE,yEAAyE;QACzE,OAAO,KAAK,CAAC;IACd,CAAC;AACF,CAAC;AAED,+EAA+E;AAC/E,SAAS,gBAAgB,CAAC,GAAW,EAAE,IAAY;IAClD,KAAK,MAAM,MAAM,IAAI,YAAY,EAAE,CAAC;QACnC,MAAM,GAAG,GAAG,WAAW,CAAC,MAAM,EAAE,GAAG,IAAI,KAAK,CAAC,CAAC;QAC9C,IAAI,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC;YAChC,OAAO,GAAG,CAAC;QACZ,CAAC;IACF,CAAC;IACD,OAAO,SAAS,CAAC;AAClB,CAAC;AAED,4EAA4E;AAE5E,SAAS,OAAO,CACf,IAAc,EACd,GAAW,EACX,GAAkC;IAElC,OAAO,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,EAAC,GAAG,EAAC,CAAC,CAAC;AACrC,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,8BAA8B,CAC7C,KAAwB;IAExB,MAAM,EAAC,GAAG,EAAE,IAAI,EAAE,GAAG,EAAC,GAAG,KAAK,CAAC;IAC/B,oEAAoE;IACpE,8DAA8D;IAC9D,MAAM,QAAQ,GAAG,OAAO,CACvB,CAAC,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,IAAI,CAAC,EAC1C,GAAG,EACH,GAAG,CACH,CAAC;IACF,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC3B,OAAO,EAAE,CAAC;IACX,CAAC;IACD,MAAM,IAAI,GAAG,OAAO,CACnB;QACC,cAAc;QACd,yCAAyC;QACzC,kBAAkB;KAClB,EACD,GAAG,EACH,GAAG,CACH,CAAC;IACF,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO,EAAE,CAAC;IACX,CAAC;IACD,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM;SACvB,KAAK,CAAC,IAAI,CAAC;SACX,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;SACpB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;IAC1B,MAAM,QAAQ,GAAyB,EAAE,CAAC;IAC1C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QAC1B,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAChC,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;YAClB,SAAS;QACV,CAAC;QACD,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;QACjC,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QACzC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;YAC9B,SAAS;QACV,CAAC;QACD,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACvC,IAAI,IAAI,KAAK,EAAE,EAAE,CAAC;YACjB,SAAS;QACV,CAAC;QACD,mEAAmE;QACnE,+BAA+B;QAC/B,MAAM,KAAK,GAAG,OAAO,CAAC,CAAC,YAAY,EAAE,eAAe,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAC5E,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxB,QAAQ,CAAC,IAAI,CAAC,EAAC,GAAG,EAAE,IAAI,EAAE,GAAG,EAAC,CAAC,CAAC;QACjC,CAAC;IACF,CAAC;IACD,OAAO,QAAQ,CAAC;AACjB,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,yBAAyB,CACxC,KAA4B;IAE5B,MAAM,EAAC,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAC,GAAG,KAAK,CAAC;IACtC,MAAM,MAAM,GAAG,GAAG,CACjB,KAAK,EACL;QACC,IAAI;QACJ,MAAM;QACN,SAAS;QACT,MAAM;QACN,QAAQ;QACR,IAAI;QACJ,SAAS;QACT,KAAK;QACL,QAAQ;QACR,oCAAoC;KACpC,EACD,GAAG,EACH,EAAC,GAAG,EAAC,CACL,CAAC;IACF,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,IAAI,GAAG,EAAE,CAAC;IAClB,CAAC;IACD,IAAI,MAAe,CAAC;IACpB,IAAI,CAAC;QACJ,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACpC,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,IAAI,GAAG,EAAE,CAAC;IAClB,CAAC;IACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAC5B,OAAO,IAAI,GAAG,EAAE,CAAC;IAClB,CAAC;IACD,MAAM,GAAG,GAAG,IAAI,GAAG,EAAoC,CAAC;IACxD,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;QAC1B,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;YAC7C,SAAS;QACV,CAAC;QACD,MAAM,CAAC,GAAG,GAA8B,CAAC;QACzC,MAAM,WAAW,GAAG,OAAO,CAAC,CAAC,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3E,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;QACnE,IAAI,WAAW,KAAK,EAAE,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YAChD,SAAS;QACV,CAAC;QACD,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE;YACpB,MAAM;YACN,GAAG,EAAE,OAAO,CAAC,CAAC,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS;YAClD,KAAK,EAAE,OAAO,CAAC,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;YACxD,KAAK,EAAE,OAAO,CAAC,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;SACxD,CAAC,CAAC;IACJ,CAAC;IACD,OAAO,GAAG,CAAC;AACZ,CAAC"}
+{"version":3,"file":"merge-question-surfacer.js","sourceRoot":"","sources":["../src/merge-question-surfacer.ts"],"names":[],"mappings":"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"}

package/dist/merge-question-tick.d.ts

@@ -0,0 +1,64 @@
+import type { MergeQuestions } from './config.js';
+import { type LockEntry } from './item-lock.js';
+import { type SurfaceMergeQuestionsOptions, type SurfaceMergeQuestionsResult } from './merge-question-surfacer.js';
+/**
+ * The **merge-question TICK** (task `wire-merge-questions-into-the-advance-tick`):
+ * the one production caller of {@link surfaceMergeQuestions}, behind the
+ * `mergeQuestions: off | ask` gate. Surfacing is deterministic (it reads runner
+ * state, no agent), so it runs as its own step rather than as a rung of the
+ * per-item tick:
+ *
+ *   - the laptop bare `advance` runs it before selecting (`advance-drivers.ts`);
+ *   - CI runs it as the no-agent `surface-merge-questions` job of the generated
+ *     `advance-lifecycle` workflow, through `dorfl surface-merge-questions`
+ *     (decision 5). The read-only `enumerate` job does not run it.
+ *
+ * One pass: fetch the arbiter (so the listing sees its current work branches),
+ * read the held item locks STRICTLY (a lock that cannot be read must not look
+ * like "no live build"), run the surfacer in `cwd` (each question is its own
+ * local commit on `HEAD`, via `persistSurfacedQuestions`), then publish those
+ * commits to `<arbiter>/main` through the tree-less publish seam (re-fetch and
+ * rebase on a race, never `--force`).
+ */
+/** Options of {@link runMergeQuestionTick}. */
+export interface MergeQuestionTickOptions {
+    /** The working clone (checked out on `main`) the questions are committed in. */
+    cwd: string;
+    /** The arbiter remote NAME in `cwd`. */
+    arbiter: string;
+    /** The resolved `mergeQuestions` gate. `off` ⇒ nothing runs. */
+    mergeQuestions: MergeQuestions;
+    /** The base branch. Default `main`. */
+    base?: string;
+    /**
+     * Push the surfaced questions to `<arbiter>/main`. Default `true`. The laptop
+     * tick passes `false` when it has no arbiter configured (its checkout sits on
+     * the real `main`).
+     */
+    publish?: boolean;
+    /** The `gh` binary for the open-PR listing (GitHub arbiters). */
+    ghBin?: string;
+    env?: NodeJS.ProcessEnv;
+    note?: (message: string) => void;
+    /** Seam: the surfacer (tests). */
+    surface?: (options: SurfaceMergeQuestionsOptions) => SurfaceMergeQuestionsResult;
+    /** Seam: the strict lock read (tests). */
+    readLocks?: (cwd: string, arbiter: string, env: NodeJS.ProcessEnv | undefined) => Promise<LockEntry[]>;
+}
+/** What one {@link runMergeQuestionTick} pass did. */
+export interface MergeQuestionTickResult {
+    /** `false` when the gate is `off` or a read failed (nothing surfaced). */
+    ran: boolean;
+    /**
+     * `true` when a read the pass depends on failed (fetch, lock refs, or the
+     * open-PR listing of a GitHub arbiter).
+     */
+    failed: boolean;
+    /** The surfacer's result, when it ran. */
+    result?: SurfaceMergeQuestionsResult;
+    /** A one-paragraph summary for the log. */
+    message: string;
+}
+/** Run one merge-question pass (see the module doc). Never throws. */
+export declare function runMergeQuestionTick(options: MergeQuestionTickOptions): Promise<MergeQuestionTickResult>;
+//# sourceMappingURL=merge-question-tick.d.ts.map

package/dist/merge-question-tick.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-question-tick.d.ts","sourceRoot":"","sources":["../src/merge-question-tick.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,aAAa,CAAC;AAChD,OAAO,EAA4B,KAAK,SAAS,EAAC,MAAM,gBAAgB,CAAC;AACzE,OAAO,EAEN,KAAK,4BAA4B,EACjC,KAAK,2BAA2B,EAChC,MAAM,8BAA8B,CAAC;AAGtC;;;;;;;;;;;;;;;;;;GAkBG;AAEH,+CAA+C;AAC/C,MAAM,WAAW,wBAAwB;IACxC,gFAAgF;IAChF,GAAG,EAAE,MAAM,CAAC;IACZ,wCAAwC;IACxC,OAAO,EAAE,MAAM,CAAC;IAChB,gEAAgE;IAChE,cAAc,EAAE,cAAc,CAAC;IAC/B,uCAAuC;IACvC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,iEAAiE;IACjE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACjC,kCAAkC;IAClC,OAAO,CAAC,EAAE,CACT,OAAO,EAAE,4BAA4B,KACjC,2BAA2B,CAAC;IACjC,0CAA0C;IAC1C,SAAS,CAAC,EAAE,CACX,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,MAAM,CAAC,UAAU,GAAG,SAAS,KAC9B,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;CAC1B;AAED,sDAAsD;AACtD,MAAM,WAAW,uBAAuB;IACvC,0EAA0E;IAC1E,GAAG,EAAE,OAAO,CAAC;IACb;;;OAGG;IACH,MAAM,EAAE,OAAO,CAAC;IAChB,0CAA0C;IAC1C,MAAM,CAAC,EAAE,2BAA2B,CAAC;IACrC,2CAA2C;IAC3C,OAAO,EAAE,MAAM,CAAC;CAChB;AAED,sEAAsE;AACtE,wBAAsB,oBAAoB,CACzC,OAAO,EAAE,wBAAwB,GAC/B,OAAO,CAAC,uBAAuB,CAAC,CAqGlC"}

package/dist/merge-question-tick.js

@@ -0,0 +1,96 @@
+import { runAsync } from './git.js';
+import { listItemLockEntriesStrict } from './item-lock.js';
+import { surfaceMergeQuestions, } from './merge-question-surfacer.js';
+import { refWrite } from './ref-write.js';
+/** Run one merge-question pass (see the module doc). Never throws. */
+export async function runMergeQuestionTick(options) {
+    const { cwd, arbiter, env } = options;
+    const note = options.note ?? (() => { });
+    if (options.mergeQuestions === 'off') {
+        return {
+            ran: false,
+            failed: false,
+            message: 'mergeQuestions is off: no merge question is surfaced.',
+        };
+    }
+    const url = await runAsync('git', ['remote', 'get-url', arbiter], cwd, {
+        env,
+    });
+    const arbiterUrl = url.status === 0 ? url.stdout.trim() : undefined;
+    let locks = [];
+    if (arbiterUrl !== undefined) {
+        // The arbiter's CURRENT work branches (the floor reads the remote-tracking
+        // refs of a clone) and `main` (the reachability base).
+        const fetched = await runAsync('git', ['fetch', '--prune', '--quiet', arbiter], cwd, { env });
+        if (fetched.status !== 0) {
+            return {
+                ran: false,
+                failed: true,
+                message: `merge questions: fetching ${arbiter} failed (${fetched.stderr.trim()}); nothing surfaced.`,
+            };
+        }
+        try {
+            locks = await (options.readLocks ?? listItemLockEntriesStrict)(cwd, arbiter, env);
+        }
+        catch (err) {
+            const detail = err instanceof Error ? err.message : String(err);
+            return {
+                ran: false,
+                failed: true,
+                message: `merge questions: the item locks on ${arbiter} could not be read (${detail}); nothing surfaced.`,
+            };
+        }
+    }
+    const result = (options.surface ?? surfaceMergeQuestions)({
+        cwd,
+        arbiterUrl,
+        arbiter,
+        base: options.base,
+        ghBin: options.ghBin,
+        env,
+        note,
+        locks,
+    });
+    for (const s of result.skipped) {
+        note(`merge question: not asked about ${s.ref} (${s.reason}).`);
+    }
+    for (const s of result.surfaced) {
+        note(`merge question: asked about ${s.ref} (${s.sidecarPath}).`);
+    }
+    // A GitHub arbiter whose open PRs could not be listed: the surfacer asked
+    // about no branch (it cannot tell which have an open PR). Report the pass as
+    // FAILED so it is visible (gate-3 of PR #459: an uncredentialed `gh` in CI
+    // otherwise skipped every branch as `pr-state-unknown` with exit 0).
+    if (result.prListingError !== undefined) {
+        return {
+            ran: true,
+            failed: true,
+            result,
+            message: `merge questions: the open PRs on ${arbiter} could not be listed ` +
+                `(${result.prListingError}); no merge question was asked. Give gh a ` +
+                'credential (GH_TOKEN) that can read pull requests.',
+        };
+    }
+    if (result.surfaced.length > 0 &&
+        options.publish !== false &&
+        arbiterUrl !== undefined) {
+        await refWrite.publishTreelessResult({
+            cwd,
+            arbiter,
+            // The same large liveness ceiling the in-place tree-less publish uses: a
+            // clean re-rebase never counts against a small budget.
+            retries: 1000,
+            env,
+            note,
+        });
+    }
+    return {
+        ran: true,
+        failed: false,
+        result,
+        message: `merge questions: ${result.surfaced.length} surfaced, ` +
+            `${result.skipped.length} not asked, of ${result.considered} unmerged ` +
+            'work branch(es).',
+    };
+}
+//# sourceMappingURL=merge-question-tick.js.map