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

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

@@ -0,0 +1 @@
+{"version":3,"file":"ship-approval.d.ts","sourceRoot":"","sources":["../../src/phases/ship-approval.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAiB,KAAK,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAElE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAElD,wBAAsB,mBAAmB,CAAC,GAAG,EAAE;IAC7C,YAAY,EAAE,YAAY,CAAC;IAC3B,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,aAAa,CAAC;IACnB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,GAAG,EAAE,gBAAgB,CAAC,KAAK,CAAC,CAAC;CAC9B,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAmBlC"}

package/dist/phases/ship-approval.js

@@ -0,0 +1,21 @@
+// packages/core/src/phases/ship-approval.ts — SHIP approval gate request
+import { issueNumberOf } from '../work/work-key.js';
+import { computeDiffStat } from './ship-diff-stat.js';
+export async function requestShipApproval(ctx) {
+    const { approvalGate, issue, branch, worktree, base, run, checkSummary, log } = ctx;
+    // Log a 'ship'-typed event before anything else so the TUI's activePhase
+    // advances to SHIP first — otherwise a denial reports failedPhase as
+    // whichever phase (CHECK/BUILD) last logged, which is misleading.
+    log('ship', `Starting ship phase for ${branch}`);
+    const diffStat = await computeDiffStat(run, worktree, base);
+    log('approval_requested', `awaiting approval to ship ${branch}${checkSummary ? ` (checks: ${checkSummary.passes} pass, ${checkSummary.failures} fail, ${checkSummary.skips} skip)` : ''}`);
+    const response = await approvalGate({ issue: issueNumberOf(issue), branch, worktree, diffStat, checkSummary });
+    if (!response.approved) {
+        const reason = response.reason ?? 'denied';
+        log('ship_denied', `ship denied for ${branch}: ${reason}`);
+        return { ok: false, denied: true, deniedReason: reason };
+    }
+    log('approval_granted', `approval granted for ${branch}`);
+    return undefined;
+}
+//# sourceMappingURL=ship-approval.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ship-approval.js","sourceRoot":"","sources":["../../src/phases/ship-approval.ts"],"names":[],"mappings":"AAAA,yEAAyE;AAIzE,OAAO,EAAE,aAAa,EAAgB,MAAM,qBAAqB,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAKtD,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,GASzC;IACC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,EAAE,YAAY,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC;IACpF,yEAAyE;IACzE,qEAAqE;IACrE,kEAAkE;IAClE,GAAG,CAAC,MAAM,EAAE,2BAA2B,MAAM,EAAE,CAAC,CAAC;IACjD,MAAM,QAAQ,GAAG,MAAM,eAAe,CAAC,GAAG,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;IAC5D,GAAG,CACD,oBAAoB,EACpB,6BAA6B,MAAM,GAAG,YAAY,CAAC,CAAC,CAAC,aAAa,YAAY,CAAC,MAAM,UAAU,YAAY,CAAC,QAAQ,UAAU,YAAY,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAChK,CAAC;IACF,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,EAAE,KAAK,EAAE,aAAa,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC,CAAC;IAC/G,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;QACvB,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC;QAC3C,GAAG,CAAC,aAAa,EAAE,mBAAmB,MAAM,KAAK,MAAM,EAAE,CAAC,CAAC;QAC3D,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC;IAC3D,CAAC;IACD,GAAG,CAAC,kBAAkB,EAAE,wBAAwB,MAAM,EAAE,CAAC,CAAC;IAC1D,OAAO,SAAS,CAAC;AACnB,CAAC"}

package/dist/phases/ship-branch-push.d.ts

@@ -0,0 +1,17 @@
+import type { Octokit } from '@octokit/rest';
+import type { WorkKey } from '../work/work-key.js';
+import { type CommandRunner } from './ship-git.js';
+import type { ShipPhaseOptions } from './ship-options.js';
+import type { ShipResult } from './ship-types.js';
+export declare function pushNewBranch(ctx: {
+    run: CommandRunner;
+    worktree: string;
+    branch: string;
+    issue: WorkKey | undefined;
+    octokit: Octokit;
+    owner: string;
+    repoName: string;
+    recordedRemoteSha?: string;
+    log: ShipPhaseOptions['log'];
+}): Promise<ShipResult | undefined>;
+//# sourceMappingURL=ship-branch-push.d.ts.map

package/dist/phases/ship-branch-push.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ship-branch-push.d.ts","sourceRoot":"","sources":["../../src/phases/ship-branch-push.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAG7C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,KAAK,aAAa,EAAgD,MAAM,eAAe,CAAC;AACjG,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAE1D,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,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,GAAG,EAAE,gBAAgB,CAAC,KAAK,CAAC,CAAC;CAC9B,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAqElC"}

package/dist/phases/ship-branch-push.js

@@ -0,0 +1,77 @@
+// packages/core/src/phases/ship-branch-push.ts — SHIP push of a new branch before PR creation
+import { shellEscape } from '../utils/index.js';
+import { pushAndVerifyRemoteHead, readRemoteBranchSha } from './ship-git.js';
+import { recoverOrStop } from './ship-recovery.js';
+export async function pushNewBranch(ctx) {
+    const { run, worktree, branch, issue, octokit, owner, repoName, log } = ctx;
+    const stop = await recoverOrStop({
+        run,
+        worktree,
+        branch,
+        issue,
+        octokit,
+        owner,
+        repoName,
+        log,
+    });
+    if (stop)
+        return stop;
+    // Push branch. A rejected push means the remote head does not contain this run's
+    // commits — opening a PR against it would advertise work that is not there, so the
+    // ship fails closed here rather than continuing to PR creation (#734).
+    let pushCmd = `git push -u origin ${shellEscape(branch)}`;
+    const recorded = ctx.recordedRemoteSha;
+    let leased = false;
+    if (recorded) {
+        // A retry rebuilds the branch from origin/main, so an earlier run's push is stale. Replace it
+        // only while the remote is still exactly what was recorded at worktree creation (#1869).
+        const current = await readRemoteBranchSha(run, worktree, branch);
+        if (current.status === 'unreadable') {
+            const reason = `could not read origin/${branch} to check recorded SHA ${recorded} (${current.detail})`;
+            log('ship', `${reason} — aborting before push`);
+            return { ok: false, reason };
+        }
+        if (current.sha === null) {
+            log('ship', `origin/${branch} recorded @ ${recorded} no longer exists — nothing to replace, plain push`);
+        }
+        else if (current.sha !== recorded) {
+            const reason = `origin/${branch} moved since it was recorded: recorded ${recorded}, current ${current.sha}`;
+            log('ship', `${reason} — aborting before push`);
+            return { ok: false, reason };
+        }
+        else {
+            pushCmd = `git push ${shellEscape(`--force-with-lease=${branch}:${recorded}`)} -u origin ${shellEscape(branch)}`;
+            leased = true;
+            log('ship', `replacing stale origin/${branch} @ ${recorded} with a leased push`);
+        }
+    }
+    // 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 advertises work that is not there (#735). Fail closed, like the
+    // push-failure abort (#734).
+    const pushed = await pushAndVerifyRemoteHead(run, worktree, branch, pushCmd);
+    if (pushed.status === 'push-failed') {
+        const pushReason = `git push failed (${pushed.kind}): ${pushed.detail}`;
+        log('ship', `${pushReason} — aborting before PR creation`);
+        if (leased) {
+            return {
+                ok: false,
+                reason: `leased push of ${branch} over recorded ${recorded} was rejected (${pushed.kind})`,
+            };
+        }
+        return { ok: false, reason: pushReason };
+    }
+    if (pushed.status === 'mismatch') {
+        const reason = `remote head ${pushed.remoteSha} does not match local HEAD ${pushed.localSha} for ${branch}`;
+        log('ship', `${reason} — aborting before PR creation`);
+        return { ok: false, reason };
+    }
+    if (pushed.status === 'unreadable') {
+        const reason = `could not verify the remote head for ${branch} (${pushed.detail}); local HEAD ${pushed.localSha ?? 'unknown'}`;
+        log('ship', `${reason} — aborting before PR creation`);
+        return { ok: false, reason };
+    }
+    log('ship', `remote head ${pushed.remoteSha} matches local HEAD ${pushed.localSha} for ${branch}`);
+    return undefined;
+}
+//# sourceMappingURL=ship-branch-push.js.map

package/dist/phases/ship-branch-push.js.map

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

package/dist/phases/ship-evidence-comment.d.ts

@@ -0,0 +1,14 @@
+import type { CommandRunner } from './ship-git.js';
+import type { ShipPhaseOptions } from './ship-options.js';
+import type { lazyWalkthrough } from './ship-walkthrough.js';
+export declare function postEvidenceComment(ctx: {
+    opts: ShipPhaseOptions;
+    run: CommandRunner;
+    owner: string;
+    repoName: string;
+    prNumber: number;
+    walkthrough: ReturnType<typeof lazyWalkthrough>;
+    /** The commit CHECK ran on, when SHIP merged main after it; unset reads HEAD. */
+    checkedSha?: string;
+}): Promise<void>;
+//# sourceMappingURL=ship-evidence-comment.d.ts.map

package/dist/phases/ship-evidence-comment.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ship-evidence-comment.d.ts","sourceRoot":"","sources":["../../src/phases/ship-evidence-comment.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D,wBAAsB,mBAAmB,CAAC,GAAG,EAAE;IAC7C,IAAI,EAAE,gBAAgB,CAAC;IACvB,GAAG,EAAE,aAAa,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC;IAChD,iFAAiF;IACjF,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,GAAG,OAAO,CAAC,IAAI,CAAC,CAyBhB"}

package/dist/phases/ship-evidence-comment.js

@@ -0,0 +1,31 @@
+// packages/core/src/phases/ship-evidence-comment.ts — SHIP evidence-pack PR comment
+import { gatherEvidencePack } from '../reports/evidence-pack.js';
+export async function postEvidenceComment(ctx) {
+    const { opts, run, owner, repoName, prNumber, walkthrough } = ctx;
+    const { issue, octokit, worktree, checkSummary, log } = opts;
+    try {
+        let checkedSha = ctx.checkedSha;
+        if (!checkedSha)
+            try {
+                checkedSha = (await run('git rev-parse HEAD', { cwd: worktree })).stdout.trim() || undefined;
+            }
+            catch { }
+        const body = gatherEvidencePack({
+            issue,
+            checkSummary,
+            reworkRounds: opts.reworkRounds,
+            specPath: opts.specPath,
+            eventsFile: opts.eventsFile,
+            startedAt: opts.startedAt,
+            logsDir: opts.logsDir,
+            reviewRouting: opts.reviewRouting,
+            pinNotes: opts.pinNotes,
+            headSha: checkedSha,
+            walkthrough: await walkthrough.walkthrough(),
+        });
+        await octokit.rest.issues.createComment({ owner, repo: repoName, issue_number: prNumber, body });
+        log('evidence', `posted evidence pack to PR #${prNumber}`);
+    }
+    catch { }
+}
+//# sourceMappingURL=ship-evidence-comment.js.map

package/dist/phases/ship-evidence-comment.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ship-evidence-comment.js","sourceRoot":"","sources":["../../src/phases/ship-evidence-comment.ts"],"names":[],"mappings":"AAAA,oFAAoF;AAEpF,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAKjE,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,GASzC;IACC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,GAAG,CAAC;IAClE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC7D,IAAI,CAAC;QACH,IAAI,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC;QAChC,IAAI,CAAC,UAAU;YACb,IAAI,CAAC;gBACH,UAAU,GAAG,CAAC,MAAM,GAAG,CAAC,oBAAoB,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,SAAS,CAAC;YAC/F,CAAC;YAAC,MAAM,CAAC,CAAA,CAAC;QACZ,MAAM,IAAI,GAAG,kBAAkB,CAAC;YAC9B,KAAK;YACL,YAAY;YACZ,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,OAAO,EAAE,UAAU;YACnB,WAAW,EAAE,MAAM,WAAW,CAAC,WAAW,EAAE;SAC7C,CAAC,CAAC;QACH,MAAM,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;QACjG,GAAG,CAAC,UAAU,EAAE,+BAA+B,QAAQ,EAAE,CAAC,CAAC;IAC7D,CAAC;IAAC,MAAM,CAAC,CAAA,CAAC;AACZ,CAAC"}

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

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"ship-existing-pr.d.ts","sourceRoot":"","sources":["../../src/phases/ship-existing-pr.ts"],"names":[],"mappings":"AAGA,OAAO,EAAyB,KAAK,aAAa,EAA6C,MAAM,eAAe,CAAC;AACrH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAElD,wBAAsB,cAAc,CAAC,GAAG,EAAE;IACxC,GAAG,EAAE,aAAa,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,gBAAgB,CAAC,KAAK,CAAC,CAAC;CAC9B,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAmClC"}

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

