fdeops 4.0.3 → 4.0.4

package/bin/fde.js

@@ -36,7 +36,7 @@ const { createMemoryApi } = require('./lib/memory')
 const { createTrustApi } = require('./lib/trust')
 const vault = require('./lib/vault')
 const context = require('./lib/context')
-const { sourceReference, hasSource, datedDecisions } = require('./lib/provenance')
+const { sourceReference, sourceReferences, hasSource, datedDecisions } = require('./lib/provenance')
 const { deliverySummary } = require('./lib/delivery-gaps')
 
 const HOME = os.homedir()
@@ -67,8 +67,13 @@ function maskReport(value) {
   if (value && typeof value === 'object') return Object.fromEntries(Object.entries(value).map(([key, item]) => [key, maskReport(item)]))
   return value
 }
-function maskedSections(sections, maxBytes) {
-  return context.boundedSections(sections.map(text => masking.mask(text)), maxBytes)
+function maskedSections(sections, maxBytes = context.DEFAULT_BYTES, heading = '') {
+  // Reserve identity before sharing the remaining budget between excerpts.
+  // Pathological path lengths remain explicitly clipped rather than exhausting policy space.
+  const maskedHeading = masking.mask(heading)
+  const prefix = heading ? (Buffer.byteLength(maskedHeading) <= 1024 ? maskedHeading
+    : context.clipMaskedUtf8(maskedHeading, 900) + '\n[Identity path truncated; use fde resume --bind to inspect.]') + '\n\n' : ''
+  return prefix + context.boundedSections(sections.map(text => masking.mask(text)), maxBytes - Buffer.byteLength(prefix))
 }
 const DEBRIEF_MAX_BYTES = 256 * 1024
 const CODE_EXT = ['.js', '.ts', '.tsx', '.jsx', '.py', '.java', '.go', '.rb', '.cs', '.php']
@@ -1459,12 +1464,12 @@ function cmdResume(args) {
   process.stdout.write(maskedSections([
     policy ? `CLIENT POLICY - trust-profile.md\n${policy}` : '',
     preferences.work ? `WORKING PREFERENCES: ${preferences.work}. Starting help: ${preferences.start}.\n${setup.nextStep(preferences)}\nThis is a starting preference, not a client fact; current instructions and engagement state take precedence.` : '',
-    `${intro}\n\nENGAGEMENT: ${eng}`,
+    intro,
     success ? `CURRENT GOALS & ACCEPTANCE - success.md\n${success}` : '',
     risks ? `OPEN RISKS - risks.md\n${extractRisks(eng).map(r => r.text).join('\n') || '(none recorded)'}` : '',
     `VALUE LEDGER - delivery.md\n${parseValueLedger(eng).rows.map(r => formatValueLedgerLine(r) + '; source: ' + (r.evidence || '(missing)')).join('\n') || '(none recorded)'}`,
     `WORKING CONTEXT - context.md\n${ctx ? resumeView(ctx) : '(no context.md yet)'}`,
-  ], maxBytes))
+  ], maxBytes, `ENGAGEMENT: ${eng}`))
 }
 
 // Token discipline: context.md grows every session (the session-stop hook
@@ -2083,7 +2088,10 @@ function withDebriefRecords(eng, apply, files = ['decisions.md', 'risks.md', 'de
         } catch (_) { failed.push(path.basename(target)) }
       }
       if (failed.length) throw new Error(`${error.message}; recovery could not restore ${failed.join(', ')}. Inspect these records and the pending proposal before retrying.`)
-      throw new Error(`${error.message}; no record changes kept. The proposal is retained; retry after resolving the cause.`)
+      const recovery = snapshots.get(path.join(eng, DEBRIEF_PROPOSE))
+        ? 'The proposal is retained; inspect it with fde debrief --review before retrying.'
+        : 'No pending proposal was retained; review your input before retrying.'
+      throw new Error(`${error.message}; no record changes kept. ${recovery}`)
     } finally { debriefTransactionActive = false }
   }
   return lockAt(0)
@@ -2156,7 +2164,7 @@ function routeDebriefInput(eng, input, { dry, force, sealed = [], allowReplay =
     })
   }
   const repeats = repeatedDebriefStatements(eng, input)
-  if (repeats.length && !dry && !allowReplay) throw new Error('source-backed statement already recorded; review the existing record and newer next action. Explicitly confirm a repeat with --allow-replay, or remove the repeated statement from the proposal.')
+  if (repeats.length && !dry && !allowReplay) throw new Error('source-backed statement already recorded; review the existing record and newer next action. Explicitly confirm a repeat with --allow-replay, or remove the repeated statement from your input or pending proposal.')
   const d = new Date()
   const date = d.toISOString().slice(0, 10)
   const counts = { decision: 0, risk: 0, delivery: 0, contact: 0, next: 0, signer: 0 }
