@goodandready/dsh-time-machine 0.1.4 → 0.1.6

package/lib/client.js

@@ -53,6 +53,8 @@ window.__ModuleLoader__.load({
       empty: 'No checkpoints yet.',
       diff: 'Diff',
       rollback: 'Rollback',
+      delete: 'Delete',
+      confirmDelete: 'Delete this checkpoint?',
       confirmRollback: 'Rollback to this checkpoint? This will reset the workspace.',
       close: 'Close',
       save: 'Save',
@@ -73,6 +75,8 @@ window.__ModuleLoader__.load({
       empty: 'Чекпоинтов пока нет.',
       diff: 'Diff',
       rollback: 'Откатить',
+      delete: 'Удалить',
+      confirmDelete: 'Удалить этот чекпоинт?',
       confirmRollback: 'Откатиться к этому чекпоинту? Рабочая копия будет сброшена.',
       close: 'Закрыть',
       save: 'Сохранить',
@@ -164,6 +168,15 @@ window.__ModuleLoader__.load({
             fetchList();
           }).catch(e => setErr(String(e.message || e))).finally(() => setBusy(false));
       };
+      const onDelete = (id) => {
+        if (!window.confirm(t.confirmDelete)) return;
+        setBusy(true); setErr('');
+        fetch('/dsh-time-machine/delete', { method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify({ id, confirm: true }) })
+          .then(r => r.json()).then(j => {
+            if (!j.success) throw new Error(j.error || 'delete failed');
+            fetchList();
+          }).catch(e => setErr(String(e.message || e))).finally(() => setBusy(false));
+      };
 
       return React.createElement('div', { style: { display: 'flex', flexDirection: 'column', gap: 12 } },
         React.createElement('div', { style: { display: 'flex', gap: 8 } },
@@ -180,7 +193,8 @@ window.__ModuleLoader__.load({
               React.createElement('span', { className: 'tm-row-meta' }, new Date(s.createdAt).toLocaleString() + (s.commit ? ' · ' + s.commit.slice(0,7) : ''))
             ),
             React.createElement('button', { className: 'tm-btn', disabled: busy, onClick: () => onDiff(s.id) }, t.diff),
-            React.createElement('button', { className: 'tm-btn', disabled: busy, onClick: () => onRollback(s.id) }, t.rollback)
+            React.createElement('button', { className: 'tm-btn', disabled: busy, onClick: () => onRollback(s.id) }, t.rollback),
+            React.createElement('button', { className: 'tm-btn', disabled: busy, onClick: () => onDelete(s.id) }, t.delete)
           ))
         ),
         diffText !== null ? React.createElement('div', { className: 'tm-modal', onClick: () => setDiffText(null) },
@@ -277,6 +291,15 @@ window.__ModuleLoader__.load({
             fetchList();
           }).catch(e => setErr(String(e.message || e))).finally(() => setBusy(false));
       };
+      const onDelete = (id) => {
+        if (!window.confirm(t.confirmDelete)) return;
+        setBusy(true); setErr('');
+        fetch('/dsh-time-machine/delete', { method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify({ id, confirm: true }) })
+          .then(r => r.json()).then(j => {
+            if (!j.success) throw new Error(j.error || 'delete failed');
+            fetchList();
+          }).catch(e => setErr(String(e.message || e))).finally(() => setBusy(false));
+      };
       const onSave = async () => {
         if (!scope) return;
         setSaving(true); setErr('');
@@ -338,7 +361,8 @@ window.__ModuleLoader__.load({
                   React.createElement('span', { className: 'tm-row-meta' }, new Date(s.createdAt).toLocaleString() + (s.commit ? ' · ' + s.commit.slice(0,7) : ''))
                 ),
                 React.createElement('button', { className: 'tm-btn', disabled: busy, onClick: () => onDiff(s.id) }, t.diff),
-                React.createElement('button', { className: 'tm-btn', disabled: busy, onClick: () => onRollback(s.id) }, t.rollback)
+                React.createElement('button', { className: 'tm-btn', disabled: busy, onClick: () => onRollback(s.id) }, t.rollback),
+                React.createElement('button', { className: 'tm-btn', disabled: busy, onClick: () => onDelete(s.id) }, t.delete)
               ))
             )
           ),

package/lib/index.js

@@ -29,6 +29,7 @@ function sessionIdOf(execution, ctx) {
 export function apply(ctx, config) {
   let getConfig = () => config;
   let engine = new ShadowSnapshotEngine({ maxSnapshots: config?.maxSnapshots ?? 20 });
+  engine.loadFromRefs().catch(() => {});
 
   ctx.inject(['settings'], (sctx) => {
     const scope = sctx.settings.register(NS, Config, { base: config });
@@ -66,6 +67,18 @@ export function apply(ctx, config) {
             autoSnap(`auto:approval:${tool}`, sid);
           }));
         } catch {}
+        try {
+          offs.push(ctx.events.on('turn/end', (ev) => {
+            if (!getConfig().autoSnapshotEnabled) return;
+            const outcome = String((ev && (ev.outcome || ev.result?.outcome || ev.result?.status)) || '');
+            const sid = sessionIdOf(ev, ctx);
+            if (!sid) return;
+            if (outcome === 'success' || outcome === 'ok' || outcome === 'done') {
+              engine.pruneSnapshots(sid, 3).catch(() => {});
+            }
+            // failure/blocked: keep all checkpoints for review
+          }));
+        } catch {}
         return () => { for (const off of offs) try { typeof off === 'function' && off(); } catch {} };
       }, 'dsh-time-machine: auto snapshot events');
     }