@@ -0,0 +1,36 @@
+// packages/core/src/phases/ship-existing-pr.ts — SHIP sync of an already-open PR's branch
+import { shellEscape } from '../utils/index.js';
+import { checkRemoteIsAncestor, pushAndVerifyRemoteHead, verifyRemoteHead } from './ship-git.js';
+export async function syncExistingPr(ctx) {
+    const { run, worktree, branch, prNumber, log } = ctx;
+    // Rework commits made after BUILD's push must reach the open PR before evidence or ready (#1813).
+    const current = await verifyRemoteHead(run, worktree, branch);
+    if (current.status === 'match') {
+        log('ship', `remote head ${current.remoteSha} matches local HEAD ${current.localSha} for ${branch} — already in sync, not pushing`);
+    }
+    else {
+        if (current.status === 'mismatch') {
+            const ancestry = await checkRemoteIsAncestor(run, worktree, current.remoteSha, current.localSha);
+            if (ancestry.status !== 'ancestor') {
+                const reason = ancestry.status === 'diverged'
+                    ? `origin/${branch} @ ${current.remoteSha} has diverged from local HEAD ${current.localSha} (remote has commits local HEAD lacks) on open PR #${prNumber} — not force-pushing`
+                    : `could not confirm origin/${branch} @ ${current.remoteSha} is an ancestor of local HEAD ${current.localSha} on open PR #${prNumber} (${ancestry.detail})`;
+                log('ship', `${reason} — aborting before evidence`);
+                return { ok: false, prNumber, reason };
+            }
+        }
+        const pushed = await pushAndVerifyRemoteHead(run, worktree, branch, `git push -u origin ${shellEscape(branch)}`);
+        if (pushed.status !== 'pushed') {
+            const reason = pushed.status === 'push-failed'
+                ? `push of ${branch} to open PR #${prNumber} failed (${pushed.kind}): ${pushed.detail}`
+                : pushed.status === 'mismatch'
+                    ? `remote head ${pushed.remoteSha} does not match local HEAD ${pushed.localSha} for ${branch} after push to open PR #${prNumber}`
+                    : `could not verify the remote head for ${branch} after push to open PR #${prNumber} (${pushed.detail})`;
+            log('ship', `${reason} — aborting before evidence`);
+            return { ok: false, prNumber, reason };
+        }
+        log('ship', `remote head ${pushed.remoteSha} matches local HEAD ${pushed.localSha} for ${branch}`);
+    }
+    return undefined;
+}
+//# sourceMappingURL=ship-existing-pr.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ship-existing-pr.js","sourceRoot":"","sources":["../../src/phases/ship-existing-pr.ts"],"names":[],"mappings":"AAAA,0FAA0F;AAE1F,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,qBAAqB,EAAsB,uBAAuB,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAIrH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,GAMpC;IACC,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC;IACrD,kGAAkG;IAClG,MAAM,OAAO,GAAG,MAAM,gBAAgB,CAAC,GAAG,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;IAC9D,IAAI,OAAO,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;QAC/B,GAAG,CACD,MAAM,EACN,eAAe,OAAO,CAAC,SAAS,uBAAuB,OAAO,CAAC,QAAQ,QAAQ,MAAM,iCAAiC,CACvH,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,IAAI,OAAO,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;YAClC,MAAM,QAAQ,GAAG,MAAM,qBAAqB,CAAC,GAAG,EAAE,QAAQ,EAAE,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;YACjG,IAAI,QAAQ,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;gBACnC,MAAM,MAAM,GACV,QAAQ,CAAC,MAAM,KAAK,UAAU;oBAC5B,CAAC,CAAC,UAAU,MAAM,MAAM,OAAO,CAAC,SAAS,iCAAiC,OAAO,CAAC,QAAQ,sDAAsD,QAAQ,sBAAsB;oBAC9K,CAAC,CAAC,4BAA4B,MAAM,MAAM,OAAO,CAAC,SAAS,iCAAiC,OAAO,CAAC,QAAQ,gBAAgB,QAAQ,KAAK,QAAQ,CAAC,MAAM,GAAG,CAAC;gBAChK,GAAG,CAAC,MAAM,EAAE,GAAG,MAAM,6BAA6B,CAAC,CAAC;gBACpD,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;YACzC,CAAC;QACH,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,uBAAuB,CAAC,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,sBAAsB,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACjH,IAAI,MAAM,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC/B,MAAM,MAAM,GACV,MAAM,CAAC,MAAM,KAAK,aAAa;gBAC7B,CAAC,CAAC,WAAW,MAAM,gBAAgB,QAAQ,YAAY,MAAM,CAAC,IAAI,MAAM,MAAM,CAAC,MAAM,EAAE;gBACvF,CAAC,CAAC,MAAM,CAAC,MAAM,KAAK,UAAU;oBAC5B,CAAC,CAAC,eAAe,MAAM,CAAC,SAAS,8BAA8B,MAAM,CAAC,QAAQ,QAAQ,MAAM,2BAA2B,QAAQ,EAAE;oBACjI,CAAC,CAAC,wCAAwC,MAAM,2BAA2B,QAAQ,KAAK,MAAM,CAAC,MAAM,GAAG,CAAC;YAC/G,GAAG,CAAC,MAAM,EAAE,GAAG,MAAM,6BAA6B,CAAC,CAAC;YACpD,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;QACzC,CAAC;QACD,GAAG,CAAC,MAAM,EAAE,eAAe,MAAM,CAAC,SAAS,uBAAuB,MAAM,CAAC,QAAQ,QAAQ,MAAM,EAAE,CAAC,CAAC;IACrG,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}

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

