Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 3c72e807da | |||
| 702692cf0c | |||
| 51d1917a7b | |||
| 85f3400076 | |||
| a5cbe98f25 |
@@ -119,7 +119,7 @@ public class DashboardController(OpenClawGatewayClient gateway, ILogger<Dashboar
|
||||
{
|
||||
try
|
||||
{
|
||||
var key = string.IsNullOrWhiteSpace(sessionKey) ? "iris" : sessionKey.Trim();
|
||||
var key = string.IsNullOrWhiteSpace(sessionKey) ? "agent:iris:main" : sessionKey.Trim();
|
||||
var messages = await gateway.GetSessionHistoryAsync(key, Math.Clamp(limit, 1, 200), Math.Max(0, offset));
|
||||
|
||||
// Filter: only user and assistant messages (exclude tool/system)
|
||||
|
||||
@@ -145,24 +145,49 @@ public sealed class OpenClawGatewayClient(HttpClient httpClient, IConfiguration
|
||||
{
|
||||
try
|
||||
{
|
||||
var result = await InvokeToolAsync("sessions_history", new { sessionKey, limit, offset });
|
||||
var result = await InvokeToolAsync("sessions_history", new {
|
||||
sessionKey, limit, offset,
|
||||
includeTools = false
|
||||
});
|
||||
if (result is null) return new List<MessageEntry>();
|
||||
|
||||
var messages = new List<MessageEntry>();
|
||||
var array = result as JsonArray ?? result.AsArray();
|
||||
if (array is null) return messages;
|
||||
// sessions_history returns { details: { messages: [...] } }
|
||||
var messageArray = result["details"]?["messages"] as JsonArray;
|
||||
if (messageArray is null) return new List<MessageEntry>();
|
||||
|
||||
foreach (var msg in array)
|
||||
var messages = new List<MessageEntry>();
|
||||
foreach (var msg in messageArray.Cast<JsonNode?>())
|
||||
{
|
||||
if (msg is null) continue;
|
||||
var role = msg["role"]?.GetValue<string>() ?? "";
|
||||
var content = msg["content"]?.GetValue<string>() ?? "";
|
||||
// Skip non-user/assistant roles
|
||||
if (role is not ("user" or "assistant")) continue;
|
||||
|
||||
// Content is an array of blocks: [{type: "text"/"thinking", text: "..."}]
|
||||
// Extract only pure text blocks, skip thinking-only messages
|
||||
var contentBlocks = msg["content"] as JsonArray;
|
||||
if (contentBlocks is null) continue;
|
||||
|
||||
var visibleTexts = new List<string>();
|
||||
foreach (var block in contentBlocks.Cast<JsonNode?>())
|
||||
{
|
||||
if (block is null) continue;
|
||||
var type = block["type"]?.GetValue<string>() ?? "";
|
||||
var text = block["text"]?.GetValue<string>() ?? "";
|
||||
if (type == "text" && !string.IsNullOrWhiteSpace(text))
|
||||
visibleTexts.Add(text);
|
||||
}
|
||||
|
||||
var visibleContent = string.Join(" ", visibleTexts).Trim();
|
||||
if (string.IsNullOrWhiteSpace(visibleContent)) continue;
|
||||
|
||||
// Skip system-only replies
|
||||
if (visibleContent is "REPLY_SKIP" or "ANNOUNCE_SKIP") continue;
|
||||
|
||||
var timestamp = msg["timestamp"]?.GetValue<string>()
|
||||
?? msg["ts"]?.GetValue<string>()
|
||||
?? msg["createdAt"]?.GetValue<string>()
|
||||
?? DateTimeOffset.UtcNow.ToString("o");
|
||||
|
||||
messages.Add(new MessageEntry(role, content, timestamp));
|
||||
messages.Add(new MessageEntry(role, visibleContent, timestamp));
|
||||
}
|
||||
|
||||
return messages;
|
||||
|
||||
@@ -280,12 +280,19 @@ async function fetchChatMessages(): Promise<void> {
|
||||
const res = await apiFetch('/api/dashboard/chat/messages?limit=50')
|
||||
if (!res.ok) return
|
||||
const data: DashboardChatMessage[] = await res.json()
|
||||
chatMessages.value = data.map((msg, idx) => ({
|
||||
id: `msg-${idx}`,
|
||||
// Merge instead of replace — only add messages not already present
|
||||
const existingTexts = new Set(chatMessages.value.map(m => m.text))
|
||||
const existingTimestamps = new Set(chatMessages.value.map(m => m.timestamp))
|
||||
for (const msg of data) {
|
||||
const msgTime = new Date(msg.timestamp).getTime()
|
||||
if (existingTexts.has(msg.content) && existingTimestamps.has(msgTime)) continue
|
||||
chatMessages.value.push({
|
||||
id: `msg-${msgTime}-${msg.role}`,
|
||||
sender: msg.role === 'assistant' ? 'iris' : 'user',
|
||||
text: msg.content,
|
||||
timestamp: new Date(msg.timestamp).getTime(),
|
||||
}))
|
||||
timestamp: msgTime,
|
||||
})
|
||||
}
|
||||
} catch {
|
||||
// API unreachable – keep current values
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user