@isaacriehm/cairn-core 0.4.3 → 0.6.0

package/dist/fix-align/run.js

@@ -0,0 +1,258 @@
+/**
+ * Layer D — `cairn fix align` (plan §4.4).
+ *
+ * Operator-explicit full-repo Haiku-judge sweep over every prose
+ * block × every accepted DEC. Reuses the Layer A `alignFile` machinery
+ * per file with elevated caps so a single sweep can fully judge each
+ * file rather than deferring to staleness.
+ *
+ * Two phases:
+ *
+ *   1. Pre-flight (deterministic, free) — walk every staged source
+ *      file, extract prose blocks, compute Tier 1 candidate counts +
+ *      Haiku call estimate. Produces a cost preview the operator can
+ *      eyeball before approving the spend.
+ *
+ *   2. Apply (calls Haiku) — invoke `alignFile` per file. Aggregate
+ *      tier counts, pending, deferred, descriptive, Haiku spend.
+ *
+ * `--dry-run` exits after pre-flight. `--max-cost` aborts apply when
+ * the estimate exceeds the budget. `--no-creation` short-circuits the
+ * Tier 3 creation judge so a sweep only consolidates duplicates
+ * without proposing fresh DECs.
+ */
+import { readdirSync, statSync } from "node:fs";
+import { join, relative } from "node:path";
+import { matchAnyGlob, readSotCache, } from "../ground/index.js";
+import { alignFile } from "../hooks/post-tool-use/index.js";
+import { TIER2_JACCARD_FLOOR, TOP_K_CANDIDATES, extractBlocks, isMarkdownPath, topKCandidates, } from "../hooks/sot-align-common.js";
+import { logger } from "../logger.js";
+import { tokenize } from "../text/jaccard.js";
+const log = logger("fix-align");
+/* -------------------------------------------------------------------------- */
+/* Tunables                                                                   */
+/* -------------------------------------------------------------------------- */
+const SWEEP_PASS1_CAP = 200;
+const SWEEP_PASS2_CAP = 50;
+const PASS2_FRACTION_ESTIMATE = 0.1; // ~10% of Pass-1 ambiguous → Pass-2
+const TOKENS_PER_PASS1_CALL = 600; // empirical: Haiku dedup P1 ~600 tokens in/out
+const TOKENS_PER_PASS2_CALL = 1_200;
+const TOKENS_PER_CREATION_CALL = 800;
+const DEFAULT_MAX_COST_TOKENS = 500_000;
+const MIN_BLOCK_PROSE_LEN = 80;
+const MIN_BLOCK_TOKEN_COUNT = 10;
+const DEFAULT_EXCLUDES = [
+    ".cairn/**",
+    "node_modules/**",
+    "dist/**",
+    "build/**",
+    ".git/**",
+    ".vscode/**",
+    ".idea/**",
+];
+/* -------------------------------------------------------------------------- */
+/* Run                                                                        */
+/* -------------------------------------------------------------------------- */
+export async function runFixAlign(args) {
+    const { repoRoot } = args;
+    const include = args.include ?? [];
+    const exclude = [...DEFAULT_EXCLUDES, ...(args.exclude ?? [])];
+    const maxCost = args.maxCost ?? DEFAULT_MAX_COST_TOKENS;
+    const skipCreation = args.skipCreation === true;
+    const pass1Cap = args.pass1Cap ?? SWEEP_PASS1_CAP;
+    const pass2Cap = args.pass2Cap ?? SWEEP_PASS2_CAP;
+    const filesVisited = listSourceFiles({ repoRoot, include, exclude });
+    const cache = readSotCache(repoRoot);
+    const cacheEntries = Object.values(cache.entries).filter((e) => e.tokens.length > 0);
+    const preflight = computePreflight({
+        repoRoot,
+        files: filesVisited,
+        cacheEntries,
+        skipCreation,
+        pass1Cap,
+    });
+    const result = {
+        preflight,
+        apply: null,
+        abortedOverBudget: false,
+        filesVisited,
+    };
+    if (args.dryRun === true)
+        return result;
+    if (preflight.estimatedTokens > maxCost) {
+        log.warn({ estimated: preflight.estimatedTokens, maxCost }, "fix-align estimate exceeds maxCost; aborting before Haiku spend");
+        result.abortedOverBudget = true;
+        return result;
+    }
+    const aggregate = {
+        filesAligned: 0,
+        blocksConsidered: 0,
+        tier1Aligned: 0,
+        tier2Aligned: 0,
+        decsCreated: 0,
+        invsCreated: 0,
+        augmentsDecs: 0,
+        augmentsInvs: 0,
+        pending: 0,
+        deferredToStaleness: 0,
+        descriptive: 0,
+        skipped: 0,
+        haikuPass1Calls: 0,
+        haikuPass2Calls: 0,
+        haikuCalls: 0,
+    };
+    for (const file of filesVisited) {
+        const alignArgs = {
+            repoRoot,
+            filePath: file,
+            sessionId: null,
+            pass1Cap,
+            pass2Cap,
+            skipCreation,
+        };
+        if (args.mocks?.mockDedupJudgePass1 !== undefined)
+            alignArgs.mockDedupJudgePass1 = args.mocks.mockDedupJudgePass1;
+        if (args.mocks?.mockDedupJudgePass2 !== undefined)
+            alignArgs.mockDedupJudgePass2 = args.mocks.mockDedupJudgePass2;
+        if (args.mocks?.mockDeltaExtract !== undefined)
+            alignArgs.mockDeltaExtract = args.mocks.mockDeltaExtract;
+        if (args.mocks?.mockDeltaClassify !== undefined)
+            alignArgs.mockDeltaClassify = args.mocks.mockDeltaClassify;
+        if (args.mocks?.mockCreationJudgePass1 !== undefined)
+            alignArgs.mockCreationJudgePass1 = args.mocks.mockCreationJudgePass1;
+        if (args.mocks?.mockCreationJudgePass2 !== undefined)
+            alignArgs.mockCreationJudgePass2 = args.mocks.mockCreationJudgePass2;
+        let fileResult;
+        try {
+            fileResult = await alignFile(alignArgs);
+        }
+        catch (err) {
+            log.warn({ file, err: String(err) }, "alignFile threw; continuing sweep");
+            continue;
+        }
+        aggregate.filesAligned += 1;
+        aggregate.blocksConsidered += fileResult.blocksConsidered;
+        aggregate.tier1Aligned += fileResult.tier1Aligned;
+        aggregate.tier2Aligned += fileResult.tier2Aligned;
+        aggregate.decsCreated += fileResult.decsCreated;
+        aggregate.invsCreated += fileResult.invsCreated;
+        aggregate.augmentsDecs += fileResult.augmentsDecs;
+        aggregate.augmentsInvs += fileResult.augmentsInvs;
+        aggregate.pending += fileResult.pending;
+        aggregate.deferredToStaleness += fileResult.deferredToStaleness;
+        aggregate.descriptive += fileResult.descriptive;
+        aggregate.skipped += fileResult.skipped;
+        aggregate.haikuPass1Calls += fileResult.haikuPass1Calls;
+        aggregate.haikuPass2Calls += fileResult.haikuPass2Calls;
+        aggregate.haikuCalls += fileResult.haikuCalls;
+    }
+    result.apply = aggregate;
+    return result;
+}
+function listSourceFiles(args) {
+    const out = [];
+    walk(args.repoRoot, args.repoRoot, out, args);
+    out.sort();
+    return out;
+}
+function walk(repoRoot, dir, out, args) {
+    let entries;
+    try {
+        entries = readdirSync(dir);
+    }
+    catch {
+        return;
+    }
+    for (const name of entries) {
+        if (name.startsWith(".") && name !== ".cairn") {
+            // Allow .cairn for the exclude check below; everything else
+            // hidden gets skipped (avoids walking node_modules-equivalents).
+            if (name === ".git" || name === ".vscode" || name === ".idea")
+                continue;
+        }
+        const abs = join(dir, name);
+        let s;
+        try {
+            s = statSync(abs);
+        }
+        catch {
+            continue;
+        }
+        const rel = relative(repoRoot, abs).split("\\").join("/");
+        if (s.isDirectory()) {
+            if (matchAnyGlob(`${rel}/`, args.exclude) || matchAnyGlob(rel, args.exclude))
+                continue;
+            walk(repoRoot, abs, out, args);
+            continue;
+        }
+        if (!s.isFile())
+            continue;
+        if (isMarkdownPath(rel))
+            continue;
+        if (matchAnyGlob(rel, args.exclude))
+            continue;
+        if (args.include.length > 0 && !matchAnyGlob(rel, args.include))
+            continue;
+        out.push(rel);
+    }
+}
+function computePreflight(args) {
+    const out = {
+        filesScanned: args.files.length,
+        blocksConsidered: 0,
+        shortBlocks: 0,
+        blocksWithTier1Candidates: 0,
+        blocksWithoutCandidates: 0,
+        estimatedPass1Calls: 0,
+        estimatedPass2Calls: 0,
+        estimatedCreationCalls: 0,
+        estimatedTokens: 0,
+    };
+    for (const file of args.files) {
+        let blocks;
+        try {
+            blocks = extractBlocks(args.repoRoot, file);
+        }
+        catch {
+            continue;
+        }
+        for (const block of blocks) {
+            out.blocksConsidered += 1;
+            if (block.prose.length < MIN_BLOCK_PROSE_LEN) {
+                out.shortBlocks += 1;
+                continue;
+            }
+            const blockTokens = tokenize(block.prose, { codeAware: true });
+            if (blockTokens.size < MIN_BLOCK_TOKEN_COUNT) {
+                out.shortBlocks += 1;
+                continue;
+            }
+            const candidates = topKCandidates(blockTokens, args.cacheEntries, TIER2_JACCARD_FLOOR, TOP_K_CANDIDATES);
+            if (candidates.length === 0) {
+                out.blocksWithoutCandidates += 1;
+                if (!args.skipCreation) {
+                    // Tier 3 creation: ~1 P1 call + ~5% P2 escalation.
+                    out.estimatedPass1Calls += 1;
+                    out.estimatedPass2Calls += 0.05;
+                    out.estimatedCreationCalls += 1;
+                }
+                continue;
+            }
+            out.blocksWithTier1Candidates += 1;
+            // Tier 2 dedup: at most pass1Cap P1 calls per block, but
+            // typically the first candidate matches → average ~1 P1 call.
+            const expectedP1 = Math.min(candidates.length, Math.max(1, args.pass1Cap));
+            const avgP1 = Math.min(expectedP1, 2); // empirical avg
+            out.estimatedPass1Calls += avgP1;
+            out.estimatedPass2Calls += avgP1 * PASS2_FRACTION_ESTIMATE;
+        }
+    }
+    out.estimatedPass1Calls = Math.ceil(out.estimatedPass1Calls);
+    out.estimatedPass2Calls = Math.ceil(out.estimatedPass2Calls);
+    out.estimatedTokens =
+        out.estimatedPass1Calls * TOKENS_PER_PASS1_CALL +
+            out.estimatedPass2Calls * TOKENS_PER_PASS2_CALL +
+            out.estimatedCreationCalls * TOKENS_PER_CREATION_CALL;
+    return out;
+}
+//# sourceMappingURL=run.js.map

