dotmd-cli 0.42.0 → 0.42.1

package/bin/dotmd.mjs

@@ -1126,6 +1126,8 @@ async function main() {
   if (config.presets[command]) {
     const { buildIndex } = await import('../src/index.mjs');
     const { runQuery } = await import('../src/query.mjs');
+    const { scrubStaleSilently } = await import('../src/lease-scrub.mjs');
+    scrubStaleSilently(config);
     const index = buildIndex(config);
     runQuery(index, [...config.presets[command], ...restArgs], config, { preset: command });
     return;
@@ -1138,6 +1140,8 @@ async function main() {
   if (command === 'plans') {
     const { buildIndex } = await import('../src/index.mjs');
     const { runQuery } = await import('../src/query.mjs');
+    const { scrubStaleSilently } = await import('../src/lease-scrub.mjs');
+    scrubStaleSilently(config);
     const index = buildIndex(config);
     const sub = restArgs[0];
     let defaults;
@@ -1209,6 +1213,14 @@ async function main() {
   const { buildIndex } = await import('../src/index.mjs');
   const { renderCompactList, renderVerboseList, renderContext, renderBriefing, renderCheck, renderCoverage, buildCoverage } = await import('../src/render.mjs');
   const { runFocus, runQuery } = await import('../src/query.mjs');
+  // Opportunistic stale-lease scrub for user-facing "what's actionable now"
+  // views. Diagnostic commands (`check`, `coverage`, `stats`, `index`) are
+  // intentionally excluded — they should surface drift, not silently fix it.
+  const SCRUB_READ_COMMANDS = new Set(['list', 'briefing', 'context', 'focus', 'query', 'modules', 'module', 'surfaces']);
+  if (SCRUB_READ_COMMANDS.has(command)) {
+    const { scrubStaleSilently } = await import('../src/lease-scrub.mjs');
+    scrubStaleSilently(config);
+  }
   const index = buildIndex(config);
 
   // Apply --root and --type filters

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dotmd-cli",
-  "version": "0.42.0",
+  "version": "0.42.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

@@ -1,6 +1,7 @@
 import { existsSync, mkdirSync, readdirSync, readFileSync, writeFileSync } from 'node:fs';
 import path from 'node:path';
-import { readLeases, findStaleLeases, currentSessionId } from './lease.mjs';
+import { readLeases, findStaleLeases, currentSessionId, STALE_LEASE_AGE_HOURS } from './lease.mjs';
+import { scrubStaleSilently } from './lease-scrub.mjs';
 import { extractFrontmatter, parseSimpleFrontmatter } from './frontmatter.mjs';
 import { asString, toRepoPath } from './util.mjs';
 import { green, yellow, red, dim } from './color.mjs';
@@ -67,6 +68,12 @@ function findActionablePrompts(config) {
 }
 
 export function buildHud(config) {
+  // Drop stale lease entries (and flip their plan frontmatter back to
+  // oldStatus) before reading anything. Without this, hud would surface
+  // zombie in-session plans from crashed sessions as "you hold N plans" if
+  // the SessionStart hook sees its own (now-stale) lease from a previous
+  // session that shared the same env-supplied session id.
+  try { scrubStaleSilently(config); } catch { /* hot-path: never break hud */ }
   const session = currentSessionId();
   const leases = readLeases(config);
   const owned = Object.values(leases).filter(l => l.session === session).map(l => l.path);
@@ -115,7 +122,7 @@ export function runHud(argv, config) {
     lines.push(green(`▶ ${hud.prompts.length} pending prompt${hud.prompts.length === 1 ? '' : 's'}: ${previewList(hud.prompts)}  ${dim('(consume: `dotmd prompts use <file>` — do not cat/read)')}`));
   }
   if (hud.stale.length > 0) {
-    lines.push(yellow(`⚠ ${hud.stale.length} stuck lease${hud.stale.length === 1 ? '' : 's'} >24h  ${dim('(run: dotmd release --stale)')}`));
+    lines.push(yellow(`⚠ ${hud.stale.length} stuck lease${hud.stale.length === 1 ? '' : 's'} >${STALE_LEASE_AGE_HOURS}h  ${dim('(run: dotmd release --stale)')}`));
   }
   if (hud.errors > 0) {
     lines.push(red(`✗ ${hud.errors} validation error${hud.errors === 1 ? '' : 's'}  ${dim('(run: dotmd check)')}`));

package/src/lease-scrub.mjs

@@ -0,0 +1,49 @@
+import { readFileSync, writeFileSync } from 'node:fs';
+import path from 'node:path';
+import { releaseStale } from './lease.mjs';
+import { extractFrontmatter, parseSimpleFrontmatter } from './frontmatter.mjs';
+import { asString, nowIso } from './util.mjs';
+
+// Inline status flip, kept local so this module doesn't have to pull in
+// lifecycle.mjs (and the rest of its dep graph) on the SessionStart-hook hot
+// path. Matches the shape of lifecycle.updateFrontmatter for these two keys.
+function flipStatus(filePath, newStatus) {
+  const raw = readFileSync(filePath, 'utf8');
+  if (!raw.startsWith('---\n')) return;
+  const endMarker = raw.indexOf('\n---\n', 4);
+  if (endMarker === -1) return;
+  let fm = raw.slice(4, endMarker);
+  const body = raw.slice(endMarker + 5);
+  const today = nowIso();
+  const statusRe = /^status:.*$/m;
+  const updatedRe = /^updated:.*$/m;
+  fm = statusRe.test(fm) ? fm.replace(statusRe, `status: ${newStatus}`) : `${fm}\nstatus: ${newStatus}`;
+  fm = updatedRe.test(fm) ? fm.replace(updatedRe, `updated: ${today}`) : `${fm}\nupdated: ${today}`;
+  writeFileSync(filePath, `---\n${fm}\n---\n${body}`, 'utf8');
+}
+
+// Opportunistic stale-lease scrub for read-side commands. Drops any lease
+// entries past STALE_LEASE_AGE_MS and best-effort flips the plan's frontmatter
+// from in-session back to the lease's oldStatus. Silent: no stderr, no warn,
+// no index regen. Returns array of scrubbed lease paths (empty in the common
+// no-op case, which is the only thing that matters for cost).
+export function scrubStaleSilently(config) {
+  const result = releaseStale(config);
+  if (result.released.length === 0) return [];
+  for (const lease of result.released) {
+    const newStatus = lease.oldStatus || 'active';
+    const filePath = path.join(config.repoRoot, lease.path);
+    try {
+      const raw = readFileSync(filePath, 'utf8');
+      const { frontmatter: fmRaw } = extractFrontmatter(raw);
+      const parsedFm = parseSimpleFrontmatter(fmRaw);
+      if (asString(parsedFm.status) === 'in-session') {
+        flipStatus(filePath, newStatus);
+      }
+    } catch {
+      // Best-effort: the lease entry is already gone; a missing or unreadable
+      // file is fine for an opportunistic backstop.
+    }
+  }
+  return result.released.map(l => l.path);
+}

package/src/lease.mjs

@@ -9,7 +9,8 @@ const LOCK_FILE = 'in-session.lock';
 const LOCK_STALE_MS = 5_000;
 const LOCK_RETRY_MS = 50;
 const LOCK_MAX_WAIT_MS = 2_000;
-const STALE_LEASE_AGE_MS = 24 * 60 * 60 * 1000;
+export const STALE_LEASE_AGE_MS = 4 * 60 * 60 * 1000;
+export const STALE_LEASE_AGE_HOURS = STALE_LEASE_AGE_MS / (60 * 60 * 1000);
 
 const _sleepBuf = new Int32Array(new SharedArrayBuffer(4));
 function syncSleep(ms) { Atomics.wait(_sleepBuf, 0, 0, ms); }

package/src/lifecycle.mjs

@@ -15,6 +15,8 @@ import {
   readLeases,
   currentSessionId,
   migrateLease,
+  STALE_LEASE_AGE_MS,
+  STALE_LEASE_AGE_HOURS,
 } from './lease.mjs';
 import { buildCard, renderCard } from './pickup-card.mjs';
 import { walkSections, findSection } from './section.mjs';
@@ -245,6 +247,17 @@ export async function runPickup(argv, config, opts = {}) {
   const showFiles = argv.includes('--show-files') || opts.showFiles;
   let input = argv.find(a => !a.startsWith('-'));
 
+  // Opportunistic stale-lease scrub before pickup runs its conflict check.
+  // Without this, a stale lease from a crashed prior session would still
+  // produce 'conflict-stale' and force the agent to pass --takeover even
+  // though we already know the holder is gone.
+  if (!dryRun) {
+    try {
+      const { scrubStaleSilently } = await import('./lease-scrub.mjs');
+      scrubStaleSilently(config);
+    } catch { /* best-effort — never block pickup on scrub failure */ }
+  }
+
   // Interactive: pick from active/planned plans
   if (!input) {
     if (!isInteractive()) die('Usage: dotmd pickup <file>');
@@ -317,7 +330,7 @@ export async function runPickup(argv, config, opts = {}) {
     }
     if (result.outcome === 'conflict-stale') {
       const c = result.conflict;
-      die(`Stale in-session lease from ${c.host}/${c.session} since ${c.pickedUpAt} (>24h old).\nUse --takeover to claim.\n  ${repoPath}`);
+      die(`Stale in-session lease from ${c.host}/${c.session} since ${c.pickedUpAt} (>${STALE_LEASE_AGE_HOURS}h old).\nUse --takeover to claim.\n  ${repoPath}`);
     }
     if (oldStatus !== 'in-session') {
       updateFrontmatter(filePath, { status: 'in-session', updated: today });
@@ -459,7 +472,7 @@ export async function runUnpickup(argv, config, opts = {}) {
     if (dryRun) {
       const staleLeases = Object.values(leases).filter(l => {
         const age = Date.now() - new Date(l.pickedUpAt).getTime();
-        return Number.isNaN(age) || age > 24 * 60 * 60 * 1000;
+        return Number.isNaN(age) || age > STALE_LEASE_AGE_MS;
       });
       for (const l of staleLeases) {
         process.stderr.write(`${dim('[dry-run]')} Would release stale: ${l.path} (${l.session})\n`);
@@ -473,9 +486,10 @@ export async function runUnpickup(argv, config, opts = {}) {
       }
     }
   } else {
-    if (targets.length === 0 && !json) {
-      process.stderr.write(`No leases to release${fileArg ? ` for ${fileArg}` : ` for session ${session}`}.\n`);
-    }
+    // Silent no-op: when the session has nothing to release (already
+    // auto-released by archive, or never held), exit 0 with no output.
+    // Only print when work was actually done. The fileArg path can't reach
+    // here with targets.length === 0 — it would have died at lookup.
     for (const lease of targets) {
       const newStatus = targetStatus(lease);
       if (dryRun) {

package/src/ship.mjs

@@ -48,10 +48,17 @@ function listDirtyFiles(repoRoot) {
   return result.stdout
     .split('\n')
     .filter(Boolean)
-    .map(line => ({
-      status: line.slice(0, 2),
-      path: line.slice(3),
-    }));
+    .map(line => {
+      const status = line.slice(0, 2);
+      let rawPath = line.slice(3);
+      // Renames/copies render as `R  orig -> new` (and `C  orig -> new`); only
+      // the destination is a real file we can `git add`. Without splitting on
+      // ` -> `, the literal "orig -> new" string is handed to git, which fails
+      // with "did not match any files" and aborts the ship.
+      const arrow = rawPath.indexOf(' -> ');
+      if (arrow !== -1) rawPath = rawPath.slice(arrow + 4);
+      return { status, path: rawPath };
+    });
 }
 
 function findHeldPlanTitle(config) {

package/src/validate.mjs

@@ -2,7 +2,7 @@ import path from 'node:path';
 import { asString, resolveRefPath, suggestCandidates } from './util.mjs';
 import { getGitLastModified, getGitLastModifiedBatch } from './git.mjs';
 import { toRepoPath } from './util.mjs';
-import { readLeases, isLeaseStale } from './lease.mjs';
+import { readLeases, isLeaseStale, STALE_LEASE_AGE_HOURS } from './lease.mjs';
 
 const NOW = new Date();
 
@@ -175,9 +175,10 @@ export function validateDoc(doc, frontmatter, headingTitle, config) {
 
   // F11: `status: in-session` plans should have a matching live lease. If the
   // lease file has no entry, the previous session crashed without releasing;
-  // if the entry is stale (>24h), the holder is gone. Either way the validator
-  // is the only place that knows enough to suggest the exact unstuck command,
-  // because the lease infrastructure is otherwise invisible to `dotmd check`.
+  // if the entry is stale (> stale-threshold hours), the holder is gone.
+  // Either way the validator is the only place that knows enough to suggest
+  // the exact unstuck command, because the lease infrastructure is otherwise
+  // invisible to `dotmd check`.
   if (doc.status === 'in-session' && !config.lifecycle.skipWarningsFor.has(doc.status)) {
     const leases = readLeases(config);
     const lease = leases[doc.path];
@@ -192,7 +193,7 @@ export function validateDoc(doc, frontmatter, headingTitle, config) {
       doc.warnings.push({
         path: doc.path,
         level: 'warning',
-        message: `\`status: in-session\` but lease is stale (last touched ${ageHours}h ago, >24h threshold). Run \`dotmd release ${doc.path}\` to clear, or \`dotmd status ${doc.path} active\` to re-queue.`,
+        message: `\`status: in-session\` but lease is stale (last touched ${ageHours}h ago, >${STALE_LEASE_AGE_HOURS}h threshold). Run \`dotmd release ${doc.path}\` to clear, or \`dotmd status ${doc.path} active\` to re-queue.`,
       });
     }
   }