Merge branch 'main' of github.com:aws/amazon-q-developer-cli into fix-todo-bugs

Author: kiran-garre

crates/chat-cli/src/api_client/delay_interceptor.rs

@@ -19,6 +19,8 @@ use crossterm::{
     style,
 };
 
+use crate::api_client::MAX_RETRY_DELAY_DURATION;
+
 #[derive(Debug, Clone)]
 pub struct DelayTrackingInterceptor {
     minor_delay_threshold: Duration,
@@ -62,20 +64,16 @@ impl Intercept for DelayTrackingInterceptor {
         let now = Instant::now();
 
         if let Some(last_attempt_time) = cfg.load::<LastAttemptTime>() {
-            let delay = now.duration_since(last_attempt_time.0);
+            let delay = now.duration_since(last_attempt_time.0).min(MAX_RETRY_DELAY_DURATION);
 
             if delay >= self.major_delay_threshold {
                 Self::print_warning(format!(
-                    "Auto Retry #{} delayed by {:.1}s. Service is under heavy load - consider switching models.",
+                    "Retry #{}, retrying within {:.1}s..",
                     attempt_number,
-                    delay.as_secs_f64()
+                    MAX_RETRY_DELAY_DURATION.as_secs_f64()
                 ));
             } else if delay >= self.minor_delay_threshold {
-                Self::print_warning(format!(
-                    "Auto Retry #{} delayed by {:.1}s due to transient issues.",
-                    attempt_number,
-                    delay.as_secs_f64()
-                ));
+                Self::print_warning(format!("Retry #{}, retrying within 5s..", attempt_number,));
             }
         }
 

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

@@ -72,6 +72,8 @@ pub const X_AMZN_CODEWHISPERER_OPT_OUT_HEADER: &str = "x-amzn-codewhisperer-opto
 // TODO(bskiser): confirm timeout is updated to an appropriate value?
 const DEFAULT_TIMEOUT_DURATION: Duration = Duration::from_secs(60 * 5);
 
+pub const MAX_RETRY_DELAY_DURATION: Duration = Duration::from_secs(10);
+
 #[derive(Clone, Debug)]
 pub struct ModelListResult {
     pub models: Vec<Model>,
@@ -616,7 +618,7 @@ fn timeout_config(database: &Database) -> TimeoutConfig {
 fn retry_config() -> RetryConfig {
     RetryConfig::adaptive()
         .with_max_attempts(3)
-        .with_max_backoff(Duration::from_secs(10))
+        .with_max_backoff(MAX_RETRY_DELAY_DURATION)
 }
 
 pub fn stalled_stream_protection_config() -> StalledStreamProtectionConfig {

crates/chat-cli/src/cli/chat/cli/experiment.rs

@@ -80,11 +80,13 @@ async fn select_experiment(os: &mut Os, session: &mut ChatSession) -> Result<Opt
         experiment_labels.push(label);
     }
 
-    experiment_labels.push(String::new());
-    experiment_labels.push(format!(
-        "{}",
-        style::Stylize::white("⚠ Experimental features may be changed or removed at any time")
-    ));
+    // Show disclaimer before selection
+    queue!(
+        session.stderr,
+        style::SetForegroundColor(Color::Yellow),
+        style::Print("⚠ Experimental features may be changed or removed at any time\n\n"),
+        style::ResetColor,
+    )?;
 
     let selection: Option<_> = match Select::with_theme(&crate::util::dialoguer_theme())
         .with_prompt("Select an experiment to toggle")
@@ -107,14 +109,14 @@ async fn select_experiment(os: &mut Os, session: &mut ChatSession) -> Result<Opt
     queue!(session.stderr, style::ResetColor)?;
 
     if let Some(index) = selection {
-        // Clear the dialoguer selection line to avoid showing old status
+        // Clear the dialoguer selection line and disclaimer
         queue!(
             session.stderr,
-            crossterm::cursor::MoveUp(1),
-            crossterm::terminal::Clear(crossterm::terminal::ClearType::CurrentLine),
+            crossterm::cursor::MoveUp(3), // Move up past selection + 2 disclaimer lines
+            crossterm::terminal::Clear(crossterm::terminal::ClearType::FromCursorDown),
         )?;
 
-        // Skip if user selected disclaimer or empty line
+        // Skip if user selected disclaimer or empty line (last 2 items)
         if index >= AVAILABLE_EXPERIMENTS.len() {
             return Ok(Some(ChatState::PromptUser {
                 skip_printing_tools: false,

crates/chat-cli/src/cli/chat/cli/profile.rs

@@ -221,31 +221,55 @@ impl AgentSubcommand {
             },
 
             Self::Generate {} => {
-                let agent_name = match session.read_user_input("Enter agent name: ", false) {
-                    Some(input) => input.trim().to_string(),
-                    None => {
+                let agent_name = match crate::util::input("Enter agent name: ", None) {
+                    Ok(input) => input.trim().to_string(),
+                    Err(_) => {
                         return Ok(ChatState::PromptUser {
                             skip_printing_tools: true,
                         });
                     },
                 };
 
-                let agent_description = match session.read_user_input("Enter agent description: ", false) {
-                    Some(input) => input.trim().to_string(),
-                    None => {
+                let agent_description = match crate::util::input("Enter agent description: ", None) {
+                    Ok(input) => input.trim().to_string(),
+                    Err(_) => {
                         return Ok(ChatState::PromptUser {
                             skip_printing_tools: true,
                         });
                     },
                 };
 
                 let scope_options = vec!["Local (current workspace)", "Global (all workspaces)"];
-                let scope_selection = Select::new()
+                let scope_selection = match Select::with_theme(&crate::util::dialoguer_theme())
                     .with_prompt("Agent scope")
                     .items(&scope_options)
                     .default(0)
-                    .interact()
-                    .map_err(|e| ChatError::Custom(format!("Failed to get scope selection: {}", e).into()))?;
+                    .interact_on_opt(&dialoguer::console::Term::stdout())
+                {
+                    Ok(sel) => {
+                        let _ = crossterm::execute!(
+                            std::io::stdout(),
+                            crossterm::style::SetForegroundColor(crossterm::style::Color::Magenta)
+                        );
+                        sel
+                    },
+                    // Ctrl‑C -> Err(Interrupted)
+                    Err(dialoguer::Error::IO(ref e)) if e.kind() == std::io::ErrorKind::Interrupted => {
+                        return Ok(ChatState::PromptUser {
+                            skip_printing_tools: true,
+                        });
+                    },
+                    Err(e) => return Err(ChatError::Custom(format!("Failed to get scope selection: {e}").into())),
+                };
+
+                let scope_selection = match scope_selection {
+                    Some(selection) => selection,
+                    None => {
+                        return Ok(ChatState::PromptUser {
+                            skip_printing_tools: true,
+                        });
+                    },
+                };
 
                 let is_global = scope_selection == 1;
 

crates/chat-cli/src/cli/chat/line_tracker.rs

@@ -34,6 +34,7 @@ impl FileLineTracker {
     }
 
     pub fn lines_by_agent(&self) -> isize {
-        (self.after_fswrite_lines as isize) - (self.before_fswrite_lines as isize)
+        let lines = (self.after_fswrite_lines as isize) - (self.before_fswrite_lines as isize);
+        lines.abs()
     }
 }

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

@@ -1716,25 +1716,19 @@ impl ChatSession {
         // Parse and validate the initial generated config
         let initial_agent_config = match serde_json::from_str::<Agent>(&agent_config_json) {
             Ok(config) => config,
-            Err(err) => {
+            Err(_) => {
                 execute!(
                     self.stderr,
                     style::SetForegroundColor(Color::Red),
-                    style::Print(format!("✗ Failed to parse generated agent config: {}\n\n", err)),
+                    style::Print("✗ The LLM did not generate a valid agent configuration. Please try again.\n\n"),
                     style::SetForegroundColor(Color::Reset)
                 )?;
-                return Err(ChatError::Custom(format!("Invalid agent config: {}", err).into()));
+                return Ok(ChatState::PromptUser {
+                    skip_printing_tools: true,
+                });
             },
         };
 
-        // Display the generated agent config with syntax highlighting
-        execute!(
-            self.stderr,
-            style::SetForegroundColor(Color::Green),
-            style::Print(format!("✓ Generated agent config for '{}':\n\n", agent_name)),
-            style::SetForegroundColor(Color::Reset)
-        )?;
-
         let formatted_json = serde_json::to_string_pretty(&initial_agent_config)
             .map_err(|e| ChatError::Custom(format!("Failed to format JSON: {}", e).into()))?;
 
@@ -1750,9 +1744,9 @@ impl ChatSession {
                     style::Print(format!("✗ Invalid edited configuration: {}\n\n", err)),
                     style::SetForegroundColor(Color::Reset)
                 )?;
-                return Err(ChatError::Custom(
-                    format!("Invalid agent config after editing: {}", err).into(),
-                ));
+                return Ok(ChatState::PromptUser {
+                    skip_printing_tools: true,
+                });
             },
         };
 

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

@@ -15,6 +15,8 @@ use std::str::FromStr;
 
 use amzn_codewhisperer_client::types::{
     ChatAddMessageEvent,
+    ChatInteractWithMessageEvent,
+    ChatMessageInteractionType,
     IdeCategory,
     OperatingSystem,
     TelemetryEvent,
@@ -574,55 +576,95 @@ impl TelemetryClient {
             return;
         };
 
-        if let EventType::ChatAddedMessage {
-            conversation_id,
-            data:
-                ChatAddedMessageParams {
-                    message_id,
-                    model,
-                    time_to_first_chunk_ms,
-                    time_between_chunks_ms,
-                    assistant_response_length,
-                    ..
-                },
-            ..
-        } = &event.ty
-        {
-            let user_context = self.user_context().unwrap();
-            // Short-Term fix for Validation errors -
-            // chatAddMessageEvent.timeBetweenChunks' : Member must have length less than or equal to 100
-            let time_between_chunks_truncated = time_between_chunks_ms
-                .as_ref()
-                .map(|chunks| chunks.iter().take(100).cloned().collect());
-
-            let chat_add_message_event = match ChatAddMessageEvent::builder()
-                .conversation_id(conversation_id)
-                .message_id(message_id.clone().unwrap_or("not_set".to_string()))
-                .set_time_to_first_chunk_milliseconds(*time_to_first_chunk_ms)
-                .set_time_between_chunks(time_between_chunks_truncated)
-                .set_response_length(*assistant_response_length)
-                .build()
-            {
-                Ok(event) => event,
-                Err(err) => {
+        match &event.ty {
+            EventType::ChatAddedMessage {
+                conversation_id,
+                data:
+                    ChatAddedMessageParams {
+                        message_id,
+                        model,
+                        time_to_first_chunk_ms,
+                        time_between_chunks_ms,
+                        assistant_response_length,
+                        ..
+                    },
+                ..
+            } => {
+                let user_context = self.user_context().unwrap();
+                // Short-Term fix for Validation errors -
+                // chatAddMessageEvent.timeBetweenChunks' : Member must have length less than or equal to 100
+                let time_between_chunks_truncated = time_between_chunks_ms
+                    .as_ref()
+                    .map(|chunks| chunks.iter().take(100).cloned().collect());
+
+                let chat_add_message_event = match ChatAddMessageEvent::builder()
+                    .conversation_id(conversation_id)
+                    .message_id(message_id.clone().unwrap_or("not_set".to_string()))
+                    .set_time_to_first_chunk_milliseconds(*time_to_first_chunk_ms)
+                    .set_time_between_chunks(time_between_chunks_truncated)
+                    .set_response_length(*assistant_response_length)
+                    .build()
+                {
+                    Ok(event) => event,
+                    Err(err) => {
+                        error!(err =% DisplayErrorContext(err), "Failed to send cw telemetry event");
+                        return;
+                    },
+                };
+
+                let event = TelemetryEvent::ChatAddMessageEvent(chat_add_message_event);
+                debug!(
+                    ?event,
+                    ?user_context,
+                    telemetry_enabled = self.telemetry_enabled,
+                    "Sending cw telemetry event"
+                );
+                if let Err(err) = codewhisperer_client
+                    .send_telemetry_event(event, user_context, self.telemetry_enabled, model.to_owned())
+                    .await
+                {
                     error!(err =% DisplayErrorContext(err), "Failed to send cw telemetry event");
-                    return;
-                },
-            };
-
-            let event = TelemetryEvent::ChatAddMessageEvent(chat_add_message_event);
-            debug!(
-                ?event,
-                ?user_context,
-                telemetry_enabled = self.telemetry_enabled,
-                "Sending cw telemetry event"
-            );
-            if let Err(err) = codewhisperer_client
-                .send_telemetry_event(event, user_context, self.telemetry_enabled, model.to_owned())
-                .await
-            {
-                error!(err =% DisplayErrorContext(err), "Failed to send cw telemetry event");
-            }
+                }
+            },
+            EventType::AgentContribution {
+                conversation_id,
+                utterance_id,
+                lines_by_agent,
+                ..
+            } => {
+                let user_context = self.user_context().unwrap();
+
+                let builder = ChatInteractWithMessageEvent::builder()
+                    .conversation_id(conversation_id)
+                    .message_id(utterance_id.clone().unwrap_or("not_set".to_string()))
+                    .accepted_line_count(lines_by_agent.map_or(0, |lines| lines as i32))
+                    .interaction_type(ChatMessageInteractionType::AgenticCodeAccepted);
+
+                let chat_interact_event = match builder.build() {
+                    Ok(event) => event,
+                    Err(err) => {
+                        error!(err =% DisplayErrorContext(err), "Failed to build ChatInteractWithMessageEvent");
+                        return;
+                    },
+                };
+
+                let event = TelemetryEvent::ChatInteractWithMessageEvent(chat_interact_event);
+                debug!(
+                    ?event,
+                    ?user_context,
+                    telemetry_enabled = self.telemetry_enabled,
+                    "Sending cw telemetry event"
+                );
+                if let Err(err) = codewhisperer_client
+                    .send_telemetry_event(event, user_context, self.telemetry_enabled, None)
+                    .await
+                {
+                    error!(err =% DisplayErrorContext(err), "Failed to send cw telemetry event");
+                }
+            },
+            _ => {
+                // No CW telemetry event for other event types
+            },
         }
     }