openclaw - 💡(How to fix) Fix [Bug]: Duplicate embedded-run clear emits handle mismatch noise [2 pull requests]

Bug type

Behavior bug (incorrect output/state without crash)

Beta release blocker

No

Summary

Embedded runner cleanup can clear the same run twice, causing repeated run clear skipped / reason=handle_mismatch diagnostic noise after terminal lifecycle cleanup.

Steps to reproduce

1. Run an embedded PI agent turn that reaches terminal lifecycle cleanup.
2. Observe the terminal lifecycle path clear the active embedded run before emitting terminal lifecycle events.
3. Observe the attempt finally path clear the same run handle again.
4. Inspect gateway diagnostics for run clear skipped with reason=handle_mismatch.

Expected behavior

Once terminal lifecycle cleanup has cleared the active embedded run, the later same-handle finally cleanup should be idempotent and should not emit a handle-mismatch diagnostic. A mismatch should still be logged when another active run owns the same session.

Actual behavior

The duplicate same-handle clear reaches clearActiveEmbeddedRun after the active map entry has already been removed, so the missing entry is reported as reason=handle_mismatch. Local evidence recorded 265 matching run clear skipped lines, correlated with no_active_run and lane-wait traces.

OpenClaw version

Current origin/main at 16ef041b5d865c3049020e4cfdd86136c264599f.

Operating system

NOT_ENOUGH_INFO

Install method

pnpm dev

Model

NOT_ENOUGH_INFO

Provider / routing chain

NOT_ENOUGH_INFO

Additional provider/model setup details

NOT_ENOUGH_INFO

Logs, screenshots, and evidence

Trace/proof:
- gateway-dev.log:280
  "run clear skipped: sessionId=[redacted session id] reason=handle_mismatch"
- gateway-dev.log:30372
  "run clear skipped: sessionId=[redacted session id] reason=handle_mismatch"
  traceId=[redacted trace id] spanId=[redacted span id]

Relevant current code paths:

• src/agents/pi-embedded-runner/run/attempt.ts clears before terminal lifecycle events.
• src/agents/pi-embedded-runner/run/attempt.ts clears again in finally.
• src/agents/pi-embedded-runner/runs.ts logs reason=handle_mismatch when the active handle does not match.

Impact and severity

Affected: embedded PI agent run lifecycle diagnostics.

Severity: Medium; this appears potentially harmless at runtime but produces misleading handle-mismatch noise and can obscure true lifecycle races during debugging.

Frequency: Local evidence recorded 265 matching log lines.

Consequence: Duplicate cleanup looks like an unexpected handle race even when the same completed run is being cleared a second time.

Additional information

The fix should keep real stale-handle replacement diagnostics intact: if a session still has an active handle and the caller clears a different handle, reason=handle_mismatch should still be logged.