-
Notifications
You must be signed in to change notification settings - Fork 3.3k
feat(tui): ghost-text follow-up prompt suggestion #2781
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from 1 commit
02c3579
eb1d08b
e687b07
80246f0
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,117 @@ | ||
| //! Ghost-text follow-up prompt suggestion. | ||
| //! | ||
| //! After each completed turn, a lightweight API call generates ONE short | ||
| //! follow-up question the user might want to ask next. The suggestion is | ||
| //! rendered as dimmed ghost text in the composer when the input is empty. | ||
|
|
||
| use reqwest::header::{AUTHORIZATION, CONTENT_TYPE}; | ||
| use serde_json::Value; | ||
| use tracing::debug; | ||
|
|
||
| /// Generate a follow-up prompt suggestion based on recent messages. | ||
| /// | ||
| /// Sends the conversation summary to the API with a system prompt that | ||
| /// asks for a single short follow-up question. Returns `None` on failure | ||
| /// or empty result — callers treat this as best-effort. | ||
| pub async fn generate_suggestion( | ||
| api_key: &str, | ||
| base_url: &str, | ||
| model: &str, | ||
| recent_messages: &str, | ||
| ) -> Option<String> { | ||
| let client = reqwest::Client::new(); | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Creating a new static CLIENT: std::sync::LazyLock<reqwest::Client> = std::sync::LazyLock::new(reqwest::Client::new);
let client = &*CLIENT;
greptile-apps[bot] marked this conversation as resolved.
Outdated
|
||
| let body = serde_json::json!({ | ||
| "model": model, | ||
| "messages": [ | ||
| { | ||
| "role": "system", | ||
| "content": "\ | ||
| You are a helpful assistant. Based on the recent conversation context, generate \ | ||
| ONE short follow-up question (under 60 characters) the user might want to ask \ | ||
| next. Reply with ONLY the question text, nothing else — no quotes, no explanations, \ | ||
| no prefixes." | ||
| }, | ||
| { | ||
| "role": "user", | ||
| "content": format!( | ||
| "Recent conversation:\n{recent_messages}\n\n\ | ||
| Generate ONE short follow-up question the user might ask next:" | ||
| ) | ||
| } | ||
| ], | ||
| "max_tokens": 64, | ||
| "temperature": 0.3, | ||
| "stream": false | ||
| }); | ||
|
|
||
| let url = format!("{}/chat/completions", base_url.trim_end_matches('/')); | ||
| debug!(%url, %model, "generating prompt suggestion"); | ||
| let response = match client | ||
| .post(&url) | ||
| .header(AUTHORIZATION, format!("Bearer {api_key}")) | ||
| .header(CONTENT_TYPE, "application/json") | ||
| .timeout(std::time::Duration::from_secs(10)) | ||
| .json(&body) | ||
| .send() | ||
| .await | ||
| { | ||
| Ok(r) => r, | ||
| Err(_) => return None, | ||
| }; | ||
|
|
||
| let value: Value = match response.json().await { | ||
| Ok(v) => v, | ||
| Err(_) => return None, | ||
| }; | ||
|
|
||
| let suggestion = value["choices"][0]["message"]["content"] | ||
| .as_str() | ||
| .map(|s| s.trim().trim_matches('"').to_string()) | ||
| .filter(|s| !s.is_empty() && s.len() <= 200)?; | ||
|
greptile-apps[bot] marked this conversation as resolved.
|
||
|
|
||
| debug!(text = %suggestion, "prompt suggestion generated"); | ||
| Some(suggestion) | ||
| } | ||
|
|
||
| /// Extract the first text line from a single message. | ||
| fn message_summary(m: &crate::models::Message) -> Option<String> { | ||
| let role = match m.role.as_str() { | ||
| "user" => "User", | ||
| "assistant" => "Assistant", | ||
| _ => return None, | ||
| }; | ||
| let text = m | ||
| .content | ||
| .iter() | ||
| .filter_map(|block| match block { | ||
| crate::models::ContentBlock::Text { text, .. } => Some(text.as_str()), | ||
| _ => None, | ||
| }) | ||
| .collect::<Vec<_>>() | ||
| .join(" "); | ||
| let first_line = text.lines().next().unwrap_or("").trim(); | ||
| if first_line.is_empty() { | ||
| return None; | ||
| } | ||
| let truncated: String = first_line | ||
| .chars() | ||
| .take(120) | ||
| .chain(if first_line.chars().count() > 120 { | ||
| Some('…') | ||
| } else { | ||
| None | ||
| }) | ||
| .collect(); | ||
| Some(format!("{role}: {truncated}")) | ||
| } | ||
|
|
||
| /// Build a one-line-per-message summary of recent conversation context. | ||
| /// Takes the last N messages, skipping tool-only messages. | ||
| pub fn summarize_recent_messages(messages: &[crate::models::Message], limit: usize) -> String { | ||
| let start = messages.len().saturating_sub(limit); | ||
| messages[start..] | ||
| .iter() | ||
| .filter_map(message_summary) | ||
| .collect::<Vec<_>>() | ||
| .join("\n") | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1265,6 +1265,13 @@ async fn run_event_loop( | |
| app.needs_redraw = true; | ||
| } | ||
|
|
||
| // Poll prompt suggestion cell from background generation task. | ||
| if let Ok(mut guard) = app.prompt_suggestion_cell.lock() { | ||
| if let Some(suggestion) = guard.take() { | ||
| app.prompt_suggestion = Some(suggestion); | ||
| } | ||
| } | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Using if let Ok(mut guard) = app.prompt_suggestion_cell.try_lock() {
if let Some(suggestion) = guard.take() {
app.prompt_suggestion = Some(suggestion);
}
}
greptile-apps[bot] marked this conversation as resolved.
|
||
|
|
||
| // First, poll for engine events (non-blocking) | ||
| let mut received_engine_event = false; | ||
| let mut transcript_batch_updated = false; | ||
|
|
@@ -1618,6 +1625,7 @@ async fn run_event_loop( | |
| app.is_loading = true; | ||
| app.offline_mode = false; | ||
| app.turn_error_posted = false; | ||
| app.prompt_suggestion = None; | ||
|
greptile-apps[bot] marked this conversation as resolved.
|
||
| app.dispatch_started_at = None; | ||
| current_streaming_text.clear(); | ||
| app.streaming_state.reset(); | ||
|
|
@@ -1819,6 +1827,38 @@ async fn run_event_loop( | |
| } | ||
| } | ||
|
|
||
| // Generate ghost-text follow-up suggestion asynchronously. | ||
| if status == crate::core::events::TurnOutcomeStatus::Completed | ||
| && app.api_messages.len() >= 2 | ||
| { | ||
| let suggestion_cell = app.prompt_suggestion_cell.clone(); | ||
| let api_key = config.deepseek_api_key().unwrap_or_default(); | ||
| let base_url = config.deepseek_base_url(); | ||
| let model = config.default_model(); | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The PR description states that a lightweight API call (e.g.,
greptile-apps[bot] marked this conversation as resolved.
|
||
| let messages: Vec<crate::models::Message> = | ||
| app.api_messages.clone(); | ||
| if !api_key.is_empty() { | ||
| tokio::spawn(async move { | ||
| let summary = | ||
| crate::tui::prompt_suggestion::summarize_recent_messages( | ||
| &messages, 8, | ||
| ); | ||
| if let Some(suggestion) = | ||
| crate::tui::prompt_suggestion::generate_suggestion( | ||
| &api_key, | ||
| &base_url, | ||
| &model, | ||
| &summary, | ||
| ) | ||
| .await | ||
| && let Ok(mut guard) = suggestion_cell.lock() | ||
| { | ||
| *guard = Some(suggestion); | ||
| } | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| // Generate post-turn receipt for completed turns. | ||
| // Also push a persistent status toast so users always | ||
| // see the outcome in the footer (not just the 8-second | ||
|
|
@@ -3591,6 +3631,14 @@ async fn run_event_loop( | |
| if app.is_loading && queue_current_draft_for_next_turn(app) { | ||
| continue; | ||
| } | ||
| if app.input.is_empty() | ||
| && let Some(suggestion) = app.prompt_suggestion.take() | ||
| { | ||
| app.input = suggestion; | ||
| app.cursor_position = app.input.chars().count(); | ||
| app.needs_redraw = true; | ||
| continue; | ||
| } | ||
| let prior_model = app.model.clone(); | ||
| let prior_mode = app.mode; | ||
| app.cycle_mode(); | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The comment and PR description state that the suggestion is "cleared on new input" (typing dismisses it). However, the current implementation only hides the ghost text when
input_textis non-empty, but does not actually clearprompt_suggestion(set it toNone). If a user types a character and then deletes it, the same suggestion will reappear. To match the described behavior,app.prompt_suggestionshould be explicitly set toNonewhen new input is inserted (e.g., insideinsert_charandinsert_str).