1 commit

Author	SHA1	Message	Date
teknium1	ab08e8fc76	refactor(gateway): consolidate 19 session-keyed dicts into SessionState (turn/conversation/persistent scopes; eliminates wholesale-reset races) ... GatewayRunner carried ~19 separate Dict[str, ...] attributes keyed by session_key, each with an ad-hoc lifecycle. They now live in one `self._sessions: dict[str, SessionState]` (gateway/session_state.py) with three lifecycle scopes and a `_session_state(key)` get-or-create accessor. Mechanical refactor: same state, same semantics, new container. Migration table (dict -> old decl line -> current clear path -> new home): | legacy dict | decl | cleared by (before) | SessionState field | |------------------------------------------|-------|--------------------------------------------------|----------------------------------------| | _running_agents | 3505 | _release_running_agent_state; stop() .clear() | turn.agent | | _running_agents_ts | 3506 | same | turn.started_ts | | _active_session_leases | 3507 | same (+ lease.release()) | turn.lease | | _busy_ack_ts | 3539 | same | turn.busy_ack_ts | | _turn_lease_tokens ((key, gen)-keyed) | 3518 | _release_turn_lease (generation-guarded) | turn.lease_token + turn.lease_generation | | _session_model_overrides | 3585 | _CONVERSATION_SCOPED_STATE funnel | conversation.model_override | | _pending_one_turn_model_restores | 3586 | funnel; one-shot pop in turn finally | conversation.one_turn_restore | | _session_reasoning_overrides | 3589 | funnel; lazy-init dict swap ~5692 (RACE) | conversation.reasoning_override | | _session_service_tier_overrides | 3592 | funnel; lazy-init dict swap ~5738 (RACE) | conversation.service_tier_override | | _last_resolved_model ("*" = process-wide)| 3527 | funnel | conversation.last_resolved_model | | _queued_events | 3537 | funnel; lazy-init dict swap ~5204 (RACE) | conversation.queued_events | | _pending_turn_sidecar_notes | 3597 | funnel; lazy-init dict swap ~19832 (RACE) | conversation.sidecar_notes | | _session_ephemeral_pin | 3601 | agent-cache evict pop; lazy swap ~19885 (RACE) | conversation.ephemeral_pin | | _session_vc_last | 3604 | agent-cache evict pop; lazy swap ~19864 (RACE) | conversation.vc_last | | _pending_approvals | 3611 | boundary security funnel; stop() .clear() | persistent.approvals | | _update_prompt_pending | 3623 | security funnel; update watcher pops | persistent.update_prompt_pending | | _pending_native_image_paths_by_session | 3538 | one-shot consume; lazy swap ~12944 (RACE) | persistent.native_image_paths | | _pending_messages (runner-level, str) | 3519 | _interrupt_and_clear_session pop; stop() flush | persistent.pending_command_text | | _session_run_generation | 3540 | NEVER (monotonic, #28686) | persistent.run_generation (never reset)| Races eliminated: every `self._X = {}` lazy-init/reset replaced the WHOLE dict, so a writer on session A racing a lazy init triggered by session B could lose its entry. All six such sites (_session_reasoning_overrides ~5692, _session_service_tier_overrides ~5738, _queued_events ~5204, _pending_turn_sidecar_notes ~19832, _session_ephemeral_pin ~19885, _session_vc_last ~19864, _pending_native_image_paths_by_session ~12944, _turn_lease_tokens ~13644) are now per-session field writes on an existing SessionState; a reset can no longer cross sessions structurally. Registry successors: - _release_running_agent_state -> state.turn.clear() (one structured reset instead of the drifting pop-list; still pops the slot lease and calls lease.release() first; still generation-guarded). - _CONVERSATION_SCOPED_STATE funnel -> state.conversation.clear(); the tuple is retained for legacy plain-dict stores not yet folded in (_pending_model_notes) and for the public test contract. - _turn_lease_tokens' (key, generation) tuple key -> lease_token + lease_generation fields; release/rebind only match when the generation is current, preserving the #28686/#64934 ownership check. - _session_run_generation stays monotonic on persistent.run_generation and is never cleared (conversation boundaries and turn releases don't touch it). Compatibility adapters: tests (and a few mixin call sites) access the old dict names directly (137 direct assignments to _running_agents alone), so each legacy name is kept as a thin @property returning a live MutableMapping view over the corresponding SessionState field (legacy_dict_property / legacy_lease_token_property in session_state.py). Setter accepts a plain dict (the `runner._X = {...}` test pattern); views support ==, in, len, .get/.pop/.clear. The shutdown path in _stop_impl deliberately keeps duck-typed legacy-attribute access because test fakes borrow it with plain dicts. Name collision noted (NOT touched, out of scope): gateway/platforms/base.py has its own _pending_messages Dict[str, MessageEvent] (adapter-level slot); the runner-level Dict[str, str] of the same name is what moved to persistent.pending_command_text. Entry leaks preserved (follow-up, no new eviction in this PR): SessionState entries in self._sessions are never evicted, matching the old dicts — e.g. _last_resolved_model, _session_run_generation, _session_vc_last entries for dead sessions leaked before and their fields still occupy a SessionState now. Verification: 123 tests/gateway files referencing the old names + _release_running_agent_state + _CONVERSATION_SCOPED_STATE all pass (sole failure test_feishu.py::test_websocket_sdk_accepts_channel_ua_tag is pre-existing, stash-verified); 8 non-gateway test files touching the names pass (266 tests); `import gateway.run` subprocess smoke OK; ruff clean; post-migration grep shows zero non-comment `self._<oldname>` references in run.py outside the property adapters and the duck-typed shutdown block.	2026-07-29 12:11:15 -07:00