diff --git a/src/RustPlusBot.Features.Alarms/Relaying/AlarmStateRelay.cs b/src/RustPlusBot.Features.Alarms/Relaying/AlarmStateRelay.cs
index b406f446..5056005c 100644
--- a/src/RustPlusBot.Features.Alarms/Relaying/AlarmStateRelay.cs
+++ b/src/RustPlusBot.Features.Alarms/Relaying/AlarmStateRelay.cs
@@ -22,7 +22,7 @@ namespace RustPlusBot.Features.Alarms.Relaying;
 internal sealed record AlarmRelayChannels(
     IAlarmChannelLocator Locator,
     IAlarmChannelPoster Poster,
-    ITeamChatSender TeamChatSender);
+    IBotTeamChatSender TeamChatSender);
 
 /// <summary>
 /// Keeps alarm embeds in sync with live socket events: updates state and re-renders on trigger; marks
diff --git a/src/RustPlusBot.Features.Chat/Relaying/TeamChatRelay.cs b/src/RustPlusBot.Features.Chat/Relaying/TeamChatRelay.cs
index 441ad69f..a640afb8 100644
--- a/src/RustPlusBot.Features.Chat/Relaying/TeamChatRelay.cs
+++ b/src/RustPlusBot.Features.Chat/Relaying/TeamChatRelay.cs
@@ -1,17 +1,25 @@
+using Microsoft.Extensions.DependencyInjection;
 using RustPlusBot.Abstractions.Events;
 using RustPlusBot.Features.Chat.Webhooks;
+using RustPlusBot.Features.Connections.Listening;
 using RustPlusBot.Features.Workspace.Locating;
+using RustPlusBot.Persistence.Commands;
 
 namespace RustPlusBot.Features.Chat.Relaying;
 
-/// <summary>Relays one received in-game team message into its Discord #teamchat channel, dropping our own echoes.</summary>
+/// <summary>
+/// Relays one received in-game team message into its Discord #teamchat channel, dropping our own
+/// echoes and command invocations.
+/// </summary>
 /// <param name="locator">Resolves the target #teamchat channel.</param>
 /// <param name="poster">Posts the line via webhook.</param>
 /// <param name="dedup">Tracks lines the bridge relayed into the game so their echoes can be dropped.</param>
