@hawkeyexl/manni 2.4.0 → 2.5.1

package/dist/{chunk-P4KR3XFD.js → chunk-NFCH7HCA.js}

@@ -71,7 +71,7 @@ import {
   withValueAt,
   writeEncryptionKey,
   writeFileAtomic
-} from "./chunk-LYLNOJ32.js";
+} from "./chunk-22WVCFP4.js";
 
 // src/meta/core/reencrypt.ts
 import { extname } from "node:path";
@@ -220,16 +220,24 @@ __export(cite_exports, {
   historyOf: () => historyOf,
   insertStatementBefore: () => insertStatementBefore,
   insideFence: () => insideFence,
+  isBoundLine: () => isBoundLine,
   isCiteRule: () => isCiteRule,
   isKeyedPin: () => isKeyedPin,
+  isUnitText: () => isUnitText,
   itemLine: () => itemLine,
   lineAt: () => lineAt,
   lineSpec: () => lineSpec,
   loadCitationSidecars: () => loadCitationSidecars,
   loadCiteConfig: () => loadCiteConfig,
+  markerClaimEnd: () => markerClaimEnd,
+  markerRunAt: () => markerRunAt,
   markerUnit: () => markerUnit,
   messageFor: () => messageFor,
   mintCitation: () => mintCitation,
+  misplacedMarkerAt: () => misplacedMarkerAt,
+  misplacedMarkers: () => misplacedMarkers,
+  misplacedMessageFor: () => misplacedMessageFor,
+  movedUnit: () => movedUnit,
   noGit: () => noGit,
   normalizeText: () => normalizeText,
   normalizeWhitespace: () => normalizeWhitespace,
@@ -243,6 +251,7 @@ __export(cite_exports, {
   parseStatements: () => parseStatements,
   pickExtractor: () => pickExtractor,
   pinOfLines: () => pinOfLines,
+  pre43Span: () => pre43Span,
   rangeLines: () => rangeLines,
   readCiteConfigFile: () => readCiteConfigFile,
   readPage: () => readPage,
@@ -281,6 +290,7 @@ __export(cite_exports, {
   splice: () => splice,
   spliceEntryField: () => spliceEntryField,
   splitLines: () => splitLines,
+  splitUnit: () => splitUnit,
   statementForms: () => statementForms,
   toBodyLines: () => toBodyLines,
   toFileLines: () => toFileLines,
@@ -288,6 +298,7 @@ __export(cite_exports, {
   twoManifestsRefusal: () => twoManifestsRefusal,
   unifiedDiff: () => unifiedDiff,
   unitAt: () => unitAt,
+  unitText: () => unitText,
   urlManifestRefusal: () => urlManifestRefusal,
   validateEntry: () => validateEntry,
   withClaimLines: () => withClaimLines
@@ -306,6 +317,7 @@ var CITE_RULES = [
   "marker-orphan",
   "marker-invalid",
   "marker-repeated",
+  "marker-misplaced",
   "anchor-invalid",
   "entry-invalid",
   "quote-drift"
@@ -340,6 +352,7 @@ var DEFAULT_SEVERITY = {
   "marker-orphan": "error",
   "marker-invalid": "error",
   "marker-repeated": "warning",
+  "marker-misplaced": "warning",
   "anchor-invalid": "error",
   "entry-invalid": "error",
   "quote-drift": "error"
@@ -437,6 +450,13 @@ function shortLine(text) {
   const one = text.replace(/\s+/g, " ").trim();
   return one.length <= LINE_WIDTH ? one : `${one.slice(0, LINE_WIDTH)}\u2026`;
 }
+function spellAt(lines) {
+  return lines.start === lines.end ? `line ${String(lines.start)}` : `lines ${String(lines.start)}-${String(lines.end)}`;
+}
+function listOf(values) {
+  if (values.length <= 1) return values.join("");
+  return `${values.slice(0, -1).join(", ")} and ${values[values.length - 1] ?? ""}`;
+}
 
 // src/cite/core/sources.ts
 import fg from "fast-glob";
@@ -524,6 +544,127 @@ async function readSource(root, index, range, key) {
   }
 }
 
+// src/cite/core/page.ts
+import { extname as extname2 } from "node:path";
+import * as Ajv2020Ns from "ajv/dist/2020.js";
+
+// src/cite/schema/citations.json
+var citations_default = {
+  $schema: "https://json-schema.org/draft/2020-12/schema",
+  $id: "manni:citations:1.0.0-proposal.4",
+  title: "manni citations vocabulary (1.0.0-proposal.4)",
+  description: "What do this page's claims rest on? For each claim, the page lines that make it, the source lines it was written from, and a hash of each. A manni common vocabulary: any drift check can implement it, and other schemas may compose on top of it. A pin is a record of the past, not a copy of the present. It says what the lines were when the sentence was written. The check compares that record with the files as they are now. Recompute it on every run and there is nothing to compare against. `source-of-truth` (manni:stewardship) names the file a page answers to; a citation names the lines a sentence answers to. The page root stays open so sibling tools' keys pass untouched. The `citation-` prefix is reserved, so an unrecognized `citation-*` key is rejected and a typo fails loudly.",
+  type: "object",
+  additionalProperties: true,
+  properties: {
+    citations: {
+      type: "array",
+      minItems: 1,
+      items: {
+        $ref: "#/$defs/citationEntry"
+      },
+      description: "The page's citations, one entry per claim or pin. An empty list is not a declaration; a page with no citations omits the key. Ids are unique within a page, and two entries claiming one id is an error. JSON Schema cannot say that over a list whose members may omit the id. So it is a requirement on implementations, stated here so every tool agrees.",
+      "x-manni-location": "external"
+    }
+  },
+  patternProperties: {
+    "^citation-": false
+  },
+  $defs: {
+    citationEntry: {
+      type: "object",
+      additionalProperties: false,
+      required: [
+        "source"
+      ],
+      description: "One citation: the page text it supports, the source lines it rests on, and how the two are anchored. Both ends share one shape, a line range and a hash.",
+      properties: {
+        id: {
+          type: "string",
+          pattern: "^[a-z0-9][a-z0-9-]*$",
+          description: "A kebab-case name for this citation, unique within the page. A body marker names an entry by it, and findings are reported under it. Optional for an entry anchored by its claim lines or pinned bare. Required when a marker names the entry."
+        },
+        claim: {
+          $ref: "#/$defs/claim"
+        },
+        source: {
+          $ref: "#/$defs/source"
+        },
+        quote: {
+          type: "boolean",
+          default: false,
+          description: "The claim is a fenced block that reproduces the source lines. The pinned claim covers the whole block, fences included. An implementer compares the lines inside the fences with the source under the pin's rule. So a quoted snippet that drifts from its source is a finding even while the pin still holds. Under a marker, the block is the next fence after the marker. Default false."
+        }
+      }
+    },
+    claim: {
+      type: "object",
+      additionalProperties: false,
+      required: [
+        "integrity"
+      ],
+      description: "The page text the citation supports, pinned by lines and a hash. Absent, the entry is a bare pin, or a marker with no drift check on its sentence. Without `lines`, the text pinned is what a body marker naming this entry anchors.",
+      properties: {
+        lines: {
+          $ref: "#/$defs/lines",
+          description: "Lines of the page body. The body starts on the first line after the closing frontmatter fence, or on line 1 with no frontmatter. So editing the frontmatter never moves a claim. Required unless a marker names the entry, and never inside the frontmatter."
+        },
+        integrity: {
+          type: "string",
+          pattern: "^sha256-[0-9a-f]{64}$",
+          description: "`sha256-` and sixty-four lowercase hex digits over the claimed lines, under the rule `source.integrity` states. Always plain, never keyed: the page is public, so there is nothing to hide. With a marker, the lines hashed are the ones the marker anchors."
+        }
+      }
+    },
+    source: {
+      type: "object",
+      additionalProperties: false,
+      required: [
+        "file",
+        "integrity"
+      ],
+      description: "The lines the claim rests on: a file, an optional line range, a pin, and the commit the pin was taken at.",
+      properties: {
+        file: {
+          $ref: "#/$defs/fileRef"
+        },
+        lines: {
+          $ref: "#/$defs/lines",
+          description: "File lines. Absent, the whole file is pinned. The lines stay readable even when `file` is encrypted."
+        },
+        integrity: {
+          type: "string",
+          pattern: "^(?:sha256|hmac-sha256)-[0-9a-f]{64}$",
+          description: "The pin: an algorithm prefix and sixty-four lowercase hex digits over the cited lines under one rule. Decode as UTF-8 and drop one leading byte-order mark. Turn CRLF into LF, split on LF, and discard the empty element a trailing LF leaves. Take lines L1 to L2 inclusive, or every line for a whole file. Join with LF and no trailing LF, and keep trailing whitespace. A plain `file` is pinned `sha256-` over that text. An encrypted `file` is pinned `hmac-sha256-`: the HMAC-SHA256 of that text under a key derived from the encryption key. So a public page carries no verifier a reader could run against a guessed private line. The prefix follows `file`, and any other pairing is an invalid entry."
+        },
+        "commit-sha": {
+          type: "string",
+          pattern: "^[0-9a-f]{7,64}$",
+          description: "The git commit hash the source pin was taken at, as lowercase hex. Seven digits is what git abbreviates to; sixty-four covers a SHA-256 repository. A tool writes the full hash, because an abbreviation that is unique today need not be next year. Without it, a check can still say the lines changed. With it, the check can say since when, and whether the pin was ever true."
+        }
+      }
+    },
+    lines: {
+      oneOf: [
+        {
+          type: "integer",
+          minimum: 1
+        },
+        {
+          type: "string",
+          pattern: "^[1-9][0-9]*-[1-9][0-9]*$"
+        }
+      ],
+      description: 'A line range, 1-based and inclusive: an integer for one line, or `"L1-L2"` for several. `L1 <= L2` is a rule on implementations, since a pattern cannot compare two numbers. There is no line 0 to cite.'
+    },
+    fileRef: {
+      type: "string",
+      pattern: "^(?:~[A-Za-z0-9_-]{82,}|(?!~)(?:(?!\\.\\.?(?:/|$))[^/\\\\:\\r\\n\\t]+)(?:/(?:(?!\\.\\.?(?:/|$))[^/\\\\:\\r\\n\\t]+))*)$",
+      description: "The file: a path relative to the repository root, posix-separated, and free of `.` and `..` segments. Segments may hold spaces and dots but not `/`, `\\`, `:` or a line break. So a URL, a drive letter, a Windows path and an absolute path all fail here. In place of the path, `~` and at least 82 base64url characters is the path encrypted with the family key. Proposal 0045 states the construction. Only a checkout with the key and the files can decrypt the path and read the lines. So a public docs repo can cite a private code repo without publishing its paths. The value carries no encryption mark, because the citation tool encrypts it, and a plain path stays valid."
+    }
+  }
+};
+
 // src/shared/code-regions.ts
 var SKIP_MARKDOWN_FENCE = /^[ \t]*(`{3,}|~{3,})/;
 var SKIP_ASCIIDOC_FENCE = /^(-{4,})/;
@@ -690,6 +831,25 @@ function isMarkerLine(line, format) {
     return isCite(text.slice(form.open.length, closeAt).trim());
   });
 }
+var ATX_HEADING = /^[ \t]*#{1,6}([ \t]|$)/;
+var ASCIIDOC_TITLE = /^={1,6}[ \t]/;
+var ADORNMENT = /^[ \t]*([-=~^"'*+#_:<>])(?:[ \t]*\1){2,}[ \t]*$/;
+var TAG_LINE = /^[ \t]*<\/?[A-Za-z][^<>]*>[ \t]*$/;
+function isBoundLine(line, format) {
+  if (ADORNMENT.test(line)) return true;
+  switch (format) {
+    case "markdown":
+    case "mdx":
+      return ATX_HEADING.test(line) || TAG_LINE.test(line);
+    case "html":
+    case "xml":
+      return TAG_LINE.test(line);
+    case "asciidoc":
+      return ASCIIDOC_TITLE.test(line);
+    default:
+      return false;
+  }
+}
 function parseStatements(body, format, from = { offset: 0, line: 1 }) {
   const out = [];
   const fileLine = (bodyOffset) => from.line + lineAt(body, bodyOffset) - 1;
@@ -732,6 +892,7 @@ function detectEol(text) {
 }
 function paragraphAfter(content, offset, format) {
   const marker = (text) => format !== void 0 && isMarkerLine(text, format);
+  const bound = (text) => format !== void 0 && isBoundLine(text, format);
   let pos = offset;
   const firstEnd = lineEnd(content, pos);
   if (lineText(content, pos, firstEnd).trim() === "") pos = firstEnd + 1;
@@ -745,11 +906,11 @@ function paragraphAfter(content, offset, format) {
     if (ANY_FENCE.test(text)) return void 0;
     const start = pos;
     let last = end;
-    let cursor = end + 1;
+    let cursor = bound(text) ? content.length : end + 1;
     while (cursor < content.length) {
       const e = lineEnd(content, cursor);
       const t = lineText(content, cursor, e);
-      if (t.trim() === "" || ANY_FENCE.test(t) || marker(t)) break;
+      if (t.trim() === "" || ANY_FENCE.test(t) || marker(t) || bound(t)) break;
       last = e;
       cursor = e + 1;
     }
@@ -864,9 +1025,11 @@ function unitHolding(text, line, format, body) {
   }
   if (ANY_FENCE.test(own)) return void 0;
   let start = line;
-  while (start - 1 >= body.line) {
+  while (start - 1 >= body.line && !isBoundLine(own, format)) {
     const above = textOf(start - 1);
-    if (above.trim() === "" || ANY_FENCE.test(above) || isMarkerLine(above, format)) break;
+    if (above.trim() === "" || ANY_FENCE.test(above) || isMarkerLine(above, format) || isBoundLine(above, format)) {
+      break;
+    }
     start--;
   }
   const paragraph = paragraphAfter(text, offsetOfLine(text, start), format);
@@ -905,7 +1068,9 @@ function continuesList(text, line, format, bodyLine, column) {
   if (columnOf(indentOf(textOfLine(text, n))) > column) return true;
   for (; n >= bodyLine; n--) {
     const above = textOfLine(text, n);
-    if (above.trim() === "" || ANY_FENCE.test(above) || isMarkerLine(above, format)) break;
+    if (above.trim() === "" || ANY_FENCE.test(above) || isMarkerLine(above, format) || isBoundLine(above, format)) {
+      break;
+    }
     const item = listItemOf(above);
     if (item !== void 0 && columnOf(item.lead) === column) return true;
   }
@@ -958,730 +1123,764 @@ function offsetOfLine(content, line) {
   return pos;
 }
 
-// src/cite/core/claims.ts
-function normalizeWhitespace(text) {
-  return text.replace(/\s+/g, " ").trim();
-}
-function normalizeBlock(text) {
-  let out = text.charCodeAt(0) === 65279 ? text.slice(1) : text;
-  out = out.replace(/\r\n/g, "\n");
-  return out.endsWith("\n") ? out.slice(0, -1) : out;
-}
-function blockMatches(blockText, citedJoined) {
-  return normalizeBlock(blockText) === normalizeBlock(citedJoined);
-}
-function textAt(lines, range) {
-  return lines.slice(range.start - 1, Math.min(range.end, lines.length));
+// src/cite/core/page.ts
+var MAX_MARKERS_PER_PAGE = 500;
+var ELEMENT_BACKED = /* @__PURE__ */ new Set(["html", "xml"]);
+var FENCE_ONLY = /* @__PURE__ */ new Set(["markdown", "mdx"]);
+var MARKER_JSON = "A marker names an entry by id. Write the entry in frontmatter or the sidecar.";
+function ownedMessage(owner) {
+  return `"citations" is owned by manifest ${owner.file} (collection ${owner.collection}); remove it from the document`;
 }
-function claimLine(claim) {
-  const at2 = claim.fileLines === void 0 ? void 0 : parseLines(claim.fileLines);
-  return at2?.start;
+var Ajv2020 = Ajv2020Ns.default;
+var entryValidator;
+function compileEntryValidator() {
+  if (entryValidator) return entryValidator;
+  const ajv = new Ajv2020({ allErrors: false, strict: false });
+  ajv.addSchema(citations_default);
+  entryValidator = ajv.compile({
+    $ref: `${citations_default.$id}#/$defs/citationEntry`
+  });
+  return entryValidator;
 }
-function claimLineNow(claim) {
-  const spec = claim.newFileLines ?? claim.candidateFileLines?.[0] ?? claim.fileLines;
-  const at2 = spec === void 0 ? void 0 : parseLines(spec);
-  return at2?.start;
+function validateEntry(entry) {
+  const validate = compileEntryValidator();
+  if (validate(entry)) return void 0;
+  const first = validate.errors?.[0];
+  if (!first) return "invalid entry";
+  return `${first.instancePath} ${first.message ?? "is invalid"}`.trim();
 }
-function claimLinesNow(claim) {
-  const spec = claim.newFileLines ?? claim.candidateFileLines?.[0] ?? claim.fileLines;
-  return spec === void 0 ? void 0 : parseLines(spec);
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-function claimEnd(page, entry, lines) {
-  const { citation, marker } = entry;
-  const claim = citation.claim;
-  if (claim === void 0) return null;
-  const quote = citation.quote === true;
-  const body = page.bodyLine;
-  if (claim.lines !== void 0) {
-    const recorded = parseLines(claim.lines);
-    if (recorded === void 0) return { status: "skipped" };
-    const file = toFileLines(recorded, body);
-    const end = {
-      lines: spellLines(recorded),
-      fileLines: spellLines(file),
-      status: "changed"
-    };
-    if (marker !== void 0) return { ...end, status: "skipped" };
-    if (pinOfLines(lines, file) === claim.integrity) return { ...end, status: "current" };
-    const width = recorded.end - recorded.start + 1;
-    const found = findWindows(lines.slice(body - 1), width, claim.integrity, void 0, {
-      around: recorded.start
-    });
-    const spans = found.starts.map((start) => ({ start, end: start + width - 1 }));
-    const [only] = spans;
-    if (spans.length === 1 && only !== void 0) {
-      return {
-        ...end,
-        status: "moved",
-        newLines: spellLines(only),
-        newFileLines: spellLines(toFileLines(only, body))
-      };
-    }
-    if (spans.length > 1) {
-      return {
-        ...end,
-        status: "moved-ambiguous",
-        candidates: spans.map(spellLines),
-        candidateFileLines: spans.map((span) => spellLines(toFileLines(span, body)))
-      };
+function toCitation(entry) {
+  const source = isRecord(entry.source) ? entry.source : {};
+  const citation = {
+    source: {
+      file: String(source.file),
+      integrity: String(source.integrity)
     }
-    return { ...end, text: textAt(lines, file) };
+  };
+  if (typeof source.lines === "number" || typeof source.lines === "string") {
+    citation.source.lines = source.lines;
   }
-  if (marker !== void 0) {
-    const unit = anchoredLines(page.content, marker.end, page.format, quote);
-    if (unit === void 0) return { status: "changed" };
-    const end = { fileLines: spellLines(unit), status: "changed" };
-    if (pinOfLines(lines, unit) === claim.integrity) return { ...end, status: "current" };
-    return { ...end, text: textAt(lines, unit) };
+  if (typeof source["commit-sha"] === "string") {
+    citation.source["commit-sha"] = source["commit-sha"];
   }
-  return { status: "changed" };
-}
-function unitAt(page, line, lines) {
-  if (line < page.bodyLine || line > lines.length) return void 0;
-  if ((lines[line - 1] ?? "").trim() === "") return void 0;
-  const block = fenceSpanAt(page.content, line, page.format);
-  if (block !== void 0) {
-    return { lines: block, kind: "block", text: lines.slice(block.start - 1, block.end) };
+  if (typeof entry.id === "string") citation.id = entry.id;
+  if (isRecord(entry.claim)) {
+    const claim = entry.claim;
+    citation.claim = { integrity: String(claim.integrity) };
+    if (typeof claim.lines === "number" || typeof claim.lines === "string") {
+      citation.claim.lines = claim.lines;
+    }
   }
-  if (insideFence(page.content, page.bodyOffset, line, page.format)) return void 0;
-  const paragraph = paragraphAfter(page.content, offsetOfLine(page.content, line));
-  if (paragraph === void 0 || paragraph.line !== line) return void 0;
-  const span = { start: line, end: lineAt(page.content, paragraph.end) };
-  return { lines: span, kind: "paragraph", text: lines.slice(span.start - 1, span.end) };
+  if (typeof entry.quote === "boolean") citation.quote = entry.quote;
+  return citation;
 }
-function markerUnit(page, entry, lines) {
-  const { marker, citation } = entry;
-  if (marker === void 0) return void 0;
-  const span = anchoredLines(page.content, marker.end, page.format, citation.quote === true);
-  if (span === void 0 || span.end > lines.length) return void 0;
-  return {
-    lines: span,
-    kind: citation.quote === true ? "block" : "paragraph",
-    text: lines.slice(span.start - 1, span.end)
+function finding(rule, message, extra) {
+  const level = DEFAULT_SEVERITY[rule];
+  const out = {
+    rule,
+    ruleId: ruleId(rule),
+    // The caller re-applies the configured severity table; no page-side rule
+    // defaults to `off`, so there is nothing to collapse.
+    severity: level === "off" ? "error" : level,
+    message
   };
+  if (extra.line !== void 0) out.line = extra.line;
+  if (extra.file !== void 0) out.file = extra.file;
+  if (extra.id !== void 0) out.id = extra.id;
+  if (extra.src !== void 0) out.src = extra.src;
+  if (extra.index !== void 0) out.index = extra.index;
+  return out;
 }
-
-// src/cite/core/git.ts
-import { execFile } from "node:child_process";
-var MAX_BUFFER = 32 * 1024 * 1024;
-var NO_COMMIT = /invalid object name|bad revision|unknown revision|bad object/i;
-var NO_PATH = /does not exist in|exists on disk, but not in|path .* does not exist/i;
-function run2(root, args) {
-  return new Promise((resolve9) => {
-    execFile(
-      "git",
-      ["-c", "core.quotepath=false", ...args],
-      { cwd: root, windowsHide: true, maxBuffer: MAX_BUFFER, encoding: "utf8" },
-      (error, stdout, stderr) => {
-        if (error) {
-          const failure = { ok: false, stderr, message: error.message };
-          if (typeof error.code === "number") failure.code = error.code;
-          resolve9(failure);
-        } else resolve9({ ok: true, stdout });
-      }
-    );
-  });
-}
-function gitClient(root) {
-  const memo = /* @__PURE__ */ new Map();
-  const once = (key, compute) => {
-    const held = memo.get(key);
-    if (held !== void 0) return held;
-    const made = compute();
-    memo.set(key, made);
-    return made;
-  };
-  const available = () => once("available", async () => (await run2(root, ["rev-parse", "--show-toplevel"])).ok);
-  const failed = (verb, outcome) => new CiteError(`git ${verb} failed: ${outcome.stderr.trim() || outcome.message}`);
-  const hasCommit = (commit) => once(`has\0${commit}`, async () => {
-    const out = await run2(root, ["rev-parse", "--verify", "--quiet", "--end-of-options", `${commit}^{commit}`]);
-    if (out.ok) return true;
-    if (out.code === 1) return false;
-    throw failed("rev-parse", out);
-  });
-  return {
-    available,
-    head: () => once("head", async () => {
-      if (!await available()) return null;
-      const out = await run2(root, ["rev-parse", "HEAD"]);
-      return out.ok ? out.stdout.trim() : null;
-    }),
-    lsFiles: () => once("ls-files", async () => {
-      if (!await available()) return [];
-      const out = await run2(root, ["ls-files", "-z"]);
-      if (!out.ok) throw failed("ls-files", out);
-      return out.stdout.split("\0").filter((entry) => entry !== "");
-    }),
-    showFile: (commit, path) => once(`show\0${commit}\0${path}`, async () => {
-      const out = await run2(root, ["show", "--end-of-options", `${commit}:./${path}`]);
-      if (out.ok) return { text: out.stdout };
-      if (NO_COMMIT.test(out.stderr)) return { missing: "commit" };
-      if (NO_PATH.test(out.stderr)) {
-        return await hasCommit(commit) ? { missing: "path" } : { missing: "commit" };
-      }
-      throw failed("show", out);
-    }),
-    subjectsSince: (commit, path) => once(`log\0${commit}\0${path}`, async () => {
-      const out = await run2(root, ["log", "--format=%s", "--end-of-options", `${commit}..HEAD`, "--", path]);
-      if (!out.ok) throw failed("log", out);
-      return out.stdout.split(/\r?\n/).filter((line) => line !== "");
-    }),
-    diffSince: (commit, path) => once(`diff\0${commit}\0${path}`, async () => {
-      const out = await run2(root, ["diff", "--end-of-options", commit, "--", path]);
-      if (!out.ok) throw failed("diff", out);
-      return out.stdout;
-    })
-  };
+function named(id, text) {
+  return id === void 0 ? text : `${id}: ${text}`;
 }
-var GIT_UNAVAILABLE_HISTORY = "git is not available here, so citations are checked without history: no never-true, no diffs, no commit subjects.";
-var GIT_UNAVAILABLE_COMMIT = "git is not available here, so the citation records no commit.";
-function noGit() {
-  return {
-    available: () => Promise.resolve(false),
-    head: () => Promise.resolve(null),
-    lsFiles: () => Promise.resolve([]),
-    showFile: () => Promise.resolve({ missing: "commit" }),
-    subjectsSince: () => Promise.resolve([]),
-    diffSince: () => Promise.resolve("")
-  };
+function subjectOf(entry) {
+  const out = {};
+  if (!isRecord(entry)) return out;
+  if (typeof entry.id === "string") out.id = entry.id;
+  if (isRecord(entry.source) && typeof entry.source.file === "string") out.src = entry.source.file;
+  return out;
 }
-
-// src/cite/core/classify.ts
-async function historyOf(git, commit, path, range, pin, key, budget) {
-  const shown = await git.showFile(commit, path);
-  if ("missing" in shown) {
-    return shown.missing === "commit" ? { kind: "unavailable" } : { kind: "never-true" };
-  }
-  const then = splitLines(shown.text);
-  let joined;
-  try {
-    joined = sliceLines2(then, range);
-  } catch {
-    joined = void 0;
-  }
-  if (joined !== void 0 && hashLines(joined, key) === pin) {
-    return { kind: "original", lines: joined.split("\n") };
+function pickExtractor(file, format) {
+  if (format !== void 0) {
+    const forced = extractorByName(format);
+    if (forced === void 0) {
+      throw new CiteError(
+        `Unknown format "${format}". Supported extensions: ${supportedExtensions().join(", ")}.`
+      );
+    }
+    return forced;
   }
-  if (range.start === void 0) return { kind: "never-true" };
-  const length = (range.end ?? range.start) - range.start + 1;
-  const search = { around: range.start };
-  if (budget !== void 0) search.budget = budget;
-  const found = findWindows(then, length, pin, key, search);
-  const [first] = found.starts;
-  if (first !== void 0) {
-    return { kind: "original", lines: then.slice(first - 1, first - 1 + length) };
+  const extension = extname2(file);
+  const byExt = extractorForExtension(extension);
+  if (!byExt) {
+    throw new CiteError(
+      `Unsupported file type "${extension}" for "${file}". Supported: ${supportedExtensions().join(", ")}. Use --as to override.`
+    );
   }
-  return found.truncated ? { kind: "unknown" } : { kind: "never-true" };
+  return byExt;
 }
-async function classifyCitation(entry, opts) {
-  const { citation } = entry;
-  const range = sourceRange(citation.source);
-  const commit = citation.source["commit-sha"];
-  const result = { src: spellSource(citation.source), status: "missing" };
-  if (commit !== void 0) result.commitSha = commit;
-  const source = await readSource(opts.root, opts.index, range, opts.key);
-  if (source.kind === "missing") {
-    result.missingReason = source.reason;
-    return result;
+function byLine(a, b) {
+  return (a.line ?? Number.MAX_SAFE_INTEGER) - (b.line ?? Number.MAX_SAFE_INTEGER);
+}
+function bodyLineOf(content, bodyOffset) {
+  if (bodyOffset <= 0) return 1;
+  const line = lineAt(content, bodyOffset);
+  return content.charCodeAt(bodyOffset - 1) === 10 ? line : line + 1;
+}
+function citationInputs(file, extracted, injected) {
+  if (injected !== void 0) return [...injected];
+  const raw = extracted.data.citations;
+  const list = Array.isArray(raw) ? raw : [];
+  return list.map((entry, index) => {
+    const origin = { kind: "frontmatter", file };
+    const line = extracted.lineFor(`/citations/${String(index)}`);
+    if (line !== void 0) origin.line = line;
+    return { entry, origin };
+  });
+}
+function readPage(file, content, opts) {
+  const extractor = pickExtractor(file, opts?.format);
+  const format = extractor.name;
+  if (FENCE_ONLY.has(format) && hasFrontmatterFence(content) && locateFrontmatter(content) === null) {
+    throw new CiteError(
+      `${file}: Unterminated front matter fence: the opening fence has no matching close, so the page's citations cannot be read. Add a closing fence.`
+    );
   }
-  result.resolvedPath = source.resolvedPath;
-  const key = range.encrypted ? opts.key : void 0;
-  const pin = citation.source.integrity;
-  const lines = splitLines(source.text);
-  let here;
-  try {
-    here = hashLines(sliceLines2(lines, range), key);
-  } catch {
-    here = void 0;
+  const extracted = extractor.extract(content, file);
+  const data = extracted.data;
+  const bodyOffset = ELEMENT_BACKED.has(format) ? 0 : locateFrontmatter(content)?.closeEnd ?? 0;
+  const bodyLine = bodyLineOf(content, bodyOffset);
+  const findings = [];
+  const citations = [];
+  const byId = /* @__PURE__ */ new Map();
+  const ids = /* @__PURE__ */ new Set();
+  const markedAt = /* @__PURE__ */ new Map();
+  for (const key of Object.keys(data)) {
+    if (!key.startsWith("citation-")) continue;
+    findings.push(
+      finding(
+        "entry-invalid",
+        `"${key}" is not a citations key; the page root reserves the citation- prefix`,
+        { line: extracted.lineFor(`/${key}`) }
+      )
+    );
   }
-  if (here === pin) {
-    result.status = "current";
-    return result;
+  const injected = opts?.citations;
+  const rawCitations = data.citations;
+  if (opts?.owned !== void 0 && rawCitations !== void 0) {
+    findings.push(
+      finding("entry-invalid", ownedMessage(opts.owned), {
+        line: extracted.lineFor("/citations")
+      })
+    );
   }
-  let history = { kind: "none" };
-  if (commit !== void 0 && await opts.git.available()) {
-    history = await historyOf(opts.git, commit, source.resolvedPath, range, pin, key, opts.budget);
+  if (injected === void 0 && rawCitations !== void 0 && !Array.isArray(rawCitations)) {
+    findings.push(
+      finding("entry-invalid", "citations must be an array of entries", {
+        line: extracted.lineFor("/citations")
+      })
+    );
   }
-  if (range.start !== void 0) {
-    const start = range.start;
-    const end = range.end ?? start;
-    const search = { around: start };
-    if (history.kind === "original") search.original = history.lines;
-    if (opts.budget !== void 0) search.budget = opts.budget;
-    const found = findWindows(lines, end - start + 1, pin, key, search);
-    if (found.truncated) result.truncatedSearch = true;
-    const spell = (at2) => formatSrc({ ...range, start: at2, end: at2 + (end - start) });
-    const [only] = found.starts;
-    if (found.starts.length === 1 && only !== void 0) {
-      result.status = "moved";
-      result.newSrc = spell(only);
-      result.newLines = String(lineSpec({ start: only, end: only + (end - start) }));
-      return result;
+  const inputs = citationInputs(file, extracted, injected);
+  inputs.forEach((input, index) => {
+    const origin = { ...input.origin, index };
+    const where = { index };
+    if (origin.line !== void 0) where.line = origin.line;
+    if (origin.kind === "manifest") where.file = origin.file;
+    const entry = input.entry;
+    const error = validateEntry(entry);
+    if (error !== void 0 || !isRecord(entry)) {
+      findings.push(finding("entry-invalid", error ?? "must be object", { ...where, ...subjectOf(entry) }));
+      return;
     }
-    if (found.starts.length > 1) {
-      result.status = "moved-ambiguous";
-      result.candidates = found.starts.map(spell);
-      return result;
+    const citation = toCitation(entry);
+    const subject = { ...where, src: spellSource(citation.source) };
+    if (citation.id !== void 0) subject.id = citation.id;
+    const bad = ["claim", "source"].find((end) => {
+      const lines = end === "claim" ? citation.claim?.lines : citation.source.lines;
+      return lines !== void 0 && parseLines(lines) === void 0;
+    });
+    if (bad !== void 0) {
+      const lines = bad === "claim" ? citation.claim?.lines : citation.source.lines;
+      findings.push(
+        finding(
+          "entry-invalid",
+          named(citation.id, `${bad}.lines "${String(lines)}" ends before it starts`),
+          subject
+        )
+      );
+      return;
+    }
+    const wide = ["claim", "source"].map((end) => {
+      const lines = end === "claim" ? citation.claim?.lines : citation.source.lines;
+      const parsed = lines === void 0 ? void 0 : parseLines(lines);
+      const reason = parsed === void 0 ? void 0 : tooWide(parsed);
+      return reason === void 0 ? void 0 : `${end}.lines "${String(lines)}" ${reason}`;
+    }).find((message) => message !== void 0);
+    if (wide !== void 0) {
+      findings.push(finding("entry-invalid", named(citation.id, wide), subject));
+      return;
+    }
+    const encrypted = isEncryptedValue(citation.source.file);
+    if (encrypted !== isKeyedPin(citation.source.integrity)) {
+      findings.push(
+        finding(
+          "entry-invalid",
+          named(
+            citation.id,
+            encrypted ? "an encrypted source is pinned with hmac-sha256-, not sha256-." : "a plain source is pinned with sha256-, not hmac-sha256-."
+          ),
+          subject
+        )
+      );
+      return;
+    }
+    const page = { citation, origin };
+    citations.push(page);
+    if (citation.id !== void 0) {
+      if (ids.has(citation.id)) {
+        findings.push(finding("entry-invalid", `duplicate id "${citation.id}"`, subject));
+      } else {
+        ids.add(citation.id);
+        byId.set(citation.id, page);
+      }
     }
+  });
+  const body = content.slice(bodyOffset);
+  const statements = parseStatements(body, format, {
+    offset: bodyOffset,
+    line: bodyLine
+  });
+  if (statements.length > MAX_MARKERS_PER_PAGE) {
+    findings.push(
+      finding(
+        "marker-invalid",
+        `more than ${String(MAX_MARKERS_PER_PAGE)} markers on one page (${String(statements.length)}); the rest are not read`,
+        { line: statements[MAX_MARKERS_PER_PAGE]?.line }
+      )
+    );
   }
-  if (history.kind === "never-true") {
-    result.status = "never-true";
-    return result;
+  for (const statement of statements.slice(0, MAX_MARKERS_PER_PAGE)) {
+    const { payload } = statement;
+    if (payload.kind === "bad") {
+      findings.push(
+        finding(
+          "marker-invalid",
+          payload.json === true ? MARKER_JSON : `invalid marker: ${payload.reason}`,
+          { line: statement.line }
+        )
+      );
+      continue;
+    }
+    const target = byId.get(payload.id);
+    if (target === void 0) {
+      findings.push(
+        finding("marker-orphan", `no entry has id "${payload.id}"`, {
+          line: statement.line,
+          id: payload.id
+        })
+      );
+      continue;
+    }
+    const first = markedAt.get(target);
+    if (first !== void 0) {
+      findings.push(
+        finding(
+          "marker-repeated",
+          `${payload.id} is named by markers at lines ${String(first)} and ${String(statement.line)}; the first anchors it.`,
+          {
+            line: statement.line,
+            id: payload.id,
+            index: target.origin.index,
+            src: spellSource(target.citation.source)
+          }
+        )
+      );
+      continue;
+    }
+    markedAt.set(target, statement.line);
+    target.marker = statement;
   }
-  result.status = "changed";
-  if (history.kind === "unavailable") result.historyAvailable = false;
-  if (history.kind === "unknown") result.truncatedSearch = true;
-  if (history.kind === "original" && commit !== void 0) {
-    result.historyAvailable = true;
-    result.commitsSince = await opts.git.subjectsSince(commit, source.resolvedPath);
-    result.diff = await opts.git.diffSince(commit, source.resolvedPath);
+  for (const entry of citations) {
+    const { citation, origin, marker } = entry;
+    const subject = { index: origin.index, src: spellSource(citation.source) };
+    if (citation.id !== void 0) subject.id = citation.id;
+    if (origin.line !== void 0) subject.line = origin.line;
+    if (origin.kind === "manifest") subject.file = origin.file;
+    if (citation.claim?.lines !== void 0 && marker !== void 0) {
+      const onPage = { index: origin.index, line: marker.line, src: subject.src };
+      if (citation.id !== void 0) onPage.id = citation.id;
+      findings.push(
+        finding(
+          "anchor-invalid",
+          `${citation.id ?? "the entry"} has claim lines and a marker. Keep one.`,
+          onPage
+        )
+      );
+      continue;
+    }
+    if (citation.quote === true && citation.claim?.lines === void 0 && marker === void 0) {
+      findings.push(
+        finding("anchor-invalid", named(citation.id, "quote needs a claim or a marker."), subject)
+      );
+    }
   }
-  return result;
+  return {
+    file,
+    format,
+    content,
+    bodyOffset,
+    bodyLine,
+    citations,
+    statements,
+    findings: findings.sort(byLine)
+  };
 }
 
-// src/cite/core/page.ts
-import { extname as extname2 } from "node:path";
-import * as Ajv2020Ns from "ajv/dist/2020.js";
-
-// src/cite/schema/citations.json
-var citations_default = {
-  $schema: "https://json-schema.org/draft/2020-12/schema",
-  $id: "manni:citations:1.0.0-proposal.4",
-  title: "manni citations vocabulary (1.0.0-proposal.4)",
-  description: "What do this page's claims rest on? For each claim, the page lines that make it, the source lines it was written from, and a hash of each. A manni common vocabulary: any drift check can implement it, and other schemas may compose on top of it. A pin is a record of the past, not a copy of the present. It says what the lines were when the sentence was written. The check compares that record with the files as they are now. Recompute it on every run and there is nothing to compare against. `source-of-truth` (manni:stewardship) names the file a page answers to; a citation names the lines a sentence answers to. The page root stays open so sibling tools' keys pass untouched. The `citation-` prefix is reserved, so an unrecognized `citation-*` key is rejected and a typo fails loudly.",
-  type: "object",
-  additionalProperties: true,
-  properties: {
-    citations: {
-      type: "array",
-      minItems: 1,
-      items: {
-        $ref: "#/$defs/citationEntry"
-      },
-      description: "The page's citations, one entry per claim or pin. An empty list is not a declaration; a page with no citations omits the key. Ids are unique within a page, and two entries claiming one id is an error. JSON Schema cannot say that over a list whose members may omit the id. So it is a requirement on implementations, stated here so every tool agrees.",
-      "x-manni-location": "external"
-    }
-  },
-  patternProperties: {
-    "^citation-": false
-  },
-  $defs: {
-    citationEntry: {
-      type: "object",
-      additionalProperties: false,
-      required: [
-        "source"
-      ],
-      description: "One citation: the page text it supports, the source lines it rests on, and how the two are anchored. Both ends share one shape, a line range and a hash.",
-      properties: {
-        id: {
-          type: "string",
-          pattern: "^[a-z0-9][a-z0-9-]*$",
-          description: "A kebab-case name for this citation, unique within the page. A body marker names an entry by it, and findings are reported under it. Optional for an entry anchored by its claim lines or pinned bare. Required when a marker names the entry."
-        },
-        claim: {
-          $ref: "#/$defs/claim"
-        },
-        source: {
-          $ref: "#/$defs/source"
-        },
-        quote: {
-          type: "boolean",
-          default: false,
-          description: "The claim is a fenced block that reproduces the source lines. The pinned claim covers the whole block, fences included. An implementer compares the lines inside the fences with the source under the pin's rule. So a quoted snippet that drifts from its source is a finding even while the pin still holds. Under a marker, the block is the next fence after the marker. Default false."
-        }
-      }
-    },
-    claim: {
-      type: "object",
-      additionalProperties: false,
-      required: [
-        "integrity"
-      ],
-      description: "The page text the citation supports, pinned by lines and a hash. Absent, the entry is a bare pin, or a marker with no drift check on its sentence. Without `lines`, the text pinned is what a body marker naming this entry anchors.",
-      properties: {
-        lines: {
-          $ref: "#/$defs/lines",
-          description: "Lines of the page body. The body starts on the first line after the closing frontmatter fence, or on line 1 with no frontmatter. So editing the frontmatter never moves a claim. Required unless a marker names the entry, and never inside the frontmatter."
-        },
-        integrity: {
-          type: "string",
-          pattern: "^sha256-[0-9a-f]{64}$",
-          description: "`sha256-` and sixty-four lowercase hex digits over the claimed lines, under the rule `source.integrity` states. Always plain, never keyed: the page is public, so there is nothing to hide. With a marker, the lines hashed are the ones the marker anchors."
-        }
-      }
-    },
-    source: {
-      type: "object",
-      additionalProperties: false,
-      required: [
-        "file",
-        "integrity"
-      ],
-      description: "The lines the claim rests on: a file, an optional line range, a pin, and the commit the pin was taken at.",
-      properties: {
-        file: {
-          $ref: "#/$defs/fileRef"
-        },
-        lines: {
-          $ref: "#/$defs/lines",
-          description: "File lines. Absent, the whole file is pinned. The lines stay readable even when `file` is encrypted."
-        },
-        integrity: {
-          type: "string",
-          pattern: "^(?:sha256|hmac-sha256)-[0-9a-f]{64}$",
-          description: "The pin: an algorithm prefix and sixty-four lowercase hex digits over the cited lines under one rule. Decode as UTF-8 and drop one leading byte-order mark. Turn CRLF into LF, split on LF, and discard the empty element a trailing LF leaves. Take lines L1 to L2 inclusive, or every line for a whole file. Join with LF and no trailing LF, and keep trailing whitespace. A plain `file` is pinned `sha256-` over that text. An encrypted `file` is pinned `hmac-sha256-`: the HMAC-SHA256 of that text under a key derived from the encryption key. So a public page carries no verifier a reader could run against a guessed private line. The prefix follows `file`, and any other pairing is an invalid entry."
-        },
-        "commit-sha": {
-          type: "string",
-          pattern: "^[0-9a-f]{7,64}$",
-          description: "The git commit hash the source pin was taken at, as lowercase hex. Seven digits is what git abbreviates to; sixty-four covers a SHA-256 repository. A tool writes the full hash, because an abbreviation that is unique today need not be next year. Without it, a check can still say the lines changed. With it, the check can say since when, and whether the pin was ever true."
-        }
-      }
-    },
-    lines: {
-      oneOf: [
-        {
-          type: "integer",
-          minimum: 1
-        },
-        {
-          type: "string",
-          pattern: "^[1-9][0-9]*-[1-9][0-9]*$"
-        }
-      ],
-      description: 'A line range, 1-based and inclusive: an integer for one line, or `"L1-L2"` for several. `L1 <= L2` is a rule on implementations, since a pattern cannot compare two numbers. There is no line 0 to cite.'
-    },
-    fileRef: {
-      type: "string",
-      pattern: "^(?:~[A-Za-z0-9_-]{82,}|(?!~)(?:(?!\\.\\.?(?:/|$))[^/\\\\:\\r\\n\\t]+)(?:/(?:(?!\\.\\.?(?:/|$))[^/\\\\:\\r\\n\\t]+))*)$",
-      description: "The file: a path relative to the repository root, posix-separated, and free of `.` and `..` segments. Segments may hold spaces and dots but not `/`, `\\`, `:` or a line break. So a URL, a drive letter, a Windows path and an absolute path all fail here. In place of the path, `~` and at least 82 base64url characters is the path encrypted with the family key. Proposal 0045 states the construction. Only a checkout with the key and the files can decrypt the path and read the lines. So a public docs repo can cite a private code repo without publishing its paths. The value carries no encryption mark, because the citation tool encrypts it, and a plain path stays valid."
+// src/cite/core/reanchor.ts
+function isUnitText(line, format) {
+  if (line === void 0) return false;
+  if (line.trim() === "") return false;
+  if (ANY_FENCE.test(line)) return false;
+  if (isMarkerLine(line, format)) return false;
+  return !isBoundLine(line, format);
+}
+function markerAt(lines, n, format) {
+  const line = lines[n - 1];
+  return line !== void 0 && isMarkerLine(line, format);
+}
+function markerRunAt(lines, line, format, bodyLine) {
+  let start = line;
+  while (start - 1 >= bodyLine && markerAt(lines, start - 1, format)) start--;
+  let end = line;
+  while (end + 1 <= lines.length && markerAt(lines, end + 1, format)) end++;
+  return { start, end };
+}
+function splitUnit(lines, run3, format, bodyLine) {
+  if (run3.start - 1 < bodyLine) return void 0;
+  if (!isUnitText(lines[run3.start - 2], format)) return void 0;
+  if (!isUnitText(lines[run3.end], format)) return void 0;
+  let start = run3.start - 1;
+  while (start - 1 >= bodyLine && isUnitText(lines[start - 2], format)) start--;
+  let end = run3.end + 1;
+  while (end + 1 <= lines.length && isUnitText(lines[end], format)) end++;
+  return { start, end };
+}
+function pre43Span(lines, markerLine) {
+  const start = markerLine + 1;
+  const first = lines[start - 1];
+  if (first === void 0 || first.trim() === "" || ANY_FENCE.test(first)) return void 0;
+  let end = start;
+  while (end + 1 <= lines.length) {
+    const next = lines[end];
+    if (next === void 0 || next.trim() === "" || ANY_FENCE.test(next)) break;
+    end++;
+  }
+  return { start, end };
+}
+function runLength(run3) {
+  return run3.end - run3.start + 1;
+}
+function misplacedMarkerAt(page, lines, line, entry) {
+  if (!markerAt(lines, line, page.format)) return void 0;
+  const run3 = markerRunAt(lines, line, page.format, page.bodyLine);
+  const unit = splitUnit(lines, run3, page.format, page.bodyLine);
+  if (unit === void 0) return void 0;
+  const order = line - run3.start;
+  const quote = entry?.citation.quote === true;
+  const marker = entry?.marker;
+  const blockAt = quote && marker !== void 0 ? anchoredLines(page.content, marker.end, page.format, true)?.start : void 0;
+  const out = blockAt === void 0 ? { line, run: run3, order, unit, place: unit.start, block: false, to: unit.start + order } : {
+    line,
+    run: run3,
+    order,
+    unit,
+    place: blockAt,
+    block: true,
+    to: blockAt - runLength(run3) + order
+  };
+  if (entry !== void 0) out.entry = entry;
+  return out;
+}
+function misplacedMarkers(page, lines) {
+  const out = [];
+  for (const statement of page.statements.slice(0, MAX_MARKERS_PER_PAGE)) {
+    const entry = page.citations.find((c) => c.marker?.line === statement.line);
+    const found = misplacedMarkerAt(page, lines, statement.line, entry);
+    if (found !== void 0) out.push(found);
+  }
+  return out;
+}
+function movedUnit(misplaced) {
+  return { start: misplaced.unit.start + runLength(misplaced.run), end: misplaced.unit.end };
+}
+function unitText(lines, misplaced) {
+  const { unit, run: run3 } = misplaced;
+  const out = [];
+  for (let n = unit.start; n <= unit.end; n++) {
+    if (n >= run3.start && n <= run3.end) continue;
+    const line = lines[n - 1];
+    if (line !== void 0) out.push(line);
+  }
+  return out;
+}
+function splitKeepingEol(content) {
+  const parts = content.match(/[^\n]*\n|[^\n]+$/g) ?? [];
+  const texts = [];
+  const eols = [];
+  for (const part of parts) {
+    const eol = /\r?\n$/.exec(part)?.[0] ?? "";
+    texts.push(part.slice(0, part.length - eol.length));
+    eols.push(eol);
+  }
+  return { texts, eols };
+}
+function applyMarkerMoves(content, moves, indentAt) {
+  const { texts, eols } = splitKeepingEol(content);
+  const moving = new Set(moves.map((move) => move.from));
+  const inserts = /* @__PURE__ */ new Map();
+  for (const move of moves) {
+    const list = inserts.get(move.place) ?? [];
+    list.push(move.from);
+    inserts.set(move.place, list);
+  }
+  const order = [];
+  for (let n = 1; n <= texts.length; n++) {
+    for (const from of inserts.get(n) ?? []) order.push(from);
+    if (!moving.has(n)) order.push(n);
+  }
+  const moved = /* @__PURE__ */ new Map();
+  for (const move of moves) {
+    moved.set(move.from, indentAt(move.place) + (texts[move.from - 1] ?? "").trim());
+  }
+  const at2 = /* @__PURE__ */ new Map();
+  order.forEach((old, index) => at2.set(old, index + 1));
+  const out = order.map((old, index) => (moved.get(old) ?? texts[old - 1] ?? "") + (eols[index] ?? "")).join("");
+  return { content: out, line: (old) => at2.get(old) ?? old };
+}
+function pinOf(lines, span) {
+  if (span.start < 1 || span.end > lines.length || span.end < span.start) return void 0;
+  return hashLines(lines.slice(span.start - 1, span.end).join("\n"));
+}
+function markerClaimEnd(page, entry, lines, misplaced) {
+  const { citation, marker } = entry;
+  const pin = citation.claim?.integrity;
+  const quote = citation.quote === true;
+  if (marker === void 0 || pin === void 0) return { status: "changed" };
+  const current = anchoredLines(page.content, marker.end, page.format, quote);
+  if (current === void 0) return { status: "changed" };
+  const claimAt = (span, status, to) => {
+    const end = { fileLines: spellLines(span), status };
+    if (to !== void 0) {
+      end.newLines = spellLines(to);
+      end.newFileLines = end.newLines;
     }
+    if (status === "changed") end.text = lines.slice(span.start - 1, Math.min(span.end, lines.length));
+    return end;
+  };
+  if (quote) {
+    return claimAt(current, pinOf(lines, current) === pin ? "current" : "changed");
   }
-};
+  if (misplaced !== void 0) {
+    const to = movedUnit(misplaced);
+    if (hashLines(unitText(lines, misplaced).join("\n")) === pin) return claimAt(to, "current");
+    if (pinOf(lines, current) === pin) return claimAt(current, "moved", to);
+    const pre432 = pre43Span(lines, marker.line);
+    if (pre432 !== void 0 && pinOf(lines, pre432) === pin) return claimAt(pre432, "moved", to);
+    return claimAt(current, "changed");
+  }
+  if (pinOf(lines, current) === pin) return claimAt(current, "current");
+  const pre43 = pre43Span(lines, marker.line);
+  if (pre43 !== void 0 && pinOf(lines, pre43) === pin) return claimAt(pre43, "moved", current);
+  return claimAt(current, "changed");
+}
 
-// src/cite/core/page.ts
-var MAX_MARKERS_PER_PAGE = 500;
-var ELEMENT_BACKED = /* @__PURE__ */ new Set(["html", "xml"]);
-var FENCE_ONLY = /* @__PURE__ */ new Set(["markdown", "mdx"]);
-var MARKER_JSON = "A marker names an entry by id. Write the entry in frontmatter or the sidecar.";
-function ownedMessage(owner) {
-  return `"citations" is owned by manifest ${owner.file} (collection ${owner.collection}); remove it from the document`;
+// src/cite/core/claims.ts
+function normalizeWhitespace(text) {
+  return text.replace(/\s+/g, " ").trim();
 }
-var Ajv2020 = Ajv2020Ns.default;
-var entryValidator;
-function compileEntryValidator() {
-  if (entryValidator) return entryValidator;
-  const ajv = new Ajv2020({ allErrors: false, strict: false });
-  ajv.addSchema(citations_default);
-  entryValidator = ajv.compile({
-    $ref: `${citations_default.$id}#/$defs/citationEntry`
-  });
-  return entryValidator;
+function normalizeBlock(text) {
+  let out = text.charCodeAt(0) === 65279 ? text.slice(1) : text;
+  out = out.replace(/\r\n/g, "\n");
+  return out.endsWith("\n") ? out.slice(0, -1) : out;
 }
-function validateEntry(entry) {
-  const validate = compileEntryValidator();
-  if (validate(entry)) return void 0;
-  const first = validate.errors?.[0];
-  if (!first) return "invalid entry";
-  return `${first.instancePath} ${first.message ?? "is invalid"}`.trim();
+function blockMatches(blockText, citedJoined) {
+  return normalizeBlock(blockText) === normalizeBlock(citedJoined);
 }
-function isRecord(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
+function textAt(lines, range) {
+  return lines.slice(range.start - 1, Math.min(range.end, lines.length));
 }
-function toCitation(entry) {
-  const source = isRecord(entry.source) ? entry.source : {};
-  const citation = {
-    source: {
-      file: String(source.file),
-      integrity: String(source.integrity)
+function claimLine(claim) {
+  const at2 = claim.fileLines === void 0 ? void 0 : parseLines(claim.fileLines);
+  return at2?.start;
+}
+function claimLineNow(claim) {
+  const spec = claim.newFileLines ?? claim.candidateFileLines?.[0] ?? claim.fileLines;
+  const at2 = spec === void 0 ? void 0 : parseLines(spec);
+  return at2?.start;
+}
+function claimLinesNow(claim) {
+  const spec = claim.newFileLines ?? claim.candidateFileLines?.[0] ?? claim.fileLines;
+  return spec === void 0 ? void 0 : parseLines(spec);
+}
+function claimEnd(page, entry, lines, misplaced) {
+  const { citation, marker } = entry;
+  const claim = citation.claim;
+  if (claim === void 0) return null;
+  const body = page.bodyLine;
+  if (claim.lines !== void 0) {
+    const recorded = parseLines(claim.lines);
+    if (recorded === void 0) return { status: "skipped" };
+    const file = toFileLines(recorded, body);
+    const end = {
+      lines: spellLines(recorded),
+      fileLines: spellLines(file),
+      status: "changed"
+    };
+    if (marker !== void 0) return { ...end, status: "skipped" };
+    if (pinOfLines(lines, file) === claim.integrity) return { ...end, status: "current" };
+    const width = recorded.end - recorded.start + 1;
+    const found = findWindows(lines.slice(body - 1), width, claim.integrity, void 0, {
+      around: recorded.start
+    });
+    const spans = found.starts.map((start) => ({ start, end: start + width - 1 }));
+    const [only] = spans;
+    if (spans.length === 1 && only !== void 0) {
+      return {
+        ...end,
+        status: "moved",
+        newLines: spellLines(only),
+        newFileLines: spellLines(toFileLines(only, body))
+      };
     }
+    if (spans.length > 1) {
+      return {
+        ...end,
+        status: "moved-ambiguous",
+        candidates: spans.map(spellLines),
+        candidateFileLines: spans.map((span) => spellLines(toFileLines(span, body)))
+      };
+    }
+    return { ...end, text: textAt(lines, file) };
+  }
+  if (marker !== void 0) {
+    return markerClaimEnd(
+      page,
+      entry,
+      lines,
+      misplaced ?? misplacedMarkerAt(page, lines, marker.line, entry)
+    );
+  }
+  return { status: "changed" };
+}
+function unitAt(page, line, lines) {
+  if (line < page.bodyLine || line > lines.length) return void 0;
+  if ((lines[line - 1] ?? "").trim() === "") return void 0;
+  const block = fenceSpanAt(page.content, line, page.format);
+  if (block !== void 0) {
+    return { lines: block, kind: "block", text: lines.slice(block.start - 1, block.end) };
+  }
+  if (insideFence(page.content, page.bodyOffset, line, page.format)) return void 0;
+  const paragraph = paragraphAfter(page.content, offsetOfLine(page.content, line));
+  if (paragraph === void 0 || paragraph.line !== line) return void 0;
+  const span = { start: line, end: lineAt(page.content, paragraph.end) };
+  return { lines: span, kind: "paragraph", text: lines.slice(span.start - 1, span.end) };
+}
+function markerUnit(page, entry, lines) {
+  const { marker, citation } = entry;
+  if (marker === void 0) return void 0;
+  const span = anchoredLines(page.content, marker.end, page.format, citation.quote === true);
+  if (span === void 0 || span.end > lines.length) return void 0;
+  return {
+    lines: span,
+    kind: citation.quote === true ? "block" : "paragraph",
+    text: lines.slice(span.start - 1, span.end)
+  };
+}
+
+// src/cite/core/git.ts
+import { execFile } from "node:child_process";
+var MAX_BUFFER = 32 * 1024 * 1024;
+var NO_COMMIT = /invalid object name|bad revision|unknown revision|bad object/i;
+var NO_PATH = /does not exist in|exists on disk, but not in|path .* does not exist/i;
+function run2(root, args) {
+  return new Promise((resolve9) => {
+    execFile(
+      "git",
+      ["-c", "core.quotepath=false", ...args],
+      { cwd: root, windowsHide: true, maxBuffer: MAX_BUFFER, encoding: "utf8" },
+      (error, stdout, stderr) => {
+        if (error) {
+          const failure = { ok: false, stderr, message: error.message };
+          if (typeof error.code === "number") failure.code = error.code;
+          resolve9(failure);
+        } else resolve9({ ok: true, stdout });
+      }
+    );
+  });
+}
+function gitClient(root) {
+  const memo = /* @__PURE__ */ new Map();
+  const once = (key, compute) => {
+    const held = memo.get(key);
+    if (held !== void 0) return held;
+    const made = compute();
+    memo.set(key, made);
+    return made;
+  };
+  const available = () => once("available", async () => (await run2(root, ["rev-parse", "--show-toplevel"])).ok);
+  const failed = (verb, outcome) => new CiteError(`git ${verb} failed: ${outcome.stderr.trim() || outcome.message}`);
+  const hasCommit = (commit) => once(`has\0${commit}`, async () => {
+    const out = await run2(root, ["rev-parse", "--verify", "--quiet", "--end-of-options", `${commit}^{commit}`]);
+    if (out.ok) return true;
+    if (out.code === 1) return false;
+    throw failed("rev-parse", out);
+  });
+  return {
+    available,
+    head: () => once("head", async () => {
+      if (!await available()) return null;
+      const out = await run2(root, ["rev-parse", "HEAD"]);
+      return out.ok ? out.stdout.trim() : null;
+    }),
+    lsFiles: () => once("ls-files", async () => {
+      if (!await available()) return [];
+      const out = await run2(root, ["ls-files", "-z"]);
+      if (!out.ok) throw failed("ls-files", out);
+      return out.stdout.split("\0").filter((entry) => entry !== "");
+    }),
+    showFile: (commit, path) => once(`show\0${commit}\0${path}`, async () => {
+      const out = await run2(root, ["show", "--end-of-options", `${commit}:./${path}`]);
+      if (out.ok) return { text: out.stdout };
+      if (NO_COMMIT.test(out.stderr)) return { missing: "commit" };
+      if (NO_PATH.test(out.stderr)) {
+        return await hasCommit(commit) ? { missing: "path" } : { missing: "commit" };
+      }
+      throw failed("show", out);
+    }),
+    subjectsSince: (commit, path) => once(`log\0${commit}\0${path}`, async () => {
+      const out = await run2(root, ["log", "--format=%s", "--end-of-options", `${commit}..HEAD`, "--", path]);
+      if (!out.ok) throw failed("log", out);
+      return out.stdout.split(/\r?\n/).filter((line) => line !== "");
+    }),
+    diffSince: (commit, path) => once(`diff\0${commit}\0${path}`, async () => {
+      const out = await run2(root, ["diff", "--end-of-options", commit, "--", path]);
+      if (!out.ok) throw failed("diff", out);
+      return out.stdout;
+    })
   };
-  if (typeof source.lines === "number" || typeof source.lines === "string") {
-    citation.source.lines = source.lines;
-  }
-  if (typeof source["commit-sha"] === "string") {
-    citation.source["commit-sha"] = source["commit-sha"];
-  }
-  if (typeof entry.id === "string") citation.id = entry.id;
-  if (isRecord(entry.claim)) {
-    const claim = entry.claim;
-    citation.claim = { integrity: String(claim.integrity) };
-    if (typeof claim.lines === "number" || typeof claim.lines === "string") {
-      citation.claim.lines = claim.lines;
-    }
-  }
-  if (typeof entry.quote === "boolean") citation.quote = entry.quote;
-  return citation;
 }
-function finding(rule, message, extra) {
-  const level = DEFAULT_SEVERITY[rule];
-  const out = {
-    rule,
-    ruleId: ruleId(rule),
-    // The caller re-applies the configured severity table; no page-side rule
-    // defaults to `off`, so there is nothing to collapse.
-    severity: level === "off" ? "error" : level,
-    message
+var GIT_UNAVAILABLE_HISTORY = "git is not available here, so citations are checked without history: no never-true, no diffs, no commit subjects.";
+var GIT_UNAVAILABLE_COMMIT = "git is not available here, so the citation records no commit.";
+function noGit() {
+  return {
+    available: () => Promise.resolve(false),
+    head: () => Promise.resolve(null),
+    lsFiles: () => Promise.resolve([]),
+    showFile: () => Promise.resolve({ missing: "commit" }),
+    subjectsSince: () => Promise.resolve([]),
+    diffSince: () => Promise.resolve("")
   };
-  if (extra.line !== void 0) out.line = extra.line;
-  if (extra.file !== void 0) out.file = extra.file;
-  if (extra.id !== void 0) out.id = extra.id;
-  if (extra.src !== void 0) out.src = extra.src;
-  if (extra.index !== void 0) out.index = extra.index;
-  return out;
-}
-function named(id, text) {
-  return id === void 0 ? text : `${id}: ${text}`;
-}
-function subjectOf(entry) {
-  const out = {};
-  if (!isRecord(entry)) return out;
-  if (typeof entry.id === "string") out.id = entry.id;
-  if (isRecord(entry.source) && typeof entry.source.file === "string") out.src = entry.source.file;
-  return out;
 }
-function pickExtractor(file, format) {
-  if (format !== void 0) {
-    const forced = extractorByName(format);
-    if (forced === void 0) {
-      throw new CiteError(
-        `Unknown format "${format}". Supported extensions: ${supportedExtensions().join(", ")}.`
-      );
-    }
-    return forced;
-  }
-  const extension = extname2(file);
-  const byExt = extractorForExtension(extension);
-  if (!byExt) {
-    throw new CiteError(
-      `Unsupported file type "${extension}" for "${file}". Supported: ${supportedExtensions().join(", ")}. Use --as to override.`
-    );
+
+// src/cite/core/classify.ts
+async function historyOf(git, commit, path, range, pin, key, budget) {
+  const shown = await git.showFile(commit, path);
+  if ("missing" in shown) {
+    return shown.missing === "commit" ? { kind: "unavailable" } : { kind: "never-true" };
   }
-  return byExt;
-}
-function byLine(a, b) {
-  return (a.line ?? Number.MAX_SAFE_INTEGER) - (b.line ?? Number.MAX_SAFE_INTEGER);
-}
-function bodyLineOf(content, bodyOffset) {
-  if (bodyOffset <= 0) return 1;
-  const line = lineAt(content, bodyOffset);
-  return content.charCodeAt(bodyOffset - 1) === 10 ? line : line + 1;
-}
-function citationInputs(file, extracted, injected) {
-  if (injected !== void 0) return [...injected];
-  const raw = extracted.data.citations;
-  const list = Array.isArray(raw) ? raw : [];
-  return list.map((entry, index) => {
-    const origin = { kind: "frontmatter", file };
-    const line = extracted.lineFor(`/citations/${String(index)}`);
-    if (line !== void 0) origin.line = line;
-    return { entry, origin };
-  });
-}
-function readPage(file, content, opts) {
-  const extractor = pickExtractor(file, opts?.format);
-  const format = extractor.name;
-  if (FENCE_ONLY.has(format) && hasFrontmatterFence(content) && locateFrontmatter(content) === null) {
-    throw new CiteError(
-      `${file}: Unterminated front matter fence: the opening fence has no matching close, so the page's citations cannot be read. Add a closing fence.`
-    );
+  const then = splitLines(shown.text);
+  let joined;
+  try {
+    joined = sliceLines2(then, range);
+  } catch {
+    joined = void 0;
   }
-  const extracted = extractor.extract(content, file);
-  const data = extracted.data;
-  const bodyOffset = ELEMENT_BACKED.has(format) ? 0 : locateFrontmatter(content)?.closeEnd ?? 0;
-  const bodyLine = bodyLineOf(content, bodyOffset);
-  const findings = [];
-  const citations = [];
-  const byId = /* @__PURE__ */ new Map();
-  const ids = /* @__PURE__ */ new Set();
-  const markedAt = /* @__PURE__ */ new Map();
-  for (const key of Object.keys(data)) {
-    if (!key.startsWith("citation-")) continue;
-    findings.push(
-      finding(
-        "entry-invalid",
-        `"${key}" is not a citations key; the page root reserves the citation- prefix`,
-        { line: extracted.lineFor(`/${key}`) }
-      )
-    );
+  if (joined !== void 0 && hashLines(joined, key) === pin) {
+    return { kind: "original", lines: joined.split("\n") };
   }
-  const injected = opts?.citations;
-  const rawCitations = data.citations;
-  if (opts?.owned !== void 0 && rawCitations !== void 0) {
-    findings.push(
-      finding("entry-invalid", ownedMessage(opts.owned), {
-        line: extracted.lineFor("/citations")
-      })
-    );
+  if (range.start === void 0) return { kind: "never-true" };
+  const length = (range.end ?? range.start) - range.start + 1;
+  const search = { around: range.start };
+  if (budget !== void 0) search.budget = budget;
+  const found = findWindows(then, length, pin, key, search);
+  const [first] = found.starts;
+  if (first !== void 0) {
+    return { kind: "original", lines: then.slice(first - 1, first - 1 + length) };
   }
-  if (injected === void 0 && rawCitations !== void 0 && !Array.isArray(rawCitations)) {
-    findings.push(
-      finding("entry-invalid", "citations must be an array of entries", {
-        line: extracted.lineFor("/citations")
-      })
-    );
+  return found.truncated ? { kind: "unknown" } : { kind: "never-true" };
+}
+async function classifyCitation(entry, opts) {
+  const { citation } = entry;
+  const range = sourceRange(citation.source);
+  const commit = citation.source["commit-sha"];
+  const result = { src: spellSource(citation.source), status: "missing" };
+  if (commit !== void 0) result.commitSha = commit;
+  const source = await readSource(opts.root, opts.index, range, opts.key);
+  if (source.kind === "missing") {
+    result.missingReason = source.reason;
+    return result;
   }
-  const inputs = citationInputs(file, extracted, injected);
-  inputs.forEach((input, index) => {
-    const origin = { ...input.origin, index };
-    const where = { index };
-    if (origin.line !== void 0) where.line = origin.line;
-    if (origin.kind === "manifest") where.file = origin.file;
-    const entry = input.entry;
-    const error = validateEntry(entry);
-    if (error !== void 0 || !isRecord(entry)) {
-      findings.push(finding("entry-invalid", error ?? "must be object", { ...where, ...subjectOf(entry) }));
-      return;
-    }
-    const citation = toCitation(entry);
-    const subject = { ...where, src: spellSource(citation.source) };
-    if (citation.id !== void 0) subject.id = citation.id;
-    const bad = ["claim", "source"].find((end) => {
-      const lines = end === "claim" ? citation.claim?.lines : citation.source.lines;
-      return lines !== void 0 && parseLines(lines) === void 0;
-    });
-    if (bad !== void 0) {
-      const lines = bad === "claim" ? citation.claim?.lines : citation.source.lines;
-      findings.push(
-        finding(
-          "entry-invalid",
-          named(citation.id, `${bad}.lines "${String(lines)}" ends before it starts`),
-          subject
-        )
-      );
-      return;
-    }
-    const wide = ["claim", "source"].map((end) => {
-      const lines = end === "claim" ? citation.claim?.lines : citation.source.lines;
-      const parsed = lines === void 0 ? void 0 : parseLines(lines);
-      const reason = parsed === void 0 ? void 0 : tooWide(parsed);
-      return reason === void 0 ? void 0 : `${end}.lines "${String(lines)}" ${reason}`;
-    }).find((message) => message !== void 0);
-    if (wide !== void 0) {
-      findings.push(finding("entry-invalid", named(citation.id, wide), subject));
-      return;
-    }
-    const encrypted = isEncryptedValue(citation.source.file);
-    if (encrypted !== isKeyedPin(citation.source.integrity)) {
-      findings.push(
-        finding(
-          "entry-invalid",
-          named(
-            citation.id,
-            encrypted ? "an encrypted source is pinned with hmac-sha256-, not sha256-." : "a plain source is pinned with sha256-, not hmac-sha256-."
-          ),
-          subject
-        )
-      );
-      return;
-    }
-    const page = { citation, origin };
-    citations.push(page);
-    if (citation.id !== void 0) {
-      if (ids.has(citation.id)) {
-        findings.push(finding("entry-invalid", `duplicate id "${citation.id}"`, subject));
-      } else {
-        ids.add(citation.id);
-        byId.set(citation.id, page);
-      }
-    }
-  });
-  const body = content.slice(bodyOffset);
-  const statements = parseStatements(body, format, {
-    offset: bodyOffset,
-    line: bodyLine
-  });
-  if (statements.length > MAX_MARKERS_PER_PAGE) {
-    findings.push(
-      finding(
-        "marker-invalid",
-        `more than ${String(MAX_MARKERS_PER_PAGE)} markers on one page (${String(statements.length)}); the rest are not read`,
-        { line: statements[MAX_MARKERS_PER_PAGE]?.line }
-      )
-    );
+  result.resolvedPath = source.resolvedPath;
+  const key = range.encrypted ? opts.key : void 0;
+  const pin = citation.source.integrity;
+  const lines = splitLines(source.text);
+  let here;
+  try {
+    here = hashLines(sliceLines2(lines, range), key);
+  } catch {
+    here = void 0;
   }
-  for (const statement of statements.slice(0, MAX_MARKERS_PER_PAGE)) {
-    const { payload } = statement;
-    if (payload.kind === "bad") {
-      findings.push(
-        finding(
-          "marker-invalid",
-          payload.json === true ? MARKER_JSON : `invalid marker: ${payload.reason}`,
-          { line: statement.line }
-        )
-      );
-      continue;
-    }
-    const target = byId.get(payload.id);
-    if (target === void 0) {
-      findings.push(
-        finding("marker-orphan", `no entry has id "${payload.id}"`, {
-          line: statement.line,
-          id: payload.id
-        })
-      );
-      continue;
-    }
-    const first = markedAt.get(target);
-    if (first !== void 0) {
-      findings.push(
-        finding(
-          "marker-repeated",
-          `${payload.id} is named by markers at lines ${String(first)} and ${String(statement.line)}; the first anchors it.`,
-          {
-            line: statement.line,
-            id: payload.id,
-            index: target.origin.index,
-            src: spellSource(target.citation.source)
-          }
-        )
-      );
-      continue;
-    }
-    markedAt.set(target, statement.line);
-    target.marker = statement;
+  if (here === pin) {
+    result.status = "current";
+    return result;
   }
-  for (const entry of citations) {
-    const { citation, origin, marker } = entry;
-    const subject = { index: origin.index, src: spellSource(citation.source) };
-    if (citation.id !== void 0) subject.id = citation.id;
-    if (origin.line !== void 0) subject.line = origin.line;
-    if (origin.kind === "manifest") subject.file = origin.file;
-    if (citation.claim?.lines !== void 0 && marker !== void 0) {
-      const onPage = { index: origin.index, line: marker.line, src: subject.src };
-      if (citation.id !== void 0) onPage.id = citation.id;
-      findings.push(
-        finding(
-          "anchor-invalid",
-          `${citation.id ?? "the entry"} has claim lines and a marker. Keep one.`,
-          onPage
-        )
-      );
-      continue;
+  let history = { kind: "none" };
+  if (commit !== void 0 && await opts.git.available()) {
+    history = await historyOf(opts.git, commit, source.resolvedPath, range, pin, key, opts.budget);
+  }
+  if (range.start !== void 0) {
+    const start = range.start;
+    const end = range.end ?? start;
+    const search = { around: start };
+    if (history.kind === "original") search.original = history.lines;
+    if (opts.budget !== void 0) search.budget = opts.budget;
+    const found = findWindows(lines, end - start + 1, pin, key, search);
+    if (found.truncated) result.truncatedSearch = true;
+    const spell = (at2) => formatSrc({ ...range, start: at2, end: at2 + (end - start) });
+    const [only] = found.starts;
+    if (found.starts.length === 1 && only !== void 0) {
+      result.status = "moved";
+      result.newSrc = spell(only);
+      result.newLines = String(lineSpec({ start: only, end: only + (end - start) }));
+      return result;
     }
-    if (citation.quote === true && citation.claim?.lines === void 0 && marker === void 0) {
-      findings.push(
-        finding("anchor-invalid", named(citation.id, "quote needs a claim or a marker."), subject)
-      );
+    if (found.starts.length > 1) {
+      result.status = "moved-ambiguous";
+      result.candidates = found.starts.map(spell);
+      return result;
     }
   }
-  return {
-    file,
-    format,
-    content,
-    bodyOffset,
-    bodyLine,
-    citations,
-    statements,
-    findings: findings.sort(byLine)
-  };
+  if (history.kind === "never-true") {
+    result.status = "never-true";
+    return result;
+  }
+  result.status = "changed";
+  if (history.kind === "unavailable") result.historyAvailable = false;
+  if (history.kind === "unknown") result.truncatedSearch = true;
+  if (history.kind === "original" && commit !== void 0) {
+    result.historyAvailable = true;
+    result.commitsSince = await opts.git.subjectsSince(commit, source.resolvedPath);
+    result.diff = await opts.git.diffSince(commit, source.resolvedPath);
+  }
+  return result;
 }
 
 // src/cite/core/shift.ts
-function spellAt(lines) {
-  return lines.start === lines.end ? `line ${String(lines.start)}` : `lines ${String(lines.start)}-${String(lines.end)}`;
-}
 function shiftedEntries(opts) {
   const { citations, at: at2, delta, bodyLine, label } = opts;
   const out = { frontmatter: [], manifest: /* @__PURE__ */ new Map() };
@@ -2168,10 +2367,6 @@ function short(commit) {
 function plural(n, noun) {
   return `${String(n)} ${noun}${n === 1 ? "" : "s"}`;
 }
-function listOf(values) {
-  if (values.length <= 1) return values.join("");
-  return `${values.slice(0, -1).join(", ")} and ${values[values.length - 1] ?? ""}`;
-}
 function citesEncrypted(src) {
   try {
     return parseSrc(src).encrypted;
@@ -2249,6 +2444,13 @@ function claimMessageFor(result) {
       return "";
   }
 }
+function misplacedMessageFor(id, marker) {
+  const place = marker.block ? `above the block at line ${String(marker.place)}` : `above line ${String(marker.place)}`;
+  return named2(
+    id,
+    `the marker at line ${String(marker.line)} splits the paragraph at ${at(marker.unit)}. Its place is ${place}.`
+  );
+}
 function sourceRuleOf(status) {
   if (status === "skipped" || status === "current") return void 0;
   return `source-${status}`;
@@ -2372,7 +2574,7 @@ async function quoteFindings(input, entry, result) {
   const { citation } = entry;
   if (citation.quote !== true || result.anchor === null) return [];
   const id = citation.id;
-  const named3 = (text) => id === void 0 ? text : `${id}: ${text}`;
+  const named4 = (text) => id === void 0 ? text : `${id}: ${text}`;
   const { page } = input;
   let block;
   if (result.anchor === "marker" && entry.marker !== void 0) {
@@ -2394,7 +2596,7 @@ async function quoteFindings(input, entry, result) {
       return [
         {
           rule: "anchor-invalid",
-          message: named3(
+          message: named4(
             `the quote's claim lines ${at2.start === at2.end ? String(at2.start) : `${String(at2.start)}-${String(at2.end)}`} are no longer a fenced block.`
           ),
           line: at2.start
@@ -2416,6 +2618,17 @@ async function quoteFindings(input, entry, result) {
     }
   ];
 }
+function markerEnd(entry, misplaced) {
+  const { marker } = entry;
+  if (marker === void 0) return {};
+  if (misplaced === void 0) return { marker: { line: marker.line } };
+  return {
+    marker: {
+      line: marker.line,
+      misplaced: { unit: spellLines(misplaced.unit), to: misplaced.to }
+    }
+  };
+}
 function anchorOf(entry, claim, page) {
   const { citation, marker } = entry;
   const hasLines = citation.claim?.lines !== void 0;
@@ -2462,13 +2675,17 @@ async function checkCitations(page, opts) {
     checkSources,
     ...opts.key === void 0 ? {} : { key: opts.key }
   };
+  const misplaced = misplacedMarkers(read, lines);
+  const misplacedAt = new Map(misplaced.map((found) => [found.line, found]));
   for (const entry of read.citations) {
-    const claim = claimEnd(read, entry, lines);
+    const split = entry.marker === void 0 ? void 0 : misplacedAt.get(entry.marker.line);
+    const claim = claimEnd(read, entry, lines, split);
     const source = classifyOpts === void 0 ? skippedSource(entry) : await classifyCitation(entry, classifyOpts);
     const result = {
       citation: entry.citation,
       origin: entry.origin,
       ...anchorOf(entry, claim, read),
+      ...markerEnd(entry, split),
       claim,
       source
     };
@@ -2489,6 +2706,30 @@ async function checkCitations(page, opts) {
       findings.push(finding2);
     }
   }
+  const misplacedLevel = severity["marker-misplaced"];
+  if (misplacedLevel !== "off") {
+    for (const found of misplaced) {
+      const entry = found.entry;
+      const finding2 = {
+        rule: "marker-misplaced",
+        ruleId: ruleId("marker-misplaced"),
+        severity: misplacedLevel,
+        message: misplacedMessageFor(entry?.citation.id, {
+          line: found.line,
+          unit: spellLines(found.unit),
+          place: found.place,
+          block: found.block
+        }),
+        line: found.line
+      };
+      if (entry !== void 0) {
+        finding2.index = entry.origin.index;
+        finding2.src = spellSource(entry.citation.source);
+        if (entry.citation.id !== void 0) finding2.id = entry.citation.id;
+      }
+      findings.push(finding2);
+    }
+  }
   findings.push(...findingsFor(results, severity));
   const wantsHistory = checkSources && read.citations.some(({ citation }) => citation.source["commit-sha"] !== void 0);
   if (wantsHistory && !await client.available()) notices.push(GIT_UNAVAILABLE_HISTORY);
@@ -3022,11 +3263,11 @@ var NAMED_SPANS = 3;
 function spellElsewhere(spans) {
   const first = spans[0];
   const noun = spans.length === 1 && first !== void 0 && first.start === first.end ? "line" : "lines";
-  const named3 = spans.slice(0, NAMED_SPANS).map((span) => spellLines(span));
-  const rest = spans.length - named3.length;
-  if (rest > 0) return `${noun} ${named3.join(", ")} and ${String(rest)} more`;
-  const last = named3.pop() ?? "";
-  return named3.length === 0 ? `${noun} ${last}` : `${noun} ${named3.join(", ")} and ${last}`;
+  const named4 = spans.slice(0, NAMED_SPANS).map((span) => spellLines(span));
+  const rest = spans.length - named4.length;
+  if (rest > 0) return `${noun} ${named4.join(", ")} and ${String(rest)} more`;
+  const last = named4.pop() ?? "";
+  return named4.length === 0 ? `${noun} ${last}` : `${noun} ${named4.join(", ")} and ${last}`;
 }
 async function runAdd(opts) {
   const cwd = resolve4(opts.cwd ?? process.cwd());
@@ -3123,11 +3364,28 @@ async function runAdd(opts) {
       const empty = emptyClaimRefusal(lines, pageLines, at2);
       if (empty !== void 0) throw new CiteError(empty);
     }
+    const split = misplacedMarkers(page, lines);
+    const held = split.find(
+      (found) => found.line >= pageLines.start && found.line <= pageLines.end
+    );
+    if (held !== void 0) {
+      throw new CiteError(
+        `${at2} holds the marker at line ${String(held.line)}, which splits its paragraph. Run manni cite update first.`
+      );
+    }
+    const inside = marker ? split.find(
+      (found) => pageLines.start >= found.unit.start && pageLines.start <= found.unit.end
+    ) : void 0;
+    if (inside !== void 0) {
+      throw new CiteError(
+        `${at2} is in the paragraph at ${spellAt(inside.unit)}, which the marker at line ${String(inside.line)} splits. Run manni cite update first.`
+      );
+    }
   }
   const client = opts.gitClient ?? gitClient(root);
   const sourceIndex = await sourceIndexFor(root, client);
   let body = content;
-  let markerAt;
+  let markerAt2;
   let claimSpan;
   let claim;
   let elsewhere = [];
@@ -3161,7 +3419,7 @@ async function runAdd(opts) {
     const statement = markerIndent(content, holding.start, format, page.bodyLine) + formatStatement(format, { kind: "ref", id: opts.id ?? "" });
     const insertAt = offsetOfLine(content, holding.start);
     body = insertStatementBefore(content, insertAt, statement);
-    markerAt = holding.start;
+    markerAt2 = holding.start;
     const unit = anchoredLines(body, insertAt + statement.length, format, quote);
     const pin = unit === void 0 ? void 0 : pinOfLines(splitLines(body), unit);
     if (unit === void 0 || pin === void 0) {
@@ -3257,7 +3515,7 @@ async function runAdd(opts) {
     ...sourceLine === void 0 ? {} : { sourceLine },
     ...placed === void 0 ? {} : { manifest: placed }
   };
-  if (markerAt !== void 0) result.markerLine = markerAt + shift;
+  if (markerAt2 !== void 0) result.markerLine = markerAt2 + shift;
   if (claimSpan !== void 0) {
     result.claimLines = { start: claimSpan.start + shift, end: claimSpan.end + shift };
   }
@@ -3268,10 +3526,10 @@ async function runAdd(opts) {
     result.manifest.written = true;
   }
   if (elsewhere.length > 0) {
-    const named3 = elsewhere.map((span) => ({ start: span.start + shift, end: span.end + shift }));
+    const named4 = elsewhere.map((span) => ({ start: span.start + shift, end: span.end + shift }));
     const who = citation.id === void 0 ? "" : `${citation.id}: `;
     opts.onNotice?.(
-      `${who}the claim's text also appears at ${spellElsewhere(named3)}, so a move would be ambiguous. Use --marker, or pin more lines.`
+      `${who}the claim's text also appears at ${spellElsewhere(named4)}, so a move would be ambiguous. Use --marker, or pin more lines.`
     );
   }
   if (opts.commitSha !== false && !await client.available()) {
@@ -3374,9 +3632,9 @@ async function runRemove(opts) {
     for (const line of ordered) {
       if (!isMarkerLine(lines[line - 1] ?? "", format)) {
         const id = page.statements.find((s) => s.line === line)?.payload;
-        const named3 = id?.kind === "ref" ? ` ${id.id}` : "";
+        const named4 = id?.kind === "ref" ? ` ${id.id}` : "";
         throw new CiteError(
-          `the marker${named3} at ${label}:${String(line)} shares its line with text; remove it by hand.`
+          `the marker${named4} at ${label}:${String(line)} shares its line with text; remove it by hand.`
         );
       }
     }
@@ -3459,13 +3717,26 @@ function settles(plan) {
       return "claim-changed";
     case "source-accepted":
       return plan.result.source.status === "never-true" ? "source-never-true" : "source-changed";
+    case "marker-moved":
+      return "marker-misplaced";
+    case "claim-reanchored":
+      return "claim-moved";
+    // A shifted entry was `current`, so it had no finding to settle.
+    case "claim-shifted":
+      return "";
   }
 }
 function apply(content, format, plan) {
   const index = plan.result.origin.index;
   switch (plan.kind) {
     case "claim-moved":
+    case "claim-shifted":
       return spliceEntryField(content, format, index, ["claim", "lines"], plan.lines);
+    case "claim-reanchored":
+      return spliceEntryField(content, format, index, ["claim", "integrity"], plan.pin);
+    // The move is a page rewrite, applied to the whole page before any splice.
+    case "marker-moved":
+      return content;
     case "source-moved":
       return spliceEntryField(content, format, index, ["source", "lines"], plan.lines);
     case "claim-accepted": {
@@ -3498,12 +3769,22 @@ function applyToEntry(entry, plan) {
   if (!isRecord3(entry)) return false;
   const end = (name) => isRecord3(entry[name]) ? entry[name] : void 0;
   switch (plan.kind) {
-    case "claim-moved": {
+    case "claim-moved":
+    case "claim-shifted": {
       const claim = end("claim");
       if (claim === void 0) return false;
       claim.lines = plan.lines;
       return true;
     }
+    case "claim-reanchored": {
+      const claim = end("claim");
+      if (claim === void 0) return false;
+      claim.integrity = plan.pin;
+      return true;
+    }
+    // The page holds the marker, so the manifest has nothing to change.
+    case "marker-moved":
+      return true;
     case "source-moved": {
       const source = end("source");
       if (source === void 0) return false;
@@ -3534,7 +3815,56 @@ function rewriteOf(plan) {
   if (origin.line !== void 0) base.line = origin.line;
   switch (plan.kind) {
     case "claim-moved":
-      return { ...base, end: "claim", reason: "moved", status: "moved", from: plan.from, to: plan.to };
+      return {
+        ...base,
+        end: "claim",
+        reason: "moved",
+        status: "moved",
+        from: plan.from,
+        to: plan.to,
+        fromLines: plan.from,
+        toLines: plan.to
+      };
+    case "marker-moved": {
+      const from = String(plan.from);
+      const to = String(plan.to);
+      return {
+        ...base,
+        end: "marker",
+        reason: "re-anchored",
+        status: "misplaced",
+        from,
+        to,
+        fromLines: from,
+        toLines: to
+      };
+    }
+    case "claim-reanchored": {
+      const was = citation.claim?.integrity ?? "";
+      return {
+        ...base,
+        end: "claim",
+        reason: "re-anchored",
+        status: "moved",
+        from: was,
+        to: plan.pin,
+        fromPin: was,
+        toPin: plan.pin,
+        lines: plan.held,
+        newLines: plan.now
+      };
+    }
+    case "claim-shifted":
+      return {
+        ...base,
+        end: "claim",
+        reason: "shifted",
+        status: "current",
+        from: plan.from,
+        to: plan.to,
+        fromLines: plan.from,
+        toLines: plan.to
+      };
     case "source-moved":
       return {
         ...base,
@@ -3545,19 +3875,21 @@ function rewriteOf(plan) {
         to: plan.to
       };
     case "claim-accepted": {
+      const was = citation.claim?.integrity ?? "";
       const out = {
         ...base,
         end: "claim",
         reason: "accepted",
         status: "changed",
-        from: citation.claim?.integrity ?? "",
+        from: was,
         to: plan.pin,
+        fromPin: was,
+        toPin: plan.pin,
         at: plan.unit.lines.start,
         text: normalizeWhitespace(plan.unit.text.join("\n"))
       };
-      if (plan.result.anchor === "marker" && plan.result.markerLine !== void 0) {
-        out.markerLine = plan.result.markerLine;
-      }
+      const markerLine = plan.markerLine ?? (plan.result.anchor === "marker" ? plan.result.markerLine : void 0);
+      if (markerLine !== void 0) out.markerLine = markerLine;
       return out;
     }
     case "source-accepted": {
@@ -3568,6 +3900,8 @@ function rewriteOf(plan) {
         status: source.status === "never-true" ? "never-true" : "changed",
         from: citation.source.integrity,
         to: plan.minted.source.integrity,
+        fromPin: citation.source.integrity,
+        toPin: plan.minted.source.integrity,
         src: source.src
       };
       const commit = plan.minted.source["commit-sha"];
@@ -3576,26 +3910,157 @@ function rewriteOf(plan) {
     }
   }
 }
+function named3(id, text) {
+  return id === void 0 ? text : `${id}: ${text}`;
+}
+function crossing(page, misplaced) {
+  for (const other of page.citations) {
+    const spec = other.citation.claim?.lines;
+    const recorded = spec === void 0 ? void 0 : parseLines(spec);
+    if (recorded === void 0) continue;
+    const file = toFileLines(recorded, page.bodyLine);
+    const holdsMarker = file.start <= misplaced.line && misplaced.line <= file.end;
+    const holdsPlace = file.start < misplaced.place && misplaced.place <= file.end;
+    if (!holdsMarker && !holdsPlace) continue;
+    return other.citation.id === void 0 ? `the claim at ${spellAt(file)}` : `the claim of ${other.citation.id} (${spellAt(file)})`;
+  }
+  return void 0;
+}
+function decideMarkers(input) {
+  const { page, report, lines, accept, only } = input;
+  const out = { moves: [], stays: [] };
+  for (const misplaced of misplacedMarkers(page, lines)) {
+    const entry = misplaced.entry;
+    const line = misplaced.line;
+    const stay = (rule, message) => {
+      out.stays.push({ line, rule, message });
+    };
+    if (entry === void 0) {
+      if (only !== void 0) continue;
+      const own = report.findings.find(
+        (finding2) => finding2.line === line && finding2.rule.startsWith("marker-") && finding2.rule !== "marker-misplaced"
+      );
+      stay(
+        own?.rule ?? "marker-orphan",
+        `the marker at line ${String(line)} stays, because it names no entry update can check.`
+      );
+      continue;
+    }
+    const id = entry.citation.id;
+    if (only !== void 0 && (id === void 0 || !only.has(id))) continue;
+    const result = report.citations.find((r) => r.origin.index === entry.origin.index);
+    if (result === void 0) continue;
+    if (entry.citation.claim?.lines !== void 0) {
+      stay(
+        "anchor-invalid",
+        named3(id, `the marker at line ${String(line)} stays, because the entry also has claim lines. Keep one.`)
+      );
+      continue;
+    }
+    const across = crossing(page, misplaced);
+    if (across !== void 0) {
+      stay(
+        "marker-misplaced",
+        named3(id, `the marker at line ${String(line)} stays, because moving it would change ${across}.`)
+      );
+      continue;
+    }
+    if (result.claim !== null && result.claim.status === "changed" && !accept) {
+      stay(
+        "marker-misplaced",
+        named3(
+          id,
+          `the marker at line ${String(line)} stays, because its claim changed since it was pinned. update --accept moves it and re-pins.`
+        )
+      );
+      continue;
+    }
+    out.moves.push({ result, entry, misplaced });
+  }
+  return out;
+}
+function anchoredNow(content, format, lines, markerLine, quote) {
+  const at2 = offsetOfLine(content, markerLine) + (lines[markerLine - 1]?.length ?? 0);
+  const span = anchoredLines(content, at2, format, quote);
+  if (span === void 0) return void 0;
+  const pin = pinOfLines(lines, span);
+  return pin === void 0 ? void 0 : { span, pin };
+}
+function codeOf(error) {
+  if (typeof error !== "object" || error === null || !("code" in error)) return void 0;
+  const code = error.code;
+  return typeof code === "string" ? code : void 0;
+}
+var WrittenFiles = class {
+  before = /* @__PURE__ */ new Map();
+  labels = /* @__PURE__ */ new Map();
+  /** Remember what `path` held before this run wrote it. */
+  record(path, label, content) {
+    if (!this.before.has(path)) {
+      this.before.set(path, content);
+      this.labels.set(path, label);
+    }
+  }
+  /**
+   * Put every file back, and say what happened: `<file> could not be written
+   * (<code>). <pages> was restored.`
+   */
+  async restore(file, error) {
+    const restored = [];
+    const failed = [];
+    for (const [path, content] of this.before) {
+      const label = this.labels.get(path) ?? path;
+      try {
+        await writeFileAtomic(path, content);
+        restored.push(label);
+      } catch {
+        failed.push(label);
+      }
+    }
+    const code = codeOf(error);
+    const why = code === void 0 ? "" : ` (${code})`;
+    const parts = [`${file} could not be written${why}.`];
+    if (restored.length > 0) {
+      parts.push(`${listOf(restored)} ${restored.length === 1 ? "was" : "were"} restored.`);
+    }
+    if (failed.length > 0) {
+      parts.push(
+        `${listOf(failed)} could not be restored, and ${failed.length === 1 ? "holds" : "hold"} an intermediate state.`
+      );
+    }
+    return new CiteError(parts.join(" "));
+  }
+};
+function citationsIn(rows) {
+  const withMarker = new Set(rows.filter((row) => row.end === "marker").map((row) => row.index));
+  return withMarker.size + rows.filter((row) => !withMarker.has(row.index)).length;
+}
 async function runUpdate(opts) {
   const prepared = await prepareRun(opts, "updated", "update", { require: true });
   const { run: run3, files, usingStdin, forced, pageOptions, git } = prepared;
   assertNoOrphans(prepared);
   const hits = joinHits();
   const manifests = new ManifestSet();
+  const writes = new WrittenFiles();
   const only = opts.only !== void 0 && opts.only.length > 0 ? new Set(opts.only) : void 0;
   const accept = opts.accept === true;
-  const plansFor = async (result, entry, page, lines, declined) => {
+  const plansFor = async (result, entry, page, lines, lineNow, declined) => {
     const out = [];
     const claim = result.claim;
-    if (claim !== null && claim.status === "moved" && claim.newLines !== void 0) {
+    if (result.anchor !== "marker" && claim !== null && claim.status === "moved" && claim.newLines !== void 0) {
       const at2 = parseLines(claim.newLines);
-      if (at2 !== void 0) {
+      const shifted = at2 === void 0 ? void 0 : (() => {
+        const file = toFileLines(at2, page.bodyLine);
+        const to = { start: lineNow(file.start), end: lineNow(file.end) };
+        return to.end - to.start === file.end - file.start ? toBodyLines(to, page.bodyLine) : void 0;
+      })();
+      if (at2 !== void 0 && shifted !== void 0) {
         out.push({
           kind: "claim-moved",
           result,
-          lines: lineSpec(at2),
+          lines: lineSpec(shifted),
           from: claim.fileLines ?? "",
-          to: claim.newFileLines ?? ""
+          to: spellLines(toFileLines(shifted, page.bodyLine))
         });
       }
     }
@@ -3606,8 +4071,8 @@ async function runUpdate(opts) {
       }
     }
     if (!accept) return out;
-    if (claim !== null && claim.status === "changed" && entry !== void 0) {
-      const unit = result.anchor === "marker" ? markerUnit(page, entry, lines) : (() => {
+    if (claim !== null && claim.status === "changed" && entry !== void 0 && result.anchor !== "marker") {
+      const unit = (() => {
         const at2 = claimLine(claim);
         return at2 === void 0 ? void 0 : unitAt(page, at2, lines);
       })();
@@ -3615,7 +4080,10 @@ async function runUpdate(opts) {
       const pin = unit === void 0 ? void 0 : pinOfLines(lines, unit.lines);
       const wide = unit === void 0 ? void 0 : tooWide(unit.lines);
       if (unit !== void 0 && wide !== void 0) {
-        declined.set(result.origin.index, `Not re-pinned: the ${unit.kind} ${wide}.`);
+        declined.set(result.origin.index, {
+          rule: "claim-changed",
+          why: `Not re-pinned: the ${unit.kind} ${wide}.`
+        });
       } else if (unit !== void 0 && pin !== void 0 && (!wantsBlock || unit.kind === "block")) {
         const plan = { kind: "claim-accepted", result, unit, pin };
         if (entry.citation.claim?.lines !== void 0) {
@@ -3651,6 +4119,7 @@ async function runUpdate(opts) {
     if (setup.sidecar !== void 0) hits.record(setup.sidecar, label);
     const report = await checkCitations({ file: label, content, format: forced?.name }, setup.options);
     const { format } = report;
+    const severity = resolveSeverity(setup.options.severity);
     const page = readPage(label, content, {
       ...forced === void 0 ? {} : { format: forced.name },
       ...setup.options.citations === void 0 ? {} : { citations: setup.options.citations },
@@ -3660,18 +4129,105 @@ async function runUpdate(opts) {
     const rewritten2 = [];
     const settled = /* @__PURE__ */ new Set();
     const declined = /* @__PURE__ */ new Map();
-    let after = content;
+    const markers = decideMarkers({ page, report, lines, accept, only });
+    const movedPage = markers.moves.length === 0 ? void 0 : applyMarkerMoves(
+      content,
+      markers.moves.map(({ misplaced }) => ({
+        from: misplaced.line,
+        place: misplaced.place
+      })),
+      (line) => markerIndent(content, line, format, page.bodyLine)
+    );
+    let after = movedPage?.content ?? content;
+    const afterLines = movedPage === void 0 ? lines : splitLines(after);
+    const movedIndexes = new Set(markers.moves.map(({ entry }) => entry.origin.index));
+    const lineNow = (line) => movedPage?.line(line) ?? line;
     const owner = setup.sidecar?.owner;
     const entries = setup.sidecar?.citations === void 0 ? void 0 : JSON.parse(JSON.stringify(setup.sidecar.citations.map((c) => c.entry)));
     let manifestDirty = false;
     for (const result of report.citations) {
-      if (only !== void 0 && (result.citation.id === void 0 || !only.has(result.citation.id))) {
-        continue;
-      }
+      const selected = only === void 0 || result.citation.id !== void 0 && only.has(result.citation.id);
       const entry = page.citations.find((c) => c.origin.index === result.origin.index);
-      for (const plan of await plansFor(result, entry, page, lines, declined)) {
-        if (result.origin.kind === "manifest") {
-          if (entries === void 0 || !applyToEntry(entries[result.origin.index], plan)) continue;
+      const plans = [];
+      const move = selected ? markers.moves.find((m) => m.entry.origin.index === result.origin.index) : void 0;
+      if (move !== void 0) {
+        plans.push({
+          kind: "marker-moved",
+          result,
+          from: move.misplaced.line,
+          to: lineNow(move.misplaced.line)
+        });
+      }
+      const marker = entry?.marker;
+      const recorded = entry?.citation.claim?.integrity;
+      if (selected && result.anchor === "marker" && marker !== void 0 && recorded !== void 0 && result.claim !== null) {
+        const quote = entry?.citation.quote === true;
+        const now = anchoredNow(after, format, afterLines, lineNow(marker.line), quote);
+        const status = result.claim.status;
+        if (now !== void 0 && now.pin !== recorded) {
+          if (status === "moved" || status === "current" && move !== void 0) {
+            plans.push({
+              kind: "claim-reanchored",
+              result,
+              pin: now.pin,
+              held: result.claim.fileLines ?? "",
+              now: spellLines(now.span)
+            });
+          } else if (status === "changed" && accept) {
+            const kind = quote ? "block" : "paragraph";
+            const wide = tooWide(now.span);
+            if (wide !== void 0) {
+              declined.set(result.origin.index, {
+                rule: "claim-changed",
+                why: `Not re-pinned: the ${kind} ${wide}.`
+              });
+            } else {
+              plans.push({
+                kind: "claim-accepted",
+                result,
+                pin: now.pin,
+                markerLine: lineNow(marker.line),
+                unit: {
+                  lines: now.span,
+                  kind,
+                  text: afterLines.slice(now.span.start - 1, now.span.end)
+                }
+              });
+            }
+          }
+        }
+      }
+      if (selected) {
+        plans.push(...await plansFor(result, entry, page, lines, lineNow, declined));
+      }
+      const spec = entry?.citation.claim?.lines;
+      const wentElsewhere = result.claim?.status === "moved";
+      if (movedPage !== void 0 && spec !== void 0 && !wentElsewhere && !plans.some((p) => p.kind === "claim-moved")) {
+        const at2 = parseLines(spec);
+        const file = at2 === void 0 ? void 0 : toFileLines(at2, page.bodyLine);
+        const to = file === void 0 ? void 0 : { start: lineNow(file.start), end: lineNow(file.end) };
+        if (file !== void 0 && to !== void 0 && to.end - to.start === file.end - file.start && (to.start !== file.start || to.end !== file.end)) {
+          plans.push({
+            kind: "claim-shifted",
+            result,
+            lines: lineSpec(toBodyLines(to, page.bodyLine)),
+            from: spellLines(file),
+            to: spellLines(to)
+          });
+        }
+      }
+      for (const plan of plans) {
+        if (plan.kind === "marker-moved") {
+        } else if (result.origin.kind === "manifest") {
+          const held = entries?.[result.origin.index];
+          if (held === void 0) {
+            declined.set(result.origin.index, {
+              rule: settles(plan),
+              why: `Not rewritten: ${owner?.file ?? "the manifest"} has no entry at index ${String(result.origin.index)}.`
+            });
+            continue;
+          }
+          if (!applyToEntry(held, plan)) continue;
           manifestDirty = true;
         } else {
           after = apply(after, format, plan);
@@ -3680,6 +4236,7 @@ async function runUpdate(opts) {
         settled.add(`${String(result.origin.index)}\0${settles(plan)}`);
       }
     }
+    for (const index of movedIndexes) settled.add(`${String(index)}\0marker-misplaced`);
     if (manifestDirty && owner !== void 0 && entries !== void 0) {
       if (setup.sidecar?.entry === void 0) {
         throw new CiteError(
@@ -3688,15 +4245,34 @@ async function runUpdate(opts) {
       }
       await manifests.write(owner, setup.sidecar.entry, entries, 0);
     }
+    const stayAt = new Map(markers.stays.map((stay) => [stay.line, stay]));
     const skipped2 = report.findings.filter(
       (finding2) => (only === void 0 || finding2.id !== void 0 && only.has(finding2.id)) && !settled.has(`${String(finding2.index ?? -1)}\0${finding2.rule}`)
     ).map((finding2) => {
-      const why = finding2.rule === "claim-changed" && finding2.index !== void 0 ? declined.get(finding2.index) : void 0;
+      if (finding2.rule === "marker-misplaced") {
+        const stay = stayAt.get(finding2.line ?? -1);
+        if (stay === void 0) return finding2;
+        const level = severity[stay.rule];
+        return {
+          ...finding2,
+          message: stay.message,
+          ...level === "off" ? {} : { severity: level }
+        };
+      }
+      const turned = finding2.index === void 0 ? void 0 : declined.get(finding2.index);
+      const why = turned?.rule === finding2.rule ? turned.why : void 0;
       return why === void 0 ? finding2 : { ...finding2, message: `${finding2.message} ${why}` };
     });
     const diff = after === content ? "" : unifiedDiff(label, content, after);
     const written = after !== content && path !== void 0 && opts.dryRun !== true;
-    if (written) await writeFileAtomic(path, after);
+    if (written) {
+      try {
+        await writeFileAtomic(path, after);
+      } catch (error) {
+        throw await writes.restore(label, error);
+      }
+      writes.record(path, label, content);
+    }
     const out = { file: label, rewritten: rewritten2, skipped: skipped2, diff, written };
     if (path === void 0) out.content = after;
     pages.push(out);
@@ -3712,14 +4288,21 @@ async function runUpdate(opts) {
   const rewrittenManifests = [];
   for (const changed of changedManifests) {
     const write = opts.dryRun !== true;
-    if (write) await writeFileAtomic(changed.path, changed.text);
+    if (write) {
+      try {
+        await writeFileAtomic(changed.path, changed.text);
+      } catch (error) {
+        throw await writes.restore(changed.file, error);
+      }
+      writes.record(changed.path, changed.file, changed.before);
+    }
     rewrittenManifests.push({ file: changed.file, diff: changed.diff, written: write });
   }
   const reminted = pages.some(
     (page) => page.rewritten.some((r) => r.reason === "accepted" && r.end === "source")
   );
   sayNotices(reports, opts.onNotice, reminted && !await git.available() ? [GIT_UNAVAILABLE_COMMIT] : []);
-  const rewritten = pages.reduce((n, page) => n + page.rewritten.length, 0);
+  const rewritten = pages.reduce((n, page) => n + citationsIn(page.rewritten), 0);
   const skipped = pages.reduce((n, page) => n + page.skipped.length, 0);
   const undone = pages.some((page) => page.skipped.some((finding2) => finding2.severity === "error"));
   return {
@@ -3907,13 +4490,15 @@ function citesEncrypted2(src) {
   }
 }
 function claimColumn(result) {
-  const { claim } = result;
-  const where = result.anchor === "marker" && result.markerLine !== void 0 ? `marker :${String(result.markerLine)}` : claim?.fileLines === void 0 ? "" : `:${claim.fileLines}`;
+  const { claim, marker } = result;
+  const anchoredByMarker = result.anchor === "marker" && result.markerLine !== void 0;
+  const moves = marker?.misplaced === void 0 ? "" : ` -> :${String(marker.misplaced.to)}`;
+  const where = anchoredByMarker ? `marker :${String(result.markerLine ?? 0)}${moves}` : claim?.fileLines === void 0 ? "" : `:${claim.fileLines}`;
   if (claim === null) return where;
   let status;
   switch (claim.status) {
     case "moved":
-      status = `moved -> :${claim.newFileLines ?? "?"}`;
+      status = anchoredByMarker ? "moved" : `moved -> :${claim.newFileLines ?? "?"}`;
       break;
     case "moved-ambiguous": {
       const at2 = (claim.candidateFileLines ?? []).map((lines) => `:${lines}`);
@@ -4003,7 +4588,7 @@ function renderCheckPretty(run3, opts) {
       if (own.length === 0 && quiet) continue;
       const worst = live.find((f) => f.severity === "error") ?? live.find((f) => f.severity === "warning") ?? live[0];
       const mark = worst !== void 0 ? severityMark(worst.severity, c) : own.length > 0 ? c.dim("\xB7") : result.source.status === "skipped" && result.claim === null ? c.dim("\xB7") : c.green("\u2713");
-      const endRules = /* @__PURE__ */ new Set(["claim-", "source-"]);
+      const endRules = /* @__PURE__ */ new Set(["claim-", "source-", "marker-misplaced"]);
       const under = [];
       for (const finding2 of own) {
         const isEnd = [...endRules].some((prefix) => finding2.rule.startsWith(prefix));
@@ -4062,9 +4647,45 @@ function renderCheckPretty(run3, opts) {
   }
   return lines.join("\n");
 }
+function spellAtSpec(spec) {
+  const span = spanOf(spec);
+  return span === void 0 ? `lines ${spec}` : spellAt(span);
+}
+function spanOf(spec) {
+  const [first, second] = spec.split("-");
+  const start = Number(first);
+  const end = second === void 0 ? start : Number(second);
+  if (!Number.isFinite(start) || !Number.isFinite(end)) return void 0;
+  return { start, end };
+}
+function widening(held, now) {
+  const was = spanOf(held);
+  const is = spanOf(now);
+  if (was === void 0 || is === void 0) return "";
+  const parts = [];
+  if (is.start < was.start) {
+    parts.push(spellAt({ start: is.start, end: Math.min(was.start - 1, is.end) }));
+  }
+  if (is.end > was.end) {
+    parts.push(spellAt({ start: Math.max(was.end + 1, is.start), end: is.end }));
+  }
+  if (parts.length === 0) return ", which held a marker line";
+  return `, ${parts.join(" and ")} newly pinned`;
+}
 function rewriteLine(rewrite) {
   const word = rewrite.from.includes("-") ? "lines" : "line";
   const status = rewrite.status === "never-true" ? "never true" : rewrite.status;
+  if (rewrite.end === "marker") {
+    return `marker line ${rewrite.from} -> ${rewrite.to} (misplaced)`;
+  }
+  if (rewrite.reason === "shifted") {
+    return `claim ${word} ${rewrite.from} -> ${rewrite.to} (shifted by a marker)`;
+  }
+  if (rewrite.reason === "re-anchored") {
+    const held = rewrite.lines ?? "";
+    const now = rewrite.newLines ?? "";
+    return `claim re-pinned over ${spellAtSpec(now)} (moved; was ${spellAtSpec(held)}${widening(held, now)})`;
+  }
   if (rewrite.reason === "moved") {
     return rewrite.end === "claim" ? `claim ${word} ${rewrite.from} -> ${rewrite.to} (moved)` : `source ${shortSrc(rewrite.from)} -> ${shortSrc(rewrite.to)} (moved)`;
   }
@@ -4118,8 +4739,8 @@ function spellLineList(at2, noun) {
 function removalLine(removal, c) {
   const markers = spellLineList(removal.markerLines, "line");
   if (removal.origin === void 0) {
-    const named3 = removal.markerLines.length === 1 ? "the marker" : "the markers";
-    return `removed ${named3} ${c.cyan(removal.id ?? "")} at ${markers}, which named no entry`;
+    const named4 = removal.markerLines.length === 1 ? "the marker" : "the markers";
+    return `removed ${named4} ${c.cyan(removal.id ?? "")} at ${markers}, which named no entry`;
   }
   const name = removal.id ?? `/citations/${String(removal.index ?? 0)}`;
   const where = removal.origin.kind === "manifest" ? `${removal.origin.file}${removal.origin.line === void 0 ? "" : `:${String(removal.origin.line)}`}` : "frontmatter";
@@ -4183,6 +4804,7 @@ function publicCitation(result) {
     ...result.citation.id === void 0 ? {} : { id: result.citation.id },
     origin,
     anchor: result.anchor,
+    ...result.marker === void 0 ? {} : { marker: result.marker },
     claim,
     source
   };
@@ -4664,13 +5286,13 @@ export {
   isSeverity,
   meetsSeverity,
   reencryptMetadata,
-  codeRegions,
-  codeEndAt,
   CiteError,
   asCiteError,
+  spellSource,
   RULE_ID_PREFIX,
   isCiteRule,
-  spellSource,
+  codeRegions,
+  codeEndAt,
   shortPin,
   shortCommit,
   shortSrc,
@@ -4693,4 +5315,4 @@ export {
   runKeyRotate,
   runKeySet
 };
-//# sourceMappingURL=chunk-P4KR3XFD.js.map
+//# sourceMappingURL=chunk-NFCH7HCA.js.map