WIP: preserve remaining background task output work
This commit is contained in:
@@ -13,6 +13,8 @@ import net.awan.pipelines.data.protocol.ChatPromptRequest
|
||||
import net.awan.pipelines.data.protocol.ChatProtocol
|
||||
import net.awan.pipelines.data.protocol.ChatQuery
|
||||
import net.awan.pipelines.data.protocol.ChatSession
|
||||
import net.awan.pipelines.data.protocol.ChatShellOutputPage
|
||||
import net.awan.pipelines.data.protocol.ChatShell
|
||||
import net.awan.pipelines.data.protocol.Message
|
||||
import net.awan.pipelines.data.protocol.Graph
|
||||
import net.awan.pipelines.data.protocol.PipelineDetail
|
||||
@@ -312,6 +314,22 @@ class PipelinesRepository(
|
||||
return response.chatHistory ?: ChatHistoryPage(messages = response.chatMessages ?: emptyList())
|
||||
}
|
||||
|
||||
/** Reads one bounded page from a verified, currently observable shell. */
|
||||
suspend fun chatShellOutput(sessionId: String, shellId: String, cursor: Long = 0, limit: Int = ChatProtocol.SHELL_OUTPUT_LIMIT): ChatShellOutputPage {
|
||||
if (sessionId.isBlank() || shellId.isBlank()) throw ProtocolException("Select a shell first.")
|
||||
if (cursor < 0 || limit <= 0 || limit > ChatProtocol.SHELL_OUTPUT_LIMIT) {
|
||||
throw ProtocolException("Shell output bounds are invalid.")
|
||||
}
|
||||
return client.call(ChatProtocol.shellOutputRequest(sessionId, shellId, cursor, limit)).chatShellOutput
|
||||
?: throw ProtocolException("The server returned no shell output page.")
|
||||
}
|
||||
|
||||
/** Lists currently observed shells owned by this operator chat session. */
|
||||
suspend fun chatShells(sessionId: String): List<ChatShell> {
|
||||
if (sessionId.isBlank()) throw ProtocolException("Select a chat session first.")
|
||||
return client.call(ChatProtocol.shellsRequest(sessionId)).chatShells ?: emptyList()
|
||||
}
|
||||
|
||||
/**
|
||||
* Attaches this connection to [sessionId]'s shared live stream, so it sees
|
||||
* every frame any client's turn produces — the other devices' prompts and the
|
||||
|
||||
@@ -201,6 +201,24 @@ data class ChatShell(
|
||||
val exit: Int? = null,
|
||||
)
|
||||
|
||||
@Serializable
|
||||
data class ChatShellOutputQuery(
|
||||
@SerialName("session_id") val sessionId: String = "",
|
||||
@SerialName("shell_id") val shellId: String = "",
|
||||
val cursor: Long = 0,
|
||||
val limit: Int = ChatProtocol.SHELL_OUTPUT_LIMIT,
|
||||
)
|
||||
|
||||
@Serializable
|
||||
data class ChatShellOutputPage(
|
||||
val shell: ChatShell = ChatShell(),
|
||||
val output: String = "",
|
||||
val cursor: Long = 0,
|
||||
val size: Long = 0,
|
||||
val truncated: Boolean = false,
|
||||
val unavailable: Boolean = false,
|
||||
)
|
||||
|
||||
@Serializable
|
||||
data class ChatStep(
|
||||
val status: String = "",
|
||||
@@ -282,6 +300,7 @@ object ChatProtocol {
|
||||
|
||||
const val SHELL_RUNNING = "running"
|
||||
const val SHELL_EXITED = "exited"
|
||||
const val SHELL_OUTPUT_LIMIT = 64 * 1024
|
||||
|
||||
/**
|
||||
* A prompt another client sent, echoed live to this client so it appears in
|
||||
@@ -359,6 +378,15 @@ object ChatProtocol {
|
||||
fun interruptRequest(sessionId: String): Message =
|
||||
Message(type = Protocol.CHAT_INTERRUPT, chatQuery = ChatQuery(sessionId = sessionId))
|
||||
|
||||
fun shellOutputRequest(sessionId: String, shellId: String, cursor: Long = 0, limit: Int = SHELL_OUTPUT_LIMIT): Message =
|
||||
Message(
|
||||
type = Protocol.CHAT_SHELL_OUTPUT,
|
||||
chatShellOutputQuery = ChatShellOutputQuery(sessionId, shellId, cursor, limit),
|
||||
)
|
||||
|
||||
fun shellsRequest(sessionId: String): Message =
|
||||
Message(type = Protocol.CHAT_SHELLS, chatQuery = ChatQuery(sessionId = sessionId))
|
||||
|
||||
/**
|
||||
* The `chat_close` frame that finishes [sessionId]: the server stops any
|
||||
* running turn (through the same interrupt) and records the session closed on
|
||||
|
||||
@@ -79,6 +79,8 @@ object Protocol {
|
||||
// The operator's directory choices for a new chat (home first, then the
|
||||
// directories of previous operator sessions, most recently used first).
|
||||
const val CHAT_DIRECTORIES = "chat_directories"
|
||||
const val CHAT_SHELLS = "chat_shells"
|
||||
const val CHAT_SHELL_OUTPUT = "chat_shell_output"
|
||||
// Server-pushed frames with no matching request.
|
||||
const val CHAT_EVENT = "chat_event"
|
||||
const val CHAT_PERMISSION = "chat_permission"
|
||||
@@ -712,4 +714,7 @@ data class Message(
|
||||
// close/reopen requests themselves ride on chat_query like chat_interrupt.
|
||||
@SerialName("chat_close") val chatClose: ChatCloseResult? = null,
|
||||
@SerialName("chat_directories") val chatDirectories: List<String>? = null,
|
||||
@SerialName("chat_shell_output_query") val chatShellOutputQuery: ChatShellOutputQuery? = null,
|
||||
@SerialName("chat_shells") val chatShells: List<ChatShell>? = null,
|
||||
@SerialName("chat_shell_output") val chatShellOutput: ChatShellOutputPage? = null,
|
||||
)
|
||||
|
||||
@@ -405,6 +405,36 @@ class ChatProtocolTest {
|
||||
assertEquals(1792112367999L, decodedReply.chatClose!!.closedAt)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun shellOutputRequestAndPageUseBoundedWireNames() {
|
||||
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)
|
||||
assertEquals("ses_1", decoded.chatShellOutputQuery!!.sessionId)
|
||||
assertEquals("sh_1", decoded.chatShellOutputQuery!!.shellId)
|
||||
assertEquals(7L, decoded.chatShellOutputQuery!!.cursor)
|
||||
assertEquals(128, decoded.chatShellOutputQuery!!.limit)
|
||||
|
||||
val page = PipelinesJson.decodeFromString(Message.serializer(), """
|
||||
{"type":"chat_shell_output","chat_shell_output":{"shell":{"id":"sh_1","status":"running"},"output":"marker","cursor":13,"size":20,"truncated":true}}
|
||||
""".trimIndent())
|
||||
assertEquals("marker", page.chatShellOutput!!.output)
|
||||
assertTrue(page.chatShellOutput!!.truncated)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun shellsRequestUsesSessionQueryAndPreservesListWireName() {
|
||||
val request = ChatProtocol.shellsRequest("ses_1")
|
||||
val decoded = PipelinesJson.decodeFromString(Message.serializer(), PipelinesJson.encodeToString(Message.serializer(), request))
|
||||
assertEquals(Protocol.CHAT_SHELLS, decoded.type)
|
||||
assertEquals("ses_1", decoded.chatQuery!!.sessionId)
|
||||
val reply = PipelinesJson.decodeFromString(Message.serializer(), """
|
||||
{"type":"chat_shells","chat_shells":[{"id":"sh_1","status":"running","command":"printf marker"}]}
|
||||
""".trimIndent())
|
||||
assertEquals("sh_1", reply.chatShells!!.single().id)
|
||||
assertEquals(ChatProtocol.SHELL_RUNNING, reply.chatShells.single().status)
|
||||
}
|
||||
|
||||
private fun toolDuration(part: ChatPart): Long? {
|
||||
val time = part.time ?: return null
|
||||
return time.completed - time.ran
|
||||
|
||||
Reference in New Issue
Block a user