package/dist/fix-align/run.js.map

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

package/dist/fix-align/sentinel.d.ts

@@ -0,0 +1,59 @@
+/**
+ * Layer D operator-consent gates (plan §4.4 — items 4 + 9 in
+ * `/Users/user/cairn-v0.5.0-deferred.md`).
+ *
+ * `cairn fix align` runs a full-repo Haiku-judge sweep + strip-replace
+ * pass. It is expensive (Haiku spend) and destructive (rewrites source
+ * prose blocks). Two gates protect the operator:
+ *
+ *   - Dry-run sentinel — `--dry-run` writes
+ *     `.cairn/state/fix-align-dryrun.json` with `{ ts, repo_head_sha,
+ *     args_hash }`. The next non-dry-run invocation must find a
+ *     sentinel that is fresh (≤ 30 min), points at the current HEAD,
+ *     and matches the same flag set. Mismatch aborts before any
+ *     Haiku call.
+ *
+ *   - Dirty-tree guard — before the apply phase, the CLI checks
+ *     `git status --porcelain` for modified / staged paths that
+ *     intersect the include globs. Hits abort with a message asking
+ *     the operator to commit / stash, or pass `--force`.
+ *
+ * Both gates can be bypassed with `--force` for scripted contexts
+ * (CI, retroactive sweeps the operator has already vetted).
+ */
+export declare function fixAlignSentinelPath(repoRoot: string): string;
+export interface FixAlignSentinelArgs {
+    include: readonly string[];
+    exclude: readonly string[];
+    skipCreation: boolean;
+    maxCost: number | null;
+}
+/**
+ * Hash the apply-phase flags so a follow-up run with different
+ * `--include` / `--exclude` / `--no-creation` / `--max-cost` is
+ * detected as drift against the dry-run.
+ */
+export declare function hashFixAlignArgs(args: FixAlignSentinelArgs): string;
+export declare function readGitHeadSha(repoRoot: string): string | null;
+export declare function writeFixAlignSentinel(repoRoot: string, args: FixAlignSentinelArgs): void;
+export type SentinelValidation = {
+    ok: true;
+} | {
+    ok: false;
+    reason: "missing" | "stale" | "head-drifted" | "args-drifted";
+    detail: string;
+};
+export declare function validateFixAlignSentinel(repoRoot: string, args: FixAlignSentinelArgs, now?: number): SentinelValidation;
+export interface DirtyPath {
+    /** Repo-relative path. */
+    path: string;
+    /** Two-character porcelain status (e.g., ` M`, `??`, `MM`). */
+    status: string;
+}
+/**
+ * Return modified / staged / untracked paths inside `git status
+ * --porcelain` whose path matches one of the include globs (or every
+ * dirty path when include is empty — full-repo sweep). Returns an
+ * empty array when the repo isn't a git tree at all.
+ */
+export declare function gitDirtyPathsInScope(repoRoot: string, includeGlobs: readonly string[]): DirtyPath[];

