From 6c8eda9f47b6a304c5da522c7ed8858df185c873 Mon Sep 17 00:00:00 2001 From: Alan Silva Date: Sun, 18 Oct 2026 21:54:22 +0100 Subject: [PATCH] fix android shell output wire defaults --- .../java/net/awan/pipelines/data/protocol/Chat.kt | 5 +++++ .../awan/pipelines/data/protocol/ChatProtocolTest.kt | 8 ++++++++ docs/notes/shell-output-default-wire-fields.md | 11 +++++++++++ 3 files changed, 24 insertions(+) create mode 100644 docs/notes/shell-output-default-wire-fields.md diff --git a/android/app/src/main/java/net/awan/pipelines/data/protocol/Chat.kt b/android/app/src/main/java/net/awan/pipelines/data/protocol/Chat.kt index 47e3fcfd..560e765b 100644 --- a/android/app/src/main/java/net/awan/pipelines/data/protocol/Chat.kt +++ b/android/app/src/main/java/net/awan/pipelines/data/protocol/Chat.kt @@ -2,6 +2,8 @@ package net.awan.pipelines.data.protocol import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable +import kotlinx.serialization.EncodeDefault +import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.json.JsonElement import kotlinx.serialization.json.JsonObject @@ -202,10 +204,13 @@ data class ChatShell( ) @Serializable +@OptIn(ExperimentalSerializationApi::class) data class ChatShellOutputQuery( @SerialName("session_id") val sessionId: String = "", @SerialName("shell_id") val shellId: String = "", + @EncodeDefault(EncodeDefault.Mode.ALWAYS) val cursor: Long = 0, + @EncodeDefault(EncodeDefault.Mode.ALWAYS) val limit: Int = ChatProtocol.SHELL_OUTPUT_LIMIT, ) diff --git a/android/app/src/test/java/net/awan/pipelines/data/protocol/ChatProtocolTest.kt b/android/app/src/test/java/net/awan/pipelines/data/protocol/ChatProtocolTest.kt index fa170210..ff1e11e0 100644 --- a/android/app/src/test/java/net/awan/pipelines/data/protocol/ChatProtocolTest.kt +++ b/android/app/src/test/java/net/awan/pipelines/data/protocol/ChatProtocolTest.kt @@ -407,6 +407,14 @@ class ChatProtocolTest { @Test fun shellOutputRequestAndPageUseBoundedWireNames() { + val defaults = ChatProtocol.shellOutputRequest("ses_1", "sh_1") + val defaultJson = PipelinesJson.encodeToString(Message.serializer(), defaults) + assertTrue(defaultJson.contains("\"cursor\":0")) + assertTrue(defaultJson.contains("\"limit\":65536")) + val decodedDefaults = PipelinesJson.decodeFromString(Message.serializer(), defaultJson) + assertEquals(0L, decodedDefaults.chatShellOutputQuery!!.cursor) + assertEquals(ChatProtocol.SHELL_OUTPUT_LIMIT, decodedDefaults.chatShellOutputQuery!!.limit) + val request = ChatProtocol.shellOutputRequest("ses_1", "sh_1", 7, 128) val decoded = PipelinesJson.decodeFromString(Message.serializer(), PipelinesJson.encodeToString(Message.serializer(), request)) assertEquals(Protocol.CHAT_SHELL_OUTPUT, decoded.type) diff --git a/docs/notes/shell-output-default-wire-fields.md b/docs/notes/shell-output-default-wire-fields.md new file mode 100644 index 00000000..8025d5bc --- /dev/null +++ b/docs/notes/shell-output-default-wire-fields.md @@ -0,0 +1,11 @@ +# Shell output default wire fields + +The Android shell-output query now always serializes its bounded `cursor` and +`limit` fields, including when callers use the request helper defaults. The +server requires both bounds explicitly; unrelated protocol DTO defaults remain +unchanged. + +The packaged OpenCode skill references and any shared protocol documentation +that describe Android shell-output request serialization are stale. The +manual-only `docs-fold` pipeline should update those references; this item does +not edit shared docs or packaged skill files.