TUI/Core: preserve duplicate skill/app mention selection across submit + resume

[daniel-oai]

What changed

• In codex-rs/core/src/skills/injection.rs, we now honor explicit UserInput::Skill { name, path } first, then fall back to text mentions only when safe.
• In codex-rs/tui/src/bottom_pane/chat_composer.rs, mention selection is now token-bound (selected mention is tied to the specific inserted $token), and we snapshot bindings at submit time so selection is not lost.
• In codex-rs/tui/src/chatwidget.rs and codex-rs/tui/src/bottom_pane/mod.rs, submit/queue paths now consume the submit-time mention snapshot (instead of rereading cleared composer state).
• In codex-rs/tui/src/mention_codec.rs and codex-rs/tui/src/bottom_pane/chat_composer_history.rs, history now round-trips mention targets so resume restores the same selected duplicate.
• In codex-rs/tui/src/bottom_pane/skill_popup.rs and codex-rs/tui/src/bottom_pane/chat_composer.rs, duplicate labels are normalized to [Repo] / [App], app rows no longer show Connected -, and description space is a bit wider.

Before vs now

• Before: selecting a duplicate could still submit the default/repo match, and resume could lose which duplicate was originally selected.
• Now: the exact selected target (skill path or app id) is preserved through submit, queue/restore, and resume.

Manual test

1. Build and run this branch locally:
   • cd /Users/daniels/code/codex/codex-rs
   • cargo build -p codex-cli --bin codex
   • ./target/debug/codex
2. Open mention picker with $ and pick a duplicate entry (not the first one).
3. Confirm duplicate UI:
   • repo duplicate rows show [Repo]
   • app duplicate rows show [App]
   • app description does not start with Connected -
4. Submit the prompt, then press Up to restore draft and submit again.
   Expected: it keeps the same selected duplicate target.
5. Use /resume to reopen the session and send again.
   Expected: restored mention still resolves to the same duplicate target.

[chatgpt-codex-connector]

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 5def75d495

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

• Open a pull request for review
• Mark a draft as ready
• Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

[xl-openai]

@codex can you help me understand how we use MentionBinding? More specially:

1. When do we set MentionBinding;
2. How do we clear MentionBinding.

[chatgpt-codex-connector]

Answer

1. When do we set MentionBinding?

• On mention selection from the popup: when a user picks a skill/app mention, insert_selected_mention inserts the $token as an element and stores the binding (mention + path) in mention_bindings keyed by that element id. codex-rs/tui/src/bottom_pane/chat_composer.rsL1846-L1861
• When restoring a draft with bindings: set_text_content_with_mention_bindings rehydrates mention bindings via bind_mentions_from_snapshot, which scans for $token occurrences and rebuilds the binding map to match the restored text/elements. codex-rs/tui/src/bottom_pane/chat_composer.rsL777-L815 codex-rs/tui/src/bottom_pane/chat_composer.rsL1912-L1944

2. How do we clear MentionBinding?

• Fresh draft resets: set_text_content routes to set_text_content_with_mention_bindings(..., Vec::new()), which explicitly clears self.mention_bindings before any new content is set, so starting fresh clears all bindings. codex-rs/tui/src/bottom_pane/chat_composer.rsL757-L796
• Explicit drain: take_mention_bindings removes any bindings tied to current mention elements and then clears the map entirely, returning the drained bindings. codex-rs/tui/src/bottom_pane/chat_composer.rsL426-L440
• Snapshot rebind: bind_mentions_from_snapshot always clears existing bindings before re-adding the snapshot’s bindings, so rehydrate paths replace the current map rather than merge with it. codex-rs/tui/src/bottom_pane/chat_composer.rsL1912-L1944

Commands Used

• sed -n '1,220p' codex-rs/tui/src/bottom_pane/chat_composer.rs
• rg -n "MentionBinding" codex-rs/tui/src/bottom_pane/chat_composer.rs
• sed -n '260,520p' codex-rs/tui/src/bottom_pane/chat_composer.rs
• sed -n '780,980p' codex-rs/tui/src/bottom_pane/chat_composer.rs
• sed -n '1820,1985p' codex-rs/tui/src/bottom_pane/chat_composer.rs
• rg -n "mention_bindings\\.clear|mention_bindings =|mention_bindings\\.insert" codex-rs/tui/src/bottom_pane/chat_composer.rs
• rg -n "set_text_content\\(" -n codex-rs/tui/src/bottom_pane/chat_composer.rs
• rg -n "take_mention_bindings\\(|mention_bindings\\(" codex-rs/tui/src
• sed -n '220,520p' codex-rs/tui/src/bottom_pane/mod.rs
• sed -n '3000,3095p' codex-rs/tui/src/chatwidget.rs
• nl -ba codex-rs/tui/src/bottom_pane/chat_composer.rs | sed -n '720,860p'
• nl -ba codex-rs/tui/src/bottom_pane/chat_composer.rs | sed -n '1828,1935p'
• nl -ba codex-rs/tui/src/bottom_pane/chat_composer.rs | sed -n '1935,1965p'
• nl -ba codex-rs/tui/src/bottom_pane/chat_composer.rs | sed -n '420,450p'

View task →