@smoothbricks/cli 0.4.2 → 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/lib/run.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/lib/run.ts"],"names":[],"mappings":"AAMA,wBAAsB,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAKnH;AAED,wBAAsB,SAAS,CAC7B,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EAAE,EACd,GAAG,EAAE,MAAM,EACX,KAAK,UAAQ,EACb,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC3B,OAAO,CAAC,MAAM,CAAC,CAQjB;AAED,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EAAE,EACd,GAAG,EAAE,MAAM,EACX,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC3B,OAAO,CAAC,MAAM,CAAC,CAiBjB;AAED,wBAAsB,SAAS,CAC7B,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EAAE,EACd,GAAG,EAAE,MAAM,EACX,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC3B,OAAO,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAY/D;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAOvE;AAuCD,wBAAsB,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC,CAMpD;AAED,wBAAgB,MAAM,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,CAEhD"}
+{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/lib/run.ts"],"names":[],"mappings":"AAMA,wBAAsB,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAKnH;AAED,wBAAsB,SAAS,CAC7B,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EAAE,EACd,GAAG,EAAE,MAAM,EACX,KAAK,UAAQ,EACb,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC3B,OAAO,CAAC,MAAM,CAAC,CAQjB;AAED,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EAAE,EACd,GAAG,EAAE,MAAM,EACX,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC3B,OAAO,CAAC,MAAM,CAAC,CAiBjB;AAED,wBAAsB,SAAS,CAC7B,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EAAE,EACd,GAAG,EAAE,MAAM,EACX,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC3B,OAAO,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAY/D;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAOvE;AAmCD,wBAAsB,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC,CAMpD;AAED,wBAAgB,MAAM,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,CAEhD"}

package/dist/lib/run.js

@@ -1,6 +1,6 @@
 import { spawn } from 'node:child_process';
 import { existsSync } from 'node:fs';
-import { dirname, join } from 'node:path';
+import { join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { $ } from 'bun';
 export async function run(command, args, cwd, env) {
@@ -82,10 +82,6 @@ function resolveBundledCommand(command) {
         if (command === 'sherif') {
             return fileURLToPath(import.meta.resolve('sherif'));
         }
-        if (command === 'attw') {
-            const packageJson = fileURLToPath(import.meta.resolve('@arethetypeswrong/cli/package.json'));
-            return join(dirname(packageJson), 'dist', 'index.js');
-        }
     }
     catch {
         return null;

package/dist/monorepo/packed-package.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"packed-package.d.ts","sourceRoot":"","sources":["../../src/monorepo/packed-package.ts"],"names":[],"mappings":"AAUA,wBAAsB,4BAA4B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAMhF;AAED,wBAAsB,kCAAkC,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAMtF;AAED,wBAAsB,mCAAmC,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAMvF;AAED,wBAAsB,gCAAgC,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAMpF"}
+{"version":3,"file":"packed-package.d.ts","sourceRoot":"","sources":["../../src/monorepo/packed-package.ts"],"names":[],"mappings":"AAYA,wBAAsB,4BAA4B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAMhF;AAED,wBAAsB,kCAAkC,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAMtF;AAED,wBAAsB,mCAAmC,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAMvF;AAED,wBAAsB,gCAAgC,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAMpF"}

package/dist/monorepo/packed-package.js

@@ -1,5 +1,7 @@
-import { readFileSync, rmSync, unlinkSync } from 'node:fs';
-import { join } from 'node:path';
+import { mkdtempSync, readdirSync, readFileSync, rmSync, statSync, unlinkSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { dirname, join, relative } from 'node:path';
+import { fileURLToPath, pathToFileURL } from 'node:url';
 import { publint } from 'publint';
 import { formatMessage } from 'publint/utils';
 import { isRecord } from '../lib/json.js';
@@ -65,37 +67,143 @@ async function validatePackedManifest(root, pkg, packed) {
     return failures;
 }
 async function validateAttw(root, pkg, packed) {
-    const attwArgs = [
-        packed.path,
-        '--format',
-        'ascii',
-        '--no-color',
-        '--profile',
-        'node16',
-        '--ignore-rules',
-        'cjs-resolves-to-esm',
-        ...attwExcludedEntrypointArgs(pkg),
-    ];
-    const attw = await runResult('attw', attwArgs, root);
-    if (attw.exitCode === 0) {
+    const attw = await loadAttwCore();
+    const analysis = await attw.checkPackage(await createAttwPackageFromTarball(attw, root, packed.path), {
+        excludeEntrypoints: wasmExportEntrypoints(pkg.json.exports),
+    });
+    if (!isRecord(analysis) || analysis.types === false) {
         return 0;
     }
-    printAttwOutput(attw.stdout);
-    printAttwOutput(attw.stderr);
+    const rawProblems = Array.isArray(analysis.problems) ? analysis.problems : [];
+    const problems = rawProblems.filter(isReportedAttwProblem);
+    if (problems.length === 0) {
+        return 0;
+    }
+    for (const problem of problems) {
+        console.error(`${pkg.path}: are-the-types-wrong ${problem.kind}${formatProblemLocation(problem)}`);
+    }
     console.error(`${pkg.path}: are-the-types-wrong validation failed`);
     return 1;
 }
-function printAttwOutput(output) {
-    for (const line of output.split('\n')) {
-        if (!line || line.includes('(ignored)')) {
+async function loadAttwCore() {
+    const packageJson = fileURLToPath(import.meta.resolve('@arethetypeswrong/core/package.json'));
+    const core = await import(pathToFileURL(join(dirname(packageJson), 'dist', 'index.js')).href);
+    if (!isRecord(core)) {
+        throw new Error('@arethetypeswrong/core does not expose the expected API');
+    }
+    const PackageConstructor = core.Package;
+    const checkPackage = core.checkPackage;
+    if (typeof PackageConstructor !== 'function' || typeof checkPackage !== 'function') {
+        throw new Error('@arethetypeswrong/core does not expose the expected API');
+    }
+    return {
+        createPackage: (files, packageName, packageVersion) => Reflect.construct(PackageConstructor, [files, packageName, packageVersion]),
+        checkPackage: (pkg, options) => Promise.resolve(checkPackage(pkg, options)),
+    };
+}
+async function createAttwPackageFromTarball(attw, root, tarballPath) {
+    const temp = mkdtempSync(join(tmpdir(), 'smoo-attw-'));
+    try {
+        const extract = await runResult('tar', ['-xzf', tarballPath, '-C', temp], root);
+        if (extract.exitCode !== 0) {
+            printCommandOutput(extract.stdout, extract.stderr);
+            throw new Error('unable to extract packed package for are-the-types-wrong');
+        }
+        return createAttwPackageFromDirectory(attw, join(temp, 'package'));
+    }
+    finally {
+        rmSync(temp, { recursive: true, force: true });
+    }
+}
+function createAttwPackageFromDirectory(attw, packageDir) {
+    const packageJson = readJsonFile(join(packageDir, 'package.json'));
+    const packageName = typeof packageJson.name === 'string' ? packageJson.name : null;
+    const packageVersion = typeof packageJson.version === 'string' ? packageJson.version : null;
+    if (!packageName || !packageVersion) {
+        throw new Error('packed package.json must contain name and version');
+    }
+    const files = {};
+    collectAttwFiles(packageDir, packageDir, packageName, files);
+    return attw.createPackage(files, packageName, packageVersion);
+}
+function collectAttwFiles(root, current, packageName, files) {
+    for (const entry of readdirSync(current)) {
+        const path = join(current, entry);
+        const stat = statSync(path);
+        if (stat.isDirectory()) {
+            collectAttwFiles(root, path, packageName, files);
             continue;
         }
-        console.error(line);
+        if (!stat.isFile()) {
+            continue;
+        }
+        const packageRelativePath = relative(root, path).split('\\').join('/');
+        files[`/node_modules/${packageName}/${packageRelativePath}`] = new Uint8Array(readFileSync(path));
+    }
+}
+function readJsonFile(path) {
+    const parsed = JSON.parse(readFileSync(path, 'utf8'));
+    if (!isRecord(parsed)) {
+        throw new Error(`${path} is not a JSON object`);
+    }
+    return parsed;
+}
+function isReportedAttwProblem(problem) {
+    if (!isRecord(problem) || typeof problem.kind !== 'string') {
+        return false;
+    }
+    const flag = attwProblemFlag(problem.kind);
+    if (flag === 'cjs-resolves-to-esm') {
+        return false;
     }
+    return problem.resolutionKind !== 'node10';
 }
-function attwExcludedEntrypointArgs(pkg) {
-    const excluded = wasmExportEntrypoints(pkg.json.exports);
-    return excluded.length === 0 ? [] : ['--exclude-entrypoints', ...excluded];
+function attwProblemFlag(kind) {
+    switch (kind) {
+        case 'NoResolution':
+            return 'no-resolution';
+        case 'UntypedResolution':
+            return 'untyped-resolution';
+        case 'FalseCJS':
+            return 'false-cjs';
+        case 'FalseESM':
+            return 'false-esm';
+        case 'CJSResolvesToESM':
+            return 'cjs-resolves-to-esm';
+        case 'FallbackCondition':
+            return 'fallback-condition';
+        case 'CJSOnlyExportsDefault':
+            return 'cjs-only-exports-default';
+        case 'NamedExports':
+            return 'named-exports';
+        case 'FalseExportDefault':
+            return 'false-export-default';
+        case 'MissingExportEquals':
+            return 'missing-export-equals';
+        case 'UnexpectedModuleSyntax':
+            return 'unexpected-module-syntax';
+        case 'InternalResolutionError':
+            return 'internal-resolution-error';
+        default:
+            return null;
+    }
+}
+function formatProblemLocation(problem) {
+    if (!isRecord(problem)) {
+        return '';
+    }
+    const entrypoint = typeof problem.entrypoint === 'string' ? ` ${problem.entrypoint}` : '';
+    const resolution = typeof problem.resolutionKind === 'string' ? ` ${formatResolutionKind(problem.resolutionKind)}` : '';
+    return `${entrypoint}${resolution}`;
+}
+function formatResolutionKind(kind) {
+    if (kind === 'node16-cjs') {
+        return 'node16 (from CJS)';
+    }
+    if (kind === 'node16-esm') {
+        return 'node16 (from ESM)';
+    }
+    return kind;
 }
 function wasmExportEntrypoints(exports) {
     if (!isRecord(exports)) {

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