@aperant/framework 0.6.2

package/dist/cli/config/post-merge-sweep.d.mts

@@ -0,0 +1,85 @@
+/**
+ * Pure preflight — returns the list of `shipped-pending-merge` task IDs
+ * whose `pr_url` is set. Returns `null` if state can't be read or no
+ * candidates exist (the dispatcher uses `null` as the short-circuit).
+ *
+ * @internal
+ */
+export function readShippedCandidates(projectRoot: any): {
+    id: string;
+    pr_url: any;
+    worktree_path: any;
+}[] | null;
+/**
+ * Returns true if the cooldown lock is "fresh" (last sweep too recent).
+ * Lock content is `{pid}:{ms-since-epoch}` but we only consult mtime.
+ *
+ * @internal
+ */
+export function isCooldownActive(lockPath: any, cooldownMs?: number): boolean;
+/**
+ * Best-effort lease writer. Atomic enough for our needs (the lock
+ * itself is the cooldown token, not a critical-section guard — the
+ * destructive side effects all run in the detached child via the
+ * existing `task close-merged → task close` pipeline).
+ *
+ * @internal
+ */
+export function writeSweepLease(lockPath: any): boolean;
+/**
+ * Filter out candidates whose worktree contains the current cwd —
+ * sweeping into your own active worktree would pull the rug out from
+ * under you. Returns the deferred IDs alongside the kept ones.
+ *
+ * @internal
+ */
+export function partitionByCwd(candidates: any, cwd: any): {
+    kept: any[];
+    deferred: any[];
+};
+/**
+ * Spawn the detached close-merged child. Sets `APT_INTERNAL_MERGE_SWEEP=1`
+ * in env so the child's own dispatch hook doesn't recurse.
+ *
+ * Returns the child's PID on success, null on spawn failure.
+ *
+ * @internal
+ */
+export function spawnDetachedSweep(projectRoot: any, options?: {}): number | null;
+/**
+ * Dispatch-time hook. Runs through:
+ *   1. Suppression env → return.
+ *   2. Recursion-guard env → return.
+ *   3. SKIP_COMMANDS allowlist → return.
+ *   4. Read shipped-pending-merge candidates (no lock, fast). None → return.
+ *   5. Cooldown check via lease-file mtime → return if too recent.
+ *   6. Filter out candidates whose worktree contains cwd. All deferred → return.
+ *   7. Write lease (cooldown token).
+ *   8. Spawn detached `task close-merged <root>` child with recursion-guard env.
+ *   9. Print one stderr line so the user knows the sweep fired.
+ *
+ * Never throws. Returns `{ kicked, reason }` for tests; production callers
+ * wrap in try/catch and ignore.
+ *
+ * @internal
+ */
+export function maybeSweepShippedMergedTasks(projectRoot: any, command: any, options?: {}): {
+    kicked: boolean;
+    reason: string;
+    deferred?: undefined;
+    pid?: undefined;
+    candidate_count?: undefined;
+} | {
+    kicked: boolean;
+    reason: string;
+    deferred: any[];
+    pid?: undefined;
+    candidate_count?: undefined;
+} | {
+    kicked: boolean;
+    reason: string;
+    pid: any;
+    candidate_count: number;
+    deferred: any[];
+};
+//# sourceMappingURL=post-merge-sweep.d.mts.map

package/dist/cli/config/post-merge-sweep.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"post-merge-sweep.d.mts","sourceRoot":"","sources":["../../../src/cli/config/post-merge-sweep.mjs"],"names":[],"mappings":"AAgEA;;;;;;GAMG;AACH;;;;WAmBC;AAED;;;;;GAKG;AACH,8EAQC;AAED;;;;;;;GAOG;AACH,wDAYC;AAED;;;;;;GAMG;AACH;;;EAWC;AAcD;;;;;;;GAOG;AACH,kFAiBC;AAED;;;;;;;;;;;;;;;;GAgBG;AACH;;;;;;;;;;;;;;;;;;EAyEC"}

package/dist/cli/config/post-merge-sweep.mjs

