Prevent bot from mis-recognizing itself on symphony

Signed-off-by: Tim Paine <3105306+timkpaine@users.noreply.github.com>

Author: timkpaine

csp_bot/bot.py

@@ -588,7 +588,15 @@ def is_msg_to_bot(self, msg: Message) -> Tuple[bool, str, str, List[Tag]]:
         # if the bot is not tagged, first argument is false so ignore second arg
         bot_name = self._configs[msg.backend].bot_name
         bot_tag_to_find = self._get_bot_tag(msg.backend)
-        bot_tag = f"@{bot_tag_to_find}" in text
+
+        # Check if bot is tagged - use exact entity matching to avoid
+        # "@CCRT Bot" matching inside "@CCRT Bot Dev"
+        if msg.backend == "symphony":
+            # For Symphony: entities contain the exact tagged names like "@CCRT Bot Dev"
+            bot_tag = f"@{bot_tag_to_find}" in entities
+        else:
+            # For Slack/Discord: entities contain user IDs, use substring match on text
+            bot_tag = f"@{bot_tag_to_find}" in text
 
         if bot_tag:
             return True, msg.channel, text, entities

csp_bot/tests/conftest.py

@@ -76,3 +76,32 @@ def side_effect(name):
         )
 
         yield bot
+
+
+@pytest.fixture(scope="function")
+def bot_with_symphony():
+    """Bot fixture with Symphony config for testing Symphony-specific behavior."""
+    # Create a minimal bot config without Symphony (we'll mock it)
+    bot_config = BotConfig()
+    bot = Bot(config=bot_config)
+
+    # Create a mock symphony config with just the bot_name we need
+    mock_symphony_config = MagicMock()
+    mock_symphony_config.bot_name = "Cubist Bot"  # Shorter name to test against "Cubist Bot Dev"
+
+    # Mock the symphony adapter
+    mock_symphony_adapter = MagicMock()
+    bot._adapters["symphony"] = mock_symphony_adapter
+    bot._configs["symphony"] = mock_symphony_config
+
+    # Load default commands
+    bot.load_commands(
+        [
+            HelpCommandModel(),
+            EchoCommandModel(),
+            StatusCommandModel(),
+            ScheduleCommandModel(),
+        ]
+    )
+
+    yield bot

csp_bot/tests/test_bot.py

@@ -205,6 +205,41 @@ def test_message_not_to_bot_discord(self, bot: Bot):
         is_to_bot, channel, text, entities = bot.is_msg_to_bot(msg)
         assert is_to_bot is False
 
+    def test_symphony_similar_bot_names_no_false_match(self, bot_with_symphony: Bot):
+        """Test that '@Cubist Bot' does not match when '@Cubist Bot Dev' is tagged in Symphony.
+
+        This ensures exact entity matching is used, preventing substring matches
+        where a bot with a shorter name incorrectly receives messages meant for
+        a bot with a longer, similar name.
+        """
+        # Bot is configured with name "Cubist Bot", but message tags "Cubist Bot Dev"
+        msg = Message(
+            user="John Doe",
+            user_id="123456789",
+            msg='<div data-format="PresentationML"><span class="entity" data-entity-id="0">@Cubist Bot Dev</span> /help</div>',
+            channel="Test Room",
+            tags=["987654321"],
+            backend="symphony",
+        )
+        is_to_bot, channel, text, entities = bot_with_symphony.is_msg_to_bot(msg)
+        # Should NOT match because "@Cubist Bot" != "@Cubist Bot Dev"
+        assert is_to_bot is False
+
+    def test_symphony_exact_bot_name_matches(self, bot_with_symphony: Bot):
+        """Test that exact bot name match works correctly in Symphony."""
+        # Bot is configured with name "Cubist Bot", message also tags "Cubist Bot"
+        msg = Message(
+            user="John Doe",
+            user_id="123456789",
+            msg='<div data-format="PresentationML"><span class="entity" data-entity-id="0">@Cubist Bot</span> /help</div>',
+            channel="Test Room",
+            tags=["987654321"],
+            backend="symphony",
+        )
+        is_to_bot, channel, text, entities = bot_with_symphony.is_msg_to_bot(msg)
+        # Should match because "@Cubist Bot" == "@Cubist Bot"
+        assert is_to_bot is True
+
 
 class TestBot:
     """Tests for Bot command extraction and execution."""