@@ -0,0 +1,15 @@
+import type { InfraRerunOutcome } from '../utils/ci-watch.js';
+import type { CommandRunner } from './ship-git.js';
+import type { ShipPhaseOptions } from './ship-options.js';
+import type { ShipResult } from './ship-types.js';
+export declare function finishShip(ctx: {
+    opts: ShipPhaseOptions;
+    run: CommandRunner;
+    owner: string;
+    repoName: string;
+    prNumber: number;
+    headSha?: string;
+    ciOutcome?: InfraRerunOutcome;
+    ciWatchError?: string;
+}): Promise<ShipResult>;
+//# sourceMappingURL=ship-finish.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ship-finish.d.ts","sourceRoot":"","sources":["../../src/phases/ship-finish.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAG1D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAElD,wBAAsB,UAAU,CAAC,GAAG,EAAE;IACpC,IAAI,EAAE,gBAAgB,CAAC;IACvB,GAAG,EAAE,aAAa,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,iBAAiB,CAAC;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,GAAG,OAAO,CAAC,UAAU,CAAC,CAgEtB"}

package/dist/phases/ship-finish.js

@@ -0,0 +1,69 @@
+// packages/core/src/phases/ship-finish.ts — SHIP preview gate, ready flip and final result
+import { publishPreviewReceipt } from '../checkers/preview-receipt.js';
+import { previewFailureReason, runPreviewGate } from './ship-preview.js';
+import { markPrReadyWithRetry } from './ship-ready.js';
+export async function finishShip(ctx) {
+    const { opts, run, owner, repoName, prNumber, headSha, ciOutcome, ciWatchError } = ctx;
+    const { octokit, worktree, log } = opts;
+    const ciPending = ciOutcome === 'timeout' || ciWatchError !== undefined;
+    let previewCheck;
+    if (opts.previewGate) {
+        const sha = headSha ?? (await run('git rev-parse HEAD', { cwd: worktree })).stdout.trim();
+        const publish = (n, r) => publishPreviewReceipt(octokit, owner, repoName, n, r);
+        const gateCtx = { log, ciPending, publish, ...(opts.logsDir ? { logsDir: opts.logsDir } : {}) };
+        previewCheck = await runPreviewGate(opts.previewGate, { prNumber, headSha: sha }, gateCtx);
+        if (previewCheck.status !== 'pass') {
+            return {
+                ok: false,
+                prNumber,
+                reason: previewFailureReason(prNumber, previewCheck),
+                previewCheck,
+                headSha: sha,
+                ...(ciOutcome ? { ciOutcome } : {}),
+                ...(ciPending ? { ciPending: true, draft: true } : {}),
+            };
+        }
+    }
+    if (ciWatchError !== undefined) {
+        const reason = `CI unknown for PR #${prNumber}: the CI watch failed (${ciWatchError}); leaving PR as draft`;
+        log('ship', reason);
+        return { ok: false, prNumber, reason, ciPending: true, draft: true, ...(headSha ? { headSha } : {}) };
+    }
+    // Mark ready for review (if draft). REST pulls.update ignores `draft`;
+    // undrafting requires the markPullRequestReadyForReview GraphQL mutation.
+    if (opts.draft || ciPending) {
+        try {
+            const { data: pr } = await octokit.rest.pulls.get({ owner, repo: repoName, pull_number: prNumber });
+            if (!pr.draft)
+                log('ship', `PR #${prNumber} is already open and not a draft; draft mode leaves it as is`);
+        }
+        catch { }
+    }
+    else {
+        const flip = await markPrReadyWithRetry(octokit, owner, repoName, prNumber);
+        if (!flip.ok) {
+            const reason = `could not mark PR #${prNumber} ready for review after one retry: ${flip.detail}`;
+            log('warn', reason);
+            return {
+                ok: false,
+                prNumber,
+                reason,
+                ...(ciOutcome === undefined ? {} : { ciOutcome }),
+                ...(headSha ? { headSha } : {}),
+            };
+        }
+    }
+    const noChecks = ciOutcome === 'no-checks' ? ' (CI skipped: no checks found)' : '';
+    const readyLabel = opts.draft || ciPending ? `left as draft${ciPending ? ' (CI pending)' : ''}` : 'ready for review';
+    log('ready', `PR #${prNumber} ${readyLabel}${noChecks}`);
+    return {
+        ok: true,
+        prNumber,
+        ...(ciOutcome === undefined ? {} : { ciOutcome }),
+        ...(headSha ? { headSha } : {}),
+        ...(opts.draft || ciPending ? { draft: true } : {}),
+        ...(ciPending ? { ciPending: true } : {}),
+        ...(previewCheck ? { previewCheck } : {}),
+    };
+}
+//# sourceMappingURL=ship-finish.js.map

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

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

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