@@ -0,0 +1,276 @@
+/**
+ * post-merge-sweep.mjs — dispatch-time passive sweeper for stuck
+ * `shipped-pending-merge` tasks (C57 Piece 2).
+ *
+ * AI agents ship a PR and walk away. Tasks then rot in
+ * `shipped-pending-merge` because nothing automatic invokes
+ * `apt-tools task close-merged`. This hook runs on every `apt-tools`
+ * dispatch (mirroring the gitignore-drift hook), checks a set of
+ * fast preflights, and — at most once every 10 minutes per repo —
+ * spawns a detached child to poll `gh pr view` and close any tasks
+ * whose PRs have terminally landed.
+ *
+ * Non-blocking: never fails the command, never mutates exit code,
+ * never throws. Single stderr line on actual sweep kick (not on
+ * every dispatch).
+ *
+ * Silenced by `APT_SUPPRESS_MERGE_SWEEP=1`. Skipped when
+ * `APT_INTERNAL_MERGE_SWEEP=1` is set in env (recursion guard for
+ * the spawned child's own dispatch loop).
+ *
+ * @internal — consumed only from bin/apt-tools.mjs dispatch.
+ */
+import { spawn } from 'node:child_process';
+import { closeSync, existsSync, openSync, readFileSync, statSync, writeSync } from 'node:fs';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+/**
+ * Hot-path commands whose stderr feeds back into LLM-facing routers /
+ * detectors — chatty hook output would pollute classification signal.
+ *
+ * Plus `task` — so a `task close-merged` invocation does NOT re-trigger
+ * the sweep on its own dispatch (recursion guard #1).
+ */
+const SKIP_COMMANDS = new Set([
+    'route',
+    'detect-project',
+    'detect-worktree',
+    'health-check',
+    'toolchain-detect',
+    'host-detect',
+    'task', // recursion guard #1 — close-merged is a `task` subcommand
+    '--version',
+    '--help',
+    '-v',
+    '-h',
+]);
+/**
+ * Cooldown window between sweep kicks, in milliseconds. Tasks that
+ * just shipped won't be merged in seconds — so polling more than
+ * once per 10 minutes wastes `gh pr view` rate budget. Configurable
+ * via `MERGE_SWEEP_COOLDOWN_MS` env var (mostly for tests).
+ */
+const DEFAULT_COOLDOWN_MS = 600_000; // 10 minutes
+function getCooldownMs() {
+    const raw = process.env.MERGE_SWEEP_COOLDOWN_MS;
+    if (!raw)
+        return DEFAULT_COOLDOWN_MS;
+    const n = Number.parseInt(raw, 10);
+    return Number.isFinite(n) && n > 0 ? n : DEFAULT_COOLDOWN_MS;
+}
+/**
+ * Pure preflight — returns the list of `shipped-pending-merge` task IDs
+ * whose `pr_url` is set. Returns `null` if state can't be read or no
+ * candidates exist (the dispatcher uses `null` as the short-circuit).
+ *
+ * @internal
+ */
+export function readShippedCandidates(projectRoot) {
+    const statePath = join(projectRoot, '.aperant', 'state.json');
+    if (!existsSync(statePath))
+        return null;
+    let state;
+    try {
+        state = JSON.parse(readFileSync(statePath, 'utf-8'));
+    }
+    catch {
+        return null;
+    }
+    const active = state?.active_tasks;
+    if (!active || typeof active !== 'object')
+        return null;
+    const candidates = [];
+    for (const [id, t] of Object.entries(active)) {
+        if (!t || typeof t !== 'object')
+            continue;
+        if (t.lifecycle_phase !== 'shipped-pending-merge')
+            continue;
+        if (!t.pr_url)
+            continue;
+        candidates.push({ id, pr_url: t.pr_url, worktree_path: t.worktree_path || null });
+    }
+    return candidates.length === 0 ? null : candidates;
+}
+/**
+ * Returns true if the cooldown lock is "fresh" (last sweep too recent).
+ * Lock content is `{pid}:{ms-since-epoch}` but we only consult mtime.
+ *
+ * @internal
+ */
+export function isCooldownActive(lockPath, cooldownMs = getCooldownMs()) {
+    if (!existsSync(lockPath))
+        return false;
+    try {
+        const st = statSync(lockPath);
+        return Date.now() - st.mtimeMs < cooldownMs;
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Best-effort lease writer. Atomic enough for our needs (the lock
+ * itself is the cooldown token, not a critical-section guard — the
+ * destructive side effects all run in the detached child via the
+ * existing `task close-merged → task close` pipeline).
+ *
+ * @internal
+ */
+export function writeSweepLease(lockPath) {
+    try {
+        const fd = openSync(lockPath, 'w');
+        try {
+            writeSync(fd, `${process.pid}:${Date.now()}\n`);
+        }
+        finally {
+            closeSync(fd);
+        }
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Filter out candidates whose worktree contains the current cwd —
+ * sweeping into your own active worktree would pull the rug out from
+ * under you. Returns the deferred IDs alongside the kept ones.
+ *
+ * @internal
+ */
+export function partitionByCwd(candidates, cwd) {
+    const kept = [];
+    const deferred = [];
+    for (const c of candidates) {
+        if (c.worktree_path && cwd.startsWith(c.worktree_path)) {
+            deferred.push(c.id);
+        }
+        else {
+            kept.push(c);
+        }
+    }
+    return { kept, deferred };
+}
+/**
+ * Resolve the absolute path to `bin/apt-tools.mjs`. The hook lives in
+ * `src/cli/config/`, the dispatcher in `bin/`. Same package, same install.
+ *
+ * @internal
+ */
+function resolveAptToolsBin() {
+    const here = dirname(fileURLToPath(import.meta.url));
+    // src/cli/config → ../../../bin/apt-tools.mjs
+    return resolve(here, '..', '..', '..', 'bin', 'apt-tools.mjs');
+}
+/**
+ * Spawn the detached close-merged child. Sets `APT_INTERNAL_MERGE_SWEEP=1`
+ * in env so the child's own dispatch hook doesn't recurse.
+ *
+ * Returns the child's PID on success, null on spawn failure.
+ *
+ * @internal
+ */
+export function spawnDetachedSweep(projectRoot, options = {}) {
+    const bin = options.binPath || resolveAptToolsBin();
+    try {
+        const child = spawn('node', [bin, 'task', 'close-merged', projectRoot], {
+            cwd: projectRoot,
+            env: {
+                ...process.env,
+                APT_INTERNAL_MERGE_SWEEP: '1',
+            },
+            detached: true,
+            stdio: 'ignore',
+        });
+        child.unref();
+        return child.pid ?? null;
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Dispatch-time hook. Runs through:
+ *   1. Suppression env → return.
+ *   2. Recursion-guard env → return.
+ *   3. SKIP_COMMANDS allowlist → return.
+ *   4. Read shipped-pending-merge candidates (no lock, fast). None → return.
+ *   5. Cooldown check via lease-file mtime → return if too recent.
+ *   6. Filter out candidates whose worktree contains cwd. All deferred → return.
+ *   7. Write lease (cooldown token).
+ *   8. Spawn detached `task close-merged <root>` child with recursion-guard env.
+ *   9. Print one stderr line so the user knows the sweep fired.
+ *
+ * Never throws. Returns `{ kicked, reason }` for tests; production callers
+ * wrap in try/catch and ignore.
+ *
+ * @internal
+ */
+export function maybeSweepShippedMergedTasks(projectRoot, command, options = {}) {
+    try {
+        if (process.env.APT_SUPPRESS_MERGE_SWEEP === '1') {
+            return { kicked: false, reason: 'suppressed' };
+        }
+        // Recursion guard #2 — child sets this so its own dispatcher noops.
+        if (process.env.APT_INTERNAL_MERGE_SWEEP === '1') {
+            return { kicked: false, reason: 'internal-recursion-guard' };
+        }
+        if (!command || SKIP_COMMANDS.has(command)) {
+            return { kicked: false, reason: 'skip-command' };
+        }
+        const root = resolve(projectRoot);
+        if (!existsSync(join(root, '.aperant'))) {
+            return { kicked: false, reason: 'no-aperant-dir' };
+        }
+        const candidates = readShippedCandidates(root);
+        if (!candidates) {
+            return { kicked: false, reason: 'no-candidates' };
+        }
+        const lockPath = join(root, '.aperant', '.merge-sweep.lock');
+        const cooldownMs = options.cooldownMs ?? getCooldownMs();
+        if (isCooldownActive(lockPath, cooldownMs)) {
+            return { kicked: false, reason: 'cooldown' };
+        }
+        const cwd = options.cwd ?? process.cwd();
+        const { kept, deferred } = partitionByCwd(candidates, cwd);
+        if (kept.length === 0) {
+            return {
+                kicked: false,
+                reason: 'all-deferred-by-cwd',
+                deferred,
+            };
+        }
+        // Acquire the cooldown lease. If we can't write it, skip — better
+        // to noop than to potentially fire two sweeps in quick succession.
+        if (!writeSweepLease(lockPath)) {
+            return { kicked: false, reason: 'lease-write-failed' };
+        }
+        // Spawn the detached child. The actual close work happens in the
+        // child via the existing `task close-merged` command, which already
+        // handles offline / rate-limit / unmerged-but-not-MERGED behavior.
+        const pid = options.spawnFn
+            ? options.spawnFn(root)
+            : spawnDetachedSweep(root, { binPath: options.binPath });
+        if (pid === null) {
+            return { kicked: false, reason: 'spawn-failed' };
+        }
+        try {
+            process.stderr.write(`[apt-tools] Auto-sweeping ${kept.length} pending PR(s) — run 'apt-tools task close-merged --dry-run' to preview, or APT_SUPPRESS_MERGE_SWEEP=1 to silence.\n`);
+        }
+        catch {
+            /* stderr write failure is non-fatal */
+        }
+        return {
+            kicked: true,
+            reason: 'spawned',
+            pid,
+            candidate_count: kept.length,
+            deferred,
+        };
+    }
+    catch {
+        // Belt-and-suspenders: never block user command on the sweep hook.
+        return { kicked: false, reason: 'hook-error' };
+    }
+}
+//# sourceMappingURL=post-merge-sweep.mjs.map

package/dist/cli/config/post-merge-sweep.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"post-merge-sweep.mjs","sourceRoot":"","sources":["../../../src/cli/config/post-merge-sweep.mjs"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAC1C,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,YAAY,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAC5F,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAExC;;;;;;GAMG;AACH,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC;IAC7B,OAAO;IACP,gBAAgB;IAChB,iBAAiB;IACjB,cAAc;IACd,kBAAkB;IAClB,aAAa;IACb,MAAM,EAAE,2DAA2D;IACnE,WAAW;IACX,QAAQ;IACR,IAAI;IACJ,IAAI;CACJ,CAAC,CAAA;AAEF;;;;;GAKG;AACH,MAAM,mBAAmB,GAAG,OAAO,CAAA,CAAC,aAAa;AAEjD,SAAS,aAAa;IACrB,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAA;IAC/C,IAAI,CAAC,GAAG;QAAE,OAAO,mBAAmB,CAAA;IACpC,MAAM,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;IAClC,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAA;AAC7D,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,qBAAqB,CAAC,WAAW;IAChD,MAAM,SAAS,GAAG,IAAI,CAAC,WAAW,EAAE,UAAU,EAAE,YAAY,CAAC,CAAA;IAC7D,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC;QAAE,OAAO,IAAI,CAAA;IACvC,IAAI,KAAK,CAAA;IACT,IAAI,CAAC;QACJ,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAA;IACrD,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,IAAI,CAAA;IACZ,CAAC;IACD,MAAM,MAAM,GAAG,KAAK,EAAE,YAAY,CAAA;IAClC,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAA;IACtD,MAAM,UAAU,GAAG,EAAE,CAAA;IACrB,KAAK,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAC9C,IAAI,CAAC,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ;YAAE,SAAQ;QACzC,IAAI,CAAC,CAAC,eAAe,KAAK,uBAAuB;YAAE,SAAQ;QAC3D,IAAI,CAAC,CAAC,CAAC,MAAM;YAAE,SAAQ;QACvB,UAAU,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC,aAAa,IAAI,IAAI,EAAE,CAAC,CAAA;IAClF,CAAC;IACD,OAAO,UAAU,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAA;AACnD,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,gBAAgB,CAAC,QAAQ,EAAE,UAAU,GAAG,aAAa,EAAE;IACtE,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;QAAE,OAAO,KAAK,CAAA;IACvC,IAAI,CAAC;QACJ,MAAM,EAAE,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAA;QAC7B,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,OAAO,GAAG,UAAU,CAAA;IAC5C,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,KAAK,CAAA;IACb,CAAC;AACF,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,eAAe,CAAC,QAAQ;IACvC,IAAI,CAAC;QACJ,MAAM,EAAE,GAAG,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAA;QAClC,IAAI,CAAC;YACJ,SAAS,CAAC,EAAE,EAAE,GAAG,OAAO,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;QAChD,CAAC;gBAAS,CAAC;YACV,SAAS,CAAC,EAAE,CAAC,CAAA;QACd,CAAC;QACD,OAAO,IAAI,CAAA;IACZ,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,KAAK,CAAA;IACb,CAAC;AACF,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,cAAc,CAAC,UAAU,EAAE,GAAG;IAC7C,MAAM,IAAI,GAAG,EAAE,CAAA;IACf,MAAM,QAAQ,GAAG,EAAE,CAAA;IACnB,KAAK,MAAM,CAAC,IAAI,UAAU,EAAE,CAAC;QAC5B,IAAI,CAAC,CAAC,aAAa,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,aAAa,CAAC,EAAE,CAAC;YACxD,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;QACpB,CAAC;aAAM,CAAC;YACP,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACb,CAAC;IACF,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAA;AAC1B,CAAC;AAED;;;;;GAKG;AACH,SAAS,kBAAkB;IAC1B,MAAM,IAAI,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;IACpD,8CAA8C;IAC9C,OAAO,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,eAAe,CAAC,CAAA;AAC/D,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,kBAAkB,CAAC,WAAW,EAAE,OAAO,GAAG,EAAE;IAC3D,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,IAAI,kBAAkB,EAAE,CAAA;IACnD,IAAI,CAAC;QACJ,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,cAAc,EAAE,WAAW,CAAC,EAAE;YACvE,GAAG,EAAE,WAAW;YAChB,GAAG,EAAE;gBACJ,GAAG,OAAO,CAAC,GAAG;gBACd,wBAAwB,EAAE,GAAG;aAC7B;YACD,QAAQ,EAAE,IAAI;YACd,KAAK,EAAE,QAAQ;SACf,CAAC,CAAA;QACF,KAAK,CAAC,KAAK,EAAE,CAAA;QACb,OAAO,KAAK,CAAC,GAAG,IAAI,IAAI,CAAA;IACzB,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,IAAI,CAAA;IACZ,CAAC;AACF,CAAC;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,UAAU,4BAA4B,CAAC,WAAW,EAAE,OAAO,EAAE,OAAO,GAAG,EAAE;IAC9E,IAAI,CAAC;QACJ,IAAI,OAAO,CAAC,GAAG,CAAC,wBAAwB,KAAK,GAAG,EAAE,CAAC;YAClD,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,CAAA;QAC/C,CAAC;QACD,oEAAoE;QACpE,IAAI,OAAO,CAAC,GAAG,CAAC,wBAAwB,KAAK,GAAG,EAAE,CAAC;YAClD,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,0BAA0B,EAAE,CAAA;QAC7D,CAAC;QACD,IAAI,CAAC,OAAO,IAAI,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;YAC5C,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,CAAA;QACjD,CAAC;QACD,MAAM,IAAI,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA;QACjC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC;YACzC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAA;QACnD,CAAC;QAED,MAAM,UAAU,GAAG,qBAAqB,CAAC,IAAI,CAAC,CAAA;QAC9C,IAAI,CAAC,UAAU,EAAE,CAAC;YACjB,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,eAAe,EAAE,CAAA;QAClD,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,mBAAmB,CAAC,CAAA;QAC5D,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,aAAa,EAAE,CAAA;QACxD,IAAI,gBAAgB,CAAC,QAAQ,EAAE,UAAU,CAAC,EAAE,CAAC;YAC5C,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,CAAA;QAC7C,CAAC;QAED,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,CAAA;QACxC,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC,UAAU,EAAE,GAAG,CAAC,CAAA;QAC1D,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvB,OAAO;gBACN,MAAM,EAAE,KAAK;gBACb,MAAM,EAAE,qBAAqB;gBAC7B,QAAQ;aACR,CAAA;QACF,CAAC;QAED,kEAAkE;QAClE,mEAAmE;QACnE,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,EAAE,CAAC;YAChC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,oBAAoB,EAAE,CAAA;QACvD,CAAC;QAED,iEAAiE;QACjE,oEAAoE;QACpE,mEAAmE;QACnE,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO;YAC1B,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC;YACvB,CAAC,CAAC,kBAAkB,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAA;QACzD,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;YAClB,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,CAAA;QACjD,CAAC;QAED,IAAI,CAAC;YACJ,OAAO,CAAC,MAAM,CAAC,KAAK,CACnB,6BAA6B,IAAI,CAAC,MAAM,sHAAsH,CAC9J,CAAA;QACF,CAAC;QAAC,MAAM,CAAC;YACR,uCAAuC;QACxC,CAAC;QAED,OAAO;YACN,MAAM,EAAE,IAAI;YACZ,MAAM,EAAE,SAAS;YACjB,GAAG;YACH,eAAe,EAAE,IAAI,CAAC,MAAM;YAC5B,QAAQ;SACR,CAAA;IACF,CAAC;IAAC,MAAM,CAAC;QACR,mEAAmE;QACnE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,CAAA;IAC/C,CAAC;AACF,CAAC"}

package/dist/cli/config/schema-migrate.d.mts

@@ -0,0 +1,49 @@
+/**
+ * Set a dot-path on an object, creating intermediate plain objects as
+ * needed. Mutates `obj` in place.
+ *
+ * Defends against prototype-pollution by rejecting `__proto__`,
+ * `constructor`, and `prototype` segments. Although every current caller
+ * passes paths derived from the trusted template / Class A descriptors,
+ * the guard is cheap and survives future callers.
+ *
+ * Exported (in addition to internal use) so init.mjs can write descriptor
+ * defaults into a `MigrationResult.migrated` payload via the same helper
+ * — keeps the dot-path semantics in one place.
+ *
+ * @param {Record<string, unknown>} obj
+ * @param {string} path Dot-notation key (e.g. `share.visibility`).
+ * @param {unknown} value
+ */
+export function setAt(obj: Record<string, unknown>, path: string, value: unknown): void;
+/**
+ * Plan + apply the migration of `existingConfig` toward `templateConfig`.
+ *
+ * @param {Record<string, unknown>} existingConfig
+ * @param {Record<string, unknown>} templateConfig
+ * @returns {MigrationResult}
+ */
+export function migrateConfigSchema(existingConfig: Record<string, unknown>, templateConfig: Record<string, unknown>): MigrationResult;
+export type MigrationResult = {
+    /**
+     * New config object (existing + filled defaults).
+     */
+    migrated: Record<string, unknown>;
+    applied_defaults: Array<{
+        key: string;
+        value: unknown;
+        why: string;
+        source?: string;
+    }>;
+    requires_explicit: Array<{
+        key: string;
+        why: string;
+        options?: unknown[] | null;
+        default?: unknown;
+    }>;
+    auto_added: Array<{
+        key: string;
+        value: unknown;
+    }>;
+};
+//# sourceMappingURL=schema-migrate.d.mts.map

package/dist/cli/config/schema-migrate.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"schema-migrate.d.mts","sourceRoot":"","sources":["../../../src/cli/config/schema-migrate.mjs"],"names":[],"mappings":"AAuDA;;;;;;;;;;;;;;;;GAgBG;AACH,2BAJW,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,QACvB,MAAM,SACN,OAAO,QAkBjB;AA+BD;;;;;;GAMG;AACH,oDAJW,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,kBACvB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACrB,eAAe,CAkF3B;;;;;cA5Ka,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;sBACvB,KAAK,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,OAAO,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;uBACpE,KAAK,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,OAAO,EAAE,GAAC,IAAI,CAAC;QAAC,OAAO,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;gBAChF,KAAK,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,OAAO,CAAA;KAAE,CAAC"}

package/dist/cli/config/schema-migrate.mjs

@@ -0,0 +1,199 @@
+/**
+ * schema-migrate.mjs — detect drift between an existing
+ * `.aperant/config.json` and the shipped `templates/config.json`, and
+ * plan the merge. Pure function; no disk I/O.
+ *
+ * Per spec R3, the helper walks the template's leaf paths and buckets
+ * every absent-or-stale key into one of three lists:
+ *
+ *   - `applied_defaults` — Class B keys + auto_added internal keys that
+ *     can be filled silently. (We split internal keys into a separate
+ *     `auto_added` list because R3 calls them out as informational.)
+ *   - `requires_explicit` — Class A keys that demand a user decision in
+ *     non-TTY OR a clack prompt in upgrade-TTY. Includes keys whose
+ *     existing value is invalid under the new schema (e.g. an enum
+ *     dropped an option).
+ *   - `auto_added` — template-internal additions (e.g.
+ *     risk_map.elevated_paths growing) that aren't classified.
+ *
+ * `migrated.version` only bumps to template.version when
+ * `requires_explicit` is empty — otherwise the user still owes us a
+ * decision and bumping the version would lose the "needs review" signal.
+ *
+ * Mirrors the upgrade-gitignore.mjs split: data-only function here,
+ * I/O lives in the caller (commands/init.mjs).
+ */
+import { CLASS_A_SETTINGS, CLASS_B_SETTINGS, findClassDescriptor, } from '../install/setting-class.mjs';
+/**
+ * @typedef {Object} MigrationResult
+ * @property {Record<string, unknown>} migrated   New config object (existing + filled defaults).
+ * @property {Array<{ key: string, value: unknown, why: string, source?: string }>} applied_defaults
+ * @property {Array<{ key: string, why: string, options?: unknown[]|null, default?: unknown }>} requires_explicit
+ * @property {Array<{ key: string, value: unknown }>} auto_added
+ */
+/**
+ * Read a dot-path from an object. Returns `undefined` when any segment
+ * is absent. Treats arrays as opaque leaves (we don't index into them).
+ */
+function getAt(obj, path) {
+    if (!obj || typeof obj !== 'object')
+        return undefined;
+    const parts = path.split('.');
+    let cur = obj;
+    for (const p of parts) {
+        if (cur === null || cur === undefined || typeof cur !== 'object')
+            return undefined;
+        cur = cur[p];
+    }
+    return cur;
+}
+/**
+ * Set a dot-path on an object, creating intermediate plain objects as
+ * needed. Mutates `obj` in place.
+ *
+ * Defends against prototype-pollution by rejecting `__proto__`,
+ * `constructor`, and `prototype` segments. Although every current caller
+ * passes paths derived from the trusted template / Class A descriptors,
+ * the guard is cheap and survives future callers.
+ *
+ * Exported (in addition to internal use) so init.mjs can write descriptor
+ * defaults into a `MigrationResult.migrated` payload via the same helper
+ * — keeps the dot-path semantics in one place.
+ *
+ * @param {Record<string, unknown>} obj
+ * @param {string} path Dot-notation key (e.g. `share.visibility`).
+ * @param {unknown} value
+ */
+export function setAt(obj, path, value) {
+    const parts = path.split('.');
+    for (const seg of parts) {
+        if (seg === '__proto__' || seg === 'constructor' || seg === 'prototype') {
+            throw new Error(`setAt: refusing to write reserved key segment "${seg}" in path "${path}"`);
+        }
+    }
+    let cur = /** @type {Record<string, unknown>} */ (obj);
+    for (let i = 0; i < parts.length - 1; i++) {
+        const p = parts[i];
+        if (cur[p] === null || cur[p] === undefined || typeof cur[p] !== 'object') {
+            cur[p] = {};
+        }
+        cur = /** @type {Record<string, unknown>} */ (cur[p]);
+    }
+    cur[parts[parts.length - 1]] = value;
+}
+/**
+ * Walk a template object, yielding `{ path, value }` for every leaf —
+ * scalars, arrays, and `null`. Skips `$comment` keys (template-only
+ * documentation that never needs migrating).
+ */
+function* walkLeaves(obj, prefix = '') {
+    if (obj === null || typeof obj !== 'object' || Array.isArray(obj)) {
+        yield { path: prefix, value: obj };
+        return;
+    }
+    for (const [k, v] of Object.entries(obj)) {
+        if (k.startsWith('$'))
+            continue; // $comment, $trusted_skill_sources_comment, etc.
+        const next = prefix === '' ? k : `${prefix}.${k}`;
+        if (v === null || typeof v !== 'object' || Array.isArray(v)) {
+            yield { path: next, value: v };
+        }
+        else {
+            yield* walkLeaves(v, next);
+        }
+    }
+}
+/**
+ * Deep-clone `obj` via JSON. Sufficient for config payloads (no
+ * functions, no Dates, no circular refs).
+ */
+function clone(obj) {
+    return JSON.parse(JSON.stringify(obj));
+}
+/**
+ * Plan + apply the migration of `existingConfig` toward `templateConfig`.
+ *
+ * @param {Record<string, unknown>} existingConfig
+ * @param {Record<string, unknown>} templateConfig
+ * @returns {MigrationResult}
+ */
+export function migrateConfigSchema(existingConfig, templateConfig) {
+    const migrated = clone(existingConfig ?? {});
+    /** @type {MigrationResult['applied_defaults']} */
+    const applied_defaults = [];
+    /** @type {MigrationResult['requires_explicit']} */
+    const requires_explicit = [];
+    /** @type {MigrationResult['auto_added']} */
+    const auto_added = [];
+    // (1) Walk template leaves; for each, decide what to do based on
+    //     classification + presence in existing.
+    for (const { path, value } of walkLeaves(templateConfig)) {
+        // Skip the `version` leaf — handled at the end based on
+        // requires_explicit.length so we don't promise a clean migrated
+        // version when the user still owes us a decision.
+        if (path === 'version')
+            continue;
+        const existingValue = getAt(migrated, path);
+        const desc = findClassDescriptor(path);
+        if (existingValue === undefined) {
+            if (!desc) {
+                // Template-internal addition — not classified. Apply silently.
+                setAt(migrated, path, value);
+                auto_added.push({ key: path, value });
+                continue;
+            }
+            if (CLASS_A_SETTINGS.includes(desc)) {
+                requires_explicit.push({
+                    key: desc.shortKey,
+                    why: desc.why,
+                    options: desc.options,
+                    default: desc.default,
+                });
+                continue;
+            }
+            if (CLASS_B_SETTINGS.includes(desc)) {
+                setAt(migrated, path, value);
+                applied_defaults.push({
+                    key: desc.shortKey,
+                    value,
+                    why: desc.why,
+                });
+            }
+        }
+        else {
+            // Present in existing — only flag invalid values for classified keys.
+            // Unclassified keys are left alone (user may have customized them).
+            if (desc && desc.classify(existingValue) === 'invalid') {
+                if (CLASS_A_SETTINGS.includes(desc)) {
+                    requires_explicit.push({
+                        key: desc.shortKey,
+                        why: 'value invalid under new schema',
+                        options: desc.options,
+                        default: desc.default,
+                    });
+                }
+                else {
+                    // Class B with an invalid value — overwrite with template default
+                    // to keep the install moving (Class B is reversible).
+                    setAt(migrated, path, value);
+                    applied_defaults.push({
+                        key: desc.shortKey,
+                        value,
+                        why: 'value invalid under new schema — reset to template default',
+                    });
+                }
+            }
+        }
+    }
+    // (2) Bump version only when nothing is blocked. The user's existing
+    //     config-with-blockers stays at its old version so a follow-up run
+    //     still detects it as "needs migration".
+    if (requires_explicit.length === 0) {
+        const templateVersion = templateConfig?.version;
+        if (templateVersion !== undefined) {
+            migrated.version = templateVersion;
+        }
+    }
+    return { migrated, applied_defaults, requires_explicit, auto_added };
+}
+//# sourceMappingURL=schema-migrate.mjs.map

package/dist/cli/config/schema-migrate.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"schema-migrate.mjs","sourceRoot":"","sources":["../../../src/cli/config/schema-migrate.mjs"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAEH,OAAO,EACN,gBAAgB,EAChB,gBAAgB,EAChB,mBAAmB,GACnB,MAAM,8BAA8B,CAAA;AAErC;;;;;;GAMG;AAEH;;;GAGG;AACH,SAAS,KAAK,CAAC,GAAG,EAAE,IAAI;IACvB,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ;QAAE,OAAO,SAAS,CAAA;IACrD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAC7B,IAAI,GAAG,GAAG,GAAG,CAAA;IACb,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;QACvB,IAAI,GAAG,KAAK,IAAI,IAAI,GAAG,KAAK,SAAS,IAAI,OAAO,GAAG,KAAK,QAAQ;YAAE,OAAO,SAAS,CAAA;QAClF,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,CAAA;IACb,CAAC;IACD,OAAO,GAAG,CAAA;AACX,CAAC;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,UAAU,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK;IACrC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAC7B,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,GAAG,KAAK,WAAW,IAAI,GAAG,KAAK,aAAa,IAAI,GAAG,KAAK,WAAW,EAAE,CAAC;YACzE,MAAM,IAAI,KAAK,CAAC,kDAAkD,GAAG,cAAc,IAAI,GAAG,CAAC,CAAA;QAC5F,CAAC;IACF,CAAC;IACD,IAAI,GAAG,GAAG,sCAAsC,CAAC,CAAC,GAAG,CAAC,CAAA;IACtD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAC3C,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;QAClB,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,SAAS,IAAI,OAAO,GAAG,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE,CAAC;YAC3E,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,CAAA;QACZ,CAAC;QACD,GAAG,GAAG,sCAAsC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;IACtD,CAAC;IACD,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,GAAG,KAAK,CAAA;AACrC,CAAC;AAED;;;;GAIG;AACH,QAAQ,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,EAAE;IACpC,IAAI,GAAG,KAAK,IAAI,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QACnE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,CAAA;QAClC,OAAM;IACP,CAAC;IACD,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QAC1C,IAAI,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,SAAQ,CAAC,iDAAiD;QACjF,MAAM,IAAI,GAAG,MAAM,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI,CAAC,EAAE,CAAA;QACjD,IAAI,CAAC,KAAK,IAAI,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;YAC7D,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,CAAA;QAC/B,CAAC;aAAM,CAAC;YACP,KAAK,CAAC,CAAC,UAAU,CAAC,CAAC,EAAE,IAAI,CAAC,CAAA;QAC3B,CAAC;IACF,CAAC;AACF,CAAC;AAED;;;GAGG;AACH,SAAS,KAAK,CAAC,GAAG;IACjB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAA;AACvC,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,mBAAmB,CAAC,cAAc,EAAE,cAAc;IACjE,MAAM,QAAQ,GAAG,KAAK,CAAC,cAAc,IAAI,EAAE,CAAC,CAAA;IAC5C,kDAAkD;IAClD,MAAM,gBAAgB,GAAG,EAAE,CAAA;IAC3B,mDAAmD;IACnD,MAAM,iBAAiB,GAAG,EAAE,CAAA;IAC5B,4CAA4C;IAC5C,MAAM,UAAU,GAAG,EAAE,CAAA;IAErB,iEAAiE;IACjE,6CAA6C;IAC7C,KAAK,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;QAC1D,wDAAwD;QACxD,gEAAgE;QAChE,kDAAkD;QAClD,IAAI,IAAI,KAAK,SAAS;YAAE,SAAQ;QAEhC,MAAM,aAAa,GAAG,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;QAC3C,MAAM,IAAI,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAA;QAEtC,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;YACjC,IAAI,CAAC,IAAI,EAAE,CAAC;gBACX,+DAA+D;gBAC/D,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;gBAC5B,UAAU,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAA;gBACrC,SAAQ;YACT,CAAC;YACD,IAAI,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;gBACrC,iBAAiB,CAAC,IAAI,CAAC;oBACtB,GAAG,EAAE,IAAI,CAAC,QAAQ;oBAClB,GAAG,EAAE,IAAI,CAAC,GAAG;oBACb,OAAO,EAAE,IAAI,CAAC,OAAO;oBACrB,OAAO,EAAE,IAAI,CAAC,OAAO;iBACrB,CAAC,CAAA;gBACF,SAAQ;YACT,CAAC;YACD,IAAI,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;gBACrC,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;gBAC5B,gBAAgB,CAAC,IAAI,CAAC;oBACrB,GAAG,EAAE,IAAI,CAAC,QAAQ;oBAClB,KAAK;oBACL,GAAG,EAAE,IAAI,CAAC,GAAG;iBACb,CAAC,CAAA;YACH,CAAC;QACF,CAAC;aAAM,CAAC;YACP,sEAAsE;YACtE,oEAAoE;YACpE,IAAI,IAAI,IAAI,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,KAAK,SAAS,EAAE,CAAC;gBACxD,IAAI,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;oBACrC,iBAAiB,CAAC,IAAI,CAAC;wBACtB,GAAG,EAAE,IAAI,CAAC,QAAQ;wBAClB,GAAG,EAAE,gCAAgC;wBACrC,OAAO,EAAE,IAAI,CAAC,OAAO;wBACrB,OAAO,EAAE,IAAI,CAAC,OAAO;qBACrB,CAAC,CAAA;gBACH,CAAC;qBAAM,CAAC;oBACP,kEAAkE;oBAClE,sDAAsD;oBACtD,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;oBAC5B,gBAAgB,CAAC,IAAI,CAAC;wBACrB,GAAG,EAAE,IAAI,CAAC,QAAQ;wBAClB,KAAK;wBACL,GAAG,EAAE,4DAA4D;qBACjE,CAAC,CAAA;gBACH,CAAC;YACF,CAAC;QACF,CAAC;IACF,CAAC;IAED,qEAAqE;IACrE,uEAAuE;IACvE,6CAA6C;IAC7C,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACpC,MAAM,eAAe,GAAG,cAAc,EAAE,OAAO,CAAA;QAC/C,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;YACnC,QAAQ,CAAC,OAAO,GAAG,eAAe,CAAA;QACnC,CAAC;IACF,CAAC;IAED,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,UAAU,EAAE,CAAA;AACrE,CAAC"}