fix: surface push lock release errors

Author: goanpeca

README.md

@@ -316,7 +316,7 @@ openclaw plugins list  # should show openclaw-b2-backup
 pnpm test
 ```
 
-132 tests across 11 test files covering encryption round-trips, manifest diffing, snapshot filtering, file gathering, B2 client signing, debounce timing, CLI behavior, push coordination, and plugin registration.
+134 tests across 11 test files covering encryption round-trips, manifest diffing, snapshot filtering, file gathering, B2 client signing, debounce timing, CLI behavior, push coordination, and plugin registration.
 
 ## License
 

src/push.test.ts

@@ -191,6 +191,70 @@ describe("push", () => {
     await fs.promises.rm(stateDir, { recursive: true, force: true });
   });
 
+  it("fails a successful push when releasing the lock fails", async () => {
+    const stateDir = await fs.promises.mkdtemp(path.join(os.tmpdir(), "b2-state-"));
+    const lockDir = path.join(stateDir, ".b2-backup-push.lock");
+    await fs.promises.writeFile(path.join(stateDir, "openclaw.json"), "{}");
+    const config: ResolvedB2BackupConfig = {
+      keyId: "test-key",
+      applicationKey: "test-secret",
+      bucket: "test-bucket",
+      region: "test-region",
+      encrypt: false,
+    };
+    const b2 = mockB2();
+    const logger = { info: vi.fn(), warn: vi.fn(), debug: vi.fn() };
+    const rm = fs.promises.rm.bind(fs.promises);
+    const rmSpy = vi.spyOn(fs.promises, "rm").mockImplementation(async (target, options) => {
+      if (path.resolve(String(target)) === path.resolve(lockDir)) {
+        throw new Error("release failed");
+      }
+      return rm(target, options);
+    });
+
+    await expect(push(config, stateDir, b2, logger)).rejects.toThrow("release failed");
+    expect(logger.warn).toHaveBeenCalledWith(
+      expect.stringContaining("failed to release push lock"),
+    );
+
+    rmSpy.mockRestore();
+    await fs.promises.rm(stateDir, { recursive: true, force: true });
+  });
+
+  it("preserves the push error when lock release also fails", async () => {
+    const stateDir = await fs.promises.mkdtemp(path.join(os.tmpdir(), "b2-state-"));
+    const lockDir = path.join(stateDir, ".b2-backup-push.lock");
+    await fs.promises.writeFile(path.join(stateDir, "openclaw.json"), "{}");
+    const config: ResolvedB2BackupConfig = {
+      keyId: "test-key",
+      applicationKey: "test-secret",
+      bucket: "test-bucket",
+      region: "test-region",
+      encrypt: false,
+    };
+    const b2 = mockB2({
+      putObject: vi.fn(async () => {
+        throw new Error("upload failed");
+      }),
+    });
+    const logger = { info: vi.fn(), warn: vi.fn(), debug: vi.fn() };
+    const rm = fs.promises.rm.bind(fs.promises);
+    const rmSpy = vi.spyOn(fs.promises, "rm").mockImplementation(async (target, options) => {
+      if (path.resolve(String(target)) === path.resolve(lockDir)) {
+        throw new Error("release failed");
+      }
+      return rm(target, options);
+    });
+
+    await expect(push(config, stateDir, b2, logger)).rejects.toThrow("upload failed");
+    expect(logger.warn).toHaveBeenCalledWith(
+      expect.stringContaining("failed to release push lock"),
+    );
+
+    rmSpy.mockRestore();
+    await fs.promises.rm(stateDir, { recursive: true, force: true });
+  });
+
   it("adds a random suffix to snapshot IDs", () => {
     const snapshotId = createSnapshotId("2026-02-19T12:00:00.000Z");
 

src/push.ts

@@ -43,10 +43,19 @@ export async function push(
   options?: PushOptions,
 ): Promise<void> {
   const lock = await acquirePushLock(stateDir);
+  let pushError: unknown;
   try {
     await pushWithLock(config, stateDir, b2, logger, options);
+  } catch (err) {
+    pushError = err;
+    throw err;
   } finally {
-    await lock.release();
+    try {
+      await lock.release();
+    } catch (err) {
+      logger.warn(`b2-backup: failed to release push lock: ${String(err)}`);
+      if (!pushError) throw err;
+    }
   }
 }
 
@@ -193,7 +202,7 @@ async function acquirePushLock(stateDir: string): Promise<{ release: () => Promi
 
   return {
     async release() {
-      await fs.promises.rm(lockDir, { recursive: true, force: true }).catch(() => undefined);
+      await fs.promises.rm(lockDir, { recursive: true, force: true });
     },
   };
 }