dotmd-cli 0.28.2 → 0.29.1

package/package.json

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

package/src/hud.mjs

@@ -16,9 +16,23 @@ function previewList(items, max = MAX_PREVIEW) {
   return slugs.join(', ') + more;
 }
 
-function findPendingPrompts(config) {
+// Statuses that count as "actionable" for a prompt are derived from config:
+// types.prompt.context.expanded (the statuses the user wants prominently shown).
+// Falls back to ['pending'] when no prompt type is configured (defensive default
+// for stripped-down configs). This means a user who customizes
+// types.prompt.statuses to add e.g. `urgent: { context: 'expanded' }` gets that
+// status surfaced too, without needing a code change.
+export function actionablePromptStatuses(config) {
+  const promptCtx = config.typeContextConfig?.get('prompt');
+  const expanded = promptCtx?.expanded;
+  if (Array.isArray(expanded) && expanded.length > 0) return new Set(expanded);
+  return new Set(['pending']);
+}
+
+function findActionablePrompts(config) {
   const roots = config.docsRoots || (config.docsRoot ? [config.docsRoot] : []);
   const archiveDir = config.archiveDir || 'archived';
+  const actionable = actionablePromptStatuses(config);
   const found = [];
   const seen = new Set();
 
@@ -43,7 +57,7 @@ function findPendingPrompts(config) {
       if (!frontmatter) continue;
       const fm = parseSimpleFrontmatter(frontmatter);
       if (asString(fm.type) !== 'prompt') continue;
-      if (asString(fm.status) !== 'pending') continue;
+      if (!actionable.has(asString(fm.status))) continue;
       found.push(toRepoPath(filePath, config.repoRoot));
     }
   }
@@ -57,7 +71,7 @@ export function buildHud(config) {
   const owned = Object.values(leases).filter(l => l.session === session).map(l => l.path);
   const queued = listQueuedHandoffs(config).map(h => h.repoPath);
   const stale = findStaleLeases(config).map(l => l.path);
-  const prompts = findPendingPrompts(config);
+  const prompts = findActionablePrompts(config);
 
   return { owned, queued, stale, prompts };
 }

package/src/validate.mjs

@@ -5,11 +5,52 @@ import { toRepoPath } from './util.mjs';
 
 const NOW = new Date();
 
+// Type-conventional dirs are the directories where `dotmd new <type>` lands
+// live (non-archive) docs of that type. Built-ins use `dir` ('plans'/'prompts')
+// and `targetRoot`. In flat-array root configs (e.g. root: ['docs/plans',
+// 'docs/prompts']), the root itself is a type-conventional dir; in default
+// single-root configs (root: 'docs'), the type-conventional dirs are
+// '<root>/plans' and '<root>/prompts'. This helper builds the union so the
+// archive-drift check works for both layouts. Custom user templates with
+// their own `dir` would extend this; we hard-code the built-in dir names.
+const BUILTIN_TYPE_DIR_NAMES = ['plans', 'prompts'];
+
+function liveTypeDirsForRoots(config) {
+  const set = new Set();
+  const roots = config.docsRoots || (config.docsRoot ? [config.docsRoot] : []);
+  for (const root of roots) {
+    const rootRel = path.relative(config.repoRoot, root).split(path.sep).join('/');
+    // The root itself is a live dir (covers flat-array layouts where the
+    // root IS the type-container).
+    set.add(rootRel);
+    // Each builtin type-dir joined to the root (covers single-root layouts
+    // where 'docs' contains 'docs/plans' and 'docs/prompts' subdirs).
+    for (const dirName of BUILTIN_TYPE_DIR_NAMES) {
+      // Skip if root already ends in this name (no double-nesting like
+      // 'docs/prompts/prompts').
+      if (path.basename(rootRel) === dirName) continue;
+      set.add(rootRel ? `${rootRel}/${dirName}` : dirName);
+    }
+    // User template dirs from config (extend the set with whatever live
+    // dirs custom types declare).
+    for (const tmpl of Object.values(config.raw?.templates ?? {})) {
+      if (!tmpl || typeof tmpl !== 'object') continue;
+      if (tmpl.dir && path.basename(rootRel) !== tmpl.dir) {
+        set.add(rootRel ? `${rootRel}/${tmpl.dir}` : tmpl.dir);
+      }
+    }
+  }
+  return set;
+}
+
 function isValidStatus(status, root, config, type) {
-  // Union type-specific + root-specific statuses (a doc can satisfy either)
+  // When a doc declares a known type, that type's status set is authoritative.
+  // Falling through to the global union (across all types) would allow a
+  // `type: prompt` doc to carry `status: active` just because `active` is valid
+  // for plans — defeating the purpose of type-scoped vocabularies.
   if (type) {
     const typeSet = config.typeStatuses?.get(type);
-    if (typeSet && typeSet.has(status)) return true;
+    if (typeSet) return typeSet.has(status);
   }
   const rootSet = config.rootValidStatuses?.get(root);
   if (rootSet) return rootSet.has(status);
@@ -27,8 +68,11 @@ export function validateDoc(doc, frontmatter, headingTitle, config) {
   } else if (!isValidStatus(doc.status, doc.root, config, doc.type)) {
     const typeSet = doc.type && config.typeStatuses?.get(doc.type);
     const rootSet = config.rootValidStatuses?.get(doc.root);
-    const combined = new Set([...(typeSet ?? []), ...(rootSet ?? config.validStatuses)]);
-    const hint = `valid: ${[...combined].join(', ')}`;
+    // When the doc has a known type, scope the error hint to that type's vocab.
+    // Otherwise fall back to root-specific or global validStatuses.
+    const hint = typeSet
+      ? `valid for type \`${doc.type}\`: ${[...typeSet].join(', ')}`
+      : `valid: ${[...(rootSet ?? config.validStatuses)].join(', ')}`;
     doc.errors.push({ path: doc.path, level: 'error', message: `Unknown status \`${doc.status}\`; ${hint}.` });
   }
 
@@ -95,6 +139,26 @@ export function validateDoc(doc, frontmatter, headingTitle, config) {
     doc.warnings.push({ path: doc.path, level: 'warning', message: 'Archived plan missing `## Closeout` section.' });
   }
 
+  // Archive drift: a doc with an archive-flagged status (`status: archived` by
+  // default) whose parent dir is a "live" type-conventional location is
+  // misplaced — `dotmd archive` would have moved it under `<that>/archiveDir/`.
+  // Without this check, default `dotmd plans` / `dotmd prompts` views silently
+  // drop the file (because they exclude archived paths), and the user gets no
+  // signal it exists but is invisible. Nested intentional content (e.g.,
+  // `docs/plans/audit/<file>.md`) is in a non-conventional subdir and exempt.
+  if (config.lifecycle.archiveStatuses.has(doc.status)) {
+    const parentDir = path.dirname(doc.path);
+    const liveDirs = liveTypeDirsForRoots(config);
+    if (liveDirs.has(parentDir)) {
+      const expected = `${parentDir}/${config.archiveDir}/${path.basename(doc.path)}`;
+      doc.errors.push({
+        path: doc.path,
+        level: 'error',
+        message: `\`status: ${doc.status}\` but file is a direct child of \`${parentDir}/\`, not \`${parentDir}/${config.archiveDir}/\`. Run \`dotmd archive ${doc.path}\` to relocate to \`${expected}\`, or change the status.`,
+      });
+    }
+  }
+
   // Validate reference fields resolve to existing files
   const docDir = path.dirname(path.join(config.repoRoot, doc.path));
   const allRefFields = [...(config.referenceFields.bidirectional || []), ...(config.referenceFields.unidirectional || [])];