fix(android): filter device and internal sessions from thread picker by ly85206559 · Pull Request #99557 · openclaw/openclaw

ly85206559 · 2026-07-03T13:46:33Z

What Problem This Solves

Android's chat thread picker exposed transport/device and internal sessions such as agent:main:node-*, main aliases, and onboarding. Raw hidden sessions could also create a misleading All chip, while counting only recent visible sessions would hide All when valid older conversations existed.

Why This Change Was Made

Centralize selectable-session classification beside Android session-choice resolution, with the full iOS behavior table as parity coverage.
Filter before injecting the active session so a hidden current device session cannot reappear.
Derive the All affordance from undisplayed selectable sessions, not raw session count or only the 24-hour recent subset.
Preserve pinned main/current behavior and compact chips without adding parallel filtering paths.

User Impact

The picker now shows user-facing conversations only. Device, direct/internal, main-alias, and onboarding rows disappear; channel conversations remain selectable; and valid older sessions remain reachable through All.

Evidence

Exact head: 51a96cab192b560d9762d851e4728f97af705335

ANDROID_HOME=$HOME/Library/Android/sdk ./gradlew :app:testPlayDebugUnitTest --tests ai.openclaw.app.ui.chat.SessionFiltersTest :app:assemblePlayDebug
node --import tsx scripts/native-app-i18n.ts check
Fresh Codex autoreview after fixing its stale-session navigation finding: no actionable findings.
Android 16 emulator connected to an isolated real Gateway seeded with synthetic main, device, onboarding, and channel sessions.

Before	After

The screenshots contain synthetic session labels only. The candidate also removes the bogus All row caused solely by filtered internal sessions; focused tests preserve All when an undisplayed selectable conversation is stale or compacted.

clawsweeper · 2026-07-03T13:50:50Z

Codex review: needs maintainer review before merge. Reviewed July 3, 2026, 3:31 PM ET / 19:31 UTC.

Summary
The PR adds Android session-selection filtering and tests so chat thread chips hide device/internal/onboarding sessions while preserving selectable channel and stale conversations.

PR surface: Other +157. Total +157 across 4 files.

Reproducibility: yes. source-reproducible: seed Android chat sessions with main, agent device, onboarding, stale channel, and channel keys, then open the chat thread picker. Current main admits raw entries into choices, while the PR filters them and the inspected screenshots show the before/after UI result.

Review metrics: none identified.

Root-cause cluster
Relationship: canonical
Canonical: #99557
Summary: This PR is the focused canonical branch for the Android thread-picker session-filter slice split out of a broader closed umbrella PR.

Members:

partial_overlap: fix(android): session filters, talk config booleans, notification loop guard, IPv6 zone hosts #99548 - The closed unmerged umbrella PR included this same session-filter work plus unrelated Android fixes and was split into focused PRs.
adjacent_distinct: fix(android): parse string booleans in talk gateway config #99558 - This focused sibling came from the same umbrella PR but targets Talk config boolean parsing rather than session-picker filtering.
adjacent_distinct: fix(android): block self-package notification forwarding in allowlist mode #99559 - This focused sibling came from the same umbrella PR but targets notification forwarding policy rather than session-picker filtering.
adjacent_distinct: feat(android): Multiple nodes session context isolated from each other #53752 - The merged multi-node session PR introduced related node session key behavior, but it does not track this Android picker filtering fix.

Proposal only: this assessment does not dispatch repair, suppress jobs, mutate sibling items, close, or merge anything.

Merge readiness
Overall: 🐚 platinum hermit
Proof: 🦞 diamond lobster ✨ media proof bonus
Patch quality: 🐚 platinum hermit
Result: ready for maintainer review.

Overall follows the weaker of proof and patch quality, so missing proof can cap an otherwise strong patch.

Rank-up moves:

none.

Risk before merge

[P1] Required CI was still in progress and mergeability was unknown at live inspection after a recent force-push, so the normal required-check and mergeability gates still need to settle before merge.

Maintainer options:

Decide the mitigation before merge
Land the focused Android session-filter helper and tests after required checks and maintainer review clear; broader session-browser policy can stay separate if maintainers want it.
Pause or close
Do not merge this PR until maintainers decide whether the risk is worth taking.

Next step before merge

No automated repair is identified; the remaining action is maintainer review plus the normal required-check and mergeability gate.

Security
Cleared: No concrete security or supply-chain concern was found; the diff changes Android UI filtering helper code, tests, and native i18n line metadata only.

Review details

Best possible solution:

Land the focused Android session-filter helper and tests after required checks and maintainer review clear; broader session-browser policy can stay separate if maintainers want it.

Do we have a high-confidence way to reproduce the issue?

