@mrsf/cli 0.7.0 → 0.8.0

package/dist/commands/add.js

@@ -7,7 +7,7 @@ import { discoverSidecar, findWorkspaceRoot } from "../lib/discovery.js";
 import { parseSidecar, readDocumentLines } from "../lib/parser.js";
 import { writeSidecar } from "../lib/writer.js";
 import { addComment, populateSelectedText } from "../lib/comments.js";
-import { findRepoRoot } from "../lib/git.js";
+import { findRepoRoot, getGitUserName } from "../lib/git.js";
 function collectOptionValues(value, previous) {
     previous.push(value);
     return previous;
@@ -52,12 +52,12 @@ export function registerAdd(program) {
     program
         .command("add <document>")
         .description("Add a review comment to a document's sidecar")
-        .requiredOption("-a, --author <name>", "Comment author")
+        .option("-a, --author <name>", "Comment author (defaults to repository-local Git user.name)")
         .requiredOption("-t, --text <text>", "Comment text")
         .option("-l, --line <n>", "Line number (1-based)")
         .option("--end-line <n>", "End line (inclusive)")
-        .option("--start-column <n>", "Start column (0-based)")
-        .option("--end-column <n>", "End column (0-based)")
+        .option("--start-column <n>", "Inclusive UTF-16 column (0-based)")
+        .option("--end-column <n>", "Exclusive UTF-16 column (0-based)")
         .option("--type <type>", "Comment type (e.g. suggestion, issue)")
         .option("--severity <level>", "Severity: low | medium | high")
         .option("--reply-to <id>", "Reply to an existing comment")
@@ -84,9 +84,17 @@ export function registerAdd(program) {
                 comments: [],
             };
         }
-        const repoRoot = await findRepoRoot(cwd);
+        const repoRoot = await findRepoRoot(path.dirname(docPath));
+        const author = opts.author?.trim()
+            || (repoRoot ? await getGitUserName(repoRoot) : null);
+        if (!author) {
+            console.error(chalk.red("Comment author is required. Pass --author or configure "
+                + "repository-local Git identity with: "
+                + "git config --local user.name \"Your Name\""));
+            process.exit(1);
+        }
         const comment = await addComment(doc, {
-            author: opts.author,
+            author,
             text: opts.text,
             line: opts.line ? parseInt(opts.line, 10) : undefined,
             end_line: opts.endLine ? parseInt(opts.endLine, 10) : undefined,
@@ -108,7 +116,7 @@ export function registerAdd(program) {
         else if (comment.line != null) {
             try {
                 const lines = await readDocumentLines(docPath);
-                populateSelectedText(comment, lines);
+                populateSelectedText(comment, lines.slice(1));
             }
             catch {
                 // Document file may not exist yet, skip

package/dist/index.cjs

@@ -221,6 +221,7 @@ __export(index_exports, {
   getCurrentCommit: () => getCurrentCommit2,
   getDiff: () => getDiff2,
   getFileAtCommit: () => getFileAtCommit2,
+  getGitUserName: () => getGitUserName2,
   getLineShift: () => getLineShift4,
   getStagedFiles: () => getStagedFiles2,
   getThreads: () => getThreads2,
@@ -380,6 +381,7 @@ init_parser();
 var import_promises3 = require("node:fs/promises");
 var import_node_fs2 = require("node:fs");
 var import_node_crypto = require("node:crypto");
+var import_promises4 = require("node:timers/promises");
 var import_node_path4 = __toESM(require("node:path"), 1);
 var import_yaml2 = require("yaml");
 init_serialize();
@@ -400,7 +402,17 @@ async function atomicWriteFile(filePath, content) {
   const tmp = filePath + "." + (0, import_node_crypto.randomBytes)(6).toString("hex") + ".tmp";
   try {
     await (0, import_promises3.writeFile)(tmp, content, "utf-8");
-    await (0, import_promises3.rename)(tmp, filePath);
+    for (let attempt = 0; ; attempt++) {
+      try {
+        await (0, import_promises3.rename)(tmp, filePath);
+        break;
+      } catch (error) {
+        if (attempt >= 5 || !(error instanceof Error) || !("code" in error) || !["EPERM", "EACCES", "EBUSY"].some((code) => code === error.code)) {
+          throw error;
+        }
+        await (0, import_promises4.setTimeout)(50 * (attempt + 1));
+      }
+    }
   } catch (err) {
     try {
       await (0, import_promises3.unlink)(tmp);
@@ -710,7 +722,7 @@ async function writeSidecarInternal(abs, doc) {
 }
 
 // src/lib/validator.ts
-var import_promises4 = require("node:fs/promises");
+var import_promises5 = require("node:fs/promises");
 var import_node_path5 = __toESM(require("node:path"), 1);
 var import_node_url = require("node:url");
 
@@ -804,12 +816,12 @@ var mrsf_schema_default = {
           start_column: {
             type: "integer",
             minimum: 0,
-            description: "Starting column index (0-based) within the starting line."
+            description: "Inclusive starting UTF-16 code-unit offset (0-based) within the starting line."
           },
           end_column: {
             type: "integer",
             minimum: 0,
-            description: "Ending column index. MUST be >= start_column when on the same line."
+            description: "Exclusive ending UTF-16 code-unit offset (0-based) within the ending line. MUST be >= start_column when on the same line."
           },
           selected_text: {
             type: "string",
@@ -974,7 +986,7 @@ async function loadSchema() {
   ];
   for (const candidate of candidates) {
     try {
-      const raw = await (0, import_promises4.readFile)(candidate, "utf-8");
+      const raw = await (0, import_promises5.readFile)(candidate, "utf-8");
       _schemaCache = JSON.parse(raw);
       return _schemaCache;
     } catch {
@@ -1352,6 +1364,20 @@ async function findRepoRoot(cwd) {
     return null;
   }
 }
+async function getGitUserName(repoRoot) {
+  if (!await isGitAvailable()) return null;
+  try {
+    const { stdout } = await execFile(
+      "git",
+      ["config", "--local", "--get", "user.name"],
+      { cwd: repoRoot, timeout: GIT_TIMEOUT }
+    );
+    const name = stdout.trim();
+    return name || null;
+  } catch {
+    return null;
+  }
+}
 async function getCurrentCommit(repoRoot) {
   if (!await isGitAvailable()) return null;
   try {
@@ -2849,7 +2875,7 @@ async function reanchorDocument(doc, documentLines, opts = {}) {
   if (!opts.noGit && await isGitAvailable()) {
     const repoRoot = opts.repoRoot ?? await findRepoRoot(opts.cwd);
     if (repoRoot && opts.documentPath) {
-      const relPath = import_node_path6.default.relative(repoRoot, opts.documentPath);
+      const relPath = import_node_path6.default.relative(repoRoot, opts.documentPath).split(import_node_path6.default.sep).join("/");
       const head = await getCurrentCommit(repoRoot);
       const globalFrom = opts.fromCommit;
       const diffCache = /* @__PURE__ */ new Map();
@@ -3255,6 +3281,7 @@ var fuzzySearch2 = fuzzySearch;
 var combinedScore2 = combinedScore;
 var isGitAvailable2 = isGitAvailable;
 var findRepoRoot3 = findRepoRoot;
+var getGitUserName2 = getGitUserName;
 var getCurrentCommit2 = getCurrentCommit;
 var resolveCommit2 = resolveCommit;
 var isStale2 = isStale;
@@ -3315,6 +3342,7 @@ var newCommentId2 = newCommentId;
   getCurrentCommit,
   getDiff,
   getFileAtCommit,
+  getGitUserName,
   getLineShift,
   getStagedFiles,
   getThreads,