kibi-cli 2.1.0 → 2.3.0

package/dist/operations/mutation/source-authoring.js

@@ -2,9 +2,11 @@ import { createHash } from "node:crypto";
 import { randomUUID } from "node:crypto";
 import fs from "node:fs";
 import path from "node:path";
+import { isDeepStrictEqual } from "node:util";
 import { dump as dumpYaml, load as loadYaml } from "js-yaml";
 import { parseDocument, stringify } from "yaml";
 import { OperationError } from "../../cli-errors.js";
+import { canonicalFilesystemPath } from "../../utils/canonical-path.js";
 import { CANONICAL_ENTITY_PATHS, isDerivedKbPath, } from "../../utils/kb-paths.js";
 function digest(value) {
     return createHash("sha256").update(value).digest("hex");
@@ -22,6 +24,26 @@ export function writePendingSourceReceipt(workspaceRoot, relativePath, afterHash
         createdAt: new Date().toISOString(),
     }, null, 2)}\n`, { mode: 0o600 });
 }
+/**
+ * Retire the pending receipt of a source that a committed plan deleted. A
+ * receipt binds untracked input to exact bytes, so one left behind for a
+ * removed file makes every later sync fail on a missing pending source.
+ */
+// implements REQ-core-atomic-upsert-persistence, REQ-kibi-operation-interface-parity
+export function retirePendingSourceReceipt(workspaceRoot, relativePath) {
+    try {
+        fs.unlinkSync(pendingReceiptPath(workspaceRoot, relativePath));
+    }
+    catch (error) {
+        if (error.code !== "ENOENT")
+            throw error;
+    }
+}
+/**
+ * Authored YAML round-trips keep long scalars on one line, matching sync and
+ * coordinate refresh output, so editing one entry never refolds the others.
+ */
+const AUTHORED_YAML_OPTIONS = { lineWidth: 0 };
 function authoredPath(value) {
     if (typeof value !== "string" || !value.trim())
         return undefined;
@@ -49,21 +71,24 @@ export function resolveContainedSourcePath(workspaceRoot, relative) {
         throw new OperationError("SOURCE_PATH_INVALID", `document.path cannot target Kibi's derived state under ${workspaceRelative}: ${relative}`);
     }
     // A symlinked existing file or parent could otherwise escape the workspace.
-    let existing = fs.existsSync(absolute) ? absolute : path.dirname(absolute);
-    while (!fs.existsSync(existing) && path.dirname(existing) !== existing) {
-        existing = path.dirname(existing);
-    }
-    const real = fs.realpathSync.native(existing);
-    if (real !== root && !real.startsWith(`${root}${path.sep}`)) {
+    const realRoot = canonicalFilesystemPath(root);
+    const real = canonicalFilesystemPath(absolute);
+    if (real !== realRoot && !real.startsWith(`${realRoot}${path.sep}`)) {
         throw new OperationError("SOURCE_PATH_INVALID", `document.path resolves outside the workspace: ${relative}`);
     }
     return absolute;
 }
 export function normalizeAuthoredSourcePath(workspaceRoot, source) {
     const normalized = source.replaceAll("\\", "/");
-    const relative = path.isAbsolute(normalized)
-        ? path.relative(path.resolve(workspaceRoot), path.resolve(normalized))
-        : normalized;
+    const root = path.resolve(workspaceRoot);
+    let relative = normalized;
+    if (path.isAbsolute(normalized)) {
+        const absolute = path.resolve(normalized);
+        relative =
+            absolute === root || absolute.startsWith(`${root}${path.sep}`)
+                ? path.relative(root, absolute)
+                : path.relative(canonicalFilesystemPath(root), canonicalFilesystemPath(absolute));
+    }
     return path
         .relative(path.resolve(workspaceRoot), resolveContainedSourcePath(workspaceRoot, relative))
         .replaceAll(path.sep, "/");
@@ -226,13 +251,97 @@ export function manifestRelationships(item) {
             : [];
     });
 }