@@ -0,0 +1,31 @@
+export type CommandRunner = (command: string, options?: {
+    cwd?: string;
+    timeout?: number;
+}) => Promise<{
+    stdout: string;
+}>;
+/** 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;
+};
+/** Prefer stderr, then stdout, before the error fallback; keep details flattened and bounded. */
+export declare function shortDetail(err: unknown): string;
+/** 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>;
+//# sourceMappingURL=ship-git-detail.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ship-git-detail.d.ts","sourceRoot":"","sources":["../../src/phases/ship-git-detail.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,aAAa,GAAG,CAC1B,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,KACzC,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAEjC,4EAA4E;AAC5E,MAAM,MAAM,eAAe,GAAG,kBAAkB,GAAG,SAAS,GAAG,SAAS,CAAC;AA8BzE;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,OAAO,GAAG;IAAE,IAAI,EAAE,eAAe,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAM3F;AAKD,iGAAiG;AACjG,wBAAgB,WAAW,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CAQhD;AAED,uGAAuG;AACvG,MAAM,MAAM,cAAc,GAAG;IAAE,MAAM,EAAE,UAAU,CAAA;CAAE,GAAG;IAAE,MAAM,EAAE,UAAU,CAAA;CAAE,GAAG;IAAE,MAAM,EAAE,YAAY,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAIxH,wBAAsB,qBAAqB,CACzC,GAAG,EAAE,aAAa,EAClB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,cAAc,CAAC,CAYzB"}

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

@@ -0,0 +1,71 @@
+// packages/core/src/phases/ship-git-detail.ts — command runner type and push-failure description for SHIP
+import { shellEscape } from '../utils/index.js';
+/** 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';
+}
+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 };
+    }
+}
+//# sourceMappingURL=ship-git-detail.js.map

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

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

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

@@ -0,0 +1,51 @@
+import { type CommandRunner, type PushFailureKind } from './ship-git-detail.js';
+/** 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;
+};
+/** 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>;
+/** 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 {};
+//# sourceMappingURL=ship-git-remote.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ship-git-remote.d.ts","sourceRoot":"","sources":["../../src/phases/ship-git-remote.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,aAAa,EAAuB,KAAK,eAAe,EAAe,MAAM,sBAAsB,CAAC;AAElH,yFAAyF;AACzF,KAAK,eAAe,GAChB;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GACxD;IAAE,MAAM,EAAE,UAAU,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GAC3D;IAAE,MAAM,EAAE,YAAY,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAapF,sGAAsG;AACtG,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,aAAa,EAClB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;IAAE,MAAM,EAAE,IAAI,CAAC;IAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GAAG;IAAE,MAAM,EAAE,YAAY,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAO1F;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAuBrH;AAED,qHAAqH;AACrH,MAAM,MAAM,YAAY,GACpB;IAAE,MAAM,EAAE,QAAQ,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GACzD;IAAE,MAAM,EAAE,aAAa,CAAC;IAAC,IAAI,EAAE,eAAe,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAChE;IAAE,MAAM,EAAE,UAAU,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GAC3D;IAAE,MAAM,EAAE,YAAY,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAEhE,wBAAsB,uBAAuB,CAC3C,GAAG,EAAE,aAAa,EAClB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,YAAY,CAAC,CAUvB"}

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

@@ -0,0 +1,70 @@
+// packages/core/src/phases/ship-git-remote.ts — remote-head verification and verified push for SHIP
+import { shellEscape } from '../utils/index.js';
+import { describePushFailure, shortDetail } from './ship-git-detail.js';
+/** 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 };
+}
+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 };
+}
+//# sourceMappingURL=ship-git-remote.js.map

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

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