Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 21 additions & 19 deletions app/src/main/java/ai/javaclaw/chat/ChatChannel.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ai.javaclaw.chat;

import ai.javaclaw.agent.Agent;
import ai.javaclaw.agent.ResponseListener;
import ai.javaclaw.agent.AgentEvent;
import ai.javaclaw.channels.Channel;
import ai.javaclaw.channels.ChannelMessageReceivedEvent;
import ai.javaclaw.channels.ChannelRegistry;
Expand Down Expand Up @@ -143,27 +143,29 @@ public List<String> loadHistoryAsHtml(String conversationId) {
/**
* Handles a chat message from the web UI for the given conversationId.
* The response is streamed to the WebSocket session as JSON frames
* ({@code chunk}/{@code done}/{@code error}); the full response text is returned.
* ({@code chunk}/{@code toolCall}/{@code toolResult}/{@code done}/{@code error}).
*/
public String chat(String conversationId, String message) {
public void chat(String conversationId, String message) {
channelRegistry.publishMessageReceivedEvent(new ChannelMessageReceivedEvent(getName(), message));

return agent.respondTo(conversationId, message, ResponseListener.of(
token -> sendChunkFrame(conversationId, token),
() -> sendDoneFrame(conversationId),
error -> sendErrorFrame(conversationId, error)));
}

private void sendChunkFrame(String conversationId, String token) {
sendFrame(frame(StreamFrameType.CHUNK, conversationId, token));
}

private void sendDoneFrame(String conversationId) {
sendFrame(frame(StreamFrameType.DONE, conversationId, null));
}

private void sendErrorFrame(String conversationId, String error) {
sendFrame(frame(StreamFrameType.ERROR, conversationId, error == null ? "Unknown error" : error));
agent.respondTo(conversationId, message, event -> sendFrame(switch (event) {
case AgentEvent.Token t -> frame(StreamFrameType.CHUNK, conversationId, t.text());
case AgentEvent.ToolCall c -> frame(StreamFrameType.TOOL_CALL, conversationId,
toolData(c.id(), c.name(), "input", c.input()));
case AgentEvent.ToolResult r -> frame(StreamFrameType.TOOL_RESULT, conversationId,
toolData(r.id(), r.name(), "output", r.output()));
case AgentEvent.Done ignored -> frame(StreamFrameType.DONE, conversationId, null);
case AgentEvent.Failed f -> frame(StreamFrameType.ERROR, conversationId,
f.message() == null ? "Unknown error" : f.message());
}));
}

private static Map<String, Object> toolData(String id, String name, String payloadKey, String payload) {
Map<String, Object> data = new LinkedHashMap<>();
data.put("id", id);
data.put("name", name);
data.put(payloadKey, payload == null ? "" : payload);
return data;
}

private static Map<String, Object> frame(StreamFrameType type, String conversationId, Object payload) {
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/ai/javaclaw/chat/StreamFrameType.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
*/
public enum StreamFrameType {
CHUNK("chunk"),
TOOL_CALL("toolCall"),
TOOL_RESULT("toolResult"),
DONE("done"),
ERROR("error");

Expand Down
Loading
Loading