@on-par/factory-core 0.9.28-next.9 → 0.9.29-next.1

package/dist/phases/ship-git.d.ts

@@ -1,82 +1,7 @@
-export type CommandRunner = (command: string, options?: {
-    cwd?: string;
-    timeout?: number;
-}) => Promise<{
-    stdout: string;
-}>;
+import type { CommandRunner } from './ship-git-detail.js';
 /** Wraps a runner so no command starts once the lane's claim is lost (#3146): push and remote-head checks refuse to run. */
 export declare function claimGuardedRunner(signal: AbortSignal, run?: CommandRunner): CommandRunner;
-/** Why a `git push` was refused, as far as git's own stderr says (#733). */
-export type PushFailureKind = 'non-fast-forward' | 'network' | 'unknown';
-/**
- * The real reason a push failed, from git's own stderr when the runner exposes it
- * (node's promisified `exec` rejection carries `stderr`), else the Error message, else the
- * value's string form. Flattened to one line and bounded so a single event row stays
- * greppable in `.factory/events.ndjson`.
- */
-export declare function describePushFailure(err: unknown): {
-    kind: PushFailureKind;
-    detail: string;
-};
-/** The result of comparing the pushed branch's remote head against local HEAD (#735). */
-type RemoteHeadCheck = {
-    status: 'match';
-    localSha: string;
-    remoteSha: string;
-} | {
-    status: 'mismatch';
-    localSha: string;
-    remoteSha: string;
-} | {
-    status: 'unreadable';
-    localSha?: string;
-    remoteSha?: string;
-    detail: string;
-};
-/** Prefer stderr, then stdout, before the error fallback; keep details flattened and bounded. */
-export declare function shortDetail(err: unknown): string;
-/** origin/<branch>'s current SHA, `null` when the branch is absent, or the failure detail (#1869). */
-export declare function readRemoteBranchSha(run: CommandRunner, worktree: string, branch: string): Promise<{
-    status: 'ok';
-    sha: string | null;
-} | {
-    status: 'unreadable';
-    detail: string;
-}>;
-/**
- * A zero-exit push is not proof the remote branch actually carries this run's commits — a
- * concurrent push or an update that silently applied nothing leaves the remote head elsewhere,
- * and a PR opened against it would advertise work that is not there (#735).
- */
-export declare function verifyRemoteHead(run: CommandRunner, worktree: string, branch: string): Promise<RemoteHeadCheck>;
-/** Whether origin's head is an ancestor of local HEAD, i.e. a plain push is a fast-forward (#1815). */
-export type RemoteAncestry = {
-    status: 'ancestor';
-} | {
-    status: 'diverged';
-} | {
-    status: 'unreadable';
-    detail: string;
-};
-export declare function checkRemoteIsAncestor(run: CommandRunner, worktree: string, remoteSha: string, localSha: string): Promise<RemoteAncestry>;
-/** Outcome of one push followed by a remote-head check, the single verified push site for SHIP (#734/#735/#1813). */
-export type VerifiedPush = {
-    status: 'pushed';
-    localSha: string;
-    remoteSha: string;
-} | {
-    status: 'push-failed';
-    kind: PushFailureKind;
-    detail: string;
-} | {
-    status: 'mismatch';
-    localSha: string;
-    remoteSha: string;
-} | {
-    status: 'unreadable';
-    localSha?: string;
-    detail: string;
-};
-export declare function pushAndVerifyRemoteHead(run: CommandRunner, worktree: string, branch: string, pushCmd: string): Promise<VerifiedPush>;
-export {};
+export type { CommandRunner } from './ship-git-detail.js';
+export { checkRemoteIsAncestor, describePushFailure, shortDetail } from './ship-git-detail.js';
+export { pushAndVerifyRemoteHead, readRemoteBranchSha, verifyRemoteHead } from './ship-git-remote.js';
 //# sourceMappingURL=ship-git.d.ts.map

package/dist/phases/ship-git.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ship-git.d.ts","sourceRoot":"","sources":["../../src/phases/ship-git.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ship-git.d.ts","sourceRoot":"","sources":["../../src/phases/ship-git.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAI1D,4HAA4H;AAC5H,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,GAAE,aAA0B,GAAG,aAAa,CAKtG;AAED,YAAY,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAC/F,OAAO,EAAE,uBAAuB,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC"}

package/dist/phases/ship-git.js

