@dotrino/vaultd 0.161.0 → 0.162.1

package/lib/src/core/libVersion.js

@@ -5,4 +5,4 @@
  * si no coincide con la del paquete: una versión anunciada que no es la que corre es peor
  * que no anunciar ninguna.
  */
-export const LIB_VERSION = '0.89.0'
+export const LIB_VERSION = '0.90.1'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dotrino/vaultd",
-  "version": "0.161.0",
+  "version": "0.162.1",
   "type": "module",
   "description": "Certificador personal de Dotrino: daemon headless que custodia la clave maestra y delega capacidades a tus dispositivos por el proxy. Tu CA propia.",
   "bin": {
@@ -22,12 +22,12 @@
   },
   "dependencies": {
     "@dotrino/compat": "0.4.0",
-    "@dotrino/identity": "^0.118.0",
+    "@dotrino/identity": "0.119.0",
     "@dotrino/opaque": "0.1.0",
     "@dotrino/passmanager": "0.18.4",
-    "@dotrino/proxy-client": "^0.36.1",
-    "@dotrino/roadmap": "0.4.26",
-    "@dotrino/store": "0.11.0",
+    "@dotrino/proxy-client": "0.36.1",
+    "@dotrino/roadmap": "0.4.30",
+    "@dotrino/store": "0.12.3",
     "@dotrino/update": "0.9.0",
     "sigstore": "5.0.0",
     "ws": "^8.18.0"
@@ -51,11 +51,11 @@
     "!lib/src/types.d.ts"
   ],
   "devDependencies": {
-    "@dotrino/remote-agent": "0.13.0",
+    "@dotrino/remote-agent": "0.20.1",
     "@types/node": "^22.0.0",
     "typescript": "5.9.3"
   },
   "optionalDependencies": {
-    "@dotrino/webrtc": "0.1.0"
+    "@dotrino/webrtc": "0.1.1"
   }
 }

package/src/ctl.js

@@ -41,6 +41,7 @@ import * as hw from './hwkeys.js'
 import { isNewer } from './update.js'
 import { COMM_CN } from '../lib/src/core/commKey.js'
 import { machineLine } from '@dotrino/identity/machine'
+import * as vc from './vaultControl.js'
 
 const dir = dataDir()
 const stateFile = path.join(dir, 'state.json')
@@ -2338,25 +2339,10 @@ function drawerArg (word, devices = []) {
   return 'ns:' + w
 }
 
