@nodesify/astria 1.0.11 → 1.1.0

package/dist/commands/merge-driver.js

@@ -0,0 +1,186 @@
+"use strict";
+// Git merge driver for the knowledge graph artifact. Parallel branches both
+// rebuild the graph and both commit `.astria/graph.json` — plain git sees
+// JSON line noise and conflicts. This driver performs a 3-way union merge
+// over the graph structure so both branches' additions survive:
+//
+//   nodes/edges/hyperedges: union by key with classic 3-way field
+//     resolution (unchanged side takes the changed side; both changed keeps
+//     ours); a side's deletion of an entry is respected.
+//   communities: derived data — take whichever side changed from base;
+//     the next `astria update` re-clusters anyway.
+//
+// Git wiring (done by `astria merge-driver install`):
+//   .gitattributes:  .astria/graph.json merge=astria
+//   .git/config:     merge.astria.driver = astria merge-driver run %O %A %B %P
+//
+// Exit 0 = merged cleanly (the merged graph is written over %A); exit 1 =
+// unmergeable input (git falls back to a conflict).
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.threeWayUnion = threeWayUnion;
+exports.mergeDriverRun = mergeDriverRun;
+exports.mergeDriverInstall = mergeDriverInstall;
+exports.mergeDriverUninstall = mergeDriverUninstall;
+const fs_1 = require("fs");
+const child_process_1 = require("child_process");
+const path_1 = require("path");
+const GRAPH_JSON_PATH = '.astria/graph.json';
+const REPORT_PATH = '.astria/graph_report.md';
+function loadJson(path, label) {
+    try {
+        return JSON.parse((0, fs_1.readFileSync)(path, 'utf-8'));
+    }
+    catch (e) {
+        throw new Error(`cannot read ${label} (${path}): ${e.message || e}`);
+    }
+}
+/// Classic 3-way field resolution for two versions of one object.
+/// Unchanged-on-both-sides, changed-on-one-side, and agree-on-both cases
+/// collapse; genuine divergence keeps ours (git's own convention).
+function mergeFields(base, ours, theirs) {
+    const out = {};
+    const keys = new Set([...Object.keys(ours), ...Object.keys(theirs)]);
+    for (const key of keys) {
+        const o = ours[key];
+        const t = theirs[key];
+        const b = base ? base[key] : undefined;
+        if (JSON.stringify(o) === JSON.stringify(t)) {
+            out[key] = o;
+        }
+        else if (JSON.stringify(o) === JSON.stringify(b)) {
+            out[key] = t; // only theirs changed
+        }
+        else if (JSON.stringify(t) === JSON.stringify(b)) {
+            out[key] = o; // only ours changed
+        }
+        else {
+            out[key] = o; // both changed differently — ours wins
+        }
+    }
+    return out;
+}
+/// 3-way union over arrays of objects keyed by `key(entry)`. An entry that
+/// exists only on one side and not in base is that side's addition; one in
+/// base but missing from a side is that side's deletion.
+function threeWayUnion(baseEntries, oursEntries, theirsEntries, keyOf) {
+    const index = (entries) => new Map(entries.map((e) => [keyOf(e), e]));
+    const base = index(baseEntries);
+    const ours = index(oursEntries);
+    const theirs = index(theirsEntries);
+    const keys = new Set([...base.keys(), ...ours.keys(), ...theirs.keys()]);
+    const merged = [];
+    for (const key of [...keys].sort()) {
+        const b = base.get(key);
+        const o = ours.get(key);
+        const t = theirs.get(key);
+        if (o && t) {
+            merged.push(mergeFields(b, o, t));
+        }
+        else if (o) {
+            if (!b)
+                merged.push(o); // ours added it
+            // else theirs deleted it — drop
+        }
+        else if (t) {
+            if (!b)
+                merged.push(t); // theirs added it
+            // else ours deleted it — drop
+        }
+        // both deleted, or vanished both sides — drop
+    }
+    return merged;
+}
+/// Communities are derived (re-clustered on every build): whichever side
+/// moved away from base wins wholesale; identical sides stay identical.
+function mergeCommunities(base, ours, theirs) {
+    if (base && JSON.stringify(ours) === JSON.stringify(base.communities))
+        return theirs;
+    return ours;
+}
+function mergeGraphs(base, ours, theirs) {
+    const arr = (graph, name) => Array.isArray(graph[name]) ? graph[name] : [];
+    return {
+        nodes: threeWayUnion(arr(base, 'nodes'), arr(ours, 'nodes'), arr(theirs, 'nodes'), (n) => String(n.id)),
+        edges: threeWayUnion(arr(base, 'edges'), arr(ours, 'edges'), arr(theirs, 'edges'), (e) => `${e.source}|${e.target}|${e.relation}`),
+        hyperedges: threeWayUnion(arr(base, 'hyperedges'), arr(ours, 'hyperedges'), arr(theirs, 'hyperedges'), (h) => String(h.id)),
+        communities: mergeCommunities(base, arr(ours, 'communities'), arr(theirs, 'communities')),
+    };
+}
+/// The `git merge` driver entry: base, ours (written in place), theirs,
+/// then git's path argument.
+function mergeDriverRun(basePath, oursPath, theirsPath) {
+    try {
+        const base = (0, fs_1.existsSync)(basePath) ? loadJson(basePath, 'base graph') : { nodes: [], edges: [], hyperedges: [], communities: [] };
+        const ours = loadJson(oursPath, 'ours');
+        const theirs = loadJson(theirsPath, 'theirs');
+        const merged = mergeGraphs(base, ours, theirs);
+        (0, fs_1.writeFileSync)(oursPath, JSON.stringify(merged, null, 2) + '\n');
+        const n = merged.nodes.length;
+        const e = merged.edges.length;
+        console.log(`astria merge-driver: union-merged graph.json (${n} nodes, ${e} edges)`);
+        return 0;
+    }
+    catch (e) {
+        console.error(`astria merge-driver: ${e.message || e}`);
+        console.error('falling back to a git conflict on .astria/graph.json');
+        return 1;
+    }
+}
+function gitConfigGet(key) {
+    try {
+        return (0, child_process_1.execFileSync)('git', ['config', '--get', key], { encoding: 'utf-8' }).trim() || null;
+    }
+    catch {
+        return null;
+    }
+}
+/// Idempotent install: .gitattributes entry + git config driver definition.
+function mergeDriverInstall(projectDir) {
+    const messages = [];
+    const attributesPath = (0, path_1.join)(projectDir, '.gitattributes');
+    const graphEntry = `${GRAPH_JSON_PATH} merge=astria`;
+    const reportEntry = `${REPORT_PATH} merge=union`;
+    let attributes = (0, fs_1.existsSync)(attributesPath) ? (0, fs_1.readFileSync)(attributesPath, 'utf-8') : '';
+    let changed = false;
+    for (const entry of [graphEntry, reportEntry]) {
+        if (!attributes.split('\n').some((line) => line.trim() === entry)) {
+            if (attributes && !attributes.endsWith('\n'))
+                attributes += '\n';
+            attributes += entry + '\n';
+            changed = true;
+            messages.push(`.gitattributes: ${entry}`);
+        }
+    }
+    if (changed)
+        (0, fs_1.writeFileSync)(attributesPath, attributes);
+    (0, child_process_1.execFileSync)('git', ['config', 'merge.astria.name', 'astria knowledge graph union-merge'], { cwd: projectDir });
+    (0, child_process_1.execFileSync)('git', ['config', 'merge.astria.driver', 'astria merge-driver run %O %A %B %P'], { cwd: projectDir });
+    messages.push('git config: merge.astria.driver = astria merge-driver run %O %A %B %P');
+    messages.push('committed .astria/graph.json files on parallel branches now union-merge automatically');
+    return messages;
+}
+function mergeDriverUninstall(projectDir) {
+    const messages = [];
+    const attributesPath = (0, path_1.join)(projectDir, '.gitattributes');
+    if ((0, fs_1.existsSync)(attributesPath)) {
+        const kept = (0, fs_1.readFileSync)(attributesPath, 'utf-8')
+            .split('\n')
+            .filter((line) => {
+            const t = line.trim();
+            return t !== `${GRAPH_JSON_PATH} merge=astria` && t !== `${REPORT_PATH} merge=union` && t !== '';
+        });
+        (0, fs_1.writeFileSync)(attributesPath, kept.length ? kept.join('\n') + '\n' : '');
+        messages.push('.gitattributes: astria merge entries removed');
+    }
+    for (const key of ['merge.astria.name', 'merge.astria.driver']) {
+        try {
+            (0, child_process_1.execFileSync)('git', ['config', '--unset', key], { cwd: projectDir, stdio: 'pipe' });
+            messages.push(`git config: ${key} removed`);
+        }
+        catch {
+            // never set — fine
+        }
+    }
+    return messages;
+}
+//# sourceMappingURL=merge-driver.js.map

