Skip to content

Commit 9fd1501

Browse files
zixlin7zixlin7
committed
some fnf items
1 parent 7ad7b30 commit 9fd1501

File tree

7 files changed

+37
-23
lines changed

7 files changed

+37
-23
lines changed

‎crates/chat-cli/src/cli/chat/cli/context.rs‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ impl ContextSubcommand {
9595
session.stderr,
9696
style::SetAttribute(Attribute::Bold),
9797
StyledText::emphasis_fg(),
98-
style::Print(format!("👤 Agent ({}):\n", context_manager.current_profile)),
98+
style::Print(format!("Agent ({}):\n", context_manager.current_profile)),
9999
StyledText::reset_attributes(),
100100
)?;
101101

@@ -108,7 +108,10 @@ impl ContextSubcommand {
108108
)?;
109109
} else {
110110
for path in &agent_owned_list {
111-
execute!(session.stderr, style::Print(format!(" {} ", path.get_path_as_str())))?;
111+
execute!(
112+
session.stderr,
113+
style::Print(format!(" - {} ", path.get_path_as_str()))
114+
)?;
112115
if let Ok(context_files) = context_manager
113116
.get_context_files_by_path(os, path.get_path_as_str())
114117
.await
@@ -135,7 +138,7 @@ impl ContextSubcommand {
135138
session.stderr,
136139
style::SetAttribute(Attribute::Bold),
137140
StyledText::emphasis_fg(),
138-
style::Print("💬 Session (temporary):\n"),
141+
style::Print("Session (temporary):\n"),
139142
StyledText::reset_attributes(),
140143
)?;
141144

@@ -148,7 +151,10 @@ impl ContextSubcommand {
148151
)?;
149152
} else {
150153
for path in &session_owned_list {
151-
execute!(session.stderr, style::Print(format!(" {} ", path.get_path_as_str())))?;
154+
execute!(
155+
session.stderr,
156+
style::Print(format!(" - {} ", path.get_path_as_str()))
157+
)?;
152158
if let Ok(context_files) = context_manager
153159
.get_context_files_by_path(os, path.get_path_as_str())
154160
.await
@@ -197,12 +203,11 @@ impl ContextSubcommand {
197203
StyledText::reset_attributes()
198204
)?;
199205

200-
for (filename, content, is_temporary) in &profile_context_files {
206+
for (filename, content, _is_temporary) in &profile_context_files {
201207
let est_tokens = TokenCounter::count_tokens(content);
202-
let icon = if *is_temporary { "💬" } else { "👤" };
203208
execute!(
204209
session.stderr,
205-
style::Print(format!("{icon} {filename} ")),
210+
style::Print(format!("- {filename} ")),
206211
StyledText::secondary_fg(),
207212
style::Print(format!("(~{est_tokens} tkns)\n")),
208213
StyledText::reset(),

‎crates/chat-cli/src/cli/chat/cli/model.rs‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,11 @@ pub async fn select_model(os: &Os, session: &mut ChatSession) -> Result<Option<C
116116
StyledText::secondary("-- experimental")
117117
)
118118
} else {
119-
format!("{display_name} {} | {desc}", StyledText::current_item("(current)"))
119+
format!(
120+
"{display_name} {} | {}",
121+
StyledText::current_item("(current)"),
122+
StyledText::secondary(desc)
123+
)
120124
}
121125
} else {
122126
format!("{display_name} {}", StyledText::current_item("(current)"))
@@ -125,7 +129,7 @@ pub async fn select_model(os: &Os, session: &mut ChatSession) -> Result<Option<C
125129
if desc.to_lowercase().contains("experimental") {
126130
format!("{display_name} {}", StyledText::secondary("-- experimental"))
127131
} else {
128-
format!("{display_name} | {desc}")
132+
format!("{display_name} | {}", StyledText::secondary(desc))
129133
}
130134
} else {
131135
display_name.to_string()
@@ -135,9 +139,13 @@ pub async fn select_model(os: &Os, session: &mut ChatSession) -> Result<Option<C
135139

136140
let selection: Option<_> = match Select::with_theme(&crate::util::dialoguer_theme())
137141
.with_prompt(format!(
138-
"Press ({}) to navigate · Enter({}) to select model",
142+
"{}({}) {} · {}({}) {}",
143+
StyledText::secondary("Press "),
139144
StyledText::current_item("↑↓"),
140-
StyledText::current_item("⏎")
145+
StyledText::secondary("to navigate"),
146+
StyledText::secondary("Enter"),
147+
StyledText::current_item("⏎"),
148+
StyledText::secondary("to select model")
141149
))
142150
.items(&labels)
143151
.default(0)

‎crates/chat-cli/src/cli/chat/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2598,7 +2598,7 @@ impl ChatSession {
25982598
StyledText::reset_attributes(),
25992599
)?;
26002600
}
2601-
execute!(self.stdout, style::Print("\n\n"))?;
2601+
execute!(self.stdout, style::Print("\n"))?;
26022602

26032603
tool_telemetry = tool_telemetry.and_modify(|ev| ev.is_success = Some(true));
26042604
if let Tool::Custom(_) = &tool.tool {

‎crates/chat-cli/src/cli/chat/skim_integration.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ fn create_skim_options(prompt: &str, multi: bool) -> Result<SkimOptions> {
7878
.reverse(true)
7979
.multi(multi)
8080
.color(Some(format!(
81-
"current:{BRAND_COLOR_ANSI}:bold,pointer:{BRAND_COLOR_ANSI},prompt:{SECONDARY_COLOR_ANSI}"
81+
"current:{BRAND_COLOR_ANSI}:bold,pointer:{BRAND_COLOR_ANSI},prompt:{SECONDARY_COLOR_ANSI},current_bg:-1"
8282
)))
8383
.build()
8484
.map_err(|e| eyre!("Failed to build skim options: {}", e))

‎crates/chat-cli/src/constants.rs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -131,16 +131,16 @@ pub mod ui_text {
131131
pub fn welcome_text() -> String {
132132
StyledText::brand(
133133
"⠀⠀⠀⠀⠀⠀⠀
134-
⠀⠀⠀⠀⠀⠀⠀⠀⢀⣴⣶⣶⣦⡀⠀⠀⠀⠀⢀⣴⣶⣦⣄⠀⠀⢀⣴⣶⣶⣦⡀⠀⠀⢀⣴⣶⣶⣶⣶⣶⣶⣶⣶⣶⣦⣄⡀⠀⠀⠀⠀⠀⠀⢀⣠⣴⣶⣶⣶⣶⣶⣦⣄⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀
135-
⠀⠀⠀⠀⠀⠀⠀⢰⣿⠋⠁⠈⠙⣿⡆⠀⢀⣾⡿⠁⠀⠈⢻⡇⢰⣿⠋⠁⠈⠙⣿⡆⢰⣿⠋⠁⠀⠀⠀⠀⠀⠀⠀⠀⠈⠙⠻⣦⠀⠀⠀⠀⣴⡿⠟⠋⠁⠀⠀⠀⠈⠙⠻⢿⣦⠀⠀⠀⠀⠀⠀⠀
136-
⠀⠀⠀⠀⠀⠀⠀⢸⣿⠀⠀⠀⠀⣿⣇⣴⡿⠋⠀⠀⠀⣠⡿⠃⢸⣿⠀⠀⠀⠀⣿⡇⢸⣿⠀⠀⠀⢠⣤⣤⣤⣤⣄⠀⠀⠀⠀⣿⡆⠀⠀⣼⡟⠀⠀⠀⠀⣀⣀⣀⠀⠀⠀⠀⢻⣧⠀⠀⠀⠀⠀
134+
⠀⠀⠀⠀⠀⠀⠀⢀⣴⣶⣶⣦⡀⠀⠀⠀⠀⢀⣴⣶⣦⣄⡀⠀⠀⢀⣴⣶⣶⣦⡀⠀⠀⢀⣴⣶⣶⣶⣶⣶⣶⣶⣶⣶⣦⣄⡀⠀⠀⠀⠀⠀⠀⢀⣠⣴⣶⣶⣶⣶⣶⣦⣄⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀
135+
⠀⠀⠀⠀⠀⠀⠀⢰⣿⠋⠁⠈⠙⣿⡆⠀⢀⣾⡿⠁⠀⠈⢻⡆⢰⣿⠋⠁⠈⠙⣿⡆⢰⣿⠋⠁⠀⠀⠀⠀⠀⠀⠀⠀⠈⠙⠻⣦⠀⠀⠀⠀⣴⡿⠟⠋⠁⠀⠀⠀⠈⠙⠻⢿⣦⠀⠀⠀⠀⠀⠀⠀
136+
⠀⠀⠀⠀⠀⠀⠀⢸⣿⠀⠀⠀⠀⣿⣇⣴⡿⠋⠀⠀⠀⢀⣼⠇⢸⣿⠀⠀⠀⠀⣿⡇⢸⣿⠀⠀⠀⢠⣤⣤⣤⣤⣄⠀⠀⠀⠀⣿⡆⠀⠀⣼⡟⠀⠀⠀⠀⣀⣀⣀⠀⠀⠀⠀⢻⣧⠀⠀⠀⠀⠀
137137
⠀⠀⠀⠀⠀⠀⠀⢸⣿⠀⠀⠀⠀⣿⡿⠋⠀⠀⠀⢀⣾⡿⠁⠀⢸⣿⠀⠀⠀⠀⣿⡇⢸⣿⠀⠀⠀⢸⣿⠉⠉⠉⣿⡇⠀⠀⠀⣿⡇⠀⣼⡟⠀⠀⠀⣰⡿⠟⠛⠻⢿⣆⠀⠀⠀⢻⣧⠀⠀⠀⠀
138-
⠀⠀⠀⠀⠀⠀⠀⢸⣿⠀⠀⠀⠀⠙⠁⠀⠀⠀⣼⡟⠁⠀⠀⠀⢸⣿⠀⠀⠀⠀⣿⡇⢸⣿⠀⠀⠀⢸⣿⣶⣶⡶⠋⠀⠀⠀⠀⣿⠇⢰⣿⠀⠀⠀⢰⣿⠀⠀⠀⠀⠀⣿⡆⠀⠀⠀⣿⡆
139-
⠀⠀⠀⠀⠀⠀⠀⢸⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠹⣷⡀⠀⠀⠀⢸⣿⠀⠀⠀⠀⣿⡇⢸⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣠⣼⠟⠀⢸⣿⠀⠀⠀⢸⣿⠀⠀⠀⠀⠀⣿⡇⠀⠀⠀⣿⡇
140-
⠀⠀⠀⠀⠀⠀⠀⢸⣿⠀⠀⠀⠀⠀⣠⡀⠀⠀⠀⠹⣷⡄⠀⠀⢸⣿⠀⠀⠀⠀⣿⡇⢸⣿⠀⠀⠀⠀⣤⣄⠀⠀⠀⠀⠹⣿⡅⠀⠀⠸⣿⠀⠀⠀⠸⣿⠀⠀⠀⠀⠀⣿⠇⠀⠀⠀⣿⠇
141-
⠀⠀⠀⠀⠀⠀⠀⢸⣿⠀⠀⠀⠀⣾⡟⣷⡀⠀⠀⠀⠘⣿⣆⠀⢸⣿⠀⠀⠀⠀⣿⡇⢸⣿⠀⠀⠀⠀⣿⡟⣷⡀⠀⠀⠀⠘⣿⣆⠀⠀⢻⣧⠀⠀⠀⠹⣷⣦⣤⣤⣾⠏⠀⠀⠀⣼⡟
142-
⠀⠀⠀⠀⠀⠀⠀⢸⣿⠀⠀⠀⠀⣿⡇⠹⣷⡀⠀⠀⠀⠈⢻⡇⢸⣿⠀⠀⠀⠀⣿⡇⢸⣿⠀⠀⠀⠀⣿⡇⠹⣷⡀⠀⠀⠀⠈⢻⡇⠀⠀⢻⣧⠀⠀⠀⠀⠉⠉⠉⠀⠀⠀⠀⣼⡟
143-
⠀⠀⠀⠀⠀⠀⠀⠸⣿⣄⡀⢀⣠⣿⠇⠀⠙⣷⡀⠀⠀⢀⣼⠇⠸⣿⣄⡀⢀⣠⣿⠇⠸⣿⣄⡀⢀⣠⣿⠇⠀⠙⣷⡀⠀⠀⢀⣼⠇⠀⠀⠀⠻⣷⣦⣄⡀⠀⠀⠀⢀⣠⣴⣾⠟
138+
⠀⠀⠀⠀⠀⠀⠀⢸⣿⠀⠀⠀⠀⠙⠁⠀⠀⢀⣼⡟⠁⠀⠀⠀⢸⣿⠀⠀⠀⠀⣿⡇⢸⣿⠀⠀⠀⢸⣿⣶⣶⡶⠋⠀⠀⠀⠀⣿⠇⢰⣿⠀⠀⠀⢰⣿⠀⠀⠀⠀⠀⣿⡆⠀⠀⠀⣿⡆
139+
⠀⠀⠀⠀⠀⠀⠀⢸⣿⠀⠀⠀⠀⠀⠀⠀⠀⠹⣷⡀⠀⠀⠀⠀⢸⣿⠀⠀⠀⠀⣿⡇⢸⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣠⣼⠟⠀⢸⣿⠀⠀⠀⢸⣿⠀⠀⠀⠀⠀⣿⡇⠀⠀⠀⣿⡇
140+
⠀⠀⠀⠀⠀⠀⠀⢸⣿⠀⠀⠀⠀⠀⣠⡀⠀⠀⠹⣷⡄⠀⠀⠀⢸⣿⠀⠀⠀⠀⣿⡇⢸⣿⠀⠀⠀⠀⣤⣄⠀⠀⠀⠀⠹⣿⡅⠀⠀⠸⣿⠀⠀⠀⠸⣿⠀⠀⠀⠀⠀⣿⠇⠀⠀⠀⣿⠇
141+
⠀⠀⠀⠀⠀⠀⠀⢸⣿⠀⠀⠀⠀⣾⡟⣷⡀⠀⠀⠘⣿⣆⠀⠀⢸⣿⠀⠀⠀⠀⣿⡇⢸⣿⠀⠀⠀⠀⣿⡟⣷⡀⠀⠀⠀⠘⣿⣆⠀⠀⢻⣧⠀⠀⠀⠹⣷⣦⣤⣤⣾⠏⠀⠀⠀⣼⡟
142+
⠀⠀⠀⠀⠀⠀⠀⢸⣿⠀⠀⠀⠀⣿⡇⠹⣷⡀⠀⠀⠈⢻⡇⠀⢸⣿⠀⠀⠀⠀⣿⡇⢸⣿⠀⠀⠀⠀⣿⡇⠹⣷⡀⠀⠀⠀⠈⢻⡇⠀⠀⢻⣧⠀⠀⠀⠀⠉⠉⠉⠀⠀⠀⠀⣼⡟
143+
⠀⠀⠀⠀⠀⠀⠀⠸⣿⣄⡀⢀⣠⣿⠇⠀⠙⣷⡀⠀⢀⣼⠇⠀⠸⣿⣄⡀⢀⣠⣿⠇⠸⣿⣄⡀⢀⣠⣿⠇⠀⠙⣷⡀⠀⠀⢀⣼⠇⠀⠀⠀⠻⣷⣦⣄⡀⠀⠀⠀⢀⣠⣴⣾⠟
144144
⠀⠀⠀⠀⠀⠀⠀⠀⠈⠻⠿⠿⠟⠁⠀⠀⠀⠈⠻⠿⠿⠟⠁⠀⠀⠈⠻⠿⠿⠟⠁⠀⠀⠈⠻⠿⠿⠟⠁⠀⠀⠀⠈⠻⠿⠿⠟⠁⠀⠀⠀⠀⠀⠈⠙⠻⠿⠿⠿⠿⠟⠋⠁",
145145
)
146146
}

‎crates/chat-cli/src/theme/colors.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ impl Default for InteractiveColors {
8888
Self {
8989
prompt_symbol: Color::AnsiValue(BRIGHT_MAGENTA),
9090
profile_indicator: Color::AnsiValue(BRAND_PURPLE),
91-
tangent_indicator: Color::AnsiValue(BRIGHT_MAGENTA),
91+
tangent_indicator: Color::Yellow,
9292
usage_low: Color::Green,
9393
usage_medium: Color::Yellow,
9494
usage_high: Color::Red,

‎crates/chat-cli/src/util/mod.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ pub fn dialoguer_theme() -> ColorfulTheme {
103103

104104
ColorfulTheme {
105105
prompt_prefix: dialoguer::console::style("".into()).for_stderr(),
106+
prompt_suffix: dialoguer::console::style("".into()).for_stderr(),
106107
active_item_prefix: dialoguer::console::style("❯".into())
107108
.for_stderr()
108109
.color256(BRAND_COLOR_ANSI),

0 commit comments

Comments
 (0)