@@ -1,7 +1,6 @@
 // packages/core/src/phases/ship-git.ts — push-failure and remote-head helpers for SHIP
 import { exec as execCb } from 'node:child_process';
 import { promisify } from 'node:util';
-import { shellEscape } from '../utils/index.js';
 const defaultRun = promisify(execCb);
 /** Wraps a runner so no command starts once the lane's claim is lost (#3146): push and remote-head checks refuse to run. */
 export function claimGuardedRunner(signal, run = defaultRun) {
@@ -10,138 +9,6 @@ export function claimGuardedRunner(signal, run = defaultRun) {
         return run(command, options);
     };
 }
-/** Bound on the failure text copied into one NDJSON event row. */
-const MAX_PUSH_ERROR_DETAIL = 400;
-const NON_FAST_FORWARD_MARKERS = [
-    'non-fast-forward',
-    '! [rejected]',
-    'fetch first',
-    'updates were rejected',
-    'stale info',
-];
-const NETWORK_MARKERS = [
-    'could not resolve host',
-    'failed to connect',
-    'connection timed out',
-    'connection refused',
-    'network is unreachable',
-    'operation timed out',
-    'the remote end hung up unexpectedly',
-];
-function classifyPushFailure(text) {
-    const t = text.toLowerCase();
-    if (NON_FAST_FORWARD_MARKERS.some((m) => t.includes(m)))
-        return 'non-fast-forward';
-    if (NETWORK_MARKERS.some((m) => t.includes(m)))
-        return 'network';
-    return 'unknown';
-}
-/**
- * The real reason a push failed, from git's own stderr when the runner exposes it
- * (node's promisified `exec` rejection carries `stderr`), else the Error message, else the
- * value's string form. Flattened to one line and bounded so a single event row stays
- * greppable in `.factory/events.ndjson`.
- */
-export function describePushFailure(err) {
-    const raw = err?.stderr;
-    const stderr = typeof raw === 'string' ? raw : '';
-    const text = stderr.trim() || (err instanceof Error ? err.message : String(err));
-    const detail = text.replace(/\s+/g, ' ').trim().slice(0, MAX_PUSH_ERROR_DETAIL);
-    return { kind: classifyPushFailure(detail), detail: detail || 'no error output' };
-}
-/** Bound on the ls-remote failure text copied into one NDJSON event row (#735). */
-const MAX_REMOTE_HEAD_DETAIL = 200;
-/** Prefer stderr, then stdout, before the error fallback; keep details flattened and bounded. */
-export function shortDetail(err) {
-    const output = err;
-    const rawStderr = output?.stderr;
-    const rawStdout = output?.stdout;
-    const stderr = typeof rawStderr === 'string' ? rawStderr.trim() : '';
-    const stdout = typeof rawStdout === 'string' ? rawStdout.trim() : '';
-    const text = stderr || stdout || (err instanceof Error ? err.message : String(err));
-    return text.replace(/\s+/g, ' ').trim().slice(0, MAX_REMOTE_HEAD_DETAIL) || 'no error output';
-}
-/** The SHA on the `refs/heads/<branch>` line of `git ls-remote` output. `--heads origin <branch>`
- *  is a suffix pattern, so it can list more than one ref — match the ref name exactly rather than
- *  trusting the first line. */
-function parseRemoteHeadSha(stdout, branch) {
-    for (const line of stdout.split('\n')) {
-        const [sha, ref] = line.trim().split(/\s+/);
-        if (ref === `refs/heads/${branch}` && sha)
-            return sha;
-    }
-    return undefined;
-}
-/** origin/<branch>'s current SHA, `null` when the branch is absent, or the failure detail (#1869). */
-export async function readRemoteBranchSha(run, worktree, branch) {
-    try {
-        const { stdout } = await run(`git ls-remote --heads origin ${shellEscape(branch)}`, { cwd: worktree });
-        return { status: 'ok', sha: parseRemoteHeadSha(stdout, branch) ?? null };
-    }
-    catch (err) {
-        return { status: 'unreadable', detail: shortDetail(err) };
-    }
-}
-/**
- * A zero-exit push is not proof the remote branch actually carries this run's commits — a
- * concurrent push or an update that silently applied nothing leaves the remote head elsewhere,
- * and a PR opened against it would advertise work that is not there (#735).
- */
-export async function verifyRemoteHead(run, worktree, branch) {
-    let localSha;
-    try {
-        const { stdout } = await run('git rev-parse HEAD', { cwd: worktree });
-        localSha = stdout.trim();
-    }
-    catch (err) {
-        return { status: 'unreadable', detail: shortDetail(err) };
-    }
-    if (!localSha)
-        return { status: 'unreadable', detail: 'git rev-parse HEAD produced no SHA' };
-    let listing;
-    try {
-        const { stdout } = await run(`git ls-remote --heads origin ${shellEscape(branch)}`, { cwd: worktree });
-        listing = stdout;
-    }
-    catch (err) {
-        return { status: 'unreadable', localSha, detail: shortDetail(err) };
-    }
-    const remoteSha = parseRemoteHeadSha(listing, branch);
-    if (!remoteSha)
-        return { status: 'unreadable', localSha, detail: `no refs/heads/${branch} on origin` };
-    return remoteSha === localSha
-        ? { status: 'match', localSha, remoteSha }
-        : { status: 'mismatch', localSha, remoteSha };
-}
-const MISSING_OBJECT_MARKERS = ['not a valid object name', 'not a valid commit', 'bad object', 'unknown revision'];
-export async function checkRemoteIsAncestor(run, worktree, remoteSha, localSha) {
-    try {
-        await run(`git merge-base --is-ancestor ${shellEscape(remoteSha)} ${shellEscape(localSha)}`, { cwd: worktree });
-        return { status: 'ancestor' };
-    }
-    catch (err) {
-        // Exit 1 is git's documented "not an ancestor"; other non-zero statuses are errors.
-        if (err?.code === 1)
-            return { status: 'diverged' };
-        const detail = shortDetail(err);
-        // A remote commit absent from the local object store cannot be contained in local HEAD.
-        if (MISSING_OBJECT_MARKERS.some((marker) => detail.toLowerCase().includes(marker)))
-            return { status: 'diverged' };
-        return { status: 'unreadable', detail };
-    }
-}
-export async function pushAndVerifyRemoteHead(run, worktree, branch, pushCmd) {
-    try {
-        await run(pushCmd, { cwd: worktree });
-    }
-    catch (err) {
-        return { status: 'push-failed', ...describePushFailure(err) };
-    }
-    const head = await verifyRemoteHead(run, worktree, branch);
-    if (head.status === 'match')
-        return { status: 'pushed', localSha: head.localSha, remoteSha: head.remoteSha };
-    if (head.status === 'mismatch')
-        return head;
-    return { status: 'unreadable', localSha: head.localSha, detail: head.detail };
-}
+export { checkRemoteIsAncestor, describePushFailure, shortDetail } from './ship-git-detail.js';
+export { pushAndVerifyRemoteHead, readRemoteBranchSha, verifyRemoteHead } from './ship-git-remote.js';
 //# sourceMappingURL=ship-git.js.map

