tui: prevent scoped npm package tokens from triggering @ file search

simonsickle · simonsickle · commit 80791c29fb8b · 2026-02-18T13:18:37.000-05:00
Ignore @-prefixed tokens that contain a second @ so scoped package strings like @kaeawc/auto-mobile@latest are treated as plain text.

Add a regression test that verifies this prompt submits on Enter and does not activate the file-search popup.
diff --git a/codex-rs/tui/src/bottom_pane/chat_composer.rs b/codex-rs/tui/src/bottom_pane/chat_composer.rs
@@ -1847,8 +1847,12 @@ impl ChatComposer {
         let left_match = token_left.filter(|t| t.starts_with(prefix));
         let right_match = token_right.filter(|t| t.starts_with(prefix));
 
-        let left_prefixed = left_match.map(|t| t[prefix.len_utf8()..].to_string());
-        let right_prefixed = right_match.map(|t| t[prefix.len_utf8()..].to_string());
+        let left_prefixed = left_match
+            .map(|t| t[prefix.len_utf8()..].to_string())
+            .filter(|value| !value.contains(prefix));
+        let right_prefixed = right_match
+            .map(|t| t[prefix.len_utf8()..].to_string())
+            .filter(|value| !value.contains(prefix));
 
         if at_whitespace {
             if right_prefixed.is_some() {
@@ -4826,6 +4830,39 @@ mod tests {
         }
     }
 
+    #[test]
+    fn enter_submits_prompt_ending_with_scoped_npm_package() {
+        use crossterm::event::KeyCode;
+        use crossterm::event::KeyEvent;
+        use crossterm::event::KeyModifiers;
+
+        let (tx, _rx) = unbounded_channel::<AppEvent>();
+        let sender = AppEventSender::new(tx);
+        let mut composer = ChatComposer::new(
+            true,
+            sender,
+            false,
+            "Ask Codex to do anything".to_string(),
+            false,
+        );
+        composer.set_steer_enabled(true);
+
+        let prompt = "npx -y @kaeawc/auto-mobile@latest";
+        composer.insert_str(prompt);
+        assert!(
+            !composer.popup_active(),
+            "scoped npm package should not trigger @ file search popup"
+        );
+
+        let (result, _needs_redraw) =
+            composer.handle_key_event(KeyEvent::new(KeyCode::Enter, KeyModifiers::NONE));
+
+        match result {
+            InputResult::Submitted { text, .. } => assert_eq!(text, prompt),
+            _ => panic!("expected Submitted"),
+        }
+    }
+
     /// Behavior: if the ASCII path has a pending first char (flicker suppression) and a non-ASCII
     /// char arrives next, the pending ASCII char should still be preserved and the overall input
     /// should submit normally (i.e. we should not misclassify this as a paste burst).
