merge: accept remote fixes for issue #415 (fnSucceeded path)

Author: jlin53882

scripts/verify-ci-test-manifest.mjs

@@ -39,6 +39,7 @@ const EXPECTED_BASELINE = [
   { group: "packaging-and-workflow", runner: "node", file: "test/workflow-fork-guards.test.mjs", args: ["--test"] },
   { group: "storage-and-schema", runner: "node", file: "test/clawteam-scope.test.mjs", args: ["--test"] },
   { group: "storage-and-schema", runner: "node", file: "test/cross-process-lock.test.mjs", args: ["--test"] },
+  { group: "storage-and-schema", runner: "node", file: "test/lock-stress-test.mjs", args: ["--test"] },
   { group: "core-regression", runner: "node", file: "test/preference-slots.test.mjs", args: ["--test"] },
   { group: "core-regression", runner: "node", file: "test/is-latest-auto-supersede.test.mjs" },
   { group: "core-regression", runner: "node", file: "test/temporal-awareness.test.mjs", args: ["--test"] },

src/store.ts

@@ -64,10 +64,6 @@ async function loadLockfile(): Promise<any> {
   return lockfileModule;
 }
 
-export function __setLockfileModuleForTests(module: any): void {
-  lockfileModule = module;
-}
-
 export const loadLanceDB = async (): Promise<
   typeof import("@lancedb/lancedb")
 > => {
@@ -218,7 +214,6 @@ export class MemoryStore {
     // ECOMPROMISED 透過 onCompromised callback 觸發（非 throw），使用 flag 機制正確處理
     let isCompromised = false;
     let compromisedErr: any = null;
-    let fnSucceeded = false;
     let fnError: any = null;
 
     const release = await lockfile.lock(lockPath, {
@@ -244,29 +239,18 @@ export class MemoryStore {
     });
 
     try {
-      const result = await fn();
-      fnSucceeded = true;
-      return result;
+      return await fn();
     } catch (e: any) {
-      fnError = e;  // 保留 fn() 的錯誤
-      throw e;      // 立刻拋出，讓 caller 知道
+      fnError = e;
+      throw e;
     } finally {
       if (isCompromised) {
-        // lock 已被 proper-lockfile 標記 released，不需要也無法再次 release
-        // 若 fn() 已拋錯，fnError 優先（fn() 錯誤不被 lock 錯誤覆蓋）
-        if (fnError !== null) {
-          throw fnError;
-        }
-        if (!fnSucceeded) {
-          throw compromisedErr;
+        if (fnError === null) {
+          return;
         }
-        console.warn(
-          `[memory-lancedb-pro] Returning successful result despite compromised lock at "${lockPath}". ` +
-          `Callers must not retry this operation automatically.`,
-        );
-      } else {
-        await release();
+        throw fnError;
       }
+      await release();
     }
   }