@on-par/factory-core 0.9.28-next.2 → 0.9.28-next.21

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

@@ -0,0 +1,71 @@
+// 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 { renderStackOrderLine } from './stack-order.js';
+export async function openOrFindPr(ctx) {
+    const { opts, inlineWork, 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
+        : (await octokit.rest.issues.get({ owner, repo: repoName, issue_number: issueNumberOf(issue) })).data.title;
+    const slice = inlineWork ? undefined : opts.slice;
+    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 #${issue}.`
+            : `Implements #${issue}.`;
+    const prTitle = inlineWork
+        ? stripBriefIds(title)
+        : slice
+            ? `${title} — slice ${slice.index}/${slice.count} (#${issue})`
+            : `${title} (#${issue})`;
+    // 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) : undefined,
+                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 : issue,
+                partOf: !inlineWork && !finalSlice ? issue : 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,76 @@
+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 { 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;
+    /** 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;
+    /** 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":"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"}

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;AAiBrG,2EAA2E;AAC3E,MAAM,CAAC,MAAM,gBAAgB,GAAG,MAAM,CAAC"}

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

@@ -0,0 +1,8 @@
+import type { Octokit } from '@octokit/rest';
+import type { PrLookup } from './ship-types.js';
+export declare function findOpenPR(octokit: Octokit, owner: string, repo: string, branch: string): Promise<PrLookup>;
+export declare function findMergedPR(octokit: Octokit, owner: string, repo: string, branch: string): Promise<PrLookup>;
+/** A `pulls.create` 422 whose message says the PR already exists — recoverable by re-querying,
+ *  unlike every other 422 (e.g. "No commits between ..."), which still propagates (#641). */
+export declare function isPullAlreadyExistsError(err: unknown): boolean;
+//# sourceMappingURL=ship-pr-lookup.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ship-pr-lookup.d.ts","sourceRoot":"","sources":["../../src/phases/ship-pr-lookup.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAEhD,wBAAsB,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAajH;AAED,wBAAsB,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAanH;AAED;6FAC6F;AAC7F,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAS9D"}

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

@@ -0,0 +1,41 @@
+import { shortDetail } from './ship-git.js';
+export async function findOpenPR(octokit, owner, repo, branch) {
+    try {
+        const { data: prs } = await octokit.rest.pulls.list({
+            owner,
+            repo,
+            state: 'open',
+            head: `${owner}:${branch}`,
+        });
+        const prNumber = prs[0]?.number;
+        return prNumber === undefined ? { status: 'absent' } : { status: 'found', prNumber };
+    }
+    catch (err) {
+        return { status: 'error', detail: shortDetail(err) };
+    }
+}
+export async function findMergedPR(octokit, owner, repo, branch) {
+    try {
+        const { data: prs } = await octokit.rest.pulls.list({
+            owner,
+            repo,
+            state: 'closed',
+            head: `${owner}:${branch}`,
+        });
+        const prNumber = prs.find((pr) => pr.merged_at != null)?.number;
+        return prNumber === undefined ? { status: 'absent' } : { status: 'found', prNumber };
+    }
+    catch (err) {
+        return { status: 'error', detail: shortDetail(err) };
+    }
+}
+/** A `pulls.create` 422 whose message says the PR already exists — recoverable by re-querying,
+ *  unlike every other 422 (e.g. "No commits between ..."), which still propagates (#641). */
+export function isPullAlreadyExistsError(err) {
+    const e = err;
+    if (e?.status !== 422)
+        return false;
+    const messages = [e.message ?? '', ...(e.response?.data?.errors ?? []).map((x) => x?.message ?? '')];
+    return messages.some((m) => /already exists/i.test(m));
+}
+//# sourceMappingURL=ship-pr-lookup.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ship-pr-lookup.js","sourceRoot":"","sources":["../../src/phases/ship-pr-lookup.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAG5C,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,OAAgB,EAAE,KAAa,EAAE,IAAY,EAAE,MAAc;IAC5F,IAAI,CAAC;QACH,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;YAClD,KAAK;YACL,IAAI;YACJ,KAAK,EAAE,MAAM;YACb,IAAI,EAAE,GAAG,KAAK,IAAI,MAAM,EAAE;SAC3B,CAAC,CAAC;QACH,MAAM,QAAQ,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC;QAChC,OAAO,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;IACvF,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC;IACvD,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,OAAgB,EAAE,KAAa,EAAE,IAAY,EAAE,MAAc;IAC9F,IAAI,CAAC;QACH,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;YAClD,KAAK;YACL,IAAI;YACJ,KAAK,EAAE,QAAQ;YACf,IAAI,EAAE,GAAG,KAAK,IAAI,MAAM,EAAE;SAC3B,CAAC,CAAC;QACH,MAAM,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,SAAS,IAAI,IAAI,CAAC,EAAE,MAAM,CAAC;QAChE,OAAO,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;IACvF,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC;IACvD,CAAC;AACH,CAAC;AAED;6FAC6F;AAC7F,MAAM,UAAU,wBAAwB,CAAC,GAAY;IACnD,MAAM,CAAC,GAAG,GAIF,CAAC;IACT,IAAI,CAAC,EAAE,MAAM,KAAK,GAAG;QAAE,OAAO,KAAK,CAAC;IACpC,MAAM,QAAQ,GAAG,CAAC,CAAC,CAAC,OAAO,IAAI,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,IAAI,EAAE,CAAC,CAAC,CAAC;IACrG,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;AACzD,CAAC"}

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

@@ -0,0 +1,16 @@
+import type { Octokit } from '@octokit/rest';
+import type { EventKind } from '../events/kinds.js';
+import type { WorkKey } from '../work/work-key.js';
+import type { CommandRunner } from './ship-git.js';
+import type { ShipResult } from './ship-types.js';
+export declare function recoverOrStop(ctx: {
+    run: CommandRunner;
+    worktree: string;
+    branch: string;
+    issue: WorkKey | undefined;
+    octokit: Octokit;
+    owner: string;
+    repoName: string;
+    log: (type: EventKind, msg: string) => void;
+}): Promise<ShipResult | undefined>;
+//# sourceMappingURL=ship-recovery.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ship-recovery.d.ts","sourceRoot":"","sources":["../../src/phases/ship-recovery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAGnD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAElD,wBAAsB,aAAa,CAAC,GAAG,EAAE;IACvC,GAAG,EAAE,aAAa,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,OAAO,GAAG,SAAS,CAAC;IAC3B,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CAC7C,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAyDlC"}

package/dist/phases/ship-recovery.js

@@ -0,0 +1,81 @@
+import { commitLeftoverBuildOutput } from './ship-leftover.js';
+import { findMergedPR } from './ship-pr-lookup.js';
+export async function recoverOrStop(ctx) {
+    const { run, worktree, branch, octokit, owner, repoName, log } = ctx;
+    try {
+        await run('git fetch origin main', { cwd: worktree });
+    }
+    catch {
+        log('ship', 'git fetch origin main failed — recovery may compare against a stale origin/main');
+    }
+    let recoveryState = await inspectRecoveryState(worktree, run);
+    if (!recoveryState.clean) {
+        const conflicts = conflictedPaths(recoveryState.statusLines);
+        if (conflicts.length > 0) {
+            const listed = conflicts.slice(0, 5).join(', ') + (conflicts.length > 5 ? ` (+${conflicts.length - 5} more)` : '');
+            const reason = `worktree has merge conflicts in ${listed}`;
+            log('ship', `not recovering ${branch}: ${reason} — worktree preserved`);
+            return { ok: false, reason };
+        }
+        const committed = await commitLeftoverBuildOutput({
+            run,
+            worktree,
+            branch,
+            issue: ctx.issue,
+            statusLines: recoveryState.statusLines,
+            log,
+        });
+        if (!committed.ok) {
+            log('ship', `not recovering ${branch}: ${committed.reason} — worktree preserved`);
+            return { ok: false, reason: committed.reason };
+        }
+        recoveryState = await inspectRecoveryState(worktree, run);
+        if (!recoveryState.clean) {
+            const reason = 'worktree still dirty after committing leftover build output';
+            log('ship', `not recovering ${branch}: ${reason} — worktree preserved`);
+            return { ok: false, reason };
+        }
+    }
+    if (recoveryState.landed || !recoveryState.ahead) {
+        const mergedLookup = await findMergedPR(octokit, owner, repoName, branch);
+        if (mergedLookup.status === 'error' && !recoveryState.landed) {
+            const reason = `could not determine whether ${branch} was already merged (${mergedLookup.detail})`;
+            log('ship', `not recovering ${branch}: ${reason}`);
+            return { ok: false, reason };
+        }
+        const mergedPr = mergedLookup.status === 'found' ? mergedLookup.prNumber : undefined;
+        if (mergedPr !== undefined || recoveryState.landed) {
+            log('ship', `not recovering ${branch}: already delivered${mergedPr !== undefined ? ` by merged PR #${mergedPr}` : ' (HEAD tree matches origin/main)'}`);
+            return { ok: true, prNumber: mergedPr, alreadyDelivered: true };
+        }
+        const reason = 'no commits ahead of origin/main';
+        log('ship', `not recovering ${branch}: ${reason}`);
+        return { ok: false, reason };
+    }
+    return undefined;
+}
+async function inspectRecoveryState(worktree, run) {
+    const [{ stdout: status }, { stdout: ahead }, landed] = await Promise.all([
+        run('git status --porcelain', { cwd: worktree }),
+        run('git rev-list --count origin/main..HEAD', { cwd: worktree }),
+        run('git diff --quiet origin/main..HEAD', { cwd: worktree }).then(() => true, () => false),
+    ]);
+    return {
+        clean: status.trim() === '',
+        ahead: Number.parseInt(ahead.trim(), 10) > 0,
+        landed,
+        statusLines: status
+            .split('\n')
+            .map((l) => l.trimEnd())
+            .filter((l) => l.trim() !== ''),
+    };
+}
+function conflictedPaths(statusLines) {
+    return statusLines
+        .filter((line) => {
+        const xy = line.slice(0, 2);
+        return xy.includes('U') || xy === 'AA' || xy === 'DD';
+    })
+        .map((line) => line.slice(3));
+}
+//# sourceMappingURL=ship-recovery.js.map

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

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

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

@@ -0,0 +1,36 @@
+import type { PreviewCheckResult } from '../checkers/preview-check.js';
+import type { CiFailureEvidence } from '../types/index.js';
+import type { InfraRerunOutcome } from '../utils/ci-watch.js';
+export interface ShipResult {
+    ok: boolean;
+    prNumber?: number;
+    denied?: boolean;
+    deniedReason?: string;
+    reason?: string;
+    ciOutcome?: InfraRerunOutcome;
+    /** Bounded evidence for a CI-watch 'failure' (#2814). */
+    ciFailure?: CiFailureEvidence;
+    /** True when the branch's content had already landed on main (e.g. a retry after a
+     *  squash merge) — nothing was pushed and no PR was created (#520). */
+    alreadyDelivered?: boolean;
+    /** The head SHA watched on a CI rework re-entry (#2816). */
+    headSha?: string;
+    /** Draft mode (#3449): mark-ready skipped; callers must not merge. */
+    draft?: boolean;
+    /** CI watch timed out before a verdict (#3569): the PR was left as draft. */
+    ciPending?: boolean;
+    previewCheck?: PreviewCheckResult;
+}
+/** The result of asking GitHub whether a PR exists for a branch. `error` is never collapsed
+ *  into `absent` — an unanswered lookup makes ship fail closed rather than open a duplicate
+ *  PR (#641). */
+export type PrLookup = {
+    status: 'found';
+    prNumber: number;
+} | {
+    status: 'absent';
+} | {
+    status: 'error';
+    detail: string;
+};
+//# sourceMappingURL=ship-types.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ship-types.d.ts","sourceRoot":"","sources":["../../src/phases/ship-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAE9D,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,OAAO,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,iBAAiB,CAAC;IAC9B,yDAAyD;IACzD,SAAS,CAAC,EAAE,iBAAiB,CAAC;IAC9B;2EACuE;IACvE,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,4DAA4D;IAC5D,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,sEAAsE;IACtE,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,6EAA6E;IAC7E,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,YAAY,CAAC,EAAE,kBAAkB,CAAC;CACnC;AAED;;iBAEiB;AACjB,MAAM,MAAM,QAAQ,GAClB;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,MAAM,EAAE,QAAQ,CAAA;CAAE,GAAG;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC"}

package/dist/phases/ship-types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=ship-types.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ship-types.js","sourceRoot":"","sources":["../../src/phases/ship-types.ts"],"names":[],"mappings":""}

package/dist/phases/ship.d.ts

@@ -1,114 +1,7 @@
-import { type WorkKey } from '../work/work-key.js';
-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 WalkthroughShipOpts } from './ship-walkthrough.js';
-import { type StackPosition } from './stack-order.js';
-import type { ReviewRouting } from '../review/routing.js';
-import { type CommandRunner } from './ship-git.js';
-import type { PreviewCheckResult } from '../checkers/preview-check.js';
-import { type PreviewGate } from './ship-preview.js';
-import type { CheckSummary, CiFailureEvidence } from '../types/index.js';
-import { type InfraRerunOutcome, watchChecksWithInfraRerun } from '../utils/ci-watch.js';
-import type { WorkRequest } from '../work/index.js';
-export interface ShipResult {
-    ok: boolean;
-    prNumber?: number;
-    denied?: boolean;
-    deniedReason?: string;
-    reason?: string;
-    ciOutcome?: InfraRerunOutcome;
-    /** Bounded evidence for a CI-watch 'failure' (#2814). */
-    ciFailure?: CiFailureEvidence;
-    /** True when the branch's content had already landed on main (e.g. a retry after a
-     *  squash merge) — nothing was pushed and no PR was created (#520). */
-    alreadyDelivered?: boolean;
-    /** The head SHA watched on a CI rework re-entry (#2816). */
-    headSha?: string;
-    /** Draft mode (#3449): mark-ready skipped; callers must not merge. */
-    draft?: boolean;
-    /** CI watch timed out before a verdict (#3569): the PR was left as draft. */
-    ciPending?: boolean;
-    previewCheck?: PreviewCheckResult;
-}
-export declare function shipPhase(opts: Parameters<typeof shipPhaseImpl>[0]): Promise<ShipResult>;
-declare function shipPhaseImpl(opts: {
-    issue: WorkKey;
-    repo: string;
-    worktree: string;
-    branch: string;
-    octokit: Octokit;
-    watchCI?: 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;
-    /** 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;
-}): Promise<ShipResult>;
-export declare function findOpenPR(octokit: Octokit, owner: string, repo: string, branch: string): Promise<PrLookup>;
-export declare function findMergedPR(octokit: Octokit, owner: string, repo: string, branch: string): Promise<PrLookup>;
-/** A `pulls.create` 422 whose message says the PR already exists — recoverable by re-querying,
- *  unlike every other 422 (e.g. "No commits between ..."), which still propagates (#641). */
-export declare function isPullAlreadyExistsError(err: unknown): boolean;
-/** The result of asking GitHub whether a PR exists for a branch. `error` is never collapsed
- *  into `absent` — an unanswered lookup makes ship fail closed rather than open a duplicate
- *  PR (#641). */
-export type PrLookup = {
-    status: 'found';
-    prNumber: number;
-} | {
-    status: 'absent';
-} | {
-    status: 'error';
-    detail: string;
-};
-export {};
+import { type ShipPhaseOptions } from './ship-options.js';
+import { findMergedPR, findOpenPR } from './ship-pr-lookup.js';
+import type { PrLookup, ShipResult } from './ship-types.js';
+export { findMergedPR, findOpenPR };
+export type { PrLookup, ShipResult };
+export declare function shipPhase(opts: ShipPhaseOptions): Promise<ShipResult>;
 //# sourceMappingURL=ship.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ship.d.ts","sourceRoot":"","sources":["../../src/phases/ship.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ship.d.ts","sourceRoot":"","sources":["../../src/phases/ship.ts"],"names":[],"mappings":"AAeA,OAAO,EAAoB,KAAK,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC5E,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAE/D,OAAO,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAG5D,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,CAAC;AACpC,YAAY,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC;AAIrC,wBAAsB,SAAS,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,UAAU,CAAC,CAiB3E"}