From 1c3da949061a376440aa4c71cbf28f657df1a503 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Sat, 15 Aug 2026 17:00:19 +0200
Subject: [PATCH] Keep mise wrappers from writing to stdout (#6940)

mise use -g announces the resolved tool on stdout, so every wrapped command
prepended a "tools:" line to its own output. That corrupts anything speaking a
protocol over stdout, such as codex app-server. Pass --quiet, which keeps errors
on stderr and preserves the exit status.

The obsolete-wrapper check in the agent migration matched the generated command
verbatim, so loosen it to match the package instead of the flags.

Closes #6908

Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
---
 bin/omarchy-mise-install           |  2 +-
 migrations/1785846769.sh           |  2 +-
 test/shell.d/default-agent-test.sh | 20 +++++++++++++++++++-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/bin/omarchy-mise-install b/bin/omarchy-mise-install
index 87dc10fe..e6dfc96c 100755
--- a/bin/omarchy-mise-install
+++ b/bin/omarchy-mise-install
@@ -22,7 +22,7 @@ rm -f "$HOME/.local/bin/$command"
 cat >"$HOME/.local/bin/$command" <<EOF
 #!/bin/bash
 export MISE_MINIMUM_RELEASE_AGE=0
-mise use -g "$package" || exit 1
+mise use -g --quiet "$package" || exit 1
 exec mise x "$package" -- "$bin" "\$@"
 EOF
 
diff --git a/migrations/1785846769.sh b/migrations/1785846769.sh
index f3f5aab9..659cabab 100644
--- a/migrations/1785846769.sh
+++ b/migrations/1785846769.sh
@@ -4,6 +4,6 @@ if [[ ! -f $HOME/.local/state/omarchy/preinstalls-removed ]]; then
   omarchy-mise-install github:can1357/oh-my-pi omp
   omarchy-mise-install npm:@xai-official/grok grok
   omarchy-mise-install crush
-elif [[ -f $HOME/.local/bin/omp ]] && grep -Fq 'mise use -g "oh-my-pi"' "$HOME/.local/bin/omp"; then
+elif [[ -f $HOME/.local/bin/omp ]] && grep -Eq 'mise use -g .*"oh-my-pi"' "$HOME/.local/bin/omp"; then
   rm -f "$HOME/.local/bin/omp"
 fi
diff --git a/test/shell.d/default-agent-test.sh b/test/shell.d/default-agent-test.sh
index 680d9606..28eb8aae 100644
--- a/test/shell.d/default-agent-test.sh
+++ b/test/shell.d/default-agent-test.sh
@@ -105,7 +105,7 @@ assert_lazy_stub() {
   "$test_home/.local/bin/$command" --version
   mapfile -t mise_calls <"$mise_history"
 
-  [[ ${mise_calls[0]} == "use -g $package" && ${mise_calls[1]} == "x $package -- $command --version" ]] ||
+  [[ ${mise_calls[0]} == "use -g --quiet $package" && ${mise_calls[1]} == "x $package -- $command --version" ]] ||
     fail "$command lazy stub preserves its mise package"
 }
 
@@ -138,6 +138,24 @@ source "$ROOT/migrations/1785617047.sh" >/dev/null
 source "$ROOT/migrations/1785846769.sh" >/dev/null
 [[ ! -s $stub_log ]] || fail "agent migrations respect the preinstall opt-out"
 [[ ! -e $test_home/.local/bin/omp ]] || fail "agent migration removes the obsolete Oh My Pi wrapper after opt-out"
+
+# The matcher has to catch a bare oh-my-pi wrapper from either generation of the
+# installer, and leave a wrapper built on the fully qualified package alone.
+for obsolete_form in 'mise use -g "oh-my-pi"' 'mise use -g --quiet "oh-my-pi"'; do
+  printf '#!/bin/bash\n%s || exit 1\n' "$obsolete_form" >"$test_home/.local/bin/omp"
+  chmod +x "$test_home/.local/bin/omp"
+  source "$ROOT/migrations/1785846769.sh" >/dev/null
+  [[ ! -e $test_home/.local/bin/omp ]] ||
+    fail "agent migration removes a wrapper built on [$obsolete_form]"
+done
+
+printf '#!/bin/bash\nmise use -g --quiet "%s" || exit 1\n' "$omp_package" >"$test_home/.local/bin/omp"
+chmod +x "$test_home/.local/bin/omp"
+source "$ROOT/migrations/1785846769.sh" >/dev/null
+[[ -e $test_home/.local/bin/omp ]] ||
+  fail "agent migration keeps a wrapper built on $omp_package"
+rm -f "$test_home/.local/bin/omp"
+
 rm "$test_home/.local/state/omarchy/preinstalls-removed"
 pass "agent migrations install working wrappers without overriding the preinstall opt-out"