overleaf-review 0.6.0 → 0.6.2

package/README.md

@@ -212,6 +212,13 @@ Grouping applies to new pushes; it does not consolidate or accept suggestions al
 ### Holistic paragraph rewrites over reviewed suggestions and comments
 
 Use this when a paragraph rewrite intentionally incorporates or supersedes existing suggestions.
+
+To regroup existing fragmented suggestions **without changing their proposed wording**, set
+`before` and `after` to the same paragraph text and explicitly list the suggestion IDs in
+`supersedes`. Keep the local file unchanged for that block. This is supported from v0.6.1;
+the proposal must still differ from the underlying text obtained by rejecting those suggestions.
+Affected comments still require explicit anchor mappings, and all stale-plan and verification
+checks still apply. Ordinary replacements without selected suggestions cannot be no-ops.
 It differs from consolidation: the proposed text may change, and selected older suggestion cards
 are replaced by a new pending revision under the authenticated account.
 
@@ -332,6 +339,17 @@ project, verifies consolidation and protected review state, and checks that exis
 were unchanged. It does not require or spoof another account. Foreign-author preservation is also
 covered by the upstream model check. Never run this probe against a manuscript project.
 
+From v0.6.2, rejection and underlying-text reconstruction account for insertions and deletions
+at the same position, including multiple co-located deletions. The undo first restores selected
+deletions, then removes insertions at their adjusted positions; exact-text and range verification
+remain mandatory. Recreate unsubmitted plans from a fresh snapshot after upgrading, since the
+operation ordering has changed. Do not re-plan to bypass an uncertain earlier submission.
+
+`npm run probe:rejection-model` checks this ordering against pinned upstream range logic in both
+tracking modes, including consolidation and reviewed paragraph rewrites. Add `-- --backup <file>`
+to check a saved full snapshot (or a plan containing `backup`) offline. The backup stays local;
+the probe fetches only public upstream code and never connects to an Overleaf project.
+
 ### Push overrides and submission
 
 Use `--allow-overlap` only after inspecting those tracked changes. `--unsafe-no-base` is a deliberate

package/dist/{chunk-TWIDV42A.js → chunk-FBISFRYR.js}

@@ -924,11 +924,11 @@ function buildReviewEdits(source, target, options = {}) {
   }
   return groups;
 }
