fdeops 3.30.0 → 3.31.0

package/README.md

@@ -56,7 +56,7 @@ Read-only HTML of the record - promised, measured, accepted, and evidence. Regen
 /plugin install fdeops@fdeops
 ```
 
-Make it fit your day: `fde setup` asks three choices for your daily overview, context size, and report masking. [First-use setup](docs/USAGE.md#make-fdeops-fit-your-day).
+Make it fit your day: `fde setup` asks how you work, what would help first, and what to mask before sharing context with your agent. [First-use setup](docs/USAGE.md#make-fdeops-fit-your-day).
 
 The plugin adds session hooks and the slash commands below. Skill-only installation does not add hooks. See the [installation guide](docs/install.md) for setup details.
 

package/bin/fde.js

@@ -98,9 +98,9 @@ function gitIsAncestor(eng, olderHash, newerHash) {
   } catch (_) { return false }
 }
 
-function gitLogHash(eng, args) {
+function gitLogHash(eng, args, format = '%H') {
   try {
-    return execFileSync('git', ['log', '-1', '--format=%H', ...args], {
+    return execFileSync('git', ['log', '-1', `--format=${format}`, ...args], {
       cwd: eng, encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'], timeout: 15000,
     }).trim()
   } catch (_) { return '' }
@@ -821,7 +821,7 @@ function phaseLabel(phase) {
 // colon) collapses to '' here, which callers treat as "nothing to show".
 function firstLine(md, maxLen) {
   for (const raw of md.split('\n')) {
-    const l = raw.trim()
+    const l = maskDisplay(raw).trim()
     if (!l || /^#{1,6}\s/.test(l)) continue
     const clean = maskDisplay(l.replace(/^\*\*[^*]+:\*\*\s*/, '').replace(/\*\*/g, '').replace(/^["']|["']$/g, '').trim())
     if (!clean) continue
@@ -1041,7 +1041,7 @@ function parseSignalHistoryEntries(eng) {
 }
 
 function displayNameFromSignalText(text) {
-  if (preferences.privacy === 'reports' && masking.mask(text) !== text) return 'Contact (identifier masked)'
+  if ((preferences.privacy === 'reports' || !['dashboard', 'vault'].includes(process.argv[2])) && masking.mask(text) !== text) return 'Contact (identifier masked)'
   const person = personFromSignalText(text)
   if (person) return person
   const t = String(text).trim()
@@ -1166,7 +1166,7 @@ function extractRisks(eng) {
 // sides look like real numbers/percentages, deduped by value pair, capped at
 // 4; nothing reliable found -> the widget stays empty, never an invented number.
 function extractStats(eng) {
-  const text = readClean(eng, 'delivery.md') + '\n' + readClean(eng, 'decisions.md')
+  const text = maskDisplay(readClean(eng, 'delivery.md') + '\n' + readClean(eng, 'decisions.md'))
   const patterns = [
     /(\d+(?:\.\d+)?%)[^\n%]{0,40}?(?:→|->)[^\n%]{0,20}?(\d+(?:\.\d+)?%)/g, // "X% ... -> Y%"
     /(\d+(?:\.\d+)?%)\s+to\s+(\d+(?:\.\d+)?%)/gi,                               // "X% to Y%"
@@ -1458,6 +1458,7 @@ function cmdResume(args) {
   const risks = readClean(eng, 'risks.md')
   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}`,
     success ? `CURRENT GOALS & ACCEPTANCE - success.md\n${success}` : '',
     risks ? `OPEN RISKS - risks.md\n${extractRisks(eng).map(r => r.text).join('\n') || '(none recorded)'}` : '',