+/// <param name="scopeFactory">Opens a scope to read the scoped <see cref="IMuteStore"/> command prefix.</param>
 internal sealed class TeamChatRelay(
     ITeamChatChannelLocator locator,
     ITeamChatWebhookPoster poster,
-    RelayDedupBuffer dedup)
+    RelayDedupBuffer dedup,
+    IServiceScopeFactory scopeFactory)
 {
     /// <summary>Handles one <see cref="TeamMessageReceivedEvent"/>.</summary>
     /// <param name="evt">The received team message.</param>
@@ -19,11 +27,18 @@ internal sealed class TeamChatRelay(
     /// <returns>A task that completes when the line has been relayed or dropped.</returns>
     public async Task RelayAsync(TeamMessageReceivedEvent evt, CancellationToken cancellationToken)
     {
+        if (evt.FromActivePlayer && evt.Message.StartsWith(BotTeamChat.Prefix, StringComparison.Ordinal))
+        {
+            return; // Bot-originated line echoing back; #teamchat carries only human discussion.
+        }
+
         if (evt.FromActivePlayer && dedup.TryConsume((evt.GuildId, evt.ServerId), evt.Message))
         {
             return; // Our own relayed line echoing back; do not re-post.
         }
 
+        // The locator is an in-memory cache, so resolve the channel first: unmapped servers exit
+        // before the per-message prefix query below.
         var channelId = await locator.GetChannelIdAsync(evt.GuildId, evt.ServerId, cancellationToken)
             .ConfigureAwait(false);
         if (channelId is null)
@@ -31,6 +46,25 @@ public async Task RelayAsync(TeamMessageReceivedEvent evt, CancellationToken can
             return;
         }
 
+        // A command invocation (e.g. "!pop") gets its reply in game; the bare trigger line is noise in Discord.
+        var prefix = await GetCommandPrefixAsync(evt.GuildId, evt.ServerId, cancellationToken).ConfigureAwait(false);
+        if (!string.IsNullOrWhiteSpace(prefix) &&
+            evt.Message.TrimStart().StartsWith(prefix, StringComparison.Ordinal))
+        {
+            return;
+        }
+
         await poster.PostAsync(channelId.Value, evt.SenderName, evt.Message, cancellationToken).ConfigureAwait(false);
     }
+
+    private async Task<string> GetCommandPrefixAsync(ulong guildId, Guid serverId, CancellationToken cancellationToken)
+    {
+        // IMuteStore is scoped, so resolve it from a fresh scope rather than capturing it on this singleton.
+        var scope = scopeFactory.CreateAsyncScope();
+        await using (scope.ConfigureAwait(false))
+        {
+            var muteStore = scope.ServiceProvider.GetRequiredService<IMuteStore>();
+            return await muteStore.GetPrefixAsync(guildId, serverId, cancellationToken).ConfigureAwait(false);
+        }
+    }
 }
diff --git a/src/RustPlusBot.Features.Commands/Dispatching/CommandDispatcher.cs b/src/RustPlusBot.Features.Commands/Dispatching/CommandDispatcher.cs
index 61c6d2b4..e1fbaf97 100644
--- a/src/RustPlusBot.Features.Commands/Dispatching/CommandDispatcher.cs
+++ b/src/RustPlusBot.Features.Commands/Dispatching/CommandDispatcher.cs
@@ -19,7 +19,7 @@ internal sealed partial class CommandDispatcher
     private readonly Dictionary<string, ICommandHandler> _handlers;
     private readonly ILogger<CommandDispatcher> _logger;
     private readonly IMuteStore _muteStore;
-    private readonly ITeamChatSender _sender;
+    private readonly IBotTeamChatSender _sender;
     private readonly IWorkspaceStore _workspace;
 
     /// <summary>Initializes the dispatcher.</summary>
@@ -34,7 +34,7 @@ public CommandDispatcher(
         CommandCooldown cooldown,
         IMuteStore muteStore,
         IWorkspaceStore workspace,
-        ITeamChatSender sender,
+        IBotTeamChatSender sender,
         ILogger<CommandDispatcher> logger)
     {
         ArgumentNullException.ThrowIfNull(handlers);
@@ -54,7 +54,9 @@ public async Task DispatchAsync(TeamMessageReceivedEvent evt, CancellationToken
     {
         ArgumentNullException.ThrowIfNull(evt);
 
-        if (evt.FromActivePlayer)
+        // Bot-originated lines echo back from the active player carrying the bot prefix; ignoring only
+        // those (instead of every active-player line) lets the paired player's own typed commands dispatch.
+        if (evt.FromActivePlayer && evt.Message.StartsWith(BotTeamChat.Prefix, StringComparison.Ordinal))
         {
             return;
         }
diff --git a/src/RustPlusBot.Features.Connections/ConnectionServiceCollectionExtensions.cs b/src/RustPlusBot.Features.Connections/ConnectionServiceCollectionExtensions.cs
index f96eb325..7736a409 100644
--- a/src/RustPlusBot.Features.Connections/ConnectionServiceCollectionExtensions.cs
+++ b/src/RustPlusBot.Features.Connections/ConnectionServiceCollectionExtensions.cs
@@ -23,6 +23,7 @@ public static IServiceCollection AddConnections(this IServiceCollection services
         services.AddSingleton<ConnectionSupervisor>();
         services.AddSingleton<IConnectionSupervisor>(sp => sp.GetRequiredService<ConnectionSupervisor>());
         services.AddSingleton<ITeamChatSender>(sp => sp.GetRequiredService<ConnectionSupervisor>());
+        services.AddSingleton<IBotTeamChatSender, BotTeamChatSender>();
         services.AddSingleton<IRustServerQuery>(sp => sp.GetRequiredService<ConnectionSupervisor>());
         services.AddSingleton<IAfkState>(sp => sp.GetRequiredService<ConnectionSupervisor>());
         services.AddScoped<IServerRemovalService, ServerRemovalService>();
diff --git a/src/RustPlusBot.Features.Connections/Listening/BotTeamChat.cs b/src/RustPlusBot.Features.Connections/Listening/BotTeamChat.cs
new file mode 100644
index 00000000..355c32b2
--- /dev/null
+++ b/src/RustPlusBot.Features.Connections/Listening/BotTeamChat.cs
@@ -0,0 +1,12 @@
+namespace RustPlusBot.Features.Connections.Listening;
+
+/// <summary>The marker prefix identifying bot-originated in-game team-chat lines.</summary>
+public static class BotTeamChat
+{
+    /// <summary>
+    /// Marker leading every bot-originated team-chat line so the relay can drop the echo instead of
+    /// re-posting it to Discord. The constant carries no trailing space; <see cref="BotTeamChatSender"/>
+    /// inserts one space between the prefix and the message. Never localized.
+    /// </summary>
+    public const string Prefix = "[R+]";
+}
diff --git a/src/RustPlusBot.Features.Connections/Listening/BotTeamChatSender.cs b/src/RustPlusBot.Features.Connections/Listening/BotTeamChatSender.cs
new file mode 100644
index 00000000..150b58d9
--- /dev/null
+++ b/src/RustPlusBot.Features.Connections/Listening/BotTeamChatSender.cs
@@ -0,0 +1,18 @@
+using System.Globalization;
+
+namespace RustPlusBot.Features.Connections.Listening;
+
+/// <summary>Prepends <see cref="BotTeamChat.Prefix"/> and forwards to the raw <see cref="ITeamChatSender"/>.</summary>
+/// <param name="inner">The raw team-chat sender.</param>
+internal sealed class BotTeamChatSender(ITeamChatSender inner) : IBotTeamChatSender
+{
+    /// <inheritdoc />
+    public Task<TeamChatSendResult> SendAsync(ulong guildId,
+        Guid serverId,
+        string message,
+        CancellationToken cancellationToken) =>
+        inner.SendAsync(guildId,
+            serverId,
+            string.Create(CultureInfo.InvariantCulture, $"{BotTeamChat.Prefix} {message}"),
+            cancellationToken);
+}
diff --git a/src/RustPlusBot.Features.Connections/Listening/IBotTeamChatSender.cs b/src/RustPlusBot.Features.Connections/Listening/IBotTeamChatSender.cs
new file mode 100644
index 00000000..5edb6c56
--- /dev/null
+++ b/src/RustPlusBot.Features.Connections/Listening/IBotTeamChatSender.cs
@@ -0,0 +1,21 @@
+namespace RustPlusBot.Features.Connections.Listening;
+
+/// <summary>
+/// Relays a bot-originated line (command reply, event/player/alarm notification) into a server's
+/// in-game team chat, prefixed with <see cref="BotTeamChat.Prefix"/> so its echo is never re-posted
+/// to the Discord #teamchat channel. Player speech bridged from Discord uses
+/// <see cref="ITeamChatSender"/> instead.
+/// </summary>
+public interface IBotTeamChatSender
+{
+    /// <summary>Sends <paramref name="message"/>, prefixed, to the live socket for (<paramref name="guildId"/>, <paramref name="serverId"/>).</summary>
+    /// <param name="guildId">The owning guild snowflake.</param>
+    /// <param name="serverId">The target server id.</param>
+    /// <param name="message">The unprefixed message text.</param>
+    /// <param name="cancellationToken">A cancellation token.</param>
+    /// <returns>The send result.</returns>
+    Task<TeamChatSendResult> SendAsync(ulong guildId,
+        Guid serverId,
+        string message,
+        CancellationToken cancellationToken);
+}
diff --git a/src/RustPlusBot.Features.Events/Relaying/EventRelay.cs b/src/RustPlusBot.Features.Events/Relaying/EventRelay.cs
index 45ec85f8..b960f7f3 100644
--- a/src/RustPlusBot.Features.Events/Relaying/EventRelay.cs
+++ b/src/RustPlusBot.Features.Events/Relaying/EventRelay.cs
@@ -17,7 +17,7 @@ namespace RustPlusBot.Features.Events.Relaying;
 internal sealed record EventRelayChannels(
     IEventChannelLocator Locator,
     IEventChannelPoster Poster,
-    ITeamChatSender TeamChatSender);
+    IBotTeamChatSender TeamChatSender);
 
 /// <summary>Posts every live event to #events AND in-game team chat; tracks rig state.</summary>
 /// <param name="classifier">Classifies raw marker deltas into domain events.</param>
diff --git a/src/RustPlusBot.Features.Players/Relaying/PlayerEventRelay.cs b/src/RustPlusBot.Features.Players/Relaying/PlayerEventRelay.cs
index 433daf18..7641cbda 100644
--- a/src/RustPlusBot.Features.Players/Relaying/PlayerEventRelay.cs
+++ b/src/RustPlusBot.Features.Players/Relaying/PlayerEventRelay.cs
@@ -18,7 +18,7 @@ internal sealed class PlayerEventRelay(
     PlayerEventRenderer renderer,
     IEventChannelLocator locator,
     IPlayerChannelPoster poster,
-    ITeamChatSender teamChatSender,
+    IBotTeamChatSender teamChatSender,
     IServiceScopeFactory scopeFactory)
 {
     /// <summary>Handles one <see cref="PlayerStateChangedEvent"/>: posts embeds and broadcasts in-game.</summary>
diff --git a/tests/RustPlusBot.Features.Alarms.Tests/AlarmRegistrationTests.cs b/tests/RustPlusBot.Features.Alarms.Tests/AlarmRegistrationTests.cs
index 8f472948..05079c4a 100644
--- a/tests/RustPlusBot.Features.Alarms.Tests/AlarmRegistrationTests.cs
+++ b/tests/RustPlusBot.Features.Alarms.Tests/AlarmRegistrationTests.cs
@@ -50,7 +50,7 @@ public void AddAlarms_resolves_without_captive_dependency_errors()
         services.AddSingleton(Substitute.For<IClock>());
         services.AddSingleton(Substitute.For<IEventBus>());
         services.AddSingleton(Substitute.For<IAlarmChannelLocator>());
-        services.AddSingleton(Substitute.For<ITeamChatSender>());
+        services.AddSingleton(Substitute.For<IBotTeamChatSender>());
 
         // Discord
         var discordConfig = new DiscordSocketConfig();
diff --git a/tests/RustPlusBot.Features.Alarms.Tests/AlarmStateRelayTests.cs b/tests/RustPlusBot.Features.Alarms.Tests/AlarmStateRelayTests.cs
index d93de7ab..450c9145 100644
--- a/tests/RustPlusBot.Features.Alarms.Tests/AlarmStateRelayTests.cs
+++ b/tests/RustPlusBot.Features.Alarms.Tests/AlarmStateRelayTests.cs
@@ -44,7 +44,7 @@ private static Harness Create(SmartAlarm? alarm = null, ulong? channelId = 777UL
             .Returns(channelId);
 
         var poster = Substitute.For<IAlarmChannelPoster>();
-        var teamChatSender = Substitute.For<ITeamChatSender>();
+        var teamChatSender = Substitute.For<IBotTeamChatSender>();
         teamChatSender
             .SendAsync(Arg.Any<ulong>(), Arg.Any<Guid>(), Arg.Any<string>(), Arg.Any<CancellationToken>())
             .Returns(TeamChatSendResult.Sent);
@@ -462,6 +462,6 @@ private sealed record Harness(
         IAlarmStore Store,
         IAlarmRefresher Refresher,
         IAlarmChannelPoster Poster,
-        ITeamChatSender TeamChatSender,
+        IBotTeamChatSender TeamChatSender,
         IConnectionStore Connections);
 }
diff --git a/tests/RustPlusBot.Features.Alarms.Tests/Hosting/AlarmsHostedServiceTests.cs b/tests/RustPlusBot.Features.Alarms.Tests/Hosting/AlarmsHostedServiceTests.cs
index f771156c..635bb330 100644
--- a/tests/RustPlusBot.Features.Alarms.Tests/Hosting/AlarmsHostedServiceTests.cs
+++ b/tests/RustPlusBot.Features.Alarms.Tests/Hosting/AlarmsHostedServiceTests.cs
@@ -47,7 +47,7 @@ private static Harness Create()
         relayLocator.GetChannelIdAsync(Arg.Any<ulong>(), Arg.Any<Guid>(), Arg.Any<CancellationToken>())
             .Returns(777UL);
         var relayPoster = Substitute.For<IAlarmChannelPoster>();
-        var teamChatSender = Substitute.For<ITeamChatSender>();
+        var teamChatSender = Substitute.For<IBotTeamChatSender>();
         teamChatSender.SendAsync(Arg.Any<ulong>(), Arg.Any<Guid>(), Arg.Any<string>(), Arg.Any<CancellationToken>())
             .Returns(TeamChatSendResult.Sent);
 
diff --git a/tests/RustPlusBot.Features.Chat.Tests/Hosting/ChatHostedServiceTests.cs b/tests/RustPlusBot.Features.Chat.Tests/Hosting/ChatHostedServiceTests.cs
index 909a080e..626c08af 100644
--- a/tests/RustPlusBot.Features.Chat.Tests/Hosting/ChatHostedServiceTests.cs
+++ b/tests/RustPlusBot.Features.Chat.Tests/Hosting/ChatHostedServiceTests.cs
@@ -1,4 +1,5 @@
 using Discord.WebSocket;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using NSubstitute;
 using NSubstitute.ExceptionExtensions;
@@ -10,6 +11,7 @@
 using RustPlusBot.Features.Chat.Webhooks;
 using RustPlusBot.Features.Connections.Listening;
 using RustPlusBot.Features.Workspace.Locating;
+using RustPlusBot.Persistence.Commands;
 
 namespace RustPlusBot.Features.Chat.Tests.Hosting;
 
@@ -27,7 +29,16 @@ private static (ChatHostedService Service, InMemoryEventBus Bus, ITeamChatWebhoo
         var locator = Substitute.For<ITeamChatChannelLocator>();
         locator.GetChannelIdAsync(Arg.Any<ulong>(), Arg.Any<Guid>(), Arg.Any<CancellationToken>())
             .Returns((ulong?)555UL);
-        var relay = new TeamChatRelay(locator, poster, dedup);
+        // The relay reads the scoped IMuteStore command prefix per message; stub a scope that provides it.
+        var muteStore = Substitute.For<IMuteStore>();
+        muteStore.GetPrefixAsync(Arg.Any<ulong>(), Arg.Any<Guid>(), Arg.Any<CancellationToken>()).Returns("!");
+        var relayScopeFactory = Substitute.For<IServiceScopeFactory>();
+        var relayScope = Substitute.For<IServiceScope>();
+        var relayScopeProvider = Substitute.For<IServiceProvider>();
+        relayScopeProvider.GetService(typeof(IMuteStore)).Returns(muteStore);
+        relayScope.ServiceProvider.Returns(relayScopeProvider);
+        relayScopeFactory.CreateScope().Returns(relayScope);
+        var relay = new TeamChatRelay(locator, poster, dedup, relayScopeFactory);
 
         var inboundLocator = Substitute.For<ITeamChatChannelLocator>();
         var sender = Substitute.For<ITeamChatSender>();
diff --git a/tests/RustPlusBot.Features.Chat.Tests/TeamChatRelayTests.cs b/tests/RustPlusBot.Features.Chat.Tests/TeamChatRelayTests.cs
index 77dbac46..3fc9d44d 100644
--- a/tests/RustPlusBot.Features.Chat.Tests/TeamChatRelayTests.cs
+++ b/tests/RustPlusBot.Features.Chat.Tests/TeamChatRelayTests.cs
@@ -1,9 +1,11 @@
+using Microsoft.Extensions.DependencyInjection;
 using NSubstitute;
 using RustPlusBot.Abstractions.Events;
 using RustPlusBot.Abstractions.Time;
 using RustPlusBot.Features.Chat.Relaying;
 using RustPlusBot.Features.Chat.Webhooks;
 using RustPlusBot.Features.Workspace.Locating;
+using RustPlusBot.Persistence.Commands;
 
 namespace RustPlusBot.Features.Chat.Tests;
 
@@ -11,7 +13,7 @@ public sealed class TeamChatRelayTests
 {
     private static (TeamChatRelay Relay, ITeamChatWebhookPoster Poster, RelayDedupBuffer Dedup, ITeamChatChannelLocator
         Locator)
-        Build()
+        Build(string prefix = "!")
     {
         var clock = Substitute.For<IClock>();
         clock.UtcNow.Returns(DateTimeOffset.UnixEpoch);
@@ -20,7 +22,15 @@ private static (TeamChatRelay Relay, ITeamChatWebhookPoster Poster, RelayDedupBu
         var locator = Substitute.For<ITeamChatChannelLocator>();
         locator.GetChannelIdAsync(Arg.Any<ulong>(), Arg.Any<Guid>(), Arg.Any<CancellationToken>())
             .Returns((ulong?)777UL);
-        var relay = new TeamChatRelay(locator, poster, dedup);
+        var muteStore = Substitute.For<IMuteStore>();
+        muteStore.GetPrefixAsync(Arg.Any<ulong>(), Arg.Any<Guid>(), Arg.Any<CancellationToken>()).Returns(prefix);
+        var scopeFactory = Substitute.For<IServiceScopeFactory>();
+        var scope = Substitute.For<IServiceScope>();
+        var scopeProvider = Substitute.For<IServiceProvider>();
+        scopeProvider.GetService(typeof(IMuteStore)).Returns(muteStore);
+        scope.ServiceProvider.Returns(scopeProvider);
+        scopeFactory.CreateScope().Returns(scope);
+        var relay = new TeamChatRelay(locator, poster, dedup, scopeFactory);
         return (relay, poster, dedup, locator);
     }
 
@@ -74,4 +84,56 @@ public async Task Skips_when_channel_not_provisioned()
         await poster.DidNotReceive().PostAsync(Arg.Any<ulong>(), Arg.Any<string>(), Arg.Any<string>(),
             Arg.Any<CancellationToken>());
     }
+
+    [Fact]
+    public async Task Drops_bot_originated_echo_by_prefix()
+    {
+        var (relay, poster, _, _) = Build();
+        var evt = new TeamMessageReceivedEvent(10UL, Guid.Empty, 555UL, "BotPlayer", "[R+] Cargo Ship entered the map",
+            FromActivePlayer: true);
+
+        await relay.RelayAsync(evt, CancellationToken.None);
+
+        await poster.DidNotReceive().PostAsync(Arg.Any<ulong>(), Arg.Any<string>(), Arg.Any<string>(),
+            Arg.Any<CancellationToken>());
+    }
+
+    [Fact]
+    public async Task Posts_teammate_message_even_with_prefix()
+    {
+        var (relay, poster, _, _) = Build();
+        var evt = new TeamMessageReceivedEvent(10UL, Guid.Empty, 999UL, "Bob", "[R+] hi", FromActivePlayer: false);
+
+        await relay.RelayAsync(evt, CancellationToken.None);
+
+        await poster.Received(1).PostAsync(777UL, "Bob", "[R+] hi", Arg.Any<CancellationToken>());
+    }
+
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public async Task Drops_command_shaped_player_lines(bool fromActivePlayer)
+    {
+        var (relay, poster, _, _) = Build();
+        var evt = new TeamMessageReceivedEvent(10UL, Guid.Empty, 999UL, "Bob", "!pop", fromActivePlayer);
+
+        await relay.RelayAsync(evt, CancellationToken.None);
+
+        await poster.DidNotReceive().PostAsync(Arg.Any<ulong>(), Arg.Any<string>(), Arg.Any<string>(),
+            Arg.Any<CancellationToken>());
+    }
+
+    [Fact]
+    public async Task Command_drop_honors_custom_prefix()
+    {
+        var (relay, poster, _, _) = Build(prefix: ".");
+        await relay.RelayAsync(new TeamMessageReceivedEvent(10UL, Guid.Empty, 999UL, "Bob", ".pop", false),
+            CancellationToken.None);
+        await relay.RelayAsync(new TeamMessageReceivedEvent(10UL, Guid.Empty, 999UL, "Bob", "!not a command", false),
+            CancellationToken.None);
+
+        await poster.Received(1).PostAsync(777UL, "Bob", "!not a command", Arg.Any<CancellationToken>());
+        await poster.DidNotReceive().PostAsync(Arg.Any<ulong>(), Arg.Any<string>(), ".pop",
+            Arg.Any<CancellationToken>());
+    }
 }
diff --git a/tests/RustPlusBot.Features.Commands.Tests/CommandRegistrationTests.cs b/tests/RustPlusBot.Features.Commands.Tests/CommandRegistrationTests.cs
index c6b4b6ce..6a7e3626 100644
--- a/tests/RustPlusBot.Features.Commands.Tests/CommandRegistrationTests.cs
+++ b/tests/RustPlusBot.Features.Commands.Tests/CommandRegistrationTests.cs
@@ -27,7 +27,7 @@ public void Dispatcher_and_handlers_resolve()
         services.AddLogging();
         services.AddSingleton<IClock>(Substitute.For<IClock>());
         services.AddSingleton<IEventBus>(Substitute.For<IEventBus>());
-        services.AddSingleton<ITeamChatSender>(Substitute.For<ITeamChatSender>());
+        services.AddSingleton<IBotTeamChatSender>(Substitute.For<IBotTeamChatSender>());
         services.AddSingleton<IRustServerQuery>(Substitute.For<IRustServerQuery>());
         services.AddSingleton<IEventState>(_ => Substitute.For<IEventState>());
         services.AddSingleton<IRigState>(_ => Substitute.For<IRigState>());
@@ -85,7 +85,7 @@ public void Commands_contribute_an_interaction_module_assembly()
         services.AddLogging();
         services.AddSingleton<IClock>(Substitute.For<IClock>());
         services.AddSingleton<IEventBus>(Substitute.For<IEventBus>());
-        services.AddSingleton<ITeamChatSender>(Substitute.For<ITeamChatSender>());
+        services.AddSingleton<IBotTeamChatSender>(Substitute.For<IBotTeamChatSender>());
         services.AddSingleton<IRustServerQuery>(Substitute.For<IRustServerQuery>());
         services.AddSingleton<IEventState>(_ => Substitute.For<IEventState>());
         services.AddSingleton<IRigState>(_ => Substitute.For<IRigState>());
diff --git a/tests/RustPlusBot.Features.Commands.Tests/Dispatching/CommandDispatcherTests.cs b/tests/RustPlusBot.Features.Commands.Tests/Dispatching/CommandDispatcherTests.cs
index 7c1b4974..5cb7db89 100644
--- a/tests/RustPlusBot.Features.Commands.Tests/Dispatching/CommandDispatcherTests.cs
+++ b/tests/RustPlusBot.Features.Commands.Tests/Dispatching/CommandDispatcherTests.cs
@@ -12,12 +12,12 @@ namespace RustPlusBot.Features.Commands.Tests.Dispatching;
 
 public sealed class CommandDispatcherTests
 {
-    private static (CommandDispatcher Sut, ITeamChatSender Sender, StubHandler Handler) Build(
+    private static (CommandDispatcher Sut, IBotTeamChatSender Sender, StubHandler Handler) Build(
         bool muted = false,
         string prefix = "!",
         string handlerName = "pop")
     {
-        var sender = Substitute.For<ITeamChatSender>();
+        var sender = Substitute.For<IBotTeamChatSender>();
         var settings = Substitute.For<IMuteStore>();
         settings.GetMutedAsync(Arg.Any<ulong>(), Arg.Any<Guid>(), Arg.Any<CancellationToken>()).Returns(muted);
         settings.GetPrefixAsync(Arg.Any<ulong>(), Arg.Any<Guid>(), Arg.Any<CancellationToken>()).Returns(prefix);
@@ -44,10 +44,19 @@ public async Task RunsHandler_AndSendsReply()
     }
 
     [Fact]
-    public async Task Ignores_FromActivePlayer()
+    public async Task Runs_ActivePlayerCommand()
     {
         var (sut, sender, handler) = Build();
         await sut.DispatchAsync(Evt("!pop", fromActive: true), CancellationToken.None);
+        Assert.Equal(1, handler.Calls);
+        await sender.Received(1).SendAsync(1, Arg.Any<Guid>(), "reply", Arg.Any<CancellationToken>());
+    }
+
+    [Fact]
+    public async Task Ignores_BotPrefixedEcho()
+    {
+        var (sut, sender, handler) = Build();
+        await sut.DispatchAsync(Evt("[R+] anything", fromActive: true), CancellationToken.None);
         Assert.Equal(0, handler.Calls);
         await sender.DidNotReceive().SendAsync(Arg.Any<ulong>(), Arg.Any<Guid>(), Arg.Any<string>(),
             Arg.Any<CancellationToken>());
diff --git a/tests/RustPlusBot.Features.Commands.Tests/Hosting/CommandsHostedServiceTests.cs b/tests/RustPlusBot.Features.Commands.Tests/Hosting/CommandsHostedServiceTests.cs
index 678fde03..7987f592 100644
--- a/tests/RustPlusBot.Features.Commands.Tests/Hosting/CommandsHostedServiceTests.cs
+++ b/tests/RustPlusBot.Features.Commands.Tests/Hosting/CommandsHostedServiceTests.cs
@@ -16,7 +16,7 @@ public sealed class CommandsHostedServiceTests
 {
     private static Harness Create(bool prefixThrows = false)
     {
-        var sender = Substitute.For<ITeamChatSender>();
+        var sender = Substitute.For<IBotTeamChatSender>();
         sender.SendAsync(Arg.Any<ulong>(), Arg.Any<Guid>(), Arg.Any<string>(), Arg.Any<CancellationToken>())
             .Returns(TeamChatSendResult.Sent);
 
@@ -63,7 +63,7 @@ public async Task TeamMessageReceivedEvent_dispatches_the_command_and_relays_the
         var deadline = DateTimeOffset.UtcNow.AddSeconds(20);
         while (DateTimeOffset.UtcNow < deadline
                && !h.Sender.ReceivedCalls().Any(c =>
-                   c.GetMethodInfo().Name == nameof(ITeamChatSender.SendAsync)))
+                   c.GetMethodInfo().Name == nameof(IBotTeamChatSender.SendAsync)))
         {
             await h.Bus.PublishAsync(
                 new TeamMessageReceivedEvent(10UL, serverId, 7UL, "alice", "!pop", FromActivePlayer: false));
@@ -115,7 +115,7 @@ await h.Sender.DidNotReceive().SendAsync(
     private sealed record Harness(
         CommandsHostedService Service,
         InMemoryEventBus Bus,
-        ITeamChatSender Sender,
+        IBotTeamChatSender Sender,
         StubHandler Handler,
         IMuteStore MuteStore);
 
diff --git a/tests/RustPlusBot.Features.Connections.Tests/BotTeamChatSenderTests.cs b/tests/RustPlusBot.Features.Connections.Tests/BotTeamChatSenderTests.cs
new file mode 100644
index 00000000..aa3d4fc6
--- /dev/null
+++ b/tests/RustPlusBot.Features.Connections.Tests/BotTeamChatSenderTests.cs
@@ -0,0 +1,38 @@
+using NSubstitute;
+using RustPlusBot.Features.Connections.Listening;
+
+namespace RustPlusBot.Features.Connections.Tests;
+
+public sealed class BotTeamChatSenderTests
+{
+    [Fact]
+    public async Task Prefixes_the_message_and_forwards()
+    {
+        var inner = Substitute.For<ITeamChatSender>();
+        inner.SendAsync(Arg.Any<ulong>(), Arg.Any<Guid>(), Arg.Any<string>(), Arg.Any<CancellationToken>())
+            .Returns(TeamChatSendResult.Sent);
+        var serverId = Guid.NewGuid();
+        var sut = new BotTeamChatSender(inner);
+
+        var result = await sut.SendAsync(10UL, serverId, "hello", CancellationToken.None);
+
+        Assert.Equal(TeamChatSendResult.Sent, result);
+        await inner.Received(1).SendAsync(10UL, serverId, "[R+] hello", Arg.Any<CancellationToken>());
+    }
+
+    [Theory]
+    [InlineData(TeamChatSendResult.Sent)]
+    [InlineData(TeamChatSendResult.NotConnected)]
+    [InlineData(TeamChatSendResult.Failed)]
+    public async Task Passes_the_result_through(TeamChatSendResult expected)
+    {
+        var inner = Substitute.For<ITeamChatSender>();
+        inner.SendAsync(Arg.Any<ulong>(), Arg.Any<Guid>(), Arg.Any<string>(), Arg.Any<CancellationToken>())
+            .Returns(expected);
+        var sut = new BotTeamChatSender(inner);
+
+        var result = await sut.SendAsync(1UL, Guid.Empty, "x", CancellationToken.None);
+
+        Assert.Equal(expected, result);
+    }
+}
diff --git a/tests/RustPlusBot.Features.Connections.Tests/ConnectionRegistrationTests.cs b/tests/RustPlusBot.Features.Connections.Tests/ConnectionRegistrationTests.cs
index 0a12d577..97c4c8e0 100644
--- a/tests/RustPlusBot.Features.Connections.Tests/ConnectionRegistrationTests.cs
+++ b/tests/RustPlusBot.Features.Connections.Tests/ConnectionRegistrationTests.cs
@@ -6,6 +6,7 @@
 using RustPlusBot.Abstractions.Time;
 using RustPlusBot.Discord.Notifications;
 using RustPlusBot.Features.Connections;
+using RustPlusBot.Features.Connections.Listening;
 using RustPlusBot.Features.Connections.Removal;
 using RustPlusBot.Features.Connections.Supervisor;
 using RustPlusBot.Features.Workspace.Teardown;
@@ -37,6 +38,7 @@ public async Task Services_Resolve()
         });
 
         Assert.NotNull(provider.GetRequiredService<IConnectionSupervisor>());
+        Assert.NotNull(provider.GetRequiredService<IBotTeamChatSender>());
         await using var scope = provider.CreateAsyncScope();
         Assert.NotNull(scope.ServiceProvider.GetRequiredService<IConnectionStore>());
         Assert.NotNull(scope.ServiceProvider.GetRequiredService<IServerRemovalService>());
diff --git a/tests/RustPlusBot.Features.Events.Tests/EventRegistrationTests.cs b/tests/RustPlusBot.Features.Events.Tests/EventRegistrationTests.cs
index 03dc9ffc..fd56348d 100644
--- a/tests/RustPlusBot.Features.Events.Tests/EventRegistrationTests.cs
+++ b/tests/RustPlusBot.Features.Events.Tests/EventRegistrationTests.cs
@@ -42,7 +42,7 @@ private static ServiceProvider BuildProvider()
         services.AddSingleton<IEventChannelLocator>(Substitute.For<IEventChannelLocator>());
         services.AddScoped<IWorkspaceStore>(_ => Substitute.For<IWorkspaceStore>());
         services.AddScoped<IConnectionStore>(_ => Substitute.For<IConnectionStore>());
-        services.AddSingleton<ITeamChatSender>(Substitute.For<ITeamChatSender>());
+        services.AddSingleton<IBotTeamChatSender>(Substitute.For<IBotTeamChatSender>());
         services.AddSingleton(Options.Create(new ConnectionOptions()));
         services.AddEvents();
 
diff --git a/tests/RustPlusBot.Features.Events.Tests/Relaying/EventRelayTests.cs b/tests/RustPlusBot.Features.Events.Tests/Relaying/EventRelayTests.cs
index 70f53104..02081439 100644
--- a/tests/RustPlusBot.Features.Events.Tests/Relaying/EventRelayTests.cs
+++ b/tests/RustPlusBot.Features.Events.Tests/Relaying/EventRelayTests.cs
@@ -24,7 +24,7 @@ public sealed class EventRelayTests
     private static readonly Guid Server = Guid.NewGuid();
 
     private static (EventRelay Relay, EventStateStore Store, IEventChannelPoster Poster,
-        ITeamChatSender Sender, RigStateStore RigStore) CreateRelay(ulong? channelId = 999UL)
+        IBotTeamChatSender Sender, RigStateStore RigStore) CreateRelay(ulong? channelId = 999UL)
     {
         var clock = Substitute.For<IClock>();
         clock.UtcNow.Returns(new DateTimeOffset(2026, 6, 17, 12, 0, 0, TimeSpan.Zero));
@@ -43,7 +43,7 @@ private static (EventRelay Relay, EventStateStore Store, IEventChannelPoster Pos
         services.AddScoped<IWorkspaceStore>(_ => workspaceStore);
         var provider = services.BuildServiceProvider();
 
-        var sender = Substitute.For<ITeamChatSender>();
+        var sender = Substitute.For<IBotTeamChatSender>();
         var rigStore = new RigStateStore(clock, Options.Create(new ConnectionOptions()));
         var renderer = new EventEmbedRenderer(new ResxLocalizer());
 
diff --git a/tests/RustPlusBot.Features.Players.Tests/Hosting/PlayersHostedServiceTests.cs b/tests/RustPlusBot.Features.Players.Tests/Hosting/PlayersHostedServiceTests.cs
index 2deecf5c..02ec2391 100644
--- a/tests/RustPlusBot.Features.Players.Tests/Hosting/PlayersHostedServiceTests.cs
+++ b/tests/RustPlusBot.Features.Players.Tests/Hosting/PlayersHostedServiceTests.cs
@@ -30,7 +30,7 @@ private static Harness Create()
         locator.GetChannelIdAsync(Arg.Any<ulong>(), Arg.Any<Guid>(), Arg.Any<CancellationToken>())
             .Returns((ulong?)null);
         var poster = Substitute.For<IPlayerChannelPoster>();
-        var sender = Substitute.For<ITeamChatSender>();
+        var sender = Substitute.For<IBotTeamChatSender>();
         sender.SendAsync(Arg.Any<ulong>(), Arg.Any<Guid>(), Arg.Any<string>(), Arg.Any<CancellationToken>())
             .Returns(TeamChatSendResult.Sent);
 
@@ -57,7 +57,7 @@ public async Task PlayerStateChangedEvent_routes_to_relay_and_sends_ingame_line(
         var deadline = DateTimeOffset.UtcNow.AddSeconds(20);
         while (DateTimeOffset.UtcNow < deadline
                && !h.Sender.ReceivedCalls().Any(c =>
-                   c.GetMethodInfo().Name == nameof(ITeamChatSender.SendAsync)))
+                   c.GetMethodInfo().Name == nameof(IBotTeamChatSender.SendAsync)))
         {
             await h.Bus.PublishAsync(new PlayerStateChangedEvent(
                 10UL, serverId,
@@ -97,7 +97,7 @@ public async Task RelayLoop_faults_on_sender_exception_but_StopAsync_completes_c
         var deadline = DateTimeOffset.UtcNow.AddSeconds(20);
         while (DateTimeOffset.UtcNow < deadline
                && !h.Sender.ReceivedCalls().Any(c =>
-                   c.GetMethodInfo().Name == nameof(ITeamChatSender.SendAsync)))
+                   c.GetMethodInfo().Name == nameof(IBotTeamChatSender.SendAsync)))
         {
             await h.Bus.PublishAsync(new PlayerStateChangedEvent(
                 10UL, Guid.NewGuid(),
@@ -116,7 +116,7 @@ await h.Sender.Received().SendAsync(
     private sealed record Harness(
         PlayersHostedService Service,
         InMemoryEventBus Bus,
-        ITeamChatSender Sender,
+        IBotTeamChatSender Sender,
         IEventChannelLocator Locator,
         IPlayerChannelPoster Poster);
 }
diff --git a/tests/RustPlusBot.Features.Players.Tests/PlayerEventRegistrationTests.cs b/tests/RustPlusBot.Features.Players.Tests/PlayerEventRegistrationTests.cs
index 54d07746..51d9312a 100644
--- a/tests/RustPlusBot.Features.Players.Tests/PlayerEventRegistrationTests.cs
+++ b/tests/RustPlusBot.Features.Players.Tests/PlayerEventRegistrationTests.cs
@@ -30,7 +30,7 @@ private static ServiceProvider BuildProvider()
         services.AddSingleton(new DiscordSocketClient());
         services.AddSingleton<IEventChannelLocator>(Substitute.For<IEventChannelLocator>());
         services.AddScoped<IWorkspaceStore>(_ => Substitute.For<IWorkspaceStore>());
-        services.AddSingleton<ITeamChatSender>(Substitute.For<ITeamChatSender>());
+        services.AddSingleton<IBotTeamChatSender>(Substitute.For<IBotTeamChatSender>());
         services.AddPlayers();
         return services.BuildServiceProvider(validateScopes: true);
     }
diff --git a/tests/RustPlusBot.Features.Players.Tests/PlayerEventRelayTests.cs b/tests/RustPlusBot.Features.Players.Tests/PlayerEventRelayTests.cs
index 7cf88a11..59e3c042 100644
--- a/tests/RustPlusBot.Features.Players.Tests/PlayerEventRelayTests.cs
+++ b/tests/RustPlusBot.Features.Players.Tests/PlayerEventRelayTests.cs
@@ -16,7 +16,7 @@ public sealed class PlayerEventRelayTests
 {
     private readonly IEventChannelLocator _locator = Substitute.For<IEventChannelLocator>();
     private readonly IPlayerChannelPoster _poster = Substitute.For<IPlayerChannelPoster>();
-    private readonly ITeamChatSender _sender = Substitute.For<ITeamChatSender>();
+    private readonly IBotTeamChatSender _sender = Substitute.For<IBotTeamChatSender>();
     private readonly IWorkspaceStore _workspace = Substitute.For<IWorkspaceStore>();
 
     private PlayerEventRelay BuildRelay()