Yes, source-reproducible: seed Android chat sessions with main, agent device, onboarding, stale channel, and channel keys, then open the chat thread picker. Current main admits raw entries into choices, while the PR filters them and the inspected screenshots show the before/after UI result.

Is this the best way to solve the issue?

Yes. The shared SessionFilters classifier is the right layer because both Android picker call sites already flow through resolveSessionChoices, and it mirrors the existing iOS classifier instead of adding per-composable filtering policy.

AGENTS.md: found and applied where relevant.

Codex review notes: model internal, reasoning high; reviewed against 8cc1786f495a.

Label changes

Label justifications:

P2: This is a bounded Android thread-picker correctness fix with visible UI impact but limited blast radius and no runtime outage or security impact.
rating: 🐚 platinum hermit: Overall readiness is 🐚 platinum hermit; proof is 🦞 diamond lobster and patch quality is 🐚 platinum hermit.
status: 👀 ready for maintainer look: ClawSweeper has no concrete contributor-facing blocker left for this PR. Sufficient (screenshot): The PR body includes inspected before/after Android screenshots that directly show hidden device/onboarding chips disappearing while a channel chip remains, supplemented by focused Gradle test output.
proof: sufficient: Contributor real behavior proof is sufficient. The PR body includes inspected before/after Android screenshots that directly show hidden device/onboarding chips disappearing while a channel chip remains, supplemented by focused Gradle test output.
proof: 📸 screenshot: Contributor real behavior proof includes screenshot evidence. The PR body includes inspected before/after Android screenshots that directly show hidden device/onboarding chips disappearing while a channel chip remains, supplemented by focused Gradle test output.

Evidence reviewed

PR surface:

Other +157. Total +157 across 4 files.

View PR surface stats

Area	Files	Added	Removed	Net
Source	0	0	0	0
Tests	0	0	0	0
Docs	0	0	0	0
Config	0	0	0	0
Generated	0	0	0	0
Other	4	186	29	+157
Total	4	186	29	+157

What I checked:

Repository policy read: Read the full root AGENTS.md and scoped Android AGENTS.md; the review applied the whole-path PR review, proof, and Android scoped guidance, with no release/dependency policy issue for this UI/test-only patch. (AGENTS.md:1, 8cc1786f495a)
Current main lacks Android filtering: On current main, resolveSessionChoices only hides the legacy main alias, then accepts recent raw entries and appends the active session without checking whether it is a user-facing chat session. (apps/android/app/src/main/java/ai/openclaw/app/ui/chat/SessionFilters.kt:36, 8cc1786f495a)
Thread picker currently keys All from raw sessions: On current main, ChatSessionSwitcher derives its compact choices directly and shows All when raw session count exceeds displayed choices, which lets filtered-only internal rows create the affordance. (apps/android/app/src/main/java/ai/openclaw/app/ui/chat/ChatScreen.kt:273, 8cc1786f495a)
iOS sibling contract: The iOS command/session surfaces already reject default, onboarding, direct main/global/node, and direct agent-device sessions while keeping channel-style session keys, giving the Android change a concrete parity target. (apps/ios/Sources/Design/CommandCenterTab.swift:549, 8cc1786f495a)
PR implements shared Android filter: At PR head, isSelectableChatSession filters empty, main/default, onboarding, and direct device/main/global/node shapes before resolveSessionChoices adds recent or current-session entries. (apps/android/app/src/main/java/ai/openclaw/app/ui/chat/SessionFilters.kt:23, 51a96cab192b)
PR fixes All affordance decision: At PR head, ChatSessionSwitcher separates all filtered choices from compact displayed choices and uses hasAdditionalSessionChoices so hidden internal sessions alone do not create All, while stale selectable sessions still can. (apps/android/app/src/main/java/ai/openclaw/app/ui/chat/ChatScreen.kt:273, 51a96cab192b)

Likely related people:

joshavant: Commit 2ef0d27 added the iOS isRecentChatSession classifier and tests that this Android PR explicitly mirrors. (role: sibling invariant introducer; confidence: high; commits: 2ef0d274faad; files: apps/ios/Sources/Design/CommandCenterTab.swift, apps/ios/Tests/CommandCenterTabSessionFilterTests.swift)
lixuankai: Merged PR feat(android): Multiple nodes session context isolated from each other #53752 introduced Android node-specific session key behavior and buildNodeMainSessionKey, which is directly related to the node-* keys filtered here. (role: adjacent session-key behavior contributor; confidence: medium; commits: f0a57fad42e1; files: apps/android/app/src/main/java/ai/openclaw/app/SessionKey.kt)
christopheraaronhogg: Commit ab2761f recently changed the Android ChatScreen chat-reader path adjacent to the thread switcher, making this a useful Android chat UI routing signal. (role: recent Android chat contributor; confidence: medium; commits: ab2761f3a59a; files: apps/android/app/src/main/java/ai/openclaw/app/ui/chat/ChatScreen.kt)
steipete: The live PR is assigned to steipete, and the latest PR-head commits tighten the filter and stale-session handling, so this is the strongest immediate review route. (role: current follow-up owner; confidence: high; commits: f2045d05ae37, 8ccda32148c8, 51a96cab192b; files: apps/android/app/src/main/java/ai/openclaw/app/ui/chat/SessionFilters.kt, apps/android/app/src/main/java/ai/openclaw/app/ui/chat/ChatScreen.kt, apps/android/app/src/test/java/ai/openclaw/app/ui/chat/SessionFiltersTest.kt)

