@plurnk/plurnk-service 1.3.12 → 1.4.0

package/dist/Paths.d.ts

@@ -1,10 +1,13 @@
+import { type TeachingCorpusSource } from "@plurnk/plurnk-meta";
 export default class Paths {
     #private;
+    static readonly teachingRoot: string;
     static migrations: string;
     static instructionsSystem: string;
     static personality: string;
-    static schemeDocs: string;
     static defaultRequirements: string;
+    static defaultRequirementsTeachingSource: TeachingCorpusSource | null;
+    static teachingSource(source: TeachingCorpusSource): string;
     static docs(): Array<{
         entryName: string;
         path: string;

package/dist/Paths.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Paths.d.ts","sourceRoot":"","sources":["../src/Paths.ts"],"names":[],"mappings":"AAcA,MAAM,CAAC,OAAO,OAAO,KAAK;;IAQtB,MAAM,CAAC,UAAU,SAA8C;IAC/D,MAAM,CAAC,kBAAkB,SAA6C;IAEtE,MAAM,CAAC,WAAW,SAAsD;IACxE,MAAM,CAAC,UAAU,SAAqC;IAMtD,MAAM,CAAC,mBAAmB,SAAuC;IAkBjE,MAAM,CAAC,IAAI,IAAI,KAAK,CAAC;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAUxD;CACJ"}
+{"version":3,"file":"Paths.d.ts","sourceRoot":"","sources":["../src/Paths.ts"],"names":[],"mappings":"AAYA,OAAO,EAAmB,KAAK,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAEjF,MAAM,CAAC,OAAO,OAAO,KAAK;;IAKtB,MAAM,CAAC,QAAQ,CAAC,YAAY,SAAmF;IAE/G,MAAM,CAAC,UAAU,SAA8C;IAC/D,MAAM,CAAC,kBAAkB,SAA+C;IAExE,MAAM,CAAC,WAAW,SAAqD;IAGvE,MAAM,CAAC,mBAAmB,SAAoC;IAC9D,MAAM,CAAC,iCAAiC,8BAAsC;IAE9E,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,oBAAoB,GAAG,MAAM,CAE1D;IAqBD,MAAM,CAAC,IAAI,IAAI,KAAK,CAAC;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAUxD;CACJ"}

package/dist/Paths.js

@@ -1,45 +1,47 @@
 // Package-relative paths to non-code artifacts.
 //
 // `migrations` ships in this package's tarball.
-// `instructionsSystem` resolves to `plurnk.md` IN THE GRAMMAR PACKAGE — single
-// source of truth lives upstream. Plurnk-service doesn't carry its own copy;
-// the grammar agent owns the prose.
+// `instructionsSystem` resolves to the canonical model reference in the
+// contracts package. Plurnk-service does not carry a second copy.
 //
 // Lives at src/ (one level above the package root, like the index barrel that
 // re-exports it) so `..` resolves to PACKAGE_ROOT.
 import { fileURLToPath } from "node:url";
 import { dirname, resolve } from "node:path";
 import { homedir } from "node:os";
+import { TEACHING_CORPUS } from "@plurnk/plurnk-meta";
 export default class Paths {
     static #PACKAGE_ROOT = resolve(dirname(fileURLToPath(import.meta.url)), "..");
-    static #GRAMMAR_ROOT = dirname(fileURLToPath(import.meta.resolve("@plurnk/plurnk-grammar/package.json")));
-    // The teaching corpus (scheme docs, personality, requirements) lives in @plurnk/plurnk-meta —
-    // the metaproject layer OWNS the family prose (owner ruling, monorepo cut); the daemon
-    // consumes it via the same single-source pull shape as GRAMMAR_ROOT.
-    static #DOCS_ROOT = dirname(fileURLToPath(import.meta.resolve("@plurnk/plurnk-meta/package.json")));
+    static #CONTRACTS_ROOT = dirname(fileURLToPath(import.meta.resolve("@plurnk/plurnk-contracts/package.json")));
+    // {§teaching-corpus} — core consumes the teaching sources owned by
+    // @plurnk/plurnk-meta; admission and projection remain core-owned.
+    static teachingRoot = dirname(fileURLToPath(import.meta.resolve("@plurnk/plurnk-meta/package.json")));
     static migrations = resolve(Paths.#PACKAGE_ROOT, "migrations");
-    static instructionsSystem = resolve(Paths.#GRAMMAR_ROOT, "plurnk.md");
-    // The default operating policy (seeded to ~/.plurnk/AGENTS.md) + the per-scheme teaching docs.
-    static personality = resolve(Paths.#DOCS_ROOT, "PLURNK_PERSONALITY.md");
-    static schemeDocs = resolve(Paths.#DOCS_ROOT, "docs");
-    // (GBNF artifact resolution moved to Engine.#grammarConstraint — the env value
-    // SELECTS the variant from @plurnk/plurnk-grammar; no hardcoded default here, #225.)
-    // packet.user.system_requirements DEFAULT. Static contract appended at
-    // the end of the user packet — names rules the model has to honor that
-    // the grammar block doesn't cover (e.g. "loop concludes with SEND[200]").
-    static defaultRequirements = Paths.#resolveDefaultRequirements();
+    static instructionsSystem = resolve(Paths.#CONTRACTS_ROOT, "plurnk.md");
+    // The first-run policy seed and built-in/conditional pull-doc sources.
+    static personality = Paths.teachingSource(TEACHING_CORPUS.personality);
+    // {§requirements} — static recap appended at the end of the user slot.
+    static #DEFAULT_REQUIREMENTS = Paths.#resolveDefaultRequirements();
+    static defaultRequirements = Paths.#DEFAULT_REQUIREMENTS.path;
+    static defaultRequirementsTeachingSource = Paths.#DEFAULT_REQUIREMENTS.source;
+    static teachingSource(source) {
+        return resolve(Paths.teachingRoot, source);
+    }
     // Resolve the default requirements file: `PLURNK_SERVICE_REQUIREMENTS` env (absolute
     // or relative-to-package-root) overrides the docs package's `requirements.md`.
     static #resolveDefaultRequirements() {
         const env = process.env.PLURNK_SERVICE_REQUIREMENTS;
         if (typeof env === "string" && env.length > 0) {
-            return resolve(Paths.#PACKAGE_ROOT, env);
+            return { path: resolve(Paths.#PACKAGE_ROOT, env), source: null };
         }
-        return resolve(Paths.#DOCS_ROOT, "requirements.md");
+        return {
+            path: Paths.teachingSource(TEACHING_CORPUS.requirements),
+            source: TEACHING_CORPUS.requirements,
+        };
     }
     // Operator reference docs auto-READ into every model worker at turn 0.
     // `PLURNK_SERVICE_MD_<ALIAS>=<path>` materializes <path>'s markdown as a
-    // `plurnk:///<ALIAS>.md` entry the model READs — an idiomatic, userland way
+    // `worker://plurnk/<ALIAS>.md` entry the model READs — an idiomatic way
     // to inject standing context (an ordinary entry + READ op, not a bespoke
     // packet section). `~` expands to home; relative paths resolve
     // against the package root. Resolved fresh each call so it tracks the env.

package/dist/Paths.js.map

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

package/dist/build-info.json

@@ -1 +1 @@
-{"package":"@plurnk/plurnk-service","version":"1.3.12","revision":"0238000d6fc9b5ec5dd4987df0e0dd9941858e6a","dirty":false}
+{"package":"@plurnk/plurnk-service","version":"1.4.0","revision":"36be3503f6eed553ace1f7990d1e42625c31b989","dirty":false}

package/dist/content/edit-receipt.d.ts

@@ -1,35 +1,20 @@
-import type { LineMarker } from "@plurnk/plurnk-grammar";
+import type { LineMarker } from "@plurnk/plurnk-contracts";
+import type { AppliedEditBatchReceipt, EditBatchReceipt, EditReceipt, ReviewerReplacementEditBatchReceipt } from "@plurnk/plurnk-schemes";
 export interface ReceiptEdit {
     readonly marker: LineMarker;
     readonly body: string;
 }
-interface ReceiptOptions {
-    readonly unit?: "lines" | "items";
+export type { AppliedEditBatchReceipt, EditBatchReceipt, EditEffectReceipt, EditReceipt, EditReceiptUnit, ReviewerReplacementEditBatchReceipt, } from "@plurnk/plurnk-schemes";
+export type ResourceEffectAction = "create" | "update" | "delete";
+export interface ResourceEffect {
+    readonly target: string;
+    readonly action: ResourceEffectAction;
+    readonly receipt?: EditReceipt;
 }
-export interface EditEffectReceipt {
-    readonly requested: string;
-    readonly source: string;
-    readonly result: string;
-    readonly removed: number;
-    readonly inserted: number;
-    readonly context: string;
-}
-export interface EditBatchReceipt {
-    readonly revision: string;
-    readonly unit: "lines" | "items";
-    readonly before: number;
-    readonly after: number;
-    readonly effects: readonly EditEffectReceipt[];
-}
-export interface EditReceipt {
-    readonly revision: string;
-    readonly unit: "lines" | "items";
-    readonly before: number;
-    readonly after: number;
-    readonly effect: EditEffectReceipt;
-}
-export declare const editReceiptUnit: (structuralJson: boolean, original: string, updated: string) => "lines" | "items";
+export declare const assertEditReceipt: (value: unknown) => EditReceipt;
+export declare const assertEditBatchReceipt: (value: unknown) => EditBatchReceipt;
+export declare const assertResourceEffects: (value: unknown) => readonly ResourceEffect[];
 export declare const projectEditReceipt: (receipt: EditBatchReceipt, index: number) => EditReceipt;
-export declare const editReceipt: (original: string, updated: string, edits: readonly ReceiptEdit[], options?: ReceiptOptions) => EditBatchReceipt;
-export {};
+export declare const editReceipt: (original: string, updated: string, edits: readonly ReceiptEdit[]) => AppliedEditBatchReceipt;
+export declare const reviewerReplacementReceipt: (original: string, updated: string, authored: EditBatchReceipt) => ReviewerReplacementEditBatchReceipt;
 //# sourceMappingURL=edit-receipt.d.ts.map

package/dist/content/edit-receipt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"edit-receipt.d.ts","sourceRoot":"","sources":["../../src/content/edit-receipt.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEzD,MAAM,WAAW,WAAW;IACxB,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;IAC5B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACzB;AAED,UAAU,cAAc;IACpB,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC;CACrC;AAED,MAAM,WAAW,iBAAiB;IAC9B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,gBAAgB;IAC7B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC;IACjC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,OAAO,EAAE,SAAS,iBAAiB,EAAE,CAAC;CAClD;AAED,MAAM,WAAW,WAAW;IACxB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC;IACjC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,MAAM,EAAE,iBAAiB,CAAC;CACtC;AAED,eAAO,MAAM,eAAe,mBACR,OAAO,YACb,MAAM,WACP,MAAM,KAChB,OAAO,GAAG,OASZ,CAAC;AAEF,eAAO,MAAM,kBAAkB,YAAa,gBAAgB,SAAS,MAAM,KAAG,WAU7E,CAAC;AA4BF,eAAO,MAAM,WAAW,aACV,MAAM,WACP,MAAM,SACR,SAAS,WAAW,EAAE,YACpB,cAAc,KACxB,gBAqGF,CAAC"}
+{"version":3,"file":"edit-receipt.d.ts","sourceRoot":"","sources":["../../src/content/edit-receipt.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,KAAK,EACR,uBAAuB,EACvB,gBAAgB,EAEhB,WAAW,EAEX,mCAAmC,EACtC,MAAM,wBAAwB,CAAC;AAGhC,MAAM,WAAW,WAAW;IACxB,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;IAC5B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACzB;AAED,YAAY,EACR,uBAAuB,EACvB,gBAAgB,EAChB,iBAAiB,EACjB,WAAW,EACX,eAAe,EACf,mCAAmC,GACtC,MAAM,wBAAwB,CAAC;AAEhC,MAAM,MAAM,oBAAoB,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAElE,MAAM,WAAW,cAAc;IAC3B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,EAAE,oBAAoB,CAAC;IACtC,QAAQ,CAAC,OAAO,CAAC,EAAE,WAAW,CAAC;CAClC;AA2ED,eAAO,MAAM,iBAAiB,UAAW,OAAO,KAAG,WAuBlD,CAAC;AAEF,eAAO,MAAM,sBAAsB,UAAW,OAAO,KAAG,gBA4BvD,CAAC;AAEF,eAAO,MAAM,qBAAqB,UAAW,OAAO,KAAG,SAAS,cAAc,EAqC7E,CAAC;AAEF,eAAO,MAAM,kBAAkB,YAAa,gBAAgB,SAAS,MAAM,KAAG,WAwB7E,CAAC;AAiMF,eAAO,MAAM,WAAW,aACV,MAAM,WACP,MAAM,SACR,SAAS,WAAW,EAAE,KAC9B,uBAkBF,CAAC;AAEF,eAAO,MAAM,0BAA0B,aACzB,MAAM,WACP,MAAM,YACL,gBAAgB,KAC3B,mCAyBF,CAAC"}

package/dist/content/edit-receipt.js

@@ -1,40 +1,158 @@
 import { createHash } from "node:crypto";
-export const editReceiptUnit = (structuralJson, original, updated) => {
-    if (!structuralJson)
-        return "lines";
-    try {
-        if (original.length > 0)
-            JSON.parse(original);
-        if (updated.length > 0)
-            JSON.parse(updated);
-        return "items";
+import { InvalidOperationResultError } from "@plurnk/plurnk-contracts";
+import LineMarkerOps from "./line-marker.js";
+const receiptRecord = (value, label) => {
+    if (value === null || typeof value !== "object" || Array.isArray(value)) {
+        throw new InvalidOperationResultError(`${label} must be an object.`);
     }
-    catch {
-        return "lines";
+    return value;
+};
+const exactFields = (record, fields, label) => {
+    const allowed = new Set(fields);
+    const unexpected = Object.keys(record).find((field) => !allowed.has(field));
+    if (unexpected !== undefined) {
+        throw new InvalidOperationResultError(`${label} contains unexpected field ${JSON.stringify(unexpected)}.`);
+    }
+    const missing = fields.find((field) => !Object.hasOwn(record, field));
+    if (missing !== undefined) {
+        throw new InvalidOperationResultError(`${label} is missing field ${JSON.stringify(missing)}.`);
+    }
+};
+const assertExtent = (value, field) => {
+    if (!Number.isSafeInteger(value) || value < 0) {
+        throw new InvalidOperationResultError(`EDIT receipt ${field} must be a non-negative safe integer.`);
+    }
+};
+const assertEffectReceipt = (value) => {
+    const effect = receiptRecord(value, "EDIT effect receipt");
+    exactFields(effect, ["requested", "source", "result", "removed", "inserted", "context"], "EDIT effect receipt");
+    for (const field of ["requested", "source", "result", "context"]) {
+        if (typeof effect[field] !== "string") {
+            throw new InvalidOperationResultError(`EDIT effect receipt ${field} must be a string.`);
+        }
     }
+    assertExtent(effect.removed, "removed");
+    assertExtent(effect.inserted, "inserted");
+    return value;
+};
+const assertReceiptHead = (receipt, label) => {
+    if (typeof receipt.revision !== "string" || !/^[a-f0-9]{64}$/.test(receipt.revision)) {
+        throw new InvalidOperationResultError(`${label} revision must be a lowercase SHA-256 digest.`);
+    }
+    if (receipt.unit !== "lines" && receipt.unit !== "codePoints") {
+        throw new InvalidOperationResultError(`${label} unit must be 'lines' or 'codePoints'.`);
+    }
+    assertExtent(receipt.before, "before");
+    assertExtent(receipt.after, "after");
+};
+export const assertEditReceipt = (value) => {
+    const receipt = receiptRecord(value, "EDIT receipt");
+    if (receipt.disposition === "superseded") {
+        exactFields(receipt, Object.hasOwn(receipt, "replacement")
+            ? ["revision", "unit", "before", "after", "disposition", "requested", "replacement"]
+            : ["revision", "unit", "before", "after", "disposition", "requested"], "EDIT receipt");
+        assertReceiptHead(receipt, "EDIT receipt");
+        if (typeof receipt.requested !== "string" || receipt.requested.length === 0) {
+            throw new InvalidOperationResultError("A superseded EDIT receipt requested marker must be a non-empty string.");
+        }
+        if (Object.hasOwn(receipt, "replacement"))
+            assertEffectReceipt(receipt.replacement);
+        return value;
+    }
+    exactFields(receipt, ["revision", "unit", "before", "after", "effect"], "EDIT receipt");
+    assertReceiptHead(receipt, "EDIT receipt");
+    assertEffectReceipt(receipt.effect);
+    return value;
+};
+export const assertEditBatchReceipt = (value) => {
+    const receipt = receiptRecord(value, "EDIT batch receipt");
+    if (receipt.disposition === "reviewer-replaced") {
+        exactFields(receipt, ["revision", "unit", "before", "after", "disposition", "superseded", "replacement"], "EDIT batch receipt");
+        assertReceiptHead(receipt, "EDIT batch receipt");
+        if (!Array.isArray(receipt.superseded)
+            || receipt.superseded.length === 0
+            || receipt.superseded.some((requested) => typeof requested !== "string" || requested.length === 0)) {
+            throw new InvalidOperationResultError("A reviewer-replaced EDIT batch receipt superseded list must contain non-empty requested markers.");
+        }
+        assertEffectReceipt(receipt.replacement);
+        return value;
+    }
+    exactFields(receipt, ["revision", "unit", "before", "after", "effects"], "EDIT batch receipt");
+    assertReceiptHead(receipt, "EDIT batch receipt");
+    if (!Array.isArray(receipt.effects) || receipt.effects.length === 0) {
+        throw new InvalidOperationResultError("EDIT batch receipt effects must be a non-empty array.");
+    }
+    for (const effect of receipt.effects)
+        assertEffectReceipt(effect);
+    return value;
+};
+export const assertResourceEffects = (value) => {
+    if (!Array.isArray(value) || value.length === 0) {
+        throw new InvalidOperationResultError("Resource effects must be a non-empty array.");
+    }
+    for (const candidate of value) {
+        const effect = receiptRecord(candidate, "Resource effect");
+        const fields = Object.hasOwn(effect, "receipt")
+            ? ["target", "action", "receipt"]
+            : ["target", "action"];
+        exactFields(effect, fields, "Resource effect");
+        if (typeof effect.target !== "string" || effect.target.length === 0) {
+            throw new InvalidOperationResultError("Resource effect target must be a non-empty string.");
+        }
+        if (effect.action !== "create"
+            && effect.action !== "update"
+            && effect.action !== "delete") {
+            throw new InvalidOperationResultError("Resource effect action must be 'create', 'update', or 'delete'.");
+        }
+        if (Object.hasOwn(effect, "receipt")) {
+            if (effect.action === "delete") {
+                throw new InvalidOperationResultError("Only a created or updated resource effect may carry a text receipt.");
+            }
+            const receipt = assertEditReceipt(effect.receipt);
+            if (effect.action === "create" && receipt.before !== 0) {
+                throw new InvalidOperationResultError("A created resource effect receipt must have a before extent of zero.");
+            }
+        }
+    }
+    return value;
 };
 export const projectEditReceipt = (receipt, index) => {
-    const effect = receipt.effects[index];
+    const exact = assertEditBatchReceipt(receipt);
+    if ("disposition" in exact) {
+        const requested = exact.superseded[index];
+        if (requested === undefined)
+            throw new Error(`EDIT receipt has no superseded request at index ${index}`);
+        return {
+            revision: exact.revision,
+            unit: exact.unit,
+            before: exact.before,
+            after: exact.after,
+            disposition: "superseded",
+            requested,
+            ...(index === 0 ? { replacement: exact.replacement } : {}),
+        };
+    }
+    const effect = exact.effects[index];
     if (effect === undefined)
         throw new Error(`EDIT receipt has no effect at index ${index}`);
     return {
-        revision: receipt.revision,
-        unit: receipt.unit,
-        before: receipt.before,
-        after: receipt.after,
+        revision: exact.revision,
+        unit: exact.unit,
+        before: exact.before,
+        after: exact.after,
         effect,
     };
 };
 const splitLines = (content) => {
     if (content.length === 0)
         return [];
-    const lines = content.split("\n");
-    if (content.endsWith("\n"))
+    const lines = content.split(/\r\n|\r|\n/);
+    if (/[\r\n]$/.test(content))
         lines.pop();
     return lines;
 };
 const markerText = ({ marks }) => `<${marks.join(",")}>`;
-const sourceRange = (marker, total) => {
+const sourceLineRange = (marker, total) => {
     const first = marker.marks[0];
     const last = marker.marks[1];
     if (last !== undefined) {
@@ -46,113 +164,176 @@ const sourceRange = (marker, total) => {
         return { start: 1, end: 0, removed: 0 };
     if (first === -1)
         return { start: total + 1, end: total, removed: 0 };
-    if (!Number.isInteger(first)) {
-        const start = Math.floor(first) + 1;
-        return { start, end: start - 1, removed: 0 };
-    }
+    if (!Number.isInteger(first))
+        throw new Error("Whole-line EDIT receipts require integer coordinates.");
     return { start: first, end: first, removed: 1 };
 };
-export const editReceipt = (original, updated, edits, options = {}) => {
-    const { unit = "lines" } = options;
+const lineEffects = (original, edits) => {
     const before = splitLines(original);
-    const after = splitLines(updated);
-    let sourceShape = "scalar";
-    const itemCount = (content) => {
-        if (content.length === 0)
-            return 0;
-        const parsed = JSON.parse(content);
-        if (Array.isArray(parsed))
-            return parsed.length;
-        if (parsed !== null && typeof parsed === "object")
-            return Object.keys(parsed).length;
-        return 1;
-    };
-    if (unit === "items" && (original.length > 0 || updated.length > 0)) {
-        const parsed = JSON.parse(original.length > 0 ? original : updated);
-        sourceShape = Array.isArray(parsed) ? "array" : parsed !== null && typeof parsed === "object" ? "object" : "scalar";
-    }
-    const countBody = (body) => {
-        if (unit === "lines")
-            return splitLines(body).length;
-        if (body.length === 0)
-            return 0;
-        const parsed = JSON.parse(body);
-        if (sourceShape === "array")
-            return Array.isArray(parsed) ? parsed.length : 1;
-        if (sourceShape === "object") {
-            const values = Array.isArray(parsed) ? parsed : [parsed];
-            return values.reduce((count, value) => count + (value !== null && typeof value === "object" && !Array.isArray(value) ? Object.keys(value).length : 0), 0);
-        }
-        return Array.isArray(parsed) ? parsed.length : 1;
-    };
-    const beforeExtent = unit === "lines" ? before.length : itemCount(original);
-    const afterExtent = unit === "lines" ? after.length : itemCount(updated);
     let offset = 0;
-    const effectsByIndex = new Array(edits.length);
+    const effects = new Array(edits.length);
     edits
-        .map((edit, index) => ({ edit, index, source: sourceRange(edit.marker, beforeExtent) }))
-        .sort((a, b) => a.source.start - b.source.start)
+        .map((edit, index) => ({
+        edit,
+        index,
+        source: sourceLineRange(edit.marker, before.length),
+    }))
+        .sort((left, right) => left.source.start - right.source.start)
         .forEach(({ edit, index, source }) => {
-        const inserted = countBody(edit.body);
+        const inserted = splitLines(edit.body).length;
         const resultStart = source.start + offset;
-        const resultEnd = inserted === 0 ? resultStart - 1 : resultStart + inserted - 1;
+        const resultEnd = inserted === 0
+            ? resultStart - 1
+            : resultStart + inserted - 1;
         offset += inserted - source.removed;
-        effectsByIndex[index] = {
-            marker: markerText(edit.marker),
-            source,
+        effects[index] = {
+            requested: markerText(edit.marker),
+            source: source.removed === 0
+                ? `${source.start}^`
+                : source.start === source.end
+                    ? `${source.start}`
+                    : `${source.start}-${source.end}`,
+            result: resultEnd < resultStart
+                ? `${resultStart}^`
+                : resultStart === resultEnd
+                    ? `${resultStart}`
+                    : `${resultStart}-${resultEnd}`,
+            removed: source.removed,
             inserted,
-            resultStart,
-            resultEnd,
+            context: "",
+            resultStartLine: resultStart,
+            resultEndLine: Math.max(resultStart, resultEnd),
         };
     });
-    const effects = effectsByIndex.map((effect, index) => {
+    return effects.map((effect, index) => {
         if (effect === undefined)
             throw new Error(`EDIT receipt calculation omitted effect ${index}`);
         return effect;
     });
-    const joinRadiusRaw = process.env.PLURNK_SERVICE_EDIT_RECEIPT_CONTEXT_LINES;
-    const joinRadius = Number(joinRadiusRaw);
-    if (!Number.isSafeInteger(joinRadius) || joinRadius < 0) {
-        throw new Error(`PLURNK_SERVICE_EDIT_RECEIPT_CONTEXT_LINES must be a non-negative safe integer, got ${JSON.stringify(joinRadiusRaw)}`);
-    }
-    const contextItems = unit === "lines"
-        ? after
-        : (() => {
-            if (updated.length === 0)
-                return [];
-            const parsed = JSON.parse(updated);
-            if (Array.isArray(parsed))
-                return parsed.map((item) => JSON.stringify(item));
-            if (parsed !== null && typeof parsed === "object")
-                return Object.entries(parsed).map(([key, value]) => JSON.stringify({ [key]: value }));
-            return [JSON.stringify(parsed)];
-        })();
-    const withContext = effects.map((effect) => {
-        const visible = new Set();
-        const join = Math.min(Math.max(effect.resultStart, 1), Math.max(contextItems.length, 1));
-        const end = Math.max(join, effect.resultEnd);
-        for (let line = Math.max(1, join - joinRadius); line <= Math.min(contextItems.length, end + joinRadius); line += 1) {
-            visible.add(line);
+};
+const codePointCount = (content) => [...content].length;
+const codePointOffset = (content, jsOffset) => codePointCount(content.slice(0, jsOffset));
+const jsOffsetFromCodePoints = (content, offset) => [...content].slice(0, offset).join("").length;
+const coordinateAt = (content, codePoints) => {
+    const prefix = content.slice(0, jsOffsetFromCodePoints(content, codePoints));
+    const lines = prefix.split(/\r\n|\r|\n/);
+    return {
+        line: lines.length,
+        column: codePointCount(lines.at(-1) ?? "") + 1,
+    };
+};
+const coordinateText = ({ line, column }) => `${line}:${column}`;
+const codePointEffects = (original, updated, edits) => {
+    const effects = new Array(edits.length);
+    let offset = 0;
+    edits
+        .map((edit, index) => {
+        const replacement = LineMarkerOps.textReplacement(original, edit.marker, edit.body);
+        if ("error" in replacement) {
+            throw new Error(`EDIT receipt could not resolve ${markerText(edit.marker)}: ${replacement.error}`);
         }
-        const contextRows = [...visible].sort((a, b) => a - b).map((line) => `${line}:${contextItems[line - 1]}`);
-        const sourceText = effect.source.removed === 0 ? `${effect.source.start}^` : effect.source.start === effect.source.end ? `${effect.source.start}` : `${effect.source.start}-${effect.source.end}`;
-        const resultText = effect.resultEnd < effect.resultStart ? `${effect.resultStart}^` : effect.resultStart === effect.resultEnd ? `${effect.resultStart}` : `${effect.resultStart}-${effect.resultEnd}`;
         return {
-            requested: effect.marker,
-            source: sourceText,
-            result: resultText,
-            removed: effect.source.removed,
+            edit,
+            index,
+            replacement,
+            sourceStart: codePointOffset(original, replacement.start),
+            sourceEnd: codePointOffset(original, replacement.end),
+            inserted: codePointCount(replacement.body),
+        };
+    })
+        .sort((left, right) => left.sourceStart - right.sourceStart)
+        .forEach((effect) => {
+        const removed = effect.sourceEnd - effect.sourceStart;
+        const resultStart = effect.sourceStart + offset;
+        const resultEnd = resultStart + effect.inserted;
+        offset += effect.inserted - removed;
+        const sourceStart = coordinateAt(original, effect.sourceStart);
+        const sourceEnd = coordinateAt(original, effect.sourceEnd);
+        const updatedStart = coordinateAt(updated, resultStart);
+        const updatedEnd = coordinateAt(updated, resultEnd);
+        effects[effect.index] = {
+            requested: markerText(effect.edit.marker),
+            source: removed === 0
+                ? `${coordinateText(sourceStart)}^`
+                : `${coordinateText(sourceStart)}-${coordinateText(sourceEnd)}`,
+            result: effect.inserted === 0
+                ? `${coordinateText(updatedStart)}^`
+                : `${coordinateText(updatedStart)}-${coordinateText(updatedEnd)}`,
+            removed,
             inserted: effect.inserted,
-            context: contextRows.join("\n"),
+            context: "",
+            resultStartLine: updatedStart.line,
+            resultEndLine: updatedEnd.line,
         };
     });
-    const revision = createHash("sha256").update(updated).digest("hex");
+    return effects.map((effect, index) => {
+        if (effect === undefined)
+            throw new Error(`EDIT receipt calculation omitted effect ${index}`);
+        return effect;
+    });
+};
+const contextRadius = () => {
+    const raw = process.env.PLURNK_SERVICE_EDIT_RECEIPT_CONTEXT_LINES;
+    const value = Number(raw);
+    if (!Number.isSafeInteger(value) || value < 0) {
+        throw new Error(`PLURNK_SERVICE_EDIT_RECEIPT_CONTEXT_LINES must be a non-negative safe integer, got ${JSON.stringify(raw)}`);
+    }
+    return value;
+};
+const addContext = (effects, updated) => {
+    const lines = splitLines(updated);
+    const radius = contextRadius();
+    return effects.map((effect) => {
+        const first = Math.max(1, effect.resultStartLine - radius);
+        const last = Math.min(lines.length, Math.max(effect.resultStartLine, effect.resultEndLine) + radius);
+        const context = [];
+        for (let line = first; line <= last; line += 1) {
+            context.push(`${line}:${lines[line - 1]}`);
+        }
+        const { resultStartLine: _resultStartLine, resultEndLine: _resultEndLine, ...receipt } = effect;
+        return {
+            ...receipt,
+            context: context.join("\n"),
+        };
+    });
+};
+export const editReceipt = (original, updated, edits) => {
+    const unit = edits.some(({ marker }) => marker.marks.length === 4)
+        ? "codePoints"
+        : "lines";
+    const effects = unit === "codePoints"
+        ? codePointEffects(original, updated, edits)
+        : lineEffects(original, edits);
     return {
-        revision,
+        revision: createHash("sha256").update(updated).digest("hex"),
         unit,
-        before: beforeExtent,
-        after: afterExtent,
-        effects: withContext,
+        before: unit === "codePoints"
+            ? codePointCount(original)
+            : splitLines(original).length,
+        after: unit === "codePoints"
+            ? codePointCount(updated)
+            : splitLines(updated).length,
+        effects: addContext(effects, updated),
+    };
+};
+export const reviewerReplacementReceipt = (original, updated, authored) => {
+    const exact = assertEditBatchReceipt(authored);
+    if ("disposition" in exact) {
+        throw new InvalidOperationResultError("A reviewer replacement cannot supersede an already replaced EDIT batch receipt.");
+    }
+    const landed = editReceipt(original, updated, [{ marker: { marks: [1, -1] }, body: updated }]);
+    const replacement = landed.effects[0];
+    if (replacement === undefined) {
+        throw new Error("Reviewer replacement receipt omitted its landed effect.");
+    }
+    return {
+        revision: landed.revision,
+        unit: landed.unit,
+        before: landed.before,
+        after: landed.after,
+        disposition: "reviewer-replaced",
+        superseded: exact.effects.map(({ requested }) => requested),
+        replacement,
     };
 };
 //# sourceMappingURL=edit-receipt.js.map