package/dist/fix-align/sentinel.js

@@ -0,0 +1,149 @@
+/**
+ * Layer D operator-consent gates (plan §4.4 — items 4 + 9 in
+ * `/Users/user/cairn-v0.5.0-deferred.md`).
+ *
+ * `cairn fix align` runs a full-repo Haiku-judge sweep + strip-replace
+ * pass. It is expensive (Haiku spend) and destructive (rewrites source
+ * prose blocks). Two gates protect the operator:
+ *
+ *   - Dry-run sentinel — `--dry-run` writes
+ *     `.cairn/state/fix-align-dryrun.json` with `{ ts, repo_head_sha,
+ *     args_hash }`. The next non-dry-run invocation must find a
+ *     sentinel that is fresh (≤ 30 min), points at the current HEAD,
+ *     and matches the same flag set. Mismatch aborts before any
+ *     Haiku call.
+ *
+ *   - Dirty-tree guard — before the apply phase, the CLI checks
+ *     `git status --porcelain` for modified / staged paths that
+ *     intersect the include globs. Hits abort with a message asking
+ *     the operator to commit / stash, or pass `--force`.
+ *
+ * Both gates can be bypassed with `--force` for scripted contexts
+ * (CI, retroactive sweeps the operator has already vetted).
+ */
+import { execFileSync } from "node:child_process";
+import { createHash } from "node:crypto";
+import { existsSync, readFileSync } from "node:fs";
+import { join } from "node:path";
+import { writeFileSafe } from "../fs.js";
+import { matchAnyGlob } from "../ground/glob.js";
+import { logger } from "../logger.js";
+const log = logger("fix-align.sentinel");
+/** Sentinel TTL — operators who walk away for half an hour pay the dry-run cost again. */
+const SENTINEL_TTL_MS = 30 * 60 * 1000;
+export function fixAlignSentinelPath(repoRoot) {
+    return join(repoRoot, ".cairn", "state", "fix-align-dryrun.json");
+}
+/**
+ * Hash the apply-phase flags so a follow-up run with different
+ * `--include` / `--exclude` / `--no-creation` / `--max-cost` is
+ * detected as drift against the dry-run.
+ */
+export function hashFixAlignArgs(args) {
+    const normalized = {
+        include: [...args.include].sort(),
+        exclude: [...args.exclude].sort(),
+        skipCreation: args.skipCreation === true,
+        maxCost: args.maxCost ?? null,
+    };
+    return createHash("sha256")
+        .update(JSON.stringify(normalized), "utf8")
+        .digest("hex");
+}
+export function readGitHeadSha(repoRoot) {
+    try {
+        const out = execFileSync("git", ["rev-parse", "HEAD"], {
+            cwd: repoRoot,
+            encoding: "utf8",
+            stdio: ["ignore", "pipe", "ignore"],
+        });
+        return out.trim();
+    }
+    catch {
+        return null;
+    }
+}
+export function writeFixAlignSentinel(repoRoot, args) {
+    const data = {
+        ts: new Date().toISOString(),
+        repo_head_sha: readGitHeadSha(repoRoot),
+        args_hash: hashFixAlignArgs(args),
+    };
+    writeFileSafe(fixAlignSentinelPath(repoRoot), `${JSON.stringify(data, null, 2)}\n`);
+}
+export function validateFixAlignSentinel(repoRoot, args, now = Date.now()) {
+    const path = fixAlignSentinelPath(repoRoot);
+    if (!existsSync(path)) {
+        return { ok: false, reason: "missing", detail: "no prior --dry-run sentinel found" };
+    }
+    let parsed;
+    try {
+        parsed = JSON.parse(readFileSync(path, "utf8"));
+    }
+    catch (err) {
+        log.warn({ err: err instanceof Error ? err.message : String(err) }, "fix-align sentinel parse failed");
+        return { ok: false, reason: "missing", detail: "sentinel unreadable" };
+    }
+    const ts = Date.parse(parsed.ts ?? "");
+    if (!Number.isFinite(ts) || now - ts > SENTINEL_TTL_MS) {
+        return {
+            ok: false,
+            reason: "stale",
+            detail: `sentinel older than ${SENTINEL_TTL_MS / 60_000} minutes`,
+        };
+    }
+    const head = readGitHeadSha(repoRoot);
+    if (head !== null && parsed.repo_head_sha !== head) {
+        return {
+            ok: false,
+            reason: "head-drifted",
+            detail: `HEAD ${head.slice(0, 7)} differs from sentinel ${(parsed.repo_head_sha ?? "?").slice(0, 7)}`,
+        };
+    }
+    const expected = hashFixAlignArgs(args);
+    if (parsed.args_hash !== expected) {
+        return {
+            ok: false,
+            reason: "args-drifted",
+            detail: "flags differ from the --dry-run invocation",
+        };
+    }
+    return { ok: true };
+}
+/**
+ * Return modified / staged / untracked paths inside `git status
+ * --porcelain` whose path matches one of the include globs (or every
+ * dirty path when include is empty — full-repo sweep). Returns an
+ * empty array when the repo isn't a git tree at all.
+ */
+export function gitDirtyPathsInScope(repoRoot, includeGlobs) {
+    let out;
+    try {
+        // `--untracked-files=all` so an untracked file inside an
+        // untracked directory shows up as a leaf path rather than the
+        // collapsed `?? src/` summary line.
+        out = execFileSync("git", ["status", "--porcelain", "--untracked-files=all"], {
+            cwd: repoRoot,
+            encoding: "utf8",
+            stdio: ["ignore", "pipe", "ignore"],
+        });
+    }
+    catch {
+        return [];
+    }
+    const dirty = [];
+    for (const line of out.split("\n")) {
+        if (line.length === 0)
+            continue;
+        const status = line.slice(0, 2);
+        // Porcelain v1 layout: `XY <path>` where the path starts at column 3.
+        const path = line.slice(3).trim();
+        if (path.length === 0)
+            continue;
+        if (includeGlobs.length > 0 && !matchAnyGlob(path, includeGlobs))
+            continue;
+        dirty.push({ path, status });
+    }
+    return dirty;
+}
+//# sourceMappingURL=sentinel.js.map

