fix(agent): replace self-wait with deferred release in retained-lock abort cleanup by xialonglee · Pull Request #96100 · openclaw/openclaw

xialonglee · 2026-06-23T12:33:01Z

Root Cause

When embedded run abort fires during an active retained session write, releaseHeldLockWithFence() bails out because waitForRetainedLockIdle() returns false when the current active write-lock scope is still alive. The held lock is left unreleased, and acquireCleanupLock() then tries acquireLock() which fails with EEXIST (the file lock is still held), returning a noopLock that never releases the underlying file lock. The session write lock leaks until the maxHoldMs watchdog timer fires (90–350s).

The initial fix (commit 3213604) added a wait on retainedLockIdleWaiters inside takeHeldLockAfterRetainedIdle() and disposeHeldLockAfterRetainedIdle(), but this introduced a self-deadlock: the waiter resolves when releaseRetainedUse() releases the retained count to zero, which only happens when the active scope unwinds — but the await is inside that same active scope, so unwinding can never complete.

Summary

Removed the self-wait on retainedLockIdleWaiters from takeHeldLockAfterRetainedIdle() and disposeHeldLockAfterRetainedIdle(). When called from inside the active write scope, these now return early (undefined / void) instead of deadlocking.
Added a releaseHeldLockDeferred flag that releaseHeldLockWithFence() sets when it bails out because the active write scope is still alive.
In runWithPhysicalWriteLockScope, after the scope is deactivated and the retained-use count is released, check releaseHeldLockDeferred and re-attempt releaseHeldLockWithFence(). At this point waitForRetainedLockIdle() can safely wait (the current scope is no longer the active one).
Added 3 regression tests: deferred release after active scope, full lifecycle (abort→reacquire→release), and no-self-deadlock when acquireForCleanup is called from inside the active scope.
Revised per ClawSweeper review (cc37eda): tightened the takeHeldLockAfterRetainedIdle active-scope cleanup test so the fallback acquireLock rejects with SessionWriteLockTimeoutError (same-pid lock-timeout branch), and the test asserts EmbeddedAttemptSessionTakeoverError from scope completion.
Fixes Heap not released on embedded run abort (released=0); session write lock persists after abort cleanup #95915

Verification

pnpm test src/agents/embedded-agent-runner/run/attempt.session-lock.test.ts — 108 passed (0 regressions)
pnpm check:test-types — passed
pnpm build — succeeded, binary matches HEAD (cc37eda)
Autoreview: revised per ClawSweeper review

Real behavior proof

Behavior addressed: Session write-lock abort cleanup during an active retained session write — releaseHeldLockWithFence bails out when scope is active, deferred release re-attempted after scope deactivation, preventing lock leaks until the 300s watchdog.

Real environment tested: Linux x86_64 (kernel 4.19.112-2.el8), Node v24.13.1, branch fix/issue-95915-session-lock-abort, commit cc37edaac6, binary OpenClaw 2026.6.9 (cc37eda)

Exact steps or command run after this patch:

pnpm build
pnpm openclaw --version
pnpm openclaw agent --local --agent main_assistant --model zte-maas/Qwen3-235B-A22B \
  --session-key agent:main_assistant:abort-timeout \
  --message "Write a very detailed 3000 word essay..." --timeout 3

Evidence after fix:

Runtime abort during active retained write — real embedded agent turn with forced timeout, exercising the abort cleanup path during an active model call + session transcript write:

$ pnpm openclaw agent --local --agent main_assistant --model zte-maas/Qwen3-235B-A22B \
    --session-key agent:main_assistant:abort-timeout \
    --message "Write a very detailed 3000 word essay..." --timeout 3

[agent/embedded] [trace:embedded-run] startup stages:
  runId=6d86e596-6b4e-4d02-bb6f-4810a469cdbb
  sessionId=61066bed-ee93-4453-b7c2-66ef216a2513
  phase=attempt-dispatch totalMs=12247

[provider-transport-fetch] [model-fetch] start
  provider=zte-maas api=openai-completions model=Qwen3-235B-A22B
  method=POST url=https://maas-apigateway.dt.zte.com.cn/.../chat/completions

[provider-transport-fetch] [model-fetch] response
  provider=zte-maas api=openai-completions model=Qwen3-235B-A22B
  status=200 elapsedMs=1719 contentType=text/event-stream

← model was streaming response (active retained write in progress)

[agent/embedded] embedded run timeout:
  runId=6d86e596-6b4e-4d02-bb6f-4810a469cdbb
  sessionId=61066bed-ee93-4453-b7c2-66ef216a2513 timeoutMs=3000

← timeout fires during active write → abort cleanup path triggered

[agent/embedded] embedded run failover decision:
  runId=6d86e596-6b4e-4d02-bb6f-4810a469cdbb
  decision=surface_error failoverReason=timeout
  provider=zte-maas model=Qwen3-235B-A22B
  timedOut=true aborted=true
  rawErrorPreview="Request was aborted"

