From e28981e776f4a2ae931d6b273f170399349aea39 Mon Sep 17 00:00:00 2001 From: 34262315716 <34262315716@github.com> Date: Sun, 12 Jul 2026 15:33:18 +0800 Subject: [PATCH 1/3] fix: pidIsAlive self-PID check for stale lock detection --- apps/memos-local-plugin/adapters/openclaw/runtime-lock.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/memos-local-plugin/adapters/openclaw/runtime-lock.ts b/apps/memos-local-plugin/adapters/openclaw/runtime-lock.ts index 55d2f6e43..4176225af 100644 --- a/apps/memos-local-plugin/adapters/openclaw/runtime-lock.ts +++ b/apps/memos-local-plugin/adapters/openclaw/runtime-lock.ts @@ -146,6 +146,7 @@ function readOwner(ownerFile: string): OpenClawRuntimeLockOwner | null { function pidIsAlive(pid: number): boolean { if (!Number.isInteger(pid) || pid <= 0) return false; + if (pid === process.pid) return false; try { process.kill(pid, 0); return true; From 8da7a110665973726866dd1420da51c32bfa842e Mon Sep 17 00:00:00 2001 From: jiachengzhen Date: Thu, 6 Aug 2026 20:16:37 +0800 Subject: [PATCH 2/3] fix(openclaw): distinguish held locks from recycled PIDs --- .../adapters/openclaw/runtime-lock.ts | 11 ++++++-- .../adapters/openclaw-runtime-lock.test.ts | 28 +++++++++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/apps/memos-local-plugin/adapters/openclaw/runtime-lock.ts b/apps/memos-local-plugin/adapters/openclaw/runtime-lock.ts index 544710e9e..8138e79f3 100644 --- a/apps/memos-local-plugin/adapters/openclaw/runtime-lock.ts +++ b/apps/memos-local-plugin/adapters/openclaw/runtime-lock.ts @@ -7,6 +7,7 @@ import type { ResolvedHome } from "../../core/config/index.js"; const LOCK_DIRNAME = "openclaw-runtime.lock"; const OWNER_FILENAME = "owner.json"; const UNWRITTEN_OWNER_STALE_MS = 30_000; +const heldRuntimeLockDirs = new Set(); export interface OpenClawRuntimeLockOwner { pluginId: string; @@ -101,7 +102,12 @@ export function acquireOpenClawRuntimeLock( if (e.code !== "EEXIST") throw err; const owner = readOwner(ownerFile); - if (owner && pidIsAlive(owner.pid)) { + if (heldRuntimeLockDirs.has(lockDir)) { + throw new DuplicateOpenClawRuntimeError(lockDir, owner); + } + // A live self PID without a locally held lock can only be a stale owner + // from an earlier process lifecycle whose PID was recycled by the OS. + if (owner && owner.pid !== process.pid && pidIsAlive(owner.pid)) { throw new DuplicateOpenClawRuntimeError(lockDir, owner); } if (!owner && !lockLooksStale(lockDir, now(), unwrittenOwnerStaleMs)) { @@ -128,11 +134,13 @@ export function acquireOpenClawRuntimeLock( fs.rmSync(lockDir, { recursive: true, force: true }); throw err; } + heldRuntimeLockDirs.add(lockDir); let released = false; const releaseSync = () => { if (released) return; released = true; + heldRuntimeLockDirs.delete(lockDir); const current = readOwner(ownerFile); if (current?.token !== owner.token) return; fs.rmSync(lockDir, { recursive: true, force: true }); @@ -172,7 +180,6 @@ function readOwner(ownerFile: string): OpenClawRuntimeLockOwner | null { function pidIsAlive(pid: number): boolean { if (!Number.isInteger(pid) || pid <= 0) return false; - if (pid === process.pid) return false; try { process.kill(pid, 0); return true; diff --git a/apps/memos-local-plugin/tests/unit/adapters/openclaw-runtime-lock.test.ts b/apps/memos-local-plugin/tests/unit/adapters/openclaw-runtime-lock.test.ts index b80000c02..078851d9d 100644 --- a/apps/memos-local-plugin/tests/unit/adapters/openclaw-runtime-lock.test.ts +++ b/apps/memos-local-plugin/tests/unit/adapters/openclaw-runtime-lock.test.ts @@ -63,6 +63,9 @@ describe("OpenClaw runtime lock", () => { lock.release(); expect(fs.existsSync(lock.lockDir)).toBe(false); + + const reacquired = acquire(home); + reacquired.release(); }); it("rejects a second live owner before another runtime can bootstrap", () => { @@ -100,6 +103,31 @@ describe("OpenClaw runtime lock", () => { lock.release(); }); + it("reclaims a stale owner whose PID was recycled to the current process", () => { + const home = tmpHome(); + const lockDir = openClawRuntimeLockDir(home); + fs.mkdirSync(lockDir, { recursive: true }); + fs.writeFileSync( + path.join(lockDir, "owner.json"), + JSON.stringify({ + pluginId: "memos-local-plugin", + version: "old", + pid: process.pid, + token: "stale-self-token", + startedAt: 1, + dbFile: home.dbFile, + viewerPort: 18799, + }), + "utf8", + ); + + const lock = acquire(home); + expect(lock.owner.pid).toBe(process.pid); + expect(lock.owner.token).not.toBe("stale-self-token"); + + lock.release(); + }); + it("allows diagnostic mode to skip lock when gateway is running", () => { const home = tmpHome(); const gatewayLock = acquire(home, process.pid, false); From c9cf4cb86e9886ae5b455bfa0e894aee8ec6b760 Mon Sep 17 00:00:00 2001 From: jiachengzhen Date: Thu, 6 Aug 2026 20:22:38 +0800 Subject: [PATCH 3/3] test(openclaw): cover configured lock owner PID --- .../adapters/openclaw/runtime-lock.ts | 2 +- .../adapters/openclaw-runtime-lock.test.ts | 26 +++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/apps/memos-local-plugin/adapters/openclaw/runtime-lock.ts b/apps/memos-local-plugin/adapters/openclaw/runtime-lock.ts index 8138e79f3..26f23394e 100644 --- a/apps/memos-local-plugin/adapters/openclaw/runtime-lock.ts +++ b/apps/memos-local-plugin/adapters/openclaw/runtime-lock.ts @@ -107,7 +107,7 @@ export function acquireOpenClawRuntimeLock( } // A live self PID without a locally held lock can only be a stale owner // from an earlier process lifecycle whose PID was recycled by the OS. - if (owner && owner.pid !== process.pid && pidIsAlive(owner.pid)) { + if (owner && owner.pid !== pid && pidIsAlive(owner.pid)) { throw new DuplicateOpenClawRuntimeError(lockDir, owner); } if (!owner && !lockLooksStale(lockDir, now(), unwrittenOwnerStaleMs)) { diff --git a/apps/memos-local-plugin/tests/unit/adapters/openclaw-runtime-lock.test.ts b/apps/memos-local-plugin/tests/unit/adapters/openclaw-runtime-lock.test.ts index 078851d9d..32d3587cb 100644 --- a/apps/memos-local-plugin/tests/unit/adapters/openclaw-runtime-lock.test.ts +++ b/apps/memos-local-plugin/tests/unit/adapters/openclaw-runtime-lock.test.ts @@ -128,6 +128,32 @@ describe("OpenClaw runtime lock", () => { lock.release(); }); + it("reclaims a stale owner whose PID matches the configured owner PID", () => { + const home = tmpHome(); + const lockDir = openClawRuntimeLockDir(home); + const ownerPid = process.ppid; + fs.mkdirSync(lockDir, { recursive: true }); + fs.writeFileSync( + path.join(lockDir, "owner.json"), + JSON.stringify({ + pluginId: "memos-local-plugin", + version: "old", + pid: ownerPid, + token: "stale-configured-pid-token", + startedAt: 1, + dbFile: home.dbFile, + viewerPort: 18799, + }), + "utf8", + ); + + const lock = acquire(home, ownerPid); + expect(lock.owner.pid).toBe(ownerPid); + expect(lock.owner.token).not.toBe("stale-configured-pid-token"); + + lock.release(); + }); + it("allows diagnostic mode to skip lock when gateway is running", () => { const home = tmpHome(); const gatewayLock = acquire(home, process.pid, false);