stego-cli 0.3.0 → 0.3.2

package/dist/comments/add-comment.js

@@ -1,7 +1,8 @@
 import fs from "node:fs";
 import path from "node:path";
 import { CommentsCommandError } from "./errors.js";
-const COMMENT_HEADING_REGEX = /^###\s+(CMT-(\d{4,}))\s*$/;
+const COMMENT_DELIMITER_REGEX = /^<!--\s*comment:\s*(CMT-(\d{4,}))\s*-->\s*$/i;
+const LEGACY_COMMENT_HEADING_REGEX = /^###\s+(CMT-(\d{4,}))\s*$/i;
 const START_SENTINEL = "<!-- stego-comments:start -->";
 const END_SENTINEL = "<!-- stego-comments:end -->";
 /** Adds one stego comment entry to a manuscript and writes the updated file. */
@@ -18,7 +19,7 @@ export function addCommentToManuscript(request) {
     if (!sentinelState.hasSentinels && !hasYamlFrontmatter) {
         throw new CommentsCommandError("NOT_STEGO_MANUSCRIPT", 3, "File is not recognized as a Stego manuscript (missing frontmatter and comments sentinels).");
     }
-    const commentId = getNextCommentId(lines);
+    const commentId = getNextCommentId(lines, sentinelState);
     const createdAt = new Date().toISOString();
     const meta = buildMetaPayload(request.range, request.sourceMeta);
     const meta64 = Buffer.from(JSON.stringify(meta), "utf8").toString("base64url");
@@ -75,7 +76,7 @@ function buildCommentEntryLines(commentId, timestamp, author, message, meta64) {
         .split("\n")
         .map((line) => line.trimEnd());
     return [
-        `### ${commentId}`,
+        `<!-- comment: ${commentId} -->`,
         `<!-- meta64: ${meta64} -->`,
         `> _${timestamp} | ${safeAuthor}_`,
         ">",
@@ -142,11 +143,15 @@ function findTrimmedLineIndexes(lines, target) {
     }
     return indexes;
 }
-function getNextCommentId(lines) {
+function getNextCommentId(lines, sentinelState) {
+    const candidateLines = sentinelState.hasSentinels
+        ? lines.slice(sentinelState.startIndex + 1, sentinelState.endIndex)
+        : lines;
     let maxId = 0;
-    for (const line of lines) {
-        const match = line.trim().match(COMMENT_HEADING_REGEX);
-        if (!match) {
+    for (const line of candidateLines) {
+        const trimmed = line.trim();
+        const match = trimmed.match(COMMENT_DELIMITER_REGEX) ?? trimmed.match(LEGACY_COMMENT_HEADING_REGEX);
+        if (!match || !match[2]) {
             continue;
         }
         const numeric = Number.parseInt(match[2], 10);

package/dist/stego-cli.js

@@ -430,7 +430,7 @@ function parseArgs(argv) {
         if (token.startsWith("--")) {
             const key = token.slice(2);
             const next = rest[i + 1];
-            if (!next || next.startsWith("-")) {
+            if (!next || !canBeOptionValue(next)) {
                 options[key] = true;
                 continue;
             }
@@ -441,7 +441,7 @@ function parseArgs(argv) {
         if (token.startsWith("-") && token.length > 1) {
             const key = token.slice(1);
             const next = rest[i + 1];
-            if (!next || next.startsWith("-")) {
+            if (!next || !canBeOptionValue(next)) {
                 options[key] = true;
                 continue;
             }
@@ -456,6 +456,12 @@ function parseArgs(argv) {
     }
     return { command, options };
 }
+function canBeOptionValue(token) {
+    if (token === "-") {
+        return true;
+    }
+    return !token.startsWith("-");
+}
 function resolveWorkspaceContext(rootOption) {
     if (rootOption) {
         const explicitRoot = path.resolve(process.cwd(), rootOption);
@@ -1419,19 +1425,18 @@ function parseStegoCommentThreads(lines, relativePath, baseLine, issues) {
             index += 1;
             continue;
         }
-        const headingMatch = trimmed.match(/^###\s+(CMT-\d{4})\s*$/);
-        if (!headingMatch) {
-            issues.push(makeIssue("error", "comments", "Invalid comments appendix line. Expected heading like '### CMT-0001'.", relativePath, baseLine + index));
+        const id = parseCommentThreadDelimiter(trimmed);
+        if (!id) {
+            issues.push(makeIssue("error", "comments", "Invalid comments appendix line. Expected comment delimiter '<!-- comment: CMT-0001 -->'.", relativePath, baseLine + index));
             index += 1;
             continue;
         }
-        const id = headingMatch[1];
         index += 1;
         const rowLines = [];
         const rowLineNumbers = [];
         while (index < lines.length) {
             const nextTrimmed = lines[index].trim();
-            if (/^###\s+CMT-\d{4}\s*$/.test(nextTrimmed)) {
+            if (parseCommentThreadDelimiter(nextTrimmed)) {
                 break;
             }
             rowLines.push(lines[index]);
@@ -1543,6 +1548,17 @@ function parseStegoCommentThreads(lines, relativePath, baseLine, issues) {
     }
     return comments;
 }
+function parseCommentThreadDelimiter(line) {
+    const markerMatch = line.match(/^<!--\s*comment:\s*(CMT-\d{4,})\s*-->\s*$/i);
+    if (markerMatch?.[1]) {
+        return markerMatch[1].toUpperCase();
+    }
+    const legacyHeadingMatch = line.match(/^###\s+(CMT-\d{4,})\s*$/i);
+    if (legacyHeadingMatch?.[1]) {
+        return legacyHeadingMatch[1].toUpperCase();
+    }
+    return undefined;
+}
 function decodeCommentMeta64(encoded, commentId, relativePath, lineNumber, issues) {
     let rawJson = "";
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stego-cli",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "type": "module",
   "description": "Installable CLI for the Stego writing monorepo workflow.",
   "license": "Apache-2.0",