fix(example): fix/data-agent-multi-session-inbox-routing #3095
+190
−14
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,134 @@ | ||
| /* | ||
| * Copyright 2024-2026 the original author or authors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package io.agentscope.dataagent.web.api; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
| import static org.assertj.core.api.Assertions.assertThatThrownBy; | ||
|
|
||
| import io.agentscope.core.message.Msg; | ||
| import io.agentscope.core.message.MsgRole; | ||
| import io.agentscope.harness.agent.gateway.channel.ChannelConfig; | ||
| import io.agentscope.harness.agent.gateway.channel.DmScope; | ||
| import io.agentscope.harness.agent.gateway.channel.InboundMessage; | ||
| import io.agentscope.harness.agent.gateway.channel.Peer; | ||
| import io.agentscope.harness.agent.gateway.channel.chatui.ChatUiChannel; | ||
| import java.util.List; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| /** Verifies conversation-scoped inbound routing produces distinct gate keys per conversation. */ | ||
| class ChatControllerConversationRoutingTest { | ||
|
|
||
| private static final ChatUiChannel CHANNEL = | ||
| ChatUiChannel.create( | ||
|
Collaborator
There was a problem hiding this comment. Solid focused test. Two additions would lock the fix down: (1) blank/ |
||
| ChannelConfig.builder("chatui") | ||
| .defaultAgentId("data-agent") | ||
| .dmScope(DmScope.MAIN) | ||
| .build()); | ||
|
|
||
| private static String gateKey(InboundMessage inbound) { | ||
| return CHANNEL.previewRoute(inbound).context().canonicalKey(); | ||
| } | ||
|
|
||
| @Test | ||
| void differentConversationIdsProduceDistinctGateKeysWithThreadSegment() { | ||
| InboundMessage a = | ||
| ChatController.buildConversationInbound( | ||
| "user-1", "data-agent", "conv-a", List.of()); | ||
| InboundMessage b = | ||
| ChatController.buildConversationInbound( | ||
| "user-1", "data-agent", "conv-b", List.of()); | ||
|
|
||
| String gateKeyA = gateKey(a); | ||
| String gateKeyB = gateKey(b); | ||
|
|
||
| assertThat(gateKeyA).isNotEqualTo(gateKeyB); | ||
| assertThat(gateKeyA).contains("|t:conv-a"); | ||
| assertThat(gateKeyB).contains("|t:conv-b"); | ||
| assertThat(SessionController.extractConversationId(gateKeyA)).isEqualTo("conv-a"); | ||
| assertThat(SessionController.extractConversationId(gateKeyB)).isEqualTo("conv-b"); | ||
| } | ||
|
|
||
| @Test | ||
| void sameConversationIdMapsToSameGateKey() { | ||
| InboundMessage first = | ||
| ChatController.buildConversationInbound( | ||
| "user-1", "data-agent", "conv-a", List.of()); | ||
| InboundMessage second = | ||
| ChatController.buildConversationInbound( | ||
| "user-1", "data-agent", "conv-a", List.of()); | ||
|
|
||
| assertThat(gateKey(first)).isEqualTo(gateKey(second)); | ||
| } | ||
|
|
||
| @Test | ||
| void probeAndDispatchInboundShareCanonicalKey() { | ||
| InboundMessage probe = | ||
| ChatController.buildConversationInbound( | ||
| "user-1", "data-agent", "conv-a", List.of()); | ||
| InboundMessage dispatch = | ||
| ChatController.buildConversationInbound( | ||
| "user-1", | ||
| "data-agent", | ||
| "conv-a", | ||
| List.of(Msg.builder().role(MsgRole.USER).textContent("hello").build())); | ||
|
|
||
| assertThat(gateKey(probe)).isEqualTo(gateKey(dispatch)); | ||
| } | ||
|
|
||
| @Test | ||
| void blankConversationIdIsRejectedByBuildConversationInbound() { | ||
| assertThatThrownBy( | ||
| () -> | ||
| ChatController.buildConversationInbound( | ||
| "user-1", "data-agent", null, List.of())) | ||
| .isInstanceOf(IllegalArgumentException.class) | ||
| .hasMessageContaining("conversationId"); | ||
| assertThatThrownBy( | ||
| () -> | ||
| ChatController.buildConversationInbound( | ||
| "user-1", "data-agent", " ", List.of())) | ||
| .isInstanceOf(IllegalArgumentException.class) | ||
| .hasMessageContaining("conversationId"); | ||
| } | ||
|
|
||
| @Test | ||
| void threadInboundCarriesSenderIdAndParentPeer() { | ||
| InboundMessage inbound = | ||
| ChatController.buildConversationInbound( | ||
| "user-1", "data-agent", "conv-a", List.of()); | ||
|
|
||
| assertThat(inbound.senderId()).isEqualTo("user-1"); | ||
| assertThat(inbound.parentPeer()).isEqualTo(Peer.direct("user-1")); | ||
| assertThat(inbound.peer()).isEqualTo(Peer.thread("conv-a")); | ||
| } | ||
|
|
||
| @Test | ||
| void sameUserDifferentConversationsShareRoomButNotThread() { | ||
| InboundMessage a = | ||
| ChatController.buildConversationInbound( | ||
| "user-1", "data-agent", "conv-a", List.of()); | ||
| InboundMessage b = | ||
| ChatController.buildConversationInbound( | ||
| "user-1", "data-agent", "conv-b", List.of()); | ||
|
|
||
| String gateKeyA = gateKey(a); | ||
| String gateKeyB = gateKey(b); | ||
|
|
||
| assertThat(gateKeyA).contains("|r:user-1"); | ||
| assertThat(gateKeyB).contains("|r:user-1"); | ||
| assertThat(gateKeyA).isNotEqualTo(gateKeyB); | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[Warning] This new guard makes
resolveGateKeyreturnnullfor a blank conversation id, butexecuteChat(line 581) still dispatches for a blank id by falling back to the pre-thread DM shape. The two sides now disagree about which session a request belongs to.Consequence on that path: the message is dispatched and a session is created with a
|r:<user>-style gate key, but nothing can resolve that key any more —/resetanswers "No active session to reset.", thecurrentSessionprobe reportsexists=false, andrecordRunSession'sdedupeKeyisnullso theRUN_SESSIONactivity event is silently dropped.Before this change the two sides agreed, because
resolveGateKeybuilt aPeer.direct+accountId(conversationId)probe and produced exactly the same DM-shaped key thatInboundMessage.dm(...)does.The HTTP entry points mint a UUID (lines 164-166, 277-279), so I could not confirm a reachable caller that arrives here with a blank id — but the comment on the fallback branch says it exists for back-compat, which implies it is expected to be live. Please pick one:
null; orexecuteChat, delete the branch at line 581 and make the invariant explicit, so the two paths cannot drift again.ChatControllerConversationRoutingTest.probeAndDispatchInboundShareCanonicalKeyasserts probe/dispatch agreement only for a non-blankconv-a; a blank-id case would pin whichever option you choose.