vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-06-04 01:14:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(agents): fence yield abort lock release

Browse Source
This commit is contained in:
Peter Steinberger
2026-05-27 02:10:08 +01:00
parent a7eab7467f
commit 0fe7479752
2 changed files with 41 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/agents/pi-embedded-runner/run/attempt.session-lock.test.ts
View File

@@ -128,6 +128,26 @@ describe("embedded attempt session lock lifecycle", () => {
expect(events).toEqual(["prep-release", "yield-cleanup-write", "cleanup-release"]);
});
it("keeps the session fence active after releasing for sessions_yield abort cleanup", async () => {
const sessionFile = await createTempSessionFile();
const release = vi.fn(async () => {});
const acquireSessionWriteLock = vi.fn(async () => ({ release }));
const controller = await createEmbeddedAttemptSessionLockController({
acquireSessionWriteLock,
lockOptions: { ...lockOptions, sessionFile },
});
await controller.releaseHeldLockForAbort();
await fs.appendFile(sessionFile, '{"type":"message","id":"abort-takeover"}\n', "utf8");
await expect(controller.withSessionWriteLock(() => "yield-cleanup")).rejects.toBeInstanceOf(
EmbeddedAttemptSessionTakeoverError,
);
expect(controller.hasSessionTakeover()).toBe(true);
expect(acquireSessionWriteLock).toHaveBeenCalledTimes(2);
expect(release).toHaveBeenCalledTimes(2);
});
it("runs post-prompt transcript writes under a short reacquired lock", async () => {
const events: string[] = [];
const acquireSessionWriteLock = vi

43
src/agents/pi-embedded-runner/run/attempt.session-lock.ts
View File

@@ -749,32 +749,31 @@ export async function createEmbeddedAttemptSessionLockController(params: {
const noopLock: SessionLock = { release: async () => {} };
async function releaseHeldLockWithFence(): Promise<void> {
if (!heldLock) {
return;
}
const lock = heldLock;
heldLock = undefined;
const fingerprint = await readSessionFileFingerprint(params.lockOptions.sessionFile);
const ownedWrite = ownedSessionFileWrites.get(sessionFileFenceKey);
const trustedGeneration = trustSessionFileState(sessionFileFenceKey, fingerprint);
fenceFingerprint = fingerprint;
fenceSnapshot = await readSessionFileFenceSnapshot(params.lockOptions.sessionFile);
fenceGeneration =
ownedWrite && sameSessionFileFingerprint(ownedWrite.fingerprint, fingerprint)
? ownedWrite.generation
: (trustedGeneration ?? fenceGeneration);
fenceActive = true;
await lock.release();
}
return {
async releaseForPrompt(): Promise<void> {
if (!heldLock) {
return;
}
const lock = heldLock;
heldLock = undefined;
const fingerprint = await readSessionFileFingerprint(params.lockOptions.sessionFile);
const ownedWrite = ownedSessionFileWrites.get(sessionFileFenceKey);
const trustedGeneration = trustSessionFileState(sessionFileFenceKey, fingerprint);
fenceFingerprint = fingerprint;
fenceSnapshot = await readSessionFileFenceSnapshot(params.lockOptions.sessionFile);
fenceGeneration =
ownedWrite && sameSessionFileFingerprint(ownedWrite.fingerprint, fingerprint)
? ownedWrite.generation
: (trustedGeneration ?? fenceGeneration);
fenceActive = true;
await lock.release();
await releaseHeldLockWithFence();
},
async releaseHeldLockForAbort(): Promise<void> {
if (!heldLock) {
return;
}
const lock = heldLock;
heldLock = undefined;
await lock.release();
await releaseHeldLockWithFence();
},
refreshAfterOwnedSessionWrite(): void {
if (fenceActive && !takeoverDetected) {