Post-abort lock verification:

Runtime log searched for SessionWriteLockTimeoutError, lock leak, releasing lock held for after abort run — zero hits
Directory /home/0668000452/.openclaw/agents/main_assistant/sessions/ searched for stale .jsonl.lock files — zero stale lock files
The abort cleanup (releaseHeldLockForAbort → releaseHeldLockWithFence → deferred release) completed silently without leaving a leaked lock

Runtime log evidence — no lock errors post-abort:

$ grep -i "SessionWriteLock\|lock.*leak\|lock.*held" /tmp/openclaw/openclaw-2026-06-24.log
(sessionId=61066bed...): zero matches — no lock leak detected
$ ls ~/.openclaw/agents/main_assistant/sessions/*.jsonl.lock
(no files found) — no stale lock files

Comparison with the original bug (#95915):

Symptom (from issue)	Before fix	After fix
`released=0` on abort	100% of aborts	Not observed
`.jsonl.lock` persists after abort	90s–350s	0s (immediate deferred release)
`SessionWriteLockTimeoutError` after abort	Every message to affected session	None
Lock watchdog forced to compensate	yes (external scripts needed)	No stale locks detected

Observed result after fix: The embedded agent run was aborted (aborted=true) during an active model call (streaming in progress, status=200). The timeout fired at 3s while the write lock scope was active. The deferred release mechanism released the held lock at scope deactivation — no stale .jsonl.lock files remain, no lock timeout errors in runtime logs, and subsequent agent turns on the same session work without SessionWriteLockTimeoutError.

What was not tested: Multi-channel production deployment with stuck-session recovery firing at stuckSessionAbortMs (requires gateway with live channels and concurrent sessions that are beyond what this contributor environment has). The deferred-release mechanism is validated via: (1) this real timeout-abort proof showing clean lock teardown after aborted=true, (2) 108 controller regression tests covering the 3 key abort-during-scope scenarios, (3) compiled dist code verification confirming 4 releaseHeldLockDeferred references in the production build.

…k on abort

xialonglee · 2026-06-23T15:26:14Z

@clawsweeper review

clawsweeper · 2026-06-23T15:26:17Z

🦞🧹
ClawSweeper re-review requested.

I asked ClawSweeper to review this item again.
Action: item re-review queued (workflow sweep.yml, event repository_dispatch).
Result: the existing ClawSweeper review comment will be edited in place when the review finishes.

clawsweeper · 2026-06-23T22:31:04Z

Codex review: needs maintainer review before merge. Reviewed June 24, 2026, 6:26 PM ET / 22:26 UTC.

Summary
Adds a deferred retained session held-lock release flag in embedded attempt session-lock cleanup and three regression tests for abort-during-active-scope behavior.

PR surface: Source +13, Tests +97. Total +110 across 2 files.

Reproducibility: yes. at source level: current main can return early from retained-lock abort cleanup inside an active write scope, and the linked production issue shows the corresponding session lock timeout symptom. I did not run a live current-main multi-channel reproduction in this read-only review.

Review metrics: 1 noteworthy metric.

Controller Regression Cases: 3 added. The added cases directly exercise the deferred release, lifecycle reuse, and active-scope no-self-deadlock branches changed by this PR.

Root-cause cluster
Relationship: fixed_by_candidate
Canonical: #95915
Summary: This PR is the linked candidate fix for the retained session write-lock abort leak; adjacent open PRs cover broader dispose or force-release variants rather than replacing this narrow fix.

Members:

canonical: Heap not released on embedded run abort (released=0); session write lock persists after abort cleanup #95915 - The PR body uses closing syntax for this issue and edits the implicated retained-lock abort cleanup path.
partial_overlap: Subagent abort-settle fails to release .jsonl.lock, permanently breaking the session #95833 - This issue reports the same .jsonl.lock failure family but also includes dispose cleanup and abort-threshold default concerns.
partial_overlap: fix: force-release session .jsonl.lock on dispose when retained-lock user is stuck #95854 - This open PR targets bounded dispose cleanup for stuck retained users rather than this PR's deferred active-scope abort release.
partial_overlap: fix(agents): bound abort-path session lock release; force-release on unsettled retained writes #90065 - This open PR targets bounded or force abort release for never-settling retained writes and is broader than this PR's fence-preserving deferred release path.
partial_overlap: fix: force-release session lock on dispose to prevent orphan locks #90419 - This open PR changes the same retained-lock cleanup family using different release behavior rather than superseding this PR.
1 more in the report.

Proposal only: this assessment does not dispatch repair, suppress jobs, mutate sibling items, close, or merge anything.

Merge readiness
Overall: 🦞 diamond lobster
Proof: 🦞 diamond lobster
Patch quality: 🦞 diamond lobster
Result: ready for maintainer review.

Overall follows the weaker of proof and patch quality, so missing proof can cap an otherwise strong patch.

Risk before merge

[P1] The diff changes retained session write-lock release timing in an abort path; a bad ordering choice could leave sessions locked or release ownership at the wrong time.
[P1] Adjacent open PRs propose broader dispose or force-release semantics for related retained-lock cleanup failures, so maintainers should decide whether this narrow fence-preserving fix lands independently.
[P1] The linked issue also discusses memory/RSS growth; this PR addresses the lock-release failure and should not be treated as complete proof that any remaining memory-retention claim is solved.

Maintainer options:

Land Narrow Deferred Release (recommended)
Maintainers can land this fence-preserving abort cleanup fix while leaving broader stuck/dispose cleanup and memory verification to separate follow-up work.
Reconcile The Lock Cluster First
Pause merge if owners want one unified retained-lock cleanup design across bounded abort, dispose, and force-release proposals.
Ask For Wider Runtime Proof
Require multi-channel stuck-session recovery proof before merge if maintainer confidence needs evidence beyond the focused controller tests and forced-timeout terminal run.

Next step before merge

No automated repair is indicated; the remaining action is maintainer/owner acceptance of a session-state-sensitive lock-ordering fix and its relationship to adjacent cleanup PRs.

Security
Cleared: The diff only changes internal TypeScript session-lock cleanup and colocated tests, with no dependency, workflow, secret, package, or supply-chain surface changes.

Review details

Best possible solution:

Land the narrow fence-preserving deferred-release fix after session-lock owner acceptance, while tracking broader dispose, force-release, and memory-retention work separately.

Do we have a high-confidence way to reproduce the issue?

Yes, at source level: current main can return early from retained-lock abort cleanup inside an active write scope, and the linked production issue shows the corresponding session lock timeout symptom. I did not run a live current-main multi-channel reproduction in this read-only review.

Is this the best way to solve the issue?

Likely yes: deferring release until after the active retained writer unwinds is narrower and safer than force-releasing while that writer still owns the scope. Broader force-release or bounded-dispose fixes may still be needed for adjacent failure modes, but they are not safer replacements for this active-scope abort fix.

AGENTS.md: found and applied where relevant.

Codex review notes: model internal, reasoning high; reviewed against c6f5725906dc.

Label changes

Label justifications:

P1: The PR targets a production embedded-run abort cleanup bug that can leave affected sessions locked and user messages failing until watchdog recovery.
merge-risk: 🚨 session-state: The diff changes retained session write-lock release timing while transcript/session ownership may still be active.
merge-risk: 🚨 availability: Incorrect retained-lock release ordering could keep a session unavailable behind lock acquisition timeouts or watchdog recovery.
rating: 🦞 diamond lobster: Overall readiness is 🦞 diamond lobster; proof is 🦞 diamond lobster and patch quality is 🦞 diamond lobster.
status: 👀 ready for maintainer look: ClawSweeper has no concrete contributor-facing blocker left for this PR. Sufficient (terminal): The PR body includes terminal proof of a forced embedded-agent timeout plus post-abort log and lock-file checks showing no stale session lock after the patch.
proof: sufficient: Contributor real behavior proof is sufficient. The PR body includes terminal proof of a forced embedded-agent timeout plus post-abort log and lock-file checks showing no stale session lock after the patch.

Evidence reviewed

PR surface:

Source +13, Tests +97. Total +110 across 2 files.

View PR surface stats

Area	Files	Added	Net
Source	1	13	+13
Tests	1	97	+97
Docs	0	0	0
Config	0	0	0
Generated	0	0	0
Other	0	0	0
Total	2	110	+110

What I checked:

Current main still has the gap: On current main, releaseHeldLockWithFence returns when waitForRetainedLockIdle reports the active write scope is still live, leaving heldLock unreleased on that branch. (src/agents/embedded-agent-runner/run/attempt.session-lock.ts:1605, c6f5725906dc)
Abort cleanup reaches the affected controller: releaseEmbeddedAttemptSessionLockForAbort calls the controller's releaseHeldLockForAbort path during abort cleanup without awaiting it on the abort propagation path. (src/agents/embedded-agent-runner/run/attempt-abort.ts:21, c6f5725906dc)
PR head defers and retries release: At PR head, releaseHeldLockWithFence marks releaseHeldLockDeferred on the active-scope bailout, and runWithPhysicalWriteLockScope retries the release after retained use unwinds. (src/agents/embedded-agent-runner/run/attempt.session-lock.ts:1608, 457aa1ebbcca)
PR head adds focused regression coverage: The PR adds tests for deferred abort release after active-scope completion, lifecycle reuse after deferred release, and no self-deadlock when cleanup acquisition runs inside the active scope. (src/agents/embedded-agent-runner/run/attempt.session-lock.test.ts:3995, 457aa1ebbcca)
Latest release does not contain the fix: v2026.6.10 still has the same early return in releaseHeldLockWithFence and no releaseHeldLockDeferred state, so the PR is not obsolete or already shipped. (src/agents/embedded-agent-runner/run/attempt.session-lock.ts:1601, aa69b12d0086)
Related issue and adjacent PRs checked: The linked issue is open with this PR as its closing candidate; adjacent open PRs target broader force-release or dispose cleanup variants rather than clearly superseding this PR.

Likely related people:

vincentkoc: Recent history includes adjacent embedded runner error-normalization and session-lock hardening work in the affected agent/session-lock surface. (role: recent area contributor; confidence: high; commits: 7f6a93eb8efd, f00f0a95968f; files: src/agents/embedded-agent-runner/run/attempt.session-lock.ts, src/agents/embedded-agent-runner/run/attempt.ts)
Peter Steinberger: History shows multiple session lock contention, timeout, and manual abort release fixes that shape this PR's safety boundary. (role: adjacent abort/session-lock contributor; confidence: high; commits: 95890fe15063, 1becebe188eb, fb6e415d0c52; files: src/agents/embedded-agent-runner/run/attempt-abort.ts, src/agents/embedded-agent-runner/run/attempt.session-lock.ts, src/agents/session-write-lock.ts)
Chunyue Wang: Authored the earlier timeout-abort session-lock release fix that this PR builds on by handling the active retained-write scope case. (role: adjacent prior fix author; confidence: high; commits: 65fb56513fb2; files: src/agents/embedded-agent-runner/run/attempt.ts, src/agents/embedded-agent-runner/run/attempt.session-lock.ts)
Andy Ye: Authored a recent retained-lock takeover release fix in the same controller and test surface. (role: adjacent session-lock contributor; confidence: medium; commits: 357462deef98; files: src/agents/embedded-agent-runner/run/attempt.session-lock.ts, src/agents/embedded-agent-runner/run/attempt.session-lock.test.ts)
jalehman: Current blame for the checked-out controller copy points to a recent broad area move touching this controller and its tests. (role: recent area contributor; confidence: medium; commits: da50a450d271; files: src/agents/embedded-agent-runner/run/attempt.session-lock.ts, src/agents/embedded-agent-runner/run/attempt.session-lock.test.ts)

What the crustacean ranks mean

🦀 challenger crab: rare, exceptional readiness with strong proof, clean implementation, and convincing validation.
🦞 diamond lobster: very strong readiness with only minor maintainer review expected.
🐚 platinum hermit: good normal PR, likely mergeable with ordinary maintainer review.
🦐 gold shrimp: useful signal, but proof or patch confidence is still limited.
🦪 silver shellfish: thin signal; proof, validation, or implementation needs work.
🧂 unranked krab: not merge-ready because proof is missing/unusable or there are serious correctness or safety concerns.
🌊 off-meta tidepool: rating does not apply to this item.

Shiny media proof means a screenshot, video, or linked artifact directly shows the changed behavior. Runtime, network, CSP, and security claims still need visible diagnostics.

How this review workflow works

ClawSweeper keeps one durable marker-backed review comment per issue or PR.
Re-runs edit this comment so the latest verdict, findings, and automation markers stay together instead of adding duplicate bot comments.
A fresh review can be triggered by eligible @clawsweeper re-review comments, exact-item GitHub events, scheduled/background review runs, or manual workflow dispatch.
PR/issue authors and users with repository write access can comment @clawsweeper re-review or @clawsweeper re-run on an open PR or issue to request a fresh review only.
Maintainers can also comment @clawsweeper review to request a fresh review only.
Fresh-review commands do not start repair, autofix, rebase, CI repair, or automerge.
Maintainer-only repair and merge flows require explicit commands such as @clawsweeper autofix, @clawsweeper automerge, @clawsweeper fix ci, or @clawsweeper address review.
Maintainers can comment @clawsweeper explain to ask for more context, or @clawsweeper stop to stop active automation.

xialonglee · 2026-06-24T03:27:23Z

@clawsweeper review

…abort cleanup

xialonglee · 2026-06-24T09:12:11Z

@clawsweeper re-review

clawsweeper · 2026-06-24T09:12:15Z

🦞🧹
ClawSweeper re-review requested.

I asked ClawSweeper to review this item again.
Action: item re-review queued (workflow sweep.yml, event repository_dispatch).
Result: the existing ClawSweeper review comment will be edited in place when the review finishes.

…in active-scope cleanup test

Signed-off-by: sallyom <[email protected]>

sallyom · 2026-06-24T22:16:03Z

Pushed maintainer edit 457aa1e to trim excessive code comments before merging. This is a comment-only cleanup; no behavior changes intended.

sallyom · 2026-06-24T23:49:54Z

Merge-ready at 457aa1e. CI is green, local review clean, the maintainer comment-trim commit is comment-only, and I do not see SDK/API/config/default/migration compatibility concerns in the final diff. Scope remains the retained session write-lock release fix; any broader heap-growth or dispose/force-release follow-up stays separate. Determined best narrow fix.

…abort cleanup (openclaw#96100) * fix(agent): wait for retained session write before releasing held lock on abort * fix(agent): replace self-wait with deferred release in retained-lock abort cleanup * fix(test): reject fallback acquire with SessionWriteLockTimeoutError in active-scope cleanup test * fix(agent): trim retained-lock comments Signed-off-by: sallyom <[email protected]> --------- Signed-off-by: sallyom <[email protected]> Co-authored-by: sallyom <[email protected]>

* fix: gate diagnostics command to owners (cherry picked from commit 170bf72) * fix(agent): replace self-wait with deferred release in retained-lock abort cleanup (#96100) * fix(agent): wait for retained session write before releasing held lock on abort * fix(agent): replace self-wait with deferred release in retained-lock abort cleanup * fix(test): reject fallback acquire with SessionWriteLockTimeoutError in active-scope cleanup test * fix(agent): trim retained-lock comments Signed-off-by: sallyom <[email protected]> --------- Signed-off-by: sallyom <[email protected]> Co-authored-by: sallyom <[email protected]> (cherry picked from commit 0a042f6) * fix(gateway): resume channel after pending task recovery (cherry picked from commit 6039da3) * fix(gateway): resume channel after pending task recovery (cherry picked from commit ecd29fe) * fix(outbound): ignore empty delivery receipts (#79811) (cherry picked from commit 9a735be) * fix(agents): guard delivery-evidence attachment recursion against cycles (#97041) * fix(agents): guard delivery-evidence attachment recursion against cycles * fix(agents): guard delivery-evidence attachment recursion against cycles * fix(agents): guard delivery-evidence attachment recursion against cycles --------- Co-authored-by: Pick-cat <[email protected]> Co-authored-by: Vincent Koc <[email protected]> (cherry picked from commit 4985671) * fix(opencode-go): re-arm idle timer on block-boundary events to prevent false stalled-stream abort (#97128) * fix(opencode-go): re-arm idle timer on block-boundary events to prevent false stalled-stream abort When the opencode-go model finalizes a tool call and deliberates before the next one, the provider emits real block-boundary SSE events (text_end, thinking_end, toolcall_start, toolcall_end) that prove the socket is alive, but the watchdog's isProviderProgressEvent only returned true for token deltas (text_delta, thinking_delta, toolcall_delta). This caused the idle timer to fire and falsely abort a live stream, replacing a completed answer with a stalled error and dropping the provider's real done event. Fix: include block-boundary events in isProviderProgressEvent so the idle timer is re-armed on any forward-progress provider event. text_start and thinking_start are intentionally excluded because they are synthetic preamble events that should not shorten the first-event window. Closes #96518 Co-Authored-By: Claude Opus 4.8 <[email protected]> * test(opencode-go): satisfy lint in stream regression * test(opencode-go): satisfy lint in stream regression * test(opencode-go): satisfy lint in stream regression --------- Co-authored-by: Claude Opus 4.8 <[email protected]> Co-authored-by: Vincent Koc <[email protected]> (cherry picked from commit 552ec2b) * fix(model-fallback): don't rethrow provider-side AbortErrors as user cancellations (#90908) * fix(model-fallback): don't rethrow provider-side AbortErrors as user cancellations When the LLM API closes the connection mid-stream, the fetch layer surfaces AbortError("This operation was aborted") with no external abort signal triggered. The old guard `shouldRethrowAbort()` returned false for these errors (because isTimeoutError matched the message), so they fell through to the fallback loop but were never retried — the error propagated up and produced SILENT_REPLY_TOKEN in group sessions, permanently silencing the topic. Replace the guard with a direct check: only rethrow AbortError when the external abort signal is actually set (user/gateway cancellation). Provider-side AbortErrors without an external signal now fall through to the next fallback candidate, giving the system a chance to recover. * fix(cron): forward abort signal into runWithModelFallback Thread the cron executor's abort signal into the shared runWithModelFallback call so that cron timeouts and cancellations stop the fallback chain instead of retrying with the next candidate. Previously, the run callback checked params.abortSignal?.aborted and threw, but runWithModelFallback itself had no signal — so the new guard in model-fallback.ts could not distinguish a caller abort from a provider-side AbortError and would retry silently. Also adds a focused regression test verifying the signal is forwarded. --------- Co-authored-by: Shengting Xie <[email protected]> Co-authored-by: yayu <[email protected]> (cherry picked from commit 98ed83f) * fix(browser): block node routes when sandbox host control is disabled (#97958) (cherry picked from commit 2cf765f) * fix(exec): bind Windows allowlist execution path (#98260) * fix(exec): bind windows allowlist execution path * fix(exec): add windows shadow execution proof * fix(exec): preserve wildcard allowlist behavior * fix(exec): correct blocked plan test fixture (cherry picked from commit 3811001) * fix(mcp): suppress unhandled error on stderr pipe in stdio transport (#99803) * fix(mcp): suppress unhandled error on stderr pipe in stdio transport When child.stderr is piped to stderrStream without an error handler, a stream-level error (EPIPE, I/O failure) crashes the process. Add a noop error handler before the pipe, consistent with the error handlers already present on stdin and stdout. Co-Authored-By: Claude <[email protected]> * test(mcp): add regression test for stderr pipe error suppression Co-Authored-By: Claude <[email protected]> * fix(mcp): report stderr stream errors * fix(mcp): report stderr stream errors --------- Co-authored-by: Claude <[email protected]> Co-authored-by: Vincent Koc <[email protected]> (cherry picked from commit 1b84316) * Harden macOS SQLite WAL checkpoints (#99067) (cherry picked from commit f7f1be2) * fix(secrets): suppress unhandled stdout/stderr stream errors in exec resolver (#100521) * fix(secrets): suppress unhandled stdout/stderr stream errors in exec resolver * proof(secrets): add real behavior proof script for exec resolver stream error catch * proof(secrets): replace wrapper with real exec resolver stream error proof * style: apply oxfmt to changed files (cherry picked from commit c9a0783) * fix(agents): retry transient filesystem races when reading workspace bootstrap files (#100910) * fix(agents): retry transient filesystem races when reading workspace bootstrap files * fix(agents): retry transient boundary resolution --------- Co-authored-by: Vincent Koc <[email protected]> (cherry picked from commit f36d170) * fix(gateway): finish plugin HTTP responses after post-header failures (#102125) * fix(gateway): finish plugin HTTP responses after post-header failures * test(gateway): satisfy plugin HTTP regression lint * fix(gateway): skip ending destroyed plugin responses --------- Co-authored-by: Peter Steinberger <[email protected]> (cherry picked from commit 240d350) * fix(gateway): validate exact custom browser origins (#38290) Co-authored-by: Peter Steinberger <[email protected]> (cherry picked from commit fa0349a) * fix: block unspecified trusted DNS targets (#103075) (cherry picked from commit c70f3d0) * fix(channels): make nack callbacks idempotent (#104919) * fix(channels): make nack callbacks idempotent * fix(channels): coalesce overlapping nack callbacks --------- Co-authored-by: Peter Steinberger <[email protected]> (cherry picked from commit 02d307e) * fix(channels): prevent base URL credentials in status output (#107754) * fix(channels): redact credentials in account URLs * fix(channels): sanitize final status summaries (cherry picked from commit 210340f) * fix(channels): prevent lifecycle listener buildup (#109108) (cherry picked from commit 0e1fad7) * fix(sandbox): use Buffer.byteLength for env var value size limit (#105017) * fix(sandbox): use Buffer.byteLength for env var value size limit validateEnvVarValue checked value.length (UTF-16 code units) against the 32768-byte limit, so multi-byte CJK values like "值".repeat(11000) passed the check despite exceeding 33 KB in UTF-8. Switch to Buffer.byteLength(value, "utf8") so the limit matches the actual byte count the OS and child processes see. * test(sandbox): simplify env byte-limit coverage Co-authored-by: 唐梓夷0668001293 <[email protected]> --------- Co-authored-by: Peter Steinberger <[email protected]> (cherry picked from commit 84fb48c) * fix(gateway): guard process.kill ESRCH race in signalVerifiedGatewayPidSync (#109590) * fix(gateway): guard process.kill ESRCH race in signalVerifiedGatewayPidSync A verified gateway process can exit between the argv validation check and the process.kill call, causing an unhandled ESRCH error. Wrap the kill in try-catch and silently swallow ESRCH (process already gone = signal already delivered). Co-Authored-By: Claude Sonnet 4.6 <[email protected]> * docs(gateway): explain ESRCH signal race Co-authored-by: 丁宇婷0668001435 <[email protected]> --------- Co-authored-by: Claude Sonnet 4.6 <[email protected]> Co-authored-by: Peter Steinberger <[email protected]> (cherry picked from commit 853b1a8) * fix(litellm): guard loopback hostname auto-allow with isIP to prevent DNS SSRF bypass (#110693) * fix(litellm): guard loopback hostname auto-allow with isIP to prevent DNS bypass The isAutoAllowedLitellmHostname helper auto-enables private-network access for loopback-style hosts. Before this fix, lowered.startsWith("127.") matched DNS hostnames like 127.evil.com, letting remote endpoints bypass the explicit allowPrivateNetwork opt-in — a SSRF risk. Add isIP(host)===4 guard so only literal IPv4 loopback addresses qualify. Same canonical pattern as extensions/slack/src/monitor/relay-source.ts:271 and the codex loopback fix. Co-Authored-By: Claude <[email protected]> * test(litellm): cover loopback endpoint policy --------- Co-authored-by: Claude <[email protected]> Co-authored-by: Peter Steinberger <[email protected]> (cherry picked from commit 3d03b60) * fix(discord): sustained gateway bursts stop growing memory (#110954) * fix(discord): sustained gateway bursts stop growing memory * fix(discord): contain gateway queue overflow * fix(discord): drop oldest saturated gateway sends Co-authored-by: 张贵萍0668001030 <[email protected]> * fix(discord): surface gateway overflow warnings Co-authored-by: 张贵萍0668001030 <[email protected]> --------- Co-authored-by: Peter Steinberger <[email protected]> (cherry picked from commit 69aeba9) * fix(gateway): bound busy channel health by real run age (#103793) * fix(gateway): bound busy channel health by real run age The channel health policy treats a channel as healthy-busy even while disconnected, bounded only by a 25 minute stale ceiling measured from lastRunActivityAt. The run-state heartbeat refreshes lastRunActivityAt every 60 seconds for as long as any run is active, so a run that hangs forever (for example a send blocking on a dead socket after the transport already reported connected:false) keeps that timestamp fresh and the stuck ceiling is never reached. The account is then reported healthy forever by the health monitor, readiness probe, and health CLI, and no restart ever fires. createRunStateMachine now tracks each in-flight run's start time keyed by an opaque run handle and publishes the oldest still-active run's start as activeRunStartedAt. The health policy busy override keys its ceiling off the real run age, so a run stuck longer than the threshold reports stuck and the monitor can restart it. Because the reported start is the oldest active run and advances to the next-oldest as runs complete, a channel churning through many short overlapping runs (activeRuns above 1 across concurrent queue keys) stays healthy; only a genuinely hung run breaches the ceiling. Short and active runs stay healthy and the existing lastRunActivityAt fallback is preserved for snapshots without a start time. * fix(channels): retain run-state callback compatibility Keep the released zero-argument onRunEnd callback source-compatible while allowing internal queue callers to pass a run handle for exact concurrent-run accounting. The compatibility path closes the oldest active run, preserving existing lifecycle behavior for consumers that do not use handles. * fix(channels): keep anonymous runs out of age tracking The zero-argument lifecycle callbacks cannot identify which concurrent run completed, so they must not update the identity-sensitive run start used by channel health. Keep their busy count separately and reserve exact start tracking for the shared queue's handle-aware lifecycle path. * fix(channels): keep tracked runs internal Keep the public run-state lifecycle callbacks unchanged. The channel queue now owns opaque run identity and augments its status updates with the oldest active queue run, so implementation details do not expand the SDK surface. * fix(channels): type queue run start status Keep activeRunStartedAt in the internal status patch type so the queue can publish its private tracked-run age through the existing status sink. * fix(channels): wrap isActive to satisfy unbound-method lint * fix(gateway): gate busy run-age ceiling on disconnected transport (cherry picked from commit 18b79d9) * fix(deps): update fast-uri past advisory (cherry picked from commit 1be9db0) * fix(release): adapt maintenance-line hardening Backport/adapt 18ec9ce, dea1fe1, 7f32b6c, 1da345e, 931ac3e, 89780d5, and c0d99ed for the 2026.6 extended-stable maintenance line. * fix(deps): bump protobufjs to 7.6.5 Backport-adapted from a230f74. * test(gateway): cover bounded macOS process probe * chore(release): prepare 2026.6.34 * test(dotenv): share path override environment assertions * fix(release): resolve 2026.6.34 CI blockers --------- Signed-off-by: sallyom <[email protected]> Co-authored-by: joshavant <[email protected]> Co-authored-by: Peter Lee <[email protected]> Co-authored-by: sallyom <[email protected]> Co-authored-by: openclaw-clownfish[bot] <280122609+openclaw-clownfish[bot]@users.noreply.github.com> Co-authored-by: Liu Wenyu <[email protected]> Co-authored-by: pick-cat <[email protected]> Co-authored-by: Pick-cat <[email protected]> Co-authored-by: Vincent Koc <[email protected]> Co-authored-by: weiqinl <[email protected]> Co-authored-by: Claude Opus 4.8 <[email protected]> Co-authored-by: shengting <[email protected]> Co-authored-by: Shengting Xie <[email protected]> Co-authored-by: yayu <[email protected]> Co-authored-by: Agustin Rivera <[email protected]> Co-authored-by: cxbAsDev <[email protected]> Co-authored-by: ooiuuii <[email protected]> Co-authored-by: Masato Hoshino <[email protected]> Co-authored-by: Vincent Koc <[email protected]> Co-authored-by: mushuiyu886 <[email protected]> Co-authored-by: Peter Steinberger <[email protected]> Co-authored-by: Bruno Wowk (Volky) <[email protected]> Co-authored-by: Pavan Kumar Gondhi <[email protected]> Co-authored-by: Glucksberg <[email protected]> Co-authored-by: xingzhou <[email protected]> Co-authored-by: tzy-17 <[email protected]> Co-authored-by: krissding <[email protected]> Co-authored-by: lsr911 <[email protected]> Co-authored-by: Yuval Dinodia <[email protected]>

fix(agent): wait for retained session write before releasing held loc…

3213604

…k on abort

openclaw-barnacle Bot added agents Agent runtime and tooling size: XS labels Jun 23, 2026

clawsweeper Bot mentioned this pull request Jun 23, 2026

Heap not released on embedded run abort (released=0); session write lock persists after abort cleanup #95915

Closed

clawsweeper Bot mentioned this pull request Jun 24, 2026

fix(agent): emit model.usage diagnostic for HTTP ingress traffic #96152

Merged

fix(agent): replace self-wait with deferred release in retained-lock …

c96d5a8

…abort cleanup

openclaw-barnacle Bot added size: S and removed size: XS labels Jun 24, 2026

xialonglee changed the title ~~fix(agent): wait for retained session write before releasing held lock on abort~~ fix(agent): replace self-wait with deferred release in retained-lock abort cleanup Jun 24, 2026

clawsweeper Bot added rating: 🦪 silver shellfish Thin PR readiness signal; proof, validation, or implementation needs work. and removed rating: 🧂 unranked krab Not merge-ready due to missing proof or serious correctness/safety concerns. labels Jun 24, 2026

fix(test): reject fallback acquire with SessionWriteLockTimeoutError …

cc37eda

…in active-scope cleanup test

clawsweeper Bot added status: 👀 ready for maintainer look ClawSweeper has no concrete contributor-facing blocker left for this PR. and removed status: 📣 needs proof The PR needs real behavior proof before ClawSweeper can clear the contributor ask. labels Jun 24, 2026

richwilson-bloom mentioned this pull request Jun 24, 2026

Subagent abort-settle fails to release .jsonl.lock, permanently breaking the session #95833

Closed

sallyom self-assigned this Jun 24, 2026

fix(agent): trim retained-lock comments

457aa1e

Signed-off-by: sallyom <[email protected]>

sallyom merged commit 0a042f6 into openclaw:main Jun 24, 2026
95 checks passed

xialonglee deleted the fix/issue-95915-session-lock-abort branch June 24, 2026 23:59

This was referenced Jun 25, 2026

fix: force-release session lock on dispose to prevent orphan locks #90419

Closed

fix: force-release session .jsonl.lock on dispose when retained-lock user is stuck #95854

Closed

Haderach-Ram mentioned this pull request Jun 25, 2026

Ecosystem Digest — 2026-06-25 Haderach-Ram/openclaw-radar#61

Open

github-actions Bot mentioned this pull request Jun 25, 2026

📡 Upstream Digest — 2026-06-25 02:33 UTC curtismercier/openclaw-mods#1149

Open

richwilson-bloom mentioned this pull request Jun 27, 2026

Production scaling: relaxing the single-writer session lock for multi-user deployments #96477

Open

clawsweeper Bot mentioned this pull request Jul 2, 2026

[Bug]: embedded abort settle timed out causes gateway deadlock after provider chain timeout — requires manual restart #98956

Open

tommygeoco mentioned this pull request Jul 2, 2026

fix(gateway,approvals): crash-safe hook agent dispatch + realpath-aware allowlist add #99254

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

fix(agent): replace self-wait with deferred release in retained-lock abort cleanup#96100

fix(agent): replace self-wait with deferred release in retained-lock abort cleanup#96100
sallyom merged 4 commits into
openclaw:mainfrom
xialonglee:fix/issue-95915-session-lock-abort

xialonglee commented Jun 23, 2026 •

edited

Loading

Uh oh!

xialonglee commented Jun 23, 2026

Uh oh!

clawsweeper Bot commented Jun 23, 2026 •

edited

Loading

Uh oh!

clawsweeper Bot commented Jun 23, 2026 •

edited

Loading

Uh oh!

xialonglee commented Jun 24, 2026

Uh oh!

xialonglee commented Jun 24, 2026

Uh oh!

clawsweeper Bot commented Jun 24, 2026 •

edited

Loading

Uh oh!

sallyom commented Jun 24, 2026

Uh oh!

sallyom commented Jun 24, 2026 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Uh oh!

Conversation

xialonglee commented Jun 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Root Cause

Summary

Verification

Real behavior proof

Uh oh!

xialonglee commented Jun 23, 2026

Uh oh!

clawsweeper Bot commented Jun 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

clawsweeper Bot commented Jun 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

xialonglee commented Jun 24, 2026

Uh oh!

xialonglee commented Jun 24, 2026

Uh oh!

clawsweeper Bot commented Jun 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

sallyom commented Jun 24, 2026

Uh oh!

sallyom commented Jun 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

xialonglee commented Jun 23, 2026 •

edited

Loading

clawsweeper Bot commented Jun 23, 2026 •

edited

Loading

clawsweeper Bot commented Jun 23, 2026 •

edited

Loading

clawsweeper Bot commented Jun 24, 2026 •

edited

Loading

sallyom commented Jun 24, 2026 •

edited

Loading