@isaacriehm/cairn-core 0.26.0 → 0.31.0

package/dist/resync/index.js

@@ -0,0 +1,389 @@
+/**
+ * `cairn resync` — operator-initiated incremental re-discovery (Stage 3).
+ *
+ * Stage 1's config-drift sensor SURFACES the gap between declared config and
+ * the grown tree; resync is the operator-initiated verb that RESOLVES it. This
+ * v1 closes the deterministic half of the loop: it re-runs the config-drift
+ * detector and turns each finding into a concrete `config.yaml` edit —
+ *
+ *   - `config_uncovered_dir`     → add the dir to the owning workspace's
+ *                                  `componentDirs`
+ *   - `config_uncovered_ext`     → add the file type to that workspace's
+ *                                  `extensions`
+ *   - `config_gitignore_drift`   → add the ignored path to top-level
+ *                                  `off_limits`
+ *   - `config_orphan_path`       → drop the dead `componentDir`
+ *
+ * Safety (Q23): `--dry-run` (the default) mutates nothing — it returns the
+ * proposed edits for the operator to review. Apply archives the pre-resync
+ * `config.yaml` to `.cairn/ground/.archive/` first, edits via the comment-
+ * preserving yaml Document API, and is idempotent on a clean delta (re-run
+ * after apply proposes nothing). The edit is a `review`-class mutation of
+ * committed config the operator commits; derived state stays gitignored +
+ * per-clone, so there is no new multi-dev conflict surface (Q22).
+ *
+ * Deferred to the LLM half (Q3/Q16, opt-in, quota-gated): hash-rematch of moved
+ * entities, Haiku re-cluster of topic-index/canonical-map over genuinely-new
+ * prose, and re-curation of new areas into DEC/INV drafts. `domain_summary`
+ * (Q15) is an init-time seed for the brand bodies, not live agent context, so
+ * resync does not refresh it.
+ */
+import { existsSync, readFileSync, readdirSync, writeFileSync } from "node:fs";
+import { extname, join } from "node:path";
+import { configPath, decisionsDir, invariantsDir, knownExtensions, loadComponentsConfig, parseFrontmatterRecord, } from "@isaacriehm/cairn-state";
+import { runConfigDrift } from "../gc/config-drift.js";
+import { walkSourceTree } from "../gc/walk-source.js";
+import { loadConfigDoc, writeConfigDoc } from "../migrate/config-io.js";
+import { archiveFile } from "./archive.js";
+export { runResyncRecluster, } from "./recluster.js";
+function trimSlash(p) {
+    return p.endsWith("/") ? p.slice(0, -1) : p;
+}
+function commonDirPrefix(dirs) {
+    if (dirs.length === 0)
+        return "";
+    const split = dirs.map((d) => trimSlash(d).split("/"));
+    const first = split[0];
+    let len = first.length;
+    for (const segs of split) {
+        let i = 0;
+        while (i < len && i < segs.length && segs[i] === first[i])
+            i++;
+        len = i;
+    }
+    return first.slice(0, len).join("/");
+}
+function isUnder(rel, dir) {
+    const n = trimSlash(dir);
+    return n.length > 0 && (rel === n || rel.startsWith(`${n}/`));
+}
+/** Workspace whose root (common prefix of its componentDirs) contains `dir`. */
+function attributeDirToWorkspace(dir, workspaces) {
+    let best = null;
+    let bestLen = -1;
+    for (const ws of workspaces) {
+        const root = commonDirPrefix(ws.componentDirs);
+        if (isUnder(dir, root) && root.length > bestLen) {
+            best = ws.name;
+            bestLen = root.length;
+        }
+    }
+    return best ?? workspaces[0]?.name ?? "";
+}
+/** Workspace whose componentDir is the longest prefix of `file`. */
+function owningWorkspace(file, workspaces) {
+    let best = null;
+    let bestLen = -1;
+    for (const ws of workspaces) {
+        for (const d of ws.componentDirs) {
+            const n = trimSlash(d);
+            if (isUnder(file, n) && n.length > bestLen) {
+                best = ws.name;
+                bestLen = n.length;
+            }
+        }
+    }
+    return best ?? workspaces[0]?.name ?? "";
+}
+/** Workspace that declares `dir` verbatim as a componentDir, or null. */
+function workspaceDeclaring(dir, workspaces) {
+    const target = trimSlash(dir);
+    for (const ws of workspaces) {
+        if (ws.componentDirs.map(trimSlash).includes(target))
+            return ws.name;
+    }
+    return null;
+}
+function dedupKey(p) {
+    return `${p.kind} ${p.workspace ?? ""} ${p.entityPath ?? ""} ${p.value}`;
+}
+const INV_CITE_RE = /§INV-([0-9a-f]{7,})\b/g;
+const DEC_CITE_RE = /§DEC-([0-9a-f]{7,})\b/g;
+function citeScanExtensions() {
+    return new Set([...knownExtensions(), ".html", ".css", ".scss", ".md"]);
+}
+function fileExt(rel) {
+    const i = rel.lastIndexOf(".");
+    return i === -1 ? "" : rel.slice(i).toLowerCase();
+}
+/** Map every cited `§DEC-`/`§INV-` id → the set of files that cite it. */
+function buildCiteFileMap(repoRoot) {
+    const exts = citeScanExtensions();
+    const map = new Map();
+    const add = (id, file) => {
+        const s = map.get(id) ?? new Set();
+        s.add(file);
+        map.set(id, s);
+    };
+    for (const rel of walkSourceTree(repoRoot)) {
+        if (!exts.has(fileExt(rel)))
+            continue;
+        let content;
+        try {
+            content = readFileSync(join(repoRoot, rel), "utf8");
+        }
+        catch {
+            continue;
+        }
+        for (const m of content.matchAll(DEC_CITE_RE))
+            add(`DEC-${m[1]}`, rel);
+        for (const m of content.matchAll(INV_CITE_RE))
+            add(`INV-${m[1]}`, rel);
+    }
+    return map;
+}
+/**
+ * Hash-rematch's deterministic, committed-mode case (Q3 "free" half): a
+ * ledger-backed DEC/INV whose recorded `source_file` no longer exists, but
+ * whose `§cite` now lives in exactly one OTHER file — the file was renamed and
+ * the cite moved with its content, so the cite is the authoritative new home.
+ * Re-point `source_file` there (keeps `cairn_in_scope`'s source_file match —
+ * the Stage 0 fix — accurate after a rename). Ambiguous (0 or >1 citing files)
+ * is left to the entity-orphan pass. Ghost (no cites) yields nothing here.
+ */
+function deriveSourceRematch(repoRoot) {
+    const citeMap = buildCiteFileMap(repoRoot);
+    const out = [];
+    const groups = [
+        { dir: decisionsDir(repoRoot), rel: ".cairn/ground/decisions" },
+        { dir: invariantsDir(repoRoot), rel: ".cairn/ground/invariants" },
+    ];
+    for (const g of groups) {
+        let names;
+        try {
+            names = readdirSync(g.dir, { encoding: "utf8" });
+        }
+        catch {
+            continue;
+        }
+        for (const name of names) {
+            if (!name.endsWith(".md") || name.startsWith("_"))
+                continue;
+            const abs = join(g.dir, name);
+            let fm;
+            try {
+                fm = parseFrontmatterRecord(readFileSync(abs, "utf8")).fm;
+            }
+            catch {
+                continue;
+            }
+            const status = typeof fm["status"] === "string" ? fm["status"] : "";
+            if (status === "archived" || status === "superseded")
+                continue;
+            const sotKind = typeof fm["sot_kind"] === "string" ? fm["sot_kind"] : "ledger";
+            if (sotKind !== "ledger")
+                continue;
+            const src = typeof fm["source_file"] === "string" ? fm["source_file"] : "";
+            const id = typeof fm["id"] === "string" ? fm["id"] : "";
+            if (src.length === 0 || id.length === 0)
+                continue;
+            if (existsSync(join(repoRoot, src)))
+                continue; // source still present → fine
+            const files = [...(citeMap.get(id) ?? [])];
+            if (files.length !== 1)
+                continue; // 0 = orphan (entity-orphan's job); >1 = ambiguous
+            const newSrc = files[0];
+            if (newSrc === src)
+                continue;
+            out.push({
+                kind: "repoint_source",
+                value: newSrc,
+                from: "stale_source",
+                entityId: id,
+                entityPath: `${g.rel}/${name}`,
+                detail: `re-point ${id} source_file \`${src}\` → \`${newSrc}\` (file moved; cite followed)`,
+            });
+        }
+    }
+    return out;
+}
+/** Map current config-drift findings → deterministic config-edit proposals. */
+function deriveProposals(repoRoot, area) {
+    const { workspaces } = loadComponentsConfig(repoRoot);
+    const findings = runConfigDrift({ repoRoot }).findings.filter((f) => area === undefined || f.path === area || f.path.startsWith(`${trimSlash(area)}/`));
+    const proposals = [];
+    const skipped = [];
+    const seen = new Set();
+    const push = (p) => {
+        const k = dedupKey(p);
+        if (seen.has(k))
+            return;
+        seen.add(k);
+        proposals.push(p);
+    };
+    for (const f of findings) {
+        switch (f.kind) {
+            case "config_uncovered_dir": {
+                const ws = attributeDirToWorkspace(f.path, workspaces);
+                push({
+                    kind: "add_component_dir",
+                    workspace: ws,
+                    value: f.path,
+                    from: f.kind,
+                    detail: `add componentDir \`${f.path}\`${ws ? ` to workspace ${ws}` : ""}`,
+                });
+                break;
+            }
+            case "config_uncovered_ext": {
+                const ws = owningWorkspace(f.path, workspaces);
+                const ext = extname(f.path);
+                if (ext.length === 0) {
+                    skipped.push({ finding: f.kind, path: f.path, reason: "no file extension" });
+                    break;
+                }
+                push({
+                    kind: "add_extension",
+                    workspace: ws,
+                    value: ext,
+                    from: f.kind,
+                    detail: `add extension \`${ext}\`${ws ? ` to workspace ${ws}` : ""}`,
+                });
+                break;
+            }
+            case "config_gitignore_drift": {
+                push({
+                    kind: "add_off_limits",
+                    value: f.path,
+                    from: f.kind,
+                    detail: `add \`${f.path}\` to off_limits`,
+                });
+                break;
+            }
+            case "config_orphan_path": {
+                const ws = workspaceDeclaring(f.path, workspaces);
+                if (ws === null) {
+                    skipped.push({ finding: f.kind, path: f.path, reason: "no workspace declares this dir" });
+                    break;
+                }
+                push({
+                    kind: "drop_component_dir",
+                    workspace: ws,
+                    value: f.path,
+                    from: f.kind,
+                    detail: `drop dead componentDir \`${f.path}\`${ws ? ` from workspace ${ws}` : ""}`,
+                });
+                break;
+            }
+            default:
+                // Non-config-drift findings (other GC passes) aren't resync's job.
+                break;
+        }
+    }
+    // Source rematch (Q3 free half) — re-point stale source_file pointers.
+    for (const p of deriveSourceRematch(repoRoot)) {
+        if (area !== undefined && p.value !== area && !p.value.startsWith(`${trimSlash(area)}/`)) {
+            continue;
+        }
+        push(p);
+    }
+    proposals.sort((a, b) => dedupKey(a).localeCompare(dedupKey(b)));
+    return { proposals, skipped };
+}
+/** Config Document path to a workspace's array field (flat single-app vs map). */
+function fieldPath(workspace, field) {
+    return workspace !== undefined && workspace.length > 0
+        ? ["components", "workspaces", workspace, field]
+        : ["components", field];
+}
+function asArray(node) {
+    if (node === null || node === undefined)
+        return [];
+    const json = node.toJSON?.() ?? node;
+    return Array.isArray(json) ? json.filter((x) => typeof x === "string") : [];
+}
+/** Resolve a `.cairn/ground/{decisions,invariants}/X.md` rel path to abs (mode-aware). */
+function entityAbs(repoRoot, entityPath) {
+    const base = entityPath.split("/").pop();
+    return entityPath.includes("/decisions/")
+        ? join(decisionsDir(repoRoot), base)
+        : join(invariantsDir(repoRoot), base);
+}
+/** Rewrite the (frontmatter) `source_file:` line in place. */
+function repointSource(abs, newSrc) {
+    let raw;
+    try {
+        raw = readFileSync(abs, "utf8");
+    }
+    catch {
+        return false;
+    }
+    if (!/^source_file:\s*.*$/m.test(raw))
+        return false;
+    const next = raw.replace(/^source_file:\s*.*$/m, `source_file: ${newSrc}`);
+    if (next === raw)
+        return false;
+    try {
+        writeFileSync(abs, next, "utf8");
+    }
+    catch {
+        return false;
+    }
+    return true;
+}
+export function runResync(opts) {
+    const dryRun = opts.dryRun !== false; // default true (safe)
+    const { proposals, skipped } = deriveProposals(opts.repoRoot, opts.area);
+    if (dryRun || proposals.length === 0) {
+        return {
+            dryRun: true,
+            proposals,
+            applied: false,
+            archivedConfig: null,
+            archivedEntities: [],
+            skipped,
+        };
+    }
+    const nowIso = opts.nowIso ?? new Date().toISOString();
+    const configProposals = proposals.filter((p) => p.kind !== "repoint_source");
+    const rematchProposals = proposals.filter((p) => p.kind === "repoint_source");
+    // ── Config edits (config.yaml) ──────────────────────────────────────
+    let archivedConfig = null;
+    if (configProposals.length > 0) {
+        archivedConfig = archiveFile(configPath(opts.repoRoot), opts.repoRoot, "config.yaml", nowIso);
+        const doc = loadConfigDoc(opts.repoRoot);
+        if (doc !== null) {
+            for (const p of configProposals) {
+                if (p.kind === "add_off_limits") {
+                    const path = ["off_limits"];
+                    const cur = asArray(doc.getIn(path));
+                    if (!cur.includes(p.value))
+                        doc.setIn(path, [...cur, p.value]);
+                    continue;
+                }
+                const field = p.kind === "add_extension" ? "extensions" : "componentDirs";
+                const path = fieldPath(p.workspace, field);
+                const cur = asArray(doc.getIn(path));
+                if (p.kind === "drop_component_dir") {
+                    const next = cur.filter((d) => trimSlash(d) !== trimSlash(p.value));
+                    if (next.length !== cur.length)
+                        doc.setIn(path, next);
+                }
+                else if (!cur.includes(p.value)) {
+                    doc.setIn(path, [...cur, p.value]);
+                }
+            }
+            writeConfigDoc(opts.repoRoot, doc);
+        }
+    }
+    // ── Source rematch (entity .md frontmatter) ─────────────────────────
+    const archivedEntities = [];
+    for (const p of rematchProposals) {
+        if (p.entityPath === undefined)
+            continue;
+        const abs = entityAbs(opts.repoRoot, p.entityPath);
+        const base = p.entityPath.split("/").pop();
+        const archived = archiveFile(abs, opts.repoRoot, base, nowIso);
+        if (repointSource(abs, p.value) && archived !== null) {
+            archivedEntities.push(archived);
+        }
+    }
+    return {
+        dryRun: false,
+        proposals,
+        applied: true,
+        archivedConfig,
+        archivedEntities,
+        skipped,
+    };
+}
+//# sourceMappingURL=index.js.map

