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

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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"}

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-open-pr.d.ts

@@ -0,0 +1,19 @@
+import type { WorkRequest } from '../work/index.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;
+    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;AAEpD,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,EAAwB,KAAK,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAE5E,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,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,CA+DvD"}