@isaacriehm/cairn-core 0.4.3 → 0.6.0

package/dist/init/phases/parallel-678.d.ts

@@ -1,24 +1,21 @@
 /**
- * Phases 6 / 7b / 7c parallel orchestrator.
+ * Phases 6 / 7b / 7c sequential orchestrator.
  *
  * The three post-pilot ingestion phases (docs-ingest, source-comments,
- * rules-merge) are each I/O-bound on Haiku; running them sequentially
- * adds the smaller two phases' wall-clock to the long 7b run for no
- * good reason. This runner fires all three concurrently inside a single
- * MCP call.
+ * rules-merge) all read + write the same v0.5.0 ground-state files —
+ * `topic-index.yaml`, `anchor-map.yaml`, `sot-bindings.yaml`,
+ * `sot-cache.yaml`. Concurrent execution races on those writes: each
+ * phase reads at start, mutates in memory, writes at end → last writer
+ * wipes the others. The v0.4.x parallel orchestrator was safe because
+ * only DEC/INV files (uniquely named per id) were on the write path.
  *
- * Concurrency-safety:
- *   - DEC + INV id allocators race-free via shared `Set<string>` threads
- *     (each phase's allocation loop is sync within JS turn boundaries,
- *     so mutations to the shared Set are atomic per turn). The pre-scan
- *     happens once, here; phases mutate the Set as they allocate.
- *   - Filesystem mutations are non-overlapping by design: phase 6 writes
- *     to `decisions/_inbox/`, phase 7b writes to `decisions/_inbox/` +
- *     `invariants/` + applies strip-replace to source, phase 7c writes
- *     to `decisions/_inbox/`. Different filenames per phase (DEC ids
- *     are unique across the shared Set), so no race.
- *   - Ledger rebuilds: only 7b rebuilds the invariants ledger; the
- *     decisions ledger is rebuilt later by `bulkAcceptObvious`. Safe.
+ * v0.5.0 fix: run the phases sequentially in canonical order
+ * (6 → 7b → 7c). Each phase still uses Haiku internally (with its own
+ * concurrency for batching + per-section workers), so the wall-clock
+ * cost vs. the v0.4.x parallel pipeline is bounded by the longest
+ * phase plus the smaller two — historically <5s combined for the
+ * smaller phases. Heartbeats fire per phase so the operator sees
+ * motion across all three.
  *
  * State machine:
  *   - The runner enters expecting `currentPhase === "6-docs-ingest"` and

package/dist/init/phases/parallel-678.js

@@ -1,24 +1,21 @@
 /**
- * Phases 6 / 7b / 7c parallel orchestrator.
+ * Phases 6 / 7b / 7c sequential orchestrator.
  *
  * The three post-pilot ingestion phases (docs-ingest, source-comments,
- * rules-merge) are each I/O-bound on Haiku; running them sequentially
- * adds the smaller two phases' wall-clock to the long 7b run for no
- * good reason. This runner fires all three concurrently inside a single
- * MCP call.
+ * rules-merge) all read + write the same v0.5.0 ground-state files —
+ * `topic-index.yaml`, `anchor-map.yaml`, `sot-bindings.yaml`,
+ * `sot-cache.yaml`. Concurrent execution races on those writes: each
+ * phase reads at start, mutates in memory, writes at end → last writer
+ * wipes the others. The v0.4.x parallel orchestrator was safe because
+ * only DEC/INV files (uniquely named per id) were on the write path.
  *
- * Concurrency-safety:
- *   - DEC + INV id allocators race-free via shared `Set<string>` threads
- *     (each phase's allocation loop is sync within JS turn boundaries,
- *     so mutations to the shared Set are atomic per turn). The pre-scan
- *     happens once, here; phases mutate the Set as they allocate.
- *   - Filesystem mutations are non-overlapping by design: phase 6 writes
- *     to `decisions/_inbox/`, phase 7b writes to `decisions/_inbox/` +
- *     `invariants/` + applies strip-replace to source, phase 7c writes
- *     to `decisions/_inbox/`. Different filenames per phase (DEC ids
- *     are unique across the shared Set), so no race.
- *   - Ledger rebuilds: only 7b rebuilds the invariants ledger; the
- *     decisions ledger is rebuilt later by `bulkAcceptObvious`. Safe.
+ * v0.5.0 fix: run the phases sequentially in canonical order
+ * (6 → 7b → 7c). Each phase still uses Haiku internally (with its own
+ * concurrency for batching + per-section workers), so the wall-clock
+ * cost vs. the v0.4.x parallel pipeline is bounded by the longest
+ * phase plus the smaller two — historically <5s combined for the
+ * smaller phases. Heartbeats fire per phase so the operator sees
+ * motion across all three.
  *
  * State machine:
  *   - The runner enters expecting `currentPhase === "6-docs-ingest"` and
@@ -70,94 +67,62 @@ export async function runPhases678Parallel(state) {
         preScannedDecIds: sharedDecIds.size,
         preScannedInvIds: sharedInvIds.size,
     }, "parallel-678 starting");
-    // Fire all three phases. Each phase's loop is synchronous between
-    // await points, so shared-Set mutations stay atomic per JS turn.
-    // The 7b heartbeat dominates statusline output (it runs longest), but
-    // 6 and 7c also write progress so the operator sees motion across
-    // all three.
+    // Run the three phases sequentially. v0.5.0 ground-state files
+    // (topic-index, anchor-map, sot-bindings, sot-cache) are the shared
+    // mutable surface; serializing 6 → 7b → 7c removes the last-writer-
+    // wins race that Promise.allSettled had under v0.4.x.
     const t0 = performance.now();
     const startedAt = Date.now();
-    const settled = await Promise.allSettled([
-        runDocsIngestion({
-            repoRoot: state.repoRoot,
-            existingDecIds: sharedDecIds,
-            onGroupProgress: (row) => writeProgress(state.repoRoot, {
-                phase: "6-docs-ingest",
-                batch: row.total > 0 ? row.total : 1,
-                total: row.total,
-                startedAt,
-            }),
+    const docsRes = await runPhaseSafely("docs-ingest-failed", async () => runDocsIngestion({
+        repoRoot: state.repoRoot,
+        existingDecIds: sharedDecIds,
+        onEntryProgress: (row) => writeProgress(state.repoRoot, {
+            phase: "6-docs-ingest",
+            batch: row.total > 0 ? row.total : 1,
+            total: row.total,
+            startedAt,
         }),
-        runSourceCommentsIngestion({
-            repoRoot: state.repoRoot,
-            globs,
-            ...(pilotModule !== undefined ? { pilotModule } : {}),
-            existingDecIds: sharedDecIds,
-            existingInvIds: sharedInvIds,
-            onBatchProgress: (row) => writeProgress(state.repoRoot, {
-                phase: "7b-source-comments",
-                batch: row.index + 1,
-                total: row.total,
-                classified: row.classified,
-                failed: row.failed,
-                startedAt,
-            }),
+    }));
+    if ("error" in docsRes) {
+        clearProgress(state.repoRoot);
+        return { status: "error", error: docsRes.error, state };
+    }
+    const srcRes = await runPhaseSafely("source-comments-failed", async () => runSourceCommentsIngestion({
+        repoRoot: state.repoRoot,
+        globs,
+        ...(pilotModule !== undefined ? { pilotModule } : {}),
+        existingDecIds: sharedDecIds,
+        existingInvIds: sharedInvIds,
+        onBatchProgress: (row) => writeProgress(state.repoRoot, {
+            phase: "7b-source-comments",
+            batch: row.index + 1,
+            total: row.total,
+            classified: row.classified,
+            failed: row.failed,
+            startedAt,
         }),
-        runRulesMerge({
-            repoRoot: state.repoRoot,
-            existingDecIds: sharedDecIds,
-            onSectionProgress: (row) => writeProgress(state.repoRoot, {
-                phase: "7c-rules-merge",
-                batch: row.index,
-                total: row.total,
-                startedAt,
-            }),
+    }));
+    if ("error" in srcRes) {
+        clearProgress(state.repoRoot);
+        return { status: "error", error: srcRes.error, state };
+    }
+    const rulesRes = await runPhaseSafely("rules-merge-failed", async () => runRulesMerge({
+        repoRoot: state.repoRoot,
+        existingDecIds: sharedDecIds,
+        existingInvIds: sharedInvIds,
+        onSectionProgress: (row) => writeProgress(state.repoRoot, {
+            phase: "7c-rules-merge",
+            batch: row.index,
+            total: row.total,
+            startedAt,
         }),
-    ]);
+    }));
+    if ("error" in rulesRes) {
+        clearProgress(state.repoRoot);
+        return { status: "error", error: rulesRes.error, state };
+    }
     const durationMs = Math.round(performance.now() - t0);
     clearProgress(state.repoRoot);
-    const [docsRes, srcRes, rulesRes] = settled;
-    // Any phase failure = whole-block failure. Surface the first error so
-    // the operator knows which Haiku batch died and can `/exit` + resume.
-    if (docsRes.status !== "fulfilled") {
-        return {
-            status: "error",
-            error: {
-                code: "docs-ingest-failed",
-                message: "Docs ingestion failed in parallel pipeline",
-                detail: docsRes.reason instanceof Error
-                    ? docsRes.reason.stack ?? docsRes.reason.message
-                    : String(docsRes.reason),
-            },
-            state,
-        };
-    }
-    if (srcRes.status !== "fulfilled") {
-        return {
-            status: "error",
-            error: {
-                code: "source-comments-failed",
-                message: "Source-comment ingestion failed in parallel pipeline",
-                detail: srcRes.reason instanceof Error
-                    ? srcRes.reason.stack ?? srcRes.reason.message
-                    : String(srcRes.reason),
-            },
-            state,
-        };
-    }
-    if (rulesRes.status !== "fulfilled") {
-        return {
-            status: "error",
-            error: {
-                code: "rules-merge-failed",
-                message: "Rules merge failed in parallel pipeline",
-                detail: rulesRes.reason instanceof Error
-                    ? rulesRes.reason.stack ?? rulesRes.reason.message
-                    : String(rulesRes.reason),
-            },
-            state,
-        };
-    }
     writeSourceCommentsWalkFile(state.repoRoot, srcRes.value);
     const persistedSrc = to7bResultPersisted(srcRes.value);
     const outputs = {
@@ -202,4 +167,18 @@ export async function runPhases678Parallel(state) {
         state: next,
     };
 }
+async function runPhaseSafely(code, fn) {
+    try {
+        return { value: await fn() };
+    }
+    catch (err) {
+        const detail = err instanceof Error ? err.stack ?? err.message : String(err);
+        const message = code === "docs-ingest-failed"
+            ? "Docs ingestion failed"
+            : code === "source-comments-failed"
+                ? "Source-comment ingestion failed"
+                : "Rules merge failed";
+        return { error: { code, message, detail } };
+    }
+}
 //# sourceMappingURL=parallel-678.js.map

package/dist/init/phases/parallel-678.js.map

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

package/dist/init/phases/source-comments-output-io.d.ts

@@ -48,26 +48,32 @@ export interface IngestSourceCommentsResultPersisted {
         filesAvailable: number;
         truncatedAtFileCap: boolean;
     };
-    decDraftsWritten: {
+    decsWritten: {
         id: string;
         path: string;
         sourceFile: string;
+        slug: string;
+        status: "accepted";
     }[];
-    invariantsWritten: {
+    invsWritten: {
         id: string;
         path: string;
         sourceFile: string;
+        slug: string;
+        status: "accepted";
     }[];
-    invariantStripFilesModified: number;
-    invariantStripItemsApplied: number;
-    invariantStripItemsSkipped: number;
-    invariantStripError: string | null;
-    invariantProposalsAdded: number;
-    canonicalCitationsAdded: number;
+    citesEmitted: {
+        id: string;
+        sourceFile: string;
+        lineRange: [number, number];
+        slug: string;
+    }[];
+    stripFilesModified: number;
+    stripItemsApplied: number;
+    stripItemsSkipped: number;
+    stripError: string | null;
     auditPath: string;
     auditRelPath: string;
-    invariantProposalsPath: string | null;
-    canonicalCitationsPath: string | null;
     inputTokens: number;
     outputTokens: number;
     batchesRun: number;

package/dist/init/phases/source-comments-output-io.js

@@ -62,18 +62,15 @@ export function to7bResultPersisted(full) {
             filesAvailable: full.walk.filesAvailable,
             truncatedAtFileCap: full.walk.truncatedAtFileCap,
         },
-        decDraftsWritten: full.decDraftsWritten,
-        invariantsWritten: full.invariantsWritten,
-        invariantStripFilesModified: full.invariantStripFilesModified,
-        invariantStripItemsApplied: full.invariantStripItemsApplied,
-        invariantStripItemsSkipped: full.invariantStripItemsSkipped,
-        invariantStripError: full.invariantStripError,
-        invariantProposalsAdded: full.invariantProposalsAdded,
-        canonicalCitationsAdded: full.canonicalCitationsAdded,
+        decsWritten: full.decsWritten,
+        invsWritten: full.invsWritten,
+        citesEmitted: full.citesEmitted,
+        stripFilesModified: full.stripFilesModified,
+        stripItemsApplied: full.stripItemsApplied,
+        stripItemsSkipped: full.stripItemsSkipped,
+        stripError: full.stripError,
         auditPath: full.auditPath,
         auditRelPath: full.auditRelPath,
-        invariantProposalsPath: full.invariantProposalsPath,
-        canonicalCitationsPath: full.canonicalCitationsPath,
         inputTokens: full.inputTokens,
         outputTokens: full.outputTokens,
         batchesRun: full.batchesRun,

package/dist/init/phases/source-comments-output-io.js.map

@@ -1 +1 @@
-{"version":3,"file":"source-comments-output-io.js","sourceRoot":"","sources":["../../../src/init/phases/source-comments-output-io.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EACL,UAAU,EACV,SAAS,EACT,YAAY,EACZ,UAAU,EACV,aAAa,GACd,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAI1C,qCAAqC;AACrC,MAAM,CAAC,MAAM,yBAAyB,GAAG,IAAI,CAC3C,QAAQ,EACR,MAAM,EACN,2BAA2B,CAC5B,CAAC;AAEF,MAAM,UAAU,yBAAyB,CAAC,QAAgB;IACxD,OAAO,IAAI,CAAC,QAAQ,EAAE,yBAAyB,CAAC,CAAC;AACnD,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,2BAA2B,CACzC,QAAgB,EAChB,IAAgC;IAEhC,MAAM,GAAG,GAAG,yBAAyB,CAAC,QAAQ,CAAC,CAAC;IAChD,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC7C,MAAM,GAAG,GAAG,GAAG,GAAG,MAAM,CAAC;IACzB,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;IAC1D,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACrB,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,0BAA0B,CACxC,QAAgB;IAEhB,MAAM,GAAG,GAAG,yBAAyB,CAAC,QAAQ,CAAC,CAAC;IAChD,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;QAAE,OAAO,IAAI,CAAC;IAClC,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,CAA+B,CAAC;IAC7E,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAsCD,+EAA+E;AAC/E,MAAM,UAAU,mBAAmB,CACjC,IAAgC;IAEhC,OAAO;QACL,QAAQ,EAAE,yBAAyB;QACnC,WAAW,EAAE;YACX,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM;YAC7B,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM;YAC/B,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,YAAY;YACpC,eAAe,EAAE,IAAI,CAAC,IAAI,CAAC,eAAe;YAC1C,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc;YACxC,kBAAkB,EAAE,IAAI,CAAC,IAAI,CAAC,kBAAkB;SACjD;QACD,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;QACvC,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;QACzC,2BAA2B,EAAE,IAAI,CAAC,2BAA2B;QAC7D,0BAA0B,EAAE,IAAI,CAAC,0BAA0B;QAC3D,0BAA0B,EAAE,IAAI,CAAC,0BAA0B;QAC3D,mBAAmB,EAAE,IAAI,CAAC,mBAAmB;QAC7C,uBAAuB,EAAE,IAAI,CAAC,uBAAuB;QACrD,uBAAuB,EAAE,IAAI,CAAC,uBAAuB;QACrD,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,sBAAsB,EAAE,IAAI,CAAC,sBAAsB;QACnD,sBAAsB,EAAE,IAAI,CAAC,sBAAsB;QACnD,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,UAAU,EAAE,IAAI,CAAC,UAAU;QAC3B,aAAa,EAAE,IAAI,CAAC,aAAa;QACjC,UAAU,EAAE,IAAI,CAAC,UAAU;KAC5B,CAAC;AACJ,CAAC"}
+{"version":3,"file":"source-comments-output-io.js","sourceRoot":"","sources":["../../../src/init/phases/source-comments-output-io.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EACL,UAAU,EACV,SAAS,EACT,YAAY,EACZ,UAAU,EACV,aAAa,GACd,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAI1C,qCAAqC;AACrC,MAAM,CAAC,MAAM,yBAAyB,GAAG,IAAI,CAC3C,QAAQ,EACR,MAAM,EACN,2BAA2B,CAC5B,CAAC;AAEF,MAAM,UAAU,yBAAyB,CAAC,QAAgB;IACxD,OAAO,IAAI,CAAC,QAAQ,EAAE,yBAAyB,CAAC,CAAC;AACnD,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,2BAA2B,CACzC,QAAgB,EAChB,IAAgC;IAEhC,MAAM,GAAG,GAAG,yBAAyB,CAAC,QAAQ,CAAC,CAAC;IAChD,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC7C,MAAM,GAAG,GAAG,GAAG,GAAG,MAAM,CAAC;IACzB,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;IAC1D,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACrB,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,0BAA0B,CACxC,QAAgB;IAEhB,MAAM,GAAG,GAAG,yBAAyB,CAAC,QAAQ,CAAC,CAAC;IAChD,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;QAAE,OAAO,IAAI,CAAC;IAClC,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,CAA+B,CAAC;IAC7E,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAoDD,+EAA+E;AAC/E,MAAM,UAAU,mBAAmB,CACjC,IAAgC;IAEhC,OAAO;QACL,QAAQ,EAAE,yBAAyB;QACnC,WAAW,EAAE;YACX,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM;YAC7B,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM;YAC/B,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,YAAY;YACpC,eAAe,EAAE,IAAI,CAAC,IAAI,CAAC,eAAe;YAC1C,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc;YACxC,kBAAkB,EAAE,IAAI,CAAC,IAAI,CAAC,kBAAkB;SACjD;QACD,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;QAC3C,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;QACzC,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;QACzC,UAAU,EAAE,IAAI,CAAC,UAAU;QAC3B,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,UAAU,EAAE,IAAI,CAAC,UAAU;QAC3B,aAAa,EAAE,IAAI,CAAC,aAAa;QACjC,UAAU,EAAE,IAAI,CAAC,UAAU;KAC5B,CAAC;AACJ,CAAC"}

package/dist/init/phases/types.d.ts

@@ -13,7 +13,7 @@
  * and pick up at the same phase on the next session.
  */
 /** Phase ids in execution order. */
