dotmd-cli 0.64.2 → 0.64.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dotmd-cli",
-  "version": "0.64.2",
+  "version": "0.64.3",
   "description": "CLI for managing markdown documents with YAML frontmatter — index, query, validate, graph, export, Notion sync, AI summaries.",
   "type": "module",
   "license": "MIT",

package/src/doctor.mjs

@@ -11,6 +11,7 @@ import { checkClaudeCommands, removeGeneratedSlashCommands } from './claude-comm
 import { runMigrateTemplate } from './migrate-template.mjs';
 import { runMigratePrompts } from './migrate-prompts.mjs';
 import { runFrontmatterFix } from './frontmatter-fix.mjs';
+import { normalizeEol } from './frontmatter.mjs';
 import { toRepoPath } from './util.mjs';
 
 // Tunable thresholds for `dotmd doctor --statuses` conflation detection.
@@ -165,7 +166,7 @@ function findWorkflowDrift(config) {
   for (const filePath of collectDocFiles(config)) {
     let raw = '';
     try { raw = readFileSync(filePath, 'utf8'); } catch { continue; }
-    if (!raw.startsWith('---\n')) docsWithoutFrontmatter.push(toRepoPath(filePath, config.repoRoot));
+    if (!normalizeEol(raw).startsWith('---\n')) docsWithoutFrontmatter.push(toRepoPath(filePath, config.repoRoot));
   }
 
   const planStatusGaps = [];

package/src/frontmatter.mjs

@@ -1,24 +1,40 @@
+// Windows-authored (CRLF) docs otherwise slip past the LF-only fence detection
+// below and read as having NO frontmatter — silently dropping them from the
+// managed set (no type, no status). Normalizing CRLF→LF at every parse/rewrite
+// boundary is the fix; the per-line value parser already strips a trailing \r,
+// so only the fence scan was blind. A managed doc settles to LF the first time a
+// dotmd verb rewrites it — content-preserving line-ending normalization, not
+// corruption. For LF docs this is a no-op (the `\r` guard skips the replace), so
+// existing behavior is byte-identical.
+export function normalizeEol(text) {
+  return typeof text === 'string' && text.includes('\r') ? text.replace(/\r\n/g, '\n') : text;
+}
+
 export function extractFrontmatter(raw) {
-  if (!raw.startsWith('---\n')) {
-    return { frontmatter: '', body: raw };
+  const text = normalizeEol(raw);
+  if (!text.startsWith('---\n')) {
+    return { frontmatter: '', body: text };
   }
 
-  const endMarker = raw.indexOf('\n---\n', 4);
+  const endMarker = text.indexOf('\n---\n', 4);
   if (endMarker === -1) {
-    return { frontmatter: '', body: raw };
+    return { frontmatter: '', body: text };
   }
 
   return {
-    frontmatter: raw.slice(4, endMarker),
-    body: raw.slice(endMarker + 5),
+    frontmatter: text.slice(4, endMarker),
+    body: text.slice(endMarker + 5),
   };
 }
 
 export function replaceFrontmatter(raw, newFrontmatter) {
-  if (!raw.startsWith('---\n')) return raw;
-  const endMarker = raw.indexOf('\n---\n', 4);
+  const text = normalizeEol(raw);
+  // No frontmatter to replace: return the ORIGINAL bytes untouched (a no-op
+  // rewrite must not normalize a file the caller didn't intend to change).
+  if (!text.startsWith('---\n')) return raw;
+  const endMarker = text.indexOf('\n---\n', 4);
   if (endMarker === -1) return raw;
-  const body = raw.slice(endMarker + 5);
+  const body = text.slice(endMarker + 5);
   return `---\n${newFrontmatter}\n---\n${body}`;
 }
 
@@ -34,6 +50,16 @@ export function replaceFrontmatter(raw, newFrontmatter) {
 //   folded block scalar    `key: >\n  one line\n  continues`         → "one line continues"
 //   literal block scalar   `key: |\n  one\n  two`                    → "one\ntwo"
 //   chomping indicators    `>-`, `|-` (strip), `>+`, `|+` (keep), default (clip to one trailing \n)
+//
+// Supported-subset boundary (deliberately NOT a full YAML parser):
+//   - Scalars stay strings except literal `true`/`false`. Numbers, null, and
+//     dates are kept verbatim as strings; callers coerce where they need a type
+//     (so `1.0`, `2025-01-01`, version strings, and numeric-looking ids survive
+//     intact rather than silently changing type).
+//   - Duplicate keys keep the FIRST occurrence; later ones are ignored (and
+//     reported via the optional `warnings` array).
+//   - Nested maps / multi-level indentation are not parsed — only top-level
+//     keys, with one level of `- ` items under an array key.
 export function parseSimpleFrontmatter(text, warnings) {
   const data = {};
   const seenDupKeys = new Set();

package/src/guard.mjs

@@ -27,6 +27,14 @@ const pkg = JSON.parse(readFileSync(path.join(__dirname, '..', 'package.json'),
 
 const SHELL_READERS = new Set(['cat', 'less', 'more', 'head', 'tail', 'bat', 'view', 'open']);
 
+// Normalize path separators so the guard's `/`-based matching also fires on
+// Windows backslash paths (`docs\prompts\foo.md`). Without this the PreToolUse
+// status-edit/commit-prompt guards silently no-op on Windows — protection
+// absent exactly where it's needed. On POSIX paths this is a no-op.
+function toSlash(p) {
+  return typeof p === 'string' ? p.replace(/\\/g, '/') : p;
+}
+
 // A path that ends in .md and sits under a `prompts/` directory is a
 // session-local saved prompt regardless of which doc root it belongs to —
 // robust across repos without needing the resolved config. Archived prompts
@@ -34,20 +42,23 @@ const SHELL_READERS = new Set(['cat', 'less', 'more', 'head', 'tail', 'bat', 'vi
 // committable history, NOT session-local, so they're explicitly excluded — the
 // guard must not block committing or reading them.
 function isPromptPath(p) {
-  if (typeof p !== 'string' || !p.endsWith('.md')) return false;
-  if (!/(^|\/)prompts\//.test(p)) return false;
-  if (/(^|\/)archived\//.test(p)) return false;
+  const s = toSlash(p);
+  if (typeof s !== 'string' || !s.endsWith('.md')) return false;
+  if (!/(^|\/)prompts\//.test(s)) return false;
+  if (/(^|\/)archived\//.test(s)) return false;
   return true;
 }
 
 // Loose "is this a dotmd-managed doc" test: a .md file under one of the
 // configured doc roots (default `docs/`). Used for the status-edit guard.
 function isManagedDoc(p, config) {
-  if (typeof p !== 'string' || !p.endsWith('.md')) return false;
+  const s = toSlash(p);
+  if (typeof s !== 'string' || !s.endsWith('.md')) return false;
   const roots = config?.docsRoots || (config?.docsRoot ? [config.docsRoot] : ['docs']);
   return roots.some(r => {
-    const base = path.basename(r);
-    return p.includes(`/${base}/`) || p.startsWith(`${base}/`) || p.includes(r);
+    const rNorm = toSlash(r).replace(/\/+$/, '');
+    const base = rNorm.split('/').pop();
+    return s.includes(`/${base}/`) || s.startsWith(`${base}/`) || s.includes(rNorm);
   });
 }
 

package/src/lifecycle.mjs

@@ -1,6 +1,6 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
 import path from 'node:path';
-import { extractFrontmatter, parseSimpleFrontmatter } from './frontmatter.mjs';
+import { extractFrontmatter, parseSimpleFrontmatter, normalizeEol } from './frontmatter.mjs';
 import { asString, toRepoPath, die, warn, resolveDocPath, resolveRefPath, escapeRegex, nowIso, suggestCandidates, emitFilesFooter, isArchivedPath } from './util.mjs';
 import { gitMv, getGitLastModifiedBatch } from './git.mjs';
 import { buildIndex, collectDocFiles, resolveDocArg } from './index.mjs';
@@ -935,7 +935,7 @@ function countRefsToUpdate(oldPath, newPath, config) {
 // — never auto-creates the section (don't surprise users on old plans/docs).
 export function appendVersionHistory(filePath, entry, { createSection = false } = {}) {
   let raw;
-  try { raw = readFileSync(filePath, 'utf8'); } catch { return false; }
+  try { raw = normalizeEol(readFileSync(filePath, 'utf8')); } catch { return false; }
   if (!raw.startsWith('---\n')) return false;
 
   const endMarker = raw.indexOf('\n---\n', 4);
@@ -979,7 +979,7 @@ export function appendVersionHistory(filePath, entry, { createSection = false }
 }
 
 export function updateFrontmatter(filePath, updates) {
-  const raw = readFileSync(filePath, 'utf8');
+  const raw = normalizeEol(readFileSync(filePath, 'utf8'));
   // Name the remedy in the error: this is where every status verb lands when a
   // doc was created outside dotmd, and "no frontmatter block" alone left
   // sessions retrying other verbs instead of fixing the doc.
@@ -1009,7 +1009,7 @@ export function updateFrontmatter(filePath, updates) {
 // to updateFrontmatter when a block already exists so callers can hand it any
 // file without pre-checking — the result is the same shape either way.
 export function writeFrontmatter(filePath, fields) {
-  const raw = readFileSync(filePath, 'utf8');
+  const raw = normalizeEol(readFileSync(filePath, 'utf8'));
   if (raw.startsWith('---\n')) {
     updateFrontmatter(filePath, fields);
     return;

package/src/new.mjs

@@ -5,7 +5,7 @@ import { toRepoPath, die, warn, nowIso, emitFilesFooter } from './util.mjs';
 import { green, dim, bold } from './color.mjs';
 import { isInteractive, promptText } from './prompt.mjs';
 import { regenIndex } from './lifecycle.mjs';
-import { extractFrontmatter, parseSimpleFrontmatter } from './frontmatter.mjs';
+import { extractFrontmatter, parseSimpleFrontmatter, normalizeEol } from './frontmatter.mjs';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const pkg = JSON.parse(readFileSync(path.join(__dirname, '..', 'package.json'), 'utf8'));
@@ -203,7 +203,7 @@ Status markers (put in heading text):
 // trap 4. Returns `{ frontmatter: object|null, body: string }`.
 function splitBodyFrontmatter(rawBody) {
   if (!rawBody || typeof rawBody !== 'string') return { frontmatter: null, body: rawBody };
-  if (!rawBody.startsWith('---\n')) return { frontmatter: null, body: rawBody };
+  if (!normalizeEol(rawBody).startsWith('---\n')) return { frontmatter: null, body: rawBody };
   const { frontmatter: fmText, body } = extractFrontmatter(rawBody);
   if (!fmText) return { frontmatter: null, body: rawBody };
   const parsed = parseSimpleFrontmatter(fmText);