package/dist/resync/index.js.map

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

package/dist/resync/recluster.d.ts

@@ -0,0 +1,59 @@
+/**
+ * `cairn resync --recluster` — the LLM half of re-discovery (Stage 3b).
+ *
+ * The deterministic config-resync (`runResync`) re-points moved entities and
+ * patches `config.yaml`, but it can't notice that the project's *prose* has
+ * grown a new concept or that two now-separate docs describe the same topic.
+ * That re-clustering is what init's Phase 7 does with a Haiku judge; this verb
+ * re-runs exactly that pass over the grown tree.
+ *
+ * Why it's a distinct, opt-in verb (not folded into `runResync` or a sensor):
+ *   - It spends Haiku. The judge fires for every fresh semantic-similarity
+ *     collision, so it's quota-gated — never auto-run, never on a hook.
+ *   - The on-disk judge cache makes it *incremental for free* (Q3): unchanged
+ *     prose pairs hit the cache (no quota burn); only genuinely-new prose
+ *     produces fresh judge calls. `judgeFresh` is the real cost of a re-run.
+ *
+ * Safety (Q23): the maps are gitignored, per-clone derived state — overwriting
+ * them is not a committed mutation and raises no multi-dev conflict (Q22). Even
+ * so, apply archives the pre-resync `topic-index.yaml` + `anchor-map.yaml` to
+ * `.cairn/ground/.archive/` first (a bad re-cluster is recoverable), and
+ * `--dry-run` (the default) resolves + reports without overwriting anything.
+ *
+ * The judge is injected (`opts.judge`) so the gate smoke drives a deterministic
+ * mock — same runner seam Phase 7 already exposes — and burns zero quota.
+ */
+import type { ProseBlock, SemanticJudge } from "../init/topic-index/resolve.js";
+export interface ResyncReclusterOptions {
+    repoRoot: string;
+    /** Preview only — resolve + report but DON'T overwrite the maps. Default true (safe). */
+    dryRun?: boolean;
+    /** Judge seam — smokes inject a deterministic mock to avoid Haiku. */
+    judge?: SemanticJudge;
+    /** Walker seam — smokes inject canned blocks instead of walking the tree. */
+    blocks?: ProseBlock[];
+    /** Hard cap on judge calls (passed through to the resolver). */
+    maxJudgeCalls?: number;
+    /** Injected ISO for archive filenames (determinism in tests). */
+    nowIso?: string;
+}
+export interface ResyncReclusterResult {
+    dryRun: boolean;
+    applied: boolean;
+    /** Distinct topic count before / after the re-cluster. */
+    topicsBefore: number;
+    topicsAfter: number;
+    /** Prose blocks walked. */
+    blockCount: number;
+    /** Total judge calls dispatched (fresh + cached). */
+    judgeCalls: number;
+    /** Fresh `claude --print` judge calls — the real quota cost of this run. */
+    judgeFresh: number;
+    /** Judge calls served from the on-disk cache (no quota burn). */
+    judgeCached: number;
+    /** Judge calls that threw. */
+    judgeErrors: number;
+    /** Repo-relative paths of the archived pre-resync maps (apply only). */
+    archivedMaps: string[];
+}
+export declare function runResyncRecluster(opts: ResyncReclusterOptions): Promise<ResyncReclusterResult>;

