feat: QCHAT_PROCESS_ID and pre-push hook.

.husky/pre-push

@@ -0,0 +1,11 @@
+
+
+# Check if Amazon Q chat is active
+if [ -n "$QCHAT_PROCESS_ID" ]; then
+  echo "ERROR: Git push blocked while Amazon Q chat is active (QCHAT_PROCESS_ID=$QCHAT_PROCESS_ID)"
+  echo "Please exit Amazon Q chat with '/quit' before pushing changes."
+  exit 1
+fi
+
+# Continue with push if QCHAT_PROCESS_ID is not set
+exit 0

Cargo.toml

@@ -19,7 +19,7 @@ authors = [
 edition = "2021"
 homepage = "https://aws.amazon.com/q/"
 publish = false
-version = "1.8.0"
+version = "1.8.1"
 license = "MIT OR Apache-2.0"
 
 [workspace.dependencies]

crates/q_chat/src/consts.rs

@@ -17,3 +17,5 @@ pub const MAX_USER_MESSAGE_SIZE: usize = 600_000;
 pub const CONTEXT_WINDOW_SIZE: usize = 200_000;
 
 pub const MAX_CHARS: usize = TokenCounter::token_to_chars(CONTEXT_WINDOW_SIZE); // Character-based warning threshold
+
+pub const QCHAT_PROCESS_ID: &str = "QCHAT_PROCESS_ID";

crates/q_chat/src/lib.rs

@@ -40,7 +40,10 @@ use command::{
     Command,
     ToolsSubcommand,
 };
-use consts::CONTEXT_WINDOW_SIZE;
+use consts::{
+    CONTEXT_WINDOW_SIZE,
+    QCHAT_PROCESS_ID,
+};
 use context::ContextManager;
 use conversation_state::{
     ConversationState,
@@ -333,6 +336,11 @@ pub async fn chat(
         }
     }
 
+    let process_info = ctx.process_info();
+    let current_pid = process_info.current_pid().to_string();
+
+    unsafe { ctx.env().set_var(QCHAT_PROCESS_ID, current_pid) };
+
     let tool_config = load_tools()?;
     let mut tool_permissions = ToolPermissions::new(tool_config.len());
     if accept_all || trust_all_tools {
@@ -1015,7 +1023,37 @@ impl ChatContext {
             execute!(self.output, cursor::Hide, style::Print("\n"))?;
             self.spinner = Some(Spinner::new(Spinners::Dots, "Creating summary...".to_string()));
         }
-        let response = self.client.send_message(summary_state).await?;
+        let response = self.client.send_message(summary_state).await;
+
+        // TODO(brandonskiser): This is a temporary hotfix for failing compaction. We should instead
+        // retry except with less context included.
+        let response = match response {
+            Ok(res) => res,
+            Err(e) => match e {
+                fig_api_client::Error::ContextWindowOverflow => {
+                    self.conversation_state.clear(true);
+                    if self.interactive {
+                        self.spinner.take();
+                        execute!(
+                            self.output,
+                            terminal::Clear(terminal::ClearType::CurrentLine),
+                            cursor::MoveToColumn(0),
+                            style::SetForegroundColor(Color::Yellow),
+                            style::Print(
+                                "The context window usage has overflowed. Clearing the conversation history.\n\n"
+                            ),
+                            style::SetAttribute(Attribute::Reset)
+                        )?;
+                    }
+                    return Ok(ChatState::PromptUser {
+                        tool_uses,
+                        pending_tool_index,
+                        skip_printing_tools: true,
+                    });
+                },
+                e => return Err(e.into()),
+            },
+        };
 
         let summary = {
             let mut parser = ResponseParser::new(response);