opencode-self-improvement 0.8.3 → 0.8.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-self-improvement",
-  "version": "0.8.3",
+  "version": "0.8.4",
   "description": "Durable memory for opencode: remember facts, decisions, and commands across sessions, plus a one-command per-repo setup (/repo-init).",
   "main": "index.ts",
   "exports": {

package/src/index.ts

@@ -399,7 +399,7 @@ const impl = {
       editor.add(validated(UndoArgs, {
         name: "memory_undo",
         description:
-          "List memory snapshots, or restore one (rollback). SAFE BY DEFAULT: daily store files are shared across sessions, so if the current file has rows added or edited since the snapshot, restore REFUSES and lists them — re-run with merge=true to restore AND keep those rows, or force=true for the exact rollback. `snapshot` accepts a bare name from the list or a full path.",
+          "List memory snapshots, or restore one (rollback). Only snapshots inside this store's snapshots directory are accepted: pass a bare name from the list or its full path. SAFE BY DEFAULT: restore refuses if the current file has rows added or edited since the snapshot, and audited human/tool deletions stay deleted. Re-run with merge=true to restore AND keep divergent rows, or force=true for an explicit exact rollback. Blocklisted rows remain inactive in every mode.",
         options: direct,
         async execute(args): Promise<{ content: string }> {
           if (args.snapshot) {
@@ -420,7 +420,10 @@ const impl = {
               ? ` Kept ${res.concurrentAdded.length} added / ${res.concurrentChanged.length} changed row(s) written after the snapshot.`
               : "";
             const safety = res.safety ? ` Pre-restore file snapshotted -> ${res.safety}.` : "";
-            return { content: `Restored ${basename(res.target)} from ${res.mode} snapshot -> ${res.target}.${kept}${safety}` };
+            const omitted = res.deletedOmitted.length
+              ? ` Omitted ${res.deletedOmitted.length} deliberately deleted row(s); use force=true to recover them.`
+              : "";
+            return { content: `Restored ${basename(res.target)} from ${res.mode} snapshot -> ${res.target}.${kept}${safety}${omitted}` };
           }
           const snaps = await listSnapshots();
           if (!snaps.length) return { content: "No snapshots" };

package/src/schema.ts

@@ -94,7 +94,7 @@ export const UndoArgs = z.object({
   list: z.boolean().describe("List snapshots").optional(),
   snapshot: z
     .string()
-    .describe("Snapshot to restore (bare name from list, or a full path)")
+    .describe("Store-owned snapshot to restore (bare name from list, or its full path)")
     .optional(),
   merge: z
     .boolean()

package/src/undo.ts

@@ -10,12 +10,15 @@
 // MERGE replays them on top of the snapshot; FORCE is the old exact rollback,
 // and additionally snapshots the file it replaces, so the state it drops stays
 // undoable (result.safety).
-import { basename, join, resolve, sep } from "node:path";
-import { snapshotDir } from "./config.ts";
-import { ensureDir, writeAtomic } from "./logfmt.ts";
+import { lstat, realpath, stat } from "node:fs/promises";
+import { basename, isAbsolute, join, relative, resolve, sep } from "node:path";
+import { deletionsFile, snapshotDir } from "./config.ts";
+import { ensureDir, parseLine, readLines, writeAtomic } from "./logfmt.ts";
 import { withStoreLock, LOCK_RESTORE } from "./lock.ts";
 import { snapshotFiles } from "./memory.ts";
 
+const SNAPSHOT_NAME = /^(\d+)-(\d{4}-\d{2}-\d{2}\.logfmt)$/;
+
 export interface SnapshotInfo {
   file: string;
   name: string;
@@ -28,6 +31,7 @@ export async function listSnapshots(): Promise<SnapshotInfo[]> {
   const out: SnapshotInfo[] = [];
   try {
     for await (const f of glob.scan(snapshotDir())) {
+      if (!SNAPSHOT_NAME.test(f)) continue;
       const info = Bun.file(join(snapshotDir(), f));
       out.push({
         file: join(snapshotDir(), f),
@@ -55,6 +59,9 @@ export interface RestoreResult {
   // (added after it — or in-place edits, listed under their original ts).
   concurrentAdded: string[];
   concurrentChanged: string[];
+  // ts of rows intentionally deleted after this snapshot. CHECK and MERGE
+  // leave them deleted; FORCE is the explicit recovery path.
+  deletedOmitted: string[];
 }
 
 // Rows are keyed by their ts= field; unparseable lines key on the whole line.
@@ -66,33 +73,113 @@ function rows(text: string): string[] {
   return text.split("\n").filter((l) => l.trim());
 }
 
-// Restore `snapshot` over its original file. The snapshot name is
-// `<stamp>-<original>.logfmt`; strip the stamp to recover the target. A bare
-// name (as printed by the list) resolves against <memory-root>/snapshots/.
+function isWithin(parent: string, child: string): boolean {
+  const rel = relative(parent, child);
+  return rel !== ".." && !rel.startsWith(`..${sep}`) && !isAbsolute(rel);
+}
+
+async function resolveSnapshot(
+  snapshot: string,
+  memoryRootDir: string,
+): Promise<{ path: string; original: string }> {
+  const name = basename(snapshot);
+  const match = SNAPSHOT_NAME.exec(name);
+  const original = match?.[2];
+  const stamp = match ? Number(match[1]) : Number.NaN;
+  if (!original || !Number.isSafeInteger(stamp)) {
+    throw new Error(`invalid snapshot name: ${name}`);
+  }
+  if (!isAbsolute(snapshot) && snapshot !== name) {
+    throw new Error("snapshot must be a bare name from memory_undo list or a full path");
+  }
+
+  const rootResolved = resolve(memoryRootDir);
+  const snapshotsResolved = resolve(rootResolved, "snapshots");
+  const requestedResolved = isAbsolute(snapshot)
+    ? resolve(snapshot)
+    : resolve(snapshotsResolved, name);
+  if (!isWithin(snapshotsResolved, requestedResolved)) {
+    throw new Error(`snapshot is outside the snapshots directory: ${snapshot}`);
+  }
+
+  let rootReal: string;
+  let snapshotsReal: string;
+  let snapshotReal: string;
+  try {
+    [rootReal, snapshotsReal, snapshotReal] = await Promise.all([
+      realpath(rootResolved),
+      realpath(snapshotsResolved),
+      realpath(requestedResolved),
+    ]);
+  } catch {
+    throw new Error(`snapshot not found: ${snapshot}`);
+  }
+  if (!isWithin(rootReal, snapshotsReal)) {
+    throw new Error("snapshots directory escapes the memory root");
+  }
+  if (!isWithin(snapshotsReal, snapshotReal)) {
+    throw new Error(`snapshot is outside the snapshots directory: ${snapshot}`);
+  }
+
+  const [linkInfo, fileInfo] = await Promise.all([
+    lstat(requestedResolved),
+    stat(snapshotReal),
+  ]);
+  if (linkInfo.isSymbolicLink() || !fileInfo.isFile()) {
+    throw new Error(`snapshot is not a regular file: ${snapshot}`);
+  }
+
+  return { path: snapshotReal, original };
+}
+
+// ts of every row memory_forget or a viewer delete has removed. Ordering
+// against the snapshot is not needed: a snapshot row with a deletion audit
+// that is absent from the live file was removed on purpose.
+async function auditedDeletions(): Promise<Set<string>> {
+  const deleted = new Set<string>();
+  for (const line of await readLines(deletionsFile())) {
+    const fields = parseLine(line);
+    if (fields?.action !== "deleted" || typeof fields.original_ts !== "string") continue;
+    deleted.add(fields.original_ts);
+  }
+  return deleted;
+}
+
+// Restore `snapshot` over its original file. Only `<stamp>-<YYYY-MM-DD>.logfmt`
+// files inside <memory-root>/snapshots/ are accepted (the viewer restore's
+// grammar); the stamp is stripped to recover the target day file. A bare name
+// (as printed by the list) resolves against <memory-root>/snapshots/.
 export async function restoreSnapshot(
   snapshot: string,
   memoryRootDir: string,
   mode: RestoreMode = "check",
 ): Promise<RestoreResult> {
-  const name = basename(snapshot);
-  let snapPath = snapshot;
-  if (!(await Bun.file(snapPath).exists())) {
-    const candidate = join(memoryRootDir, "snapshots", name);
-    if (await Bun.file(candidate).exists()) snapPath = candidate;
+  const snap = await resolveSnapshot(snapshot, memoryRootDir);
+  const rootReal = await realpath(resolve(memoryRootDir));
+  const realTarget = resolve(rootReal, snap.original);
+  if (!isWithin(rootReal, realTarget)) {
+    throw new Error(`snapshot target escapes the memory root: ${snap.original}`);
   }
-  const f = Bun.file(snapPath);
-  if (!(await f.exists())) throw new Error(`snapshot not found: ${snapshot}`);
-
-  const original = name.replace(/^\d+-/, "");
-  // Defense in depth: `name` is basenamed above, so `original`
-  // carries no separators — but a restore must never write outside the memory
-  // root no matter what a future caller passes.
-  const rootAbs = resolve(memoryRootDir);
-  const target = resolve(rootAbs, original);
-  if (!target.startsWith(rootAbs + sep)) {
-    throw new Error(`snapshot target escapes the memory root: ${original}`);
+  let targetInfo: Awaited<ReturnType<typeof lstat>> | undefined;
+  try {
+    targetInfo = await lstat(realTarget);
+  } catch (err) {
+    if (!(err instanceof Error && "code" in err && err.code === "ENOENT")) throw err;
   }
-  const snapLines = rows(await f.text());
+  if (targetInfo) {
+    if (targetInfo.isSymbolicLink()) {
+      throw new Error(`snapshot target must not be a symbolic link: ${snap.original}`);
+    }
+    const targetReal = await realpath(realTarget);
+    if (relative(realTarget, targetReal) !== "") {
+      throw new Error(`snapshot target must not be a symbolic link: ${snap.original}`);
+    }
+    if (!targetInfo.isFile()) throw new Error(`snapshot target is not a file: ${snap.original}`);
+  }
+  // Checks above ran on real paths; lock and write through the same lexical
+  // path every other writer uses, so the in-process lock queue is shared.
+  const target = resolve(memoryRootDir, snap.original);
+  const rawSnapLines = rows(await Bun.file(snap.path).text());
 
   // Comparing and publishing happen under the same lock: a divergence check on
   // a stale read would wave through a row that landed after it. A restore waits
@@ -104,6 +191,17 @@ export async function restoreSnapshot(
     async () => {
       const cur = Bun.file(target);
       const curLines = (await cur.exists()) ? rows(await cur.text()) : [];
+      // Deliberate deletions are read inside the lock too, so a forget that
+      // finished just before this restore is honoured.
+      const audited = mode !== "force" ? await auditedDeletions() : new Set<string>();
+      const live = new Set(curLines.map(rowKey));
+      const deletedOmitted: string[] = [];
+      const snapLines = rawSnapLines.filter((line) => {
+        const key = rowKey(line);
+        if (!audited.has(key) || live.has(key)) return true;
+        deletedOmitted.push(key);
+        return false;
+      });
 
       const snapByKey = new Map(snapLines.map((l) => [rowKey(l), l]));
       const concurrentAdded: string[] = [];
@@ -118,7 +216,7 @@ export async function restoreSnapshot(
       }
 
       if (mode === "check" && (concurrentAdded.length || concurrentChanged.length)) {
-        return { target, restored: false, mode, concurrentAdded, concurrentChanged };
+        return { target, restored: false, mode, concurrentAdded, concurrentChanged, deletedOmitted };
       }
 
       // FORCE is the mode that drops rows, so the file it replaces is
@@ -140,7 +238,7 @@ export async function restoreSnapshot(
       }
       await ensureDir(memoryRootDir);
       await writeAtomic(target, out.length ? out.join("\n") + "\n" : "");
-      return { target, restored: true, mode, safety, concurrentAdded, concurrentChanged };
+      return { target, restored: true, mode, safety, concurrentAdded, concurrentChanged, deletedOmitted };
     },
     LOCK_RESTORE,
   );