package/dist/resync/recluster.js

@@ -0,0 +1,66 @@
+/**
+ * `cairn resync --recluster` — the LLM half of re-discovery (Stage 3b).
+ *
+ * The deterministic config-resync (`runResync`) re-points moved entities and
+ * patches `config.yaml`, but it can't notice that the project's *prose* has
+ * grown a new concept or that two now-separate docs describe the same topic.
+ * That re-clustering is what init's Phase 7 does with a Haiku judge; this verb
+ * re-runs exactly that pass over the grown tree.
+ *
+ * Why it's a distinct, opt-in verb (not folded into `runResync` or a sensor):
+ *   - It spends Haiku. The judge fires for every fresh semantic-similarity
+ *     collision, so it's quota-gated — never auto-run, never on a hook.
+ *   - The on-disk judge cache makes it *incremental for free* (Q3): unchanged
+ *     prose pairs hit the cache (no quota burn); only genuinely-new prose
+ *     produces fresh judge calls. `judgeFresh` is the real cost of a re-run.
+ *
+ * Safety (Q23): the maps are gitignored, per-clone derived state — overwriting
+ * them is not a committed mutation and raises no multi-dev conflict (Q22). Even
+ * so, apply archives the pre-resync `topic-index.yaml` + `anchor-map.yaml` to
+ * `.cairn/ground/.archive/` first (a bad re-cluster is recoverable), and
+ * `--dry-run` (the default) resolves + reports without overwriting anything.
+ *
+ * The judge is injected (`opts.judge`) so the gate smoke drives a deterministic
+ * mock — same runner seam Phase 7 already exposes — and burns zero quota.
+ */
+import { anchorMapPath, readTopicIndex, topicIndexPath } from "@isaacriehm/cairn-state";
+import { buildTopicIndex } from "../init/topic-index/index.js";
+import { archiveFile } from "./archive.js";
+export async function runResyncRecluster(opts) {
+    const dryRun = opts.dryRun !== false; // default true (safe)
+    const topicsBefore = Object.keys(readTopicIndex(opts.repoRoot).topics).length;
+    // On apply, snapshot the live maps before the rebuild overwrites them.
+    const archivedMaps = [];
+    if (!dryRun) {
+        const nowIso = opts.nowIso ?? new Date().toISOString();
+        for (const [abs, base] of [
+            [topicIndexPath(opts.repoRoot), "topic-index.yaml"],
+            [anchorMapPath(opts.repoRoot), "anchor-map.yaml"],
+        ]) {
+            const archived = archiveFile(abs, opts.repoRoot, base, nowIso);
+            if (archived !== null)
+                archivedMaps.push(archived);
+        }
+    }
+    const result = await buildTopicIndex({
+        repoRoot: opts.repoRoot,
+        write: !dryRun,
+        emitProgress: false,
+        ...(opts.judge !== undefined ? { judge: opts.judge } : {}),
+        ...(opts.blocks !== undefined ? { blocks: opts.blocks } : {}),
+        ...(opts.maxJudgeCalls !== undefined ? { maxJudgeCalls: opts.maxJudgeCalls } : {}),
+    });
+    return {
+        dryRun,
+        applied: !dryRun,
+        topicsBefore,
+        topicsAfter: Object.keys(result.topicIndex.topics).length,
+        blockCount: result.blockCount,
+        judgeCalls: result.judgeCalls,
+        judgeFresh: result.judgeFresh,
+        judgeCached: result.judgeCached,
+        judgeErrors: result.judgeErrors,
+        archivedMaps,
+    };
+}
+//# sourceMappingURL=recluster.js.map