package/dist/fix-align/sentinel.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sentinel.js","sourceRoot":"","sources":["../../src/fix-align/sentinel.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,MAAM,GAAG,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAC;AAEzC,0FAA0F;AAC1F,MAAM,eAAe,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAEvC,MAAM,UAAU,oBAAoB,CAAC,QAAgB;IACnD,OAAO,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,uBAAuB,CAAC,CAAC;AACpE,CAAC;AAeD;;;;GAIG;AACH,MAAM,UAAU,gBAAgB,CAAC,IAA0B;IACzD,MAAM,UAAU,GAAG;QACjB,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE;QACjC,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE;QACjC,YAAY,EAAE,IAAI,CAAC,YAAY,KAAK,IAAI;QACxC,OAAO,EAAE,IAAI,CAAC,OAAO,IAAI,IAAI;KAC9B,CAAC;IACF,OAAO,UAAU,CAAC,QAAQ,CAAC;SACxB,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;SAC1C,MAAM,CAAC,KAAK,CAAC,CAAC;AACnB,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,QAAgB;IAC7C,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,YAAY,CAAC,KAAK,EAAE,CAAC,WAAW,EAAE,MAAM,CAAC,EAAE;YACrD,GAAG,EAAE,QAAQ;YACb,QAAQ,EAAE,MAAM;YAChB,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC;SACpC,CAAC,CAAC;QACH,OAAO,GAAG,CAAC,IAAI,EAAE,CAAC;IACpB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,MAAM,UAAU,qBAAqB,CACnC,QAAgB,EAChB,IAA0B;IAE1B,MAAM,IAAI,GAAiB;QACzB,EAAE,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;QAC5B,aAAa,EAAE,cAAc,CAAC,QAAQ,CAAC;QACvC,SAAS,EAAE,gBAAgB,CAAC,IAAI,CAAC;KAClC,CAAC;IACF,aAAa,CAAC,oBAAoB,CAAC,QAAQ,CAAC,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;AACtF,CAAC;AAUD,MAAM,UAAU,wBAAwB,CACtC,QAAgB,EAChB,IAA0B,EAC1B,MAAc,IAAI,CAAC,GAAG,EAAE;IAExB,MAAM,IAAI,GAAG,oBAAoB,CAAC,QAAQ,CAAC,CAAC;IAC5C,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QACtB,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,mCAAmC,EAAE,CAAC;IACvF,CAAC;IACD,IAAI,MAAoB,CAAC;IACzB,IAAI,CAAC;QACH,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;IAClD,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,GAAG,CAAC,IAAI,CACN,EAAE,GAAG,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EACzD,iCAAiC,CAClC,CAAC;QACF,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,qBAAqB,EAAE,CAAC;IACzE,CAAC;IACD,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;IACvC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,GAAG,GAAG,EAAE,GAAG,eAAe,EAAE,CAAC;QACvD,OAAO;YACL,EAAE,EAAE,KAAK;YACT,MAAM,EAAE,OAAO;YACf,MAAM,EAAE,uBAAuB,eAAe,GAAG,MAAM,UAAU;SAClE,CAAC;IACJ,CAAC;IACD,MAAM,IAAI,GAAG,cAAc,CAAC,QAAQ,CAAC,CAAC;IACtC,IAAI,IAAI,KAAK,IAAI,IAAI,MAAM,CAAC,aAAa,KAAK,IAAI,EAAE,CAAC;QACnD,OAAO;YACL,EAAE,EAAE,KAAK;YACT,MAAM,EAAE,cAAc;YACtB,MAAM,EAAE,QAAQ,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,0BAA0B,CAAC,MAAM,CAAC,aAAa,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE;SACtG,CAAC;IACJ,CAAC;IACD,MAAM,QAAQ,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACxC,IAAI,MAAM,CAAC,SAAS,KAAK,QAAQ,EAAE,CAAC;QAClC,OAAO;YACL,EAAE,EAAE,KAAK;YACT,MAAM,EAAE,cAAc;YACtB,MAAM,EAAE,4CAA4C;SACrD,CAAC;IACJ,CAAC;IACD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;AACtB,CAAC;AASD;;;;;GAKG;AACH,MAAM,UAAU,oBAAoB,CAClC,QAAgB,EAChB,YAA+B;IAE/B,IAAI,GAAW,CAAC;IAChB,IAAI,CAAC;QACH,yDAAyD;QACzD,8DAA8D;QAC9D,oCAAoC;QACpC,GAAG,GAAG,YAAY,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,aAAa,EAAE,uBAAuB,CAAC,EAAE;YAC5E,GAAG,EAAE,QAAQ;YACb,QAAQ,EAAE,MAAM;YAChB,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC;SACpC,CAAC,CAAC;IACL,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,KAAK,GAAgB,EAAE,CAAC;IAC9B,KAAK,MAAM,IAAI,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QACnC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;YAAE,SAAS;QAChC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAChC,sEAAsE;QACtE,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAClC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;YAAE,SAAS;QAChC,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,YAAY,CAAC;YAAE,SAAS;QAC3E,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IAC/B,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}

