8644ff98a3
Both sides are reviewed work and both are kept: - android/app/.../ui/AppViewModel.kt: HEAD's live-run push wiring (RunStreamState/_runStream, combine(connectionState, settings.workspace), subscribeRuns/streamDown/resync, applyRunEvent, scheduleRunsResync/ scheduleRunDetailSync, observeRunEvents) together with lane-chat2's chat management (ChatStore overrides, observeChatOverrides, refreshChatDirectories, startNewChat/selectChatDirectory/cancelNewChat/createNewChat, renameChat/removeChat/undoRemoveChat). The only textual conflict was the import list; combine (HEAD) plus map and ui.chat.ChatSessionOverrides (lane) are all kept and all used. No duplicated definitions. - android/README.md: HEAD's "Live run updates from the socket" section and lane-chat2's "Operator chat sessions: choose the directory, list only your own" section are both present once, in file order. - The rest of lane-chat2's chat files (ChatDirectories.kt, ChatOverrides.kt, ChatStore.kt, ChatScreen.kt, ChatFormat.kt, protocol Chat/Message, repositories, tests) merge cleanly on top of HEAD's work. Documentation check: android/README.md is updated by this merge and its new section is consistent with HEAD's. docs/cli.md and internal/author/skill/references/operations.md already describe the server's chat_sessions/chat_create/chat_directories surface this client builds on, and the authoring skill (SKILL.md, references/) contains no Android-client behaviour to stale, so nothing there needed changing and no packaged reference or inventory entry was touched. No server, installer or template change is part of this merge. Checks (android/, Gradle 8.11.1, --offline): - gradle :app:testDebugUnitTest --offline --rerun-tasks -> BUILD SUCCESSFUL; test-results report 463 tests, 0 failures, 0 errors across 50 suites (including ChatDirectoriesTest and ChatSessionManagementTest). - gradle :app:assembleDebug --offline -> BUILD SUCCESSFUL (debug APK built). Not verified here: on-device picker/rendering, which the visual-review stage owns.