mirror of
https://github.com/openai/codex.git
synced 2026-11-03 08:22:30 +00:00
We are removing feature-gated shared crates from the `codex-rs` workspace. `codex-common` grouped several unrelated utilities behind `[features]`, which made dependency boundaries harder to reason about and worked against the ongoing effort to eliminate feature flags from workspace crates. Splitting these utilities into dedicated crates under `utils/` aligns this area with existing workspace structure and keeps each dependency explicit at the crate boundary. ## What changed - Removed `codex-rs/common` (`codex-common`) from workspace members and workspace dependencies. - Added six new utility crates under `codex-rs/utils/`: - `codex-utils-cli` - `codex-utils-elapsed` - `codex-utils-sandbox-summary` - `codex-utils-approval-presets` - `codex-utils-oss` - `codex-utils-fuzzy-match` - Migrated the corresponding modules out of `codex-common` into these crates (with tests), and added matching `BUILD.bazel` targets. - Updated direct consumers to use the new crates instead of `codex-common`: - `codex-rs/cli` - `codex-rs/tui` - `codex-rs/exec` - `codex-rs/app-server` - `codex-rs/mcp-server` - `codex-rs/chatgpt` - `codex-rs/cloud-tasks` - Updated workspace lockfile entries to reflect the new dependency graph and removal of `codex-common`.
214 lines
6.7 KiB
Rust
214 lines
6.7 KiB
Rust
use crossterm::event::KeyCode;
|
|
use ratatui::buffer::Buffer;
|
|
use ratatui::layout::Constraint;
|
|
use ratatui::layout::Layout;
|
|
use ratatui::layout::Rect;
|
|
use ratatui::text::Line;
|
|
use ratatui::widgets::Widget;
|
|
use ratatui::widgets::WidgetRef;
|
|
|
|
use super::popup_consts::MAX_POPUP_ROWS;
|
|
use super::scroll_state::ScrollState;
|
|
use super::selection_popup_common::GenericDisplayRow;
|
|
use super::selection_popup_common::render_rows_single_line;
|
|
use crate::key_hint;
|
|
use crate::render::Insets;
|
|
use crate::render::RectExt;
|
|
use crate::text_formatting::truncate_text;
|
|
use codex_utils_fuzzy_match::fuzzy_match;
|
|
|
|
#[derive(Clone, Debug)]
|
|
pub(crate) struct MentionItem {
|
|
pub(crate) display_name: String,
|
|
pub(crate) description: Option<String>,
|
|
pub(crate) insert_text: String,
|
|
pub(crate) search_terms: Vec<String>,
|
|
pub(crate) path: Option<String>,
|
|
pub(crate) category_tag: Option<String>,
|
|
}
|
|
|
|
const MENTION_NAME_TRUNCATE_LEN: usize = 24;
|
|
|
|
pub(crate) struct SkillPopup {
|
|
query: String,
|
|
mentions: Vec<MentionItem>,
|
|
state: ScrollState,
|
|
}
|
|
|
|
impl SkillPopup {
|
|
pub(crate) fn new(mentions: Vec<MentionItem>) -> Self {
|
|
Self {
|
|
query: String::new(),
|
|
mentions,
|
|
state: ScrollState::new(),
|
|
}
|
|
}
|
|
|
|
pub(crate) fn set_mentions(&mut self, mentions: Vec<MentionItem>) {
|
|
self.mentions = mentions;
|
|
self.clamp_selection();
|
|
}
|
|
|
|
pub(crate) fn set_query(&mut self, query: &str) {
|
|
self.query = query.to_string();
|
|
self.clamp_selection();
|
|
}
|
|
|
|
pub(crate) fn calculate_required_height(&self, _width: u16) -> u16 {
|
|
let rows = self.rows_from_matches(self.filtered());
|
|
let visible = rows.len().clamp(1, MAX_POPUP_ROWS);
|
|
(visible as u16).saturating_add(2)
|
|
}
|
|
|
|
pub(crate) fn move_up(&mut self) {
|
|
let len = self.filtered_items().len();
|
|
self.state.move_up_wrap(len);
|
|
self.state.ensure_visible(len, MAX_POPUP_ROWS.min(len));
|
|
}
|
|
|
|
pub(crate) fn move_down(&mut self) {
|
|
let len = self.filtered_items().len();
|
|
self.state.move_down_wrap(len);
|
|
self.state.ensure_visible(len, MAX_POPUP_ROWS.min(len));
|
|
}
|
|
|
|
pub(crate) fn selected_mention(&self) -> Option<&MentionItem> {
|
|
let matches = self.filtered_items();
|
|
let idx = self.state.selected_idx?;
|
|
let mention_idx = matches.get(idx)?;
|
|
self.mentions.get(*mention_idx)
|
|
}
|
|
|
|
fn clamp_selection(&mut self) {
|
|
let len = self.filtered_items().len();
|
|
self.state.clamp_selection(len);
|
|
self.state.ensure_visible(len, MAX_POPUP_ROWS.min(len));
|
|
}
|
|
|
|
fn filtered_items(&self) -> Vec<usize> {
|
|
self.filtered().into_iter().map(|(idx, _, _)| idx).collect()
|
|
}
|
|
|
|
fn rows_from_matches(
|
|
&self,
|
|
matches: Vec<(usize, Option<Vec<usize>>, i32)>,
|
|
) -> Vec<GenericDisplayRow> {
|
|
matches
|
|
.into_iter()
|
|
.map(|(idx, indices, _score)| {
|
|
let mention = &self.mentions[idx];
|
|
let name = truncate_text(&mention.display_name, MENTION_NAME_TRUNCATE_LEN);
|
|
let description = mention.description.clone().unwrap_or_default();
|
|
GenericDisplayRow {
|
|
name,
|
|
match_indices: indices,
|
|
display_shortcut: None,
|
|
description: Some(description).filter(|desc| !desc.is_empty()),
|
|
category_tag: mention.category_tag.clone(),
|
|
is_disabled: false,
|
|
disabled_reason: None,
|
|
wrap_indent: None,
|
|
}
|
|
})
|
|
.collect()
|
|
}
|
|
|
|
fn filtered(&self) -> Vec<(usize, Option<Vec<usize>>, i32)> {
|
|
let filter = self.query.trim();
|
|
let mut out: Vec<(usize, Option<Vec<usize>>, i32)> = Vec::new();
|
|
|
|
if filter.is_empty() {
|
|
for (idx, _mention) in self.mentions.iter().enumerate() {
|
|
out.push((idx, None, 0));
|
|
}
|
|
return out;
|
|
}
|
|
|
|
for (idx, mention) in self.mentions.iter().enumerate() {
|
|
let mut best_match: Option<(Option<Vec<usize>>, i32)> = None;
|
|
|
|
if let Some((indices, score)) = fuzzy_match(&mention.display_name, filter) {
|
|
best_match = Some((Some(indices), score));
|
|
}
|
|
|
|
for term in &mention.search_terms {
|
|
if term == &mention.display_name {
|
|
continue;
|
|
}
|
|
|
|
if let Some((_indices, score)) = fuzzy_match(term, filter) {
|
|
match best_match.as_mut() {
|
|
Some((best_indices, best_score)) => {
|
|
if score > *best_score {
|
|
*best_score = score;
|
|
*best_indices = None;
|
|
}
|
|
}
|
|
None => {
|
|
best_match = Some((None, score));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
if let Some((indices, score)) = best_match {
|
|
out.push((idx, indices, score));
|
|
}
|
|
}
|
|
|
|
out.sort_by(|a, b| {
|
|
a.2.cmp(&b.2).then_with(|| {
|
|
let an = self.mentions[a.0].display_name.as_str();
|
|
let bn = self.mentions[b.0].display_name.as_str();
|
|
an.cmp(bn)
|
|
})
|
|
});
|
|
|
|
out
|
|
}
|
|
}
|
|
|
|
impl WidgetRef for SkillPopup {
|
|
fn render_ref(&self, area: Rect, buf: &mut Buffer) {
|
|
let (list_area, hint_area) = if area.height > 2 {
|
|
let [list_area, _spacer_area, hint_area] = Layout::vertical([
|
|
Constraint::Length(area.height - 2),
|
|
Constraint::Length(1),
|
|
Constraint::Length(1),
|
|
])
|
|
.areas(area);
|
|
(list_area, Some(hint_area))
|
|
} else {
|
|
(area, None)
|
|
};
|
|
let rows = self.rows_from_matches(self.filtered());
|
|
render_rows_single_line(
|
|
list_area.inset(Insets::tlbr(0, 2, 0, 0)),
|
|
buf,
|
|
&rows,
|
|
&self.state,
|
|
MAX_POPUP_ROWS,
|
|
"no matches",
|
|
);
|
|
if let Some(hint_area) = hint_area {
|
|
let hint_area = Rect {
|
|
x: hint_area.x + 2,
|
|
y: hint_area.y,
|
|
width: hint_area.width.saturating_sub(2),
|
|
height: hint_area.height,
|
|
};
|
|
skill_popup_hint_line().render(hint_area, buf);
|
|
}
|
|
}
|
|
}
|
|
|
|
fn skill_popup_hint_line() -> Line<'static> {
|
|
Line::from(vec![
|
|
"Press ".into(),
|
|
key_hint::plain(KeyCode::Enter).into(),
|
|
" to insert or ".into(),
|
|
key_hint::plain(KeyCode::Esc).into(),
|
|
" to close".into(),
|
|
])
|
|
}
|