package/dist/fs.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Write `data` to `path`, creating parent directories as needed.
+ * Encoding is always UTF-8.
+ */
+export declare function writeFileSafe(path: string, data: string): void;

package/dist/fs.js

@@ -0,0 +1,11 @@
+import { mkdirSync, writeFileSync } from "node:fs";
+import { dirname } from "node:path";
+/**
+ * Write `data` to `path`, creating parent directories as needed.
+ * Encoding is always UTF-8.
+ */
+export function writeFileSafe(path, data) {
+    mkdirSync(dirname(path), { recursive: true });
+    writeFileSync(path, data, "utf8");
+}
+//# sourceMappingURL=fs.js.map

package/dist/fs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"fs.js","sourceRoot":"","sources":["../src/fs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC;;;GAGG;AACH,MAAM,UAAU,aAAa,CAAC,IAAY,EAAE,IAAY;IACtD,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC9C,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;AACpC,CAAC"}

package/dist/gc/apply.js

@@ -8,8 +8,9 @@
  * No push happens here — the GC sweep + canary verification + push policy is
  * orchestrated by `runGcBatch` (sweep.ts).
  */
-import { mkdirSync, rmSync, writeFileSync } from "node:fs";
-import { dirname, resolve } from "node:path";
+import { rmSync } from "node:fs";
+import { resolve } from "node:path";
+import { writeFileSafe } from "../fs.js";
 import { simpleGit } from "simple-git";
 export async function applyCommit(opts) {
     const written = [];
@@ -26,8 +27,7 @@ export async function applyCommit(opts) {
             }
         }
         else {
-            mkdirSync(dirname(abs), { recursive: true });
-            writeFileSync(abs, content, "utf8");
+            writeFileSafe(abs, content);
             written.push(rel);
         }
     }

