Summary

• Refactors subagent session-store terminal reconciliation into a shared helper used by both live wait handling and registry sweeps.
• Keeps parent subagent runs active when agent.wait returns a plain poll timeout before the child session settles, then retries/reconciles the later completion.
• Guards session-store reconciliation with run freshness so stale terminal rows from reused/reactivated child sessions cannot complete a newer run.

Fixes #82787.

Verification

• CodexReview: clean, no accepted/actionable findings reported.
• pnpm test src/agents/subagent-registry.test.ts src/agents/subagent-registry.lifecycle-retry-grace.e2e.test.ts src/agents/openclaw-tools.subagents.sessions-spawn.lifecycle.test.ts -- --reporter=dot
• git diff --check
• pnpm check:changed
• Testbox: provider=blacksmith-testbox id=tbx_01krt1rxpkb7vj53mkaqwfserq exit=0

Real behavior proof

Behavior addressed: parent subagent waiters no longer record a terminal timeout when agent.wait only hit its poll timeout and the child session is still running.
Real environment tested: local OpenClaw checkout plus Blacksmith Testbox changed-check environment for the touched runtime surface.
Exact steps or command run after this patch: focused subagent registry/session-spawn Vitest command, CodexReview, git diff --check, and pnpm check:changed in Testbox tbx_01krt1rxpkb7vj53mkaqwfserq.
Evidence after fix: terminal output from the rebased focused run and remote Testbox run:

[test] passed 2 Vitest shards in 10.42s
blacksmith run summary sync=delegated command=1m52.657s total=1m55.545s exit=0
provider=blacksmith-testbox leaseId=tbx_01krt1rxpkb7vj53mkaqwfserq
Import cycle check: 0 runtime value cycle(s).
Found 0 warnings and 0 errors.

Observed result after fix: the unsettled child-session timeout, terminal wait timeout, stale terminal row rejection, and terminal session-store reconciliation regressions pass; changed-check completed with exit 0 in Testbox.
What was not tested: live Discord/Telegram provider roundtrip with a real delayed subagent; covered with registry/session-spawn e2e simulation and Testbox checks instead.