-function validateExplicitEdits(source, value) {
+function validateExplicitEdits(source, value, validation = {}) {
   if (!Array.isArray(value) || !value.length) throw new Error("Explicit blocks must be a nonempty array.");
   let previousEnd = -1;
   return value.map((edit) => {
-    if (!edit || !Number.isSafeInteger(edit.start) || !Number.isSafeInteger(edit.end) || edit.start < 0 || edit.end < edit.start || edit.end > source.length || typeof edit.text !== "string" || edit.start <= previousEnd || source.slice(edit.start, edit.end) === edit.text) {
+    if (!edit || !Number.isSafeInteger(edit.start) || !Number.isSafeInteger(edit.end) || edit.start < 0 || edit.end < edit.start || edit.end > source.length || typeof edit.text !== "string" || edit.start <= previousEnd || !validation.allowUnchanged && source.slice(edit.start, edit.end) === edit.text) {
       throw new Error("Explicit blocks must be valid, ordered, separated replacements with a text change.");
     }
     previousEnd = edit.end;
@@ -941,7 +941,7 @@ function applyTextEdits(source, edits) {
   }
   return source;
 }
-function parseReplacementManifest(base, value) {
+function parseReplacementManifest(base, value, validation = {}) {
   const manifest = value;
   if (!Array.isArray(manifest?.replacements) || !manifest.replacements.length) {
     throw new Error("Replacement manifest requires a nonempty replacements array.");
@@ -962,10 +962,10 @@ function parseReplacementManifest(base, value) {
     if (start === void 0) throw new Error("Replacement occurrence is absent from the saved base.");
     return { start, end: start + block.before.length, text: block.after };
   }).sort((a, b) => a.start - b.start);
-  return validateExplicitEdits(base, edits);
+  return validateExplicitEdits(base, edits, validation);
 }
-function bindExplicitEdits(base, local, live, edits, options) {
-  const checked = validateExplicitEdits(base, edits);
+function bindExplicitEdits(base, local, live, edits, options, validation = {}) {
+  const checked = validateExplicitEdits(base, edits, validation);
   if (applyTextEdits(base, checked) !== local) {
     throw new Error("Replacement manifest must describe every local change exactly.");
   }
@@ -1285,17 +1285,26 @@ function applyUndo(text, op, changeId) {
 }
 function buildRejectionPlan(currentText, ranges, requestedIds) {
   const requested = new Set(uniqueChangeIds(requestedIds));
-  const fragments = ranges.filter((range) => requested.has(range.id));
-  fragments.sort((a, b) => b.op.p - a.op.p);
+  const fragments = ranges.map((range, index) => ({ range, index })).filter(({ range }) => requested.has(range.id)).map((fragment) => ({ ...fragment, inverse: inverseOf(fragment.range) }));
+  fragments.sort((a, b) => Number(b.range.op.d !== void 0) - Number(a.range.op.d !== void 0) || b.range.op.p - a.range.op.p || a.index - b.index);
+  const restorations = fragments.filter((fragment) => "i" in fragment.inverse);
   const operations = [];
   let expectedText = currentText;
-  for (const range of fragments) {
-    const inverse = inverseOf(range);
+  let restorePosition = -1;
+  let restoredAtPosition = 0;
+  for (const { range, inverse: originalInverse } of fragments) {
+    if ("i" in originalInverse && originalInverse.p !== restorePosition) {
+      restorePosition = originalInverse.p;
+      restoredAtPosition = 0;
+    }
+    const shift = "d" in originalInverse ? restorations.reduce((sum, restored) => sum + (restored.range.op.p <= range.op.p ? restored.range.op.d.length : 0), 0) : restoredAtPosition;
+    const inverse = { ...originalInverse, p: originalInverse.p + shift };
     expectedText = applyUndo(expectedText, inverse, range.id);
     operations.push(inverse);
+    if ("i" in inverse) restoredAtPosition += inverse.i.length;
   }
   return {
-    changeIds: changeIdsInRanges(fragments),
+    changeIds: changeIdsInRanges(fragments.map((fragment) => fragment.range)),
     fragmentCount: fragments.length,
     operations,
     expectedText
@@ -2299,7 +2308,7 @@ ${doc.localPath} \u2192 ${doc.docPath} (v${doc.liveVersion}): ${doc.ops.length}
 }
 async function push(opts) {
   validatePushOptions(opts);
-  const { isReviewedManifest, createReviewedFilePlan, applyReviewedFilePlan, REVIEWED_FILE_KIND } = await import("./reviewed-replace-A7C4UNJS.js");
+  const { isReviewedManifest, createReviewedFilePlan, applyReviewedFilePlan, REVIEWED_FILE_KIND } = await import("./reviewed-replace-CW447HNG.js");
   if (opts.edits && isReviewedManifest(JSON.parse(readFileSync6(workspaceReadPath(opts.edits), "utf8")))) {
     await createReviewedFilePlan(opts);
     return;

package/dist/cli.js

@@ -39,7 +39,7 @@ import {
   uploadFile,
   validateSession,
   workspaceWritePath
-} from "./chunk-TWIDV42A.js";
+} from "./chunk-FBISFRYR.js";
 
 // src/commands/pull.ts
 import { writeFileSync, mkdirSync } from "fs";

package/dist/{reviewed-replace-A7C4UNJS.js → reviewed-replace-CW447HNG.js}

@@ -34,7 +34,7 @@ import {
   workspaceRelativePath,
   workspaceWritePath,
   writeJsonAtomic
-} from "./chunk-TWIDV42A.js";
+} from "./chunk-FBISFRYR.js";
 
 // src/commands/reviewed-replace.ts
 import { readFileSync } from "fs";
@@ -315,10 +315,13 @@ function resolveReviewedBlocks(base, local, live, value) {
   const manifest = value;
   if (!Array.isArray(manifest?.replacements) || !manifest.replacements.length) throw new Error("Reviewed manifest requires replacements.");
   const resolved = manifest.replacements.map((block) => {
-    const [edit] = parseReplacementManifest(base, { replacements: [{ before: block.before, after: block.after, occurrence: block.occurrence }] });
+    const allowUnchanged = Array.isArray(block.supersedes) && block.supersedes.length > 0;
+    const [edit] = parseReplacementManifest(base, {
+      replacements: [{ before: block.before, after: block.after, occurrence: block.occurrence }]
+    }, { allowUnchanged });
     return { ...edit, supersedes: block.supersedes ?? [], reason: block.reason, comments: block.comments ?? [] };
   }).sort((a, b) => a.start - b.start);
-  const mapped = bindExplicitEdits(base, local, live, resolved, {}).explicitEdits;
+  const mapped = bindExplicitEdits(base, local, live, resolved, {}, { allowUnchanged: true }).explicitEdits;
   return resolved.map((block, index) => ({ ...block, ...mapped[index] }));
 }
 async function createReviewedFilePlan(opts) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "overleaf-review",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "description": "The missing review layer for Overleaf's Git bridge — sync comments and tracked changes between Overleaf and your local repo.",
   "type": "module",
   "license": "MIT",
@@ -44,6 +44,7 @@
     "probe:review-live": "tsx src/probes/05-review-live.ts",
     "probe:reviewed-model": "tsx src/probes/06-reviewed-model.ts",
     "probe:reviewed-live": "tsx src/probes/07-reviewed-live.ts",
+    "probe:rejection-model": "tsx src/probes/08-rejection-model.ts",
     "typecheck": "tsc --noEmit",
     "test": "tsx --test test/*.test.ts",
     "check": "npm run typecheck && npm test && npm run build"