@smoothbricks/cli 0.4.3 → 0.5.0

package/dist/cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAKA,wBAAsB,MAAM,CAAC,IAAI,WAAwB,GAAG,OAAO,CAAC,IAAI,CAAC,CAexE"}
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAMA,wBAAsB,MAAM,CAAC,IAAI,WAAwB,GAAG,OAAO,CAAC,IAAI,CAAC,CAexE"}

package/dist/cli.js

@@ -2,6 +2,7 @@ import { Command, CommanderError } from 'commander';
 import { variants } from './generate/index.js';
 import { cliPackageVersion } from './lib/cli-package.js';
 import { findRepoRoot } from './lib/run.js';
+import { resolvePrConflicts } from './pr/index.js';
 export async function runCli(argv = process.argv.slice(2)) {
     const program = buildProgram();
     try {
@@ -278,6 +279,17 @@ function buildProgram() {
         const { githubCiNxDeploy } = await import('./github-ci/index.js');
         await githubCiNxDeploy(await findRepoRoot(), options);
     });
+    const pr = program.command('pr').description('Work with GitHub pull requests');
+    pr.command('resolve [pr]')
+        .description('Resolve conflict markers in a PR (agent-first, two-phase)')
+        .option('--remote <name>', 'git remote hosting the PR branch (auto-inferred when omitted)')
+        .option('--abort', 'discard an in-progress resolution and return to the original branch')
+        .action(async (prArg, options) => {
+        const exitCode = await resolvePrConflicts(await findRepoRoot(), prArg, options);
+        if (exitCode !== 0) {
+            process.exitCode = exitCode;
+        }
+    });
     return program;
 }
 function booleanOption(value) {

package/dist/lib/conflict-markers.d.ts

@@ -0,0 +1,54 @@
+/**
+ * Shared detection of Git merge-conflict markers.
+ *
+ * Real conflict markers always sit at column 0 and are a 7-character run of
+ * `<`, `|`, or `>` followed by a space (the diff3 base marker `|||||||` and the
+ * ours/theirs markers `<<<<<<< ` / `>>>>>>> `). We deliberately do NOT match a
+ * bare `=======` separator: it is ambiguous with Markdown h1 underlines and adds
+ * no signal (a real conflict always carries the angle/pipe markers too). The
+ * column-0 anchor also means quoted marker strings inside source (which are
+ * indented) never false-positive.
+ */
+export declare const CONFLICT_MARKER_PATTERN = "^(<<<<<<< |\\|\\|\\|\\|\\|\\|\\| |>>>>>>> )";
+export interface ConflictMarkerHit {
+    /** Repo-relative path of the offending file. */
+    readonly file: string;
+    /** 1-based line numbers carrying a conflict marker. */
+    readonly lines: number[];
+}
+/** 1-based line numbers of every conflict-marker line in `text`. */
+export declare function findMarkerLines(text: string): number[];
+export interface MarkerScanShell {
+    runResult(command: string, args: string[], cwd: string): Promise<{
+        exitCode: number;
+        stdout: string;
+        stderr: string;
+    }>;
+}
+/**
+ * Scan tracked files in the working tree for conflict markers via `git grep`.
+ * `pathspecs` optionally restricts the scan (e.g. release package roots).
+ */
+export declare function scanTrackedForMarkers(shell: MarkerScanShell, root: string, pathspecs?: string[]): Promise<ConflictMarkerHit[]>;
+/** Thrown by {@link assertNoConflictMarkers} so callers/tests can inspect the hits. */
+export declare class ConflictMarkersError extends Error {
+    readonly hits: ConflictMarkerHit[];
+    constructor(hits: ConflictMarkerHit[], context: string);
+}
+/**
+ * Reusable publish/merge guard: throw {@link ConflictMarkersError} when any
+ * tracked file carries conflict markers. `context` names the blocked operation
+ * (e.g. `'publish'`) for the message.
+ */
+export declare function assertNoConflictMarkers(shell: MarkerScanShell, root: string, context: string): Promise<void>;
+/**
+ * Scan the files changed between `baseRef` and `headRef` (three-dot, i.e. since
+ * their merge base) for conflict markers, reading blobs at `headRef` — no
+ * checkout or working-tree mutation required.
+ */
+export declare function scanRefChangedForMarkers(shell: MarkerScanShell, root: string, baseRef: string, headRef: string): Promise<ConflictMarkerHit[]>;
+/** Parse `path:line:content` rows from `git grep -n` into per-file hits. */
+export declare function parseGitGrep(stdout: string): ConflictMarkerHit[];
+/** Human-readable one-liner summary of marker hits, e.g. for CLI output. */
+export declare function formatMarkerHits(hits: ConflictMarkerHit[]): string;
+//# sourceMappingURL=conflict-markers.d.ts.map

package/dist/lib/conflict-markers.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"conflict-markers.d.ts","sourceRoot":"","sources":["../../src/lib/conflict-markers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,eAAO,MAAM,uBAAuB,gDAAgD,CAAC;AAIrF,MAAM,WAAW,iBAAiB;IAChC,gDAAgD;IAChD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,uDAAuD;IACvD,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC;CAC1B;AAED,oEAAoE;AACpE,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAStD;AAED,MAAM,WAAW,eAAe;IAC9B,SAAS,CACP,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EAAE,EACd,GAAG,EAAE,MAAM,GACV,OAAO,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAClE;AAED;;;GAGG;AACH,wBAAsB,qBAAqB,CACzC,KAAK,EAAE,eAAe,EACtB,IAAI,EAAE,MAAM,EACZ,SAAS,GAAE,MAAM,EAAO,GACvB,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAW9B;AAED,uFAAuF;AACvF,qBAAa,oBAAqB,SAAQ,KAAK;IAE3C,QAAQ,CAAC,IAAI,EAAE,iBAAiB,EAAE;gBAAzB,IAAI,EAAE,iBAAiB,EAAE,EAClC,OAAO,EAAE,MAAM;CAKlB;AAED;;;;GAIG;AACH,wBAAsB,uBAAuB,CAAC,KAAK,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAKlH;AAED;;;;GAIG;AACH,wBAAsB,wBAAwB,CAC5C,KAAK,EAAE,eAAe,EACtB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAkB9B;AAED,4EAA4E;AAC5E,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,iBAAiB,EAAE,CA2BhE;AAED,4EAA4E;AAC5E,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,iBAAiB,EAAE,GAAG,MAAM,CAElE"}

package/dist/lib/conflict-markers.js

@@ -0,0 +1,118 @@
+/**
+ * Shared detection of Git merge-conflict markers.
+ *
+ * Real conflict markers always sit at column 0 and are a 7-character run of
+ * `<`, `|`, or `>` followed by a space (the diff3 base marker `|||||||` and the
+ * ours/theirs markers `<<<<<<< ` / `>>>>>>> `). We deliberately do NOT match a
+ * bare `=======` separator: it is ambiguous with Markdown h1 underlines and adds
+ * no signal (a real conflict always carries the angle/pipe markers too). The
+ * column-0 anchor also means quoted marker strings inside source (which are
+ * indented) never false-positive.
+ */
+export const CONFLICT_MARKER_PATTERN = '^(<<<<<<< |\\|\\|\\|\\|\\|\\|\\| |>>>>>>> )';
+const conflictMarkerRe = new RegExp(CONFLICT_MARKER_PATTERN);
+/** 1-based line numbers of every conflict-marker line in `text`. */
+export function findMarkerLines(text) {
+    const hits = [];
+    const lines = text.split('\n');
+    for (let i = 0; i < lines.length; i++) {
+        if (conflictMarkerRe.test(lines[i])) {
+            hits.push(i + 1);
+        }
+    }
+    return hits;
+}
+/**
+ * Scan tracked files in the working tree for conflict markers via `git grep`.
+ * `pathspecs` optionally restricts the scan (e.g. release package roots).
+ */
+export async function scanTrackedForMarkers(shell, root, pathspecs = []) {
+    const args = ['grep', '-nI', '-E', CONFLICT_MARKER_PATTERN];
+    if (pathspecs.length > 0) {
+        args.push('--', ...pathspecs);
+    }
+    const { exitCode, stdout, stderr } = await shell.runResult('git', args, root);
+    // git grep: 0 = matches found, 1 = no matches, >1 = error.
+    if (exitCode > 1) {
+        throw new Error(`git grep for conflict markers failed: ${stderr.trim() || `exit ${exitCode}`}`);
+    }
+    return parseGitGrep(stdout);
+}
+/** Thrown by {@link assertNoConflictMarkers} so callers/tests can inspect the hits. */
+export class ConflictMarkersError extends Error {
+    hits;
+    constructor(hits, context) {
+        super(`Refusing to ${context}: conflict markers found in ${hits.length} file(s):\n${formatMarkerHits(hits)}`);
+        this.hits = hits;
+        this.name = 'ConflictMarkersError';
+    }
+}
+/**
+ * Reusable publish/merge guard: throw {@link ConflictMarkersError} when any
+ * tracked file carries conflict markers. `context` names the blocked operation
+ * (e.g. `'publish'`) for the message.
+ */
+export async function assertNoConflictMarkers(shell, root, context) {
+    const hits = await scanTrackedForMarkers(shell, root);
+    if (hits.length > 0) {
+        throw new ConflictMarkersError(hits, context);
+    }
+}
+/**
+ * Scan the files changed between `baseRef` and `headRef` (three-dot, i.e. since
+ * their merge base) for conflict markers, reading blobs at `headRef` — no
+ * checkout or working-tree mutation required.
+ */
+export async function scanRefChangedForMarkers(shell, root, baseRef, headRef) {
+    const diff = await shell.runResult('git', ['diff', '--name-only', `${baseRef}...${headRef}`], root);
+    if (diff.exitCode !== 0) {
+        throw new Error(`git diff ${baseRef}...${headRef} failed: ${diff.stderr.trim() || `exit ${diff.exitCode}`}`);
+    }
+    const files = diff.stdout.split('\n').filter((line) => line.length > 0);
+    const hits = [];
+    for (const file of files) {
+        const show = await shell.runResult('git', ['show', `${headRef}:${file}`, '--textconv'], root);
+        if (show.exitCode !== 0) {
+            continue; // deleted at head / binary / unreadable — not a marker source
+        }
+        const lines = findMarkerLines(show.stdout);
+        if (lines.length > 0) {
+            hits.push({ file, lines });
+        }
+    }
+    return hits;
+}
+/** Parse `path:line:content` rows from `git grep -n` into per-file hits. */
+export function parseGitGrep(stdout) {
+    const byFile = new Map();
+    for (const row of stdout.split('\n')) {
+        if (row.length === 0) {
+            continue;
+        }
+        const firstColon = row.indexOf(':');
+        if (firstColon < 0) {
+            continue;
+        }
+        const secondColon = row.indexOf(':', firstColon + 1);
+        if (secondColon < 0) {
+            continue;
+        }
+        const file = row.slice(0, firstColon);
+        const line = Number.parseInt(row.slice(firstColon + 1, secondColon), 10);
+        if (!Number.isFinite(line)) {
+            continue;
+        }
+        const existing = byFile.get(file);
+        if (existing) {
+            existing.push(line);
+        }
+        else {
+            byFile.set(file, [line]);
+        }
+    }
+    return [...byFile.entries()].map(([file, lines]) => ({ file, lines }));
+}
+/** Human-readable one-liner summary of marker hits, e.g. for CLI output. */
+export function formatMarkerHits(hits) {
+    return hits.map((hit) => `  ${hit.file} (lines ${hit.lines.join(', ')})`).join('\n');
+}

package/dist/pr/index.d.ts

@@ -0,0 +1,27 @@
+/** 0 = clean/done, 2 = action required (conflicts to resolve), 1 = usage/error. */
+export type PrResolveExit = 0 | 1 | 2;
+export interface PrResolveOptions {
+    /** Git remote hosting the PR branch. Auto-inferred from the PR repo when omitted. */
+    remote?: string;
+    /** Abort an in-progress resolution: restore the original branch, drop state. */
+    abort?: boolean;
+}
+export interface PrResolveShell {
+    runResult(command: string, args: string[], cwd: string): Promise<{
+        exitCode: number;
+        stdout: string;
+        stderr: string;
+    }>;
+    run(command: string, args: string[], cwd: string): Promise<void>;
+}
+/**
+ * Agent-first conflict resolution for a GitHub PR.
+ *
+ * First run (pointed at a PR): reports the conflict markers and, if any, checks
+ * out the PR branch and instructs the next step. Second run (on that branch,
+ * after the human/agent has resolved + committed): verifies no markers remain,
+ * pushes, and returns to the original branch. Idempotent via a state file under
+ * the git dir.
+ */
+export declare function resolvePrConflicts(root: string, prArg: string | undefined, options: PrResolveOptions, shell?: PrResolveShell): Promise<PrResolveExit>;
+//# sourceMappingURL=index.d.ts.map

package/dist/pr/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/pr/index.ts"],"names":[],"mappings":"AAMA,mFAAmF;AACnF,MAAM,MAAM,aAAa,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AAEtC,MAAM,WAAW,gBAAgB;IAC/B,qFAAqF;IACrF,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gFAAgF;IAChF,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,cAAc;IAC7B,SAAS,CACP,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EAAE,EACd,GAAG,EAAE,MAAM,GACV,OAAO,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACjE,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAClE;AA6BD;;;;;;;;GAQG;AACH,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,OAAO,EAAE,gBAAgB,EACzB,KAAK,GAAE,cAA6B,GACnC,OAAO,CAAC,aAAa,CAAC,CAWxB"}

package/dist/pr/index.js

@@ -0,0 +1,256 @@
+import { mkdirSync, rmSync, writeFileSync } from 'node:fs';
+import { dirname, join } from 'node:path';
+import { formatMarkerHits, scanRefChangedForMarkers } from '../lib/conflict-markers.js';
+import { isRecord, readJson } from '../lib/json.js';
+import { run, runResult } from '../lib/run.js';
+const defaultShell = {
+    runResult: (command, args, cwd) => runResult(command, args, cwd),
+    run: (command, args, cwd) => run(command, args, cwd),
+};
+/**
+ * Agent-first conflict resolution for a GitHub PR.
+ *
+ * First run (pointed at a PR): reports the conflict markers and, if any, checks
+ * out the PR branch and instructs the next step. Second run (on that branch,
+ * after the human/agent has resolved + committed): verifies no markers remain,
+ * pushes, and returns to the original branch. Idempotent via a state file under
+ * the git dir.
+ */
+export async function resolvePrConflicts(root, prArg, options, shell = defaultShell) {
+    const statePath = join(await absoluteGitDir(shell, root), 'smoo', 'pr-resolve.json');
+    const state = readState(statePath);
+    if (options.abort === true) {
+        return abortResolve(shell, root, statePath, state);
+    }
+    if (state) {
+        return finishResolve(shell, root, statePath, state, prArg);
+    }
+    return startResolve(shell, root, statePath, prArg, options.remote);
+}
+async function startResolve(shell, root, statePath, prArg, remoteOption) {
+    if (!prArg) {
+        console.error('Point smoo at a PR: smoo pr resolve <number|url|branch> [--remote <name>]');
+        return 1;
+    }
+    if (!(await isWorkingTreeClean(shell, root))) {
+        console.error('Working tree is dirty. Commit or stash your changes before resolving a PR.');
+        return 1;
+    }
+    const meta = await prMeta(shell, root, prArg);
+    const remote = remoteOption ?? (await inferRemote(shell, root, meta.nameWithOwner));
+    await fetchBranches(shell, root, remote, [meta.baseBranch, meta.headBranch]);
+    const baseRef = `${remote}/${meta.baseBranch}`;
+    const headRef = `${remote}/${meta.headBranch}`;
+    const hits = await scanRefChangedForMarkers(shell, root, baseRef, headRef);
+    if (hits.length === 0) {
+        console.log(`✅ PR #${meta.number} (${meta.headBranch} → ${meta.baseBranch}) has no conflict markers — nothing to resolve.`);
+        console.log('Next: it is safe to Rebase-and-merge.');
+        return 0;
+    }
+    const originalBranch = await currentBranch(shell, root);
+    const originalSha = (await mustRun(shell, root, ['rev-parse', 'HEAD'])).trim();
+    await checkoutPrBranch(shell, root, remote, meta);
+    writeState(statePath, {
+        pr: meta.number,
+        url: meta.url,
+        headBranch: meta.headBranch,
+        baseBranch: meta.baseBranch,
+        remote,
+        crossRepo: meta.crossRepo,
+        originalBranch,
+        originalSha,
+        startedAt: new Date().toISOString(),
+    });
+    const fileCount = hits.length;
+    console.log(`⚠️  PR #${meta.number} has conflict markers in ${fileCount} file${fileCount === 1 ? '' : 's'}:`);
+    console.log(formatMarkerHits(hits));
+    console.log('');
+    console.log(`Checked out '${meta.headBranch}' (was on '${originalBranch || originalSha.slice(0, 8)}').`);
+    console.log('Next:');
+    console.log('  1. Resolve each <<<<<<< / ======= / >>>>>>> block (keep the right content, delete the markers).');
+    console.log('  2. Commit the resolution:  git add -A && git commit');
+    console.log('  3. Run the SAME command again to verify, push, and return:  smoo pr resolve');
+    return 2;
+}
+async function finishResolve(shell, root, statePath, state, prArg) {
+    if (prArg && !prArgMatchesState(prArg, state)) {
+        console.error(`A resolution for PR #${state.pr} (${state.headBranch}) is already in progress.\n` +
+            'Finish it with `smoo pr resolve` (no argument), or discard it with `smoo pr resolve --abort`.');
+        return 1;
+    }
+    const branch = await currentBranch(shell, root);
+    if (branch !== state.headBranch) {
+        console.error(`Expected to be on '${state.headBranch}' to finish resolving PR #${state.pr}, but HEAD is '${branch || 'detached'}'.\n` +
+            `Check out the branch (git checkout ${state.headBranch}) or discard with \`smoo pr resolve --abort\`.`);
+        return 1;
+    }
+    if (!(await isWorkingTreeClean(shell, root))) {
+        console.error('Your resolution is not committed yet.');
+        console.error('Next: git add -A && git commit   — then run `smoo pr resolve` again.');
+        return 2;
+    }
+    await fetchBranches(shell, root, state.remote, [state.baseBranch]);
+    const hits = await scanRefChangedForMarkers(shell, root, `${state.remote}/${state.baseBranch}`, 'HEAD');
+    if (hits.length > 0) {
+        console.error(`Conflict markers still present in ${hits.length} file(s):`);
+        console.error(formatMarkerHits(hits));
+        console.error('Next: resolve the remaining markers, commit, then run `smoo pr resolve` again.');
+        return 2;
+    }
+    await pushResolvedBranch(shell, root, state);
+    await restoreOriginalBranch(shell, root, state);
+    clearState(statePath);
+    const back = state.originalBranch || state.originalSha.slice(0, 8);
+    console.log(`✅ Resolved PR #${state.pr}: pushed '${state.headBranch}' to '${state.remote}' and returned to '${back}'.`);
+    console.log(`Next: PR #${state.pr} is clean now — mark it Ready / Rebase-and-merge.`);
+    return 0;
+}
+async function abortResolve(shell, root, statePath, state) {
+    if (!state) {
+        console.log('No conflict resolution in progress.');
+        return 0;
+    }
+    await restoreOriginalBranch(shell, root, state);
+    clearState(statePath);
+    const back = state.originalBranch || state.originalSha.slice(0, 8);
+    console.log(`Aborted resolution of PR #${state.pr}; returned to '${back}'. The PR branch is unchanged.`);
+    return 0;
+}
+async function prMeta(shell, root, prArg) {
+    const fields = 'number,url,headRefName,baseRefName,isCrossRepository';
+    const result = await shell.runResult('gh', ['pr', 'view', prArg, '--json', fields], root);
+    if (result.exitCode !== 0) {
+        throw new Error(`Could not resolve PR '${prArg}' via gh: ${result.stderr.trim() || `exit ${result.exitCode}`}`);
+    }
+    const raw = JSON.parse(result.stdout);
+    if (!isRecord(raw)) {
+        throw new Error(`gh pr view returned unexpected JSON for '${prArg}'.`);
+    }
+    const { number, url, headRefName, baseRefName } = raw;
+    if (typeof number !== 'number' ||
+        typeof url !== 'string' ||
+        typeof headRefName !== 'string' ||
+        typeof baseRefName !== 'string') {
+        throw new Error(`gh pr view JSON for '${prArg}' is missing expected fields.`);
+    }
+    const match = /github\.com\/([^/]+\/[^/]+)\/pull\//.exec(url);
+    return {
+        number,
+        url,
+        headBranch: headRefName,
+        baseBranch: baseRefName,
+        crossRepo: raw.isCrossRepository === true,
+        nameWithOwner: match ? match[1] : '',
+    };
+}
+/** Pick the git remote whose URL points at `nameWithOwner`; fall back to origin. */
+async function inferRemote(shell, root, nameWithOwner) {
+    if (nameWithOwner.length === 0) {
+        return 'origin';
+    }
+    const result = await shell.runResult('git', ['remote', '-v'], root);
+    const needle = nameWithOwner.toLowerCase();
+    for (const line of result.stdout.split('\n')) {
+        const [name, url] = line.split(/\s+/);
+        if (name && url?.toLowerCase().includes(needle)) {
+            return name;
+        }
+    }
+    return 'origin';
+}
+async function checkoutPrBranch(shell, root, remote, meta) {
+    if (meta.crossRepo) {
+        // Fork PR: let gh set up the fork remote + tracking branch correctly.
+        await shell.run('gh', ['pr', 'checkout', String(meta.number)], root);
+        return;
+    }
+    await shell.run('git', ['checkout', '-B', meta.headBranch, `${remote}/${meta.headBranch}`], root);
+}
+async function pushResolvedBranch(shell, root, state) {
+    const refspec = `HEAD:refs/heads/${state.headBranch}`;
+    const ff = await shell.runResult('git', ['push', state.remote, refspec], root);
+    if (ff.exitCode === 0) {
+        return;
+    }
+    // The resolution may have been rebased/amended onto a moved head; the branch is
+    // the review branch we own, so force-with-lease is the safe way to update it.
+    console.log('Fast-forward push rejected; retrying with --force-with-lease (review branch).');
+    const forced = await shell.runResult('git', ['push', '--force-with-lease', state.remote, refspec], root);
+    if (forced.exitCode !== 0) {
+        throw new Error(`Failed to push '${state.headBranch}' to '${state.remote}': ${forced.stderr.trim() || ff.stderr.trim()}`);
+    }
+}
+async function restoreOriginalBranch(shell, root, state) {
+    const target = state.originalBranch.length > 0 ? state.originalBranch : state.originalSha;
+    await shell.run('git', ['checkout', target], root);
+}
+async function fetchBranches(shell, root, remote, branches) {
+    const refspecs = branches.map((branch) => `+refs/heads/${branch}:refs/remotes/${remote}/${branch}`);
+    await shell.run('git', ['fetch', remote, ...refspecs], root);
+}
+async function currentBranch(shell, root) {
+    const result = await shell.runResult('git', ['symbolic-ref', '--quiet', '--short', 'HEAD'], root);
+    return result.exitCode === 0 ? result.stdout.trim() : '';
+}
+async function isWorkingTreeClean(shell, root) {
+    const result = await shell.runResult('git', ['status', '--porcelain'], root);
+    return result.exitCode === 0 && result.stdout.trim().length === 0;
+}
+async function absoluteGitDir(shell, root) {
+    const result = await shell.runResult('git', ['rev-parse', '--absolute-git-dir'], root);
+    if (result.exitCode !== 0) {
+        throw new Error(`Not a git repository at ${root}: ${result.stderr.trim()}`);
+    }
+    return result.stdout.trim();
+}
+async function mustRun(shell, root, args) {
+    const result = await shell.runResult('git', args, root);
+    if (result.exitCode !== 0) {
+        throw new Error(`git ${args.join(' ')} failed: ${result.stderr.trim() || `exit ${result.exitCode}`}`);
+    }
+    return result.stdout;
+}
+function prArgMatchesState(prArg, state) {
+    if (prArg === state.headBranch || prArg === state.url) {
+        return true;
+    }
+    const numeric = prArg.startsWith('#') ? prArg.slice(1) : prArg;
+    return numeric === String(state.pr);
+}
+function readState(statePath) {
+    let raw;
+    try {
+        raw = readJson(statePath);
+    }
+    catch {
+        return null;
+    }
+    if (!isRecord(raw)) {
+        return null;
+    }
+    const { pr, url, headBranch, baseBranch, remote, crossRepo, originalBranch, originalSha, startedAt } = raw;
+    if (typeof pr !== 'number' ||
+        typeof headBranch !== 'string' ||
+        typeof baseBranch !== 'string' ||
+        typeof remote !== 'string') {
+        return null;
+    }
+    return {
+        pr,
+        url: typeof url === 'string' ? url : '',
+        headBranch,
+        baseBranch,
+        remote,
+        crossRepo: crossRepo === true,
+        originalBranch: typeof originalBranch === 'string' ? originalBranch : '',
+        originalSha: typeof originalSha === 'string' ? originalSha : '',
+        startedAt: typeof startedAt === 'string' ? startedAt : '',
+    };
+}
+function writeState(statePath, state) {
+    mkdirSync(dirname(statePath), { recursive: true });
+    writeFileSync(statePath, `${JSON.stringify(state, null, 2)}\n`);
+}
+function clearState(statePath) {
+    rmSync(statePath, { force: true });
+}

package/dist/release/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/release/index.ts"],"names":[],"mappings":"AAWA,OAAO,EACL,KAAK,2BAA2B,EAIjC,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAML,KAAK,kBAAkB,EAGxB,MAAM,WAAW,CAAC;AAkBnB,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,2BAA2B;IAC1C,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,4BAA4B;IAC3C,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB;AAED,MAAM,WAAW,kCAAkC;IACjD,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB;AAED,MAAM,WAAW,8BAA8B;IAC7C,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,wBAAsB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CAwBhG;AAED,wBAAsB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CA6ChG;AAED,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,2BAA2B,GAAG,OAAO,CAAC,IAAI,CAAC,CAmB5G;AAED,wBAAsB,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,4BAA4B,GAAG,OAAO,CAAC,IAAI,CAAC,CAkC9G;AAED,MAAM,WAAW,mBAAmB,CAAC,OAAO,SAAS,kBAAkB,GAAG,kBAAkB;IAC1F,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,mBAAmB,IAAI,OAAO,EAAE,CAAC;IACjC,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9C,oBAAoB,CAAC,OAAO,EAAE,2BAA2B,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;IAC/E,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAC3G,iBAAiB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;IAC7D,GAAG,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B;AAED,MAAM,MAAM,oBAAoB,GAAG,YAAY,GAAG,oBAAoB,CAAC;AAEvE,MAAM,WAAW,gBAAgB;IAC/B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,wBAAsB,0BAA0B,CAAC,OAAO,SAAS,kBAAkB,EACjF,KAAK,EAAE,mBAAmB,CAAC,OAAO,CAAC,EACnC,OAAO,EAAE,4BAA4B,GACpC,OAAO,CAAC,IAAI,CAAC,CAuEf;AAuCD,wBAAsB,2BAA2B,CAC/C,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,kCAAkC,GAC1C,OAAO,CAAC,IAAI,CAAC,CAiBf;AAED,wBAAsB,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,8BAA8B,GAAG,OAAO,CAAC,IAAI,CAAC,CAelH;AAED,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAEnE;AAkkCD,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAe9F"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/release/index.ts"],"names":[],"mappings":"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"}

