ππΌββοΈ The blackboard for coding agents - agentic development environment for claude code, codex, cursor, opencode, grok and more.
Rust adeai-agentsclaudeclaude-codecodexcursorgeminigrokopencodespec-driven-developmentvibe-codingvim
fix: gemini and codex mcp (#102)
Fynn Flueggeae46f93cab45
diff --git a/README.md b/README.mdindex 0a9a173..d58c181 100644--- a/README.md+++ b/README.md@@ -30,7 +30,7 @@<a href="#plugins">Plugins</a> β’<a href="#orchestrator-agent-experimental">Orchestrator</a> β’<a href="#configuration">Configuration</a> β’- <a href="#benchmarks">Benchmarks</a>+ <a href="#benchmark">Benchmark</a></p>---diff --git a/benchmarks/README.md b/benchmark/README.mdsimilarity index 100%rename from benchmarks/README.mdrename to benchmark/README.mddiff --git a/benchmarks/swebench/benchmark.py b/benchmark/swebench/benchmark.pysimilarity index 100%rename from benchmarks/swebench/benchmark.pyrename to benchmark/swebench/benchmark.pydiff --git a/benchmarks/swebench/cleanup.sh b/benchmark/swebench/cleanup.shsimilarity index 100%rename from benchmarks/swebench/cleanup.shrename to benchmark/swebench/cleanup.shdiff --git a/benchmarks/swebench/configs/claude-agtx-terse.toml b/benchmark/swebench/configs/claude-agtx-terse.tomlsimilarity index 100%rename from benchmarks/swebench/configs/claude-agtx-terse.tomlrename to benchmark/swebench/configs/claude-agtx-terse.tomldiff --git a/benchmarks/swebench/configs/claude-agtx.toml b/benchmark/swebench/configs/claude-agtx.tomlsimilarity index 100%rename from benchmarks/swebench/configs/claude-agtx.tomlrename to benchmark/swebench/configs/claude-agtx.tomldiff --git a/benchmarks/swebench/configs/claude-claude-opencode-agtx-terse.toml b/benchmark/swebench/configs/claude-claude-opencode-agtx-terse.tomlsimilarity index 100%rename from benchmarks/swebench/configs/claude-claude-opencode-agtx-terse.tomlrename to benchmark/swebench/configs/claude-claude-opencode-agtx-terse.tomldiff --git a/benchmarks/swebench/configs/claude-claude-opencode-agtx.toml b/benchmark/swebench/configs/claude-claude-opencode-agtx.tomlsimilarity index 100%rename from benchmarks/swebench/configs/claude-claude-opencode-agtx.tomlrename to benchmark/swebench/configs/claude-claude-opencode-agtx.tomldiff --git a/benchmarks/swebench/configs/claude-codex-claude-agtx-terse.toml b/benchmark/swebench/configs/claude-codex-claude-agtx-terse.tomlsimilarity index 100%rename from benchmarks/swebench/configs/claude-codex-claude-agtx-terse.tomlrename to benchmark/swebench/configs/claude-codex-claude-agtx-terse.tomldiff --git a/benchmarks/swebench/configs/claude-codex-claude-agtx.toml b/benchmark/swebench/configs/claude-codex-claude-agtx.tomlsimilarity index 100%rename from benchmarks/swebench/configs/claude-codex-claude-agtx.tomlrename to benchmark/swebench/configs/claude-codex-claude-agtx.tomldiff --git a/benchmarks/swebench/configs/claude-codex-gemini-agtx.toml b/benchmark/swebench/configs/claude-codex-gemini-agtx.tomlsimilarity index 100%rename from benchmarks/swebench/configs/claude-codex-gemini-agtx.tomlrename to benchmark/swebench/configs/claude-codex-gemini-agtx.tomldiff --git a/benchmarks/swebench/configs/claude-opencode-claude-agtx-terse.toml b/benchmark/swebench/configs/claude-opencode-claude-agtx-terse.tomlsimilarity index 100%rename from benchmarks/swebench/configs/claude-opencode-claude-agtx-terse.tomlrename to benchmark/swebench/configs/claude-opencode-claude-agtx-terse.tomldiff --git a/benchmarks/swebench/configs/claude-opencode-claude-agtx.toml b/benchmark/swebench/configs/claude-opencode-claude-agtx.tomlsimilarity index 100%rename from benchmarks/swebench/configs/claude-opencode-claude-agtx.tomlrename to benchmark/swebench/configs/claude-opencode-claude-agtx.tomldiff --git a/benchmarks/swebench/configs/codex-agtx-terse.toml b/benchmark/swebench/configs/codex-agtx-terse.tomlsimilarity index 100%rename from benchmarks/swebench/configs/codex-agtx-terse.tomlrename to benchmark/swebench/configs/codex-agtx-terse.tomldiff --git a/benchmarks/swebench/configs/codex-agtx.toml b/benchmark/swebench/configs/codex-agtx.tomlsimilarity index 100%rename from benchmarks/swebench/configs/codex-agtx.tomlrename to benchmark/swebench/configs/codex-agtx.tomldiff --git a/benchmarks/swebench/configs/codex-claude-codex-agtx.toml b/benchmark/swebench/configs/codex-claude-codex-agtx.tomlsimilarity index 100%rename from benchmarks/swebench/configs/codex-claude-codex-agtx.tomlrename to benchmark/swebench/configs/codex-claude-codex-agtx.tomldiff --git a/benchmark/swebench/configs/cursor-agtx.toml b/benchmark/swebench/configs/cursor-agtx.tomlnew file mode 100644index 0000000..b882063--- /dev/null+++ b/benchmark/swebench/configs/cursor-agtx.toml@@ -0,0 +1,8 @@+default_agent = "cursor"+workflow_plugin = "agtx"+worktree_dir = ".agtx/worktrees"++[agents]+planning = "cursor"+running = "cursor"+review = "cursor"diff --git a/benchmarks/swebench/configs/gemini-agtx-terse.toml b/benchmark/swebench/configs/gemini-agtx-terse.tomlsimilarity index 100%rename from benchmarks/swebench/configs/gemini-agtx-terse.tomlrename to benchmark/swebench/configs/gemini-agtx-terse.tomldiff --git a/benchmarks/swebench/configs/gemini-agtx.toml b/benchmark/swebench/configs/gemini-agtx.tomlsimilarity index 100%rename from benchmarks/swebench/configs/gemini-agtx.tomlrename to benchmark/swebench/configs/gemini-agtx.tomldiff --git a/benchmarks/swebench/configs/gemini-claude-codex-agtx-terse.toml b/benchmark/swebench/configs/gemini-claude-codex-agtx-terse.tomlsimilarity index 100%rename from benchmarks/swebench/configs/gemini-claude-codex-agtx-terse.tomlrename to benchmark/swebench/configs/gemini-claude-codex-agtx-terse.tomldiff --git a/benchmarks/swebench/configs/gemini-claude-codex-agtx.toml b/benchmark/swebench/configs/gemini-claude-codex-agtx.tomlsimilarity index 100%rename from benchmarks/swebench/configs/gemini-claude-codex-agtx.tomlrename to benchmark/swebench/configs/gemini-claude-codex-agtx.tomldiff --git a/benchmarks/swebench/configs/gemini-codex-claude-agtx-terse.toml b/benchmark/swebench/configs/gemini-codex-claude-agtx-terse.tomlsimilarity index 100%rename from benchmarks/swebench/configs/gemini-codex-claude-agtx-terse.tomlrename to benchmark/swebench/configs/gemini-codex-claude-agtx-terse.tomldiff --git a/benchmarks/swebench/configs/gemini-codex-claude-agtx.toml b/benchmark/swebench/configs/gemini-codex-claude-agtx.tomlsimilarity index 100%rename from benchmarks/swebench/configs/gemini-codex-claude-agtx.tomlrename to benchmark/swebench/configs/gemini-codex-claude-agtx.tomldiff --git a/benchmarks/swebench/configs/opencode-agtx-terse.toml b/benchmark/swebench/configs/opencode-agtx-terse.tomlsimilarity index 100%rename from benchmarks/swebench/configs/opencode-agtx-terse.tomlrename to benchmark/swebench/configs/opencode-agtx-terse.tomldiff --git a/benchmarks/swebench/configs/opencode-agtx.toml b/benchmark/swebench/configs/opencode-agtx.tomlsimilarity index 100%rename from benchmarks/swebench/configs/opencode-agtx.tomlrename to benchmark/swebench/configs/opencode-agtx.tomldiff --git a/benchmarks/swebench/configs/opencode-claude-claude-agtx-terse.toml b/benchmark/swebench/configs/opencode-claude-claude-agtx-terse.tomlsimilarity index 100%rename from benchmarks/swebench/configs/opencode-claude-claude-agtx-terse.tomlrename to benchmark/swebench/configs/opencode-claude-claude-agtx-terse.tomldiff --git a/benchmarks/swebench/configs/opencode-claude-claude-agtx.toml b/benchmark/swebench/configs/opencode-claude-claude-agtx.tomlsimilarity index 100%rename from benchmarks/swebench/configs/opencode-claude-claude-agtx.tomlrename to benchmark/swebench/configs/opencode-claude-claude-agtx.tomldiff --git a/benchmarks/swebench/pyproject.toml b/benchmark/swebench/pyproject.tomlsimilarity index 100%rename from benchmarks/swebench/pyproject.tomlrename to benchmark/swebench/pyproject.tomldiff --git a/benchmarks/swebench/requirements.txt b/benchmark/swebench/requirements.txtsimilarity index 100%rename from benchmarks/swebench/requirements.txtrename to benchmark/swebench/requirements.txtdiff --git a/benchmarks/swebench/uv.lock b/benchmark/swebench/uv.locksimilarity index 100%rename from benchmarks/swebench/uv.lockrename to benchmark/swebench/uv.lockdiff --git a/src/agent/mod.rs b/src/agent/mod.rsindex cc9141a..16a602f 100644--- a/src/agent/mod.rs+++ b/src/agent/mod.rs@@ -40,7 +40,7 @@ impl Agent {"claude" => "claude --dangerously-skip-permissions --continue".to_string(),"codex" => "codex resume --last".to_string(),"copilot" => "copilot --allow-all-tools --continue".to_string(),- "gemini" => "gemini --approval-mode yolo --resume".to_string(),+ "gemini" => "GEMINI_TRUST_WORKSPACE=true gemini --approval-mode yolo --resume".to_string(),"opencode" => "opencode --continue".to_string(),"cursor" => "agent --yolo --continue".to_string(),_ => self.build_interactive_command(""),@@ -56,7 +56,7 @@ impl Agent {"claude" => "claude --dangerously-skip-permissions".to_string(),"codex" => "codex --full-auto".to_string(),"copilot" => "copilot --allow-all-tools".to_string(),- "gemini" => "gemini --approval-mode yolo".to_string(),+ "gemini" => "GEMINI_TRUST_WORKSPACE=true gemini --approval-mode yolo".to_string(),"opencode" => "opencode".to_string(),"cursor" => "agent --yolo".to_string(),_ => self.command.clone(),@@ -68,7 +68,7 @@ impl Agent {"claude" => format!("claude --dangerously-skip-permissions '{}'", escaped_prompt),"codex" => format!("codex --full-auto '{}'", escaped_prompt),"copilot" => format!("copilot --allow-all-tools -p '{}'", escaped_prompt),- "gemini" => format!("gemini --approval-mode yolo -i '{}'", escaped_prompt),+ "gemini" => format!("GEMINI_TRUST_WORKSPACE=true gemini --approval-mode yolo -i '{}'", escaped_prompt),"opencode" => format!("opencode -p '{}'", escaped_prompt),"cursor" => format!("agent --yolo '{}'", escaped_prompt),_ => format!("{} '{}'", self.command, escaped_prompt),diff --git a/src/tui/app.rs b/src/tui/app.rsindex 4ef1e1f..f9747e2 100644--- a/src/tui/app.rs+++ b/src/tui/app.rs@@ -6290,6 +6290,18 @@ impl App {let content_hash = if phase_status == PhaseStatus::Working && !window_gone {session_name.as_ref().and_then(|sn| {tmux_ops.capture_pane(sn).ok().map(|content| {+ // Auto-dismiss Codex MCP tool approval prompt ("Always allow")+ // so agents can call agtx MCP tools without manual confirmation.+ if agent == "codex"+ && content.contains("Allow the")+ && content.contains("MCP server to run tool")+ && content.contains("Always allow")+ {+ let _ = tmux_ops.send_keys_literal(sn, "3");+ std::thread::sleep(std::time::Duration::from_millis(100));+ let _ = tmux_ops.send_keys_literal(sn, "Enter");+ }+use std::hash::{Hash, Hasher};let mut hasher = std::collections::hash_map::DefaultHasher::new();content.hash(&mut hasher);@@ -8664,7 +8676,15 @@ fn switch_agent_in_tmux(std::thread::sleep(std::time::Duration::from_millis(2000));// 5. Start the new agent- let _ = tmux_ops.send_keys(target, new_agent_cmd);+ // Wrap with env -u to clear Claude Code's nesting-detection vars β the+ // persistent shell inherited them at window creation time, so they must+ // be stripped explicitly here (unlike create_window which uses env -u+ // on the initial command only).+ let cmd = format!(+ "env -u CLAUDECODE -u CLAUDE_CODE_ENTRYPOINT {}",+ new_agent_cmd+ );+ let _ = tmux_ops.send_keys(target, &cmd);// 6. Wait for the new agent process to actually start (pane_current_command != shell).// Without this, wait_for_agent_ready may see stale ">" from old pane content@@ -8720,6 +8740,20 @@ fn wait_for_agent_ready(tmux_ops: &Arc<dyn TmuxOperations>, target: &str) -> Optbreak;}+ // Handle Gemini trust dialog β auto-trust the folder so MCP servers+ // and skills are loaded. After answering, Gemini restarts; reset+ // stabilization counters so we wait for the new instance to be ready.+ if content.contains("Do you trust the files in this folder?") {+ let _ = tmux_ops.send_keys_literal(target, "1");+ std::thread::sleep(std::time::Duration::from_millis(50));+ let _ = tmux_ops.send_keys_literal(target, "Enter");+ // Reset stabilization β Gemini will restart and we must wait again+ last_content = String::new();+ stable_ticks = 0;+ change_count = 0;+ continue;+ }+// Check 2: known ready indicator in pane contentif AGENT_ACTIVE_INDICATORS.iter().any(|s| content.contains(s)) {break;@@ -8913,7 +8947,7 @@ fn write_skills_to_worktree("gemini" => {let cfg = serde_json::json!({"mcpServers": {- "agtx": { "command": agtx_bin, "args": ["mcp-serve", &project_path_str] }+ "agtx": { "command": agtx_bin, "args": ["mcp-serve", &project_path_str], "trust": true }}});let dir = Path::new(worktree_path).join(".gemini");diff --git a/src/tui/app_tests.rs b/src/tui/app_tests.rsindex f326527..b301b52 100644--- a/src/tui/app_tests.rs+++ b/src/tui/app_tests.rs@@ -3084,7 +3084,7 @@ fn test_switch_agent_claude_sends_exit() {if k == "/exit" {exit_sent_c.store(true, Ordering::SeqCst);}- if k == "codex" {+ if k == "env -u CLAUDECODE -u CLAUDE_CODE_ENTRYPOINT codex" {new_agent_sent_c.store(true, Ordering::SeqCst);}Ok(())@@ -8609,7 +8609,7 @@ fn test_switch_agent_claude_sends_exit_then_new_cmd() {// new agent command sent after shell foundmock_tmux.expect_send_keys()- .withf(|_, cmd: &str| cmd == "claude --dangerously-skip-permissions")+ .withf(|_, cmd: &str| cmd == "env -u CLAUDECODE -u CLAUDE_CODE_ENTRYPOINT claude --dangerously-skip-permissions").times(1).returning(|_, _| Ok(()));@@ -8640,7 +8640,7 @@ fn test_switch_agent_codex_sends_ctrl_c_not_exit() {.returning(|_| Ok(String::new()));mock_tmux.expect_send_keys()- .withf(|_, cmd: &str| cmd == "codex --full-auto")+ .withf(|_, cmd: &str| cmd == "env -u CLAUDECODE -u CLAUDE_CODE_ENTRYPOINT codex --full-auto").times(1).returning(|_, _| Ok(()));@@ -8684,7 +8684,7 @@ fn test_switch_agent_retries_with_ctrl_c_when_shell_not_found() {// new agent cmd always sent at endmock_tmux.expect_send_keys()- .withf(|_, cmd: &str| cmd == "newagent")+ .withf(|_, cmd: &str| cmd == "env -u CLAUDECODE -u CLAUDE_CODE_ENTRYPOINT newagent").times(1).returning(|_, _| Ok(()));@@ -8719,7 +8719,7 @@ fn test_switch_agent_sends_ctrl_d_as_last_resort() {// new agent still sentmock_tmux.expect_send_keys()- .withf(|_, cmd: &str| cmd == "newagent")+ .withf(|_, cmd: &str| cmd == "env -u CLAUDECODE -u CLAUDE_CODE_ENTRYPOINT newagent").times(1).returning(|_, _| Ok(()));@@ -8744,7 +8744,7 @@ fn test_switch_agent_always_sends_new_agent_cmd() {// This is the key assertion β new_agent_cmd must be sent exactly oncemock_tmux.expect_send_keys()- .withf(|_, cmd: &str| cmd == "my-new-agent")+ .withf(|_, cmd: &str| cmd == "env -u CLAUDECODE -u CLAUDE_CODE_ENTRYPOINT my-new-agent").times(1).returning(|_, _| Ok(()));@@ -9074,7 +9074,7 @@ fn test_switch_agent_cursor_sends_ctrl_c_not_exit() {.returning(|_| Ok(String::new()));mock_tmux.expect_send_keys()- .withf(|_, cmd: &str| cmd == "agent --yolo")+ .withf(|_, cmd: &str| cmd == "env -u CLAUDECODE -u CLAUDE_CODE_ENTRYPOINT agent --yolo").times(1).returning(|_, _| Ok(()));diff --git a/tests/agent_tests.rs b/tests/agent_tests.rsindex f8cf640..e3fb44a 100644--- a/tests/agent_tests.rs+++ b/tests/agent_tests.rs@@ -105,7 +105,7 @@ fn test_build_interactive_command_existing_agents_unchanged() {);assert_eq!(by_name("gemini").build_interactive_command(""),- "gemini --approval-mode yolo"+ "GEMINI_TRUST_WORKSPACE=true gemini --approval-mode yolo");assert_eq!(by_name("opencode").build_interactive_command(""),@@ -136,7 +136,7 @@ fn test_build_resume_command_all_agents() {);assert_eq!(by_name("gemini").build_resume_command(),- "gemini --approval-mode yolo --resume"+ "GEMINI_TRUST_WORKSPACE=true gemini --approval-mode yolo --resume");assert_eq!(by_name("opencode").build_resume_command(),