Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/mirror-review/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
export { reviewDraftForCanon } from "./review_engine.js";
export type { MirrorReviewObservability } from "./review_engine.js";
export { MIRROR_REVIEW_RULES } from "./review_rules.js";
export { detectCanonConflicts } from "./canon_conflict.js";
export { detectNarrativeSimilarity } from "./narrative_similarity.js";
Expand Down
26 changes: 19 additions & 7 deletions src/mirror-review/review_engine.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
import { incrementMetric, logMirrorEvent } from "../mirror-observability/index.js";
import {
getCurrentMirrorObservabilityContext,
type MirrorObservabilityContext,
} from "../mirror-observability/index.js";
import { retrieveCanonicalScrolls } from "../mirror/lore_retrieval/index.js";
import { detectCanonConflicts } from "./canon_conflict.js";
import { detectNarrativeSimilarity } from "./narrative_similarity.js";
import { MIRROR_REVIEW_RULES } from "./review_rules.js";
import type { MirrorCanonReviewResult, MirrorReviewStatus } from "./review_types.js";
import { validateDraftSymbols } from "./symbol_validation.js";

export type MirrorReviewObservability = Pick<
MirrorObservabilityContext,
"incrementMetric" | "logEvent"
>;

function deriveStatus(params: {
conflicts: MirrorCanonReviewResult["conflicts"];
similarities: MirrorCanonReviewResult["similarities"];
Expand All @@ -31,10 +39,14 @@ function deriveStatus(params: {
return "approved";
}

export async function reviewDraftForCanon(params: {
loreDir: string;
draftContent: string;
}): Promise<MirrorCanonReviewResult> {
export async function reviewDraftForCanon(
params: {
loreDir: string;
draftContent: string;
},
deps: { observability?: MirrorReviewObservability } = {},
): Promise<MirrorCanonReviewResult> {
const observability = deps.observability ?? getCurrentMirrorObservabilityContext();
const retrieval = await retrieveCanonicalScrolls(params.draftContent, {
loreDir: params.loreDir,
limit: 5,
Expand All @@ -58,9 +70,9 @@ export async function reviewDraftForCanon(params: {
});

if (status === "conflict_detected") {
incrementMetric("review_conflicts");
observability.incrementMetric("review_conflicts");
}
logMirrorEvent("review.decision", {
observability.logEvent("review.decision", {
status,
conflicts: conflicts.length,
similarities: similarities.length,
Expand Down
21 changes: 16 additions & 5 deletions src/mirror/skills/commit_scroll/commit_scroll.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
import crypto from "node:crypto";
import fs from "node:fs/promises";
import path from "node:path";
import { reviewDraftForCanon, type MirrorCanonReviewResult } from "../../../mirror-review/index.js";
import { getCurrentMirrorObservabilityContext } from "../../../mirror-observability/index.js";
import {
reviewDraftForCanon,
type MirrorCanonReviewResult,
type MirrorReviewObservability,
} from "../../../mirror-review/index.js";
import { resolveLoreRetrievalRoot } from "../../lore_retrieval/index.js";
import { ensureScrollIndexUpToDate } from "../../lore_sources/scroll_index.js";
import {
Expand Down Expand Up @@ -225,6 +230,7 @@ async function writeCanonicalFileAtomically(finalPath: string, content: string):
}

export async function commitScroll(input: CommitScrollInput): Promise<CommitScrollResult> {
const observability: MirrorReviewObservability = getCurrentMirrorObservabilityContext();
const params = validateInput(input);
const family =
input.family_override ??
Expand Down Expand Up @@ -260,10 +266,15 @@ export async function commitScroll(input: CommitScrollInput): Promise<CommitScro
draftPath: finalFilename,
draftContent: finalContent,
});
const review = await reviewDraftForCanon({
loreDir,
draftContent: finalContent,
});
const review = await reviewDraftForCanon(
{
loreDir,
draftContent: finalContent,
},
{
observability,
},
);

if (validation.warningCount > 0) {
return {
Expand Down
Loading