package/dist/release/index.js

@@ -4,6 +4,7 @@ import { join } from 'node:path';
 import { createInterface } from 'node:readline/promises';
 import { Writable } from 'node:stream';
 import { $ } from 'bun';
+import { assertNoConflictMarkers } from '../lib/conflict-markers.js';
 import { withDevenvEnv } from '../lib/devenv.js';
 import { isRecord, readJsonObject, stringProperty } from '../lib/json.js';
 import { decode, run, runInteractiveStatus, runResult, runStatus } from '../lib/run.js';
@@ -39,6 +40,10 @@ export async function releaseVersion(root, options) {
     await writeReleaseGithubOutput(options.githubOutput, result.packages, result.mode);
 }
 export async function releasePublish(root, options) {
+    // Never publish a tree carrying unresolved conflict markers (e.g. a merged
+    // review branch that still had markers). Enforced here so every smoo-managed
+    // repo's template publish step inherits it. See `smoo pr resolve`.
+    await assertNoConflictMarkers({ runResult }, root, 'publish');
     const bump = releaseBumpArg(options.bump);
     const packages = await releasePackagesAtHead(root, releasePackages(root));
     if (packages.length === 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smoothbricks/cli",
-  "version": "0.4.3",
+  "version": "0.5.0",
   "type": "module",
   "description": "SmoothBricks monorepo automation CLI",
   "bin": {

package/src/cli.ts

@@ -2,6 +2,7 @@ import { Command, CommanderError } from 'commander';
 import { variants } from './generate/index.js';
 import { cliPackageVersion } from './lib/cli-package.js';
 import { findRepoRoot } from './lib/run.js';
+import { resolvePrConflicts } from './pr/index.js';
 
 export async function runCli(argv = process.argv.slice(2)): Promise<void> {
   const program = buildProgram();
@@ -341,6 +342,18 @@ function buildProgram(): Command {
       },
     );
 
+  const pr = program.command('pr').description('Work with GitHub pull requests');
+  pr.command('resolve [pr]')
+    .description('Resolve conflict markers in a PR (agent-first, two-phase)')
+    .option('--remote <name>', 'git remote hosting the PR branch (auto-inferred when omitted)')
+    .option('--abort', 'discard an in-progress resolution and return to the original branch')
+    .action(async (prArg: string | undefined, options: { remote?: string; abort?: boolean }) => {
+      const exitCode = await resolvePrConflicts(await findRepoRoot(), prArg, options);
+      if (exitCode !== 0) {
+        process.exitCode = exitCode;
+      }
+    });
+
   return program;
 }