Fix: Resolve agentic behaviour bug bash items (#654)

Author: chaynabors

crates/q_cli/src/cli/chat/parser.rs

@@ -53,6 +53,10 @@ pub struct ResponseParser {
     assistant_text: String,
     /// Tool uses requested by the model.
     tool_uses: Vec<ToolUse>,
+    /// Buffered line required in case we need to discard a code reference event
+    buffered_line: Option<String>,
+    /// Short circuit and return early since we simply need to clear our buffered line
+    short_circuit: bool,
 }
 
 impl ResponseParser {
@@ -63,17 +67,39 @@ impl ResponseParser {
             message_id: None,
             assistant_text: String::new(),
             tool_uses: Vec::new(),
+            buffered_line: None,
+            short_circuit: false,
         }
     }
 
     /// Consumes the associated [ConverseStreamResponse] until a valid [ResponseEvent] is parsed.
     pub async fn recv(&mut self) -> Result<ResponseEvent> {
+        if self.short_circuit {
+            let message = Message(ChatMessage::AssistantResponseMessage(AssistantResponseMessage {
+                message_id: self.message_id.take(),
+                content: std::mem::take(&mut self.assistant_text),
+                tool_uses: if self.tool_uses.is_empty() {
+                    None
+                } else {
+                    Some(self.tool_uses.clone().into_iter().map(Into::into).collect())
+                },
+            }));
+            return Ok(ResponseEvent::EndStream { message });
+        }
+
         loop {
             match self.next().await {
                 Ok(Some(output)) => match output {
                     ChatResponseStream::AssistantResponseEvent { content } => {
                         self.assistant_text.push_str(&content);
-                        return Ok(ResponseEvent::AssistantText(content));
+                        let text = self.buffered_line.take();
+                        self.buffered_line = Some(content);
+                        if let Some(text) = text {
+                            return Ok(ResponseEvent::AssistantText(text));
+                        }
+                    },
+                    ChatResponseStream::CodeReferenceEvent(_) => {
+                        self.buffered_line = None;
                     },
                     ChatResponseStream::InvalidStateEvent { reason, message } => {
                         error!(%reason, %message, "invalid state event");
@@ -102,6 +128,11 @@ impl ResponseParser {
                     _ => {},
                 },
                 Ok(None) => {
+                    if let Some(text) = self.buffered_line.take() {
+                        self.short_circuit = true;
+                        return Ok(ResponseEvent::AssistantText(text));
+                    }
+
                     let message = Message(ChatMessage::AssistantResponseMessage(AssistantResponseMessage {
                         message_id: self.message_id.take(),
                         content: std::mem::take(&mut self.assistant_text),

crates/q_cli/src/cli/chat/tools/execute_bash.rs

@@ -22,6 +22,7 @@ use super::{
 #[derive(Debug, Deserialize)]
 pub struct ExecuteBash {
     pub command: String,
+    pub interactive: bool,
 }
 
 impl ExecuteBash {
@@ -34,11 +35,17 @@ impl ExecuteBash {
             style::Print("\n"),
         )?;
 
+        let (stdin, stdout, stderr) = match self.interactive {
+            true => (Stdio::inherit(), Stdio::inherit(), Stdio::inherit()),
+            false => (Stdio::piped(), Stdio::piped(), Stdio::piped()),
+        };
+
         let output = tokio::process::Command::new("bash")
             .arg("-c")
             .arg(&self.command)
-            .stdout(Stdio::piped())
-            .stderr(Stdio::piped())
+            .stdin(stdin)
+            .stdout(stdout)
+            .stderr(stderr)
             .spawn()
             .wrap_err_with(|| format!("Unable to spawn command '{}'", &self.command))?
             .wait_with_output()
@@ -82,7 +89,8 @@ mod tests {
 
         // Verifying stdout
         let v = serde_json::json!({
-            "command": "echo Hello, world!"
+            "command": "echo Hello, world!",
+            "interactive": false
         });
         let out = serde_json::from_value::<ExecuteBash>(v)
             .unwrap()
@@ -100,7 +108,8 @@ mod tests {
 
         // Verifying stderr
         let v = serde_json::json!({
-            "command": "echo Hello, world! 1>&2"
+            "command": "echo Hello, world! 1>&2",
+            "interactive": false
         });
         let out = serde_json::from_value::<ExecuteBash>(v)
             .unwrap()
@@ -118,7 +127,8 @@ mod tests {
 
         // Verifying exit code
         let v = serde_json::json!({
-            "command": "exit 1"
+            "command": "exit 1",
+            "interactive": false
         });
         let out = serde_json::from_value::<ExecuteBash>(v)
             .unwrap()

crates/q_cli/src/cli/chat/tools/fs_read.rs

@@ -11,6 +11,7 @@ use crossterm::style::{
 };
 use eyre::{
     Result,
+    bail,
     eyre,
 };
 use fig_os_shim::Context;
@@ -233,6 +234,10 @@ impl FsRead {
     }
 
     pub async fn validate(&mut self, ctx: &Context) -> Result<()> {
+        if !PathBuf::from(&self.path).exists() {
+            bail!("'{}' does not exist", self.path);
+        }
+
         let is_file = ctx.fs().symlink_metadata(&self.path).await?.is_file();
         self.ty = Some(is_file);
 

crates/q_cli/src/cli/chat/tools/tool_index.json

@@ -1,13 +1,17 @@
 [
   {
     "name": "execute_bash",
-    "description": "Execute the specified bash command",
+    "description": "Execute the specified bash command.",
     "input_schema": {
       "type": "object",
       "properties": {
         "command": {
           "type": "string",
           "description": "Bash command to execute"
+        },
+        "interactive": {
+          "type": "boolean",
+          "description": "Whether or not the command is interactive. Interactive commands like nano will overtake our conversation until exited. On exit, they will have produced no stderr or stdout."
         }
       },
       "required": ["command"]