new: improved shell namespace output

Author: evilsocket

examples/shell/task.yml

@@ -5,6 +5,4 @@ using:
   - 'goal'
 
 system_prompt: > 
-  You are an useful assistant that executes any task the user provides.
-
-        
+  You are an useful assistant that executes any task the user provides.

src/agent/generator/ollama.rs

@@ -166,7 +166,7 @@ impl Client for OllamaClient {
                 }
             }
 
-            log::debug!("ollama.tools={:?}", &tools);
+            log::trace!("ollama.tools={:?}", &tools);
         }
 
         let mut request = ChatMessageRequest::new(self.model.to_string(), chat_history)
@@ -185,6 +185,8 @@ impl Client for OllamaClient {
             let mut invocations = vec![];
 
             if let Some(tool_calls) = msg.tool_calls.as_ref() {
+                log::debug!("ollama.tool.calls = {:?}", tool_calls);
+
                 for call in tool_calls {
                     let mut attributes = HashMap::new();
                     let mut payload = None;

src/agent/namespaces/shell/mod.rs

@@ -37,27 +37,28 @@ impl Action for Shell {
         payload: Option<String>,
     ) -> Result<Option<String>> {
         let command = payload.unwrap();
+        log::debug!("{}", &command);
+
         // TODO: make the shell configurable
         let output = Command::new("/bin/sh")
             .arg("-c")
             .arg(&command)
             .output()
             .await?;
 
-        let stdout = String::from_utf8_lossy(&output.stdout).to_string();
-        println!("{}", &stdout);
+        let mut result = String::from_utf8_lossy(&output.stdout).to_string();
+        println!("{}", &result);
 
         let stderr = String::from_utf8_lossy(&output.stderr).to_string();
         if !stderr.is_empty() {
-            eprintln!("{}", stderr);
+            eprintln!("{}", &stderr);
+            result += &format!("\nSTDERR: {}\n", stderr);
         }
 
-        let result = format!(
-            "Exit Code: {}\n\nStdout:\n{}\n\nStderr:\n{}",
-            output.status.code().unwrap_or(-1),
-            stdout,
-            stderr
-        );
+        let exit_code = output.status.code().unwrap_or(-1);
+        if exit_code != 0 {
+            result += &format!("\nEXIT CODE: {}", exit_code);
+        }
 
         log::debug!("{}", &result);