fdeops 3.7.2 → 3.7.4

package/bin/fde.js

@@ -93,9 +93,17 @@ function resolveEngagement() {
   // 1) explicit env (back-compat: accept old FDEOS_ENGAGEMENT too)
   const env = (process.env.FDEOPS_ENGAGEMENT || process.env.FDEOS_ENGAGEMENT || '').replace(/^~/, HOME).trim()
   if (env && fs.existsSync(env)) return env
-  // 2) workspace registry binding (written by resume --init)
+  // 2) workspace registry binding (written by resume --init). Match the cwd OR
+  // any ancestor of it - FDEs run commands from src/, packages/api/, etc., not
+  // just the repo root where they bound. Nearest (deepest) registered ancestor
+  // wins, exactly like git searching upward for .git. `startsWith(workspace +
+  // sep)` requires a true path-boundary ancestor, so /work/repo-2 never matches
+  // a binding on /work/repo. Kept in lockstep with registry_engagement_dir in
+  // hooks/session-start, session-stop, pre-compact.
   const cwd = process.cwd()
-  const reg = readRegistry().find(r => r.workspace === cwd)
+  const reg = readRegistry()
+    .filter(r => cwd === r.workspace || cwd.startsWith(r.workspace + path.sep))
+    .sort((a, b) => b.workspace.length - a.workspace.length)[0]
   if (reg) {
     const p = path.join(ENGAGEMENTS_ROOT, reg.slug, '.fde')
     if (fs.existsSync(p)) return p
@@ -111,9 +119,17 @@ function resolveEngagement() {
       }
     } catch (_) {}
   }
-  // 4) workspace dir name matches an engagement slug
+  // 4) workspace dir name matches an engagement slug. This is a convenience,
+  // NOT a binding - an unbound directory that merely happens to be named like a
+  // client (a fork, a demo, a second client with the same codename) would
+  // otherwise attach to that client's memory silently and get written into.
+  // Never silent: warn on stderr so cross-client contamination can't happen
+  // unnoticed, and tell the user how to make the binding explicit.
   const guess = path.join(ENGAGEMENTS_ROOT, slugify(path.basename(cwd)), '.fde')
-  if (fs.existsSync(guess)) return guess
+  if (fs.existsSync(guess)) {
+    process.stderr.write(`⚠ resolved engagement by directory name ("${slugify(path.basename(cwd))}"), not a saved binding. If this is the right client, run \`fde resume --init ${slugify(path.basename(cwd))}\` here to bind it; if not, you are about to read/write the WRONG client's memory.\n`)
+    return guess
+  }
   // 5) in-repo .fde (engagement-approved only)
   if (fs.existsSync(path.join(cwd, '.fde'))) return path.join(cwd, '.fde')
   return null
