@mrsf/cli 0.2.0 → 0.2.2

package/dist/commands/reanchor.js

@@ -8,7 +8,7 @@ import { readDocumentLines } from "../lib/parser.js";
 import { sidecarToDocument } from "../lib/discovery.js";
 import { resolveSidecarPaths } from "../lib/resolve-files.js";
 import { writeSidecar } from "../lib/writer.js";
-import { findRepoRoot, getStagedFiles } from "../lib/git.js";
+import { findRepoRoot, getStagedFiles, getCurrentCommit } from "../lib/git.js";
 import { reanchorDocument, applyReanchorResults, } from "../lib/reanchor.js";
 export function registerReanchor(program) {
     program
@@ -20,6 +20,7 @@ export function registerReanchor(program) {
         .option("--no-git", "Disable git integration")
         .option("--from <commit>", "Override from-commit for all comments")
         .option("--update-text", "Also update selected_text to match current document text")
+        .option("-f, --force", "Firmly anchor high-confidence results (update commit to HEAD, clear audit fields)")
         .action(async (files, opts) => {
         const parentOpts = program.opts();
         const cwd = parentOpts.cwd ?? process.cwd();
@@ -70,6 +71,7 @@ export function registerReanchor(program) {
                 const docPath = sidecarToDocument(sp);
                 const lines = await readDocumentLines(docPath);
                 const repoRoot = !noGit ? await findRepoRoot(cwd) : null;
+                const headCommit = repoRoot ? await getCurrentCommit(repoRoot) : undefined;
                 const results = await reanchorDocument(doc, lines, {
                     threshold,
                     noGit,
@@ -82,6 +84,8 @@ export function registerReanchor(program) {
                 if (!opts.dryRun) {
                     const changed = applyReanchorResults(doc, results, {
                         updateText: opts.updateText,
+                        force: opts.force,
+                        headCommit: headCommit ?? undefined,
                     });
                     totalChanged += changed;
                     if (changed > 0) {
@@ -93,6 +97,8 @@ export function registerReanchor(program) {
                     const clone = structuredClone(doc);
                     totalChanged += applyReanchorResults(clone, results, {
                         updateText: opts.updateText,
+                        force: opts.force,
+                        headCommit: headCommit ?? undefined,
                     });
                 }
                 if (!quiet) {

package/dist/index.d.ts

@@ -14,5 +14,5 @@ export { exactMatch, normalizedMatch, fuzzySearch, combinedScore, } from "./lib/
 export { isGitAvailable, findRepoRoot, getCurrentCommit, isStale, getDiff, getLineShift, getFileAtCommit, getStagedFiles, detectRenames, parseDiffHunks, } from "./lib/git.js";
 export { reanchorComment, reanchorDocument, applyReanchorResults, reanchorFile, } from "./lib/reanchor.js";
 export { addComment, populateSelectedText, resolveComment, unresolveComment, removeComment, filterComments, getThreads, summarize, } from "./lib/comments.js";
-export type { CommentSummary } from "./lib/comments.js";
+export type { CommentSummary, RemoveCommentOptions } from "./lib/comments.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/lib/comments.d.ts

@@ -23,10 +23,23 @@ export declare function resolveComment(doc: MrsfDocument, commentId: string, cas
  * Unresolve a comment by id.
  */
 export declare function unresolveComment(doc: MrsfDocument, commentId: string): boolean;
+export interface RemoveCommentOptions {
+    /**
+     * When true, also delete all direct replies instead of promoting them.
+     * Default: false (promote replies per §9.1).
+     */
+    cascade?: boolean;
+}
 /**
- * Remove a comment by id. Returns true if found and removed.
+ * Remove a comment by id. Per §9.1, direct replies are promoted:
+ * their anchor fields are inherited from the parent (when absent),
+ * and their `reply_to` is re-pointed to the parent's parent (or cleared).
+ *
+ * If `cascade` is true, direct replies are removed along with the parent.
+ *
+ * Returns true if the comment was found and removed.
  */
-export declare function removeComment(doc: MrsfDocument, commentId: string): boolean;
+export declare function removeComment(doc: MrsfDocument, commentId: string, opts?: RemoveCommentOptions): boolean;
 /**
  * Filter comments based on criteria.
  */

package/dist/lib/comments.js

@@ -122,14 +122,58 @@ export function unresolveComment(doc, commentId) {
 // ---------------------------------------------------------------------------
 // Remove
 // ---------------------------------------------------------------------------
+/** Anchor fields that a reply may inherit from its parent on deletion. */
+const ANCHOR_FIELDS = [
+    "line",
+    "end_line",
+    "start_column",
+    "end_column",
+    "selected_text",
+    "selected_text_hash",
+    "anchored_text",
+    "commit",
+];
 /**
- * Remove a comment by id. Returns true if found and removed.
+ * Remove a comment by id. Per §9.1, direct replies are promoted:
+ * their anchor fields are inherited from the parent (when absent),
+ * and their `reply_to` is re-pointed to the parent's parent (or cleared).
+ *
+ * If `cascade` is true, direct replies are removed along with the parent.
+ *
+ * Returns true if the comment was found and removed.
  */
-export function removeComment(doc, commentId) {
-    const idx = doc.comments.findIndex((c) => c.id === commentId);
-    if (idx === -1)
+export function removeComment(doc, commentId, opts) {
+    const comment = doc.comments.find((c) => c.id === commentId);
+    if (!comment)
         return false;
-    doc.comments.splice(idx, 1);
+    if (opts?.cascade) {
+        // Remove direct replies first
+        doc.comments = doc.comments.filter((c) => c.id === commentId || c.reply_to !== commentId);
+    }
+    else {
+        // Promote direct replies (§9.1)
+        for (const c of doc.comments) {
+            if (c.reply_to !== commentId)
+                continue;
+            // Copy missing anchor fields from the parent
+            for (const field of ANCHOR_FIELDS) {
+                if (c[field] == null && comment[field] != null) {
+                    c[field] = comment[field];
+                }
+            }
+            // Re-point reply_to to grandparent (or clear if parent was root)
+            if (comment.reply_to) {
+                c.reply_to = comment.reply_to;
+            }
+            else {
+                delete c.reply_to;
+            }
+        }
+    }
+    // Remove the parent comment itself
+    const idx = doc.comments.findIndex((c) => c.id === commentId);
+    if (idx !== -1)
+        doc.comments.splice(idx, 1);
     return true;
 }
 // ---------------------------------------------------------------------------

package/dist/lib/reanchor.d.ts

@@ -33,6 +33,8 @@ export declare function reanchorDocument(doc: MrsfDocument, documentLines: strin
  */
 export declare function applyReanchorResults(doc: MrsfDocument, results: ReanchorResult[], opts?: {
     updateText?: boolean;
+    force?: boolean;
+    headCommit?: string;
 }): number;
 /**
  * High-level re-anchor for a single sidecar file path.

package/dist/lib/reanchor.js

@@ -45,8 +45,24 @@ export function reanchorComment(comment, documentLines, opts = {}) {
     // -----------------------------------------------------------------------
     // Step 0: Diff-based shift
     // -----------------------------------------------------------------------
-    if (selectedText && comment.line != null && opts.diffHunks?.length) {
+    if (comment.line != null && opts.diffHunks?.length) {
         const { shift, modified } = getLineShift(opts.diffHunks, comment.line);
+        // For line-only comments (no selected_text), apply the diff shift directly
+        if (!selectedText) {
+            const shiftedLine = comment.line + shift;
+            const lineSpan = comment.end_line != null ? comment.end_line - comment.line : 0;
+            const shiftedEndLine = comment.end_line != null ? shiftedLine + lineSpan : undefined;
+            return {
+                commentId,
+                status: shift === 0 ? "anchored" : "shifted",
+                score: 1.0,
+                newLine: shiftedLine,
+                newEndLine: shiftedEndLine,
+                reason: shift === 0
+                    ? "Line-only comment unchanged (diff confirms position)."
+                    : `Line-only comment shifted by ${shift > 0 ? "+" : ""}${shift} line(s) via diff.`,
+            };
+        }
         if (!modified) {
             const shiftedLine = comment.line + shift;
             const lineSpan = comment.end_line != null ? comment.end_line - comment.line : 0;
@@ -167,13 +183,18 @@ export function reanchorComment(comment, documentLines, opts = {}) {
                 }
             }
             // Pure line fallback
+            // If there's no selected_text, the comment is purely line-anchored.
+            // A commit change alone doesn't make it ambiguous — we accept it as-is.
+            const isLineOnly = !selectedText;
             return {
                 commentId,
-                status: opts.commitIsStale ? "ambiguous" : "anchored",
-                score: opts.commitIsStale ? 0.5 : 0.8,
+                status: isLineOnly ? "anchored" : (opts.commitIsStale ? "ambiguous" : "anchored"),
+                score: isLineOnly ? 1.0 : (opts.commitIsStale ? 0.5 : 0.8),
                 newLine: comment.line,
                 newEndLine: comment.end_line,
-                reason: `Line/column fallback${qualifier}.`,
+                reason: isLineOnly
+                    ? "Line-only comment (no selected_text to verify)."
+                    : `Line/column fallback${qualifier}.`,
             };
         }
     }
@@ -320,6 +341,22 @@ export function applyReanchorResults(doc, results, opts = {}) {
             comment.x_reanchor_status = result.status;
             comment.x_reanchor_score = result.score;
         }
+        // --force: firmly anchor high-confidence results
+        // Update commit to HEAD and clear audit fields so the comment
+        // won't be re-evaluated on the next reanchor run.
+        if (opts.force &&
+            opts.headCommit &&
+            (result.status === "anchored" || result.status === "shifted") &&
+            result.score >= HIGH_THRESHOLD) {
+            comment.commit = opts.headCommit;
+            delete comment.x_reanchor_status;
+            delete comment.x_reanchor_score;
+            // Clear stale anchored_text since anchor is now confirmed
+            if (comment.anchored_text && comment.anchored_text === comment.selected_text) {
+                delete comment.anchored_text;
+            }
+            isChanged = true;
+        }
         if (isChanged)
             changed++;
     }
@@ -333,6 +370,7 @@ export async function reanchorFile(sidecarPath, opts = {}) {
     const docPath = sidecarToDocument(sidecarPath);
     const documentLines = await readDocumentLines(docPath);
     const repoRoot = !opts.noGit ? await findRepoRoot(opts.cwd) : null;
+    const headCommit = repoRoot ? await getCurrentCommit(repoRoot) : undefined;
     const results = await reanchorDocument(doc, documentLines, {
         ...opts,
         documentPath: docPath,
@@ -341,7 +379,11 @@ export async function reanchorFile(sidecarPath, opts = {}) {
     let changed = 0;
     let written = false;
     if (!opts.dryRun) {
-        changed = applyReanchorResults(doc, results, { updateText: opts.updateText });
+        changed = applyReanchorResults(doc, results, {
+            updateText: opts.updateText,
+            force: opts.force,
+            headCommit: headCommit ?? undefined,
+        });
         if (changed > 0 || opts.autoUpdate) {
             await writeSidecar(sidecarPath, doc);
             written = true;

package/dist/lib/types.d.ts

@@ -143,6 +143,8 @@ export interface ReanchorOptions extends BaseOptions {
     fromCommit?: string;
     /** Update selected_text to match anchored_text (opt-in per §6.2). */
     updateText?: boolean;
+    /** Force-anchor: update commit to HEAD and clear audit fields for high-confidence results. */
+    force?: boolean;
 }
 export interface ValidateOptions extends BaseOptions {
     /** Treat warnings as errors. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrsf/cli",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "CLI and library for the Markdown Review Sidecar Format (MRSF)",
   "type": "module",
   "main": "./dist/index.js",