dotmd-cli 0.49.3 → 0.49.4

package/package.json

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

package/src/lifecycle.mjs

@@ -1,7 +1,7 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
 import path from 'node:path';
 import { extractFrontmatter, parseSimpleFrontmatter } from './frontmatter.mjs';
-import { asString, toRepoPath, die, warn, resolveDocPath, resolveRefPath, escapeRegex, nowIso, suggestCandidates, emitFilesFooter } from './util.mjs';
+import { asString, toRepoPath, die, warn, resolveDocPath, resolveRefPath, escapeRegex, nowIso, suggestCandidates, emitFilesFooter, isArchivedPath } from './util.mjs';
 import { gitMv, getGitLastModified, getGitLastModifiedBatch } from './git.mjs';
 import { buildIndex, collectDocFiles } from './index.mjs';
 import { renderIndexFile, writeIndex } from './index-file.mjs';
@@ -169,7 +169,7 @@ export async function runStatus(argv, config, opts = {}) {
   const archiveDir = path.join(fileRoot, config.archiveDir);
   const relFromRoot = path.relative(fileRoot, filePath);
   const relSegments = relFromRoot.split(path.sep);
-  const inArchive = relFromRoot.startsWith(config.archiveDir + '/') || relFromRoot.startsWith(config.archiveDir + path.sep);
+  const inArchive = isArchivedPath(toRepoPath(filePath, config.repoRoot), config);
   const isArchiving = config.lifecycle.archiveStatuses.has(newStatus) && !inArchive;
   const isUnarchiving = !config.lifecycle.archiveStatuses.has(newStatus) && inArchive;
 
@@ -620,8 +620,15 @@ export function runArchive(argv, config, opts = {}) {
     appendVersionHistory(filePath, `Archived (frontmatter healed in place from \`${oldStatus}\`).`);
     if (!noIndex) regenIndex(config);
     out.write(`${green('✓ Healed')}: ${repoPathHeal} (${oldStatus} → archived; file already under \`${config.archiveDir}/\`)\n`);
-    if (showFiles) emitFilesFooter([repoPathHeal, config.indexPath], config);
-    return;
+    const touched = [repoPathHeal];
+    if (config.indexPath && !noIndex) touched.push(config.indexPath);
+    if (showFiles) emitFilesFooter(touched, config);
+    return {
+      action: 'healed',
+      oldRepoPath: repoPathHeal,
+      newRepoPath: repoPathHeal,
+      touched,
+    };
   }
 
   const closeoutAction = closeoutTemplate ? planCloseoutInjection(body) : null;
@@ -701,7 +708,12 @@ export function runArchive(argv, config, opts = {}) {
 
   try { config.hooks.onArchive?.({ path: newRepoPath, oldStatus }, { oldPath: oldRepoPath, newPath: newRepoPath }); } catch (err) { warn(`Hook 'onArchive' threw: ${err.message}`); }
 
-  return { touched };
+  return {
+    action: 'archived',
+    oldRepoPath,
+    newRepoPath,
+    touched,
+  };
 }
 
 // Unified status-transition verb. Collapses status/archive/release into one
@@ -763,9 +775,7 @@ export async function runSet(argv, config, opts = {}) {
   const parsedFm = parseSimpleFrontmatter(fmRaw);
   const oldStatus = asString(parsedFm.status);
 
-  const fileRoot = findFileRoot(filePath, config);
-  const relFromRoot = path.relative(fileRoot, filePath);
-  const inArchive = relFromRoot.startsWith(config.archiveDir + '/') || relFromRoot.startsWith(config.archiveDir + path.sep);
+  const inArchive = isArchivedPath(toRepoPath(filePath, config.repoRoot), config);
 
   if (config.lifecycle.archiveStatuses.has(newStatus) && !inArchive) {
     const archiveArgs = [filePath];
@@ -807,11 +817,7 @@ export function runBulkArchive(argv, config, opts = {}) {
     }
   }
 
-  const unique = [...new Set(matched)].filter(f => {
-    const root = findFileRoot(f, config);
-    const rel = path.relative(root, f);
-    return !rel.startsWith(config.archiveDir + '/') && !rel.startsWith(config.archiveDir + path.sep);
-  });
+  const unique = [...new Set(matched)].filter(f => !isArchivedPath(toRepoPath(f, config.repoRoot), config));
   if (unique.length === 0) die('No matching files found (already-archived files are excluded).');
 
   process.stdout.write(`${unique.length} file(s) to archive:\n`);

package/src/prompts.mjs

@@ -243,7 +243,7 @@ export function consumePrompt(filePath, config, opts) {
   if (docType !== 'prompt') {
     die(`Not a prompt (type: ${docType ?? 'unknown'}): ${repoPath}`);
   }
-  if (status === 'archived') {
+  if (status === 'archived' || isArchivedPath(repoPath, config)) {
     die(`Already consumed: ${repoPath}`);
   }
 
@@ -267,12 +267,13 @@ export function consumePrompt(filePath, config, opts) {
   // ever being archived, and the next session sees the same prompt as pending.
   // Body is already in memory from extractFrontmatter, so the source file
   // can move out from under us safely.
-  runArchive([filePath], config, { noIndex, showFiles, out: process.stderr });
+  const archiveResult = runArchive([filePath], config, { noIndex, showFiles, out: process.stderr });
 
   process.stdout.write(body);
   if (!body.endsWith('\n')) process.stdout.write('\n');
 
-  process.stderr.write(`${green('✓ Consumed')}: ${repoPath}\n`);
+  const consumedPath = archiveResult?.newRepoPath ?? repoPath;
+  process.stderr.write(`${green('✓ Consumed')}: ${consumedPath}\n`);
 }
 
 function runPromptsArchive(argv, config, opts = {}) {