[TheGreatAxios]

Summary

• Two concurrent shell_collect calls share one callIdByName slot; when the mapping-owning sibling resolves first and clears it, the leftover earlier collect lost its name and pinned the turn with no wall-clock bound.
• Track the tool name per call id (callNameById) in register/unregister and consult it in isStallBoundedInFlightTool, so the leftover still aborts at the stall budget.

Verification

• New regression tests: concurrent collects with the mapping owner done first still abort at the stall budget (stall-watchdog.test.ts), per-id tracking across owner-done-first (turn-state.test.ts), plus a negative for ordinary leftover tools.
• bun test src/tui/stall-watchdog.test.ts src/tui/turn-state.test.ts: 69 pass, 0 fail.
• bun run typecheck, bun run lint, bun run check:dead-exports, bun run build: all green.
• bun run check (includes full suite via projects-dir guard): exit 0, 7758 pass, 0 fail.

Fixes CL-8059

[linear-code]

CL-8059

[TheGreatAxios]

Review

Approve with follow-through.

Dual maps are the right architecture: callIdByName owns name-only collapse; callNameById owns per-id stall names. Do not replace the collapse map.

Make ShouldAbortForStallArgs.callNameById required (no ?? {}). The leftover hole reopens if a caller copies the old fixture shape. Update docs that still describe concurrent same-name collect losing the stall bound.

Will patch on the branch.