om-memory-system 3.1.0-next.3 → 3.1.1

package/dist/importer/opencode-reader.js

@@ -4,6 +4,8 @@ import { join } from "node:path";
 import { pathToFileURL } from "node:url";
 import { DatabaseSync } from "node:sqlite";
 import { INTERNAL_CAPTURE_SESSION_TITLES } from "../services/ai/internal-capture-sessions.js";
+import { log } from "../services/logger.js";
+import { withSqliteFileLockRetry } from "../services/turso/sqlite-handle-release.js";
 function validateSchema(db) {
     const required = {
         session: ["id", "directory", "project_id", "parent_id", "time_created"],
@@ -117,9 +119,25 @@ function fileStamp(path) {
  * way to see uncheckpointed turns while leaving every source file untouched.
  * A copy that raced a write or checkpoint is discarded and retried.
  */
+/**
+ * Remove a snapshot folder without ever failing the import. Windows can hold
+ * SQLite files briefly after close, so retry lock errors; if the lock
+ * outlasts the retries, log the leftover path instead of throwing.
+ */
+async function removeSnapshotDir(dir) {
+    try {
+        await withSqliteFileLockRetry(() => rmSync(dir, { recursive: true, force: true }));
+    }
+    catch (error) {
+        log("OpenCode import: could not remove the temporary database copy", {
+            dir,
+            error: String(error),
+        });
+    }
+}
 function snapshotWalDatabase(dbPath) {
     const dir = mkdtempSync(join(tmpdir(), "omms-opencode-"));
-    const cleanup = () => rmSync(dir, { recursive: true, force: true });
+    const cleanup = () => removeSnapshotDir(dir);
     const copy = join(dir, "opencode.db");
     try {
         for (let attempt = 0; attempt < 5; attempt++) {
@@ -133,24 +151,24 @@ function snapshotWalDatabase(dbPath) {
         }
     }
     catch (error) {
-        cleanup();
+        void cleanup();
         throw error;
     }
-    cleanup();
+    void cleanup();
     throw new Error("OpenCode database kept changing while it was copied; retry the import");
 }
 function openSnapshot(dbPath) {
     if (!existsSync(`${dbPath}-wal`)) {
         // No WAL: every committed page is in the main file, so read it in place.
         const uri = `${pathToFileURL(dbPath).href}?immutable=1`;
-        return { db: new DatabaseSync(uri, { readOnly: true }), cleanup: () => { } };
+        return { db: new DatabaseSync(uri, { readOnly: true }), cleanup: async () => { } };
     }
     const snapshot = snapshotWalDatabase(dbPath);
     try {
         return { db: new DatabaseSync(snapshot.path), cleanup: snapshot.cleanup };
     }
     catch (error) {
-        snapshot.cleanup();
+        void snapshot.cleanup();
         throw error;
     }
 }
@@ -159,9 +177,9 @@ export function readOpencodeHistory(dbPath, filters = {}) {
     if (!existsSync(dbPath))
         throw new Error(`OpenCode database not found: ${dbPath}`);
     const { db, cleanup } = openSnapshot(dbPath);
-    const close = () => {
+    const close = async () => {
         db.close();
-        cleanup();
+        await cleanup();
     };
     try {
         validateSchema(db);
@@ -201,14 +219,15 @@ export function readOpencodeHistory(dbPath, filters = {}) {
                     }
                 }
                 finally {
-                    close();
+                    await close();
                 }
             },
         };
         return { childSessions, topLevelSessions, sessions };
     }
     catch (error) {
-        close();
+        // Cleanup never throws, so the original error is what the caller sees.
+        void close();
         throw error;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "om-memory-system",
-  "version": "3.1.0-next.3",
+  "version": "3.1.1",
   "description": "Opinionated modular memory system for coding agents (OpenCode + Pi)",
   "type": "module",
   "main": "dist/plugin.js",