ultimate-brain 0.4.1 → 0.6.0

package/dist/lib/sync.js

@@ -1,19 +1,22 @@
 import { createHash } from "node:crypto";
 import { isDeepStrictEqual } from "node:util";
-import { applyAll, EDITABLE } from "./apply.js";
+import { applyAll } from "./apply.js";
 import { BrainError } from "./errors.js";
 import { assertNoProblems, isRecord, unknownKeys } from "./input.js";
 import { generateId, TYPE_PREFIX } from "./ids.js";
 import { assertStagedValid, checkNoteInput, stageNotes } from "./note-new.js";
 import { compareCodePoints } from "./notes.js";
-import { fullText, splitParts } from "./parts.js";
+import { splitParts } from "./parts.js";
 import { loadSchemas } from "./schemas.js";
 import { formatDate, formatTimestamp, normalizeTimestamp } from "./time.js";
-const DATABASES = ["areas", "goals", "key_results", "projects", "people", "orgs", "decisions", "questions", "concepts", "review", "inbox"];
+import { lineDiff } from "./diff.js";
+import { databaseId, moduleForDatabase, modulesOf, typeIsOn } from "./modules.js";
+import { bodyHash, bodyOf } from "./proposals.js";
+const DATABASES = ["areas", "goals", "key_results", "projects", "people", "orgs", "decisions", "questions", "concepts", "documents", "review", "inbox"];
 const CREATABLE = new Set(["areas", "goals", "projects", "people", "orgs"]);
-const TYPE_FOR_DATABASE = { areas: "area", goals: "goal", projects: "project", people: "person", orgs: "org", decisions: "decision", questions: "question", concepts: "concept", review: "proposal" };
-const DATABASE_FOR_TYPE = { area: "areas", goal: "goals", project: "projects", person: "people", org: "orgs", decision: "decisions", question: "questions", concept: "concepts", source: "inbox", meeting: "meetings", proposal: "review" };
-const PUBLISHED_TYPES = new Set(["area", "goal", "project", "person", "org", "decision", "question", "concept", "source", "meeting", "proposal"]);
+const TYPE_FOR_DATABASE = { areas: "area", goals: "goal", projects: "project", people: "person", orgs: "org", decisions: "decision", questions: "question", concepts: "concept", documents: "reference", review: "proposal" };
+const DATABASE_FOR_TYPE = { area: "areas", goal: "goals", project: "projects", person: "people", org: "orgs", decision: "decisions", question: "questions", concept: "concepts", reference: "documents", source: "inbox", meeting: "meetings", proposal: "review" };
+const PUBLISHED_TYPES = new Set(["area", "goal", "project", "person", "org", "decision", "question", "concept", "reference", "source", "meeting", "proposal"]);
 function property(value, key) {
     return Object.hasOwn(value, key) ? value[key] : undefined;
 }
