From 199771b7982321044ba8e5be48478a3ada9eb4cf Mon Sep 17 00:00:00 2001
From: M57 <41645758+Hy4ri@users.noreply.github.com>
Date: Fri, 4 Sep 2026 22:10:11 +0300
Subject: [PATCH] feat(group-chat): format non-string tool outputs using
 ToolResultSummary

When tools return structured JSON payloads (like skill_view, read_file,
web_search), casting event.data["result"] to String evaluates to null.
Fall back to ToolResultSummary.formatToolResultSummary to format structured
tool payloads into readable text when expanded in group chat cards.
---
 .../ui/bots/group/GroupChatViewModel.kt       | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/m57/hermescontrol/ui/bots/group/GroupChatViewModel.kt b/app/src/main/java/com/m57/hermescontrol/ui/bots/group/GroupChatViewModel.kt
index 6ee05151..65bc2243 100644
--- a/app/src/main/java/com/m57/hermescontrol/ui/bots/group/GroupChatViewModel.kt
+++ b/app/src/main/java/com/m57/hermescontrol/ui/bots/group/GroupChatViewModel.kt
@@ -18,6 +18,7 @@ import com.m57.hermescontrol.data.ws.HermesWsClient
 import com.m57.hermescontrol.data.ws.WsEvent
 import com.m57.hermescontrol.data.ws.WsMethods
 import com.m57.hermescontrol.data.ws.toJsonElement
+import com.m57.hermescontrol.ui.chat.tool.ToolResultSummary
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
@@ -143,6 +144,21 @@ class GroupChatViewModel(
         return null
     }
 
+    private fun extractToolOutput(data: Map<String, Any?>?): String? {
+        if (data == null) return null
+        val rawStr =
+            (data["output"] as? String)
+                ?: (data["stdout"] as? String)
+                ?: (data["result"] as? String)
+        if (!rawStr.isNullOrBlank()) {
+            return rawStr
+        }
+
+        val resultElement = data["result"]?.toJsonElement() ?: data["output"]?.toJsonElement() ?: data.toJsonElement()
+        val summary = ToolResultSummary.formatToolResultSummary(resultElement)
+        return summary.ifBlank { null }
+    }
+
     private fun observeWsEvents() {
         viewModelScope.launch(ioDispatcher) {
             HermesWsClient.events.collect { event ->
@@ -241,10 +257,7 @@ class GroupChatViewModel(
                             val streamId = activeStreamMsgId[sid]
                             val toolId = event.data?.get("tool_id") as? String
                             val toolName = event.name
-                            val output =
-                                (event.data?.get("output") as? String)
-                                    ?: (event.data?.get("stdout") as? String)
-                                    ?: (event.data?.get("result") as? String)
+                            val output = extractToolOutput(event.data)
                             val exitCode =
                                 when (val rawCode = event.data?.get("exit_code")) {
                                     is Number -> rawCode.toInt()