@@ -2547,15 +2555,20 @@ function cmdReceipts(args) {
   const records = [], claims = []
   for (const file of [...recordFiles, ...workingFiles]) {
     const document = readClean(eng, file)
+    const scaffold = new Set((templatesDir() ? readClean(templatesDir(), file) : '').split('\n').map(line => line.trim()))
     const decisionSources = new Map()
     if (file === 'decisions.md') for (const entry of datedDecisions(document)) {
-      const source = sourceReference(entry.text)
-      for (let line = entry.line; line < entry.line + entry.text.split('\n').length; line++) decisionSources.set(line, source)
+      for (let line = entry.line; line < entry.line + entry.text.split('\n').length; line++) decisionSources.set(line, entry.text)
     }
     document.split('\n').forEach((line, i) => {
       if (!line.toLowerCase().includes(term.toLowerCase())) return
-      const source = decisionSources.get(i + 1) || sourceReference(line)
-      const hit = `  ${file}:${i + 1}  ${masking.mask(line.trim()).slice(0, 160)}${source ? ` [source: ${masking.mask(source).slice(0, 160)}]` : ' [source missing]'}${dirty.has(file) ? '  dirty file - review manual edits' : ''}`
+      const sourceText = decisionSources.get(i + 1) || line
+      const source = sourceReference(sourceText)
+      if (!source && scaffold.has(line.trim())) return
+      const sources = sourceReferences(sourceText)
+      const attribution = masking.mask(sources.join('; '))
+      const displayed = Buffer.byteLength(attribution) <= 320 ? attribution : context.clipMaskedUtf8(attribution, 240) + '… [sources truncated; use fde recall]'
+      const hit = `  ${file}:${i + 1}  ${context.clipMaskedUtf8(masking.mask(line.trim()), 160)}${source ? ` [${sources.length > 1 ? 'sources' : 'source'}: ${displayed}]` : ' [source missing]'}${dirty.has(file) ? '  dirty file - review manual edits' : ''}`
       ;(recordFiles.includes(file) && source ? records : claims).push({ file, hit })
     })
   }

package/bin/lib/context.js

@@ -14,6 +14,13 @@ function clipUtf8(text, bytes) {
   while (end > 0 && (buf[end] & 0xc0) === 0x80) end--
   return buf.subarray(0, end).toString('utf8')
 }
+// Masking aliases must stay whole so they remain recognizable and reversible.
+function clipMaskedUtf8(text, bytes) {
+  const clipped = clipUtf8(text, bytes)
+  if (clipped === text) return text
+  const open = clipped.lastIndexOf('[[')
+  return open > clipped.lastIndexOf(']]') ? clipped.slice(0, open) : clipped
+}
 function budgetArgs(args, defaultBytes = DEFAULT_BYTES) {
   const rest = [...args]
   let maxBytes = defaultBytes
@@ -91,4 +98,4 @@ function recallSections(documents, query, maxHits = 12, outputText = text => tex
     sections: selected.map(h => `${h.file}:${h.line}-${h.end} (lines in redacted view)\n${h.text}`),
   }
 }
-module.exports = { DEFAULT_BYTES, clipUtf8, budgetArgs, boundedSections, recallSections }
+module.exports = { DEFAULT_BYTES, clipUtf8, clipMaskedUtf8, budgetArgs, boundedSections, recallSections }

package/bin/lib/provenance.js

@@ -40,3 +40,13 @@ function datedDecisions(value) {
   return entries.sort((a, b) => a.date.localeCompare(b.date) || a.line - b.line)
 }
 module.exports.datedDecisions = datedDecisions
+
+// Display every explicit attribution without selecting a primary source.
+// Keep classification through sourceReference unchanged.
+function sourceReferences(value) {
+  const explicit = String(value || '').match(/\[source:[^\]\n]+\]/gi) || []
+  if (explicit.length) return [...new Set(explicit.map(sourceReference).filter(Boolean))]
+  const fallback = sourceReference(value)
+  return fallback ? [fallback] : []
+}
+module.exports.sourceReferences = sourceReferences

package/mcp/fdeops-ingest/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fdeops-ingest-mcp",
-  "version": "4.0.3",
+  "version": "4.0.4",
   "private": true,
   "description": "Thin stdio MCP sink for FDEOps ingest (stage → propose → apply). Zero runtime dependencies.",
   "bin": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fdeops",
-  "version": "4.0.3",
+  "version": "4.0.4",
   "description": "Client delivery tools for Forward Deployed Engineers. One @fde skill, local Markdown engagement records, and an offline dashboard for decisions, evidence, approvals, and next actions.",
   "bin": {
     "fdeops": "bin/install.js",

package/plugin.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://agent-plugins.org/schemas/1.0.0/plugin.schema.json",
   "name": "fdeops",
-  "version": "4.0.3",
+  "version": "4.0.4",
   "description": "Forward deployed engineering skills for AI coding agents. One @fde skill for the client work around the code. You confirm; then it lands in .fde/ on your laptop.",
   "author": {
     "name": "Subash Natarajan",