Skip to content

fix(android): keep a task's terminal streaming while another screen shows it #311

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
johannesjo merged 1 commit into from
Oct 11, 2026
Merged

fix(android): keep a task's terminal streaming while another screen shows it #311

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions android/app/src/main/java/com/parallelcode/phone/RemoteClient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,8 @@ class RemoteClient(
private var handshakeJob: Job? = null
private val terminalBuffers = mutableMapOf<String, TerminalBuffer>()
private val subscribedAgents = mutableSetOf<String>()
/** Screens showing each agent's terminal; it streams until the last one lets go. */
private val terminalWatchers = mutableMapOf<String, Int>()
private val chats = mutableMapOf<String, MutableStateFlow<ChatState?>>()
private val chatWatchers = mutableMapOf<String, Int>()
/** The agent whose PTY takes this phone's terminal size, and that size (see [setViewSize]). */
Expand Down Expand Up @@ -539,16 +541,29 @@ class RemoteClient(
/**
* Stream an agent's terminal while it is on screen. Only viewed terminals stream: opening one
* starts from the desktop's rendered snapshot, so nothing needs buffering in the background.
* Pair with [releaseTerminal].
* Pair each call with [releaseTerminal]: two screens can show one terminal at once (a task
* reopened while its last screen still animates out, the pager taking over from a lone task),
* and the screen leaving last must not drop the buffer the other one is drawing.
*/
fun getTerminalBuffer(agentId: String): TerminalBuffer {
terminalWatchers[agentId] = (terminalWatchers[agentId] ?: 0) + 1

@chatgpt-codex-connector chatgpt-codex-connector Bot Oct 11, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Register watcher ownership only after composition commits

When Compose abandons or retries a composition after the remember initializer calls this method but before its DisposableEffect is committed, this increment has no matching releaseTerminal. A subsequent committed composition increments again, so disposing its screen only decrements the count to one and permanently retains the buffer and WebSocket subscription. Register the watcher from a committed effect, or return an idempotent lease whose cleanup is tied to that effect.

Useful? React with 👍 / 👎.

return streamTerminal(agentId)
}

private fun streamTerminal(agentId: String): TerminalBuffer {
val buffer = terminalBuffers.getOrPut(agentId) { TerminalBuffer(agentId) }
subscribeAgent(agentId)
return buffer
}

/** Stop streaming a terminal that left the screen. */
/** Stop streaming a terminal once no screen shows it. */
fun releaseTerminal(agentId: String) {
val watchers = (terminalWatchers[agentId] ?: 0) - 1
if (watchers > 0) {
terminalWatchers[agentId] = watchers
return
}
terminalWatchers.remove(agentId)
terminalBuffers.remove(agentId)
if (subscribedAgents.remove(agentId) && socketOpen) {
send(JSONObject().put("type", "unsubscribe").put("agentId", agentId))
Expand Down Expand Up @@ -627,7 +642,7 @@ class RemoteClient(

/** Stream an agent's terminal. Retained for backwards compatibility. */
fun watchTerminal(agentId: String, listener: TerminalListener): () -> Unit {
getTerminalBuffer(agentId)
streamTerminal(agentId)
val listeners = terminalListeners.getOrPut(agentId) { mutableSetOf() }
listeners.add(listener)
return {
Expand Down Expand Up @@ -810,7 +825,7 @@ class RemoteClient(
list.map { if (it.agentId == msg.agentId) it.copy(running = msg.running, exitCode = msg.exitCode) else it }
}
if (msg.running) {
getTerminalBuffer(msg.agentId)
streamTerminal(msg.agentId)
}
}
is ServerMessage.Scrollback -> {
Expand Down
Loading