@@ -58,6 +61,8 @@ export function parseSnapshot(input) {
         if (!isRecord(value))
             return problems.push({ pointer: p, message: "must be an object" });
         problems.push(...unknownKeys(value, ["database", "page_id", "last_edited", "properties"], p));
+        if (value.database === "references")
+            value.database = "documents"; // read as documents (0049)
         if (!DATABASES.includes(value.database))
             problems.push({ pointer: `${p}/database`, message: "is not a sync database" });
         if (typeof value.page_id !== "string" || value.page_id === "")
@@ -72,7 +77,7 @@ export function parseSnapshot(input) {
 }
 /** Compute the deterministic, no-network Notion pull plan (cli §5.14.2). */
 export function buildPlan(workspace, snapshot) {
-    const result = { as_of: snapshot.as_of, create: [], updates: [], corrections: [], decisions: [], full_text_requests: [], conflicts: [], ignored: [] };
+    const result = { as_of: snapshot.as_of, create: [], updates: [], corrections: [], decisions: [], document_requests: [], promote_requests: [], refresh_requests: [], report_fixes: [], conflicts: [], ignored: [] };
     const createsByPage = new Map();
     for (const row of snapshot.rows)
         if (CREATABLE.has(row.database) && blank(property(row.properties, "Brain ID"))) {
@@ -80,7 +85,14 @@ export function buildPlan(workspace, snapshot) {
             if (existing === undefined)
                 createsByPage.set(row.page_id, { id: generateId(TYPE_PREFIX[TYPE_FOR_DATABASE[row.database]], new Set([...workspace.ids(), ...[...createsByPage.values()].map((x) => x.id)])), type: TYPE_FOR_DATABASE[row.database] });
         }
+    const modules = modulesOf(workspace.config);
     for (const row of snapshot.rows) {
+        // A database whose module is off is not read at all (cli §5.14.2, 0048).
+        const module = moduleForDatabase(row.database);
+        if (module !== null && !modules[module]) {
+            result.ignored.push(ignoredRow(row, "MODULE_OFF"));
+            continue;
+        }
         if (row.database === "key_results") {
             planKeyResult(workspace, snapshot.as_of, row, result);
             continue;
@@ -112,6 +124,8 @@ export function buildPlan(workspace, snapshot) {
         // A create whose publish failed has no Brain ID in Notion yet; treat the row as if it had it (cli §5.14.2).
         const known = typeof brainId === "string" && brainId !== "" ? row : { ...row, properties: { ...row.properties, "Brain ID": note.id } };
         planExisting(workspace, snapshot.as_of, known, note, result);
+        if ((row.database === "decisions" || row.database === "concepts") && property(row.properties, "Promote asked") === true)
+            planPromote(workspace, row, note, modules.documents, result);
     }
     sortPlan(result);
     return result;
@@ -197,8 +211,9 @@ function planExisting(workspace, asOf, row, note, out) {
     const published = isRecord(note.attributes.notion_published) ? note.attributes.notion_published : undefined;
     const rendered = renderedBrainValues(note, workspace);
     const publish = (name, value) => { updates.published = { ...(isRecord(updates.published) ? updates.published : {}), [name]: value }; };
+    const off = offRelations(workspace.config, row.database);
     for (const [name, brainField] of brainProperties(row.database)) {
-        if (!Object.hasOwn(row.properties, name))
+        if (!Object.hasOwn(row.properties, name) || off.has(name))
             continue;
         if (name === "Key Facts") {
             planKeyFacts(row, note, published, updates, out);
@@ -296,52 +311,116 @@ function planKeyFacts(row, note, published, updates, out) {
         updates.published = { ...(isRecord(updates.published) ? updates.published : {}), "Key Facts": text };
 }
 function planDecision(row, proposal, out) {
-    const decision = property(row.properties, "Decision");
-    if (decision === undefined || property(row.properties, "State") !== "Pending")
+    // A snapshot taken before migration 0009 has Decision and Note; Edit there is read as Fix (cli §5.14.2, 0045).
+    const call = property(row.properties, "Your call") ?? property(row.properties, "Decision");
+    const label = Object.hasOwn(row.properties, "Your call") ? "Your call" : "Decision";
+    const textLabel = Object.hasOwn(row.properties, "What to fix") || !Object.hasOwn(row.properties, "Note") ? "What to fix" : "Note";
+    if (call === undefined || call === null || property(row.properties, "State") !== "Pending")
         return;
     if (["applied", "closed"].includes(String(proposal.attributes.status))) {
         out.ignored.push({ database: row.database, page_id: row.page_id, brain_id: proposal.id, reason: "ALREADY_TERMINAL" });
         return;
     }
-    const action = String(decision).toLowerCase();
-    const note = property(row.properties, "Note");
-    if (!["approve", "reject", "edit"].includes(action)) {
-        out.ignored.push({ database: row.database, page_id: row.page_id, brain_id: proposal.id, reason: "NOT_CORRECTABLE" });
+    const action = String(call).toLowerCase() === "edit" ? "fix" : String(call).toLowerCase();
+    const text = property(row.properties, textLabel);
+    const written = typeof text === "string" && text.trim() !== "";
+    if (!["approve", "reject", "fix"].includes(action)) {
+        out.ignored.push({ database: row.database, page_id: row.page_id, brain_id: proposal.id, property: label, reason: "UNKNOWN_OPTION" });
         return;
     }
-    if (action === "edit" && !EDITABLE.has(String(proposal.attributes.kind))) {
-        out.conflicts.push(conflict(row, "EDIT_NOT_ALLOWED", `Edit is not allowed on a ${String(proposal.attributes.kind)} proposal`, "Decision", decision));
+    if (action === "fix" && !written) {
+        out.conflicts.push(conflict(row, "FIX_WITHOUT_TEXT", "Fix needs What to fix: what to correct", "What to fix"));
         return;
     }
-    if (action === "edit" && (note === null || note === undefined || note === "")) {
-        out.conflicts.push(conflict(row, "EDIT_WITHOUT_VALUE", "Edit needs a Note", "Note"));
+    if (action === "fix") {
+        out.conflicts.push(conflict(row, "FIX_TO_READ", "What to fix needs reading by the skill", "What to fix", text, "Fix"));
         return;
     }
-    if (action !== "edit" && typeof note === "string" && note !== "") {
-        out.conflicts.push(conflict(row, "NOTE_TO_READ", "Review Note needs interpretation by the skill", "Note", note, decision));
+    if (written) {
+        out.conflicts.push(conflict(row, "NOTE_TO_READ", "What to fix needs reading by the skill", "What to fix", text, action === "approve" ? "Approve" : "Reject"));
         return;
     }
-    out.decisions.push({ proposal: proposal.id, action: action, ...(action === "edit" ? { value: note, note: note } : {}), decided_at: row.last_edited, decided_by: "notion" });
+    out.decisions.push({ proposal: proposal.id, action: action, decided_at: row.last_edited, decided_by: "notion" });
+}
+function ignoredRow(row, reason, propertyName) {
+    const brainId = property(row.properties, "Brain ID");
+    return { database: row.database, page_id: row.page_id, brain_id: typeof brainId === "string" && brainId !== "" ? brainId : null, ...(propertyName === undefined ? {} : { property: propertyName }), reason };
 }
-/** An Inbox row is read only for its Full text box (cli §5.14.2, 0043). */
+/**
+ * An Inbox row is read for Document asked (0049) and, on a Report row, Refresh and What to fix
+ * (0045); a Full text box is retired (cli §5.14.2).
+ */
 function planInbox(workspace, row, out) {
-    if (property(row.properties, "Full text") !== true)
-        return;
+    const modules = modulesOf(workspace.config);
     const brainId = property(row.properties, "Brain ID");
-    const ignore = (id) => out.ignored.push({ database: row.database, page_id: row.page_id, brain_id: id, property: "Full text", reason: "NO_FULL_TEXT" });
+    const note = typeof brainId === "string" && brainId !== "" ? workspace.get(brainId) : undefined;
+    if (Object.hasOwn(row.properties, "Full text"))
+        out.ignored.push(ignoredRow(row, "RETIRED", "Full text"));
+    if (note !== undefined && isReport(note)) {
+        if (!modules.reports) {
+            out.ignored.push(ignoredRow(row, "MODULE_OFF"));
+            return;
+        }
+        if (property(row.properties, "Refresh asked") === true || property(row.properties, "Refresh") === true)
+            out.refresh_requests.push({ page_id: row.page_id, report: note.id });
+        const text = property(row.properties, "What to fix");
+        const last = (Array.isArray(note.attributes.fixes) ? note.attributes.fixes : []).filter(isRecord).at(-1);
+        if (typeof text === "string" && text.trim() !== "" && text !== last?.text)
+            out.report_fixes.push({ page_id: row.page_id, report: note.id, text });
+    }
+    if (property(row.properties, "Document asked") !== true)
+        return;
+    if (!modules.documents) {
+        out.ignored.push(ignoredRow(row, "MODULE_OFF", "Document asked"));
+        return;
+    }
     if (typeof brainId !== "string" || brainId === "") {
-        ignore(null);
+        out.ignored.push(ignoredRow(row, "NOT_INGESTED", "Document asked"));
         return;
     }
-    const note = workspace.get(brainId);
     if (note === undefined) {
         out.conflicts.push(conflict(row, "UNKNOWN_BRAIN_ID", `No note has Brain ID ${brainId}`));
         return;
     }
-    if (hasInboxBody(note))
-        out.full_text_requests.push({ page_id: row.page_id, source: note.id });
-    else
-        ignore(note.id);
+    if (note.type !== "source" || note.attributes.kind === undefined || note.attributes.kind === "minutes") {
+        out.ignored.push(ignoredRow(row, "NOT_A_SOURCE", "Document asked"));
+        return;
+    }
+    const source = latestVersion(workspace, note);
+    const files = workspace.notes.filter((candidate) => candidate.type === "source" && candidate.attributes.attached_to === source.id).map((file) => file.id).sort(compareCodePoints);
+    const onlyKeep = property(row.properties, "Only keep");
+    const only = typeof onlyKeep === "string" && onlyKeep.trim() !== "" ? onlyKeep : null;
+    const request = { page_id: row.page_id, source: source.id, files, only_keep: only };
+    if (only === null) {
+        const wholes = (files.length > 0 ? files : [source.id]).map((id) => wholeDocumentOf(workspace, id));
+        if (wholes.every((id) => id !== undefined))
+            request.existing = wholes;
+    }
+    out.document_requests.push(request);
+}
+/** A Promote asked box on a decision or concept row (cli §5.14.2, 0049). */
+function planPromote(workspace, row, note, documentsOn, out) {
+    if (!documentsOn) {
+        out.ignored.push(ignoredRow(row, "MODULE_OFF", "Promote asked"));
+        return;
+    }
+    const existing = workspace.notes.find((candidate) => candidate.type === "reference" && candidate.attributes.origin === "promoted" && candidate.attributes.promoted_from === note.id);
+    out.promote_requests.push({ page_id: row.page_id, note: note.id, ...(existing === undefined ? {} : { existing: existing.id }) });
+}
+/** The latest version of a source, following `replaces` forward (schema §4, 0045). */
+function latestVersion(workspace, note) {
+    let current = note;
+    const seen = new Set([note.id]);
+    for (;;) {
+        const next = workspace.notes.find((candidate) => candidate.type === "source" && candidate.attributes.replaces === current.id);
+        if (next === undefined || seen.has(next.id))
+            return current;
+        seen.add(next.id);
+        current = next;
+    }
+}
+function wholeDocumentOf(workspace, source) {
+    return workspace.notes.find((note) => note.type === "reference" && note.attributes.origin === "whole" && Array.isArray(note.attributes.sources) && note.attributes.sources[0] === source)?.id;
 }
 /** A source whose Inbox row the brain writes: not minutes, a capture or an attached file (0042, 0043). */
 export function hasInboxBody(note) {
@@ -368,8 +447,8 @@ function planKeyResult(workspace, asOf, row, out) {
         out.updates.push({ id: goal, notion_fields: values });
 }
 function sortPlan(plan) {
-    const order = (item) => [DATABASES.indexOf(String(item.database)), String(item.page_id ?? item.id), String(item.field ?? item.property ?? "")].join("\u0000");
-    for (const values of [plan.create, plan.updates, plan.corrections, plan.decisions, plan.full_text_requests, plan.conflicts, plan.ignored])
+    const order = (item) => [String(DATABASES.indexOf(String(item.database))).padStart(2, "0"), String(item.page_id ?? item.id), String(item.field ?? item.property ?? "")].join("\u0000");
+    for (const values of [plan.create, plan.updates, plan.corrections, plan.decisions, plan.document_requests, plan.promote_requests, plan.refresh_requests, plan.report_fixes, plan.conflicts, plan.ignored])
         values.sort((a, b) => order(a).localeCompare(order(b)));
 }
 function notionFields(database, p, asOf) {
@@ -382,7 +461,7 @@ function notionFields(database, p, asOf) {
 }
 function brainProperties(database) {
     const common = [["Name", "title"], ["Summary", "summary"], ["Lifecycle", "lifecycle"]];
-    const extras = { goals: [["Why", "why"], ["Deadline", "facts.deadline"], ["Area", "area"]], projects: [["Key Facts", "facts"], ["Area", "area"], ["Goal", "goal"], ["Client", "client"], ["People", "people"]], people: [["Role", "facts.role"], ["Org", "org"]], decisions: [["Assessment", "assessment"], ["Project", "projects"], ["Area", "derived_area"]], questions: [["Kind", "kind"], ["Project", "projects"], ["Area", "derived_area"]], concepts: [["Project", "concept_projects"], ["Area", "concept_area"]] };
+    const extras = { goals: [["Why", "why"], ["Deadline", "facts.deadline"], ["Area", "area"]], projects: [["Key Facts", "facts"], ["Area", "area"], ["Goal", "goal"], ["Client", "client"], ["People", "people"]], people: [["Role", "facts.role"], ["Org", "org"]], decisions: [["Assessment", "assessment"], ["Project", "projects"], ["Area", "derived_area"]], questions: [["Kind", "kind"], ["Project", "projects"], ["Area", "derived_area"]], concepts: [["Project", "concept_projects"], ["Area", "concept_area"]], documents: [["Project", "reference_projects"], ["Area", "reference_area"]] };
     return [...common, ...(extras[database] ?? [])];
 }
 function convertedValue(workspace, row, name, value, conflicts) {
@@ -410,6 +489,28 @@ function linksUnpublished(workspace, note, brainField) {
     return ids.some((id) => typeof workspace.get(String(id))?.attributes.notion !== "string");
 }
 /** Equal in Notion's normalized form; relations compare as sets, and an empty text equals null. */
+/** Relation properties left out while their module is off (cli §5.14.4, 0048), per database. */
+function offRelations(config, database) {
+    const on = modulesOf(config);
+    const off = new Set();
+    if (!on.orgs && database === "projects")
+        off.add("Client");
+    if (!on.orgs && database === "people")
+        off.add("Org");
+    if (!on.planning && database === "projects")
+        off.add("Goal");
+    if (!on.knowledge && (database === "inbox" || database === "meetings")) {
+        off.add("Decisions");
+        off.add("Questions");
+    }
+    if (!on.knowledge && database === "inbox")
+        off.add("Concepts");
+    if (!on.documents && database === "inbox")
+        off.add("Documents");
+    return off;
+}
+/** Brain values that were renamed (0048, 0049): an S of the old one compares equal to the new one. */
+const RENAMED_VALUES = { "Brain Status": { Processed: "Done" }, Kind: { Document: "File" } };
 function sameValue(a, b) {
     const norm = (value) => Array.isArray(value) ? [...value].map(String).sort(compareCodePoints) : value === "" || value === undefined ? null : value;
     return isDeepStrictEqual(norm(a), norm(b));
@@ -446,9 +547,10 @@ export function parsePlan(input) {
     if (!isRecord(input))
         assertNoProblems([{ pointer: "", message: "must be an object" }]);
     const p = input;
-    const problems = unknownKeys(p, ["as_of", "create", "updates", "corrections", "decisions", "full_text_requests", "conflicts", "ignored"], "");
-    if (p.full_text_requests !== undefined && !Array.isArray(p.full_text_requests))
-        problems.push({ pointer: "/full_text_requests", message: "must be a list" });
+    const problems = unknownKeys(p, ["as_of", "create", "updates", "corrections", "decisions", "document_requests", "promote_requests", "refresh_requests", "report_fixes", "conflicts", "ignored"], "");
+    for (const key of ["document_requests", "promote_requests", "refresh_requests", "report_fixes"])
+        if (p[key] !== undefined && !Array.isArray(p[key]))
+            problems.push({ pointer: `/${key}`, message: "must be a list" });
     if (!isTimestamp(p.as_of))
         problems.push({ pointer: "/as_of", message: "must be an ISO 8601 UTC timestamp" });
     for (const key of ["create", "updates", "corrections", "decisions", "conflicts", "ignored"])
@@ -466,7 +568,7 @@ export function parsePlan(input) {
             problems.push({ pointer: `/create/${index}/lifecycle`, message: "must be a lifecycle string" });
     });
     assertNoProblems(problems);
-    return { ...p, full_text_requests: p.full_text_requests ?? [], as_of: normalizeTimestamp(p.as_of) };
+    return { ...p, document_requests: p.document_requests ?? [], promote_requests: p.promote_requests ?? [], refresh_requests: p.refresh_requests ?? [], report_fixes: p.report_fixes ?? [], as_of: normalizeTimestamp(p.as_of) };
 }
 export function applyPlan(workspace, plan, now, recordOnly) {
     const create = [];
@@ -538,28 +640,32 @@ export function applyPlan(workspace, plan, now, recordOnly) {
         ...updates.filter((item) => item.result === "applied").map((item) => ({ op: "sync-update", id: String(item.id), title: String(workspace.get(String(item.id))?.attributes.title ?? item.id) })),
         ...(correctionApply?.log ?? []), ...(decisionApply.log ?? []),
     ];
-    return { create, updates, corrections, decisions: decisionResult, full_text_requests: plan.full_text_requests, conflicts: plan.conflicts, ignored: plan.ignored, summary: summarize([...create, ...updates, ...corrections, ...decisionResult].map((item) => ({ ...item }))), log };
+    return { create, updates, corrections, decisions: decisionResult, document_requests: plan.document_requests, promote_requests: plan.promote_requests, refresh_requests: plan.refresh_requests, report_fixes: plan.report_fixes, conflicts: plan.conflicts, ignored: plan.ignored, summary: summarize([...create, ...updates, ...corrections, ...decisionResult].map((item) => ({ ...item }))), log };
 }
 function references(value) { if (Array.isArray(value))
     return value.flatMap(references); if (isRecord(value))
-    return Object.values(value).flatMap(references); return typeof value === "string" && /^(area|gol|prj|per|org|mtg|dec|que|con|src|mem)-/.test(value) ? [value] : []; }
+    return Object.values(value).flatMap(references); return typeof value === "string" && /^(area|gol|prj|per|org|mtg|dec|que|con|ref|src|mem)-/.test(value) ? [value] : []; }
 function summarize(items) { const result = { applied: 0, closed: 0, recorded: 0, corrected: 0, skipped: 0, failed: 0 }; for (const item of items)
     if (typeof item.result === "string" && Object.hasOwn(result, item.result))
         result[item.result] += 1; return result; }
 export function render(workspace, now, ids, held) {
     const selected = ids === undefined
-        ? workspace.notes.filter((note) => (PUBLISHED_TYPES.has(note.type) && !(note.type === "source" && note.attributes.kind === undefined)) || (isReport(note) && note.attributes.notion === undefined))
+        ? workspace.notes.filter((note) => (PUBLISHED_TYPES.has(note.type) && !(note.type === "source" && note.attributes.kind === undefined)) || isReport(note))
         : ids.map((id) => workspace.get(id)).filter(Boolean);
     const items = [];
     const errors = [];
     const warnings = [];
+    const modules = modulesOf(workspace.config);
     for (const note of selected) {
         const database = isReport(note) ? "inbox" : DATABASE_FOR_TYPE[note.type];
         if (database === undefined || (note.type === "source" && note.attributes.kind === undefined))
             continue;
-        // A published report is never rendered again (0043).
-        if (isReport(note) && note.attributes.notion !== undefined)
+        // A note of a module that is off isn't published; naming one is an error (0048).
+        if ((isReport(note) && !modules.reports) || !typeIsOn(workspace.config, note.type)) {
+            if (ids !== undefined)
+                errors.push({ id: note.id, reason: "MODULE_OFF" });
             continue;
+        }
         // An attached source has no Inbox row: its notes go on the parent's (0042).
         if (note.type === "source" && note.attributes.attached_to !== undefined)
             continue;
@@ -590,31 +696,48 @@ export function render(workspace, now, ids, held) {
         }
         const rendered = renderedBrainValues(note, workspace);
         const published = isRecord(note.attributes.notion_published) ? note.attributes.notion_published : {};
+        for (const name of offRelations(workspace.config, database))
+            delete rendered[name];
         const properties = {};
         const pending = [];
         const heldProperties = held?.get(note.id) ?? new Set();
-        const isCreate = isReport(note) || (note.attributes.notion === undefined && capturePage === undefined);
+        const isCreate = note.attributes.notion === undefined && capturePage === undefined;
         for (const [name, value] of Object.entries(rendered)) {
             if (name === "@content" || heldProperties.has(name) || (capturePage !== undefined && name === "Name"))
                 continue;
             const encoded = notionProperty(name, value, note, workspace, pending);
-            if (encoded !== undefined && (isCreate || !Object.hasOwn(published, name) || !sameValue(value, published[name])))
+            if (encoded !== undefined && (isCreate || !Object.hasOwn(published, name) || !sameValue(value, RENAMED_VALUES[name]?.[String(published[name])] ?? published[name])))
                 properties[name] = encoded;
         }
         const content = renderedContent(note, workspace);
         if (content.hash !== undefined)
             rendered["@content"] = content.hash;
+        // A promoted Document's body is yours once its page exists (0049): sent on create only.
+        if (note.type === "reference" && note.attributes.origin === "promoted" && !isCreate) {
+            content.body = null;
+            delete rendered["@content"];
+            if (Object.hasOwn(published, "@content"))
+                rendered["@content"] = published["@content"];
+            content.hash = undefined;
+        }
         const contentChanged = content.hash !== undefined && !isDeepStrictEqual(content.hash, published["@content"]);
-        // Full text (0043): the text goes out once per choice, and a ticked box is cleared once per request.
-        const full = note.type === "source" && hasInboxBody(note) ? fullTextDue(note, published["@full_text"]) : undefined;
-        if (full?.sections !== undefined)
-            content.sections = { ...(content.sections ?? {}), ...full.sections };
-        if (full?.clear === true)
-            properties["Full text"] = { type: "checkbox", value: false };
-        if (full !== undefined && (full.sections !== undefined || full.clear))
-            rendered["@full_text"] = full.record;
-        const fullTextDueNow = full !== undefined && (full.sections !== undefined || full.clear);
-        if (!isCreate && Object.keys(properties).length === 0 && !contentChanged && !fullTextDueNow)
+        // A report (0045): a refresh sends the body once and clears Refresh; a new fix clears What to fix.
+        let reportDue = false;
+        if (isReport(note)) {
+            const fixes = Array.isArray(note.attributes.fixes) ? note.attributes.fixes.length : 0;
+            const stored = typeof published["@fixes"] === "number" ? published["@fixes"] : 0;
+            if (!isCreate && contentChanged)
+                properties["Refresh asked"] = { type: "checkbox", value: false };
+            if (!isCreate && !contentChanged)
+                content.body = null;
+            if (fixes > stored) {
+                properties["What to fix"] = { type: "rich_text", value: null };
+                reportDue = true;
+            }
+            rendered["@fixes"] = Math.max(fixes, stored);
+        }
+        // Full text (0043) is retired (0049): nothing is sent, and `@full_text` in S stays as it is.
+        if (!isCreate && Object.keys(properties).length === 0 && !contentChanged && !reportDue)
             continue;
         if (!isCreate && note.type !== "meeting" && note.type !== "proposal")
             properties["Last Synced"] = { type: "date", value: { start: formatTimestamp(now), end: null } };
@@ -633,8 +756,7 @@ function trashDue(note, now) {
     const time = typeof decided === "string" ? Date.parse(decided) : Number.NaN;
     return Number.isFinite(time) && now.getTime() - time > TRASH_AFTER_MS;
 }
-function databaseIdFor(workspace, database) { const notion = workspace.config.notion; if (!isRecord(notion) || !isRecord(notion.databases))
-    return ""; return typeof notion.databases[database] === "string" ? notion.databases[database] : database === "inbox" && typeof notion.databases.capture_inbox === "string" ? notion.databases.capture_inbox : ""; }
+function databaseIdFor(workspace, database) { return databaseId(workspace.config, database); }
 function renderedBrainValues(note, workspace) {
     const a = note.attributes;
     const values = {};
@@ -644,7 +766,9 @@ function renderedBrainValues(note, workspace) {
         const addLink = a.kind === "add_link";
         const after = addLink
             ? proposalLinks(a).map((link) => `${fieldLabel(String(link.field))}: ${noteTitle(link.value, workspace)}`).join("\n")
-            : a.kind === "review_notes" ? reviewNotesAfter(a, workspace) : undefined;
+            : a.kind === "review_notes" ? reviewNotesAfter(a, workspace) : a.kind === "update_body" ? bodyChange(a, workspace)?.join("\n") ?? null : undefined;
+        // A body diff can only be shown while the target's body is the one proposed against; then S keeps it (0045).
+        const proposed = staleBody(a, workspace) && isRecord(a.notion_published) && Object.hasOwn(a.notion_published, "Proposed") ? a.notion_published.Proposed : undefined;
         const reviewText = (value) => truncate(typeof value === "string" ? reviewMarkdown(value, target) : value);
         // A Review notes row names its source: the meeting for minutes, else the source (0041).
         const source = a.kind === "review_notes" && typeof a.source === "string" ? workspace.get(a.source) : undefined;
@@ -652,16 +776,16 @@ function renderedBrainValues(note, workspace) {
         const page = (source ?? target)?.attributes.notion;
         const meeting = typeof a.source === "string" ? workspace.get(a.source) : undefined;
         Object.assign(values, {
-            Name: a.title, Kind: select(a.kind), Target: targetText,
-            "Target Page": typeof page === "string" ? `https://www.notion.so/${page.replaceAll("-", "")}` : null,
+            Name: reviewName(a), Kind: select(a.kind), About: targetText,
+            "About Page": typeof page === "string" ? `https://www.notion.so/${page.replaceAll("-", "")}` : null,
             "Source Meeting": meeting?.type === "meeting" && typeof meeting.attributes.notion === "string" ? [meeting.attributes.notion] : [],
-            Before: reviewText(proposalBefore(a, workspace)), After: reviewText(after ?? proposalAfter(a, workspace)),
-            Why: reviewText(a.why), State: select(proposalState(a.status)), "Brain ID": note.id,
+            Now: reviewText(proposalBefore(a, workspace)), Proposed: proposed !== undefined ? proposed : reviewText(after ?? proposalAfter(a, workspace)),
+            Why: reviewText(a.why), Area: relationPages(reviewArea(a, workspace), workspace), State: select(proposalState(a.status)), "Brain ID": note.id,
         });
         return values;
     }
     if (isReport(note)) {
-        Object.assign(values, { Name: a.title, Kind: "Report", Project: relationPages(a.projects, workspace), Area: relationPages(a.area === undefined ? [] : [a.area], workspace), Ask: typeof a.asked_in === "string" ? [a.asked_in] : [], "Brain Status": "Processed", "Brain ID": note.id });
+        Object.assign(values, { Name: a.title, Kind: "Report", Project: relationPages(a.projects, workspace), Area: relationPages(a.area === undefined ? [] : [a.area], workspace), Ask: typeof a.asked_in === "string" ? [a.asked_in] : Array.isArray(a.asked_in) ? a.asked_in : [], "Brain Status": "Done", "Brain ID": note.id });
         return values;
     }
     if (note.type === "meeting") {
@@ -692,10 +816,30 @@ function renderedBrainValues(note, workspace) {
         else if (published.Status === undefined && !yours)
             values.Status = "Open";
     }
-    if (note.type === "concept")
+    if (note.type === "concept" || note.type === "reference")
         Object.assign(values, { Project: relationPages(a.projects, workspace), Area: relationPages(a.area === undefined ? [] : [a.area], workspace) });
+    if (note.type === "reference") {
+        const from = a.origin === "promoted" && typeof a.promoted_from === "string" ? a.promoted_from : undefined;
+        Object.assign(values, { "From decision": relationPages(from?.startsWith("dec-") ? [from] : [], workspace), "From concept": relationPages(from?.startsWith("con-") ? [from] : [], workspace) });
+    }
     return values;
 }
+/** A Review row's Name says which kind of row it is (cli §5.14.4, 0048). */
+function reviewName(a) {
+    const prefix = ["contradiction", "supersede", "merge", "new_item"].includes(String(a.kind)) ? "Conflict: " : a.kind === "answer" ? "Answer: " : "";
+    return typeof a.title === "string" && prefix !== "" && !a.title.startsWith(prefix) ? `${prefix}${a.title}` : a.title;
+}
+/** A Review row's one area: its source note's own area, else the area of its first project (cli §5.14.4, 0050). */
+function reviewArea(a, workspace) {
+    const source = typeof a.source === "string" ? workspace.get(a.source) : undefined;
+    if (source === undefined)
+        return [];
+    if (typeof source.attributes.area === "string")
+        return [source.attributes.area];
+    const first = Array.isArray(source.attributes.projects) ? source.attributes.projects[0] : undefined;
+    const area = typeof first === "string" ? workspace.get(first)?.attributes.area : undefined;
+    return typeof area === "string" ? [area] : [];
+}
 /** Area on decisions and questions is a derived Notion relation (decision 0034). */
 function projectAreas(projects, workspace) {
     const areas = (Array.isArray(projects) ? projects : []).flatMap((project) => {
@@ -707,20 +851,23 @@ function projectAreas(projects, workspace) {
 /** The notes a source produced, with those of the sources attached to it (cli §5.14.4, 0042). */
 function producedBy(note, workspace) {
     const sources = new Set([note.id, ...workspace.notes.filter((candidate) => candidate.type === "source" && candidate.attributes.attached_to === note.id).map((candidate) => candidate.id)]);
-    return workspace.notes.filter((candidate) => ["decision", "question", "concept", "person"].includes(candidate.type) && Array.isArray(candidate.attributes.sources) && candidate.attributes.sources.some((id) => sources.has(String(id))));
+    // A promoted Document comes from its note, not the source (0049).
+    return workspace.notes.filter((candidate) => ["decision", "question", "concept", "reference", "person"].includes(candidate.type) && !(candidate.type === "reference" && candidate.attributes.origin === "promoted") && Array.isArray(candidate.attributes.sources) && candidate.attributes.sources.some((id) => sources.has(String(id))));
 }
 function sourceValues(note, workspace) {
     const produced = producedBy(note, workspace);
     const ids = (type) => produced.filter((candidate) => candidate.type === type).map((candidate) => candidate.id).sort(compareCodePoints);
     const projects = [...new Set(produced.flatMap((candidate) => Array.isArray(candidate.attributes.projects) ? candidate.attributes.projects.filter((id) => typeof id === "string") : []))].sort(compareCodePoints);
     const areas = [...new Set([...produced.map((candidate) => candidate.attributes.area).filter((id) => typeof id === "string"), ...projects.flatMap((id) => { const area = workspace.get(id)?.attributes.area; return typeof area === "string" ? [area] : []; })])].sort(compareCodePoints);
-    return { Name: note.attributes.title, Kind: select(note.attributes.kind), Summary: note.attributes.summary ?? null, Decisions: relationPages(ids("decision"), workspace), Questions: relationPages(ids("question"), workspace), Concepts: relationPages(ids("concept"), workspace), People: relationPages(ids("person"), workspace), Project: relationPages(projects, workspace), Area: relationPages(areas, workspace), "Brain Status": "Processed", "Brain ID": note.id };
+    return { Name: note.attributes.title, Kind: note.attributes.kind === "document" ? "File" : select(note.attributes.kind), Summary: note.attributes.summary ?? null, Decisions: relationPages(ids("decision"), workspace), Questions: relationPages(ids("question"), workspace), Concepts: relationPages(ids("concept"), workspace), ...(databaseIdFor(workspace, "documents") === "" ? {} : { Documents: relationPages(ids("reference"), workspace) }), People: relationPages(ids("person"), workspace), Project: relationPages(projects, workspace), Area: relationPages(areas, workspace), "Brain Status": "Done", "Brain ID": note.id };
 }
 function notionProperty(name, value, note, workspace, pending) {
-    const relation = ["Area", "Goal", "Client", "People", "Org", "Project", "Decided In", "Raised In", "Supersedes", "Decisions", "Questions", "Concepts", "Attendees"].includes(name);
+    const relation = ["Area", "Goal", "Client", "People", "Org", "Project", "Decided In", "Raised In", "Supersedes", "Decisions", "Questions", "Concepts", "Documents", "Attendees", "From decision", "From concept"].includes(name);
     if (relation) {
         const sourceField = { Area: "area", Goal: "goal", Client: "client", People: "people", Org: "org", Project: "projects", "Decided In": "decided_in", "Raised In": "raised_in", Decisions: "decisions", Questions: "questions", Attendees: "attendees" };
-        const raw = name === "Area" && (note.type === "decision" || note.type === "question") ? projectAreas(note.attributes.projects, workspace) : name === "Supersedes" ? (Array.isArray(note.attributes.relations) ? note.attributes.relations.filter(isRecord).filter((item) => item.type === "supersedes").map((item) => item.target) : []) : note.type === "source" ? sourceRelationIds(note, name, workspace) : note.attributes[sourceField[name] ?? ""];
+        const raw = name === "Area" && note.type === "proposal" ? reviewArea(note.attributes, workspace)
+            : name === "From decision" || name === "From concept" ? (Array.isArray(value) && note.attributes.promoted_from !== undefined && String(note.attributes.promoted_from).startsWith(name === "From decision" ? "dec-" : "con-") ? [note.attributes.promoted_from] : [])
+                : name === "Area" && (note.type === "decision" || note.type === "question") ? projectAreas(note.attributes.projects, workspace) : name === "Supersedes" ? (Array.isArray(note.attributes.relations) ? note.attributes.relations.filter(isRecord).filter((item) => item.type === "supersedes").map((item) => item.target) : []) : note.type === "source" ? sourceRelationIds(note, name, workspace) : note.attributes[sourceField[name] ?? ""];
         const missing = (Array.isArray(raw) ? raw : raw === undefined ? [] : [raw]).map(String).filter((id) => typeof workspace.get(id)?.attributes.notion !== "string");
         if (missing.length > 0)
             pending.push({ property: name, ids: missing });
@@ -735,8 +882,11 @@ function notionProperty(name, value, note, workspace, pending) {
     }
     if (name === "Ask")
         return { type: "relation", value: Array.isArray(value) ? value : [] };
-    if (name === "Target Page")
+    if (name === "About Page")
         return { type: "url", value };
+    // An Inbox row's Kind is written only when empty in Notion, so a Kind you chose stands (0048).
+    if (name === "Kind" && note.type === "source")
+        return { type: "select", value, mode: "if_empty" };
     if (["Lifecycle", "Assessment", "Kind", "State", "Brain Status", "Status"].includes(name))
         return { type: "select", value };
     if (name === "Last Synced" || name === "Date" || name === "Deadline" || name === "Ingested At")
@@ -751,6 +901,8 @@ function sourceRelationIds(note, name, workspace) {
         return produced.filter((candidate) => candidate.type === "question").map((candidate) => candidate.id);
     if (name === "Concepts")
         return produced.filter((candidate) => candidate.type === "concept").map((candidate) => candidate.id);
+    if (name === "Documents")
+        return produced.filter((candidate) => candidate.type === "reference").map((candidate) => candidate.id);
     if (name === "People")
         return produced.filter((candidate) => candidate.type === "person").map((candidate) => candidate.id);
     const projects = [...new Set(produced.flatMap((candidate) => Array.isArray(candidate.attributes.projects) ? candidate.attributes.projects.filter((id) => typeof id === "string") : []))];
@@ -773,7 +925,7 @@ function renderedContent(note, workspace) {
         const sections = { Brief: notionMarkdown(generatedBlock(brief.body), brief, workspace) };
         return { body: null, sections, hash: hash(JSON.stringify(sections)) };
     }
-    // A source's digest is written once; its Full text is tracked by @full_text, not @content (0043).
+    // A source's digest is written once (0043).
     if (note.type === "source") {
         if (!hasInboxBody(note))
             return { body: null, sections: null };
@@ -784,7 +936,7 @@ function renderedContent(note, workspace) {
         const body = notionMarkdown(note.body.replace(/^\n+/, ""), note, workspace);
         return { body, sections: null, hash: hash(body) };
     }
-    if (note.type === "decision" || note.type === "question" || note.type === "concept") {
+    if (note.type === "decision" || note.type === "question" || note.type === "concept" || note.type === "reference") {
         const body = notionMarkdown(note.body, note, workspace);
         return { body, sections: null, hash: hash(body) };
     }
@@ -824,32 +976,40 @@ function personTitle(value, workspace) { return typeof value === "string" && wor
 function noteTitle(value, workspace) { return typeof value === "string" ? workspace.get(value)?.attributes.title ?? value : value ?? null; }
 function fieldLabel(field) { return field[0]?.toUpperCase() + field.slice(1).replaceAll("_", " "); }
 function truncate(value) { return typeof value === "string" ? value.slice(0, 2000) : value; }
-/** The lettered lines of a Review notes row: its notes, then its links (cli §5.14.4). */
+/** The lettered lines of a Review notes row: its changes, then its notes, then its links (cli §5.14.4, 0045). */
 function reviewNotesAfter(attributes, workspace) {
+    const changes = (Array.isArray(attributes.changes) ? attributes.changes.filter(isRecord) : []).map((change) => {
+        const target = String(noteTitle(change.target, workspace));
+        if (change.kind === "update_fact")
+            return `⚠ ${fieldLabel(String(change.field))} on ${target}: ${change.before === undefined ? "(new)" : String(noteTitle(change.before, workspace))} → ${String(noteTitle(change.after, workspace))}`;
+        if (change.kind === "update_body")
+            return `⚠ ${target}: ${bodyChange(change, workspace)?.length ?? 0} lines changed`;
+        return `Add to ${target}: ${String(change.content ?? "").split("\n")[0].slice(0, 80)}`;
+    });
     const notes = (Array.isArray(attributes.notes) ? attributes.notes : []).map((id) => {
         const note = workspace.get(String(id));
         return `${note === undefined ? "Note" : fieldLabel(note.type)}: ${String(noteTitle(id, workspace))}`;
     });
     const links = (Array.isArray(attributes.links) ? attributes.links.filter(isRecord) : []).map((link) => `${fieldLabel(String(link.field))} on ${String(noteTitle(link.target, workspace))}: ${String(noteTitle(link.value, workspace))}`);
-    return [...notes, ...links].map((line, index) => `${letters(index)}) ${line}`).join("\n");
+    return [...changes, ...notes, ...links].map((line, index) => `${letters(index)}) ${line}`).join("\n");
+}
+/** The changed lines an update_body proposes against its target's body (cli §5.19), or undefined once that body changed. */
+function bodyChange(change, workspace) {
+    const target = typeof change.target === "string" ? workspace.get(change.target) : undefined;
+    if (target === undefined || bodyHash(target.body) !== change.before_hash)
+        return undefined;
+    return lineDiff(target.body, bodyOf(String(change.content ?? "")));
+}
+/** Whether a proposal holds an update_body whose target's body is no longer the one it was proposed against. */
+function staleBody(attributes, workspace) {
+    const bodies = attributes.kind === "update_body" ? [attributes] : (Array.isArray(attributes.changes) ? attributes.changes.filter(isRecord) : []).filter((change) => change.kind === "update_body");
+    return bodies.some((change) => bodyChange(change, workspace) === undefined);
 }
 /** a, b, … z, then aa, ab, … */
 export function letters(index) {
     return index < 26 ? String.fromCharCode(97 + index) : `${letters(Math.floor(index / 26) - 1)}${letters(index % 26)}`;
 }
 function isReport(note) { return note.type === "view" && note.attributes.view_kind === "report"; }
-/**
- * Whether a source's Full text is due (cli §5.14.4): B of `@full_text` against S. The text goes out
- * when it is chosen and S doesn't hold the same choice; the box is cleared when a request is new.
- */
-function fullTextDue(note, stored) {
-    const a = note.attributes;
-    const record = { text: a.notion_text ?? "digest", parts: Array.isArray(a.notion_parts) ? a.notion_parts : null, requested: a.notion_text_requested ?? null };
-    const s = isRecord(stored) ? stored : undefined;
-    const send = record.text === "full" && (s === undefined || s.text !== record.text || !isDeepStrictEqual(s.parts ?? null, record.parts));
-    const clear = record.requested !== null && record.requested !== (s?.requested ?? null);
-    return { record, ...(send ? { sections: { "Full text": fullText(note.body, record.parts) } } : {}), clear };
-}
 /** A brain-created Inbox row's body: a line about the source, its summary and its digest (cli §5.14.4). */
 function digestBody(note) {
     const a = note.attributes;
@@ -862,7 +1022,7 @@ function digestBody(note) {
     return [line, typeof a.summary === "string" ? a.summary : undefined, typeof a.digest === "string" ? a.digest.replace(/\n+$/, "") : undefined].filter((part) => part !== undefined).join("\n\n");
 }
 function proposalBefore(attributes, workspace) {
-    if (attributes.kind === "add_link" || attributes.kind === "review_notes" || attributes.kind === "answer")
+    if (attributes.kind === "add_link" || attributes.kind === "review_notes" || attributes.kind === "answer" || attributes.kind === "update_body")
         return null;
     if (attributes.kind === "supersede")
         return truncate(noteTitle(attributes.supersedes, workspace));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ultimate-brain",
-  "version": "0.4.1",
+  "version": "0.6.0",
   "description": "CLI for an AI-assisted Markdown and Git second brain",
   "license": "MIT",
   "keywords": [