-/** Una orden de respaldo al daemon, y su respuesta (o su error, con código). */
-async function backupRequest (req, { timeoutMs = 120_000 } = {}) {
-  const s = requireDaemon()
-  const listFile = path.join(dataDir(), 'secrets-list.json')
-  const id = crypto.randomBytes(8).toString('hex')
-  try { fs.rmSync(listFile, { force: true }) } catch (_) {}
-  writeReq('secret-request.json', { ...req, id })
-  writeReq('dump-request.json', {})
-  sendSignal(s.pid, 'SIGUSR2')
-  for (let i = 0; i < timeoutMs / 100; i++) {
-    await sleep(100)
-    const d = ipcRead(listFile, null)
-    if (!d?.at) continue
-    try { fs.rmSync(listFile, { force: true }) } catch (_) {}
-    assertOpen(d)
-    if (d.backup?.id === id) return d.backup
-    if (d.secretError?.id === id) throw Object.assign(new Error(d.secretError.error), d.secretError)
-  }
-  throw Object.assign(new Error('the daemon did not reply'), { code: 'NO_REPLY' })
+/** Una orden de respaldo al daemon: la misma pieza que usa la TUI (`vaultControl.js`). */
+function backupRequest (req) {
+  requireDaemon()
+  return vc.backupOp(req, PROFILE || undefined)
 }
 
 function backupFail (e) {
@@ -2367,7 +2353,9 @@ function backupFail (e) {
     BACKUP_CORRUPT: 'El respaldo está dañado: no se puede leer.',
     WEAK_PASSWORD: 'La contraseña del respaldo tiene que tener al menos 12 caracteres.',
     NO_SUCH_DRAWER: `No existe ese cajón: ${(e.missing || []).join(', ')}. Míralos con:  dotrino-vault backup list`,
-    NO_REPLY: 'El daemon no respondió.'
+    NO_REPLY: 'El daemon no respondió.',
+    DAEMON_DOWN: 'El servicio de la bóveda no está corriendo.',
+    PROFILE_LOCKED: 'Perfil bloqueado. Ábrelo con:  dotrino-vault unlock'
   }[e.code]
   console.error(msg || `No se pudo: ${e.message}`)
   process.exit(1)

package/src/tui/app.js

@@ -30,6 +30,8 @@
  * que entrar antes), el candado es `k` (la `l` es el idioma) y la contraseña `c`.
  */
 import fs from 'node:fs'
+import os from 'node:os'
+import path from 'node:path'
 import { spawnSync } from 'node:child_process'
 import { parseEnvInput } from '../../lib/src/envtext.js'
 import { createTerm, widthOf, makeTheme } from './term.js'
@@ -1338,6 +1340,15 @@ async function onKeyProfiles (term, st, key) {
     st.sel.settings = 0
     st.scroll.settings = { value: 0 }
     st.screen = 'settings'
+  } else if (ch === 'o' && cur) { // el respaldo: exportar e importar, con la bóveda abierta
+    await ensureUnlocked(term, st, cur, async (p = cur) => {
+      if (!p.current) {
+        const r = await guard(term, st, i.switchingVault, () => vc.useProfile(p.id))
+        if (!r.ok) return
+        await refreshAll(term, st)
+      }
+      await openBackup(term, st)
+    })
   } else if (ch === 'y' && cur) { // las llaves: con qué se abre la bóveda
     await ensureUnlocked(term, st, cur, async (p = cur) => {
       st.doorsFor = p.id
@@ -2427,6 +2438,280 @@ async function onConfirmKey (st, key) {
   }
 }
 
+// -------------------------------- respaldo ---------------------------------
+//
+// EL RESPALDO (`docs/respaldo.md`): un archivo cifrado con una contraseña propia, con los
+// valores de los cajones elegidos (o de todos). Exportar e importar son de bóveda ABIERTA,
+// así que se entra con `ensureUnlocked`. Importar pasa por un PLAN: se ve qué es nuevo, qué
+// es igual y qué choca, y no se escribe nada hasta decidir cada choque.
+
+const BACKUP_PWD_MIN = 12
+const drawerTitle = (i, owner, device) => owner === 'passwords'
+  ? i.bkPasswords
+  : owner === 'ns:@me' ? i.bkProfile
+    : owner.startsWith('ns:') ? owner.slice(3)
+      : i.bkDevice(device?.id || owner.slice(4, 12), device?.label || null)
+
+/** El nombre por defecto del archivo: en la carpeta personal, con la fecha. */
+const defaultBackupPath = () => path.join(os.homedir(), `dotrino-vault-backup-${new Date().toISOString().slice(0, 10)}.json`)
+
+function backupRows (st, t) {
+  const i = L(st)
+  const b = st.backup
+  if (!b) return [{ text: t.muted(' —'), sel: false }]
+  const rows = [{ text: ' ' + t.bold(i.bkExportTitle), sel: false }]
+  if (!b.drawers.length) rows.push({ text: t.muted('   ' + i.bkNothing), sel: false })
+  for (const d of b.drawers) {
+    const on = b.chosen.has(d.owner)
+    rows.push({
+      text: `   ${on ? t.accent('[x]') : '[ ]'} ${drawerTitle(i, d.owner, d.device)}   ${t.muted(i.bkCount(d.count, d.owner === 'passwords'))}`,
+      sel: true,
+      meta: { owner: d.owner }
+    })
+  }
+  rows.push({ text: '', sel: false })
+  rows.push({ text: t.muted('   ' + (b.chosen.size ? i.bkSomeChosen(b.chosen.size) : i.bkAllChosen)), sel: false })
+  rows.push({ text: t.muted('   ' + i.bkNoKeys), sel: false })
+  return rows
+}
+
+const conflictsOf = (plan) => plan.drawers.flatMap((d) => d.items.filter((it) => it.status === 'conflict').map((it) => `${d.to} ${it.key}`))
+
+function backupPlanRows (st, t) {
+  const i = L(st)
+  const bp = st.backupPlan
+  if (!bp) return [{ text: t.muted(' —'), sel: false }]
+  const rows = [{ text: ' ' + t.bold(i.bkPlanFrom(path.basename(bp.path))), sel: false }]
+  const conflicts = conflictsOf(bp.plan)
+  if (conflicts.length) {
+    const all = new Set(conflicts.map((r) => bp.decisions[r]))
+    const label = all.size === 1 && all.has('keep') ? i.bkKeep : all.size === 1 && all.has('replace') ? i.bkReplace : i.bkMixed
+    rows.push({ text: ` ${t.bold(i.bkAllConflicts)}: ${t.accent(label)}`, sel: true, meta: { all: true } })
+  }
+  for (const d of bp.plan.drawers) {
+    const name = d.from === d.to ? drawerTitle(i, d.to, d.label) : `${drawerTitle(i, d.from, d.label)} → ${drawerTitle(i, d.to, null)}`
+    rows.push({ text: '', sel: false })
+    if (d.status !== 'ok') {
+      rows.push({ text: ` ${t.bold(name)}  ${t.warn(i.bkNoDevice)}`, sel: true, meta: { drawer: d.from } })
+      continue
+    }
+    rows.push({ text: ` ${t.bold(name)}`, sel: true, meta: { drawer: d.from } })
+    for (const it of d.items) {
+      const what = it.title ? `${it.title}${it.username ? ' · ' + it.username : ''}` : it.key
+      if (it.status !== 'conflict') {
+        rows.push({ text: `   ${t.muted((it.status === 'new' ? i.bkNew : i.bkSame).padEnd(10))} ${what}`, sel: false })
+        continue
+      }
+      const ref = `${d.to} ${it.key}`
+      const dec = bp.decisions[ref]
+      const decTxt = dec === 'keep' ? i.bkKeep : dec === 'replace' ? i.bkReplace : t.warn(i.bkUndecided)
+      rows.push({ text: `   ${t.warn(i.bkConflict.padEnd(10))} ${what}   → ${decTxt}`, sel: true, meta: { ref } })
+    }
+  }
+  const c = bp.plan.counts
+  rows.push({ text: '', sel: false })
+  rows.push({ text: t.muted('   ' + i.bkCounts(c.new, c.same, c.conflict, c.skipped)), sel: false })
+  return rows
+}
+
+/** Abre la pantalla de respaldo de la bóveda activa: carga qué cajones hay. */
+async function openBackup (term, st) {
+  const i = L(st)
+  const r = await guard(term, st, i.bkLoading, () => vc.backupDrawers(activeId(st)))
+  if (!r.ok) return
+  st.backup = { drawers: r.v, chosen: new Set() }
+  st.sel.backup = 0
+  st.scroll.backup = { value: 0 }
+  st.screen = 'backup'
+}
+
+/** Pide la contraseña del respaldo (dos veces al exportar) y sigue con ella. */
+function askBackupPassword (st, { twice }, done) {
+  const i = L(st)
+  setInput(st, {
+    label: i.bkPassword,
+    hint: twice ? i.bkPasswordHint : '',
+    mask: true,
+    onSubmit: async (pwd) => {
+      st.input = null
+      if (!pwd) return
+      if (twice && pwd.length < BACKUP_PWD_MIN) { flash(st, i.bkPasswordShort, 'danger'); return }
+      if (!twice) { await done(pwd); return }
+      setInput(st, {
+        label: i.repeatPassword,
+        mask: true,
+        onSubmit: async (again) => {
+          st.input = null
+          if (again !== pwd) { flash(st, i.passwordMismatch, 'danger'); return }
+          await done(pwd)
+        },
+        onCancel: () => { st.input = null }
+      })
+    },
+    onCancel: () => { st.input = null }
+  })
+}
+
+function backupErr (e, st) {
+  const i = L(st)
+  return ({
+    VAULT_LOCKED: i.errProfileLocked,
+    NOT_A_BACKUP: i.bkNotABackup,
+    BACKUP_CORRUPT: i.bkCorrupt,
+    WRONG_PASSWORD: i.bkWrongPassword,
+    BACKUP_CONFLICTS: i.bkConflictsAppeared
+  })[e?.code] || humanErr(e, st)
+}
+/** `guard`, con los errores del respaldo dichos en su idioma. */
+async function backupGuard (term, st, msg, fn) {
+  st.busy = msg
+  render(term, st)
+  try { const v = await fn(); st.busy = null; return { ok: true, v } } catch (e) { st.busy = null; flash(st, backupErr(e, st), 'danger'); return { ok: false, e } }
+}
+
+async function onKeyBackup (term, st, key) {
+  const i = L(st)
+  const ch = key.name === 'char' ? key.ch.toLowerCase() : null
+  const b = st.backup
+  if (key.name === 'escape' || ch === 'b' || !b) { st.screen = 'profiles'; st.backup = null; return true }
+  const selectable = backupRows(st, makeTheme()).filter((r) => r.sel)
+  if (['up', 'down', 'pageup', 'pagedown', 'home', 'end'].includes(key.name)) { moveSel(st, key, 'backup', selectable.length); return true }
+  const cur = selectable[Math.min(st.sel.backup || 0, selectable.length - 1)]?.meta
+  if ((key.name === 'enter' || (key.name === 'char' && key.ch === ' ')) && cur?.owner) {
+    if (b.chosen.has(cur.owner)) b.chosen.delete(cur.owner)
+    else b.chosen.add(cur.owner)
+    return true
+  }
+  if (ch === 'g') {
+    if (!b.drawers.length) { flash(st, i.bkNothing, 'warn'); return true }
+    setInput(st, {
+      label: i.bkSaveTo,
+      hint: i.bkSaveToHint,
+      value: defaultBackupPath(),
+      file: true,
+      save: true,
+      onSubmit: async (raw) => {
+        st.input = null
+        const out = raw.trim()
+        if (!out) return
+        if (fs.existsSync(out)) { flash(st, i.bkExists(out), 'danger'); return }
+        askBackupPassword(st, { twice: true }, async (pwd) => {
+          const r = await backupGuard(term, st, i.bkExporting, () => vc.backupExport(b.chosen.size ? [...b.chosen] : null, pwd, activeId(st)))
+          if (!r.ok) return
+          try { fs.writeFileSync(out, JSON.stringify(r.v.file, null, 2) + '\n', { mode: 0o600 }) } catch (e) { flash(st, i.bkWriteFailed(e.message), 'danger'); return }
+          const s = r.v.summary
+          if (s.passwordsUnreadable) flash(st, i.bkSavedButMissing(out, s.passwordsUnreadable), 'warn')
+          else flash(st, i.bkSaved(out, s.drawers.length))
+        })
+      },
+      onCancel: () => { st.input = null }
+    })
+    return true
+  }
+  if (ch === 'i') {
+    setInput(st, {
+      label: i.bkOpenFile,
+      hint: i.bkOpenFileHint,
+      file: true,
+      onSubmit: async (raw) => {
+        st.input = null
+        const where = raw.trim()
+        if (!where) return
+        let file
+        try { file = JSON.parse(fs.readFileSync(where, 'utf8')) } catch (e) { flash(st, i.bkReadFailed(where), 'danger'); return }
+        askBackupPassword(st, { twice: false }, async (pwd) => {
+          const r = await backupGuard(term, st, i.bkPlanning, () => vc.backupPlan(file, pwd, {}, activeId(st)))
+          if (!r.ok) return
+          st.backupPlan = { path: where, file, pwd, plan: r.v, map: {}, decisions: {} }
+          st.sel.backupplan = 0
+          st.scroll.backupplan = { value: 0 }
+          st.screen = 'backupplan'
+        })
+      },
+      onCancel: () => { st.input = null }
+    })
+    return true
+  }
+  return true
+}
+
+/** Rehace el plan (tras mover un cajón), conservando lo que ya se había decidido. */
+async function replanBackup (term, st) {
+  const i = L(st)
+  const bp = st.backupPlan
+  const r = await backupGuard(term, st, i.bkPlanning, () => vc.backupPlan(bp.file, bp.pwd, { map: bp.map }, activeId(st)))
+  if (!r.ok) return
+  bp.plan = r.v
+  const valid = new Set(conflictsOf(bp.plan))
+  for (const k of Object.keys(bp.decisions)) if (!valid.has(k)) delete bp.decisions[k]
+}
+
+async function onKeyBackupPlan (term, st, key) {
+  const i = L(st)
+  const ch = key.name === 'char' ? key.ch.toLowerCase() : null
+  const bp = st.backupPlan
+  const leave = () => { st.backupPlan = null; st.screen = st.backup ? 'backup' : 'profiles' }
+  if (key.name === 'escape' || ch === 'b' || !bp) { leave(); return true }
+  const selectable = backupPlanRows(st, makeTheme()).filter((r) => r.sel)
+  if (['up', 'down', 'pageup', 'pagedown', 'home', 'end'].includes(key.name)) { moveSel(st, key, 'backupplan', selectable.length); return true }
+  const cur = selectable[Math.min(st.sel.backupplan || 0, selectable.length - 1)]?.meta
+  const next = (d) => (d === 'keep' ? 'replace' : 'keep')
+  if (key.name === 'enter' || (key.name === 'char' && key.ch === ' ')) {
+    if (cur?.ref) bp.decisions[cur.ref] = next(bp.decisions[cur.ref])
+    else if (cur?.all) {
+      const refs = conflictsOf(bp.plan)
+      const to = refs.every((r) => bp.decisions[r] === 'keep') ? 'replace' : 'keep'
+      for (const r of refs) bp.decisions[r] = to
+    }
+    return true
+  }
+  if (ch === 'm' && cur?.drawer) {
+    const from = cur.drawer
+    if (from === 'passwords') { flash(st, i.bkCantMovePasswords, 'warn'); return true }
+    setInput(st, {
+      label: i.bkMoveTo(drawerTitle(i, from, null)),
+      hint: i.bkMoveToHint,
+      onSubmit: async (raw) => {
+        st.input = null
+        const w = raw.trim()
+        if (!w) return
+        let to
+        if (/^[0-9A-F]{4}-[0-9A-F]{4}$/i.test(w)) {
+          const m = (st.members || []).find((x) => x.id === w.toUpperCase())
+          if (!m) { flash(st, i.bkNoSuchDevice(w), 'danger'); return }
+          to = 'dev:' + m.pub
+        } else if (NS_RE.test(w)) to = 'ns:' + w
+        else { flash(st, i.bkBadTarget, 'danger'); return }
+        if (to === from) delete bp.map[from]
+        else bp.map[from] = to
+        await replanBackup(term, st)
+      },
+      onCancel: () => { st.input = null }
+    })
+    return true
+  }
+  if (ch === 'g') {
+    const undecided = conflictsOf(bp.plan).filter((r) => !bp.decisions[r])
+    if (undecided.length) { flash(st, i.bkStillUndecided(undecided.length), 'warn'); return true }
+    const writes = bp.plan.counts.new + Object.values(bp.decisions).filter((d) => d === 'replace').length
+    if (!writes) { flash(st, i.bkNothingToImport, 'warn'); return true }
+    setConfirm(st, {
+      text: i.bkConfirm(writes),
+      onYes: async () => {
+        const r = await backupGuard(term, st, i.bkImporting, () => vc.backupImport(bp.file, bp.pwd, { map: bp.map, decisions: bp.decisions }, activeId(st)))
+        if (!r.ok) return
+        flash(st, i.bkImported(r.v.written, r.v.kept, r.v.keptPrivate?.length || 0))
+        leave()
+        await refreshAll(term, st)
+        if (st.backup) await openBackup(term, st)
+      },
+      onNo: () => {}
+    })
+    return true
+  }
+  return true
+}
+
 // --------------------------------- render ----------------------------------
 
 // Pestañas INTERNAS de una bóveda ya elegida: se cambian con ←→. La lista de
@@ -2453,7 +2738,9 @@ const helpSegs = (i, screen, st = {}) => {
     join: i.helpJoin,
     me: i.helpMe,
     caps: i.helpCaps,
-    devvars: i.helpDevVars
+    devvars: i.helpDevVars,
+    backup: i.helpBackup,
+    backupplan: i.helpBackupPlan
   }[screen] || []
   if (typeof segs !== 'function') return segs
   // El aparato señalado ahora mismo: `e variables` solo tiene sentido en un servicio (es
@@ -2488,7 +2775,9 @@ const title = (i, screen) => ({
   paircaps: i.titlePairCaps,
   join: i.titleJoin,
   caps: i.titleCaps,
-  devvars: i.titleDevVars
+  devvars: i.titleDevVars,
+  backup: i.titleBackup,
+  backupplan: i.titleBackupPlan
 })[screen] || ''
 
 /** Barra de pestañas horizontal (Dispositivos | Scopes y variables) de la bóveda entrada. */
@@ -2627,6 +2916,8 @@ function render (term, st) {
   else if (st.screen === 'doors') body = renderList(doorRows(st, t), st.sel.doors || 0, contentH, cols, t, scrollRef)
   else if (st.screen === 'settings') body = renderList(settingsRows(st, t), st.sel.settings || 0, contentH, cols, t, scrollRef)
   else if (st.screen === 'paircaps') body = renderList(pairCapsRows(st, t), st.sel.paircaps || 0, contentH, cols, t, scrollRef)
+  else if (st.screen === 'backup') body = renderList(backupRows(st, t), st.sel.backup || 0, contentH, cols, t, scrollRef)
+  else if (st.screen === 'backupplan') body = renderList(backupPlanRows(st, t), st.sel.backupplan || 0, contentH, cols, t, scrollRef)
   else if (st.screen === 'pairing') {
     const pb = pairingBody(st, t, cols, contentH)
     body = scrollBody(pb, contentH, scrollRef)
@@ -2669,7 +2960,9 @@ const LIST_SCREENS = {
   pairmode: [pairModeRows, 'pairmode'],
   doors: [doorRows, 'doors'],
   settings: [settingsRows, 'settings'],
-  paircaps: [pairCapsRows, 'paircaps']
+  paircaps: [pairCapsRows, 'paircaps'],
+  backup: [backupRows, 'backup'],
+  backupplan: [backupPlanRows, 'backupplan']
 }
 
 /**
@@ -2738,7 +3031,7 @@ export function viewModel (st, t) {
   else if (st.flash) vm.status = { text: st.flash.text, kind: st.flash.kind || 'ok' }
   if (st.input) {
     const inp = st.input
-    vm.input = { label: inp.label || '', hint: inp.hint || '', mask: !!inp.mask, value: inp.value || '', file: !!inp.file }
+    vm.input = { label: inp.label || '', hint: inp.hint || '', mask: !!inp.mask, value: inp.value || '', file: !!inp.file, save: !!inp.save }
   } else if (st.confirm) vm.confirm = { text: st.confirm.text, defaultYes: !!st.confirm.defaultYes }
   else vm.help = helpSegs(i, st.screen, st)
   return vm
@@ -2951,6 +3244,8 @@ export async function handleKey (term, st, key) {
   if (st.screen === 'doors') return onKeyDoors(term, st, key)
   if (st.screen === 'settings') return onKeySettings(term, st, key)
   if (st.screen === 'paircaps') return onKeyPairCaps(term, st, key)
+  if (st.screen === 'backup') return onKeyBackup(term, st, key)
+  if (st.screen === 'backupplan') return onKeyBackupPlan(term, st, key)
   if (st.screen === 'pairing') return onKeyPairing(term, st, key)
   if (st.screen === 'join') return onKeyJoin(term, st, key)
   return true
@@ -3013,4 +3308,4 @@ export async function runTui () {
 }
 
 // Solo para pruebas headless (render sin terminal real). No usar en runtime.
-export const __test = { checkForUpdate, offerUpdate, installUpdate, render, settingsRows, onKeySettings, doorRows, onKeyDoors, pairCapsRows, onKeyPairCaps, onKeyDevices, draftChanges, saveCapsDrafts, onKeySecrets, loginRows, onKeyLogins, refreshLogins, activeLocked, autoLockedIds, autoLockWakeIn, forgetAutoLocked, autoLockMin, refreshAll, ensureUnlocked, profileRows, deviceRows, secretRows, devVarRows, meRows, capsRows, onKeyCaps, pairModeRows, pairingBody, scrollBody, fitHelp, wrapHelp, wrapWords, joinBody, onKeyJoin, promptJoin, onKeyProfiles, onInputKey, toggleLang, mergeMembersAndCerts, seguirAqui, resetToque: () => { ultimoToque = 0 } }
+export const __test = { checkForUpdate, offerUpdate, installUpdate, render, settingsRows, onKeySettings, doorRows, onKeyDoors, pairCapsRows, onKeyPairCaps, onKeyDevices, draftChanges, saveCapsDrafts, onKeySecrets, loginRows, onKeyLogins, refreshLogins, activeLocked, autoLockedIds, autoLockWakeIn, forgetAutoLocked, autoLockMin, refreshAll, ensureUnlocked, profileRows, deviceRows, secretRows, devVarRows, meRows, capsRows, onKeyCaps, pairModeRows, pairingBody, scrollBody, fitHelp, wrapHelp, wrapWords, joinBody, onKeyJoin, promptJoin, onKeyProfiles, onInputKey, toggleLang, mergeMembersAndCerts, seguirAqui, backupRows, backupPlanRows, onKeyBackup, onKeyBackupPlan, resetToque: () => { ultimoToque = 0 } }

package/src/tui/i18n.js

@@ -384,6 +384,60 @@ const es = {
   // variables de UN aparato (Dispositivos → tecla e). Las del scope las comparten todos
   // los aparatos que sirven ese namespace; estas las lee solo él, y le ganan.
   titleDevVars: 'Variables del dispositivo',
+  // EL RESPALDO (`docs/respaldo.md`).
+  titleBackup: 'Respaldo',
+  titleBackupPlan: 'Importar un respaldo',
+  helpBackup: ['↑↓', 'Enter marcar', 'g exportar', 'i importar', 'Esc atrás', 'l English', 'q salir'],
+  helpBackupPlan: ['↑↓', 'Enter decidir', 'm mover cajón', 'g importar', 'Esc cancelar', 'l English', 'q salir'],
+  bkLoading: 'mirando qué hay…',
+  bkExportTitle: 'Qué cajones van en el respaldo',
+  bkNothing: 'No hay nada que respaldar todavía.',
+  bkPasswords: 'contraseñas',
+  bkProfile: '@me (tu perfil)',
+  bkDevice: (id, label) => `aparato ${id}${label ? ' (' + label + ')' : ''}`,
+  bkCount: (n, entries) => `${n} ${entries ? (n === 1 ? 'entrada' : 'entradas') : (n === 1 ? 'valor' : 'valores')}`,
+  bkAllChosen: 'Sin marcar ninguno, se exportan todos.',
+  bkSomeChosen: (n) => `Se exportan ${n === 1 ? 'el cajón marcado' : `los ${n} cajones marcados`}.`,
+  bkNoKeys: 'Las llaves no van: son de cada aparato. Al importar se vuelve a cerrar todo con las de la otra bóveda.',
+  bkSaveTo: 'Guardar el respaldo en',
+  bkSaveToHint: 'la ruta del archivo (Esc cancela)',
+  bkExists: (f) => `${f} ya existe: elige otro nombre`,
+  bkPassword: 'Contraseña del respaldo',
+  bkPasswordHint: 'al menos 12 caracteres; no se puede recuperar',
+  bkPasswordShort: 'Tiene que tener al menos 12 caracteres. Varias palabras al azar funcionan bien.',
+  bkExporting: 'exportando…',
+  bkWriteFailed: (m) => `No se pudo escribir el archivo: ${m}`,
+  bkSaved: (f, n) => `Respaldo guardado en ${f} (${n} ${n === 1 ? 'cajón' : 'cajones'})`,
+  bkSavedButMissing: (f, n) => `Guardado en ${f}, pero ${n} contraseña(s) no entraron: ábrelas una vez desde un aparato con «contraseñas» y repite`,
+  bkOpenFile: 'Archivo del respaldo',
+  bkOpenFileHint: 'la ruta del archivo (Esc cancela)',
+  bkReadFailed: (f) => `No se pudo leer ${f}`,
+  bkPlanning: 'abriendo el respaldo…',
+  bkNotABackup: 'Ese archivo no es un respaldo de la bóveda.',
+  bkCorrupt: 'El respaldo está dañado: no se puede leer.',
+  bkWrongPassword: 'Esa contraseña no abre este respaldo.',
+  bkConflictsAppeared: 'Apareció un choque nuevo (la bóveda cambió). No se importó nada; vuelve a abrir el respaldo.',
+  bkPlanFrom: (f) => `Lo que trae ${f}`,
+  bkAllConflicts: 'Todos los choques',
+  bkKeep: 'conservar lo de aquí',
+  bkReplace: 'reemplazar con el respaldo',
+  bkMixed: 'según cada uno',
+  bkUndecided: 'sin decidir',
+  bkNew: 'nuevo',
+  bkSame: 'igual',
+  bkConflict: 'CHOCA',
+  bkNoDevice: 'no entra: ese aparato no está en esta cuenta (m para moverlo)',
+  bkCounts: (n, s, c, k) => `${n} nuevo(s) · ${s} igual(es) · ${c} choque(s)${k ? ` · ${k} sin destino` : ''}`,
+  bkMoveTo: (from) => `¿A qué cajón va ${from}?`,
+  bkMoveToHint: 'el nombre de un scope, o el ID de un aparato (AB12-CD34)',
+  bkCantMovePasswords: 'Las contraseñas van a la bóveda de contraseñas: no se mueven.',
+  bkNoSuchDevice: (id) => `No hay ningún aparato ${id} en esta cuenta`,
+  bkBadTarget: 'Usa el nombre de un scope ([a-z0-9-]) o el ID de un aparato.',
+  bkStillUndecided: (n) => `Falta decidir ${n} choque(s): Enter en cada uno, o en «Todos los choques»`,
+  bkNothingToImport: 'No hay nada que importar.',
+  bkConfirm: (n) => `¿Importar ${n} cambio(s)?`,
+  bkImporting: 'importando…',
+  bkImported: (w, k, p) => `Importado: ${w} escrito(s), ${k} conservado(s)${p ? ` · ${p} se quedan privadas` : ''}`,
   devVarsFor: (id, name) => `Variables de ${id}${name ? ' · ' + name : ''}`,
   devVarsService: (cn) => `servicio «${cn}» — solo las lee este aparato, y pisan a las del scope`,
   noDevVars: '(sin variables propias — pulsa N para agregar la primera)',
@@ -447,7 +501,7 @@ const es = {
   // INGLÉS: new/rename/delete/password/unlock/locK/pair/approve/revoke/refresh/
   // language/quit); lo único que se traduce es la palabra que las explica.
   // Segmentos, no una línea: si no caben en una, el render los reparte en varias.
-  helpProfiles: ['↑↓', 'Enter entrar', 'p emparejar', 'j unirse', 'n nueva', 'r renombrar', 'd borrar', 'c clave', 'x quitar-clave', 'y llaves', 'u desbloq', 'k bloquear', 's ajustes', 'l English', 'q salir'],
+  helpProfiles: ['↑↓', 'Enter entrar', 'p emparejar', 'j unirse', 'n nueva', 'r renombrar', 'd borrar', 'c clave', 'x quitar-clave', 'y llaves', 'o respaldo', 'u desbloq', 'k bloquear', 's ajustes', 'l English', 'q salir'],
   // La barra dice lo que se PUEDE hacer AHORA, no todo lo que existe: aprobar/rechazar solo
   // valen si hay alguien esperando, y renombrar/revocar solo si hay un aparato seleccionado.
   // Anunciar teclas muertas confunde y además las quema para otros usos.
@@ -853,6 +907,59 @@ const en = {
 
   // variables de UN aparato (Dispositivos → tecla e)
   titleDevVars: 'Device variables',
+  titleBackup: 'Backup',
+  titleBackupPlan: 'Import a backup',
+  helpBackup: ['↑↓', 'Enter mark', 'g export', 'i import', 'Esc back', 'l Español', 'q quit'],
+  helpBackupPlan: ['↑↓', 'Enter decide', 'm move drawer', 'g import', 'Esc cancel', 'l Español', 'q quit'],
+  bkLoading: 'looking at what there is…',
+  bkExportTitle: 'Which drawers go in the backup',
+  bkNothing: 'There is nothing to back up yet.',
+  bkPasswords: 'passwords',
+  bkProfile: '@me (your profile)',
+  bkDevice: (id, label) => `device ${id}${label ? ' (' + label + ')' : ''}`,
+  bkCount: (n, entries) => `${n} ${entries ? (n === 1 ? 'entry' : 'entries') : (n === 1 ? 'value' : 'values')}`,
+  bkAllChosen: 'With none marked, all of them are exported.',
+  bkSomeChosen: (n) => `${n === 1 ? 'The marked drawer is' : `The ${n} marked drawers are`} exported.`,
+  bkNoKeys: 'Keys do not go: they belong to each device. On import everything is sealed again with the other vault\'s keys.',
+  bkSaveTo: 'Save the backup to',
+  bkSaveToHint: 'the file path (Esc cancels)',
+  bkExists: (f) => `${f} already exists: pick another name`,
+  bkPassword: 'Backup password',
+  bkPasswordHint: 'at least 12 characters; it cannot be recovered',
+  bkPasswordShort: 'It must be at least 12 characters. A few random words work well.',
+  bkExporting: 'exporting…',
+  bkWriteFailed: (m) => `Could not write the file: ${m}`,
+  bkSaved: (f, n) => `Backup saved to ${f} (${n} ${n === 1 ? 'drawer' : 'drawers'})`,
+  bkSavedButMissing: (f, n) => `Saved to ${f}, but ${n} password(s) did not go in: open them once from a device with «passwords» and repeat`,
+  bkOpenFile: 'Backup file',
+  bkOpenFileHint: 'the file path (Esc cancels)',
+  bkReadFailed: (f) => `Could not read ${f}`,
+  bkPlanning: 'opening the backup…',
+  bkNotABackup: 'That file is not a vault backup.',
+  bkCorrupt: 'The backup is damaged: it cannot be read.',
+  bkWrongPassword: 'That password does not open this backup.',
+  bkConflictsAppeared: 'A new conflict showed up (the vault changed). Nothing was imported; open the backup again.',
+  bkPlanFrom: (f) => `What ${f} brings`,
+  bkAllConflicts: 'All conflicts',
+  bkKeep: 'keep what is here',
+  bkReplace: 'replace with the backup',
+  bkMixed: 'one by one',
+  bkUndecided: 'undecided',
+  bkNew: 'new',
+  bkSame: 'same',
+  bkConflict: 'CONFLICT',
+  bkNoDevice: 'does not go in: that device is not in this account (m to move it)',
+  bkCounts: (n, s, c, k) => `${n} new · ${s} same · ${c} conflict(s)${k ? ` · ${k} without a destination` : ''}`,
+  bkMoveTo: (from) => `Which drawer does ${from} go to?`,
+  bkMoveToHint: 'a scope name, or a device ID (AB12-CD34)',
+  bkCantMovePasswords: 'Passwords go to the password vault: they are not moved.',
+  bkNoSuchDevice: (id) => `There is no device ${id} in this account`,
+  bkBadTarget: 'Use a scope name ([a-z0-9-]) or a device ID.',
+  bkStillUndecided: (n) => `${n} conflict(s) still undecided: Enter on each one, or on «All conflicts»`,
+  bkNothingToImport: 'There is nothing to import.',
+  bkConfirm: (n) => `Import ${n} change(s)?`,
+  bkImporting: 'importing…',
+  bkImported: (w, k, p) => `Imported: ${w} written, ${k} kept${p ? ` · ${p} stay private` : ''}`,
   devVarsFor: (id, name) => `Variables of ${id}${name ? ' · ' + name : ''}`,
   devVarsService: (cn) => `“${cn}” service — only this device reads them, and they override the scope ones`,
   noDevVars: '(no variables of its own — press N to add the first one)',
@@ -907,7 +1014,7 @@ const en = {
   helpInput: 'Enter confirm · Esc cancel · Ctrl-U clear',
   helpConfirm: 'y confirm · n/Esc cancel',
 
-  helpProfiles: ['↑↓', 'Enter open', 'p pair', 'j join', 'n new', 'r rename', 'd delete', 'c password', 'x drop-password', 'y keys', 'u unlock', 'k lock', 's settings', 'l Español', 'q quit'],
+  helpProfiles: ['↑↓', 'Enter open', 'p pair', 'j join', 'n new', 'r rename', 'd delete', 'c password', 'x drop-password', 'y keys', 'o backup', 'u unlock', 'k lock', 's settings', 'l Español', 'q quit'],
   helpDevices: ({ pending, hasDevices, isService, drafts, curBlocked } = {}) => [
     '←→ tab', '↑↓', 'p pair',
     ...(drafts ? ['g save permissions'] : []),

package/src/vaultControl.js

@@ -629,6 +629,54 @@ export async function revealSecret (owner, key, profile, password) {
   return d.revealed.value
 }
 
+// ---------------------------------------------------------------------------
+// EL RESPALDO (`docs/respaldo.md`). Lo usan la CLI (`dotrino-vault backup`) y la TUI.
+//
+// Bóveda abierta, y la contraseña del RESPALDO (no la del perfil) viaja en la petición, que
+// el daemon borra al leerla. Lo que vuelve nunca es un valor en claro: el archivo ya
+// cifrado, o el plan con nombres y estados.
+// ---------------------------------------------------------------------------
+
+/**
+ * Una orden de respaldo y su respuesta. Se reconoce la nuestra por el `id` de la petición
+ * (`backup.id` o `secretError.id`), no por el del volcado: el error de otra orden no es el
+ * nuestro. Hasta dos minutos: exportar abre cada valor y deriva la contraseña.
+ */
+export async function backupOp (req, profile, { timeoutMs = 120_000 } = {}) {
+  requireAlive()
+  rm(F.secretsList)
+  const id = await writeReq(F.secretReq, req, profile)
+  await writeReq(F.dumpReq, {}, profile)
+  signalOrCleanup('SIGUSR2', [F.secretReq, F.dumpReq])
+  for (let i = 0; i < timeoutMs / 100; i++) {
+    await sleep(100)
+    const d = read(F.secretsList, null)
+    if (!d?.at) continue
+    rm(F.secretsList)
+    assertOpen(d)
+    if (d.backup?.id === id) return d.backup
+    if (d.secretError?.id === id) throw Object.assign(new Error(d.secretError.error), d.secretError)
+  }
+  throw coded('the daemon did not reply', 'NO_REPLY')
+}
+
+/** Los cajones que hay: `[{ owner, count, device? }]`. */
+export async function backupDrawers (profile) {
+  return (await backupOp({ op: 'backup-drawers' }, profile)).drawers
+}
+/** Exporta (todo con `drawers = null`). Devuelve `{ file, summary }`; `file` ya va cifrado. */
+export async function backupExport (drawers, backupPassword, profile) {
+  return backupOp({ op: 'backup-export', drawers: drawers || null, backupPassword }, profile)
+}
+/** El plan de importar: qué es nuevo, igual o choca. No escribe nada. */
+export async function backupPlan (file, backupPassword, { drawers = null, map = {} } = {}, profile) {
+  return (await backupOp({ op: 'backup-plan', file, backupPassword, drawers, map }, profile)).plan
+}
+/** Importa. Con un choque sin decidir lanza `BACKUP_CONFLICTS` y no escribe nada. */
+export async function backupImport (file, backupPassword, { drawers = null, map = {}, onConflict = null, decisions = {} } = {}, profile) {
+  return (await backupOp({ op: 'backup-import', file, backupPassword, drawers, map, onConflict, decisions }, profile)).result
+}
+
 /** SALDA lo que quedó a deber (heredar lo viejo, rotar de verdad). Pide la contraseña. */
 export function settleSecrets (profile, password) {
   return secretOp({ op: 'settle', ...(password ? { password } : {}) }, profile, () => {})