Ayuriel/openclaw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: clear active embedded run before flush to stay within waiter timeout budget

Browse Source 
Addresses PR review comments:
- Move clearActiveEmbeddedRun before flushPendingToolResultsAfterIdle so
  waitForEmbeddedPiRunEnd resolves within the 15s budget used by
  session-reset-service.ts and commands-compact.ts (flush can take up to 30s)
- queueHandle guard (if check) prevents issues when uninitialized
- runCleanupSteps already wraps each step in try/catch, so flush failures
  cannot prevent the clear from running (and vice versa)
This commit is contained in:
Joey Krug 2026-03-14 23:46:30 -04:00
parent 37522cc01c
commit ca766f4e3e
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/agents/pi-embedded-runner/run/attempt.ts
View File

@ -3227,6 +3227,23 @@ export async function runEmbeddedAttempt(
removeToolResultContextGuard?.();
},
},
{
// Clear embedded run BEFORE flushing pending tool results so that
// waitForEmbeddedPiRunEnd resolves promptly. The flush can take up to 30s
// (idle-wait timeout in wait-for-idle-before-flush.ts), but several callers
// only wait 15s (session-reset-service.ts, commands-compact.ts). Clearing
// first ensures the run is marked ended within the waiter timeout budget.
//
// This is safe because runCleanupSteps executes each step in an isolated
// try/catch — if this step throws (e.g. queueHandle is somehow invalid),
// the flush and remaining teardown still proceed.
label: "active embedded run clear",
run: () => {
if (queueHandle) {
clearActiveEmbeddedRun(params.sessionId, queueHandle, params.sessionKey);
}
},
},
{
label: "pending tool result flush",
run: () =>
@ -3236,19 +3253,6 @@ export async function runEmbeddedAttempt(
clearPendingOnTimeout: true,
}),
},
{
// Clear embedded run AFTER flushing pending tool results so that all concurrent
// tool executions (e.g. sessions_spawn) complete before the run is considered ended.
// This prevents premature announce when sessions_yield runs in parallel with
// sessions_spawn — the announce flow's waitForEmbeddedPiRunEnd won't resolve
// until spawn registrations are committed to the subagent registry.
label: "active embedded run clear",
run: () => {
if (queueHandle) {
clearActiveEmbeddedRun(params.sessionId, queueHandle, params.sessionKey);
}
},
},
{
label: "session dispose",
run: () => {