package/dist/phases/ship-git.js.map

@@ -1 +1 @@
-{"version":3,"file":"ship-git.js","sourceRoot":"","sources":["../../src/phases/ship-git.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ship-git.js","sourceRoot":"","sources":["../../src/phases/ship-git.ts"],"names":[],"mappings":"AAAA,uFAAuF;AAEvF,OAAO,EAAE,IAAI,IAAI,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAItC,MAAM,UAAU,GAAkB,SAAS,CAAC,MAAM,CAAC,CAAC;AAEpD,4HAA4H;AAC5H,MAAM,UAAU,kBAAkB,CAAC,MAAmB,EAAE,GAAG,GAAkB,UAAU;IACrF,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE;QAC1B,MAAM,CAAC,cAAc,EAAE,CAAC;QACxB,OAAO,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC/B,CAAC,CAAC;AACJ,CAAC;AAGD,OAAO,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAC/F,OAAO,EAAE,uBAAuB,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC"}

package/dist/phases/ship-main-sync.d.ts

@@ -0,0 +1,18 @@
+import { type LandSyncOptions, type LandSyncResult } from '../land/sync.js';
+import type { CommandRunner } from './ship-git.js';
+import type { ShipPhaseOptions } from './ship-options.js';
+/**
+ * Merges origin/main into `branch` in `worktree` and returns the SHA CHECK ran on (HEAD before the
+ * merge), for the evidence pack. A sync that cannot finish is aborted, logged, and the branch ships
+ * unsynced, exactly as it would have without this step.
+ */
+export declare function syncShipBranchWithMain(ctx: {
+    run: CommandRunner;
+    worktree: string;
+    branch: string;
+    log: ShipPhaseOptions['log'];
+    sync?: (opts: LandSyncOptions) => Promise<LandSyncResult>;
+}): Promise<{
+    checkedSha?: string;
+}>;
+//# sourceMappingURL=ship-main-sync.d.ts.map

package/dist/phases/ship-main-sync.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ship-main-sync.d.ts","sourceRoot":"","sources":["../../src/phases/ship-main-sync.ts"],"names":[],"mappings":"AAOA,OAAO,EAAkB,KAAK,eAAe,EAAE,KAAK,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAC5F,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAE1D;;;;GAIG;AACH,wBAAsB,sBAAsB,CAAC,GAAG,EAAE;IAChD,GAAG,EAAE,aAAa,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,gBAAgB,CAAC,KAAK,CAAC,CAAC;IAC7B,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,eAAe,KAAK,OAAO,CAAC,cAAc,CAAC,CAAC;CAC3D,GAAG,OAAO,CAAC;IAAE,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAmBnC"}

package/dist/phases/ship-main-sync.js

@@ -0,0 +1,34 @@
+// packages/core/src/phases/ship-main-sync.ts — merge origin/main into the branch before SHIP pushes it
+//
+// A lane builds from the main it started on; sibling PRs that merge meanwhile (each adding a
+// CHANGELOG bullet) leave the new PR conflicting. GitHub runs no pull_request CI on a conflicting PR,
+// so SHIP's CI watch timed out and stranded a draft. Syncing first, with land's CHANGELOG and ADR
+// index auto-resolution, opens the PR mergeable so CI runs.
+import { syncLandBranch } from '../land/sync.js';
+/**
+ * Merges origin/main into `branch` in `worktree` and returns the SHA CHECK ran on (HEAD before the
+ * merge), for the evidence pack. A sync that cannot finish is aborted, logged, and the branch ships
+ * unsynced, exactly as it would have without this step.
+ */
+export async function syncShipBranchWithMain(ctx) {
+    const { run, worktree, branch, log } = ctx;
+    const head = async () => (await run('git rev-parse HEAD', { cwd: worktree })).stdout.trim() || undefined;
+    let checkedSha;
+    try {
+        checkedSha = await head();
+        const result = await (ctx.sync ?? syncLandBranch)({ worktree, branch, run, log });
+        if (!result.ok) {
+            log('ship', `could not sync ${branch} with origin/main before push (${result.message}); pushing it unsynced`);
+            return { checkedSha };
+        }
+        const synced = await head();
+        if (synced !== checkedSha)
+            log('ship', `merged origin/main into ${branch} before push (now ${synced?.slice(0, 12)})`);
+    }
+    catch (err) {
+        const detail = err instanceof Error ? err.message : String(err);
+        log('ship', `could not sync ${branch} with origin/main before push (${detail}); pushing it unsynced`);
+    }
+    return { checkedSha };
+}
+//# sourceMappingURL=ship-main-sync.js.map

package/dist/phases/ship-main-sync.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ship-main-sync.js","sourceRoot":"","sources":["../../src/phases/ship-main-sync.ts"],"names":[],"mappings":"AAAA,uGAAuG;AACvG,EAAE;AACF,6FAA6F;AAC7F,sGAAsG;AACtG,kGAAkG;AAClG,4DAA4D;AAE5D,OAAO,EAAE,cAAc,EAA6C,MAAM,iBAAiB,CAAC;AAI5F;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,GAM5C;IACC,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC;IAC3C,MAAM,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,oBAAoB,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,SAAS,CAAC;IACzG,IAAI,UAA8B,CAAC;IACnC,IAAI,CAAC;QACH,UAAU,GAAG,MAAM,IAAI,EAAE,CAAC;QAC1B,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,IAAI,cAAc,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;QAClF,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;YACf,GAAG,CAAC,MAAM,EAAE,kBAAkB,MAAM,kCAAkC,MAAM,CAAC,OAAO,wBAAwB,CAAC,CAAC;YAC9G,OAAO,EAAE,UAAU,EAAE,CAAC;QACxB,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,IAAI,EAAE,CAAC;QAC5B,IAAI,MAAM,KAAK,UAAU;YACvB,GAAG,CAAC,MAAM,EAAE,2BAA2B,MAAM,qBAAqB,MAAM,EAAE,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC;IAC/F,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,MAAM,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAChE,GAAG,CAAC,MAAM,EAAE,kBAAkB,MAAM,kCAAkC,MAAM,wBAAwB,CAAC,CAAC;IACxG,CAAC;IACD,OAAO,EAAE,UAAU,EAAE,CAAC;AACxB,CAAC"}

package/dist/phases/ship-open-pr.d.ts

@@ -0,0 +1,24 @@
+import type { WorkRequest } from '../work/index.js';
+import { type WorkKey } from '../work/work-key.js';
+import { type ShipPhaseOptions } from './ship-options.js';
+import type { ShipResult } from './ship-types.js';
+import type { lazyWalkthrough } from './ship-walkthrough.js';
+import { type StackPosition } from './stack-order.js';
+export declare function openOrFindPr(ctx: {
+    opts: ShipPhaseOptions;
+    inlineWork: Pick<WorkRequest, 'id' | 'kind' | 'title' | 'reference'> | undefined;
+    ticket: {
+        key: WorkKey;
+        title: string;
+    } | undefined;
+    stack: StackPosition | undefined;
+    base: string;
+    owner: string;
+    repoName: string;
+    walkthrough: ReturnType<typeof lazyWalkthrough>;
+}): Promise<{
+    stop: ShipResult;
+} | {
+    prNumber: number;
+}>;
+//# sourceMappingURL=ship-open-pr.d.ts.map

package/dist/phases/ship-open-pr.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ship-open-pr.d.ts","sourceRoot":"","sources":["../../src/phases/ship-open-pr.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAiB,KAAK,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAClE,OAAO,EAAoB,KAAK,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAG5E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAgD,KAAK,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEpG,wBAAsB,YAAY,CAAC,GAAG,EAAE;IACtC,IAAI,EAAE,gBAAgB,CAAC;IACvB,UAAU,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,GAAG,MAAM,GAAG,OAAO,GAAG,WAAW,CAAC,GAAG,SAAS,CAAC;IACjF,MAAM,EAAE;QAAE,GAAG,EAAE,OAAO,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,CAAC;IACpD,KAAK,EAAE,aAAa,GAAG,SAAS,CAAC;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC;CACjD,GAAG,OAAO,CAAC;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,CAmEvD"}

package/dist/phases/ship-open-pr.js

@@ -0,0 +1,75 @@
+// packages/core/src/phases/ship-open-pr.ts — SHIP draft PR creation and already-exists recovery
+import { briefSummaryLine, renderPrBody, stripBriefIds } from '../reports/pr-body.js';
+import { issueNumberOf } from '../work/work-key.js';
+import { SHIP_BASE_BRANCH } from './ship-options.js';
+import { findOpenPR, isPullAlreadyExistsError } from './ship-pr-lookup.js';
+import { readRisk, readSpecBody } from './ship-spec.js';
+import { prerequisiteStackOrder, renderStackOrderLine } from './stack-order.js';
+export async function openOrFindPr(ctx) {
+    const { opts, inlineWork, ticket, stack, base, owner, repoName, walkthrough } = ctx;
+    const { octokit, issue, branch, checkSummary, log } = opts;
+    let prNumber;
+    // Get title from issue (skipped for a non-github work source — no such issue exists)
+    const title = inlineWork
+        ? inlineWork.title
+        : ticket
+            ? ticket.title
+            : (await octokit.rest.issues.get({ owner, repo: repoName, issue_number: issueNumberOf(issue) })).data.title;
+    const slice = inlineWork ? undefined : opts.slice;
+    const ref = ticket ? ticket.key : `#${issue}`;
+    const finalSlice = !slice || slice.index >= slice.count;
+    // A brief is a local file reviewers cannot open, so the body describes it by its title and links the
+    // open PR it builds on (a --stack or --base-branch base), never its id, digest or path.
+    const basePr = inlineWork && base !== SHIP_BASE_BRANCH ? await findOpenPR(octokit, owner, repoName, base) : undefined;
+    const summaryLine = inlineWork
+        ? briefSummaryLine(title, basePr?.status === 'found' ? basePr.prNumber : undefined)
+        : slice
+            ? `Implements slice ${slice.index}/${slice.count} of ${ref}.`
+            : `Implements ${ref}.`;
+    const prTitle = inlineWork
+        ? stripBriefIds(title)
+        : slice
+            ? `${title} — slice ${slice.index}/${slice.count} (${ref})`
+            : `${title} (${ref})`;
+    // Create PR
+    try {
+        const { data: pr } = await octokit.rest.pulls.create({
+            owner,
+            repo: repoName,
+            head: branch,
+            base,
+            title: prTitle,
+            draft: true,
+            body: renderPrBody({
+                summaryLine,
+                footer: opts.footer,
+                stackOrder: stack ? renderStackOrderLine(stack) : prerequisiteStackOrder(opts.prerequisiteStack, issue, base),
+                specBody: await readSpecBody(opts.specPath),
+                checkSummary,
+                reworkRounds: opts.reworkRounds,
+                risk: await readRisk(opts.specPath),
+                walkthrough: await walkthrough.walkthrough(),
+                typescriptLines: await walkthrough.counts(),
+                closes: inlineWork || !finalSlice ? undefined : (ticket?.key ?? issue),
+                partOf: !inlineWork && !finalSlice ? (ticket?.key ?? issue) : undefined,
+                tracker: ticket ? 'linear' : undefined,
+            }),
+        });
+        prNumber = pr.number;
+        log('pr_opened', `opened PR #${prNumber} for committed work on ${branch} (base ${base})`);
+    }
+    catch (err) {
+        if (!isPullAlreadyExistsError(err))
+            throw err;
+        const existing = await findOpenPR(octokit, owner, repoName, branch);
+        if (existing.status !== 'found') {
+            const reason = `pulls.create reported an existing PR for ${branch} but re-querying did not find it (${existing.status === 'error' ? existing.detail : 'no open PR listed'})`;
+            log('ship', `${reason} — aborting`);
+            return { stop: { ok: false, reason } };
+        }
+        prNumber = existing.prNumber;
+        log('recovered', `PR #${prNumber} already existed for ${branch}; reusing it`);
+    }
+    return { prNumber };
+}
+//# sourceMappingURL=ship-open-pr.js.map

package/dist/phases/ship-open-pr.js.map

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

package/dist/phases/ship-options.d.ts

@@ -0,0 +1,81 @@
+import type { Octokit } from '@octokit/rest';
+import type { ApprovalGate } from '../approvals/index.js';
+import type { LifecycleBus } from '../bus/index.js';
+import type { EventKind } from '../events/kinds.js';
+import type { ReviewRouting } from '../review/routing.js';
+import type { CheckSummary } from '../types/index.js';
+import type { watchChecksWithInfraRerun } from '../utils/ci-watch.js';
+import type { WorkRequest } from '../work/index.js';
+import type { WorkKey } from '../work/work-key.js';
+import type { CommandRunner } from './ship-git.js';
+import type { PreviewGate } from './ship-preview.js';
+import type { WalkthroughShipOpts } from './ship-walkthrough.js';
+import type { PrerequisiteStackTarget } from '../queue/prerequisite-stack.js';
+import type { StackPosition } from './stack-order.js';
+/** Ship opens PRs against, and watches required checks of, this branch. */
+export declare const SHIP_BASE_BRANCH = "main";
+export interface ShipPhaseOptions {
+    issue: WorkKey;
+    repo: string;
+    worktree: string;
+    branch: string;
+    octokit: Octokit;
+    watchCI?: boolean;
+    /** Merge origin/main into the branch before pushing a PR against main (#3945). */
+    syncMain?: boolean;
+    /** Resolved pr.footer; undefined uses the default, empty string omits it. */
+    footer?: string;
+    /** Stop at the draft PR: skip mark-ready (#3449). */
+    draft?: boolean;
+    /** Post the evidence pack as a PR comment (pr.evidenceComment); default off. */
+    evidenceComment?: boolean;
+    log: (type: EventKind, msg: string) => void;
+    run?: CommandRunner;
+    /** Runs the gh rerun argv for the CI infra rescue (#2365); default runCommand. */
+    rerun?: (argv: readonly string[]) => Promise<{
+        ok: boolean;
+    }>;
+    approvalGate?: ApprovalGate;
+    checkSummary?: CheckSummary;
+    specPath?: string;
+    eventsFile?: string;
+    startedAt?: string;
+    logsDir?: string;
+    reworkRounds?: number;
+    /** PR classifier decision (#1724), rendered into the evidence pack. */
+    reviewRouting?: ReviewRouting;
+    /** Model pins that were not honored (#2511), rendered into the evidence pack. */
+    pinNotes?: string[];
+    /** The run's resolved work request; when its kind is not 'github-issue', the PR
+     *  title/body come from it instead of fetching the (nonexistent) issue (#507). */
+    work?: Pick<WorkRequest, 'id' | 'kind' | 'title' | 'reference'>;
+    /** The ADR-0147 slice this run ships; titles the PR `slice k/n` and only the final slice closes the issue. */
+    slice?: {
+        index: number;
+        count: number;
+    };
+    /** Stack-mode (ADR-0161) position: the PR opens on `stack.base` and its body names the stack order. Ignored for inline work. */
+    stack?: StackPosition;
+    /** PR base for a non-stack run started from another branch (#3764); default main. */
+    baseBranch?: string;
+    /** The open prerequisite PR this issue is stacked on (#3916): the body names the stack order and carries the marker. */
+    prerequisiteStack?: PrerequisiteStackTarget;
+    /** Lane id stamped onto emitted lifecycle events; defaults to `issue-<issue>` (#591). */
+    laneId?: string;
+    /** Lifecycle bus to emit onto; defaults to the process-wide `lifecycleBus` (#591). */
+    bus?: LifecycleBus;
+    /** origin/<branch> SHA recorded at worktree creation (#1868). When set, the new-PR push
+     *  replaces that stale head under a lease on this SHA, and fails closed if the remote moved (#1869). */
+    recordedRemoteSha?: string;
+    /** SHIP re-entry after a CI rework round (#2816): same open PR, plain push, watch the pushed SHA. */
+    reentry?: {
+        prNumber: number;
+        previousHeadSha?: string;
+    };
+    /** CI watch deadline (#3569); default DEFAULT_CI_DEADLINE_MS. */
+    ciDeadlineMs?: number;
+    walkthrough?: WalkthroughShipOpts['walkthrough'];
+    previewGate?: PreviewGate;
+    ciWatch?: typeof watchChecksWithInfraRerun;
+}
+//# sourceMappingURL=ship-options.d.ts.map

package/dist/phases/ship-options.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ship-options.d.ts","sourceRoot":"","sources":["../../src/phases/ship-options.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AACtE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AACjE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAC9E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEtD,2EAA2E;AAC3E,eAAO,MAAM,gBAAgB,SAAS,CAAC;AAEvC,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,OAAO,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,kFAAkF;IAClF,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,6EAA6E;IAC7E,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,qDAAqD;IACrD,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,gFAAgF;IAChF,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,GAAG,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5C,GAAG,CAAC,EAAE,aAAa,CAAC;IACpB,kFAAkF;IAClF,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,KAAK,OAAO,CAAC;QAAE,EAAE,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;IAC9D,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,uEAAuE;IACvE,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,iFAAiF;IACjF,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB;sFACkF;IAClF,IAAI,CAAC,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,GAAG,MAAM,GAAG,OAAO,GAAG,WAAW,CAAC,CAAC;IAChE,8GAA8G;IAC9G,KAAK,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IACzC,gIAAgI;IAChI,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,qFAAqF;IACrF,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,wHAAwH;IACxH,iBAAiB,CAAC,EAAE,uBAAuB,CAAC;IAC5C,yFAAyF;IACzF,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,sFAAsF;IACtF,GAAG,CAAC,EAAE,YAAY,CAAC;IACnB;4GACwG;IACxG,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,qGAAqG;IACrG,OAAO,CAAC,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,eAAe,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACzD,iEAAiE;IACjE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,mBAAmB,CAAC,aAAa,CAAC,CAAC;IACjD,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,OAAO,CAAC,EAAE,OAAO,yBAAyB,CAAC;CAC5C"}

package/dist/phases/ship-options.js

@@ -0,0 +1,4 @@
+// packages/core/src/phases/ship-options.ts — SHIP phase options and the base branch it ships against
+/** Ship opens PRs against, and watches required checks of, this branch. */
+export const SHIP_BASE_BRANCH = 'main';
+//# sourceMappingURL=ship-options.js.map

package/dist/phases/ship-options.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ship-options.js","sourceRoot":"","sources":["../../src/phases/ship-options.ts"],"names":[],"mappings":"AAAA,qGAAqG;AAkBrG,2EAA2E;AAC3E,MAAM,CAAC,MAAM,gBAAgB,GAAG,MAAM,CAAC"}

package/dist/phases/ship-reentry.d.ts

@@ -0,0 +1,20 @@
+import { type CommandRunner } from './ship-git.js';
+import type { ShipPhaseOptions } from './ship-options.js';
+import type { ShipResult } from './ship-types.js';
+export declare function pushReentry(ctx: {
+    run: CommandRunner;
+    worktree: string;
+    branch: string;
+    prNumber: number | undefined;
+    reentry: {
+        prNumber: number;
+        previousHeadSha?: string;
+    };
+    log: ShipPhaseOptions['log'];
+}): Promise<{
+    stop: ShipResult;
+} | {
+    watchRef: string;
+    headSha: string;
+}>;
+//# sourceMappingURL=ship-reentry.d.ts.map

package/dist/phases/ship-reentry.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ship-reentry.d.ts","sourceRoot":"","sources":["../../src/phases/ship-reentry.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,aAAa,EAAsD,MAAM,eAAe,CAAC;AACvG,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAElD,wBAAsB,WAAW,CAAC,GAAG,EAAE;IACrC,GAAG,EAAE,aAAa,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,OAAO,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,eAAe,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACxD,GAAG,EAAE,gBAAgB,CAAC,KAAK,CAAC,CAAC;CAC9B,GAAG,OAAO,CAAC;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CAyCxE"}

package/dist/phases/ship-reentry.js

@@ -0,0 +1,47 @@
+// packages/core/src/phases/ship-reentry.ts — SHIP re-entry push after a CI rework round
+import { shellEscape } from '../utils/index.js';
+import { describePushFailure, shortDetail, verifyRemoteHead } from './ship-git.js';
+export async function pushReentry(ctx) {
+    const { run, worktree, branch, prNumber, reentry, log } = ctx;
+    if (prNumber !== reentry.prNumber) {
+        const reason = `re-entry expected open PR #${reentry.prNumber} for ${branch} but found ${prNumber === undefined ? 'none' : `#${prNumber}`}`;
+        log('ship', reason);
+        return { stop: { ok: false, reason } };
+    }
+    let localSha;
+    try {
+        localSha = (await run('git rev-parse HEAD', { cwd: worktree })).stdout.trim();
+    }
+    catch (err) {
+        const reason = `could not read local HEAD on re-entry (${shortDetail(err)})`;
+        log('ship', reason);
+        return { stop: { ok: false, prNumber, reason } };
+    }
+    if (localSha && localSha === reentry.previousHeadSha) {
+        const reason = `CI rework produced no new commit on ${branch}`;
+        log('ship', reason);
+        return { stop: { ok: false, prNumber, ciOutcome: 'failure', reason, headSha: localSha } };
+    }
+    try {
+        await run(`git push origin ${shellEscape(branch)}`, { cwd: worktree });
+    }
+    catch (err) {
+        const { kind, detail } = describePushFailure(err);
+        const reason = `re-entry push of ${branch} failed (${kind}): ${detail}`;
+        log('ship', reason);
+        return { stop: { ok: false, prNumber, reason } };
+    }
+    const remoteHead = await verifyRemoteHead(run, worktree, branch);
+    if (remoteHead.status !== 'match') {
+        const reason = remoteHead.status === 'mismatch'
+            ? `remote head ${remoteHead.remoteSha} does not match local HEAD ${remoteHead.localSha} for ${branch} after re-entry push`
+            : `could not verify the remote head for ${branch} after re-entry push (${remoteHead.detail})`;
+        log('ship', reason);
+        return { stop: { ok: false, prNumber, reason } };
+    }
+    const watchRef = remoteHead.remoteSha;
+    const headSha = remoteHead.remoteSha;
+    log('ship', `re-entry pushed ${branch} @ ${headSha}`);
+    return { watchRef, headSha };
+}
+//# sourceMappingURL=ship-reentry.js.map

package/dist/phases/ship-reentry.js.map

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

package/dist/phases/ship-types.d.ts

@@ -1,6 +1,8 @@
 import type { PreviewCheckResult } from '../checkers/preview-check.js';
 import type { CiFailureEvidence } from '../types/index.js';
 import type { InfraRerunOutcome } from '../utils/ci-watch.js';
+/** Why SHIP left a PR as a draft (#3932): 'ci-pending' = CI had not finished (the sweep may land it); 'requested' = draft mode. */
+export type ShipDraftReason = 'ci-pending' | 'requested';
 export interface ShipResult {
     ok: boolean;
     prNumber?: number;
@@ -19,6 +21,8 @@ export interface ShipResult {
     draft?: boolean;
     /** CI watch timed out before a verdict (#3569): the PR was left as draft. */
     ciPending?: boolean;
+    /** Why an ok result is a draft (#3932); the run-state comment carries it for the CI-pending sweep. */
+    draftReason?: ShipDraftReason;
     previewCheck?: PreviewCheckResult;
 }
 /** The result of asking GitHub whether a PR exists for a branch. `error` is never collapsed