1 files changed, 28 insertions, 4 deletions
diff --git a/modules/core/virtual-fs.js b/modules/core/virtual-fs.js
index 09b3548..3ed1b40 100644
--- a/modules/core/virtual-fs.js
+++ b/modules/core/virtual-fs.js
@@ -940,6 +940,17 @@ class VirtualFileSystem {
     }
     checkpoint(name) {
         if (!name) name = new Date().toISOString();
+        name = String(name).trim();
+        if (!name || name.indexOf('/') !== -1) {
+            throw new Error('checkpoint name must be non-empty and must not contain "/"');
+        }
+        // Two unnamed calls can land in the same millisecond; without this the second silently
+        // overwrites the first (measured: 6 calls -> 3 distinct names).
+        if (this.listCheckpoints().indexOf(name) !== -1) {
+            let n = 2;
+            while (this.listCheckpoints().indexOf(name + '-' + n) !== -1) n++;
+            name = name + '-' + n;
+        }
         const createdAt = new Date().toISOString();
         // Strip system dirs to prevent fractal bloat
         const rootClone = JSON.parse(JSON.stringify(this.root));
@@ -959,12 +970,15 @@ class VirtualFileSystem {
         }
         this.fsWriteJSON('/_snapshots/checkpoint-' + name + '.json', data);
         this.saveToStorage();
-        // Auto-manage: keep max 3 checkpoints, delete oldest
+        // Auto-manage: keep the 3 NEWEST checkpoints — by createdAt, not by name, so a custom
+        // name ("aaa-oldest") cannot pin itself forever while newer snapshots are deleted.
         const all = this.listCheckpoints();
         if (all.length > 3) {
-            const sorted = all.slice().sort();
-            const toDelete = sorted.slice(0, all.length - 3);
-            for (const old of toDelete) this.deleteCheckpoint(old);
+            const aged = all.map(n => {
+                const snap = this.fsReadJSON('/_snapshots/checkpoint-' + n + '.json');
+                return { name: n, at: (snap && snap.createdAt) || '' };
+            }).sort((a, b) => (a.at < b.at ? -1 : (a.at > b.at ? 1 : 0)));
+            for (const old of aged.slice(0, aged.length - 3)) this.deleteCheckpoint(old.name);
         }
         return name;
     }
@@ -974,8 +988,18 @@ class VirtualFileSystem {
             console.error('Rollback failed: checkpoint not found or invalid');
             return false;
         }
+        // The snapshot deliberately omits scaffolding (bloat guard at :944-950). Restoring the
+        // clone verbatim deletes every checkpoint, every agent session and the trash, so keep the
+        // live copies and re-attach them after the root swap.
+        const keep = {};
+        for (const dir of ['_snapshots', '_sessions', '.trash']) {
+            const node = this.root && this.root.content ? this.root.content[dir] : null;
+            if (node) keep[dir] = node;
+        }
         this.root = raw.root;
         this.currentPath = raw.currentPath || [];
+        if (!this.root.content) this.root.content = {};
+        for (const dir of Object.keys(keep)) this.root.content[dir] = keep[dir];
         this.saveToStorage();
         return true;
     }