-export declare const PHASE_IDS: readonly ["1-detect", "2-walker", "3-mapper", "3b-seed", "4-pilot", "5-brand", "6-docs-ingest", "7b-source-comments", "7c-rules-merge", "8-baseline", "10-strip", "12-multidev"];
+export declare const PHASE_IDS: readonly ["1-detect", "2-walker", "3-mapper", "3b-seed", "4-pilot", "5-brand", "5b-topic-index", "6-docs-ingest", "7b-source-comments", "7c-rules-merge", "8-baseline", "10-strip", "12-multidev"];
 export type PhaseId = (typeof PHASE_IDS)[number];
 /** Inline A/B/C question rendered via AskUserQuestion in the skill. */
 export interface PhaseQuestion {

package/dist/init/phases/types.js

@@ -20,6 +20,7 @@ export const PHASE_IDS = [
     "3b-seed",
     "4-pilot",
     "5-brand",
+    "5b-topic-index",
     "6-docs-ingest",
     "7b-source-comments",
     "7c-rules-merge",

package/dist/init/phases/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/init/phases/types.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,oCAAoC;AACpC,MAAM,CAAC,MAAM,SAAS,GAAG;IACvB,UAAU;IACV,UAAU;IACV,UAAU;IACV,SAAS;IACT,SAAS;IACT,SAAS;IACT,eAAe;IACf,oBAAoB;IACpB,gBAAgB;IAChB,YAAY;IACZ,UAAU;IACV,aAAa;CACL,CAAC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/init/phases/types.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,oCAAoC;AACpC,MAAM,CAAC,MAAM,SAAS,GAAG;IACvB,UAAU;IACV,UAAU;IACV,UAAU;IACV,SAAS;IACT,SAAS;IACT,SAAS;IACT,gBAAgB;IAChB,eAAe;IACf,oBAAoB;IACpB,gBAAgB;IAChB,YAAY;IACZ,UAAU;IACV,aAAa;CACL,CAAC"}

package/dist/init/rules-merge/discover.d.ts

@@ -1,12 +1,17 @@
 /**
  * Phase 7c discovery — find existing project-rules sources.
  *
- * Per spec §6 Phase 7c, the four sources cairn reconciles are:
+ * Plan §5.4 ownership set (v0.5.0):
  *   - <repoRoot>/CLAUDE.md
  *   - <repoRoot>/AGENTS.md
- *   - <repoRoot>/.claude/CLAUDE.md
  *   - <repoRoot>/.claude/rules/**.md
  *
+ * `.claude/CLAUDE.md` was previously discovered here too (kind
+ * `claude-md-claude-dir`). The phase 5b walker treats every reachable
+ * `.md` outside the rule-owned set as `kind="doc"` — so phase 6 already
+ * owns `.claude/CLAUDE.md`. Re-discovering it here would race with phase
+ * 6's emit and double-bind the slug.
+ *
  * Returns absolute + repo-relative paths that exist. Caller drives the rest.
  */
 export interface RuleSourceFile {
@@ -14,7 +19,7 @@ export interface RuleSourceFile {
     path: string;
     absPath: string;
     /** Logical kind drives the regeneration template choice. */
-    kind: "claude-md-root" | "agents-md-root" | "claude-md-claude-dir" | "rule";
+    kind: "claude-md-root" | "agents-md-root" | "rule";
     /** File size (for largest-first ordering when batched). */
     size: number;
 }

package/dist/init/rules-merge/discover.js

@@ -1,12 +1,17 @@
 /**
  * Phase 7c discovery — find existing project-rules sources.
  *
- * Per spec §6 Phase 7c, the four sources cairn reconciles are:
+ * Plan §5.4 ownership set (v0.5.0):
  *   - <repoRoot>/CLAUDE.md
  *   - <repoRoot>/AGENTS.md
- *   - <repoRoot>/.claude/CLAUDE.md
  *   - <repoRoot>/.claude/rules/**.md
  *
+ * `.claude/CLAUDE.md` was previously discovered here too (kind
+ * `claude-md-claude-dir`). The phase 5b walker treats every reachable
+ * `.md` outside the rule-owned set as `kind="doc"` — so phase 6 already
+ * owns `.claude/CLAUDE.md`. Re-discovering it here would race with phase
+ * 6's emit and double-bind the slug.
+ *
  * Returns absolute + repo-relative paths that exist. Caller drives the rest.
  */
 import { existsSync, readdirSync, statSync } from "node:fs";
@@ -30,7 +35,6 @@ export function discoverRuleSources(repoRoot) {
     };
     tryFile("CLAUDE.md", "claude-md-root");
     tryFile("AGENTS.md", "agents-md-root");
-    tryFile(join(".claude", "CLAUDE.md"), "claude-md-claude-dir");
     const rulesDir = join(repoRoot, ".claude", "rules");
     if (existsSync(rulesDir)) {
         walkRules(rulesDir, repoRoot, out);

package/dist/init/rules-merge/discover.js.map

@@ -1 +1 @@
-{"version":3,"file":"discover.js","sourceRoot":"","sources":["../../../src/init/rules-merge/discover.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"discover.js","sourceRoot":"","sources":["../../../src/init/rules-merge/discover.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC5D,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAY3C,MAAM,UAAU,mBAAmB,CAAC,QAAgB;IAClD,MAAM,GAAG,GAAqB,EAAE,CAAC;IACjC,MAAM,OAAO,GAAG,CAAC,GAAW,EAAE,IAA4B,EAAQ,EAAE;QAClE,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAChC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,OAAO;QAC7B,IAAI,EAAE,CAAC;QACP,IAAI,CAAC;YACH,EAAE,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;QACrB,CAAC;QAAC,MAAM,CAAC;YACP,OAAO;QACT,CAAC;QACD,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE;YAAE,OAAO;QACzB,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;IACtE,CAAC,CAAC;IACF,OAAO,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;IACvC,OAAO,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;IAEvC,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;IACpD,IAAI,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QACzB,SAAS,CAAC,QAAQ,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;IACrC,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,SAAS,CAAC,GAAW,EAAE,QAAgB,EAAE,GAAqB;IACrE,IAAI,OAAmC,CAAC;IACxC,IAAI,CAAC;QACH,OAAO,GAAG,WAAW,CAAC,GAAG,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;IACxE,CAAC;IAAC,MAAM,CAAC;QACP,OAAO;IACT,CAAC;IACD,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;QACxB,IAAI,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,SAAS;QACrC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;QAC9B,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;YACpB,SAAS,CAAC,GAAG,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;YAC9B,SAAS;QACX,CAAC;QACD,IAAI,CAAC,CAAC,CAAC,MAAM,EAAE;YAAE,SAAS;QAC1B,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC;YAAE,SAAS;QACpD,IAAI,EAAE,CAAC;QACP,IAAI,CAAC;YACH,EAAE,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;QACrB,CAAC;QAAC,MAAM,CAAC;YACP,SAAS;QACX,CAAC;QACD,GAAG,CAAC,IAAI,CAAC;YACP,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;YACtC,OAAO,EAAE,GAAG;YACZ,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,EAAE,CAAC,IAAI;SACd,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED,SAAS,OAAO,CAAC,CAAS;IACxB,OAAO,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;AAC/B,CAAC"}

package/dist/init/rules-merge/ingest.d.ts

@@ -1,33 +1,49 @@
 /**
- * Phase 7c orchestrator — discover + parse + Haiku classify + persist.
+ * Phase 7c orchestrator (v0.5.0 SoT model).
  *
- * Ingests CLAUDE.md, AGENTS.md, .claude/CLAUDE.md, and `.claude/rules/**.md`
- * during init. Each H2/H3 section is classified by Haiku as:
+ * Plan §5.4 algorithm:
+ *   1. Discover sections in `CLAUDE.md`, `AGENTS.md`, `.claude/rules/*.md`.
+ *   2. Topic-index lookup (built by phase 5b) before classification:
+ *      - **Match** — slug already owns a docs/CLAUDE.md/AGENTS.md/rule
+ *        SoT and was emitted by an earlier phase. Phase 7c records the
+ *        cite (no source rewrite — operator's narrative stays intact)
+ *        and skips emit.
+ *      - **Net-new** — slug is in topic-index but not yet emitted.
+ *        Phase 7c classifies the section via Haiku (kind only:
+ *        decision / domain-rule / constraint / informational), emits
+ *        a verbatim DEC/INV via `sot-emit` with `sot_kind: "path"` +
+ *        `sot_path: <file>#<anchor>`, auto-promotes (`status: accepted`).
+ *   3. Conflict detection — for each freshly emitted entity, scan
+ *      accepted DECs/INVs in `sot-cache.yaml` for high Jaccard overlap
+ *      against the new body, then run a Haiku contradiction judge per
+ *      candidate (`contradict | agree | unrelated`). On `contradict`,
+ *      write `.cairn/ground/conflicts/<new>__<other>.md` with both
+ *      prose sides + Haiku reasoning. The cairn-attention skill renders
+ *      these per §5.4.1; **no source rewrite ever fires from conflicts**.
+ *   4. Auto-promote — every novel entity ships `status: accepted`. The
+ *      `_inbox/` draft queue is gone (the v0.4.x review surface was the
+ *      v0.5.0 pivot's primary motivation).
  *
- *   - "rule-net-new"  — section states a rule cairn doesn't have yet (DEC draft to inbox)
- *   - "rule-conflict" — section conflicts with existing cairn state (soft-conflict to attention)
- *   - "informational" — TOC, history, walkthrough — no action
- *   - "operator-keep" — already inside keep-marker block (skipped pre-classification)
- *
- * Net-new rules become DEC drafts in `.cairn/ground/decisions/_inbox/`.
- * Soft conflicts append to `.cairn/baseline/rule-conflicts-<ISO>.yaml`.
- *
- * Resilient: a single Haiku failure marks the section "informational" and
- * continues. All output paths captured in the result so the skill can surface
- * them.
+ * Output side-effects (all relative to repoRoot):
+ *   - `.cairn/ground/decisions/<DEC-id>.md`        (one per novel decision/domain-rule)
+ *   - `.cairn/ground/invariants/<INV-id>.md`       (one per novel constraint)
+ *   - `.cairn/ground/topic-index.yaml`             (extended w/ dec_id stamps)
+ *   - `.cairn/ground/sot-bindings.yaml`            (forward+reverse for new ids)
+ *   - `.cairn/ground/sot-cache.yaml`               (token cache for Layer A)
+ *   - `.cairn/ground/conflicts/<a>__<b>.md`        (one per contradiction)
+ *   - `.cairn/baseline/rules-merge-<ISO>.yaml`     (full audit)
  */
 import type { RuleSourceFile } from "./discover.js";
 import type { RuleSection } from "./parse-sections.js";
-export type RuleClassKind = "rule-net-new" | "rule-conflict" | "informational" | "operator-keep";
+export type RuleClassKind = "decision" | "domain-rule" | "constraint" | "informational" | "operator-keep";
 export interface RuleClassification {
     source: string;
-    level: 2 | 3 | 0;
+    level: 0 | 2 | 3;
     title: string;
     startOffset: number;
+    /** Content-fingerprint slug of the section body (heading excluded). */
+    slug: string;
     kind: RuleClassKind;
-    proposedDecTitle: string;
-    proposedRationale: string;
-    conflictsWith: string;
     failed: boolean;
     errorMessage?: string;
 }
@@ -35,14 +51,28 @@ export interface RunRulesMergeArgs {
     repoRoot: string;
     /** When set, every section is classified by this fn — bypasses Haiku. */
     mockClassify?: (section: RuleSection, source: RuleSourceFile) => RuleClassification;
+    /**
+     * Mock contradiction judge for smokes. Receives both prose bodies +
+     * candidate id, returns one of `contradict | agree | unrelated`.
+     * Default off → no Haiku contradiction calls in mock-classify mode.
+     */
+    mockContradictionJudge?: (args: {
+        newBody: string;
+        candidateId: string;
+        candidateBody: string;
+    }) => Promise<"contradict" | "agree" | "unrelated">;
     dryRun?: boolean;
     nowIso?: string;
     /**
      * Caller-supplied DEC id Set. Same role as in `runDocsIngestion`: when
-     * the parallel orchestrator runs phases 6 / 7b / 7c concurrently, all
-     * three share one Set so DEC id allocations don't collide.
+     * the parallel orchestrator runs phases 6 / 7b / 7c sequentially, all
+     * three share one Set so DEC id allocations don't collide. Content-
+     * addressed ids make collisions vanishingly unlikely so the Set is
+     * informational.
      */
     existingDecIds?: Set<string>;
+    /** Caller-supplied INV id Set. Same compat note. */
+    existingInvIds?: Set<string>;
     /**
      * Optional progress callback fired after each section finishes
      * classification. Enables the cairn-adopt statusline heartbeat.
@@ -52,19 +82,42 @@ export interface RunRulesMergeArgs {
         total: number;
     }) => void;
 }
+interface RuleEmittedRecord {
+    id: string;
+    path: string;
+    sourceFile: string;
+    slug: string;
+    status: "accepted";
+}
+interface RuleCiteRecord {
+    /** DEC/INV id the section was bound to (already emitted by phase 6 / 7b). */
+    id: string;
+    /** Section's source file. */
+    sourceFile: string;
+    /** Slug that resolved the topic-index lookup. */
+    slug: string;
+}
+interface RuleConflictRecord {
+    /** Newly emitted entity id (DEC or INV from this phase 7c run). */
+    newId: string;
+    /** Pre-existing accepted entity id the new prose contradicts. */
+    otherId: string;
+    /** Repo-relative path to the conflict file. */
+    conflictPath: string;
+    /** Haiku judge's verdict reasoning excerpt. */
+    reasoning: string;
+}
 export interface RunRulesMergeResult {
     sources: RuleSourceFile[];
     sectionsTotal: number;
     classifications: RuleClassification[];
-    decDraftsWritten: {
-        id: string;
-        path: string;
-        sourceFile: string;
-    }[];
-    conflictsRecorded: number;
-    conflictsPath: string | null;
+    decsWritten: RuleEmittedRecord[];
+    invsWritten: RuleEmittedRecord[];
+    citesEmitted: RuleCiteRecord[];
+    conflicts: RuleConflictRecord[];
     auditPath: string;
     auditRelPath: string;
     kindCounts: Record<RuleClassKind, number>;
 }
 export declare function runRulesMerge(args: RunRulesMergeArgs): Promise<RunRulesMergeResult>;
+export {};