dscs-server 0.1.3 → 0.1.4

package/dist/index.js

@@ -1,8 +1,9 @@
 #!/usr/bin/env node
-import { chmodSync, mkdirSync, renameSync, rmSync, writeFileSync } from 'node:fs';
+import { chmodSync, mkdirSync, readFileSync, renameSync, rmSync, writeFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { ONBOARDING_CODE_FILE, ONBOARDING_TTL_MS, createDevice, createHttpServer, listDevices, mintOnboardingCode, revokeDevice, DEFAULT_MAX_BYTES } from './http.js';
-import { clearAdminPassword, ensureSetupToken, isAdminInitialized, openDatabase, readMaxBytes } from './db.js';
+import { generateAdminPassword, resetAdminPassword } from './admin-password.js';
+import { ensureSetupToken, isAdminInitialized, openDatabase, readMaxBytes } from './db.js';
 function writeOnboardingCode(dataDir, code) {
     mkdirSync(dataDir, {
         recursive: true
@@ -34,13 +35,15 @@ function usage() {
   token list                 列出存活设备
   token revoke <deviceId>    吊销某个设备 token
   admin status               查看初始化状态与配额
-  admin reset                忘记管理密码时重置（重启 serve 后重新初始化）
+  admin reset-password       忘记管理密码时重置为新密码
+                             （默认生成随机密码；--stdin 从标准输入读取自定义密码）
 
 选项：
   --data-dir <目录>           数据目录（默认 .tmp/dev-data）
   --host <地址>               绑定地址（默认 127.0.0.1）
   --port <端口>               监听端口（默认 8787）
   --max-bytes <n>             存储上限（默认 10 GiB）
+  --stdin                     admin reset-password 从标准输入读取新密码
 `);
     process.exit(2);
 }
@@ -50,6 +53,10 @@ function parse(argv) {
     for(let index = 0; index < argv.length; index += 1){
         const argument = argv[index];
         if (argument.startsWith('--')) {
+            if (argument === '--stdin') {
+                flags.set('stdin', '');
+                continue;
+            }
             const value = argv[index + 1];
             if (value === undefined || value.startsWith('--')) usage();
             flags.set(argument.slice(2), value);
@@ -99,10 +106,19 @@ async function main(parsed) {
                 }, null, 2));
                 return;
             }
-            if (action === 'reset') {
-                clearAdminPassword(db);
-                clearOnboardingCode(dataDir);
-                console.log('已清除管理密码。重启 server 后会在控制台打印新的初始化密钥。');
+            if (action === 'reset-password') {
+                const fromStdin = parsed.flags.has('stdin');
+                const password = fromStdin ? readFileSync(0, 'utf8').replace(/\r?\n$/u, '') : generateAdminPassword();
+                resetAdminPassword(db, password);
+                if (fromStdin) {
+                    console.log('已重置管理密码。旧管理会话需要重启 server 后失效。');
+                } else {
+                    console.log('已重置管理密码（只显示一次）：');
+                    console.log('');
+                    console.log(password);
+                    console.log('');
+                    console.log('请登录管理台后立即修改；旧管理会话需要重启 server 后失效。');
+                }
                 return;
             }
             usage();

package/dist/session-admin.js

@@ -0,0 +1,200 @@
+import { rmSync } from 'node:fs';
+import { blobPath } from './blobs.js';
+import { bumpRevision, DEFAULT_DATASET, withTransaction } from './db.js';
+import { SyncError } from './shared/wire.js';
+import { recordSessionEvent } from './session-history.js';
+export const SESSION_RESET_TTL_MS = 24 * 60 * 60 * 1000;
+function targetRow(db, sessionId, createdAt) {
+    return db.handle.prepare('SELECT session_id, created_at, deleted_at, purged_at, stored_bytes, last_seq, manifest_json FROM sessions WHERE dataset = ? AND session_id = ?').get(DEFAULT_DATASET, sessionId);
+}
+function requireTarget(db, sessionId, createdAt) {
+    const row = targetRow(db, sessionId, createdAt);
+    if (row === undefined) throw new SyncError('not-found', `没有会话 ${sessionId}`);
+    if (row.created_at !== createdAt) throw new SyncError('conflict', 'createdAt 与当前生命周期不符');
+    return row;
+}
+function purgeSessionBlobs(db, dataDir, sessionId, manifestJson) {
+    let hashes;
+    try {
+        const manifest = JSON.parse(manifestJson);
+        hashes = (Array.isArray(manifest.frames) ? manifest.frames : []).map((frame)=>frame !== null && typeof frame === 'object' ? frame.blobSha256 : undefined).filter((hash)=>typeof hash === 'string' && hash !== '');
+    } catch  {
+        throw new SyncError('conflict', '会话 manifest 损坏，拒绝清理');
+    }
+    const unique = [
+        ...new Set(hashes)
+    ];
+    if (unique.length === 0) return {
+        bytes: 0,
+        files: []
+    };
+    const otherHashes = new Set();
+    const otherRows = db.handle.prepare('SELECT manifest_json FROM sessions WHERE dataset = ? AND session_id <> ?').all(DEFAULT_DATASET, sessionId);
+    for (const row of otherRows){
+        try {
+            const manifest = JSON.parse(row.manifest_json);
+            for (const frame of Array.isArray(manifest.frames) ? manifest.frames : []){
+                if (frame !== null && typeof frame === 'object' && typeof frame.blobSha256 === 'string') otherHashes.add(frame.blobSha256);
+            }
+        } catch  {
+            for (const hash of unique)otherHashes.add(hash);
+        }
+    }
+    const vaultCheck = db.handle.prepare('SELECT 1 FROM vault_records WHERE blob_sha256 = ? LIMIT 1');
+    const deleteBlob = db.handle.prepare('DELETE FROM blobs WHERE sha256 = ?');
+    const blobInfo = db.handle.prepare('SELECT bytes FROM blobs WHERE sha256 = ?');
+    let bytes = 0;
+    const files = [];
+    for (const hash of unique){
+        if (otherHashes.has(hash) || vaultCheck.get(hash) !== undefined) continue;
+        const record = blobInfo.get(hash);
+        if (record === undefined) continue;
+        deleteBlob.run(hash);
+        bytes += Number(record.bytes ?? 0);
+        files.push(blobPath(dataDir, hash));
+    }
+    return {
+        bytes,
+        files
+    };
+}
+function removeFiles(files) {
+    for (const file of files){
+        try {
+            rmSync(file, {
+                force: true
+            });
+        } catch  {}
+    }
+}
+export function archiveSession(db, sessionId, createdAt, now = Date.now()) {
+    withTransaction(db, ()=>{
+        const row = requireTarget(db, sessionId, createdAt);
+        if (row.deleted_at !== null) throw new SyncError('conflict', '会话已经删除/存档');
+        const revision = bumpRevision(db);
+        db.handle.prepare('UPDATE sessions SET deleted_at = ?, revision = ?, updated_at = ? WHERE dataset = ? AND session_id = ?').run(now, revision, now, DEFAULT_DATASET, sessionId);
+        db.handle.prepare(`INSERT OR REPLACE INTO tombstones (dataset, session_id, created_at, deleted_at, deleted_by)
+                       VALUES (?, ?, ?, ?, ?)`).run(DEFAULT_DATASET, sessionId, createdAt, now, 'admin:archive');
+        db.handle.prepare('DELETE FROM append_requests WHERE dataset = ? AND session_id = ?').run(DEFAULT_DATASET, sessionId);
+        recordSessionEvent(db, {
+            sessionId,
+            at: now,
+            kind: 'archive',
+            actorKind: 'admin',
+            actorId: 'admin',
+            lastSeq: row.last_seq ?? null,
+            storedBytes: row.stored_bytes ?? null,
+            detail: {
+                createdAt
+            }
+        });
+    });
+}
+export function removeSession(db, dataDir, sessionId, createdAt, now = Date.now()) {
+    let purged;
+    withTransaction(db, ()=>{
+        const row = requireTarget(db, sessionId, createdAt);
+        if (row.purged_at !== null) throw new SyncError('conflict', '会话已经移除并释放过空间');
+        purged = purgeSessionBlobs(db, dataDir, sessionId, row.manifest_json);
+        const revision = bumpRevision(db);
+        let manifest = {};
+        try {
+            manifest = JSON.parse(row.manifest_json);
+        } catch  {
+            manifest = {};
+        }
+        manifest.frames = [];
+        db.handle.prepare(`UPDATE sessions
+                       SET deleted_at = COALESCE(deleted_at, ?), purged_at = ?, revision = ?, updated_at = ?,
+                           stored_bytes = 0, manifest_json = ?
+                       WHERE dataset = ? AND session_id = ?`).run(now, now, revision, now, JSON.stringify(manifest), DEFAULT_DATASET, sessionId);
+        db.handle.prepare(`INSERT OR REPLACE INTO tombstones (dataset, session_id, created_at, deleted_at, deleted_by)
+                       VALUES (?, ?, ?, ?, ?)`).run(DEFAULT_DATASET, sessionId, createdAt, now, 'admin:remove');
+        db.handle.prepare('DELETE FROM append_requests WHERE dataset = ? AND session_id = ?').run(DEFAULT_DATASET, sessionId);
+        recordSessionEvent(db, {
+            sessionId,
+            at: now,
+            kind: 'remove',
+            actorKind: 'admin',
+            actorId: 'admin',
+            bytes: purged?.bytes ?? 0,
+            lastSeq: null,
+            storedBytes: 0,
+            detail: {
+                createdAt,
+                purgedBytes: purged?.bytes ?? 0
+            }
+        });
+    });
+    const result = purged ?? {
+        bytes: 0,
+        files: []
+    };
+    removeFiles(result.files);
+    return result.bytes;
+}
+export function resetSession(db, dataDir, sessionId, createdAt, deviceId, now = Date.now()) {
+    let purged;
+    withTransaction(db, ()=>{
+        const row = requireTarget(db, sessionId, createdAt);
+        purged = purgeSessionBlobs(db, dataDir, sessionId, row.manifest_json);
+        db.handle.prepare('DELETE FROM append_requests WHERE dataset = ? AND session_id = ?').run(DEFAULT_DATASET, sessionId);
+        db.handle.prepare('DELETE FROM tombstones WHERE dataset = ? AND session_id = ?').run(DEFAULT_DATASET, sessionId);
+        db.handle.prepare('DELETE FROM sessions WHERE dataset = ? AND session_id = ?').run(DEFAULT_DATASET, sessionId);
+        db.handle.prepare('DELETE FROM leases WHERE dataset = ? AND resource = ?').run(DEFAULT_DATASET, 'sync');
+        let workspaceKey = null;
+        try {
+            const manifest = JSON.parse(row.manifest_json);
+            if (typeof manifest.workspaceKey === 'string' && manifest.workspaceKey !== '') workspaceKey = manifest.workspaceKey;
+        } catch  {
+            workspaceKey = null;
+        }
+        db.handle.prepare(`INSERT OR REPLACE INTO session_resets
+                       (dataset, session_id, created_at, reset_at, expires_at, device_id, workspace_key)
+                       VALUES (?, ?, ?, ?, ?, ?, ?)`).run(DEFAULT_DATASET, sessionId, createdAt, now, now + SESSION_RESET_TTL_MS, deviceId, workspaceKey);
+        recordSessionEvent(db, {
+            sessionId,
+            at: now,
+            kind: 'reset',
+            actorKind: 'admin',
+            actorId: 'admin',
+            bytes: purged?.bytes ?? 0,
+            detail: {
+                createdAt,
+                deviceId,
+                purgedBytes: purged?.bytes ?? 0
+            }
+        });
+    });
+    const result = purged ?? {
+        bytes: 0,
+        files: []
+    };
+    removeFiles(result.files);
+    return result.bytes;
+}
+export function restoreSession(db, sessionId, createdAt, now = Date.now()) {
+    withTransaction(db, ()=>{
+        const row = requireTarget(db, sessionId, createdAt);
+        if (row.deleted_at === null) throw new SyncError('conflict', '会话没有存档');
+        if (row.purged_at !== null) throw new SyncError('conflict', '会话已经释放空间，不能恢复');
+        const revision = bumpRevision(db);
+        db.handle.prepare('UPDATE sessions SET deleted_at = NULL, revision = ?, updated_at = ? WHERE dataset = ? AND session_id = ?').run(revision, now, DEFAULT_DATASET, sessionId);
+        db.handle.prepare('DELETE FROM tombstones WHERE dataset = ? AND session_id = ? AND created_at = ?').run(DEFAULT_DATASET, sessionId, createdAt);
+        recordSessionEvent(db, {
+            sessionId,
+            at: now,
+            kind: 'restore',
+            actorKind: 'admin',
+            actorId: 'admin',
+            lastSeq: null,
+            storedBytes: row.stored_bytes ?? null,
+            detail: {
+                createdAt
+            }
+        });
+    });
+}
+
+
+//# sourceURL=session-admin.ts

package/dist/session-history.js

@@ -0,0 +1,134 @@
+import { DEFAULT_DATASET } from './db.js';
+export function recordSessionEvent(db, input) {
+    db.handle.prepare(`INSERT INTO session_events
+      (dataset, session_id, at, kind, device_id, actor_kind, actor_id, events, bytes, seq_from, seq_to,
+       batch_count, last_seq, stored_bytes, detail)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(DEFAULT_DATASET, input.sessionId, input.at, input.kind, input.deviceId ?? null, input.actorKind, input.actorId, Math.max(0, Math.trunc(input.events ?? 0)), Math.max(0, Math.trunc(input.bytes ?? 0)), input.seqFrom ?? null, input.seqTo ?? null, Math.max(0, Math.trunc(input.batchCount ?? 0)), input.lastSeq ?? null, input.storedBytes ?? null, input.detail === undefined ? null : JSON.stringify(input.detail));
+}
+export function listSessionHistory(db, sessionId, options = {}) {
+    const limit = Math.min(200, Math.max(1, Math.trunc(options.limit ?? 100)));
+    const before = options.before !== undefined && Number.isSafeInteger(options.before) ? options.before : undefined;
+    const rows = db.handle.prepare(`SELECT e.id, e.session_id, e.at, e.kind, e.device_id, e.actor_kind, e.actor_id,
+                     e.events, e.bytes, e.seq_from, e.seq_to, e.batch_count, e.last_seq, e.stored_bytes, e.detail,
+                     d.label AS device_label, d.color AS device_color
+              FROM session_events e
+              LEFT JOIN devices d ON d.dataset = e.dataset AND d.device_id = e.device_id
+              WHERE e.dataset = ? AND e.session_id = ? ${before === undefined ? '' : 'AND e.id < ?'}
+              ORDER BY e.id DESC LIMIT ?`).all(...[
+        DEFAULT_DATASET,
+        sessionId,
+        ...before === undefined ? [] : [
+            before
+        ],
+        limit
+    ]);
+    const events = rows.map((row)=>({
+            id: row.id,
+            sessionId: row.session_id,
+            at: row.at,
+            kind: row.kind,
+            deviceId: row.device_id,
+            deviceLabel: row.device_label,
+            deviceColor: row.device_color,
+            actorKind: row.actor_kind,
+            actorId: row.actor_id,
+            actorLabel: row.actor_kind === 'admin' ? '管理台' : row.actor_kind === 'system' ? '系统' : row.device_label ?? row.actor_id,
+            events: Number(row.events ?? 0),
+            bytes: Number(row.bytes ?? 0),
+            seqFrom: row.seq_from,
+            seqTo: row.seq_to,
+            batchCount: Number(row.batch_count ?? 0),
+            lastSeq: row.last_seq,
+            storedBytes: row.stored_bytes,
+            detail: row.detail === null ? null : parseDetail(row.detail)
+        }));
+    const summaryRow = db.handle.prepare(`SELECT COALESCE(SUM(events), 0) AS events, COALESCE(SUM(bytes), 0) AS bytes,
+                     COALESCE(SUM(batch_count), 0) AS batches,
+                     COALESCE(SUM(CASE WHEN kind IN ('create', 'append') THEN 1 ELSE 0 END), 0) AS appends,
+                     COUNT(DISTINCT device_id) AS devices,
+                     MIN(at) AS first_at, MAX(at) AS last_at,
+                     COALESCE(MAX(events), 0) AS max_batch_events
+              FROM session_events WHERE dataset = ? AND session_id = ?`).get(DEFAULT_DATASET, sessionId);
+    return {
+        events,
+        summary: {
+            events: Number(summaryRow?.events ?? 0),
+            bytes: Number(summaryRow?.bytes ?? 0),
+            batches: Number(summaryRow?.batches ?? 0),
+            appends: Number(summaryRow?.appends ?? 0),
+            devices: Number(summaryRow?.devices ?? 0),
+            firstAt: summaryRow?.first_at ?? null,
+            lastAt: summaryRow?.last_at ?? null,
+            maxBatchEvents: Number(summaryRow?.max_batch_events ?? 0)
+        },
+        nextBefore: rows.length === limit ? rows[rows.length - 1].id : null
+    };
+}
+export function listActivity(db, query) {
+    const offsetMs = Math.max(-14 * 60, Math.min(14 * 60, Math.trunc(query.tzOffset ?? 0))) * 60_000;
+    const where = [
+        'e.dataset = ?',
+        "e.kind IN ('create', 'append')",
+        'e.at >= ?',
+        'e.at < ?'
+    ];
+    const params = [
+        DEFAULT_DATASET,
+        Math.trunc(query.from),
+        Math.trunc(query.to)
+    ];
+    if (query.deviceId !== undefined && query.deviceId !== '') {
+        where.push('e.device_id = ?');
+        params.push(query.deviceId);
+    }
+    if (query.sessionId !== undefined && query.sessionId !== '') {
+        where.push('e.session_id = ?');
+        params.push(query.sessionId);
+    }
+    const rows = db.handle.prepare(`SELECT date((e.at + ?) / 1000, 'unixepoch') AS day,
+                     COALESCE(SUM(e.events), 0) AS events,
+                     COALESCE(SUM(e.bytes), 0) AS bytes,
+                     COUNT(*) AS appends,
+                     COUNT(DISTINCT e.session_id) AS sessions,
+                     COUNT(DISTINCT e.device_id) AS devices
+              FROM session_events e
+              WHERE ${where.join(' AND ')}
+              GROUP BY day ORDER BY day ASC`).all(offsetMs, ...params);
+    return {
+        days: rows.map((row)=>({
+                day: row.day,
+                events: Number(row.events ?? 0),
+                bytes: Number(row.bytes ?? 0),
+                appends: Number(row.appends ?? 0),
+                sessions: Number(row.sessions ?? 0),
+                devices: Number(row.devices ?? 0)
+            }))
+    };
+}
+export function listActivitySessions(db, query) {
+    const offsetMs = Math.max(-14 * 60, Math.min(14 * 60, Math.trunc(query.tzOffset ?? 0))) * 60_000;
+    const rows = db.handle.prepare(`SELECT e.session_id, COALESCE(SUM(e.events), 0) AS events,
+                     COALESCE(SUM(e.bytes), 0) AS bytes, COUNT(*) AS appends
+              FROM session_events e
+              WHERE e.dataset = ? AND e.kind IN ('create', 'append')
+                AND date((e.at + ?) / 1000, 'unixepoch') = ?
+              GROUP BY e.session_id ORDER BY events DESC`).all(DEFAULT_DATASET, offsetMs, query.day);
+    return {
+        sessions: rows.map((row)=>({
+                sessionId: row.session_id,
+                events: Number(row.events ?? 0),
+                bytes: Number(row.bytes ?? 0),
+                appends: Number(row.appends ?? 0)
+            }))
+    };
+}
+function parseDetail(raw) {
+    try {
+        return JSON.parse(raw);
+    } catch  {
+        return raw;
+    }
+}
+
+
+//# sourceURL=session-history.ts

package/dist/sessions.js

@@ -3,8 +3,9 @@ import { assertChain, buildManifest, manifestDigest, stableStringify } from './s
 import { sha256 } from './shared/crypto.js';
 import { SyncError } from './shared/wire.js';
 import { blobPath } from './blobs.js';
-import { DEFAULT_DATASET, bumpRevision, readAppendRequest, readRevision, withTransaction, writeAppendRequest } from './db.js';
+import { DEFAULT_DATASET, bumpRevision, readAppendRequest, withTransaction, writeAppendRequest } from './db.js';
 import { requireLease as requireResourceLease, SYNC_RESOURCE } from './leases.js';
+import { recordSessionEvent } from './session-history.js';
 export const MAX_APPEND_BODY_BYTES = 8 * 1024 * 1024;
 const HASH = /^[0-9a-f]{64}$/u;
 const KEY_ID = /^[0-9a-f]{16}$/u;
@@ -37,7 +38,18 @@ function toChain(frames) {
         }));
 }
 function sessionRow(db, sessionId) {
-    return db.handle.prepare('SELECT created_at, format_version, last_seq, frame_count, head_chain_hash, manifest_json, manifest_digest, revision, updated_at, deleted_at, compression, stored_bytes FROM sessions WHERE dataset = ? AND session_id = ?').get(DEFAULT_DATASET, sessionId);
+    return db.handle.prepare('SELECT created_at, format_version, last_seq, frame_count, head_chain_hash, manifest_json, manifest_digest, revision, updated_at, deleted_at, purged_at, compression, stored_bytes FROM sessions WHERE dataset = ? AND session_id = ?').get(DEFAULT_DATASET, sessionId);
+}
+function activeReset(db, sessionId, now) {
+    const row = db.handle.prepare('SELECT device_id, expires_at FROM session_resets WHERE dataset = ? AND session_id = ?').get(DEFAULT_DATASET, sessionId);
+    if (row === undefined) return undefined;
+    if (row.expires_at <= now) {
+        db.handle.prepare('DELETE FROM session_resets WHERE dataset = ? AND session_id = ?').run(DEFAULT_DATASET, sessionId);
+        return undefined;
+    }
+    return {
+        device_id: row.device_id
+    };
 }
 function manifestOf(sessionId, formatVersion, createdAt, updatedAt, frames, tailOpen, safeThroughSeq, workspaceKey, parentSession, origin, delegationDepth) {
     assertChain(toChain(frames));
@@ -105,6 +117,10 @@ function appendRequestHash(input) {
 }
 export function appendFrames(db, dataDir, input, now = Date.now()) {
     return withTransaction(db, ()=>{
+        const reset = activeReset(db, input.sessionId, now);
+        if (reset !== undefined && reset.device_id !== null && reset.device_id !== input.deviceId) {
+            throw new SyncError('reset-pending', '该会话正在等待指定设备重建');
+        }
         const idempotencyKey = input.idempotencyKey;
         const requestHash = idempotencyKey === undefined ? undefined : appendRequestHash(input);
         if (idempotencyKey !== undefined && requestHash !== undefined) {
@@ -125,6 +141,9 @@ export function appendFrames(db, dataDir, input, now = Date.now()) {
         let parentSession = input.parentSession;
         let origin = input.origin;
         let delegationDepth = input.delegationDepth;
+        if (row !== undefined && row.purged_at !== null) {
+            throw new SyncError('gone', `会话 ${input.sessionId} 已移除并释放空间，需要由管理台重置后才能重建`);
+        }
         if (row !== undefined && row.deleted_at !== null && row.created_at === input.createdAt) {
             throw new SyncError('gone', `会话 ${input.sessionId} 的这个生命周期已被删除`);
         }
@@ -183,13 +202,13 @@ export function appendFrames(db, dataDir, input, now = Date.now()) {
         const { manifest, digest, headChainHash } = manifestOf(input.sessionId, formatVersion, createdAt, now, combined, input.tailOpen, input.safeThroughSeq, workspaceKey, parentSession, origin, delegationDepth);
         const revision = bumpRevision(db);
         const stats = statsOf(combined);
-        db.handle.prepare(`INSERT INTO sessions (dataset, session_id, created_at, format_version, last_seq, frame_count, head_chain_hash, manifest_json, manifest_digest, revision, updated_at, deleted_at, compression, stored_bytes)
-                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, NULL, ?, ?)
+        db.handle.prepare(`INSERT INTO sessions (dataset, session_id, created_at, format_version, last_seq, frame_count, head_chain_hash, manifest_json, manifest_digest, revision, updated_at, deleted_at, purged_at, compression, stored_bytes)
+                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, NULL, NULL, ?, ?)
                 ON CONFLICT(dataset, session_id) DO UPDATE SET
                   created_at = excluded.created_at, format_version = excluded.format_version, last_seq = excluded.last_seq,
                   frame_count = excluded.frame_count, head_chain_hash = excluded.head_chain_hash,
                   manifest_json = excluded.manifest_json, manifest_digest = excluded.manifest_digest,
-                  revision = excluded.revision, updated_at = excluded.updated_at, deleted_at = NULL,
+                  revision = excluded.revision, updated_at = excluded.updated_at, deleted_at = NULL, purged_at = NULL,
                   compression = excluded.compression, stored_bytes = excluded.stored_bytes`).run(DEFAULT_DATASET, input.sessionId, createdAt, formatVersion, manifest.lastSeq, combined.length, headChainHash, JSON.stringify(manifest), digest, revision, now, stats.compression, stats.storedBytes);
         const summary = {
             sessionId: input.sessionId,
@@ -206,6 +225,37 @@ export function appendFrames(db, dataDir, input, now = Date.now()) {
         if (idempotencyKey !== undefined && requestHash !== undefined) {
             writeAppendRequest(db, input.deviceId, input.sessionId, idempotencyKey, requestHash, JSON.stringify(summary), now);
         }
+        if (reset !== undefined) {
+            db.handle.prepare('DELETE FROM session_resets WHERE dataset = ? AND session_id = ?').run(DEFAULT_DATASET, input.sessionId);
+        }
+        const created = row === undefined || replacingLifecycle;
+        const oldSeq = created ? 0 : row.last_seq;
+        const oldBytes = created ? 0 : row.stored_bytes;
+        const tailReplaced = !created && input.baseIndex < row.frame_count - 1;
+        recordSessionEvent(db, {
+            sessionId: input.sessionId,
+            at: now,
+            kind: created ? 'create' : 'append',
+            deviceId: input.deviceId,
+            actorKind: 'device',
+            actorId: input.deviceId,
+            events: tailReplaced ? 0 : Math.max(0, summary.lastSeq - oldSeq),
+            bytes: Math.max(0, summary.storedBytes - oldBytes),
+            seqFrom: input.frames[0]?.seqFrom ?? null,
+            seqTo: input.frames[input.frames.length - 1]?.seqTo ?? null,
+            batchCount: input.frames.length,
+            lastSeq: summary.lastSeq,
+            storedBytes: summary.storedBytes,
+            detail: {
+                createdAt,
+                ...tailReplaced ? {
+                    tailReplaced: true
+                } : {},
+                ...workspaceKey === undefined ? {} : {
+                    workspaceKey
+                }
+            }
+        });
         return summary;
     });
 }
@@ -219,6 +269,19 @@ export function deleteSession(db, sessionId, deviceId, clientId, createdAt, now
         const revision = bumpRevision(db);
         db.handle.prepare('UPDATE sessions SET deleted_at = ?, revision = ?, updated_at = ? WHERE dataset = ? AND session_id = ?').run(now, revision, now, DEFAULT_DATASET, sessionId);
         db.handle.prepare('INSERT OR REPLACE INTO tombstones (dataset, session_id, created_at, deleted_at, deleted_by) VALUES (?, ?, ?, ?, ?)').run(DEFAULT_DATASET, sessionId, createdAt, now, deviceId);
+        recordSessionEvent(db, {
+            sessionId,
+            at: now,
+            kind: 'device-delete',
+            deviceId,
+            actorKind: 'device',
+            actorId: deviceId,
+            lastSeq: row.last_seq,
+            storedBytes: row.stored_bytes,
+            detail: {
+                createdAt
+            }
+        });
         return {
             sessionId,
             revision,
@@ -253,7 +316,10 @@ export function listBatches(db, sessionId, from, limit) {
 }
 const V2_SUMMARY_SELECT = `s.session_id, s.created_at, s.format_version, s.last_seq, s.frame_count,
   s.head_chain_hash, s.manifest_digest, s.revision, s.updated_at, s.deleted_at,
-  s.compression, s.stored_bytes,
+  s.purged_at, s.compression, s.stored_bytes,
+  (SELECT t.deleted_by FROM tombstones t
+     WHERE t.dataset = s.dataset AND t.session_id = s.session_id AND t.created_at = s.created_at
+     LIMIT 1) AS deleted_by,
   json_extract(s.manifest_json, '$.workspaceKey') AS workspace_key,
   json_extract(s.manifest_json, '$.tailOpen') AS tail_open,
   json_extract(s.manifest_json, '$.safeThroughSeq') AS safe_through_seq,
@@ -279,15 +345,17 @@ function mapV2Summary(row) {
         delegationDepth: typeof row.delegation_depth === 'number' && Number.isSafeInteger(row.delegation_depth) ? row.delegation_depth : null,
         updatedAt: row.updated_at,
         deletedAt: row.deleted_at,
+        deletedBy: row.deleted_by,
+        purgedAt: row.purged_at,
         compression: compressionOf(row.compression),
         storedBytes: Number.isSafeInteger(row.stored_bytes) ? row.stored_bytes : 0
     };
 }
-export function listV2Sessions(db, after, limit) {
+export function listV2Sessions(db, after, limit, includeDeleted = false) {
     const rows = db.handle.prepare(`SELECT ${V2_SUMMARY_SELECT}
               FROM sessions s
-              WHERE s.dataset = ? AND s.deleted_at IS NULL AND s.session_id > ?
-              ORDER BY s.session_id ASC LIMIT ?`).all(DEFAULT_DATASET, after ?? '', limit + 1);
+              WHERE s.dataset = ? AND (? = 1 OR s.deleted_at IS NULL) AND s.session_id > ?
+              ORDER BY s.session_id ASC LIMIT ?`).all(DEFAULT_DATASET, includeDeleted ? 1 : 0, after ?? '', limit + 1);
     const visible = rows.slice(0, limit);
     const last = visible[visible.length - 1];
     return {
@@ -295,40 +363,6 @@ export function listV2Sessions(db, after, limit) {
         nextSessionId: rows.length > limit && last !== undefined ? last.session_id : null
     };
 }
-export function listV2Changes(db, sinceRevision, sinceTombstone, limit) {
-    const highWater = Math.max(sinceRevision, readRevision(db));
-    const rows = db.handle.prepare(`SELECT ${V2_SUMMARY_SELECT}
-              FROM sessions s
-              WHERE s.dataset = ? AND s.deleted_at IS NULL AND s.revision > ? AND s.revision <= ?
-              ORDER BY s.revision ASC LIMIT ?`).all(DEFAULT_DATASET, sinceRevision, highWater, limit + 1);
-    const tombstoneRows = db.handle.prepare(`SELECT session_id, created_at, deleted_at FROM tombstones
-              WHERE dataset = ? AND (
-                deleted_at > ? OR
-                (deleted_at = ? AND session_id > ?) OR
-                (deleted_at = ? AND session_id = ? AND created_at > ?)
-              )
-              ORDER BY deleted_at ASC, session_id ASC, created_at ASC LIMIT ?`).all(DEFAULT_DATASET, sinceTombstone.deletedAt, sinceTombstone.deletedAt, sinceTombstone.sessionId, sinceTombstone.deletedAt, sinceTombstone.sessionId, sinceTombstone.createdAt, limit + 1);
-    const visible = rows.slice(0, limit);
-    const visibleTombstones = tombstoneRows.slice(0, limit);
-    const last = visible[visible.length - 1];
-    const lastTombstone = visibleTombstones[visibleTombstones.length - 1];
-    const hasMore = rows.length > limit || tombstoneRows.length > limit;
-    return {
-        sessions: visible.map(mapV2Summary),
-        tombstones: visibleTombstones.map((row)=>({
-                sessionId: row.session_id,
-                createdAt: row.created_at,
-                deletedAt: row.deleted_at
-            })),
-        nextRevision: rows.length > limit && last !== undefined ? last.revision : highWater,
-        nextTombstone: lastTombstone === undefined ? sinceTombstone : {
-            deletedAt: lastTombstone.deleted_at,
-            sessionId: lastTombstone.session_id,
-            createdAt: lastTombstone.created_at
-        },
-        hasMore
-    };
-}
 export function getV2SessionSummary(db, sessionId) {
     const row = db.handle.prepare(`SELECT ${V2_SUMMARY_SELECT}
               FROM sessions s
@@ -347,11 +381,26 @@ export function listV2Batches(db, sessionId, from, limit) {
     };
 }
 export function adminSessions(db, limit = 500) {
-    const rows = db.handle.prepare(`SELECT s.session_id, s.created_at, s.format_version, s.frame_count, s.last_seq, s.head_chain_hash,
-                     s.revision, s.updated_at, s.deleted_at,
-                     json_extract(s.manifest_json, '$.workspaceKey') AS workspace_key
-              FROM sessions s
-              WHERE s.dataset = ? ORDER BY s.updated_at DESC LIMIT ?`).all(DEFAULT_DATASET, limit);
+    const rows = db.handle.prepare(`SELECT * FROM (
+                SELECT s.session_id, s.created_at, s.format_version, s.frame_count, s.last_seq, s.head_chain_hash,
+                       s.revision, s.updated_at, s.deleted_at, s.purged_at, s.stored_bytes,
+                       t.deleted_by, r.device_id AS reset_device_id, r.expires_at AS reset_expires_at, r.reset_at,
+                       COALESCE(json_extract(s.manifest_json, '$.workspaceKey'), r.workspace_key) AS workspace_key
+                FROM sessions s
+                LEFT JOIN tombstones t
+                  ON t.dataset = s.dataset AND t.session_id = s.session_id AND t.created_at = s.created_at
+                LEFT JOIN session_resets r
+                  ON r.dataset = s.dataset AND r.session_id = s.session_id
+                WHERE s.dataset = ?
+                UNION ALL
+                SELECT r.session_id, r.created_at, 0, 0, 0, '', 0, r.reset_at, NULL, NULL, 0,
+                       NULL, r.device_id, r.expires_at, r.reset_at, r.workspace_key
+                FROM session_resets r
+                WHERE r.dataset = ? AND NOT EXISTS (
+                  SELECT 1 FROM sessions s WHERE s.dataset = r.dataset AND s.session_id = r.session_id
+                )
+              )
+              ORDER BY updated_at DESC LIMIT ?`).all(DEFAULT_DATASET, DEFAULT_DATASET, limit);
     return rows.map((row)=>({
             sessionId: row.session_id,
             createdAt: row.created_at,
@@ -362,6 +411,12 @@ export function adminSessions(db, limit = 500) {
             revision: row.revision,
             updatedAt: row.updated_at,
             deletedAt: row.deleted_at,
+            deletedBy: row.deleted_by,
+            purgedAt: row.purged_at,
+            resetAt: row.reset_at,
+            resetDeviceId: row.reset_device_id,
+            resetExpiresAt: row.reset_expires_at,
+            storedBytes: row.stored_bytes,
             workspaceKey: row.workspace_key === null ? null : String(row.workspace_key)
         }));
 }
@@ -372,31 +427,6 @@ export function sessionCounts(db) {
         deleted: Number(row?.deleted ?? 0)
     };
 }
-export function listChanges(db, since, limit) {
-    const rows = db.handle.prepare('SELECT session_id, created_at, format_version, frame_count, head_chain_hash, manifest_digest, revision, updated_at, deleted_at FROM sessions WHERE dataset = ? AND revision > ? ORDER BY revision ASC LIMIT ?').all(DEFAULT_DATASET, since, limit + 1);
-    const tombstones = db.handle.prepare('SELECT session_id, created_at, deleted_at FROM tombstones WHERE dataset = ? AND deleted_at > ? ORDER BY deleted_at ASC LIMIT ?').all(DEFAULT_DATASET, since, limit + 1);
-    const sessions = rows.slice(0, limit).map((row)=>({
-            sessionId: row.session_id,
-            revision: row.revision,
-            formatVersion: row.format_version,
-            createdAt: row.created_at,
-            batchCount: row.frame_count,
-            headChainHash: row.head_chain_hash,
-            manifestDigest: row.manifest_digest,
-            updatedAt: row.updated_at,
-            deletedAt: row.deleted_at
-        }));
-    return {
-        revision: readRevision(db),
-        sessions,
-        tombstones: tombstones.slice(0, limit).map((row)=>({
-                sessionId: row.session_id,
-                createdAt: row.created_at,
-                deletedAt: row.deleted_at
-            })),
-        hasMore: rows.length > limit || tombstones.length > limit
-    };
-}
 
 
 //# sourceURL=sessions.ts