What the crustacean ranks mean

🦀 challenger crab: rare, exceptional readiness with strong proof, clean implementation, and convincing validation.
🦞 diamond lobster: very strong readiness with only minor maintainer review expected.
🐚 platinum hermit: good normal PR, likely mergeable with ordinary maintainer review.
🦐 gold shrimp: useful signal, but proof or patch confidence is still limited.
🦪 silver shellfish: thin signal; proof, validation, or implementation needs work.
🧂 unranked krab: not merge-ready because proof is missing/unusable or there are serious correctness or safety concerns.
🌊 off-meta tidepool: rating does not apply to this item.

Shiny media proof means a screenshot, video, or linked artifact directly shows the changed behavior. Runtime, network, CSP, and security claims still need visible diagnostics.

How this review workflow works

ClawSweeper keeps one durable marker-backed review comment per issue or PR.
Re-runs edit this comment so the latest verdict, findings, and automation markers stay together instead of adding duplicate bot comments.
A fresh review can be triggered by eligible @clawsweeper re-review comments, exact-item GitHub events, scheduled/background review runs, or manual workflow dispatch.
PR/issue authors and users with repository write access can comment @clawsweeper re-review or @clawsweeper re-run on an open PR or issue to request a fresh review only.
Maintainers can also comment @clawsweeper review to request a fresh review only.
Fresh-review commands do not start repair, autofix, rebase, CI repair, or automerge.
Maintainer-only repair and merge flows require explicit commands such as @clawsweeper autofix, @clawsweeper automerge, @clawsweeper fix ci, or @clawsweeper address review.
Maintainers can comment @clawsweeper explain to ask for more context, or @clawsweeper stop to stop active automation.

ly85206559 · 2026-07-03T14:31:09Z

Local proof (Windows)

Environment

Host: CONAN (Windows)
Branch HEAD: 48222962a9
JAVA_HOME: F:\Program Files\Android\Android Studio\jbr
ANDROID_HOME / ANDROID_SDK_ROOT: F:\Android\Sdk
GRADLE_USER_HOME: F:\Android\Sdk\.gradle

Command

cd d:\WorkSpace\AI\openclaw\.worktrees\android-session-filters-parity\apps\android
.\gradlew.bat :app:testPlayDebugUnitTest --tests ai.openclaw.app.ui.chat.SessionFiltersTest

Result: BUILD SUCCESSFUL in 9m 27s (first Gradle/SDK warmup on this machine)

JUnit (SessionFiltersTest): 5 tests, 0 failures, 0 errors

sessionChoicesPreferMainAndRecent
sessionChoicesIncludeCurrentWhenMissing
compactChoicesKeepMainAndCurrentWhileCappingRecentSessions
sessionChoicesFilterAgentDeviceAndInternalSessions
isSelectableChatSession_matchesIosRecentSessionFilter

ly85206559 · 2026-07-03T14:43:17Z

@clawsweeper re-review

Updated PR body Evidence with local Windows Gradle proof (5/5 SessionFiltersTest, BUILD SUCCESSFUL). No code changes since last review — patch quality feedback accepted; UI screenshot proof is not included (unit tests cover the shared picker helper).

clawsweeper · 2026-07-03T14:43:19Z

🦞🧹
ClawSweeper re-review requested.

I asked ClawSweeper to review this item again.
Action: item re-review queued (workflow sweep.yml, event repository_dispatch).
Result: the existing ClawSweeper review comment will be edited in place when the review finishes.

Align SessionFilters with iOS isRecentChatSession so agent device sessions, internal main aliases, and onboarding keys do not appear in recent choices. Co-authored-by: Cursor <[email protected]>

steipete · 2026-07-03T19:34:45Z

Land-ready maintainer proof for exact head 51a96cab192b560d9762d851e4728f97af705335:

Rebased and rewrote the base around one canonical Android session classifier matching the iOS behavior table.
Hidden active device sessions can no longer be injected back into the picker; channel conversations remain; All is absent for raw hidden-only sessions but retained for stale or compacted selectable conversations.
SessionFiltersTest, :app:assemblePlayDebug, and native i18n inventory check pass.
Fresh Codex autoreview initially found stale-session navigation loss; that was fixed, retested, and the final review has no actionable findings.
Exact-head CI is green: https://github.com/openclaw/openclaw/actions/runs/28679749424
Android 16 before/after used an isolated real Gateway seeded only with synthetic Main, Device Node Proof, Onboarding Proof, and Channel Proof sessions.

Before	After

No known proof gap remains for the picker behavior.

steipete · 2026-07-03T19:35:08Z

Merged via squash.

Prepared head SHA: 51a96cab192b560d9762d851e4728f97af705335
Landed commit: 57d0747185ac714f17bc4401df3e14774a3a7984

…penclaw#99557) * fix(android): filter device and internal sessions from thread picker Align SessionFilters with iOS isRecentChatSession so agent device sessions, internal main aliases, and onboarding keys do not appear in recent choices. Co-authored-by: Cursor <[email protected]> * fix(android): tighten chat session filtering * fix(android): preserve access to stale chat sessions * chore(android): sync native i18n inventory --------- Co-authored-by: Cursor <[email protected]> Co-authored-by: Peter Steinberger <[email protected]>

openclaw-barnacle Bot added app: android App: android size: S labels Jul 3, 2026

ly85206559 mentioned this pull request Jul 3, 2026

fix(android): session filters, talk config booleans, notification loop guard, IPv6 zone hosts #99548

Closed

This was referenced Jul 3, 2026

fix(android): parse string booleans in talk gateway config #99558

Closed

fix(android): block self-package notification forwarding in allowlist mode #99559

Closed

steipete self-assigned this Jul 3, 2026

steipete force-pushed the fix/android-session-filters-ios-parity branch from 4822296 to 8795a89 Compare July 3, 2026 19:16

ly85206559 and others added 4 commits July 3, 2026 20:26

fix(android): filter device and internal sessions from thread picker

73ae217

Align SessionFilters with iOS isRecentChatSession so agent device sessions, internal main aliases, and onboarding keys do not appear in recent choices. Co-authored-by: Cursor <[email protected]>

fix(android): tighten chat session filtering

f2045d0

fix(android): preserve access to stale chat sessions

8ccda32

chore(android): sync native i18n inventory

51a96ca

steipete force-pushed the fix/android-session-filters-ios-parity branch from 8795a89 to 51a96ca Compare July 3, 2026 19:26

openclaw-barnacle Bot added size: M and removed size: S labels Jul 3, 2026

steipete merged commit 57d0747 into openclaw:main Jul 3, 2026
86 of 87 checks passed

clawsweeper Bot mentioned this pull request Jul 3, 2026

[AI-assisted] feat(android): add chat command controls #98796

Merged

github-actions Bot mentioned this pull request Jul 3, 2026

📡 Upstream Digest — 2026-07-03 20:54 UTC curtismercier/openclaw-mods#1199

Open

ly85206559 deleted the fix/android-session-filters-ios-parity branch July 6, 2026 07:29

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

fix(android): filter device and internal sessions from thread picker#99557

fix(android): filter device and internal sessions from thread picker#99557
steipete merged 4 commits into
openclaw:mainfrom
ly85206559:fix/android-session-filters-ios-parity

ly85206559 commented Jul 3, 2026 •

edited by steipete

Loading

Uh oh!

clawsweeper Bot commented Jul 3, 2026 •

edited

Loading

Uh oh!

ly85206559 commented Jul 3, 2026

Uh oh!

ly85206559 commented Jul 3, 2026

Uh oh!

clawsweeper Bot commented Jul 3, 2026 •

edited

Loading

Uh oh!

steipete commented Jul 3, 2026

Uh oh!

Uh oh!

steipete commented Jul 3, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Uh oh!

Conversation

ly85206559 commented Jul 3, 2026 • edited by steipete Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What Problem This Solves

Why This Change Was Made

User Impact

Evidence

Uh oh!

clawsweeper Bot commented Jul 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ly85206559 commented Jul 3, 2026

Local proof (Windows)

Uh oh!

ly85206559 commented Jul 3, 2026

Uh oh!

clawsweeper Bot commented Jul 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

steipete commented Jul 3, 2026

Uh oh!

Uh oh!

steipete commented Jul 3, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

ly85206559 commented Jul 3, 2026 •

edited by steipete

Loading

clawsweeper Bot commented Jul 3, 2026 •

edited

Loading

clawsweeper Bot commented Jul 3, 2026 •

edited

Loading