@hawkeyexl/manni 2.3.6 → 2.3.8

package/dist/{chunk-3TVBXXJD.js → chunk-L73SKPCW.js}

@@ -61,7 +61,7 @@ import {
   supportedExtensions,
   terminalConfirm,
   toJsonText
-} from "./chunk-UUXTFBWD.js";
+} from "./chunk-EYD2RYKV.js";
 
 // src/meta/cli.ts
 import { existsSync } from "node:fs";
@@ -1517,4 +1517,4 @@ export {
   reportConfig,
   buildProgram
 };
-//# sourceMappingURL=chunk-3TVBXXJD.js.map
+//# sourceMappingURL=chunk-L73SKPCW.js.map

package/dist/{chunk-CGE2SVW7.js → chunk-TIZE6GXU.js}

@@ -70,7 +70,7 @@ import {
   withValueAt,
   writeEncryptionKey,
   writeFileAtomic
-} from "./chunk-UUXTFBWD.js";
+} from "./chunk-EYD2RYKV.js";
 
 // src/meta/core/reencrypt.ts
 import { extname } from "node:path";
@@ -2997,6 +2997,12 @@ async function runAdd(opts) {
         `${at2} runs past the ${holding.kind} at ${spellAt(holding)}. A marker anchors one paragraph.`
       );
     }
+    const unitWide = tooWide({ start: holding.start, end: holding.end });
+    if (unitWide !== void 0) {
+      throw new CiteError(
+        `${at2} is in a ${holding.kind} at ${spellAt(holding)} that ${unitWide}. A marker anchors the whole ${holding.kind}.`
+      );
+    }
     shifted = shiftedEntries(page.citations, holding.start, page.bodyLine, label);
     const statement = markerIndent(content, holding.start, format, page.bodyLine) + formatStatement(format, { kind: "ref", id: opts.id ?? "" });
     const insertAt = offsetOfLine(content, holding.start);
@@ -3213,6 +3219,9 @@ function rewriteOf(plan) {
         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;
+      }
       return out;
     }
     case "source-accepted": {
@@ -3239,7 +3248,7 @@ async function runUpdate(opts) {
   const manifests = new ManifestSet();
   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) => {
+  const plansFor = async (result, entry, page, lines, declined) => {
     const out = [];
     const claim = result.claim;
     if (claim !== null && claim.status === "moved" && claim.newLines !== void 0) {
@@ -3268,7 +3277,10 @@ async function runUpdate(opts) {
       })();
       const wantsBlock = entry.citation.quote === true;
       const pin = unit === void 0 ? void 0 : pinOfLines(lines, unit.lines);
-      if (unit !== void 0 && pin !== void 0 && (!wantsBlock || unit.kind === "block")) {
+      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}.`);
+      } 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) {
           const body = toBodyLines(unit.lines, page.bodyLine);
@@ -3311,6 +3323,7 @@ async function runUpdate(opts) {
     const lines = splitLines(content);
     const rewritten2 = [];
     const settled = /* @__PURE__ */ new Set();
+    const declined = /* @__PURE__ */ new Map();
     let after = content;
     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)));
@@ -3320,7 +3333,7 @@ async function runUpdate(opts) {
         continue;
       }
       const entry = page.citations.find((c) => c.origin.index === result.origin.index);
-      for (const plan of await plansFor(result, entry, page, lines)) {
+      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;
           manifestDirty = true;
@@ -3341,7 +3354,10 @@ async function runUpdate(opts) {
     }
     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;
+      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);
@@ -3600,6 +3616,22 @@ function claimLines(result, dim) {
   if (more > 0) out.push(dim(`        \u2026 (${plural2(more, "more line")})`));
   return out;
 }
+function anchorSortLine(result) {
+  if (result.anchor === "marker" && result.markerLine !== void 0) return result.markerLine;
+  const first = result.claim?.fileLines?.split("-")[0];
+  if (first === void 0) return void 0;
+  const line = Number.parseInt(first, 10);
+  return Number.isNaN(line) ? void 0 : line;
+}
+function rowOrder(citations) {
+  return [...citations].sort((a, b) => {
+    const left = anchorSortLine(a);
+    const right = anchorSortLine(b);
+    if (left === void 0) return right === void 0 ? 0 : 1;
+    if (right === void 0) return -1;
+    return left - right;
+  });
+}
 function padTo(text, width, plain) {
   return width <= plain ? text : text + " ".repeat(width - plain);
 }
@@ -3628,7 +3660,7 @@ function renderCheckPretty(run3, opts) {
     const isBaselined = new Set(baselined2);
     const placed = /* @__PURE__ */ new Set();
     const rows = [];
-    for (const result of page.citations) {
+    for (const result of rowOrder(page.citations)) {
       const own = page.findings.filter((f) => belongsTo(f, result) && !placed.has(f));
       for (const finding2 of own) placed.add(finding2);
       const live = own.filter((f) => !isBaselined.has(f));
@@ -3701,7 +3733,8 @@ function rewriteLine(rewrite) {
     return rewrite.end === "claim" ? `claim ${word} ${rewrite.from} -> ${rewrite.to} (moved)` : `source ${shortSrc(rewrite.from)} -> ${shortSrc(rewrite.to)} (moved)`;
   }
   if (rewrite.end === "claim") {
-    return `claim at line ${String(rewrite.at ?? 0)} re-pinned (${status}; now "${rewrite.text ?? ""}")`;
+    const where = rewrite.markerLine === void 0 ? `line ${String(rewrite.at ?? 0)}` : `marker line ${String(rewrite.markerLine)}`;
+    return `claim at ${where} re-pinned (${status}; now "${rewrite.text ?? ""}")`;
   }
   const at2 = rewrite.commitSha === void 0 ? "" : ` at ${shortCommit(rewrite.commitSha)}`;
   return `source ${shortSrc(rewrite.src ?? "")} re-pinned${at2} (${status}; ${shortPin(rewrite.from)} -> ${shortPin(rewrite.to)})`;
@@ -3781,7 +3814,11 @@ function renderCheckJson(run3) {
   return JSON.stringify({ summary: run3.summary, pages: run3.pages.map(publicPage) }, null, 2);
 }
 function renderUpdateJson(run3) {
-  return JSON.stringify(run3, null, 2);
+  const pages = run3.pages.map((page) => ({
+    ...page,
+    rewritten: page.rewritten.map(({ markerLine: _pretty, ...rewrite }) => rewrite)
+  }));
+  return JSON.stringify({ ...run3, pages }, null, 2);
 }
 
 // src/cite/reporters/github.ts
@@ -4265,4 +4302,4 @@ export {
   runKeyRotate,
   runKeySet
 };
-//# sourceMappingURL=chunk-CGE2SVW7.js.map
+//# sourceMappingURL=chunk-TIZE6GXU.js.map