yilsem/aiturk-mobil
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 6 Wiki Activity

refactor(#1375): typed params for session.interrupt, steer, redirect (#1382)

Browse Source
This commit is contained in:
m57 authored and GitHub committed 2026-09-29 17:02:32 +03:00
1 parent a780df3261
commit aac42032fb
9 files changed
+480 -22
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/java/com/m57/hermescontrol/ui/bots/group/GroupChatViewModel.kt
+3 -2
View File
@@ -20,6 +20,7 @@ import com.m57.hermescontrol.data.ws.WsMethods
import com.m57.hermescontrol.data.ws.contract.PromptSubmitParams
import com.m57.hermescontrol.data.ws.contract.RpcMethods
import com.m57.hermescontrol.data.ws.contract.SessionCreateParams
import com.m57.hermescontrol.data.ws.contract.SessionInterruptParams
import com.m57.hermescontrol.data.ws.toJsonElement
import com.m57.hermescontrol.ui.chat.tool.ToolResultSummary
import kotlinx.coroutines.CompletableDeferred
@@ -909,8 +910,8 @@ class GroupChatViewModel(
for (sid in activeSessions.distinct()) {
try {
HermesWsClient.send(
WsMethods.SESSION_INTERRUPT,
mapOf("session_id" to sid),
RpcMethods.SESSION_INTERRUPT,
SessionInterruptParams(sid),
)
} catch (e: Exception) {
Log.w("GroupChatViewModel", "Failed to send interrupt for session $sid: ${e.message}")
app/src/main/java/com/m57/hermescontrol/ui/chat/ChatViewModel.kt
+13 -10
View File
@@ -37,6 +37,9 @@ import com.m57.hermescontrol.data.ws.HermesWsClient
import com.m57.hermescontrol.data.ws.JsonRpcError
import com.m57.hermescontrol.data.ws.WsEvent
import com.m57.hermescontrol.data.ws.WsMethods
import com.m57.hermescontrol.data.ws.contract.RpcMethods
import com.m57.hermescontrol.data.ws.contract.SessionCorrectionParams
import com.m57.hermescontrol.data.ws.contract.SessionInterruptParams
import com.m57.hermescontrol.data.ws.toAny
import com.m57.hermescontrol.data.ws.toJsonElement
import com.m57.hermescontrol.notification.ReplyNotificationTracker
@@ -2454,8 +2457,8 @@ class ChatViewModel(
deleteSnapshotOnRollback = true,
) {
wsClient.send(
WsMethods.SESSION_INTERRUPT,
mapOf("session_id" to owner.agentSessionId),
RpcMethods.SESSION_INTERRUPT,
SessionInterruptParams(owner.agentSessionId),
onSent = { id -> trackHardInterrupt(id, staged.id, owner, reservation.mainTurnEpoch) },
)
}
@@ -2821,8 +2824,8 @@ class ChatViewModel(
deleteSnapshotOnRollback = false,
) {
wsClient.send(
WsMethods.SESSION_INTERRUPT,
mapOf("session_id" to owner.agentSessionId),
RpcMethods.SESSION_INTERRUPT,
SessionInterruptParams(owner.agentSessionId),
onSent = { requestId -> trackHardInterrupt(requestId, id, owner, interruptedTurnEpoch) },
)
}
@@ -3043,8 +3046,8 @@ class ChatViewModel(
viewModelScope.launch {
commitReceiptAndEnqueue(owner, receipt, null, deleteSnapshotOnRollback = false) {
wsClient.send(
WsMethods.SESSION_INTERRUPT,
mapOf("session_id" to owner.agentSessionId),
RpcMethods.SESSION_INTERRUPT,
SessionInterruptParams(owner.agentSessionId),
onSent = { id -> trackHardInterrupt(id, userMessage.id, owner, interruptedTurnEpoch) },
)
}
@@ -3437,8 +3440,8 @@ class ChatViewModel(
if (mode == BusySendMode.GUIDE) {
enqueueOwned {
wsClient.send(
WsMethods.SESSION_STEER,
mapOf("session_id" to owner.agentSessionId, "text" to fullText),
RpcMethods.SESSION_STEER,
SessionCorrectionParams(owner.agentSessionId, fullText),
onSent = { id ->
trackOutgoingRequest(
id,
@@ -4328,8 +4331,8 @@ class ChatViewModel(
}
viewModelScope.launch(ioDispatcher) {
wsClient.send(
WsMethods.SESSION_INTERRUPT,
mapOf("session_id" to sessionId),
RpcMethods.SESSION_INTERRUPT,
SessionInterruptParams(sessionId),
onSent = { id -> trackRequest(id, WsMethods.SESSION_INTERRUPT) },
)
}