@@ -143,6 +156,40 @@ export function apply(ctx, config) {
         return { success: true, ...res };
       },
     });
+
+    tctx.tools.register({
+      name: 'time_machine_checkpoint_delete',
+      description: 'Delete a single checkpoint. Requires confirm:true.',
+      parameters: {
+        type: 'object',
+        properties: {
+          id: { type: 'string', description: 'Snapshot id to delete' },
+          confirm: { type: 'boolean', description: 'Must be true to confirm deletion' },
+        },
+        required: ['id', 'confirm'],
+      },
+      execute: async ({ id, confirm } = {}) => {
+        const res = await engine.deleteSnapshot(String(id ?? ''), { confirm });
+        return { success: true, ...res };
+      },
+    });
+
+    tctx.tools.register({
+      name: 'time_machine_checkpoint_prune',
+      description: 'Prune session checkpoints, keeping only the newest N (default 3).',
+      parameters: {
+        type: 'object',
+        properties: {
+          sessionId: { type: 'string', description: 'Session id to prune (default current session)' },
+          keep: { type: 'number', description: 'How many newest checkpoints to keep (default 3)' },
+        },
+      },
+      execute: async (args = {}, execution) => {
+        const sid = String(args.sessionId || sessionIdOf(execution, tctx) || '').trim();
+        const out = await engine.pruneSnapshots(sid, args.keep);
+        return { success: true, sessionId: sid, ...out };
+      },
+    });
   };
 
   try {
@@ -204,6 +251,47 @@ export function apply(ctx, config) {
           });
         },
       }));