package/dist/resync/recluster.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"recluster.js","sourceRoot":"","sources":["../../src/resync/recluster.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAEH,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACxF,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAE/D,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAoC3C,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,IAA4B;IAE5B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,KAAK,KAAK,CAAC,CAAC,sBAAsB;IAC5D,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC;IAE9E,uEAAuE;IACvE,MAAM,YAAY,GAAa,EAAE,CAAC;IAClC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QACvD,KAAK,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI;YACxB,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,kBAAkB,CAAC;YACnD,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,iBAAiB,CAAC;SACzC,EAAE,CAAC;YACX,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;YAC/D,IAAI,QAAQ,KAAK,IAAI;gBAAE,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACrD,CAAC;IACH,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC;QACnC,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,KAAK,EAAE,CAAC,MAAM;QACd,YAAY,EAAE,KAAK;QACnB,GAAG,CAAC,IAAI,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1D,GAAG,CAAC,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7D,GAAG,CAAC,IAAI,CAAC,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACnF,CAAC,CAAC;IAEH,OAAO;QACL,MAAM;QACN,OAAO,EAAE,CAAC,MAAM;QAChB,YAAY;QACZ,WAAW,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,MAAM;QACzD,UAAU,EAAE,MAAM,CAAC,UAAU;QAC7B,UAAU,EAAE,MAAM,CAAC,UAAU;QAC7B,UAAU,EAAE,MAAM,CAAC,UAAU;QAC7B,WAAW,EAAE,MAAM,CAAC,WAAW;QAC/B,WAAW,EAAE,MAAM,CAAC,WAAW;QAC/B,YAAY;KACb,CAAC;AACJ,CAAC"}

