From 4fe31d7f403b8916364d0ed0dbea8f015b2510ee Mon Sep 17 00:00:00 2001
From: Richard Feldman <oss@rtfeldman.com>
Date: Wed, 22 Oct 2025 14:20:38 -0400
Subject: [PATCH] Bail on slash-command arg parsing if it starts with `@`

---
 crates/agent_ui/src/acp/completion_provider.rs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/crates/agent_ui/src/acp/completion_provider.rs b/crates/agent_ui/src/acp/completion_provider.rs
index 8cbae5a5420a2f89d0f7ca478ae77a5d5d350411..3641e00bea3ccc8c10145fc33ae51d2afcc010d8 100644
--- a/crates/agent_ui/src/acp/completion_provider.rs
+++ b/crates/agent_ui/src/acp/completion_provider.rs
@@ -1047,6 +1047,12 @@ impl SlashCommandCompletion {
         let mut argument = None;
         let mut command = None;
         if let Some((command_text, args)) = last_command.split_once(char::is_whitespace) {
+            // If the args start with '@', treat this as a mention completion, not a slash command argument.
+            // Early-return None to let MentionCompletion::try_parse handle it.
+            if args.trim_start().starts_with('@') {
+                return None;
+            }
+
             if !args.is_empty() {
                 argument = Some(args.trim_end().to_string());
             }