feat(#125): fix clarify input pre-filling and parse/route clarify_id (#156)

* feat(#125): fix clarification input pre-filling and parse/route clarify_id

* fix(#156): fix ktlint violations in ChatViewModelTest.kt

---------

Co-authored-by: M57 <hy4ri@users.noreply.github.com>

app/src/main/java/com/m57/hermescontrol/data/ws/EventParser.kt

@@ -82,10 +82,11 @@ object EventParser {
             "clarify.request" -> {
                 val text = payload?.get("text") as? String
                 val rawOptions = payload?.get("options")
+                val clarifyId = payload?.get("clarify_id") as? String ?: payload?.get("request_id") as? String
 
                 @Suppress("UNCHECKED_CAST")
                 val options = (rawOptions as? List<*>)?.filterIsInstance<String>()
-                WsEvent.ClarifyRequest(text, options)
+                WsEvent.ClarifyRequest(text, options, clarifyId)
             }
 
             "status.update" -> {

app/src/main/java/com/m57/hermescontrol/data/ws/WsEvent.kt

@@ -56,6 +56,7 @@ sealed class WsEvent {
     data class ClarifyRequest(
         val text: String?,
         val options: List<String>?,
+        val clarifyId: String? = null,
     ) : WsEvent()
 
     // ── Status ───────────────────────────────────────────────────────────

app/src/main/java/com/m57/hermescontrol/ui/chat/ChatScreen.kt

@@ -824,7 +824,7 @@ private fun ClarifyDialog(
     onOptionSelected: (String) -> Unit,
     onDismiss: () -> Unit,
 ) {
-    var typedText by rememberSaveable(clarify) { mutableStateOf(clarify.text) }
+    var typedText by rememberSaveable(clarify.text) { mutableStateOf(clarify.text) }
 
     AlertDialog(
         onDismissRequest = onDismiss,

app/src/main/java/com/m57/hermescontrol/ui/chat/ChatViewModel.kt

@@ -70,6 +70,7 @@ data class SessionUi(
 data class ClarifyUi(
     val text: String,
     val options: List<String>,
+    val clarifyId: String? = null,
 )
 
 class ChatViewModel(
@@ -164,6 +165,7 @@ class ChatViewModel(
                             ClarifyUi(
                                 text = event.text.orEmpty(),
                                 options = event.options.orEmpty(),
+                                clarifyId = event.clarifyId,
                             ),
                     )
                 }
@@ -888,6 +890,7 @@ class ChatViewModel(
 
     fun respondToClarify(option: String) {
         val sessionId = _uiState.value.currentSessionId ?: return
+        val clarifyId = _uiState.value.clarifyRequest?.clarifyId
         _uiState.update { it.copy(clarifyRequest = null) }
 
         val userMessage =
@@ -908,9 +911,19 @@ class ChatViewModel(
         }
 
         viewModelScope.launch(Dispatchers.IO) {
+            val params =
+                mutableMapOf<String, Any>(
+                    "session_id" to sessionId,
+                    "response" to option,
+                    "answer" to option,
+                )
+            if (clarifyId != null) {
+                params["clarify_id"] = clarifyId
+                params["request_id"] = clarifyId
+            }
             wsClient.send(
                 method = WsMethods.CLARIFY_RESPOND,
-                params = mapOf("session_id" to sessionId, "response" to option),
+                params = params,
                 onSent = { id -> trackRequest(id, WsMethods.CLARIFY_RESPOND) },
             )
         }

app/src/test/java/com/m57/hermescontrol/ui/chat/ChatViewModelTest.kt

@@ -297,12 +297,13 @@ class ChatViewModelTest {
             mockEventsFlow.emit(WsEvent.RpcResult(createReqId, mapOf("session_id" to "session-123")))
             advanceUntilIdle()
 
-            mockEventsFlow.emit(WsEvent.ClarifyRequest("Please choose:", listOf("Yes", "No")))
+            mockEventsFlow.emit(WsEvent.ClarifyRequest("Please choose:", listOf("Yes", "No"), "clarify-123"))
             advanceUntilIdle()
 
             var state = viewModel.uiState.value
             assertEquals("Please choose:", state.clarifyRequest?.text)
             assertEquals(listOf("Yes", "No"), state.clarifyRequest?.options)
+            assertEquals("clarify-123", state.clarifyRequest?.clarifyId)
 
             // Respond to clarify
             viewModel.respondToClarify("Yes")
@@ -320,7 +321,14 @@ class ChatViewModelTest {
             verify {
                 HermesWsClient.send(
                     method = WsMethods.CLARIFY_RESPOND,
-                    params = mapOf("session_id" to "session-123", "response" to "Yes"),
+                    params =
+                        mapOf(
+                            "session_id" to "session-123",
+                            "response" to "Yes",
+                            "answer" to "Yes",
+                            "clarify_id" to "clarify-123",
+                            "request_id" to "clarify-123",
+                        ),
                     onSent = any(),
                 )
             }
@@ -347,12 +355,13 @@ class ChatViewModelTest {
             mockEventsFlow.emit(WsEvent.RpcResult(createReqId, mapOf("session_id" to "session-123")))
             advanceUntilIdle()
 
-            mockEventsFlow.emit(WsEvent.ClarifyRequest("Please explain:", emptyList()))
+            mockEventsFlow.emit(WsEvent.ClarifyRequest("Please explain:", emptyList(), "clarify-456"))
             advanceUntilIdle()
 
             var state = viewModel.uiState.value
             assertEquals("Please explain:", state.clarifyRequest?.text)
             assertTrue(state.clarifyRequest?.options.isNullOrEmpty())
+            assertEquals("clarify-456", state.clarifyRequest?.clarifyId)
 
             // Respond to clarify with custom text
             viewModel.respondToClarify("This is my custom response text")
@@ -369,7 +378,14 @@ class ChatViewModelTest {
             verify {
                 HermesWsClient.send(
                     method = WsMethods.CLARIFY_RESPOND,
-                    params = mapOf("session_id" to "session-123", "response" to "This is my custom response text"),
+                    params =
+                        mapOf(
+                            "session_id" to "session-123",
+                            "response" to "This is my custom response text",
+                            "answer" to "This is my custom response text",
+                            "clarify_id" to "clarify-456",
+                            "request_id" to "clarify-456",
+                        ),
                     onSent = any(),
                 )
             }