package/dist/gc/apply.js.map

@@ -1 +1 @@
-{"version":3,"file":"apply.js","sourceRoot":"","sources":["../../src/gc/apply.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAC3D,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAgBvC,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,IAAwB;IACxD,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,MAAM,OAAO,GAAa,EAAE,CAAC;IAE7B,KAAK,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QACjE,MAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QACxC,IAAI,OAAO,KAAK,EAAE,EAAE,CAAC;YACnB,IAAI,CAAC;gBACH,MAAM,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC7B,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACpB,CAAC;YAAC,MAAM,CAAC;gBACP,6BAA6B;YAC/B,CAAC;QACH,CAAC;aAAM,CAAC;YACN,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC7C,aAAa,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;YACpC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACpB,CAAC;IACH,CAAC;IAED,MAAM,GAAG,GAAG,SAAS,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;IAClD,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QAC9B,MAAM,GAAG,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QACnE,MAAM,GAAG,CAAC,SAAS,CAAC,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IACvE,CAAC;IACD,MAAM,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACnC,MAAM,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;IAC/C,MAAM,GAAG,GAAG,CAAC,MAAM,GAAG,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAElD,OAAO;QACL,UAAU,EAAE,GAAG;QACf,aAAa,EAAE,OAAO;QACtB,aAAa,EAAE,OAAO;KACvB,CAAC;AACJ,CAAC"}
+{"version":3,"file":"apply.js","sourceRoot":"","sources":["../../src/gc/apply.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAgBvC,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,IAAwB;IACxD,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,MAAM,OAAO,GAAa,EAAE,CAAC;IAE7B,KAAK,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QACjE,MAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QACxC,IAAI,OAAO,KAAK,EAAE,EAAE,CAAC;YACnB,IAAI,CAAC;gBACH,MAAM,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC7B,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACpB,CAAC;YAAC,MAAM,CAAC;gBACP,6BAA6B;YAC/B,CAAC;QACH,CAAC;aAAM,CAAC;YACN,aAAa,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YAC5B,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACpB,CAAC;IACH,CAAC;IAED,MAAM,GAAG,GAAG,SAAS,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;IAClD,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QAC9B,MAAM,GAAG,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QACnE,MAAM,GAAG,CAAC,SAAS,CAAC,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IACvE,CAAC;IACD,MAAM,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACnC,MAAM,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;IAC/C,MAAM,GAAG,GAAG,CAAC,MAAM,GAAG,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAElD,OAAO;QACL,UAAU,EAAE,GAAG;QACf,aAAa,EAAE,OAAO;QACtB,aAAa,EAAE,OAAO;KACvB,CAAC;AACJ,CAAC"}

package/dist/ground/alignment-pending.d.ts

@@ -0,0 +1,28 @@
+/**
+ * Alignment-pending queue writer — used by Layer A (PostToolUse hook,
+ * pass-2-still-ambiguous + tier3-ambiguous paths) and Layer C
+ * (SessionStart drain, Haiku-judge-ambiguous path).
+ *
+ * The cairn-attention skill renders the file with side-by-side prose
+ * and an AskUserQuestion four-option pick. The filename is a content
+ * fingerprint slug so re-running with the same prose is idempotent.
+ */
+import type { CommentBlock } from "../init/source-comments/index.js";
+export type AlignmentPendingKind = "tier2-ambiguous" | "tier3-ambiguous";
+export interface WriteAlignmentPendingArgs {
+    repoRoot: string;
+    block: CommentBlock;
+    kind: AlignmentPendingKind;
+    /** Existing entity id (Tier 2 paths only). */
+    existingId?: string;
+    /** Existing entity body (Tier 2 paths only). */
+    existingBody?: string;
+    /**
+     * Detector tag stamped into frontmatter — distinguishes Layer A
+     * (`layer-a-pass2-ambiguous`) from Layer C (`layer-c-drain-ambiguous`).
+     * Defaults to the Layer A detector for back-compat with the existing
+     * `tier3-ambiguous` smoke fixtures.
+     */
+    detector?: string;
+}
+export declare function writeAlignmentPending(args: WriteAlignmentPendingArgs): string;

package/dist/ground/alignment-pending.js

@@ -0,0 +1,83 @@
+/**
+ * Alignment-pending queue writer — used by Layer A (PostToolUse hook,
+ * pass-2-still-ambiguous + tier3-ambiguous paths) and Layer C
+ * (SessionStart drain, Haiku-judge-ambiguous path).
+ *
+ * The cairn-attention skill renders the file with side-by-side prose
+ * and an AskUserQuestion four-option pick. The filename is a content
+ * fingerprint slug so re-running with the same prose is idempotent.
+ */
+import { existsSync, mkdirSync, writeFileSync } from "node:fs";
+import { join } from "node:path";
+import { stringify as stringifyYaml } from "yaml";
+import { alignmentPendingDir } from "./paths.js";
+import { topicSlug } from "./slug.js";
+export function writeAlignmentPending(args) {
+    const { repoRoot, block, kind } = args;
+    const detector = args.detector ?? "layer-a-pass2-ambiguous";
+    const dir = alignmentPendingDir(repoRoot);
+    mkdirSync(dir, { recursive: true });
+    const slug = topicSlug(block.prose);
+    const filename = `${slug}.md`;
+    const abs = join(dir, filename);
+    if (existsSync(abs))
+        return `.cairn/ground/alignment-pending/${filename}`;
+    const now = new Date().toISOString();
+    const fm = {
+        slug,
+        kind,
+        source_file: block.file,
+        source_range: `${block.startLine}-${block.endLine}`,
+        start_line: block.startLine,
+        end_line: block.endLine,
+        start_offset: block.startOffset,
+        end_offset: block.endOffset,
+        lang: block.lang,
+        raw: block.raw,
+        detected_at: now,
+        detector,
+        severity: "soft",
+    };
+    if (args.existingId !== undefined)
+        fm["existing_id"] = args.existingId;
+    const lines = [];
+    lines.push("---");
+    lines.push(stringifyYaml(fm).trimEnd());
+    lines.push("---");
+    lines.push("");
+    lines.push(`# Alignment pending — ${slug} (${kind})`);
+    lines.push("");
+    lines.push(`## Block (just written at \`${block.file}:${block.startLine}-${block.endLine}\`)`);
+    lines.push("");
+    lines.push("```");
+    lines.push(block.prose.trim());
+    lines.push("```");
+    lines.push("");
+    if (args.existingId !== undefined && args.existingBody !== undefined) {
+        lines.push(`## Existing ${args.existingId}`);
+        lines.push("");
+        lines.push("```");
+        lines.push(args.existingBody.trim());
+        lines.push("```");
+        lines.push("");
+    }
+    lines.push("## How to resolve");
+    lines.push("");
+    if (kind === "tier2-ambiguous") {
+        lines.push("Pass 2 dedup judge returned ambiguous. cairn-attention will surface");
+        lines.push("a side-by-side render with `[a] same` / `[b] different` /");
+        lines.push("`[c] augments` / `[d] leave for later` choices via");
+        lines.push("`cairn_resolve_attention({ kind: \"alignment_pending\", ... })`.");
+    }
+    else {
+        lines.push("Pass 2 creation judge could not classify the block as");
+        lines.push("decision / constraint / descriptive. cairn-attention will");
+        lines.push("surface `[a] decision` / `[b] constraint` / `[c] descriptive` /");
+        lines.push("`[d] leave for later` via");
+        lines.push("`cairn_resolve_attention({ kind: \"alignment_pending\", ... })`.");
+    }
+    lines.push("");
+    writeFileSync(abs, lines.join("\n"), "utf8");
+    return `.cairn/ground/alignment-pending/${filename}`;
+}
+//# sourceMappingURL=alignment-pending.js.map