@goodandready/dsh-subscriptions 0.7.8 → 0.7.9

package/bin/dsh-subscriptions.mjs

@@ -123,6 +123,11 @@ export function formatPacks(packs) {
   return JSON.stringify((Array.isArray(packs) ? packs : []).map(sanitizePack), null, 2) + '\\n'
 }
 
+export function formatSnapshotStatus(payload) {
+  const stats = (payload && payload.stats) || {}
+  return 'snapshots: ' + (stats.count || 0) + '  bytes: ' + (stats.bytes || 0) + '  path: ' + (stats.path || '-')
+}
+
 export function formatSnapshots(payload) {
   const rows = (payload && payload.snapshots) || []
   if (!rows.length) return 'no vault snapshots'
@@ -217,6 +222,7 @@ export async function run(argv = process.argv.slice(2), env = process.env, fetch
   if (options.command === 'vault' && !options.json) {
     try {
       const payload = JSON.parse(text || '{}')
+      if (options.vaultAction === 'status') return { text: formatSnapshotStatus(payload), contentType: 'text/plain' }
       if (options.vaultAction === 'snapshots' || !options.vaultAction) return { text: formatSnapshots(payload), contentType: 'text/plain' }
       if (options.vaultAction === 'snapshot') return { text: 'created ' + (payload.snapshot && payload.snapshot.id), contentType: 'text/plain' }
       if (options.vaultAction === 'restore') return { text: 'restored ' + (payload.slotCount || 0) + ' slots', contentType: 'text/plain' }
@@ -237,7 +243,7 @@ export async function run(argv = process.argv.slice(2), env = process.env, fetch
 async function main() {
   const result = await run()
   if (result.help) {
-    process.stdout.write('Usage: dsh-subscriptions <status|usage|fast|config|set|sources|packs|vault|doctor> [options]\n  usage --csv --type accounts|calls\n  fast <session> [fast|standard]\n  config\n  set <dot.path> <value>\n  sources [--json]\n  packs\n  packs add <file.json>\n  vault snapshots | vault snapshot [label] | vault restore <id>\n  doctor [--json]\n')
+    process.stdout.write('Usage: dsh-subscriptions <status|usage|fast|config|set|sources|packs|vault|doctor> [options]\n  usage --csv --type accounts|calls\n  fast <session> [fast|standard]\n  config\n  set <dot.path> <value>\n  sources [--json]\n  packs\n  packs add <file.json>\n  vault snapshots | vault snapshot [label] | vault restore <id> | vault status\n  doctor [--json]\n')
     return
   }
   process.stdout.write(result.text.endsWith('\n') ? result.text : result.text + '\n')

package/lib/client.js

@@ -3713,11 +3713,11 @@ window.__ModuleLoader__.load({
 
     // #736: vault snapshot list with create/restore. Payload stays server-side.
     function VaultSnapshotsPanel() {
-      const [state, setState] = React.useState({ snapshots: [], message: '', error: null, busy: false })
+      const [state, setState] = React.useState({ snapshots: [], stats: null, message: '', error: null, busy: false })
       const pull = () => {
         fetch('/dsh-subscriptions/vault/snapshots', { cache: 'no-store' })
           .then((res) => res.json())
-          .then((data) => setState((st) => Object.assign({}, st, { snapshots: data.snapshots || [], error: null })))
+          .then((data) => setState((st) => Object.assign({}, st, { snapshots: data.snapshots || [], stats: data.stats || null, error: null })))
           .catch((err) => setState((st) => Object.assign({}, st, { error: String(err && err.message || err) })))
       }
       React.useEffect(() => { pull() }, [])
@@ -3745,6 +3745,7 @@ window.__ModuleLoader__.load({
       return h('div', { className: 'dsub-section-card' },
         h('div', { className: 'dsub-section-title' }, 'Vault snapshots', h('button', { type: 'button', className: 'dsub-mini', onClick: create, disabled: state.busy }, state.busy ? '…' : 'Create snapshot')),
         h('div', { className: 'dsub-section-desc' }, 'Encrypted slots snapshots. A pre-pull snapshot is created automatically. Payload stays on the host.'),
+        state.stats ? h('div', { className: 'dsub-dim' }, state.stats.count + ' snapshots · ' + state.stats.bytes + ' bytes · ' + state.stats.path) : null,
         state.snapshots.length ? state.snapshots.map((snap) => h('div', { className: 'dsub-row', key: snap.id },
           h('span', { className: 'dsub-h' }, snap.id),
           h('span', { className: 'dsub-dim' }, (snap.label || '-') + ' · ' + snap.slotCount + ' slots · ' + snap.createdAt),

package/lib/routes/vault.js

@@ -15,7 +15,7 @@ export function registerVaultRoutes(ctx, state) {
         return
       }
       if (req.method === 'GET') {
-        writeJson(res, 200, { ok: true, snapshots: defaultSnapshotStore.list() })
+        writeJson(res, 200, { ok: true, snapshots: defaultSnapshotStore.list(), stats: defaultSnapshotStore.stats() })
         return
       }
       if (req.method !== 'POST') {

package/lib/vault-snapshots.js

@@ -1,7 +1,25 @@
-// #734: bounded in-memory snapshot ring. Only metadata leaves list(); the
-// encrypted payload is available through get(id) for an explicit restore.
+// #739: durable, bounded snapshot ring. Encrypted payloads are written with
+// 0600 permissions through a temp file + rename; list() only returns metadata.
+import { chmodSync, mkdirSync, readFileSync, renameSync, statSync, writeFileSync } from 'node:fs'
+import { join } from 'node:path'
+import { homedir } from 'node:os'
+
+const FILE_NAME = 'vault-snapshots.json'
+export const DEFAULT_MAX_BYTES = 2 * 1024 * 1024
+
+function bytesOf(items) {
+  return Buffer.byteLength(JSON.stringify(items))
+}
 let seq = 0
 
+export function resolveSnapshotDir(customDir) {
+  if (customDir) return customDir
+  if (process.env.DSH_SNAPSHOT_DIR) return process.env.DSH_SNAPSHOT_DIR
+  if (process.env.DSH_STORAGE_DIR) return process.env.DSH_STORAGE_DIR
+  if (process.env.DSH_HOME) return join(process.env.DSH_HOME, 'storages', 'dsh-subscriptions')
+  return join(homedir(), '.dsh', 'storages', 'dsh-subscriptions')
+}
+
 function meta(snapshot) {
   return {
     id: snapshot.id,
@@ -13,9 +31,36 @@ function meta(snapshot) {
   }
 }
 
-export function createSnapshotStore({ max = 10, now = () => Date.now() } = {}) {
-  let items = []
+function load(file) {
+  try {
+    const rows = JSON.parse(readFileSync(file, 'utf8'))
+    if (!Array.isArray(rows)) return []
+    return rows.filter((row) => row && typeof row === 'object' && typeof row.vault === 'string' && row.id)
+  } catch {
+    return []
+  }
+}
+
+function persist(dir, file, items) {
+  try {
+    mkdirSync(dir, { recursive: true, mode: 0o700 })
+    const tmp = file + '.tmp-' + process.pid + '-' + Date.now()
+    writeFileSync(tmp, JSON.stringify(items), { mode: 0o600 })
+    renameSync(tmp, file)
+    try { chmodSync(file, 0o600) } catch { /* best-effort */ }
+    return true
+  } catch {
+    return false
+  }
+}
+
+export function createSnapshotStore({ max = 10, maxBytes = DEFAULT_MAX_BYTES, now = () => Date.now(), dir, persistToDisk = true } = {}) {
+  const snapshotDir = resolveSnapshotDir(dir)
+  const file = join(snapshotDir, FILE_NAME)
+  let items = persistToDisk ? load(file) : []
+  const save = () => { if (persistToDisk) persist(snapshotDir, file, items) }
   return {
+    path: file,
     add(snapshot, label = '') {
       const at = now()
       const entry = {
@@ -26,6 +71,8 @@ export function createSnapshotStore({ max = 10, now = () => Date.now() } = {}) {
       }
       items.unshift(entry)
       if (items.length > Math.max(1, max)) items = items.slice(0, Math.max(1, max))
+      while (items.length > 1 && bytesOf(items) > Math.max(1, maxBytes)) items.pop()
+      save()
       return meta(entry)
     },
     list() {
@@ -36,6 +83,12 @@ export function createSnapshotStore({ max = 10, now = () => Date.now() } = {}) {
     },
     clear() {
       items = []
+      save()
+    },
+    stats() {
+      let bytes = bytesOf(items)
+      try { bytes = Math.max(bytes, statSync(file).size) } catch { /* file may not exist yet */ }
+      return { count: items.length, bytes, path: file, maxBytes }
     },
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-subscriptions",
-  "version": "0.7.8",
+  "version": "0.7.9",
   "description": "Use ChatGPT Codex, Claude, Grok, Antigravity, Kimi, GLM, Cursor, Kiro, Copilot, Qwen, ERNIE, Spark, JetBrains, Perplexity, Replit, and Cody subscriptions as DeepSeek Harness LLM providers via OAuth.",
   "license": "MIT",
   "type": "module",