@@ -1575,7 +1576,7 @@ function cmdLog(args) {
   if (hit && force) console.error(`warning: logging possible ${hit} (--force)`)
   if (retire) {
     const n = retireOpenRisks(eng, text)
-    if (!n) { console.error(`no open risk matched ${JSON.stringify(text)}`); process.exit(1) }
+    if (!n) { console.error(`no open risk matched ${JSON.stringify(masking.mask(text))}`); process.exit(1) }
     const hash = commitMemory(eng, 'retire risk', { files: ['risks.md'] })
     console.log(`retired ${n} risk(s) → risks.md${hash ? ` @${hash}` : ''}`)
     return
@@ -2005,7 +2006,7 @@ function changeReviewIssues(eng) {
   const del = latestDeliveryEntry(readClean(eng, 'delivery.md'))
   const dec = latestDatedDecision(readClean(eng, 'decisions.md'))
   const delHash = del.line
-    ? sh(`git log -1 --format=%H -S${JSON.stringify(del.line)} -- delivery.md`, eng)
+    ? gitLogHash(eng, ['-S', del.line, '--', 'delivery.md'])
     : ''
   if (del.date && dec.date && dec.date > del.date && delHash) {
     issues.push(
@@ -2819,7 +2820,7 @@ function silentCommitIssues(eng) {
     // Pickaxe on the entry text, not the file: a later status edit to
     // delivery.md must not become the cutoff and hide commits before it.
     const raw = entry.line
-      ? sh(`git log -1 --format=%cI -S${JSON.stringify(entry.line)} -- delivery.md`, eng)
+      ? gitLogHash(eng, ['-S', entry.line, '--', 'delivery.md'], '%cI')
       : ''
     // git --since is inclusive at second grain; a commit in the same second as
     // the receipt is the receipt's own work, not a silent one.
@@ -3355,10 +3356,10 @@ function cmdRedact(args) {
     })
   }
   if (!hits.length) {
-    console.log(`redact: no lines contain ${JSON.stringify(term)}`)
+    console.log(`redact: no lines contain ${JSON.stringify(masking.mask(term))}`)
     return
   }
-  console.log(`REDACT - ${hits.length} matching line(s) for ${JSON.stringify(term)}`)
+  console.log(`REDACT - ${hits.length} matching line(s) for ${JSON.stringify(masking.mask(term))}`)
   hits.slice(0, 20).forEach(h => {
     const preview = h.line.length > 100 ? masking.mask(h.line).slice(0, 97) + '…' : h.line
     console.log(`  ${h.file}:${h.lineNo}  ${preview}`)
@@ -3758,13 +3759,13 @@ function cmdDashboard(args) {
     ].map(([f, title]) => [title, readClean(e.dir, f)])
     .filter(([, md]) => render.hasRealContent(md))
     .map(([title, md]) => ({ title, html: render.mdBlockHtml(maskDisplay(md), parseMdTable) }))
-    e.searchBlob = render.escapeHtml([
+    e.searchBlob = render.escapeHtml(maskDisplay([
       e.name, e.next, e.lastSession, e.reality, e.brief,
       ...e.log.map(g => g.text), ...e.risks.map(r => r.text),
       ...e.stakeholders.map(p => `${p.name} ${p.role} ${p.note}`),
       ...e.moreSections.map(s => s.title),
       ...e.valueRows.map(r => `${r.slice} ${r.promised} ${r.measured} ${r.accepted} ${r.evidence}`),
-    ].join(' ').toLowerCase())
+    ].join(' ').toLowerCase()))
   })
 
   const html = render.buildFieldbookHtml({ engagements: maskReport(engagements), today, generatedAt: new Date().toISOString() })
@@ -4170,7 +4171,8 @@ let outputBudget
 if (['resume', 'recall', 'handoff', 'defend'].includes(cmd) && !rawArgs.some(a => ['--full', '--init', '--bind', '--out'].includes(a))) {
   try { outputBudget = context.budgetArgs(rawArgs, (setupStore.read() || setup.DEFAULTS).context === 'compact' ? 4096 : 16384).maxBytes } catch (_) {}
 }
-require('./lib/masking').protectOutput(masking, { maxBytes: outputBudget })
+require('./lib/masking').protectOutput(cmd === 'setup' && rawArgs.length === 1 && rawArgs[0] === '--show'
+  ? require('./lib/masking').createMasking(ENGAGEMENTS_ROOT, { custom: false }) : masking, { maxBytes: outputBudget })
 let args
 try {
   args = rawArgs.map(arg => masking.restore(arg))
@@ -4192,7 +4194,7 @@ switch (cmd) {
   case 'setup': finishAsync(setup.command(setupStore, args)); break
   case 'privacy':
     if (args.length) { console.error('usage: fde privacy'); process.exitCode = 2; break }
-    console.log(`FDEOps ${require('../package.json').version} - identifier masking enabled by default.\nCLI responses, smart proposals, handoff packets and ingest MCP results use local aliases.\nPatterns: common emails, international/US phones, SSN-shaped identifiers and supported credentials.\nNames and arbitrary sensitive prose are not detected; mark them <private>.\nRaw files, pasted chat and upstream MCP content bypass this protection. Local reports retain identifiers by default; fde setup can also mask newly generated report content.`)
+    console.log(`FDEOps ${require('../package.json').version} - identifier masking enabled by default.\nCLI responses, smart proposals, handoff packets and ingest MCP results use local aliases.\nPatterns: common emails, international/US phones, SSN-shaped identifiers and supported credentials.\nNames and arbitrary sensitive prose are not automatically detected; mark them <private> or supply local custom terms with fde setup.\nRaw files, pasted chat and upstream MCP content bypass this protection. Local reports retain identifiers by default; fde setup can also mask newly generated report content.`)
     break
   case 'demo': cmdDemo(args); break
   case 'scan': cmdScan(); break

package/bin/lib/masking.js

@@ -6,7 +6,7 @@ const fs = require('node:fs')
 const path = require('node:path')
 const crypto = require('node:crypto')
 const { StringDecoder } = require('node:string_decoder')
-const ALIAS = /\[\[(email|phone|identifier|credential):[a-f0-9]{16}\]\]/g
+const ALIAS = /\[\[(email|phone|identifier|credential|term):[a-f0-9]{16}\]\]/g
 const PATTERNS = [
   ['credential', /-----BEGIN (?:RSA |EC |OPENSSH )?PRIVATE KEY-----[\s\S]*?(?:-----END (?:RSA |EC |OPENSSH )?PRIVATE KEY-----|$)/g],
   ['credential', /\b(?:AKIA[0-9A-Z]{16}|ghp_[A-Za-z0-9]{20,}|github_pat_[A-Za-z0-9_]{20,}|sk-[A-Za-z0-9_-]{20,}|xox[baprs]-[A-Za-z0-9-]{10,})\b/g],
@@ -25,7 +25,27 @@ function replacements(text, replace) {
   for (const [kind, pattern] of PATTERNS) out = out.replace(pattern, value => replace(kind, value))
   return out
 }
-function createMasking(root) {
+function createMasking(root, { custom = true } = {}) {
+  const settings = require('./setup').createSetup(root)
+  function replaceAll(text, replace) {
+    let terms = []
+    if (custom) {
+      const profile = settings.read()
+      if (profile && profile.masking === 'custom') terms = profile.terms
+    }
+    const escape = value => value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
+    const pattern = terms.length ? new RegExp(terms.slice().sort((a, b) => b.length - a.length).map(term =>
+      '(?<![\\p{L}\\p{N}_])' + escape(term) + '(?![\\p{L}\\p{N}_])').join('|'), 'giu') : null
+    // Existing aliases are protocol tokens, never input for further masking.
+    const pieces = String(text).split(/(\[\[(?:email|phone|identifier|credential|term):[a-f0-9]{16}\]\])/g)
+    return pieces.map((piece, i) => {
+      if (i % 2) return piece
+      const builtIn = replacements(piece, replace)
+      if (!pattern) return builtIn
+      return builtIn.split(/(\[\[(?:email|phone|identifier|credential|term):[a-f0-9]{16}\]\])/g)
+        .map((part, j) => j % 2 ? part : part.replace(pattern, value => replace('term', value))).join('')
+    }).join('')
+  }
   const directory = path.join(root, '.privacy'), file = path.join(directory, 'identifiers.json')
   function directoryReady(create) {
     if (create) fs.mkdirSync(root, { recursive: true })
@@ -43,7 +63,7 @@ function createMasking(root) {
       if (data.version !== 1 || !Array.isArray(data.entries) || data.entries.length > 50000) throw new Error(FAIL)
       const seen = new Set()
       for (const entry of data.entries) {
-        if (!entry || typeof entry.value !== 'string' || !/^\[\[(email|phone|identifier|credential):[a-f0-9]{16}\]\]$/.test(entry.alias) || seen.has(entry.alias)) throw new Error(FAIL)
+        if (!entry || typeof entry.value !== 'string' || !/^\[\[(email|phone|identifier|credential|term):[a-f0-9]{16}\]\]$/.test(entry.alias) || seen.has(entry.alias)) throw new Error(FAIL)
         seen.add(entry.alias)
       }
       return data
@@ -76,11 +96,11 @@ function createMasking(root) {
   function mask(text) {
     text = String(text)
     let detected = false
-    replacements(text, (_, value) => { detected = true; return value })
+    replaceAll(text, (_, value) => { detected = true; return value })
     if (!detected) return text
     return transact(true, entries => {
       const values = new Map(entries.map(e => [e.value, e.alias]))
-      return replacements(text, (kind, value) => {
+      return replaceAll(text, (kind, value) => {
         if (!values.has(value)) {
           const alias = `[[${kind}:${crypto.randomBytes(8).toString('hex')}]]`
           entries.push({ alias, value }); values.set(value, alias)
@@ -91,7 +111,7 @@ function createMasking(root) {
   }
   function restore(text) {
     text = String(text)
-    if (/\[\[(email|phone|identifier|credential):/.test(text.replace(ALIAS, ''))) throw new Error(FAIL)
+    if (/\[\[(email|phone|identifier|credential|term):/.test(text.replace(ALIAS, ''))) throw new Error(FAIL)
     if (!text.match(ALIAS)) return text
     return transact(false, entries => {
       const aliases = new Map(entries.map(e => [e.alias, e.value]))

package/bin/lib/memory.js

@@ -53,7 +53,7 @@ function createMemoryApi(deps) {
           execFileSync('git', ['add', '--', f], { cwd: eng, stdio: 'ignore', timeout: 10000 })
         }
       } else {
-        execFileSync('git', ['add', '-A', '--', '.', ':(exclude).privacy'], { cwd: eng, stdio: 'ignore', timeout: 10000 })
+        execFileSync('git', ['add', '-A', '--', '.', ':(exclude).privacy', ':(exclude).preferences.json'], { cwd: eng, stdio: 'ignore', timeout: 10000 })
       }
       const porcelain = execFileSync('git', ['status', '--porcelain'], {
         cwd: eng, encoding: 'utf8', timeout: 10000, stdio: ['ignore', 'pipe', 'ignore'],
@@ -73,7 +73,7 @@ function createMemoryApi(deps) {
         }
       }
       // Even a previously staged alias dictionary must never enter a CLI commit.
-      const privateStaged = execFileSync('git', ['diff', '--cached', '--name-only'], { cwd: eng, encoding: 'utf8', timeout: 10000 }).split('\n').some(f => f.split('/').includes('.privacy'))
+      const privateStaged = execFileSync('git', ['diff', '--cached', '--name-only'], { cwd: eng, encoding: 'utf8', timeout: 10000 }).split('\n').some(f => f.split('/').some(part => ['.privacy', '.preferences.json'].includes(part)))
       if (privateStaged) throw new Error('private alias state must not be staged in engagement history')
       const still = execFileSync('git', ['diff', '--cached', '--name-only'], {
         cwd: eng, encoding: 'utf8', timeout: 10000, stdio: ['ignore', 'pipe', 'ignore'],
@@ -134,7 +134,7 @@ function createMemoryApi(deps) {
       execFileSync('git', ['init'], { cwd: eng, stdio: 'ignore', timeout: 10000 })
       atomicWriteFile(
         path.join(eng, '.gitignore'),
-        ['*.lock', '*.tmp', '.last-write', '.debrief-propose', '.debrief-private', '.debrief-seal', '.privacy/', ''].join('\n')
+        ['*.lock', '*.tmp', '.last-write', '.debrief-propose', '.debrief-private', '.debrief-seal', '.privacy/', '.preferences.json', ''].join('\n')
       )
       const owner = writeOwnerIfMissing(eng)
       configureMemoryGitIdentity(eng, owner)

package/bin/lib/setup.js

@@ -5,7 +5,7 @@ const crypto = require('node:crypto')
 const paths = require('./install-paths')
 
 const DEFAULTS = { view: 'current', context: 'standard', privacy: 'agent' }
-const QUESTIONS = [
+const SETTINGS = [
   { key: 'view', title: 'What should your daily overview show?', options: [
     ['current', 'The client I am working on'], ['portfolio', 'All my clients'],
   ] },
@@ -17,14 +17,60 @@ const QUESTIONS = [
     ['reports', 'Agent context and newly generated Fieldbook/vault reports'],
   ] },
 ]
-const LIMITS = 'Both options hide <private> content. Masking covers common identifier formats, not all personal data. Names and sensitive prose need private marking. Your AI host controls provider transmission; setup does not change it. Existing exports are not rewritten.'
+const QUESTIONS = [
+  { key: 'work', title: 'How do you work?', options: [
+    ['single', 'One client'], ['multiple', 'Several clients'], ['team', 'Leading a delivery team'],
+  ] },
+  { key: 'start', title: 'What would help you first?', options: [
+    ['new', 'Starting an engagement'], ['daily', 'Continuing daily work'], ['takeover', 'Taking over existing work'],
+  ] },
+  { key: 'masking', title: 'What should FDEOps hide before sharing context with your agent?', options: [
+    ['standard', 'Common identifiers and secrets'], ['custom', 'Those, plus names and terms I specify'],
+  ] },
+]
+const PROFILE_DEFAULTS = { work: 'single', start: 'daily', masking: 'standard', terms: [] }
+const LIMITS = 'Both choices hide marked private content. Masking reduces exposure; it does not guarantee anonymity or permission to share client data. Raw file tools, pasted chat and other tools can bypass it. AI-provider settings are unchanged.'
+function validateTerms(terms) {
+  if (!Array.isArray(terms) || terms.length > 100 || terms.some(t => typeof t !== 'string' || t.length < 2 || t.length > 128 || t !== t.trim() || /[\r\n\x00-\x1f]|\[\[|\]\]/.test(t))) {
+    throw new Error('Use up to 100 names or terms, one per line, each 2-128 characters; control characters and alias markers are not allowed.')
+  }
+  return [...new Set(terms)]
+}
 function validate(value) {
+  const keys = value && Object.keys(value)
+  const personal = value && Object.hasOwn(value, 'work')
   if (!value || typeof value !== 'object' || Array.isArray(value) ||
-      Object.keys(value).length !== 3 || QUESTIONS.some(q => !q.options.some(([v]) => value[q.key] === v))) {
+      keys.length !== (personal ? 7 : 3) ||
+      (personal ? SETTINGS.concat(QUESTIONS) : SETTINGS).some(q => !q.options.some(([v]) => value[q.key] === v))) {
     throw new Error('Invalid setup choices; run fde setup to see the supported options.')
   }
+  if (personal) {
+    validateTerms(value.terms)
+    if (value.masking === 'custom' && !value.terms.length) throw new Error('Custom masking needs at least one name or term.')
+  }
   return value
 }
+function readTerms(file) {
+  let fd
+  try {
+    paths.checkPath(file)
+    fd = fs.openSync(file, fs.constants.O_RDONLY | fs.constants.O_NOFOLLOW | fs.constants.O_NONBLOCK)
+    const st = fs.fstatSync(fd)
+    if (!st.isFile() || st.nlink !== 1 || st.size > 65536) throw new Error('unsafe')
+    const terms = validateTerms(fs.readFileSync(fd, 'utf8').split(/\r?\n/).map(t => t.trim()).filter(Boolean))
+    if (!terms.length) throw new Error('empty')
+    return terms
+  } catch (_) { throw new Error('Cannot load custom terms. Use an ordinary local UTF-8 file with 1-100 terms, one per line, each 2-128 characters.') }
+  finally { if (fd !== undefined) fs.closeSync(fd) }
+}
+function nextStep(value) {
+  const start = {
+    new: 'Clarify the client problem, one measurable outcome, and who will accept it. Start with land.',
+    daily: 'Resume the current client and choose one action from the existing blockers. Start with triage.',
+    takeover: 'Check the existing evidence, open risks and previous commitments before changing anything. Start with audit.',
+  }
+  return (start[value.start] || '') + (value.work === 'team' ? ' Make responsibility and handoff clear; do not assume shared access or synchronization.' : '')
+}
 function createSetup(root) {
   const file = path.join(root, '.preferences.json')
   function read() {
@@ -33,7 +79,7 @@ function createSetup(root) {
       paths.checkPath(file)
       fd = fs.openSync(file, fs.constants.O_RDONLY | fs.constants.O_NOFOLLOW | fs.constants.O_NONBLOCK)
       const st = fs.fstatSync(fd)
-      if (!st.isFile() || st.nlink !== 1 || st.size > 4096) throw new Error('unsafe')
+      if (!st.isFile() || st.nlink !== 1 || st.size > 65536 || (process.platform !== 'win32' && (st.mode & 0o077))) throw new Error('unsafe')
       return validate(JSON.parse(fs.readFileSync(fd, 'utf8')))
     } catch (e) {
       if (e.code === 'ENOENT') return null
@@ -53,57 +99,93 @@ function createSetup(root) {
   }
   return { read, save }
 }
-function describe(value) {
-  return QUESTIONS.map(q => `${q.title} ${q.options.find(([v]) => v === value[q.key])[1]}`).join('\n')
+function describe(value, questions = QUESTIONS) {
+  return questions.map(q => `${q.title} ${q.options.find(([v]) => v === value[q.key])[1]}`).join('\n')
+}
+function saveAnswers(store, choices, questions, termsFile) {
+  const saved = store.read(), current = saved || DEFAULTS
+  if (questions.some(q => !q.options.some(([v]) => choices[q.key] === v)) || Object.keys(choices).length !== questions.length) throw new Error('Supply one valid answer for each question.')
+  let result
+  if (questions === SETTINGS) result = { ...current, ...choices }
+  else {
+    if (termsFile && choices.masking !== 'custom') throw new Error('A terms file requires custom masking.')
+    const terms = termsFile ? readTerms(termsFile) : current.terms || []
+    result = { ...current, ...choices, terms, view: !saved || (saved.work && saved.work !== choices.work) ? (choices.work === 'multiple' ? 'portfolio' : 'current') : saved.view }
+  }
+  store.save(result)
+  return result
 }
 function command(store, args) {
   if (args.length === 1 && args[0] === '--show') {
-    const saved = store.read()
-    console.log(JSON.stringify({ configured: !!saved, ...(saved || DEFAULTS) }))
+    const saved = store.read(), { terms, ...safe } = saved || DEFAULTS
+    console.log(JSON.stringify({ configured: !!saved, ...safe, ...(terms ? { termCount: terms.length, nextStep: nextStep(saved) } : {}) }))
     return
   }
-  if (args.length) {
-    const choices = {}
-    if (!args.includes('--save') || args.filter(a => a === '--save').length !== 1) throw new Error('Use fde setup, or supply all three choices with --save.')
-    const rest = args.filter(a => a !== '--save')
+  if (args.length && !(args.length === 1 && args[0] === '--settings')) {
+    const choices = {}, rest = args.filter(a => a !== '--save')
+    let termsFile
+    if (args.filter(a => a === '--save').length !== 1) throw new Error('Use fde setup, or supply all three answers with --save.')
     for (let i = 0; i < rest.length; i += 2) {
       const key = rest[i].replace(/^--/, '')
-      if (!rest[i].startsWith('--') || !Object.hasOwn(DEFAULTS, key) || Object.hasOwn(choices, key)) throw new Error('Unknown or repeated setup option.')
+      if (key === 'terms-file' && !termsFile && rest[i + 1]) { termsFile = rest[i + 1]; continue }
+      if (!rest[i].startsWith('--') || !SETTINGS.concat(QUESTIONS).some(q => q.key === key) || Object.hasOwn(choices, key)) throw new Error('Unknown or repeated setup option.')
       choices[key] = rest[i + 1]
     }
-    validate(choices)
-    store.save(choices)
-    console.log('Setup saved for this engagements folder. Change it anytime with fde setup.\n' + describe(choices) + '\n' + LIMITS)
+    const questions = Object.hasOwn(choices, 'work') ? QUESTIONS : SETTINGS
+    if (termsFile && questions === SETTINGS) throw new Error('Use personal setup to change custom terms.')
+    const result = saveAnswers(store, choices, questions, termsFile)
+    console.log('Setup saved locally. Change it anytime with fde setup.\n' + describe(result, questions) + '\n' + nextStep(result) + '\n' + LIMITS)
     return
   }
-  if (process.stdin.isTTY && process.stdout.isTTY) return interactive(store)
-  console.log('FIRST-USE SETUP: ask these three questions together, then save the answers. No settings have been changed.')
-  for (const [i, q] of QUESTIONS.entries()) console.log(`${i + 1}. ${q.title}\n` + q.options.map(([value, label]) => `   ${value}: ${label}`).join('\n'))
-  console.log(LIMITS + '\nAfter the user answers: fde setup --view current|portfolio --context standard|compact --privacy agent|reports --save\nUse fde setup --show to inspect existing choices. Never infer client policy from these preferences.')
+  const questions = args[0] === '--settings' ? SETTINGS : QUESTIONS
+  if (process.stdin.isTTY && process.stdout.isTTY) return interactive(store, questions)
+  console.log('SETUP: ask these three questions together. No settings have been changed.')
+  for (const [i, q] of questions.entries()) console.log(`${i + 1}. ${q.title}\n` + q.options.map(([value, label]) => `   ${value}: ${label}`).join('\n'))
+  console.log(LIMITS)
+  console.log(questions === QUESTIONS
+    ? 'After answers: fde setup --work single|multiple|team --start new|daily|takeover --masking standard|custom [--terms-file LOCAL_FILE] --save\nFor custom masking, enter names locally with fde setup, or provide a local terms-file path; do not ask to paste sensitive names into chat. Existing terms are kept unless a replacement file is supplied.'
+    : 'Save settings: fde setup --view current|portfolio --context standard|compact --privacy agent|reports --save')
+  console.log('fde setup --show shows choices and term count only. fde setup --settings changes display and context options.')
 }
-async function interactive(store) {
-  // Only static prompts and validated enum labels bypass buffered CLI output.
+async function interactive(store, questions) {
   const emit = text => fs.writeSync(1, text)
+  const current = { ...PROFILE_DEFAULTS, ...(store.read() || DEFAULTS) }, choices = {}
   const rl = require('node:readline').createInterface({ input: process.stdin, terminal: false })
   const lines = rl[Symbol.asyncIterator]()
-  const current = store.read() || DEFAULTS, choices = {}
   try {
-    emit('Make FDEOps fit your day. Three choices; Enter keeps the current choice. Ctrl-C cancels.\n' + LIMITS + '\n')
-    for (const q of QUESTIONS) {
+    emit('Make FDEOps fit your work. Enter keeps the current choice. Ctrl-C cancels.\n' + LIMITS + '\n')
+    for (const q of questions) {
       const selected = q.options.findIndex(([v]) => v === current[q.key])
       while (true) {
         emit(q.title + '\n' + q.options.map(([, label], i) => `  ${i + 1}. ${label}${i === selected ? ' (current)' : ''}`).join('\n') + '\n> ')
         const next = await lines.next()
-        if (next.done) { emit('\nSetup cancelled; nothing saved.\n'); return }
-        const value = next.value.trim(), index = value === '' ? selected : /^[12]$/.test(value) ? Number(value) - 1 : -1
-        if (index >= 0) { choices[q.key] = q.options[index][0]; break }
-        emit('Choose 1 or 2, or press Enter.\n')
+        if (next.done) { emit('\nCancelled; nothing saved.\n'); return }
+        const value = next.value.trim(), index = value === '' ? selected : /^[123]$/.test(value) ? Number(value) - 1 : -1
+        if (index >= 0 && index < q.options.length) { choices[q.key] = q.options[index][0]; break }
+        emit('Choose a listed number, or press Enter.\n')
       }
     }
-    emit('\n' + describe(choices) + '\nSave these settings? [y/N] ')
+    let terms = current.terms
+    if (choices.masking === 'custom') {
+      emit(`Names or terms to hide, one per line; finish with an empty line. Enter alone keeps ${terms.length} saved terms. This input stays local.\n`)
+      const entered = []
+      while (true) {
+        const next = await lines.next()
+        if (next.done) { emit('\nCancelled; nothing saved.\n'); return }
+        if (!next.value.trim()) break
+        entered.push(next.value.trim())
+        validateTerms(entered)
+      }
+      terms = entered.length ? validateTerms(entered) : terms
+      if (!terms.length) throw new Error('Custom masking needs at least one term; nothing saved.')
+    }
+    const saved = store.read()
+    const result = questions === SETTINGS ? { ...(saved || DEFAULTS), ...choices }
+      : { ...(saved || DEFAULTS), ...choices, terms, view: !saved || (saved.work && saved.work !== choices.work) ? (choices.work === 'multiple' ? 'portfolio' : 'current') : saved.view }
+    emit('\n' + describe(result, questions) + (choices.masking === 'custom' ? `\n${terms.length} custom terms ready to save locally.` : '') + '\nSave these choices? [y/N] ')
     const next = await lines.next()
-    if (!next.done && /^y(es)?$/i.test(next.value.trim())) { store.save(choices); emit('\nSetup saved. Change it anytime with fde setup.\n') }
-    else emit('\nSetup cancelled; nothing saved.\n')
+    if (!next.done && /^y(es)?$/i.test(next.value.trim())) { store.save(result); emit('\nSetup saved. Change it anytime with fde setup.\n' + nextStep(result) + '\n') }
+    else emit('\nCancelled; nothing saved.\n')
   } finally { rl.close() }
 }
-module.exports = { createSetup, command, DEFAULTS }
+module.exports = { createSetup, command, DEFAULTS, nextStep }

package/mcp/fdeops-ingest/package.json

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

package/mcp/fdeops-ingest/server.js

@@ -176,7 +176,13 @@ function cliPayload(out) {
 
 function toolResult(payload) {
   let text
-  try { text = masking.mask(typeof payload === 'string' ? payload : JSON.stringify(payload, null, 2)) }
+  try {
+    const clean = value => typeof value === 'string' ? masking.mask(value)
+      : Array.isArray(value) ? value.map(clean)
+      : value && typeof value === 'object' ? Object.fromEntries(Object.entries(value).map(([key, item]) => [key, clean(item)])) : value
+    const safe = clean(payload)
+    text = typeof safe === 'string' ? safe : JSON.stringify(safe, null, 2)
+  }
   catch (_) { return { isError: true, content: [{ type: 'text', text: 'privacy masking unavailable; no unmasked tool output returned' }] } }
   return { content: [{ type: 'text', text }] }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fdeops",
-  "version": "3.30.0",
+  "version": "3.31.0",
   "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": "3.30.0",
+  "version": "3.31.0",
   "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",

package/skills/fde/SKILL.md

@@ -58,7 +58,9 @@ Fallbacks: `node ~/.claude/fdeops/fde.js …`, then `npx --yes fdeops …`. Skil
 
 ## First-use preferences
 
-Run `fde setup --show` before client reads. If unavailable, update the CLI before offering setup; never pretend preferences were saved. If `configured` is false, finish binding the named client, then run `fde setup` and present its **three questions together**, with the two choices each. Use answers already given; do not invent preferences or ask again per client. Save their selections using the displayed `--save` command; their answers authorize this settings write only. If they skip, continue with existing defaults and leave setup unsaved. On later sessions use saved choices; change them only when requested. Setup configures report scope, initial context size and masking of newly generated reports. It does not install a model, approve client data for AI, or change provider settings. Client policy always takes precedence. Reports can still contain names or other unrecognized sensitive prose; never treat them as anonymized.
+Run `fde setup --show` before client reads. If unavailable, update the CLI before offering setup. If `configured` is false, bind the named client, then run `fde setup` and present its three questions together: how they work, what would help first, and what to mask. Save their explicit answers; never infer permission to share data. For custom masking, the optional fourth question asks them to enter terms **locally** with `fde setup`, or give a local terms-file path. Do not ask them to paste sensitive names into chat or open that file with model-facing file tools. Pass the path directly to `--terms-file`; inspect only the returned count, never `.preferences.json` or the alias dictionary. If they skip, keep existing defaults.
+
+Use `work` to tailor the help: single = focus on the bound client; multiple = portfolio overview with one bound client per write; team = clarify responsibility and handoff, without implying shared storage. `start` chooses the initial route when no more specific request or record determines it: new → land, daily → triage, takeover → audit. Current client evidence and the user's request always take precedence; never restart an existing engagement because of this preference. `masking` selects standard patterns or those plus custom terms. Older technical settings remain valid; offer personal setup when requested rather than resetting them. Do not ask again per client. `fde setup --settings` keeps display, context size and report masking editable. Choices do not configure models or approve client data use.
 
 ## Entry (every session)
 
@@ -218,4 +220,4 @@ Ready to build with no `terrain.md` / plan: discover or plan first. Takeover wit
 
 ## Identifier masking
 
-Before reading engagement content in a session, run `fde privacy` to verify runtime support. If the command is unavailable, stop and update the CLI; a new skill alone does not upgrade an older executable. Use CLI context and previews for model input. They mask common email, phone, SSN-shaped, and credential patterns by default; aliases remain consistent within the local engagements root. Preserve complete alias tokens when drafting updates; the CLI resolves them locally. Never read the private `.privacy/` dictionary, sealed sidecars, raw sensitive notes, or local dashboard/vault files to recover an identity. Names, company names, addresses, and unrecognized formats are not automatically detected: keep sensitive prose in `<private>` blocks. Direct file tools, pasted chat, and upstream source MCPs bypass this boundary.
+Before reading engagement content in a session, run `fde privacy` to verify runtime support. If the command is unavailable, stop and update the CLI; a new skill alone does not upgrade an older executable. Use CLI context and previews for model input. They mask common email, phone, SSN-shaped, and credential patterns by default; aliases remain consistent within the local engagements root. Preserve complete alias tokens when drafting updates; the CLI resolves them locally. Never read the private `.privacy/` dictionary, sealed sidecars, raw sensitive notes, or local dashboard/vault files to recover an identity. Custom masking additionally hides the literal names or terms the user supplied locally, ignoring letter case and matching whole terms. It does not infer variants or discover names. Names, company names, addresses, and unrecognized formats are otherwise not automatically detected: keep sensitive prose in `<private>` blocks. Direct file tools, pasted chat, and upstream source MCPs bypass this boundary.