Merge branch 'main' into micn/libvision-fix

* main:
  control commands for machine mode
  Fix duplicate dump at end
  minor
  --machine mode flag for verbose CLI output
  fixed x,y detection in vision click
  screenshotting bug fix

.cargo/config.toml

@@ -1,5 +0,0 @@
-[target.aarch64-apple-darwin]
-rustflags = ["-C", "link-args=-Wl,-rpath,@executable_path"]
-
-[target.x86_64-apple-darwin]
-rustflags = ["-C", "link-args=-Wl,-rpath,@executable_path"]

README.md

@@ -136,12 +136,8 @@ G3 is designed for:
 # Build the project
 cargo build --release
 
-# Run from the build directory
+# Run G3
-./target/release/g3
+cargo run
-
-# Or copy both files to somewhere in your PATH (macOS only needs both files)
-cp target/release/g3 ~/.local/bin/
-cp target/release/libVisionBridge.dylib ~/.local/bin/  # macOS only
 
 # Execute a task
 g3 "implement a function to calculate fibonacci numbers"

build.rs

@@ -0,0 +1,11 @@
+use std::env;
+
+fn main() {
+    // Only add rpaths on macOS
+    if env::var("CARGO_CFG_TARGET_OS").unwrap() == "macos" {
+        // Add rpath so libVisionBridge.dylib can be found at runtime
+        // @executable_path means "relative to the executable"
+        println!("cargo:rustc-link-arg=-Wl,-rpath,@executable_path");
+        println!("cargo:rustc-link-arg=-Wl,-rpath,@loader_path");
+    }
+}

crates/g3-cli/build.rs

@@ -0,0 +1,11 @@
+use std::env;
+
+fn main() {
+    // Only add rpaths on macOS
+    if env::var("CARGO_CFG_TARGET_OS").unwrap() == "macos" {
+        // Add rpath so libVisionBridge.dylib can be found at runtime
+        // @executable_path means "relative to the executable"
+        println!("cargo:rustc-link-arg=-Wl,-rpath,@executable_path");
+        println!("cargo:rustc-link-arg=-Wl,-rpath,@loader_path");
+    }
+}

crates/g3-core/src/lib.rs

@@ -2675,7 +2675,12 @@ Template:
 
                             // Display tool execution result with proper indentation
                             if tool_call.tool != "final_output" {
-                                let output_lines: Vec<&str> = tool_result.lines().collect();
+                                // Skip displaying output for shell tool since it was already streamed
+                                let should_display_output = tool_call.tool != "shell";
+                                
+                                let output_lines: Vec<&str> = if should_display_output {
+                                    tool_result.lines().collect()
+                                } else { vec![] };
 
                                 // Check if UI wants full output (machine mode) or truncated (human mode)
                                 let wants_full = self.ui_writer.wants_full_output();
@@ -3187,13 +3192,16 @@ Template:
                         {
                             Ok(result) => {
                                 if result.success {
-                                    Ok(if result.stdout.is_empty() {
+                                    // Don't return stdout - it was already streamed to the UI
-                                        "✅ Command executed successfully".to_string()
+                                    // Returning it would cause duplicate output
-                                    } else {
+                                    Ok("✅ Command executed successfully".to_string())
-                                        result.stdout.trim().to_string()
-                                    })
                                 } else {
-                                    Ok(format!("❌ Command failed: {}", result.stderr.trim()))
+                                    // For errors, return stderr since it wasn't streamed
+                                    Ok(if result.stderr.is_empty() {
+                                        "❌ Command failed".to_string()
+                                    } else {
+                                        format!("❌ Command failed: {}", result.stderr.trim())
+                                    })
                                 }
                             }
                             Err(e) => Ok(format!("❌ Execution error: {}", e)),