package/dist/commands/merge-driver.js.map

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

package/dist/commands/merge-gate.d.ts

@@ -0,0 +1,14 @@
+export interface MergeGateOptions {
+    graph: string;
+    maxAgeHours?: string;
+    minHealth?: string;
+    maxRisk?: string;
+    staged?: boolean;
+    /** Score the committed diff `base...head` instead of the working tree (CI/PR mode). */
+    base?: string;
+    /** Head ref of the range; defaults to HEAD when --base is given. */
+    head?: string;
+    json?: boolean;
+}
+export declare function mergeGateCommand(opts: MergeGateOptions): Promise<void>;
+//# sourceMappingURL=merge-gate.d.ts.map

package/dist/commands/merge-gate.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-gate.d.ts","sourceRoot":"","sources":["../../src/commands/merge-gate.ts"],"names":[],"mappings":"AAqBA,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,uFAAuF;IACvF,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,oEAAoE;IACpE,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAoCD,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,gBAAgB,iBA8K5D"}

package/dist/commands/merge-gate.js

@@ -0,0 +1,220 @@
+"use strict";
+// Merge gate: the OSS-side artifact of the hosted tier's "merge-gate
+// verification". A CI command that refuses to merge on a stale, missing, or
+// unhealthy graph, and quantifies the blast radius of the pending diff:
+//
+//   astria merge-gate --max-age-hours 24 --min-health 60 --max-risk 70
+//
+// Exit 0 = pass (green), exit 1 = fail with the failing checks listed —
+// wire it into CI or a GitHub required check. `--json` for the hosted
+// pipeline to consume.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeGateCommand = mergeGateCommand;
+const child_process_1 = require("child_process");
+const fs_1 = require("fs");
+const path_1 = require("path");
+const native_1 = require("../native");
+const BOLD = '\x1b[1m';
+const GREEN = '\x1b[32m';
+const RED = '\x1b[31m';
+const DIM = '\x1b[2m';
+const RESET = '\x1b[0m';
+// Git work-tree detection that distinguishes the three outcomes: inside a
+// work tree, genuinely outside one (exit 128 + "not a git repository"), or
+// the git invocation FAILED (git missing, broken index, ...). A failure is
+// an error string — never a silent "not a repository" skip, which would
+// let the gate pass without the diff-risk check it promised.
+function gitWorkTreeStatus(projectRoot) {
+    try {
+        const out = (0, child_process_1.execFileSync)('git', ['rev-parse', '--is-inside-work-tree'], {
+            cwd: projectRoot,
+            encoding: 'utf8',
+            stdio: ['pipe', 'pipe', 'pipe'],
+        });
+        return { inside: out.trim() === 'true', error: null };
+    }
+    catch (e) {
+        const stderr = String(e?.stderr ?? '');
+        if (e?.status === 128 && /not a git repository/i.test(stderr)) {
+            return { inside: false, error: null };
+        }
+        if (e?.code === 'ENOENT') {
+            return { inside: false, error: 'git executable not found on PATH' };
+        }
+        return {
+            inside: false,
+            error: (stderr || e?.message || String(e)).trim().split('\n').pop() || 'git failed',
+        };
+    }
+}
+async function mergeGateCommand(opts) {
+    try {
+        const maxAgeHours = opts.maxAgeHours !== undefined ? Number(opts.maxAgeHours) : 24;
+        const minHealth = opts.minHealth !== undefined ? Number(opts.minHealth) : 60;
+        const maxRisk = opts.maxRisk !== undefined ? Number(opts.maxRisk) : 70;
+        for (const [name, value] of [['--max-age-hours', maxAgeHours], ['--min-health', minHealth], ['--max-risk', maxRisk]]) {
+            if (!Number.isFinite(value))
+                throw new Error(`invalid ${name}: not a number`);
+        }
+        const checks = [];
+        const dbPath = (0, path_1.join)(opts.graph, '.astria', 'db.sqlite');
+        // 1. The graph exists and carries build provenance.
+        let build = null;
+        try {
+            build = (0, native_1.graphBuildInfo)(opts.graph);
+        }
+        catch {
+            // fall through — handled by the exists check
+        }
+        const exists = build !== null && build !== undefined || (0, fs_1.existsSync)(dbPath);
+        checks.push({
+            name: 'graph-exists',
+            passed: exists,
+            detail: exists ? `built by astria ${build?.astriaVersion ?? '?'}, pipeline ${build?.pipelineVersion ?? '?'}` : `no graph at ${dbPath} — run 'astria run' first`,
+        });
+        // 2. Two distinct freshness signals:
+        //    - graph AGE (how long since publication, ceiling-configured), and
+        //    - source COVERAGE (does the graph represent the current HEAD —
+        //      commit identity plus manifest content comparison).
+        //    - extraction RULESET (was the graph built by the current extraction
+        //      code at all — see check 2b).
+        //    A graph built after a commit can still fail coverage: it may have
+        //    been built from a dirty tree, an older commit, or drifted since.
+        // One probe for both coverage and diff-risk.
+        const gitStatus = gitWorkTreeStatus(opts.graph);
+        if (exists) {
+            const publishedAt = Number(build?.graphPublishedAt);
+            const ageHours = Number.isFinite(publishedAt) && publishedAt > 0
+                ? (Date.now() / 1000 - publishedAt) / 3600
+                : null;
+            checks.push({
+                name: 'graph-fresh',
+                passed: ageHours !== null && ageHours <= maxAgeHours,
+                detail: ageHours === null
+                    ? 'graph has no publish timestamp (pre-provenance build) — rebuild with `astria run`'
+                    : `graph is ${ageHours.toFixed(1)} h old (age limit ${maxAgeHours} h; source coverage is a separate check below)`,
+            });
+            // 2b. Extraction ruleset. Age and HEAD coverage both pass for a graph
+            //     the CURRENT build would extract differently: the old cache is
+            //     reused, so the graph reports yesterday's facts with today's
+            //     timestamps. The committed self-graph drifted five commits this
+            //     way (`extraction_hash_version` v12 against code at v14). A version
+            //     mismatch means the recorded facts predate the current extraction
+            //     rules, so nodes and edges may be missing; rebuild before trusting
+            //     a merge decision to them.
+            const builtWith = build?.extractionHashVersion;
+            const currentRules = build?.currentExtractionHashVersion;
+            const extractionCurrent = !!builtWith && !!currentRules && builtWith === currentRules;
+            checks.push({
+                name: 'extraction-current',
+                passed: extractionCurrent,
+                detail: extractionCurrent
+                    ? `graph extracted by the current ruleset (${builtWith})`
+                    : `graph was extracted with ${builtWith ?? 'an unknown version'} but this build extracts with ${currentRules ?? '?'} — run 'astria update .' to re-extract changed files`,
+            });
+            // Coverage: the HEAD recorded at publication must equal the current
+            // HEAD, and every manifest file must still hash to the content the
+            // graph was built from. A publish timestamp alone only proved the
+            // build happened LATER — never that it saw the commit.
+            if (gitStatus.error !== null) {
+                checks.push({
+                    name: 'graph-covers-head',
+                    passed: false,
+                    detail: `git detection failed: ${gitStatus.error} — cannot verify the graph covers HEAD`,
+                });
+            }
+            else if (gitStatus.inside) {
+                try {
+                    const coverage = (0, native_1.verifySourceCommit)(opts.graph);
+                    const samples = coverage.driftSamples.length > 0
+                        ? ` (${coverage.driftSamples.join('; ')})`
+                        : '';
+                    const verified = coverage.filesChecked > 0
+                        ? ` — ${coverage.filesChecked} manifest file(s) content-verified`
+                        : '';
+                    checks.push({
+                        name: 'graph-covers-head',
+                        passed: coverage.coversHead === true,
+                        detail: `${coverage.reason}${verified}${samples}`,
+                    });
+                }
+                catch (e) {
+                    checks.push({
+                        name: 'graph-covers-head',
+                        passed: false,
+                        detail: `coverage verification failed: ${e?.message || e}`,
+                    });
+                }
+            }
+        }
+        // 3. Health floor.
+        if (exists) {
+            const health = (0, native_1.healthReport)(opts.graph);
+            checks.push({
+                name: 'health-floor',
+                passed: health.score >= minHealth,
+                detail: `health score ${health.score}/100 (floor ${minHealth}), grade ${health.grade}`,
+            });
+            // 4. Blast radius of the pending diff. Outside a git repository is an
+            //    explicit, visible skip; a FAILED git detection is a FAILED check
+            //    — never a silent "not a repository" skip that lets the gate pass
+            //    without the diff-risk it promised.
+            if (gitStatus.error !== null) {
+                checks.push({
+                    name: 'diff-risk',
+                    passed: false,
+                    detail: `git detection failed: ${gitStatus.error} — cannot score the diff`,
+                });
+            }
+            else if (!gitStatus.inside) {
+                checks.push({
+                    name: 'diff-risk',
+                    passed: true,
+                    detail: 'skipped — not a git repository (risk requires a diff to score)',
+                });
+            }
+            else {
+                try {
+                    const useRange = opts.base !== undefined;
+                    const risk = (0, native_1.riskReport)(opts.graph, opts.staged === true && !useRange, useRange ? opts.base : undefined, useRange ? (opts.head ?? 'HEAD') : undefined);
+                    const riskPassed = risk.score <= maxRisk;
+                    checks.push({
+                        name: 'diff-risk',
+                        passed: riskPassed,
+                        detail: useRange
+                            ? `diff risk ${risk.score}/100 for ${opts.base}...${opts.head ?? 'HEAD'} (ceiling ${maxRisk}), ${risk.impacted} symbols impacted across ${risk.changedFiles.length} changed file(s)`
+                            : `diff risk ${risk.score}/100 (ceiling ${maxRisk}), ${risk.impacted} symbols impacted across ${risk.changedFiles.length} changed file(s)`,
+                    });
+                }
+                catch (e) {
+                    checks.push({
+                        name: 'diff-risk',
+                        passed: false,
+                        detail: `risk calculation failed: ${e?.message || e}`,
+                    });
+                }
+            }
+        }
+        const passed = checks.every((c) => c.passed);
+        if (opts.json) {
+            console.log(JSON.stringify({ passed, checks }, null, 2));
+        }
+        else {
+            console.log(`${BOLD}Merge gate — ${passed ? 'PASSED ✓' : 'FAILED ✗'}${RESET}\n`);
+            for (const check of checks) {
+                const mark = check.passed ? `${GREEN}✓${RESET}` : `${RED}✗${RESET}`;
+                console.log(` ${mark} ${check.name}: ${check.detail}`);
+            }
+            if (!passed) {
+                console.log(`\n${DIM}Fix the failing checks or adjust the thresholds — this gate is what the hosted tier enforces on every merge.${RESET}`);
+            }
+        }
+        if (!passed)
+            process.exitCode = 1;
+    }
+    catch (e) {
+        console.error(`Error: ${e.message || e}`);
+        process.exitCode = 1;
+    }
+}
+//# sourceMappingURL=merge-gate.js.map

