openclaw - 💡(How to fix) Fix [Bug]: Chat session picker shows sessions from other agents [2 pull requests]

Bug type

Behavior bug (incorrect output/state without crash)

Beta release blocker

No

Summary

The Control UI chat session picker can display sessions from every configured agent instead of limiting the popover to the active agent.

Steps to reproduce

1. Run OpenClaw 2026.5.22 with multiple configured agents and session rows for more than one agent.
2. Open the Control UI chat view.
3. Open the chat session picker, or search from that picker.
4. Observe sessions from other agents and operational sessions mixed into the chat picker.

Expected behavior

The chat session picker should show only sessions relevant to the active chat agent and keep the existing hidden cron/subagent behavior used by the grouped session selector.

Actual behavior

The picker request does not include the active agentId, and the popover renders the raw sessions.list response, so cross-agent rows can appear in the chat session picker.

OpenClaw version

OpenClaw 2026.5.22 (a374c3a)

Operating system

macOS 15.x

Install method

npm/global package install

Model

openai/gpt-5.5

Provider / routing chain

Control UI -> local OpenClaw gateway -> sessions.list

Additional provider/model setup details

The visible issue is independent of model execution. It was observed while the active session used OpenAI model settings with a separate Codex auth profile.

Logs, screenshots, and evidence

The affected code path builds chat picker search/load-more params without agentId and renders result.sessions directly in the picker popover.

Impact and severity

Affected: Control UI users with multiple configured agents or service sessions. Severity: Medium UX/data-scope bug. Frequency: Any multi-agent session registry where the picker loads unscoped results. Consequence: Users can see unrelated agent/service sessions in the chat picker and switch lanes accidentally.

Additional information

A focused fix should scope picker sessions.list calls to the active agent and render the popover through the same session option filtering used by the grouped session selector.