package/dist/session-start/build.js

@@ -233,7 +233,11 @@ export async function buildSessionStartContext(args) {
     // 500+ soft findings as "⚑ N pending" gives the operator a count
     // they can't drain item-by-item.
     const latestBaseline = readLatestBaselineAudit(args.repoRoot, warnings);
-    counts.baselineFindings = latestBaseline?.hardFindings ?? 0;
+    // Config-drift (24h GC pass) writes its own baseline family; its findings are
+    // actionable nudges, so roll them into the same hard-findings count.
+    const latestConfigDrift = readLatestBaselineAudit(args.repoRoot, warnings, "config-drift-");
+    counts.baselineFindings =
+        (latestBaseline?.hardFindings ?? 0) + (latestConfigDrift?.hardFindings ?? 0);
     // ── Section 1.5 — brand + product context (only when CONFIRMED) ───
     // Overview, positioning, AND voice — but only files the operator has
     // confirmed (status: current). Drafts / generic auto-fill are skipped.
@@ -813,38 +817,47 @@ function renderQualityGradesSection(grades) {
     return lines.join("\n");
 }
 function listPendingDrafts(repoRoot, warnings) {
-    const dir = cairnDir(repoRoot, "ground", "decisions", "_inbox");
-    if (!existsSync(dir))
-        return [];
-    let entries;
-    try {
-        entries = readdirSync(dir, { withFileTypes: true, encoding: "utf8" });
-    }
-    catch {
-        return [];
-    }
+    // Both DEC (`decisions/_inbox/`) and INV (`invariants/_inbox/`) drafts are
+    // operator-pending review items: init-curator + manual record_decision write
+    // the former, resync re-curation writes both. The id prefix (DEC-/INV-)
+    // tells the operator which is which; cairn-attention dispatches on it.
+    const dirs = [
+        cairnDir(repoRoot, "ground", "decisions", "_inbox"),
+        cairnDir(repoRoot, "ground", "invariants", "_inbox"),
+    ];
     const out = [];
-    for (const e of entries) {
-        if (!e.isFile())
-            continue;
-        if (!e.name.endsWith(".draft.md"))
+    for (const dir of dirs) {
+        if (!existsSync(dir))
             continue;
-        const abs = join(dir, e.name);
-        let text;
+        let entries;
         try {
-            text = readFileSync(abs, "utf8");
+            entries = readdirSync(dir, { withFileTypes: true, encoding: "utf8" });
         }
-        catch (err) {
-            warnings.push(`draft ${e.name} unreadable: ${err instanceof Error ? err.message : String(err)}`);
+        catch {
             continue;
         }
-        const parsed = parseFrontmatter(text);
-        const fm = (parsed.frontmatter ?? {});
-        const id = typeof fm["id"] === "string" ? fm["id"] : e.name.replace(/\.draft\.md$/, "");
-        const title = typeof fm["title"] === "string" ? fm["title"] : "(untitled draft)";
-        const captureSource = typeof fm["capture_source"] === "string" ? fm["capture_source"] : null;
-        const decidedAt = typeof fm["decided_at"] === "string" ? fm["decided_at"] : null;
-        out.push({ id, title, capture_source: captureSource, decided_at: decidedAt });
+        for (const e of entries) {
+            if (!e.isFile())
+                continue;
+            if (!e.name.endsWith(".draft.md"))
+                continue;
+            const abs = join(dir, e.name);
+            let text;
+            try {
+                text = readFileSync(abs, "utf8");
+            }
+            catch (err) {
+                warnings.push(`draft ${e.name} unreadable: ${err instanceof Error ? err.message : String(err)}`);
+                continue;
+            }
+            const parsed = parseFrontmatter(text);
+            const fm = (parsed.frontmatter ?? {});
+            const id = typeof fm["id"] === "string" ? fm["id"] : e.name.replace(/\.draft\.md$/, "");
+            const title = typeof fm["title"] === "string" ? fm["title"] : "(untitled draft)";
+            const captureSource = typeof fm["capture_source"] === "string" ? fm["capture_source"] : null;
+            const decidedAt = typeof fm["decided_at"] === "string" ? fm["decided_at"] : null;
+            out.push({ id, title, capture_source: captureSource, decided_at: decidedAt });
+        }
     }
     out.sort((a, b) => a.id.localeCompare(b.id));
     return out;
@@ -900,7 +913,7 @@ function renderFirstSessionOnboarding(args) {
     lines.push("  To capture a new decision during this session: `/cairn-direction <your instruction>`");
     return lines.join("\n");
 }
-function readLatestBaselineAudit(repoRoot, warnings) {
+function readLatestBaselineAudit(repoRoot, warnings, prefix = "sensor-audit-") {
     const dir = cairnDir(repoRoot, "baseline");
     if (!existsSync(dir))
         return null;
@@ -912,8 +925,10 @@ function readLatestBaselineAudit(repoRoot, warnings) {
         warnings.push(`baseline dir read failed: ${err instanceof Error ? err.message : String(err)}`);
         return null;
     }
+    const escaped = prefix.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+    const re = new RegExp(`^${escaped}.*\\.yaml$`);
     const matching = entries
-        .filter((name) => /^sensor-audit-.*\.yaml$/.test(name))
+        .filter((name) => re.test(name))
         .sort();
     const latest = matching.at(-1);
     if (latest === undefined)
@@ -1016,7 +1031,9 @@ function renderPendingDraftsSection(drafts) {
     if (drafts.length === 0)
         return null;
     const lines = [];
-    lines.push(`## Decision drafts pending operator confirm (${drafts.length})`);
+    // Both DEC and INV drafts surface here (the id prefix disambiguates each row);
+    // INV drafts come from resync re-curation.
+    lines.push(`## Decision / invariant drafts pending operator confirm (${drafts.length})`);
     lines.push("");
     const slice = drafts.slice(0, DRAFTS_CAP);
     for (const d of slice) {