From dd9dee417f53a77487d93cfa21925bbc854ab104 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Sat, 15 Aug 2026 19:23:15 +0200
Subject: [PATCH] Launch claude and codex agents with auto-review instead of
 full bypass (#7001)

* Launch claude and codex agents with auto-review instead of full bypass

Claude's auto permission mode and codex's --approve-for-me both run
unattended without prompting, but keep automatic review (and codex's
workspace-write sandbox) instead of skipping approval entirely. Grok
stays on bypassPermissions.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* Match the bash aliases to the agent launcher's auto-review modes

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

---------

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
---
 bin/omarchy-agent                  | 10 +++++++---
 default/bash/aliases               |  4 ++--
 test/shell.d/default-agent-test.sh |  8 ++++----
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/bin/omarchy-agent b/bin/omarchy-agent
index 61736ea9..c93fb1d7 100755
--- a/bin/omarchy-agent
+++ b/bin/omarchy-agent
@@ -74,12 +74,16 @@ crush)
     command=(crush --yolo)
   fi
   ;;
-claude | grok)
-  command=("$agent" --permission-mode bypassPermissions)
+claude)
+  command=(claude --permission-mode auto)
+  [[ -n ${prompt:-} ]] && command+=(-- "$prompt")
+  ;;
+grok)
+  command=(grok --permission-mode bypassPermissions)
   [[ -n ${prompt:-} ]] && command+=(-- "$prompt")
   ;;
 codex)
-  command=(codex --dangerously-bypass-approvals-and-sandbox)
+  command=(codex --approve-for-me)
   [[ -n ${prompt:-} ]] && command+=(-- "$prompt")
   ;;
 omp)
diff --git a/default/bash/aliases b/default/bash/aliases
index 38a3e2d6..315dd230 100644
--- a/default/bash/aliases
+++ b/default/bash/aliases
@@ -45,8 +45,8 @@ alias ....='cd ../../..'
 # Tools
 alias a='omarchy-agent --inline'
 alias c='opencode --auto'
-alias cx='printf "\033[2J\033[3J\033[H" && claude --permission-mode bypassPermissions'
-alias cy='codex -s danger-full-access -a never'
+alias cx='printf "\033[2J\033[3J\033[H" && claude --permission-mode auto'
+alias cy='codex --approve-for-me'
 alias d='docker'
 alias r='rails'
 alias t='tmux attach || tmux new -s Work'
diff --git a/test/shell.d/default-agent-test.sh b/test/shell.d/default-agent-test.sh
index 28eb8aae..8fc8c4c6 100644
--- a/test/shell.d/default-agent-test.sh
+++ b/test/shell.d/default-agent-test.sh
@@ -369,8 +369,8 @@ assert_bypass() {
 assert_launch pi pi "Review this project"
 assert_launch omp omp --auto-approve -- "Review this project"
 assert_launch opencode opencode --auto --prompt "Review this project"
-assert_launch claude claude --permission-mode bypassPermissions -- "Review this project"
-assert_launch codex codex --dangerously-bypass-approvals-and-sandbox -- "Review this project"
+assert_launch claude claude --permission-mode auto -- "Review this project"
+assert_launch codex codex --approve-for-me -- "Review this project"
 assert_launch crush crush run "Review this project"
 assert_launch grok grok --permission-mode bypassPermissions -- "Review this project"
 assert_launch gemini gemini --yolo --prompt-interactive "Review this project"
@@ -380,8 +380,8 @@ pass "agent launcher adapts initial prompts for every supported agent"
 assert_bypass pi pi
 assert_bypass omp omp --auto-approve
 assert_bypass opencode opencode --auto
-assert_bypass claude claude --permission-mode bypassPermissions
-assert_bypass codex codex --dangerously-bypass-approvals-and-sandbox
+assert_bypass claude claude --permission-mode auto
+assert_bypass codex codex --approve-for-me
 assert_bypass crush crush --yolo
 assert_bypass grok grok --permission-mode bypassPermissions
 assert_bypass gemini gemini --yolo