@aperant/framework 0.13.0 → 0.16.0

package/dist/cli/commands/merge-integrate.mjs

@@ -0,0 +1,383 @@
+/**
+ * commands/merge-integrate.mjs — `apt-tools merge integrate` (GitHub issue #397).
+ *
+ * The fan-out PR-integration phase. After a fan-out run, N workers each opened
+ * an independent PR against the same base; nothing ordered or reconciled them.
+ * This command SERIALIZES that batch: it resolves the task → branch/PR set,
+ * computes a deterministic merge order (topological when `depends_on` edges
+ * exist, else stable by task id), and probes each branch's mergeability against
+ * the CURRENT base via the EXACT same `git merge-tree` detection the `detect`
+ * subcommand uses (#395). It emits a structured integration report the
+ * conductor renders and the `apt:merge-conflict-resolution` flow consumes for
+ * any conflicted branch.
+ *
+ * READ-ONLY, like `detect`/`markers`: NO `git merge`, NO `git rebase`, NO index
+ * mutation, NO `gh pr merge`. The SKILL.md prose owns every state change; this
+ * primitive only OBSERVES and ORDERS. Conflict resolution stays agent-inline —
+ * the framework CLI is self-contained ESM and MUST NOT import @aperant/core
+ * (see GitHub issue #390 for the architecture decision). When a branch probes
+ * `mergeable: false`, this command surfaces the conflict envelope (the worker's
+ * worktree + base ref + conflicts_preview) and the agent resolves it inline via
+ * `/apt:merge-conflict-resolution`, then re-runs `integrate` to re-probe.
+ *
+ * Reuse, not reinvent (#397):
+ *   - detection            → `gitTry` / `parseConflictPaths` / `isGitVersionTooOld`
+ *                            promoted in audit-branch-current.mjs (#395).
+ *   - batch resolution     → the same `--tasks`/`--batch` shape fan-out.mjs uses;
+ *                            task records read from the shared `.aperant/state.json`
+ *                            board (resolveMainRepoRoot — state-fork-fix).
+ *   - dependency graph     → `buildDependsOnMap` (graph/depends-on.mjs), which
+ *                            already normalizes `depends_on` edges to bare ids.
+ *
+ *   apt-tools merge integrate <project-dir> --tasks <id,id,...> [--base <ref>]
+ *   apt-tools merge integrate <project-dir> --batch <batch-id>  [--base <ref>]
+ *
+ * --tasks   Explicit canonical task-id list (what `fan-out resolve` returns and
+ *           the conductor already holds). Primary form.
+ * --batch   Recover the task-id list from the batch's worker rows
+ *           `.aperant/team-status/fanout-<batch>-<task>.json` (the agent-id
+ *           format fan-out.mjs spawns workers with: `fanout-${batch}-${task}`).
+ * --base    Override the base ref every branch is probed against. When omitted,
+ *           each task is probed against `origin/<its base_branch>` (falling back
+ *           to `origin/main` when the record carries no base_branch).
+ *
+ * @internal
+ */
+import { existsSync, readdirSync, readFileSync } from 'node:fs';
+import { join, resolve } from 'node:path';
+import { buildDependsOnMap } from '../graph/depends-on.mjs';
+import { parseFlags } from '../util/args.mjs';
+import { err, ok } from '../util/result.mjs';
+import { resolveMainRepoRoot } from '../util/state-paths.mjs';
+import { gitTry, isGitVersionTooOld, parseConflictPaths } from './audit-branch-current.mjs';
+/**
+ * Parse a PR number from a `pr_url` string (full GitHub URL or `#123` short
+ * form). Returns null if not parseable. Incidental metadata for the report —
+ * the integration order/probe never depends on it.
+ *
+ * @param {unknown} url
+ * @returns {number | null}
+ */
+function extractPrNumber(url) {
+    if (typeof url !== 'string')
+        return null;
+    const m1 = url.match(/\/pull\/(\d+)(?:[?#/]|$)/);
+    if (m1)
+        return Number.parseInt(m1[1], 10);
+    const m2 = url.match(/#(\d+)$/);
+    if (m2)
+        return Number.parseInt(m2[1], 10);
+    const m3 = url.match(/^(\d+)$/);
+    if (m3)
+        return Number.parseInt(m3[1], 10);
+    return null;
+}
+/**
+ * Read the shared ephemeral board (`state.json`). Anchors to the MAIN repo so
+ * it resolves identically from any worktree (state-fork-fix), matching how
+ * fan-out.mjs reads it.
+ *
+ * @param {string} targetDir
+ * @returns {object | null}
+ */
+function readState(targetDir) {
+    const statePath = join(resolveMainRepoRoot(targetDir), '.aperant', 'state.json');
+    if (!existsSync(statePath))
+        return null;
+    try {
+        return JSON.parse(readFileSync(statePath, 'utf-8'));
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Recover a batch's task-id list from its worker rows. Fan-out spawns each
+ * worker with `APT_AGENT_ID=fanout-<batch>-<task>`, which materializes one
+ * `.aperant/team-status/fanout-<batch>-<task>.json` per worker. We list that
+ * directory and strip the shared prefix to recover the task ids.
+ *
+ * @param {string} targetDir
+ * @param {string} batchId
+ * @returns {string[]}
+ */
+function recoverBatchTaskIds(targetDir, batchId) {
+    const statusDir = join(resolveMainRepoRoot(targetDir), '.aperant', 'team-status');
+    if (!existsSync(statusDir))
+        return [];
+    const prefix = `fanout-${batchId}-`;
+    const ids = [];
+    let entries;
+    try {
+        entries = readdirSync(statusDir);
+    }
+    catch {
+        return [];
+    }
+    for (const name of entries) {
+        if (!name.endsWith('.json'))
+            continue;
+        const base = name.slice(0, -'.json'.length);
+        if (base.startsWith(prefix)) {
+            const taskId = base.slice(prefix.length);
+            if (taskId)
+                ids.push(taskId);
+        }
+    }
+    return ids;
+}
+/**
+ * Order the batch's task ids. Topological (Kahn) over the batch SUBSET when any
+ * member has a `depends_on` edge to another member, else a stable alphabetical
+ * sort by task id (deterministic). A dependency cycle (or any unresolvable
+ * ordering) falls back to the stable order with a warning rather than throwing.
+ *
+ * Reuses `buildDependsOnMap` so the edge normalization matches the rest of the
+ * framework's graph handling exactly.
+ *
+ * @param {string[]} taskIds
+ * @param {object | null} state
+ * @returns {{ order: string[], strategy: 'topological' | 'stable', warnings: string[] }}
+ */
+function orderTasks(taskIds, state) {
+    const stable = [...taskIds].sort();
+    const inBatch = new Set(taskIds);
+    const warnings = [];
+    const depMap = buildDependsOnMap(state || {});
+    // Restrict edges to within-batch dependencies — cross-batch deps don't gate
+    // the integration order (those PRs aren't part of this serialization).
+    const deps = new Map();
+    let edgeCount = 0;
+    for (const id of taskIds) {
+        // buildDependsOnMap already normalizes deps to bare task_ids, so the
+        // entries are consumed directly (no re-parse — a re-parse would split a
+        // colon-bearing id and drop the constraint). De-dupe so a task that lists
+        // the same dependency twice doesn't overcount its Kahn indegree (which
+        // would strand it below zero-indegree and mis-flag a valid graph as a
+        // cycle).
+        const within = [];
+        const seen = new Set();
+        for (const depId of depMap.get(id) || []) {
+            if (inBatch.has(depId) && depId !== id && !seen.has(depId)) {
+                seen.add(depId);
+                within.push(depId);
+                edgeCount++;
+            }
+        }
+        deps.set(id, within);
+    }
+    if (edgeCount === 0) {
+        return { order: stable, strategy: 'stable', warnings };
+    }
+    // Kahn's algorithm — a task lands AFTER its dependencies (deps merge first).
+    const indegree = new Map(taskIds.map((id) => [id, 0]));
+    for (const id of taskIds) {
+        for (const _dep of deps.get(id) || []) {
+            indegree.set(id, (indegree.get(id) || 0) + 1);
+        }
+    }
+    // Ready = zero remaining unmet deps. Process in stable order for determinism.
+    const ready = taskIds.filter((id) => (indegree.get(id) || 0) === 0).sort();
+    const order = [];
+    while (ready.length > 0) {
+        const id = ready.shift();
+        order.push(id);
+        // Decrement indegree of every task that depends on `id`.
+        const newlyReady = [];
+        for (const other of taskIds) {
+            if ((deps.get(other) || []).includes(id)) {
+                const d = (indegree.get(other) || 0) - 1;
+                indegree.set(other, d);
+                if (d === 0)
+                    newlyReady.push(other);
+            }
+        }
+        for (const r of newlyReady)
+            ready.push(r);
+        // Re-sort the whole queue (not just the newly-ready tail) so ties across
+        // rounds resolve in strict alphabetical order — fully deterministic.
+        ready.sort();
+    }
+    if (order.length !== taskIds.length) {
+        // Cycle or unresolvable ordering — fall back to stable, deterministic.
+        warnings.push('dependency cycle detected among batch tasks — falling back to stable task-id order');
+        return { order: stable, strategy: 'stable', warnings };
+    }
+    return { order, strategy: 'topological', warnings };
+}
+/**
+ * Probe one task's branch against the base. Mirrors the `detect` subcommand's
+ * merge-tree semantics exactly (#395) — same gitTry call, same exit-code
+ * branching — so the integrate report and a standalone `merge detect` agree.
+ *
+ * @param {string} worktreeDir
+ * @param {string} base
+ * @param {string} head
+ * @returns {{ mergeable: boolean | null, conflicts_preview?: string[], audit_warning?: string }}
+ */
+function probeBranch(worktreeDir, base, head) {
+    const probe = gitTry(worktreeDir, ['merge-tree', '--write-tree', '--no-messages', head, base]);
+    if (probe.ok)
+        return { mergeable: true };
+    if (probe.code === 1 && probe.stdout.trim().length > 0) {
+        return { mergeable: false, conflicts_preview: parseConflictPaths(probe.stdout) };
+    }
+    if (isGitVersionTooOld(probe.stderr)) {
+        return { mergeable: null, audit_warning: 'git-version-too-old' };
+    }
+    return { mergeable: null, audit_warning: 'merge-tree-probe-failed' };
+}
+/**
+ * `apt-tools merge integrate` — serialize a fan-out batch into base.
+ *
+ * @param {string} targetDir
+ * @param {string[]} extraArgs
+ * @returns {import('../util/result.mjs').CommandResult}
+ */
+export function mergeIntegrate(targetDir, extraArgs) {
+    const flags = parseFlags(extraArgs);
+    const hasTasks = flags.has('tasks');
+    const hasBatch = flags.has('batch');
+    if (!hasTasks && !hasBatch) {
+        return err('One of --tasks <id,id,...> or --batch <batch-id> is required for merge integrate');
+    }
+    if (hasTasks && hasBatch) {
+        return err('Pass only one of --tasks or --batch to merge integrate');
+    }
+    const state = readState(targetDir);
+    let taskIds = [];
+    let source = '';
+    if (hasTasks) {
+        taskIds = String(flags.get('tasks') || '')
+            .split(',')
+            .map((s) => s.trim())
+            .filter(Boolean);
+        source = 'tasks';
+        if (taskIds.length === 0) {
+            return err('--tasks resolved to an empty list');
+        }
+    }
+    else {
+        const batchId = String(flags.get('batch') || '').trim();
+        if (!batchId)
+            return err('--batch requires a batch id');
+        taskIds = recoverBatchTaskIds(targetDir, batchId);
+        source = 'batch';
+        if (taskIds.length === 0) {
+            return err(`No worker rows found for batch "${batchId}" — nothing to integrate`);
+        }
+    }
+    // parseFlags yields `true` for a bare `--base` with no following value; reject
+    // it rather than silently probing against the ref literal "true".
+    let baseOverride = null;
+    if (flags.has('base')) {
+        const raw = flags.get('base');
+        if (raw === true || String(raw).trim() === '') {
+            return err('--base requires a ref value (e.g. --base origin/main)');
+        }
+        baseOverride = String(raw).trim();
+    }
+    const { order, strategy, warnings } = orderTasks(taskIds, state);
+    const tasks = [];
+    let merged = 0;
+    let conflicted = 0;
+    let needsHuman = 0;
+    for (const id of order) {
+        const task = state?.active_tasks?.[id] || null;
+        // Tasks with no shipped branch can't be integrated — record them so the
+        // conductor sees why, but never block the rest of the batch.
+        if (!task) {
+            needsHuman++;
+            tasks.push({ task_id: id, status: 'unknown', reason: 'task not found in state.json' });
+            continue;
+        }
+        const branch = typeof task.branch === 'string' ? task.branch : null;
+        const prUrl = typeof task.pr_url === 'string' ? task.pr_url : null;
+        const worktree = typeof task.worktree_path === 'string' && existsSync(task.worktree_path)
+            ? resolve(task.worktree_path)
+            : null;
+        if (!prUrl) {
+            needsHuman++;
+            tasks.push({
+                task_id: id,
+                branch,
+                status: 'skipped',
+                reason: 'no pr_url on task record (not shipped) — nothing to integrate',
+            });
+            continue;
+        }
+        if (!worktree) {
+            needsHuman++;
+            tasks.push({
+                task_id: id,
+                branch,
+                pr_url: prUrl,
+                pr_number: extractPrNumber(prUrl),
+                status: 'needs-human',
+                reason: 'worktree_path missing or no longer on disk — cannot probe mergeability',
+            });
+            continue;
+        }
+        const taskBaseBranch = typeof task.base_branch === 'string' && task.base_branch ? task.base_branch : 'main';
+        const base = baseOverride || `origin/${taskBaseBranch}`;
+        const probe = probeBranch(worktree, base, 'HEAD');
+        const entry = {
+            task_id: id,
+            branch,
+            pr_url: prUrl,
+            pr_number: extractPrNumber(prUrl),
+            worktree_path: worktree,
+            base,
+            mergeable: probe.mergeable,
+        };
+        if (probe.conflicts_preview && probe.conflicts_preview.length > 0) {
+            entry.conflicts_preview = probe.conflicts_preview;
+        }
+        if (probe.audit_warning)
+            entry.audit_warning = probe.audit_warning;
+        if (probe.mergeable === true) {
+            merged++;
+            entry.status = 'mergeable';
+            entry.action = 'advance';
+        }
+        else if (probe.mergeable === false) {
+            conflicted++;
+            entry.status = 'conflicted';
+            // Hand-off envelope for /apt:merge-conflict-resolution — the agent
+            // resolves these markers inline then re-runs `integrate` to re-probe.
+            entry.action = 'resolve-conflict';
+            entry.resolution = {
+                skill: 'apt:merge-conflict-resolution',
+                worktree_path: worktree,
+                base,
+            };
+        }
+        else {
+            needsHuman++;
+            entry.status = 'needs-human';
+            entry.action = 'probe-failed';
+        }
+        tasks.push(entry);
+    }
+    const envelope = {
+        status: 'ok',
+        command: 'merge-integrate',
+        projectDir: targetDir,
+        source,
+        order_strategy: strategy,
+        order,
+        summary: {
+            total: tasks.length,
+            mergeable: merged,
+            conflicted,
+            needs_human: needsHuman,
+        },
+        tasks,
+    };
+    if (warnings.length > 0)
+        envelope.warnings = warnings;
+    return ok(envelope);
+}
+// Test-only export for unit-level coverage of the ordering core.
+export { orderTasks as __orderTasksForTests };
+//# sourceMappingURL=merge-integrate.mjs.map

package/dist/cli/commands/merge-integrate.mjs.map

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

package/dist/cli/commands/pr-review/detect-specialists.d.mts

@@ -0,0 +1,58 @@
+/**
+ * Parse a unified diff into { touchedPaths: string[], addedText: string }.
+ * `touchedPaths` are POSIX-normalized repo-relative paths from the `+++ b/...`
+ * (and `--- a/...` for deletions) headers; `addedText` concatenates added
+ * lines (those starting with `+` but not `+++`).
+ *
+ * @param {string} patch
+ * @returns {{ touchedPaths: string[], addedText: string }}
+ */
+export function parseUnifiedDiff(patch: string): {
+    touchedPaths: string[];
+    addedText: string;
+};
+/**
+ * The core detector. Pure over its inputs (reads the filesystem at `root` and
+ * the supplied `diffText`); returns the full
+ * `{ i18n, crossplatform }` decision object.
+ *
+ * @param {object} opts
+ * @param {string} opts.root            absolute project dir
+ * @param {string} [opts.diffText]      unified-diff text (optional)
+ * @param {'repo'|'diff'} [opts.scope]  default 'repo'
+ * @param {{i18n?:string, crossplatform?:string}} [opts.config]  override config
+ *        (read from .aperant/config.json when omitted)
+ * @returns {{ i18n: SpecialistDecision, crossplatform: SpecialistDecision }}
+ */
+export function detectSpecialists(opts: {
+    root: string;
+    diffText?: string | undefined;
+    scope?: "diff" | "repo" | undefined;
+    config?: {
+        i18n?: string;
+        crossplatform?: string;
+    } | undefined;
+}): {
+    i18n: SpecialistDecision;
+    crossplatform: SpecialistDecision;
+};
+/**
+ * CLI subcommand handler: `apt-tools pr-review detect-specialists <dir>
+ * [--diff <patch>] [--scope diff|repo]`.
+ *
+ * @param {string} projectDir
+ * @param {string[]} extraArgs
+ * @returns {import('../../util/result.mjs').CommandResult}
+ */
+export function cmdDetectSpecialists(projectDir: string, extraArgs?: string[]): import("../../util/result.mjs").CommandResult;
+export type Signal = {
+    kind: string;
+    detail: string;
+    tier: "strong" | "weak";
+};
+export type SpecialistDecision = {
+    engage: boolean;
+    signals: Signal[];
+    reason: string;
+};
+//# sourceMappingURL=detect-specialists.d.mts.map

package/dist/cli/commands/pr-review/detect-specialists.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"detect-specialists.d.mts","sourceRoot":"","sources":["../../../../src/cli/commands/pr-review/detect-specialists.mjs"],"names":[],"mappings":"AAijBA;;;;;;;;GAQG;AACH,wCAHW,MAAM,GACJ;IAAE,YAAY,EAAE,MAAM,EAAE,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAwBzD;AAwKD;;;;;;;;;;;;GAYG;AACH,wCAPG;IAAqB,IAAI,EAAjB,MAAM;IACQ,QAAQ;IACD,KAAK;IACmB,MAAM;eAA5C,MAAM;wBAAiB,MAAM;;CAE5C,GAAU;IAAE,IAAI,EAAE,kBAAkB,CAAC;IAAC,aAAa,EAAE,kBAAkB,CAAA;CAAE,CAmC3E;AA0LD;;;;;;;GAOG;AACH,iDAJW,MAAM,cACN,MAAM,EAAE,GACN,OAAO,uBAAuB,EAAE,aAAa,CA8BzD;qBA39BY;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,QAAQ,GAAG,MAAM,CAAA;CAAE;iCAEzD;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE"}