package/dist/commands/merge-gate.js.map

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

package/dist/commands/merge.d.ts

@@ -1,2 +1,5 @@
-export declare function mergeCommand(pathA: string, pathB: string, outPath: string): Promise<void>;
+export interface MergeOptions {
+    sameRepo?: boolean;
+}
+export declare function mergeCommand(pathA: string, pathB: string, outPath: string, opts?: MergeOptions): Promise<void>;
 //# sourceMappingURL=merge.d.ts.map

package/dist/commands/merge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../src/commands/merge.ts"],"names":[],"mappings":"AAGA,wBAAsB,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,iBAU/E"}
+{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../src/commands/merge.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,wBAAsB,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,GAAE,YAAiB,iBAaxG"}

package/dist/commands/merge.js

@@ -36,10 +36,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.mergeCommand = mergeCommand;
 const path = __importStar(require("path"));
 const native_1 = require("../native");
-async function mergeCommand(pathA, pathB, outPath) {
+async function mergeCommand(pathA, pathB, outPath, opts = {}) {
     try {
-        console.log(`Merging graphs: ${pathA} + ${pathB} -> ${outPath}`);
-        const result = (0, native_1.mergeGraphs)(pathA, pathB, outPath);
+        console.log(`Merging graphs: ${pathA} + ${pathB} -> ${outPath}` +
+            (opts.sameRepo ? ' (same repository: shared ids, conflicts error)' : ' (cross-repository: ids namespaced per root)'));
+        const result = (0, native_1.mergeGraphs)(pathA, pathB, outPath, opts.sameRepo === true);
         console.log(`Nodes: ${result.nodesAdded}, Edges: ${result.edgesAdded}, Communities: ${result.communities}`);
         console.log(`Merged graph written to: ${path.join(outPath, '.astria')}`);
     }

package/dist/commands/merge.js.map

@@ -1 +1 @@
-{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../src/commands/merge.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,oCAUC;AAbD,2CAA6B;AAC7B,sCAAwC;AAEjC,KAAK,UAAU,YAAY,CAAC,KAAa,EAAE,KAAa,EAAE,OAAe;IAC9E,IAAI,CAAC;QACH,OAAO,CAAC,GAAG,CAAC,mBAAmB,KAAK,MAAM,KAAK,OAAO,OAAO,EAAE,CAAC,CAAC;QACjE,MAAM,MAAM,GAAG,IAAA,oBAAW,EAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QAClD,OAAO,CAAC,GAAG,CAAC,UAAU,MAAM,CAAC,UAAU,YAAY,MAAM,CAAC,UAAU,kBAAkB,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC;QAC5G,OAAO,CAAC,GAAG,CAAC,4BAA4B,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC;IAC3E,CAAC;IAAC,OAAO,CAAM,EAAE,CAAC;QAChB,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,OAAO,IAAI,CAAC,EAAE,CAAC,CAAC;QAC1C,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;IACvB,CAAC;AACH,CAAC"}
+{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../src/commands/merge.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAOA,oCAaC;AApBD,2CAA6B;AAC7B,sCAAwC;AAMjC,KAAK,UAAU,YAAY,CAAC,KAAa,EAAE,KAAa,EAAE,OAAe,EAAE,OAAqB,EAAE;IACvG,IAAI,CAAC;QACH,OAAO,CAAC,GAAG,CACT,mBAAmB,KAAK,MAAM,KAAK,OAAO,OAAO,EAAE;YACjD,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,iDAAiD,CAAC,CAAC,CAAC,8CAA8C,CAAC,CACvH,CAAC;QACF,MAAM,MAAM,GAAG,IAAA,oBAAW,EAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC;QAC1E,OAAO,CAAC,GAAG,CAAC,UAAU,MAAM,CAAC,UAAU,YAAY,MAAM,CAAC,UAAU,kBAAkB,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC;QAC5G,OAAO,CAAC,GAAG,CAAC,4BAA4B,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC;IAC3E,CAAC;IAAC,OAAO,CAAM,EAAE,CAAC;QAChB,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,OAAO,IAAI,CAAC,EAAE,CAAC,CAAC;QAC1C,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;IACvB,CAAC;AACH,CAAC"}

package/dist/commands/prs.d.ts

@@ -1,5 +1,8 @@
 export declare function prsCommand(count: string, opts: {
     graph: string;
     conflicts: boolean;
+    triage?: boolean;
+    queue?: boolean;
+    json?: boolean;
 }): Promise<void>;
 //# sourceMappingURL=prs.d.ts.map

package/dist/commands/prs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prs.d.ts","sourceRoot":"","sources":["../../src/commands/prs.ts"],"names":[],"mappings":"AAyIA,wBAAsB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,OAAO,CAAA;CAAE,iBA8B1F"}
+{"version":3,"file":"prs.d.ts","sourceRoot":"","sources":["../../src/commands/prs.ts"],"names":[],"mappings":"AA+SA,wBAAsB,UAAU,CAC9B,KAAK,EAAE,MAAM,EACb,IAAI,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,OAAO,CAAC;IAAC,IAAI,CAAC,EAAE,OAAO,CAAA;CAAE,iBA2E/F"}