fix(agents): release session lock on manual abort · openclaw/openclaw@95890fe
steipete
·
2026-05-31
·
via Recent Commits to openclaw:main
File tree
src/agents/embedded-agent-runner/run
| Original file line number | Diff line number | Diff line change |
|---|
|
| 1 | +import { describe, expect, it, vi } from "vitest"; |
| 2 | +import { releaseEmbeddedAttemptSessionLockForAbort } from "./attempt-abort.js"; |
| 3 | + |
| 4 | +describe("releaseEmbeddedAttemptSessionLockForAbort", () => { |
| 5 | +it("releases the retained session lock for manual aborts", async () => { |
| 6 | +const releaseHeldLockForAbort = vi.fn(async () => {}); |
| 7 | +const warn = vi.fn(); |
| 8 | + |
| 9 | +releaseEmbeddedAttemptSessionLockForAbort({ |
| 10 | +sessionLockController: { releaseHeldLockForAbort }, |
| 11 | +log: { warn }, |
| 12 | +runId: "run-manual", |
| 13 | +abortKind: "abort", |
| 14 | +}); |
| 15 | + |
| 16 | +await Promise.resolve(); |
| 17 | + |
| 18 | +expect(releaseHeldLockForAbort).toHaveBeenCalledTimes(1); |
| 19 | +expect(warn).not.toHaveBeenCalled(); |
| 20 | +}); |
| 21 | + |
| 22 | +it("logs release failures without throwing from the abort path", async () => { |
| 23 | +const releaseError = new Error("locked"); |
| 24 | +const releaseHeldLockForAbort = vi.fn(async () => { |
| 25 | +throw releaseError; |
| 26 | +}); |
| 27 | +const warn = vi.fn(); |
| 28 | + |
| 29 | +releaseEmbeddedAttemptSessionLockForAbort({ |
| 30 | +sessionLockController: { releaseHeldLockForAbort }, |
| 31 | +log: { warn }, |
| 32 | +runId: "run-timeout", |
| 33 | +abortKind: "timeout abort", |
| 34 | +}); |
| 35 | + |
| 36 | +await Promise.resolve(); |
| 37 | +await Promise.resolve(); |
| 38 | + |
| 39 | +expect(releaseHeldLockForAbort).toHaveBeenCalledTimes(1); |
| 40 | +expect(warn).toHaveBeenCalledWith( |
| 41 | +"failed to release session lock on timeout abort: runId=run-timeout Error: locked", |
| 42 | +); |
| 43 | +}); |
| 44 | +}); |
| Original file line number | Diff line number | Diff line change |
|---|
|
| 1 | +import type { EmbeddedAttemptSessionLockController } from "./attempt.session-lock.js"; |
| 2 | + |
| 3 | +type AbortLockReleaseLog = { |
| 4 | +warn(message: string): void; |
| 5 | +}; |
| 6 | + |
| 7 | +export function releaseEmbeddedAttemptSessionLockForAbort(params: { |
| 8 | +sessionLockController: Pick<EmbeddedAttemptSessionLockController, "releaseHeldLockForAbort">; |
| 9 | +log: AbortLockReleaseLog; |
| 10 | +runId: string; |
| 11 | +abortKind: "abort" | "timeout abort"; |
| 12 | +}): void { |
| 13 | +void params.sessionLockController.releaseHeldLockForAbort().catch((err) => { |
| 14 | +params.log.warn( |
| 15 | +`failed to release session lock on ${params.abortKind}: runId=${params.runId} ${String(err)}`, |
| 16 | +); |
| 17 | +}); |
| 18 | +} |
| Original file line number | Diff line number | Diff line change |
|---|
@@ -308,6 +308,7 @@ import {
|
308 | 308 | rotateTranscriptAfterCompaction, |
309 | 309 | shouldRotateCompactionTranscript, |
310 | 310 | } from "../compaction-successor-transcript.js"; |
| 311 | +import { releaseEmbeddedAttemptSessionLockForAbort } from "./attempt-abort.js"; |
311 | 312 | import { resolveAttemptWorkspaceBootstrapRouting } from "./attempt-bootstrap-routing.js"; |
312 | 313 | import { configureEmbeddedAttemptHttpRuntime } from "./attempt-http-runtime.js"; |
313 | 314 | import { |
@@ -2984,12 +2985,13 @@ export async function runEmbeddedAttempt(
|
2984 | 2985 | sessionFile: params.sessionFile, |
2985 | 2986 | reason: "timeout", |
2986 | 2987 | }); |
2987 | | -void sessionLockController.releaseHeldLockForAbort().catch((err) => { |
2988 | | -log.warn( |
2989 | | -`failed to release session lock on timeout abort: runId=${params.runId} ${String(err)}`, |
2990 | | -); |
2991 | | -}); |
2992 | 2988 | } |
| 2989 | +releaseEmbeddedAttemptSessionLockForAbort({ |
| 2990 | + sessionLockController, |
| 2991 | + log, |
| 2992 | +runId: params.runId, |
| 2993 | +abortKind: isTimeout ? "timeout abort" : "abort", |
| 2994 | +}); |
2993 | 2995 | }; |
2994 | 2996 | abortRunForExternalSignal = abortRun; |
2995 | 2997 | const idleTimeoutTrigger: ((error: Error) => void) | undefined = (error) => { |
|
此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。 原文来自 — 版权归原作者所有。