-function mergeManifestRelationships(existing, incoming, entityId) {
+// implements REQ-source-analysis-v2
+function manifestRecord(item) {
+    if (item === null ||
+        typeof item !== "object" ||
+        !("toJSON" in item) ||
+        typeof item.toJSON !== "function") {
+        return undefined;
+    }
+    const value = item.toJSON();
+    return value !== null && typeof value === "object" && !Array.isArray(value)
+        ? value
+        : undefined;
+}
+// implements REQ-source-analysis-v2
+function failDuplicateConflict(entityId, field) {
+    throw new OperationError("SOURCE_DUPLICATE_CONFLICT", `Duplicate symbol ${entityId} has conflicting authored field "${field}"; no source was written`, false);
+}
+// implements REQ-source-analysis-v2
+function mergeCompatibleManifestField(target, field, value, entityId, conflictField = field) {
+    if (Object.hasOwn(target, field)) {
+        if (!isDeepStrictEqual(target[field], value)) {
+            failDuplicateConflict(entityId, conflictField);
+        }
+        return;
+    }
+    Object.defineProperty(target, field, {
+        configurable: true,
+        enumerable: true,
+        value,
+        writable: true,
+    });
+}
+// implements REQ-source-analysis-v2
+function mergeDuplicateManifestFields(records, entityId) {
+    const merged = Object.create(null);
+    for (const record of records) {
+        // Links and typed relationships are collections, so merge them separately
+        // instead of treating a difference as conflicting scalar metadata.
+        const authored = Object.fromEntries(Object.entries(symbolManifestRecord(record)).filter(([key]) => key !== "links"));
+        for (const [key, value] of Object.entries(authored)) {
+            mergeCompatibleManifestField(merged, key, value, entityId);
+        }
+    }
+    return merged;
+}
+// implements REQ-source-analysis-v2
+function manifestRelationshipRecords(record, entityId) {
+    if (record.relationships === undefined)
+        return [];
+    if (!Array.isArray(record.relationships)) {
+        failDuplicateConflict(entityId, "relationships");
+    }
+    return record.relationships;
+}
+// implements REQ-source-analysis-v2
+function mergeManifestRelationshipRecords(records, incoming, entityId) {
     const merged = new Map();
-    for (const relationship of existing) {
-        merged.set(`${relationship.type}\u0000${relationship.target}`, {
-            type: relationship.type,
-            target: relationship.target,
-        });
+    const untyped = [];
+    for (const record of records) {
+        for (const row of manifestRelationshipRecords(record, entityId)) {
+            if (row === null || typeof row !== "object" || Array.isArray(row)) {
+                if (!untyped.some((value) => isDeepStrictEqual(value, row))) {
+                    untyped.push(row);
+                }
+                continue;
+            }
+            const candidate = row;
+            const type = candidate.type;
+            const target = candidate.target ?? candidate.to;
+            if (typeof type !== "string" || typeof target !== "string") {
+                if (!untyped.some((value) => isDeepStrictEqual(value, row))) {
+                    untyped.push(row);
+                }
+                continue;
+            }
+            const key = `${type}\u0000${target}`;
+            const normalized = {
+                ...Object.fromEntries(Object.entries(candidate).filter(([key]) => key !== "to")),
+                type,
+                target,
+            };
+            const previous = merged.get(key);
+            if (previous) {
+                for (const [field, value] of Object.entries(normalized)) {
+                    mergeCompatibleManifestField(previous, field, value, entityId, `relationship ${type} -> ${target}.${field}`);
+                }
+            }
+            else {
+                merged.set(key, normalized);
+            }
+        }
     }
     for (const relationship of incoming) {
         if (relationship.from !== entityId ||
@@ -240,19 +349,63 @@ function mergeManifestRelationships(existing, incoming, entityId) {
             typeof relationship.to !== "string") {
             continue;
         }
-        const normalized = { type: relationship.type, target: relationship.to };
-        merged.set(`${normalized.type}\u0000${normalized.target}`, normalized);
+        const key = `${relationship.type}\u0000${relationship.to}`;
+        const normalized = {
+            ...Object.fromEntries(Object.entries(relationship).filter(([key]) => key !== "from" && key !== "to")),
+            type: relationship.type,
+            target: relationship.to,
+        };
+        const previous = merged.get(key);
+        if (previous) {
+            for (const [field, value] of Object.entries(normalized)) {
+                mergeCompatibleManifestField(previous, field, value, entityId, `relationship ${relationship.type} -> ${relationship.to}.${field}`);
+            }
+        }
+        else {
+            merged.set(key, normalized);
+        }
+    }
+    return [
+        ...[...merged.values()].sort((left, right) => `${String(left.type)}\u0000${String(left.target)}`.localeCompare(`${String(right.type)}\u0000${String(right.target)}`)),
+        ...untyped,
+    ];
+}
+// implements REQ-source-analysis-v2
+function mergeManifestLinks(records, entity) {
+    const values = [
+        ...records.map((record) => record.links),
+        entity.links,
+    ].filter((value) => value !== undefined);
+    if (values.length === 0)
+        return undefined;
+    const links = [];
+    for (const value of values) {
+        const entries = Array.isArray(value) ? value : [value];
+        for (const entry of entries) {
+            if (!links.some((existing) => isDeepStrictEqual(existing, entry))) {
+                links.push(entry);
+            }
+        }
     }
-    return [...merged.values()].sort((left, right) => `${left.type}\u0000${left.target}`.localeCompare(`${right.type}\u0000${right.target}`));
+    return links;
+}
+/** Indexes of every manifest entry whose `id` equals `id`, in file order. */
+function symbolManifestIndexes(items, id) {
+    return items.flatMap((item, index) => item &&
+        typeof item === "object" &&
+        "get" in item &&
+        String(item.get("id")) === id
+        ? [index]
+        : []);
 }
 function renderSymbolManifest(entity, relationships, existingContent) {
     if (existingContent === undefined) {
-        const doc = parseDocument(stringify({
-            symbols: [
-                symbolManifestRecord(entity, mergeManifestRelationships([], relationships, String(entity.id))),
-            ],
-        }));
-        return doc.toString();
+        const created = symbolManifestRecord(entity);
+        const rows = mergeManifestRelationshipRecords([], relationships, String(entity.id));
+        if (rows.length > 0)
+            created.relationships = rows;
+        const doc = parseDocument(stringify({ symbols: [created] }));
+        return doc.toString(AUTHORED_YAML_OPTIONS);
     }
     const doc = parseDocument(existingContent);
     const symbols = doc.get("symbols", true);
@@ -261,31 +414,40 @@ function renderSymbolManifest(entity, relationships, existingContent) {
     }
     const items = symbols.items;
     const id = String(entity.id);
-    const index = items.findIndex((item) => {
+    const indices = items.flatMap((item, index) => {
         if (!item || typeof item !== "object" || !("get" in item))
-            return false;
-        return String(item.get("id")) === id;
+            return [];
+        return String(item.get("id")) === id
+            ? [index]
+            : [];
     });
-    const existingRelationships = index >= 0 ? manifestRelationships(items[index]) : [];
-    let next = symbolManifestRecord(entity, mergeManifestRelationships(existingRelationships, relationships, id));
-    if (index >= 0) {
-        // Partial symbol payloads (for example a relationship-only upsert) must
-        // never erase authored provenance from the manifest. Preserve fields the
-        // payload omits, with incoming values winning on explicit conflicts.
-        const item = items[index];
-        const previous = typeof item?.toJSON === "function" ? item.toJSON() : null;
-        if (typeof previous === "object" &&
-            previous !== null &&
-            !Array.isArray(previous)) {
-            const preserved = symbolManifestRecord(previous, []);
-            next = { ...preserved, ...next };
+    const existingRecords = indices
+        .map((index) => manifestRecord(items[index]))
+        .filter((record) => record !== undefined);
+    if (existingRecords.length !== indices.length) {
+        failDuplicateConflict(id, "record");
+    }
+    const previous = mergeDuplicateManifestFields(existingRecords, id);
+    const next = { ...previous, ...symbolManifestRecord(entity) };
+    const mergedRelationships = mergeManifestRelationshipRecords(existingRecords, relationships, id);
+    if (mergedRelationships.length > 0) {
+        next.relationships = mergedRelationships;
+    }
+    const mergedLinks = mergeManifestLinks(existingRecords, entity);
+    if (mergedLinks !== undefined)
+        next.links = mergedLinks;
+    if (indices.length > 0) {
+        // Patch one canonical row and remove all redundant copies only after
+        // compatible authored fields and all links have been merged successfully.
+        doc.setIn(["symbols", indices[0]], next);
+        for (const duplicateIndex of indices.slice(1).reverse()) {
+            items.splice(duplicateIndex, 1);
         }
-        doc.setIn(["symbols", index], next);
     }
     else {
         doc.addIn(["symbols"], next);
     }
-    return doc.toString();
+    return doc.toString(AUTHORED_YAML_OPTIONS);
 }
 export function renderSourceDeletion(sourcePathValue, entityId, entityType, existingContent) {
     const extension = path.extname(sourcePathValue).toLowerCase();
@@ -306,16 +468,15 @@ export function renderSourceDeletion(sourcePathValue, entityId, entityType, exis
             throw new OperationError("SOURCE_FORMAT_INVALID", "Symbol manifest must contain a symbols array");
         }
         const items = symbols.items;
-        const index = items.findIndex((item) => {
-            if (!item || typeof item !== "object" || !("get" in item))
-                return false;
-            return (String(item.get("id")) === entityId);
-        });
-        if (index < 0) {
+        const matches = symbolManifestIndexes(items, entityId);
+        if (matches.length === 0) {
             throw new OperationError("SOURCE_ENTITY_MISMATCH", `Symbol manifest ${sourcePathValue} does not contain ${entityId}`);
         }
-        doc.deleteIn(["symbols", index]);
-        return { mode: "write", body: doc.toString() };
+        // Delete every copy, last first so earlier indexes stay valid.
+        for (const match of [...matches].reverse()) {
+            doc.deleteIn(["symbols", match]);
+        }
+        return { mode: "write", body: doc.toString(AUTHORED_YAML_OPTIONS) };
     }
     throw new OperationError("SOURCE_FORMAT_UNSUPPORTED", `Unsupported authored source format: ${extension || "unknown"}`);
 }
@@ -381,7 +542,7 @@ export function renderMarkdownRelationshipDeletion(sourcePathValue, existingCont
         return { body: existingContent, removed: false };
     const body = existingContent.slice(marker + "\n---".length);
     return {
-        body: `---\n${frontmatter.toString()}---${body.startsWith("\n") ? "" : "\n"}${body}`,
+        body: `---\n${frontmatter.toString(AUTHORED_YAML_OPTIONS)}---${body.startsWith("\n") ? "" : "\n"}${body}`,
         removed: true,
     };
 }
@@ -437,7 +598,7 @@ export function renderYamlRelationshipDeletion(sourcePathValue, existingContent,
         }
     }
     return removed
-        ? { body: doc.toString(), removed: true }
+        ? { body: doc.toString(AUTHORED_YAML_OPTIONS), removed: true }
         : { body: existingContent, removed: false };
 }
 function renderSourceDocument(input, entity, existingContent, relativePath) {

package/dist/operations/mutation/strict-fact.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"strict-fact.d.ts","sourceRoot":"","sources":["../../../src/operations/mutation/strict-fact.ts"],"names":[],"mappings":"AAUA,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAarD;AAGD,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GACxC,MAAM,EAAE,CA+EV;AAED,wBAAgB,qBAAqB,CACnC,aAAa,EAAE,OAAO,EACtB,aAAa,EAAE,OAAO,GACrB,IAAI,CAUN;AAGD,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GACxC,IAAI,CA+CN"}
+{"version":3,"file":"strict-fact.d.ts","sourceRoot":"","sources":["../../../src/operations/mutation/strict-fact.ts"],"names":[],"mappings":"AAWA,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAarD;AAGD,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GACxC,MAAM,EAAE,CA+EV;AAED,wBAAgB,qBAAqB,CACnC,aAAa,EAAE,OAAO,EACtB,aAAa,EAAE,OAAO,GACrB,IAAI,CAUN;AAGD,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GACxC,IAAI,CAmDN"}

package/dist/operations/mutation/strict-fact.js

@@ -1,4 +1,5 @@
 import { validateLogicIr } from "../../logic/ir.js";
+import { predicateVocabularyErrors } from "../modeling/predicate-vocabulary.js";
 const PROPERTY_VALUE_FIELDS = [
     "value_string",
     "value_int",
@@ -106,6 +107,10 @@ export function validateFactModelingShape(entity) {
     if (hints.length > 0) {
         throw new Error(`Entity validation failed: ${hints.join("; ")}`);
     }
+    const vocabularyErrors = predicateVocabularyErrors(entity);
+    if (vocabularyErrors.length > 0) {
+        throw new Error(`Entity validation failed: ${vocabularyErrors.join("; ")}`);
+    }
     if (entity.type === "fact" && entity.fact_kind === "rule") {
         const validation = validateLogicIr(entity.rule_ir);
         if (!validation.valid || !validation.semanticKey) {

package/dist/operations/mutation/types.d.ts

@@ -1,4 +1,5 @@
 import type { SemanticAdvisorReceipt } from "../semantic-advisor/types.js";
+import type { SagaRollbackFailure } from "./saga.js";
 export type RelationshipInput = Readonly<Record<string, unknown>>;
 export type UpsertInput = {
     readonly type: string;
@@ -48,6 +49,20 @@ export type UpsertPayload = {
         readonly checked_req_id: string;
         readonly strict_readiness: string;
     };
+    readonly deferredCommit?: DeferredUpsertCommit;
+};
+/**
+ * Internal lifecycle for source writes prepared ahead of a batched Prolog
+ * commit. Finalization crosses the compiled commit boundary and permanently
+ * disables source rollback for that mutation.
+ */
+export type DeferredUpsertCommit = {
+    readonly entity: Readonly<Record<string, unknown>>;
+    readonly relationships: readonly RelationshipInput[];
+    readonly skipContradictionCheck: boolean;
+    readonly state: "prepared" | "rolling_back" | "rolled_back" | "committed";
+    readonly finalize: () => void;
+    readonly rollback: () => Promise<readonly SagaRollbackFailure[]>;
 };
 export type ValidateUpsertPayload = {
     readonly valid: boolean;
@@ -74,6 +89,8 @@ export type DeletePayload = {
     readonly error_codes?: readonly Readonly<Record<string, unknown>>[];
     readonly relationship_results?: readonly Record<string, unknown>[];
     readonly sync_required?: boolean;
+    /** Declared effects this call did not perform, such as a plan-only result. */
+    readonly skippedEffects?: readonly string[];
     readonly sourceWrites?: readonly {
         readonly path: string;
         readonly mode?: "write" | "delete";

package/dist/operations/mutation/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/operations/mutation/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/operations/mutation/types.ts"],"names":[],"mappings":"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"}

package/dist/operations/mutation/upsert.d.ts

@@ -18,6 +18,12 @@ export type UpsertExecutionOptions = Readonly<{
      * entries. Everything else keeps the append-only invariant fail-closed.
      */
     readonly allowReceiptsPrune?: boolean;
+    /**
+     * Prepare source and validation, then return the commit payload without
+     * talking to Prolog. Proof ingest batches those payloads into one
+     * transaction.
+     */
+    readonly deferCompiledCommit?: boolean;
 }>;
 export declare function executeUpsert(input: UpsertInput, context: OperationContext, options?: UpsertExecutionOptions): Promise<OperationResult<UpsertPayload>>;
 //# sourceMappingURL=upsert.d.ts.map

package/dist/operations/mutation/upsert.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"upsert.d.ts","sourceRoot":"","sources":["../../../src/operations/mutation/upsert.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AACjF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAkCxE,OAAO,KAAK,EAAE,iBAAiB,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAuGhF,wBAAsB,+BAA+B,CACnD,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,EACzC,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,IAAI,CAAC,CAaf;AAED,wBAAsB,sBAAsB,CAC1C,KAAK,EAAE,WAAW,EAClB,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,EACzC,aAAa,EAAE,SAAS,iBAAiB,EAAE,EAC3C,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,SAAS,iBAAiB,EAAE,CAAC,CAuBvC;AAmCD,MAAM,MAAM,sBAAsB,GAAG,QAAQ,CAAC;IAC5C;;;;;;OAMG;IAEH,QAAQ,CAAC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IACzC;;;;OAIG;IACH,QAAQ,CAAC,kBAAkB,CAAC,EAAE,OAAO,CAAC;CACvC,CAAC,CAAC;AAEH,wBAAsB,aAAa,CACjC,KAAK,EAAE,WAAW,EAClB,OAAO,EAAE,gBAAgB,EACzB,OAAO,GAAE,sBAA2B,GACnC,OAAO,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC,CAsczC"}
+{"version":3,"file":"upsert.d.ts","sourceRoot":"","sources":["../../../src/operations/mutation/upsert.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AACjF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAqCxE,OAAO,KAAK,EAAE,iBAAiB,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAoGhF,wBAAsB,+BAA+B,CACnD,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,EACzC,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,IAAI,CAAC,CAaf;AAED,wBAAsB,sBAAsB,CAC1C,KAAK,EAAE,WAAW,EAClB,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,EACzC,aAAa,EAAE,SAAS,iBAAiB,EAAE,EAC3C,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,SAAS,iBAAiB,EAAE,CAAC,CAuBvC;AAmCD,MAAM,MAAM,sBAAsB,GAAG,QAAQ,CAAC;IAC5C;;;;;;OAMG;IAEH,QAAQ,CAAC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IACzC;;;;OAIG;IACH,QAAQ,CAAC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IACtC;;;;OAIG;IACH,QAAQ,CAAC,mBAAmB,CAAC,EAAE,OAAO,CAAC;CACxC,CAAC,CAAC;AAEH,wBAAsB,aAAa,CACjC,KAAK,EAAE,WAAW,EAClB,OAAO,EAAE,gBAAgB,EACzB,OAAO,GAAE,sBAA2B,GACnC,OAAO,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC,CAshBzC"}

package/dist/operations/mutation/upsert.js

@@ -1,5 +1,5 @@
 import { createHash } from "node:crypto";
-import { existsSync, readFileSync, realpathSync, unlinkSync, writeFileSync, } from "node:fs";
+import { existsSync, readFileSync, unlinkSync, writeFileSync } from "node:fs";
 import path from "node:path";
 import { OperationError } from "../../cli-errors.js";
 import { readManifestWithCoordinateOverlay } from "../../extractors/manifest.js";
@@ -9,11 +9,14 @@ import { loadEntities } from "../../public/operations/discovery-entities.js";
 import { appendOnlyProofReceiptHistoryErrors } from "../../public/proof-receipt.js";
 import { appendRelationship, computeShardPath, } from "../../relationships/shards.js";
 import { resolveBranchAttachment } from "../../utils/branch-resolver.js";
+import { canonicalFilesystemPath } from "../../utils/canonical-path.js";
+import { entityIdStyleWarnings } from "../../utils/entity-id-style.js";
 import { analyzeSemanticAdvisorInput } from "../semantic-advisor/analyze-prose.js";
 import { assertLogicalGroundingClaimKeys, assertSemanticInventoryBoundary, } from "../semantic-advisor/ingestion-boundary.js";
 import { buildUpsertCommitGoal, formatUpsertError } from "./contradictions.js";
+import { assertPredicateArgumentVocabulary } from "./predicate-vocabulary-guard.js";
 import { existingRelationships, validateLiveRelationshipTargets, validateRelationshipSources, validateStrictLanePairing, validateSupersedesSourceHistory, } from "./relationships.js";
-import { MutationSaga } from "./saga.js";
+import { MutationRollbackFailureError, MutationSaga } from "./saga.js";
 import { writePendingSourceReceipt, writeSourceForUpsert, } from "./source-authoring.js";
 import { acquireSymbolCompilerLock, releaseSymbolCompilerLock, } from "./symbol-compiler-lock.js";
 import { validateSymbolGranularity } from "./symbol-granularity.js";
@@ -55,12 +58,9 @@ function assertRelationshipShardContained(workspaceRoot, shardPath) {
     if (!absolute.startsWith(`${relationshipRoot}${path.sep}`)) {
         throw new OperationError("SOURCE_PATH_INVALID", `Relationship shard escapes the canonical workspace lane: ${shardPath}`);
     }
-    let existing = absolute;
-    while (!existsSync(existing) && path.dirname(existing) !== existing) {
-        existing = path.dirname(existing);
-    }
-    const real = realpathSync.native(existing);
-    if (real !== root && !real.startsWith(`${root}${path.sep}`)) {
+    const realRoot = canonicalFilesystemPath(root);
+    const real = canonicalFilesystemPath(absolute);
+    if (real !== realRoot && !real.startsWith(`${realRoot}${path.sep}`)) {
         throw new OperationError("SOURCE_PATH_INVALID", `Relationship shard follows a symlink outside the workspace: ${shardPath}`);
     }
 }
@@ -220,6 +220,7 @@ export async function executeUpsert(input, context, options = {}) {
         semanticAdvisor = semantic.receipt;
         assertSemanticInventoryBoundary({ ...input, relationships }, relationships, semantic.receipt);
         await assertLogicalGroundingClaimKeys(prolog, { ...input, relationships }, relationships);
+        await assertPredicateArgumentVocabulary(prolog, validated.entity);
         if (context.fs !== undefined && context.sourceFirst !== false) {
             const existingRows = await loadEntities(prolog, {
                 id: input.id,
@@ -329,6 +330,57 @@ export async function executeUpsert(input, context, options = {}) {
                 source: sourceWrite.receipt.path,
             };
         }
+        if (options.deferCompiledCommit === true) {
+            let deferredState = "prepared";
+            let rollbackPromise;
+            const deferredCommit = {
+                entity: commitEntity ?? validated.entity,
+                relationships: validated.relationships,
+                skipContradictionCheck: input._skipContradictionCheck === true,
+                get state() {
+                    return deferredState;
+                },
+                finalize: () => {
+                    if (deferredState !== "prepared") {
+                        throw new Error(`Cannot finalize deferred upsert ${input.id} from state ${deferredState}`);
+                    }
+                    saga.markCommitted();
+                    deferredState = "committed";
+                },
+                rollback: () => {
+                    if (deferredState === "committed") {
+                        return Promise.reject(new Error(`Cannot roll back deferred upsert ${input.id} after its compiled commit`));
+                    }
+                    if (deferredState === "rolled_back")
+                        return Promise.resolve([]);
+                    if (rollbackPromise !== undefined)
+                        return rollbackPromise;
+                    deferredState = "rolling_back";
+                    rollbackPromise = saga.rollback().then((failures) => {
+                        deferredState = "rolled_back";
+                        return failures;
+                    });
+                    return rollbackPromise;
+                },
+            };
+            return {
+                content: [
+                    {
+                        type: "text",
+                        text: `Prepared ${input.id} for a batched proof commit.`,
+                    },
+                ],
+                structuredContent: {
+                    created: 0,
+                    updated: 0,
+                    relationships_created: validated.relationships.length,
+                    warnings: semantic.warnings,
+                    semanticAdvisor: semantic.receipt,
+                    deferredCommit,
+                    ...(sourceWrite ? { sourceWrites: [sourceWrite.receipt] } : {}),
+                },
+            };
+        }
         const transaction = buildUpsertCommitGoal({
             entity: commitEntity ?? validated.entity,
             relationships: validated.relationships,
@@ -349,6 +401,15 @@ export async function executeUpsert(input, context, options = {}) {
         }
         const coverage = await scenarioCoverageWarnings(prolog, validated.relationships, input.type, input.id);
         const created = changeKind === "created" ? 1 : 0;
+        const idStyleWarnings = created === 1
+            ? entityIdStyleWarnings({
+                id: input.id,
+                sourcePath: sourceWrite?.receipt.path ??
+                    (typeof validated.entity.source === "string"
+                        ? validated.entity.source
+                        : undefined),
+            })
+            : [];
         const shardWarnings = [];
         const relationshipSourceWrites = [];
         for (const [shardPath, before] of relationshipShardBefore) {
@@ -382,7 +443,12 @@ export async function executeUpsert(input, context, options = {}) {
             created,
             updated: changeKind === "updated" ? 1 : 0,
             relationships_created: validated.relationships.length,
-            warnings: [...semantic.warnings, ...coverage, ...shardWarnings],
+            warnings: [
+                ...semantic.warnings,
+                ...coverage,
+                ...idStyleWarnings,
+                ...shardWarnings,
+            ],
             semanticAdvisor: semantic.receipt,
             ...(shardWarnings.length > 0
                 ? {
@@ -480,7 +546,7 @@ export async function executeUpsert(input, context, options = {}) {
         }
         const coordinateFailure = rollbackFailures.find((failure) => failure.step === "symbol-coordinates");
         if (coordinateFailure !== undefined) {
-            const failure = new AggregateError([error, coordinateFailure.error], `Upsert failed and coordinate artifact rollback failed for ${input.id}`);
+            const failure = new MutationRollbackFailureError([error, coordinateFailure.error], `Upsert failed and coordinate artifact rollback failed for ${input.id}`, rollbackFailures);
             operationFailure = { error: failure };
             throw failure;
         }
@@ -489,7 +555,7 @@ export async function executeUpsert(input, context, options = {}) {
             const rollbackMessage = sourceFailure.error instanceof Error
                 ? sourceFailure.error.message
                 : String(sourceFailure.error);
-            const failure = new AggregateError([error, sourceFailure.error], `Upsert failed and authored source rollback failed for ${input.id}: ${rollbackMessage}`);
+            const failure = new MutationRollbackFailureError([error, sourceFailure.error], `Upsert failed and authored source rollback failed for ${input.id}: ${rollbackMessage}`, rollbackFailures);
             operationFailure = { error: failure };
             throw failure;
         }

package/dist/operations/mutation/validate-upsert.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validate-upsert.d.ts","sourceRoot":"","sources":["../../../src/operations/mutation/validate-upsert.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AACjF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAYxE,OAAO,KAAK,EAAE,WAAW,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAOrE,wBAAsB,qBAAqB,CACzC,KAAK,EAAE,WAAW,EAClB,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,eAAe,CAAC,qBAAqB,CAAC,CAAC,CAoFjD"}
+{"version":3,"file":"validate-upsert.d.ts","sourceRoot":"","sources":["../../../src/operations/mutation/validate-upsert.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,gBAAgB,EAEjB,MAAM,0CAA0C,CAAC;AAClD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAcxE,OAAO,KAAK,EAAE,WAAW,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAerE,wBAAsB,qBAAqB,CACzC,KAAK,EAAE,WAAW,EAClB,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,eAAe,CAAC,qBAAqB,CAAC,CAAC,CAoGjD"}