+      disposals.push(ctx.webServer.register({
+        kind: 'exact',
+        path: '/dsh-time-machine/delete',
+        handler: async (req, res) => {
+          let body = '';
+          req.on('data', (c) => body += c);
+          req.on('end', async () => {
+            try {
+              const parsed = body ? JSON.parse(body) : {};
+              const out = await engine.deleteSnapshot(String(parsed.id || ''), { confirm: parsed.confirm });
+              res.setHeader('content-type', 'application/json');
+              res.end(JSON.stringify({ success: true, ...out }));
+            } catch (e) {
+              res.statusCode = 400;
+              res.setHeader('content-type', 'application/json');
+              res.end(JSON.stringify({ success: false, error: String(e.message || e), code: e.code || '' }));
+            }
+          });
+        },
+      }));
+      disposals.push(ctx.webServer.register({
+        kind: 'exact',
+        path: '/dsh-time-machine/prune',
+        handler: async (req, res) => {
+          let body = '';
+          req.on('data', (c) => body += c);
+          req.on('end', async () => {
+            try {
+              const parsed = body ? JSON.parse(body) : {};
+              const sid = String(parsed.sessionId || new URL(req.url, 'http://localhost').searchParams.get('sessionId') || '');
+              const out = await engine.pruneSnapshots(sid, parsed.keep);
+              res.setHeader('content-type', 'application/json');
+              res.end(JSON.stringify({ success: true, sessionId: sid, ...out }));
+            } catch (e) {
+              res.statusCode = 400;
+              res.setHeader('content-type', 'application/json');
+              res.end(JSON.stringify({ success: false, error: String(e.message || e) }));
+            }
+          });
+        },
+      }));
       disposals.push(ctx.webServer.register({
         kind: 'exact',
         path: '/dsh-time-machine/rollback',

package/lib/snapshot.js

@@ -23,6 +23,7 @@ export class ShadowSnapshotEngine {
     this.maxSnapshots = maxSnapshots;
     this.cwd = cwd;
     this.snapshots = []; // {id, label, sessionId, createdAt, commit, ref}
+    this.seq = 0;
   }
 
   _now() { return Date.now(); }
@@ -47,6 +48,52 @@ export class ShadowSnapshotEngine {
     } catch { return false; }
   }
 
+  // Restore checkpoint metadata from git shadow refs after a restart.
+  // git is the durable store; memory is rebuilt from refs/dsh-time-machine/*.
+  async loadFromRefs() {
+    if (!(await this._isGitRepo())) return 0;
+    let refs = [];
+    try {
+      const { stdout } = await this.exec(
+        'git',
+        ['for-each-ref', '--format=%(refname)%00%(objectname)', 'refs/dsh-time-machine/'],
+        this.cwd ? { cwd: this.cwd } : {},
+      );
+      refs = String(stdout ?? '').trim().split('\n').filter(Boolean);
+    } catch { return 0; }
+    const restored = [];
+    for (const line of refs) {
+      const [ref, commit] = line.split('\0');
+      if (!ref || !commit) continue;
+      if (this.snapshots.some(s => s.ref === ref)) continue;
+      let createdAt = 0;
+      let label = ref.split('/').pop();
+      try {
+        const { stdout } = await this.exec(
+          'git',
+          ['log', '-1', '--format=%ct%00%s', ref],
+          this.cwd ? { cwd: this.cwd } : {},
+        );
+        const [ct, msg] = String(stdout ?? '').split('\0');
+        createdAt = Number(ct) * 1000 || 0;
+        if (msg && String(msg).trim()) label = String(msg).trim();
+      } catch {}
+      const short = ref.replace(/^refs\/dsh-time-machine\//, '');
+      const slash = short.indexOf('/');
+      const sessionId = slash === -1 ? '' : short.slice(0, slash);
+      const id = slash === -1 ? short : short.slice(slash + 1);
+      restored.push({ id: id || short, label, sessionId, createdAt, commit, ref, seq: 0 });
+    }
+    // stable order: oldest first, tie-break by ref name
+    restored.sort((a, b) => a.createdAt - b.createdAt || (a.ref < b.ref ? -1 : a.ref > b.ref ? 1 : 0));
+    for (const snap of restored) snap.seq = ++this.seq;
+    this.snapshots.push(...restored);
+    const sessions = [...new Set(this.snapshots.map(s => s.sessionId))];
+    for (const sid of sessions) this._trimFor(sid);
+    if (sessions.length === 0) while (this.snapshots.length > this.maxSnapshots) this.snapshots.shift();
+    return restored.length;
+  }
+
   async createSnapshot(label = '', { sessionId = '' } = {}) {
     const id = crypto.randomUUID().slice(0, 8);
     const createdAt = this._now();
@@ -69,7 +116,7 @@ export class ShadowSnapshotEngine {
         ref = null;
       }
     }
-    const snap = { id, label: safeLabel, sessionId: sid, createdAt, commit, ref };
+    const snap = { id, label: safeLabel, sessionId: sid, createdAt, commit, ref, seq: ++this.seq };
     this.snapshots.push(snap);
     this._trimFor(sid);
     return snap;
@@ -78,7 +125,7 @@ export class ShadowSnapshotEngine {
   listSnapshots(sessionId) {
     const sid = sessionId != null ? String(sessionId).trim() : undefined;
     const list = sid !== undefined ? this.snapshots.filter(s => String(s.sessionId) === sid) : [...this.snapshots];
-    return [...list].sort((a, b) => b.createdAt - a.createdAt);
+    return [...list].sort((a, b) => b.createdAt - a.createdAt || b.seq - a.seq);
   }
 
   getSnapshot(id) {
@@ -109,6 +156,40 @@ export class ShadowSnapshotEngine {
     return { rolledBack: true, snapshot: snap };
   }
 
+  async deleteSnapshot(id, { confirm } = {}) {
+    if (confirm !== true) {
+      const err = new Error('confirm:true required to delete');
+      err.code = 'CONFIRM_REQUIRED';
+      throw err;
+    }
+    const snap = this.getSnapshot(id);
+    if (!snap) {
+      const err = new Error(`snapshot ${id} not found`);
+      err.code = 'NOT_FOUND';
+      throw err;
+    }
+    if (snap.ref) {
+      try {
+        await this.exec('git', ['update-ref', '-d', snap.ref], this.cwd ? { cwd: this.cwd } : {});
+      } catch {}
+    }
+    const idx = this.snapshots.indexOf(snap);
+    if (idx !== -1) this.snapshots.splice(idx, 1);
+    return { deleted: true, snapshot: snap };
+  }
+
+  async pruneSnapshots(sessionId, keep = 3) {
+    const sid = sessionId != null ? String(sessionId).trim() : undefined;
+    const list = this.listSnapshots(sid); // newest first
+    const minKeep = Math.max(0, Number(keep) || 3);
+    const toRemove = list.slice(minKeep);
+    const removed = [];
+    for (const snap of toRemove) {
+      try { await this.deleteSnapshot(snap.id, { confirm: true }); removed.push(snap.id); } catch {}
+    }
+    return { removed, kept: list.length - removed.length };
+  }
+
   async diff(fromId, toId) {
     const from = this.getSnapshot(fromId);
     if (!from) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-time-machine",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "DSH plugin for smart checkpoints, workspace safety guards, and instant rollback",
   "type": "module",
   "main": "lib/index.js",