@@ -157,7 +173,9 @@ function sectionBody(md, heading) {
 // zero-effort floor when NO token exists anywhere - prose like "escalated to CTO,
 // resolved amicably" must not flip a client amber forever.
 function computeSignals(eng) {
-  const ctx = readEng(eng, 'context.md'); const stake = readEng(eng, 'stakeholders.md'); const risks = readEng(eng, 'risks.md')
+  // readClean, not readEng: status/dashboard echo topRisk and stakeholder lines
+  // to the terminal and the rendered HTML - a <private> risk must never surface.
+  const ctx = readClean(eng, 'context.md'); const stake = readClean(eng, 'stakeholders.md'); const risks = readClean(eng, 'risks.md')
   const phase = (ctx.match(/phase[:* ]+\**([a-z-]+)/i) || [])[1] || '?'
   let latest = null
   for (const l of stake.split('\n')) {
@@ -463,7 +481,7 @@ function cmdScan() {
   const sec = grepFiles(confFiles, /(api[_-]?key|secret|password|token)\s*[:=]\s*['"][^'"]{8,}/i, 10)
     .filter(h => !/example|template|test|sample|placeholder/i.test(h.file + h.text))
   sec.length
-    ? sec.forEach(h => out.push(`  ${h.file}:${h.line}  ${h.text.replace(/(['"])([^'"]{4})[^'"]+(['"])/, '$1$2…REDACTED$3')}`))
+    ? sec.forEach(h => out.push(`  ${h.file}:${h.line}  ${h.text.replace(/(['"])[^'"]+(['"])/, '$1REDACTED$2')}`))
     : out.push('  none found')
   out.push('  (grep-grade check - run gitleaks or trufflehog for real secret coverage)')
 
@@ -657,15 +675,42 @@ function cmdReceipts(args) {
   const eng = resolveEngagement()
   if (!eng) { console.error('no engagement - run: fde resume --init <name>'); process.exit(2) }
   const rx = new RegExp(term.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'), 'i')
-  let found = 0
-  for (const f of ['decisions.md', 'delivery.md', 'risks.md', 'stakeholders.md', 'context.md', 'success.md', 'brief.md', 'reality.md']) {
-    const p = path.join(eng, f)
-    if (!fs.existsSync(p)) continue
-    fs.readFileSync(p, 'utf8').split('\n').forEach((l, i) => {
-      if (rx.test(l)) { console.log(`${f}:${i + 1}  ${l.trim().slice(0, 160)}`); found++ }
-    })
+  // "receipts" answers "what did we AGREE?" - so dated, agreed records are the
+  // receipt. brief.md is the client's hypothesis and reality.md/context.md are
+  // working notes; a hit there is a CLAIM, not an agreement. Keeping them in the
+  // same list let an FDE cite a sales promise as a receipt - so they get a
+  // separate, clearly-labelled section that is never mistaken for the record.
+  const AGREEMENTS = ['decisions.md', 'delivery.md', 'success.md', 'risks.md', 'stakeholders.md']
+  const CLAIMS = ['brief.md', 'reality.md', 'context.md']
+  const collect = files => {
+    const hits = []
+    for (const f of files) {
+      if (!fs.existsSync(path.join(eng, f))) continue
+      // readClean, not raw read: receipts must not grep sealed <private> notes
+      // back out. Redaction can shift line numbers past a multi-line block; the
+      // file:line is advisory - not leaking a sealed secret is worth that.
+      readClean(eng, f).split('\n').forEach((l, i) => {
+        if (rx.test(l)) hits.push(`  ${f}:${i + 1}  ${l.trim().slice(0, 160)}`)
+      })
+    }
+    return hits
+  }
+  const agreed = collect(AGREEMENTS)
+  const claimed = collect(CLAIMS)
+  if (agreed.length) {
+    console.log('AGREED (dated record - defensible):')
+    agreed.forEach(h => console.log(h))
+  }
+  if (claimed.length) {
+    if (agreed.length) console.log('')
+    console.log('CLAIMS & working notes (stated, NOT an agreement - verify before citing):')
+    claimed.forEach(h => console.log(h))
+  }
+  if (!agreed.length && !claimed.length) {
+    console.log(`no record of "${term}" - nothing was ever logged about it. A gap in the record, not proof of absence: if it WAS agreed, log it now, dated today.`)
+  } else if (!agreed.length) {
+    console.log('\n(no dated agreement matched - only unverified claims above. If this was agreed, log it: fde log decision "...")')
   }
-  if (!found) console.log(`no record of "${term}" - nothing was ever logged about it. A gap in the record, not proof of absence: if it WAS agreed, log it now, dated today.`)
 }
 
 function cmdCapture() {
@@ -725,9 +770,14 @@ function escapeHtml(s) {
 // Closed pairs are redacted; an unclosed <private> redacts to end-of-text so a
 // forgotten closing tag can never leak the rest of the file.
 function stripPrivate(md) {
+  // Redact <private> before <!-- --> so a private block that itself contains a
+  // comment can't survive. Closed pairs first; then any unclosed <private> to
+  // end-of-text so a forgotten close tag never leaks the rest of the file.
+  // Case-insensitive (<PRIVATE> too). This is the ONE redactor every read path
+  // that can reach the model or a shared artifact must go through - see readClean.
   return md
-    .replace(/<private>[\s\S]*?<\/private>/gi, '(private - redacted from dashboard)')
-    .replace(/<private>[\s\S]*$/i, '(private - redacted from dashboard)')
+    .replace(/<private>[\s\S]*?<\/private>/gi, '(private - redacted)')
+    .replace(/<private>[\s\S]*$/i, '(private - redacted)')
     .replace(/<!--[\s\S]*?-->/g, '')
 }
 

package/hooks/pre-compact

@@ -18,9 +18,15 @@ resolve_engagement_dir() {
 registry_engagement_dir() {
   local reg="$HOME/fde-engagements/.registry" slug
   [ -f "$reg" ] || return 1
-  slug=$(awk 'BEGIN{ws=ENVIRON["PWD"]}
+  slug=$(awk 'BEGIN{ws=ENVIRON["PWD"]; best=-1}
     { i = match($0, / [^ ]*$/)
-      if (i > 0 && substr($0, 1, i - 1) == ws) { print substr($0, i + 1); exit } }' "$reg" 2>/dev/null)
+      if (i > 0) {
+        wpath = substr($0, 1, i - 1)
+        if (ws == wpath || index(ws, wpath "/") == 1) {
+          if (length(wpath) > best) { best = length(wpath); slug = substr($0, i + 1) }
+        }
+      } }
+    END { if (best >= 0) print slug }' "$reg" 2>/dev/null)
   [ -z "$slug" ] && return 1
   [ -d "$HOME/fde-engagements/$slug/.fde" ] && printf '%s\n' "$HOME/fde-engagements/$slug/.fde" && return 0
   return 1
@@ -56,19 +62,40 @@ MARKER="[fdeops context preserved"
 [ -f "$CONTEXT_FILE" ] || exit 0
 
 # Avoid unbounded growth: skip if we already preserved today.
-if grep -q "$MARKER" "$CONTEXT_FILE" 2>/dev/null; then
-  LAST=$(grep "$MARKER" "$CONTEXT_FILE" | tail -1)
+if grep -Fq "$MARKER" "$CONTEXT_FILE" 2>/dev/null; then
+  LAST=$(grep -F "$MARKER" "$CONTEXT_FILE" | tail -1)
   if echo "$LAST" | grep -q "$(date -u +%Y-%m-%d)"; then
     exit 0
   fi
 fi
 
+# Redact <private> before extracting lines - this content is appended to
+# context.md, which session-start loads into the model. A closed private block
+# collapses to one placeholder line, so its inner text can't be tail'd or
+# grepped out tag-stripped. Case-insensitive, mirrors the JS /gi redactor.
+strip_private() {
+  awk '
+    BEGIN { inblock = 0 }
+    {
+      line = $0
+      lc = tolower(line)
+      if (inblock) { if (index(lc, "</private>") > 0) { inblock = 0 } next }
+      if (index(lc, "<private>") > 0) {
+        print "(private - redacted)"
+        if (index(lc, "</private>") == 0) { inblock = 1 }
+        next
+      }
+      print line
+    }
+  ' "$1"
+}
+
 TIMESTAMP=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
 LAST_DECISIONS=""
 OPEN_RISKS=""
 
-[ -f "$DECISIONS_FILE" ] && LAST_DECISIONS=$(tail -20 "$DECISIONS_FILE" 2>/dev/null)
-[ -f "$RISKS_FILE" ] && OPEN_RISKS=$(grep -iE "open|active|unresolved" "$RISKS_FILE" 2>/dev/null | head -8)
+[ -f "$DECISIONS_FILE" ] && LAST_DECISIONS=$(strip_private "$DECISIONS_FILE" 2>/dev/null | tail -20)
+[ -f "$RISKS_FILE" ] && OPEN_RISKS=$(strip_private "$RISKS_FILE" 2>/dev/null | grep -iE "open|active|unresolved" | head -8)
 
 cat >> "$CONTEXT_FILE" 2>/dev/null << EOF
 

package/hooks/session-start

@@ -30,9 +30,15 @@ resolve_engagement_dir() {
 registry_engagement_dir() {
   local reg="$HOME/fde-engagements/.registry" slug
   [ -f "$reg" ] || return 1
-  slug=$(awk 'BEGIN{ws=ENVIRON["PWD"]}
+  slug=$(awk 'BEGIN{ws=ENVIRON["PWD"]; best=-1}
     { i = match($0, / [^ ]*$/)
-      if (i > 0 && substr($0, 1, i - 1) == ws) { print substr($0, i + 1); exit } }' "$reg" 2>/dev/null)
+      if (i > 0) {
+        wpath = substr($0, 1, i - 1)
+        if (ws == wpath || index(ws, wpath "/") == 1) {
+          if (length(wpath) > best) { best = length(wpath); slug = substr($0, i + 1) }
+        }
+      } }
+    END { if (best >= 0) print slug }' "$reg" 2>/dev/null)
   [ -z "$slug" ] && return 1
   [ -d "$HOME/fde-engagements/$slug/.fde" ] && printf '%s\n' "$HOME/fde-engagements/$slug/.fde" && return 0
   return 1
@@ -86,17 +92,21 @@ fi
 # closing tag), so a line-based state machine matches the real usage; an
 # unclosed <private> redacts to end-of-file, same as the JS regex fallback.
 strip_private() {
+  # Detection is case-insensitive (matches the JS /gi redactor) - <PRIVATE>,
+  # <Private>, <private> all redact. Detect on a lowercased copy of the line;
+  # never print the original when a tag is present.
   awk '
     BEGIN { inblock = 0 }
     {
       line = $0
+      lc = tolower(line)
       if (inblock) {
-        if (index(line, "</private>") > 0) { inblock = 0 }
+        if (index(lc, "</private>") > 0) { inblock = 0 }
         next
       }
-      if (index(line, "<private>") > 0) {
+      if (index(lc, "<private>") > 0) {
         print "(private - redacted)"
-        if (index(line, "</private>") == 0) { inblock = 1 }
+        if (index(lc, "</private>") == 0) { inblock = 1 }
         next
       }
       print line

package/hooks/session-stop

@@ -26,9 +26,15 @@ resolve_engagement_dir() {
 registry_engagement_dir() {
   local reg="$HOME/fde-engagements/.registry" slug
   [ -f "$reg" ] || return 1
-  slug=$(awk 'BEGIN{ws=ENVIRON["PWD"]}
+  slug=$(awk 'BEGIN{ws=ENVIRON["PWD"]; best=-1}
     { i = match($0, / [^ ]*$/)
-      if (i > 0 && substr($0, 1, i - 1) == ws) { print substr($0, i + 1); exit } }' "$reg" 2>/dev/null)
+      if (i > 0) {
+        wpath = substr($0, 1, i - 1)
+        if (ws == wpath || index(ws, wpath "/") == 1) {
+          if (length(wpath) > best) { best = length(wpath); slug = substr($0, i + 1) }
+        }
+      } }
+    END { if (best >= 0) print slug }' "$reg" 2>/dev/null)
   [ -z "$slug" ] && return 1
   [ -d "$HOME/fde-engagements/$slug/.fde" ] && printf '%s\n' "$HOME/fde-engagements/$slug/.fde" && return 0
   return 1

package/package.json

@@ -1,14 +1,15 @@
 {
   "name": "fdeops",
-  "version": "3.7.2",
+  "version": "3.7.4",
   "description": "Field kit for engineers embedded in client work - a real CLI (recon, memory, portfolio), one @fde skill with field judgment on top, and hooks that make it automatic. Claude Code plugin and any agent that loads skills.",
   "bin": {
     "fdeops": "bin/install.js",
     "fde": "bin/fde.js"
   },
   "scripts": {
-    "check": "node bin/check.js",
-    "prepublishOnly": "node bin/check.js"
+    "check": "node bin/check.js && npm test",
+    "test": "node --test test/*.test.js",
+    "prepublishOnly": "node bin/check.js && npm test"
   },
   "files": [
     "bin/",