From a0e2501e15ad72ed0edbc3a7ffc040ffecb24cd5 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Sat, 1 Aug 2026 18:49:28 -0700
Subject: [PATCH] Add configurable default coding agent

---
 bin/omarchy-default-agent          |  49 +++++++
 bin/omarchy-launch-agent           |  54 +++++++
 default/omarchy/omarchy-menu.jsonc |   9 ++
 install/user/mise.sh               |   1 +
 migrations/1785633225.sh           |   3 +
 test/shell.d/default-agent-test.sh | 219 +++++++++++++++++++++++++++++
 test/shell.d/menu-test.sh          |  10 ++
 7 files changed, 345 insertions(+)
 create mode 100755 bin/omarchy-default-agent
 create mode 100755 bin/omarchy-launch-agent
 create mode 100644 migrations/1785633225.sh
 create mode 100644 test/shell.d/default-agent-test.sh

diff --git a/bin/omarchy-default-agent b/bin/omarchy-default-agent
new file mode 100755
index 00000000..7a4e8a27
--- /dev/null
+++ b/bin/omarchy-default-agent
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+# omarchy:summary=Set the default coding agent used by omarchy-launch-agent
+# omarchy:args=[pi|omp|opencode|claude|codex|grok|gemini|copilot]
+# omarchy:examples=omarchy default agent | omarchy default agent codex | omarchy default agent claude
+
+agent_file="$HOME/.local/state/omarchy/defaults/agent"
+
+if (($# == 0)); then
+  if [[ -f $agent_file ]]; then
+    read -r agent <"$agent_file"
+  fi
+
+  [[ -n $agent ]] && echo "$agent" || echo "opencode"
+  exit 0
+fi
+
+case "$1" in
+pi) agent="pi"; name="Pi" ;;
+omp | oh-my-pi) agent="omp"; name="Oh My Pi"; agent_package="oh-my-pi" ;;
+opencode | open-code) agent="opencode"; name="OpenCode" ;;
+claude | claude-code) agent="claude"; name="Claude Code" ;;
+codex) agent="codex"; name="Codex" ;;
+grok) agent="grok"; name="Grok"; agent_package="npm:@xai-official/grok" ;;
+gemini | gemini-cli) agent="gemini"; name="Gemini" ;;
+copilot | github-copilot) agent="copilot"; name="GitHub Copilot" ;;
+*)
+  echo "Usage: omarchy-default-agent <pi|omp|opencode|claude|codex|grok|gemini|copilot>"
+  exit 1
+  ;;
+esac
+
+agent_package=${agent_package:-$agent}
+installing=false
+
+if ! mise where "$agent_package" &>/dev/null; then
+  installing=true
+  omarchy-notification-send -g 󰚩 "Installing $name with mise" "This might take a few minutes..."
+fi
+
+if ! mise use -g "$agent_package"; then
+  [[ $installing == "true" ]] && omarchy-notification-send -g 󰚩 "Could not install $name with mise"
+  exit 1
+fi
+
+mkdir -p "$(dirname "$agent_file")"
+printf '%s\n' "$agent" >"$agent_file"
+
+omarchy-notification-send -g 󰚩 "$name is now the default coding agent"
diff --git a/bin/omarchy-launch-agent b/bin/omarchy-launch-agent
new file mode 100755
index 00000000..54950bf6
--- /dev/null
+++ b/bin/omarchy-launch-agent
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+# omarchy:summary=Launch the default coding agent in a terminal
+# omarchy:args=[prompt...]
+# omarchy:examples=omarchy launch agent | omarchy launch agent "Review this project"
+
+agent=$(omarchy-default-agent)
+
+if omarchy-cmd-missing "$agent"; then
+  if [[ -x $HOME/.local/bin/$agent ]]; then
+    export PATH="$HOME/.local/bin:$PATH"
+  else
+    echo "$agent is not installed. Choose an installed agent with: omarchy default agent <name>" >&2
+    exit 1
+  fi
+fi
+
+if (($# > 0)); then
+  prompt="$*"
+fi
+
+case "$agent" in
+opencode)
+  if [[ -n ${prompt:-} ]]; then
+    command=(opencode --prompt "$prompt")
+  else
+    command=(opencode)
+  fi
+  ;;
+gemini)
+  if [[ -n ${prompt:-} ]]; then
+    command=(gemini --prompt-interactive "$prompt")
+  else
+    command=(gemini)
+  fi
+  ;;
+copilot)
+  if [[ -n ${prompt:-} ]]; then
+    command=(copilot --interactive "$prompt")
+  else
+    command=(copilot)
+  fi
+  ;;
+pi | omp | claude | codex | grok)
+  command=("$agent")
+  [[ -n ${prompt:-} ]] && command+=(-- "$prompt")
+  ;;
+*)
+  echo "Unsupported default agent: $agent" >&2
+  exit 1
+  ;;
+esac
+
+exec omarchy-launch-tui "${command[@]}"
diff --git a/default/omarchy/omarchy-menu.jsonc b/default/omarchy/omarchy-menu.jsonc
index c3382e8b..0c5d424c 100644
--- a/default/omarchy/omarchy-menu.jsonc
+++ b/default/omarchy/omarchy-menu.jsonc
@@ -123,6 +123,15 @@
   "setup.input": {"icon":"","label":"Input","when":"[[ -f ~/.config/hypr/input.lua ]]","action":"omarchy-launch-config-editor \"$HOME/.config/hypr/input.lua\""},
   "setup.direct-boot": {"icon":"","label":"Direct Boot","action":"omarchy-launch-floating-terminal-with-presentation omarchy-setup-direct-boot"},
   "setup.default": {"icon":"","label":"Defaults","aliases":["default","defaults"]},
+  "setup.default.agent": {"icon":"󰚩","label":"Agent"},
+  "setup.default.agent.pi": {"icon":"󰚩","label":"Pi","checked":"[[ \"$(omarchy-default-agent)\" == \"pi\" ]]","action":"omarchy-default-agent pi"},
+  "setup.default.agent.omp": {"icon":"󰚩","label":"Oh My Pi","checked":"[[ \"$(omarchy-default-agent)\" == \"omp\" ]]","action":"omarchy-default-agent omp"},
+  "setup.default.agent.opencode": {"icon":"󰚩","label":"OpenCode","checked":"[[ \"$(omarchy-default-agent)\" == \"opencode\" ]]","action":"omarchy-default-agent opencode"},
+  "setup.default.agent.claude": {"icon":"󰚩","label":"Claude Code","checked":"[[ \"$(omarchy-default-agent)\" == \"claude\" ]]","action":"omarchy-default-agent claude"},
+  "setup.default.agent.codex": {"icon":"󰚩","label":"Codex","checked":"[[ \"$(omarchy-default-agent)\" == \"codex\" ]]","action":"omarchy-default-agent codex"},
+  "setup.default.agent.grok": {"icon":"󰚩","label":"Grok","checked":"[[ \"$(omarchy-default-agent)\" == \"grok\" ]]","action":"omarchy-default-agent grok"},
+  "setup.default.agent.gemini": {"icon":"󰚩","label":"Gemini","checked":"[[ \"$(omarchy-default-agent)\" == \"gemini\" ]]","action":"omarchy-default-agent gemini"},
+  "setup.default.agent.copilot": {"icon":"󰚩","label":"GitHub Copilot","checked":"[[ \"$(omarchy-default-agent)\" == \"copilot\" ]]","action":"omarchy-default-agent copilot"},
   "setup.default.browser": {"icon":"","label":"Browser"},
   "setup.default.browser.chromium": {"icon":"","label":"Chromium","when":"omarchy-cmd-present chromium","checked":"[[ \"$(omarchy-default-browser)\" == \"chromium\" ]]","action":"omarchy-default-browser chromium"},
   "setup.default.browser.chrome": {"icon":"󰊯","label":"Chrome","when":"omarchy-cmd-present google-chrome-stable","checked":"[[ \"$(omarchy-default-browser)\" == \"chrome\" ]]","action":"omarchy-default-browser chrome"},
diff --git a/install/user/mise.sh b/install/user/mise.sh
index 87c16ac1..e5467395 100644
--- a/install/user/mise.sh
+++ b/install/user/mise.sh
@@ -7,5 +7,6 @@ omarchy-mise-install opencode
 omarchy-mise-install npm:playwright playwright
 omarchy-mise-install pi
 omarchy-mise-install oh-my-pi omp
+omarchy-mise-install npm:@xai-official/grok grok
 omarchy-mise-install npm:@kitlangton/ghui ghui
 omarchy-mise-install aqua:modem-dev/hunk hunk
diff --git a/migrations/1785633225.sh b/migrations/1785633225.sh
new file mode 100644
index 00000000..657ba855
--- /dev/null
+++ b/migrations/1785633225.sh
@@ -0,0 +1,3 @@
+echo "Install Grok via mise wrapper"
+
+omarchy-mise-install npm:@xai-official/grok grok
diff --git a/test/shell.d/default-agent-test.sh b/test/shell.d/default-agent-test.sh
new file mode 100644
index 00000000..91da13a8
--- /dev/null
+++ b/test/shell.d/default-agent-test.sh
@@ -0,0 +1,219 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
+
+test_tmp=$(mktemp -d)
+trap 'rm -rf "$test_tmp"' EXIT
+
+mock_bin="$test_tmp/bin"
+test_home="$test_tmp/home"
+notification_log="$test_tmp/notifications"
+notification_history="$test_tmp/notification-history"
+launch_log="$test_tmp/launch"
+mise_log="$test_tmp/mise"
+mise_history="$test_tmp/mise-history"
+stub_log="$test_tmp/stubs"
+mkdir -p "$mock_bin" "$test_home"
+
+cat >"$mock_bin/omarchy-notification-send" <<'SH'
+#!/bin/bash
+printf '%s\0' "$@" >"$OMARCHY_TEST_NOTIFICATION_LOG"
+printf '%s\0' "$@" >>"$OMARCHY_TEST_NOTIFICATION_HISTORY"
+SH
+
+cat >"$mock_bin/omarchy-cmd-missing" <<'SH'
+#!/bin/bash
+[[ $1 == ${OMARCHY_TEST_MISSING_COMMAND:-} ]]
+SH
+
+cat >"$mock_bin/omarchy-launch-tui" <<'SH'
+#!/bin/bash
+printf '%s\0' "$@" >"$OMARCHY_TEST_AGENT_LAUNCH_LOG"
+SH
+
+cat >"$mock_bin/omarchy-mise-install" <<'SH'
+#!/bin/bash
+printf '%s\n' "$*" >>"$OMARCHY_TEST_STUB_LOG"
+SH
+
+cat >"$mock_bin/mise" <<'SH'
+#!/bin/bash
+printf '%s\0' "$@" >"$OMARCHY_TEST_MISE_LOG"
+printf '%s\n' "$*" >>"$OMARCHY_TEST_MISE_HISTORY"
+
+if [[ $1 == "where" ]]; then
+  [[ ${OMARCHY_TEST_AGENT_INSTALLED:-false} == "true" ]]
+  exit
+fi
+
+[[ ${OMARCHY_TEST_MISE_FAIL:-false} != "true" ]]
+SH
+
+chmod +x "$mock_bin"/*
+
+export HOME="$test_home"
+export PATH="$mock_bin:$ROOT/bin:$PATH"
+export OMARCHY_TEST_NOTIFICATION_LOG="$notification_log"
+export OMARCHY_TEST_NOTIFICATION_HISTORY="$notification_history"
+export OMARCHY_TEST_AGENT_LAUNCH_LOG="$launch_log"
+export OMARCHY_TEST_MISE_LOG="$mise_log"
+export OMARCHY_TEST_MISE_HISTORY="$mise_history"
+export OMARCHY_TEST_STUB_LOG="$stub_log"
+
+grok_package="npm:@xai-official/grok"
+omp_package="oh-my-pi"
+
+assert_lazy_stub() {
+  local package=$1
+  local command=$2
+
+  : >"$mise_history"
+  "$ROOT/bin/omarchy-mise-install" "$package" "$command"
+  "$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" ]] ||
+    fail "$command lazy stub preserves its mise package"
+}
+
+assert_lazy_stub "$grok_package" grok
+assert_lazy_stub "$omp_package" omp
+pass "custom agent lazy stubs preserve their mise packages"
+
+source "$ROOT/install/user/mise.sh"
+grep -Fx "$grok_package grok" "$stub_log" >/dev/null || fail "user setup creates the Grok lazy stub"
+grep -Fx "$omp_package omp" "$stub_log" >/dev/null || fail "user setup creates the Oh My Pi lazy stub"
+pass "user setup creates the custom agent lazy stubs"
+
+[[ $(omarchy-default-agent) == "opencode" ]] || fail "default agent falls back to OpenCode"
+pass "default agent falls back to OpenCode"
+
+declare -A expected_agents=(
+  [pi]="pi"
+  [omp]="omp"
+  [oh-my-pi]="omp"
+  [opencode]="opencode"
+  [open-code]="opencode"
+  [claude]="claude"
+  [claude-code]="claude"
+  [codex]="codex"
+  [grok]="grok"
+  [gemini]="gemini"
+  [gemini-cli]="gemini"
+  [copilot]="copilot"
+  [github-copilot]="copilot"
+)
+
+declare -A expected_packages=(
+  [pi]="pi"
+  [omp]="$omp_package"
+  [opencode]="opencode"
+  [claude]="claude"
+  [codex]="codex"
+  [grok]="$grok_package"
+  [gemini]="gemini"
+  [copilot]="copilot"
+)
+
+for selection in "${!expected_agents[@]}"; do
+  expected=${expected_agents[$selection]}
+  omarchy-default-agent "$selection"
+  [[ $(omarchy-default-agent) == $expected ]] || fail "default agent canonicalizes $selection"
+
+  mapfile -d '' -t mise_args <"$mise_log"
+  [[ ${mise_args[0]} == "use" && ${mise_args[1]} == "-g" && ${mise_args[2]} == ${expected_packages[$expected]} ]] ||
+    fail "default agent installs $selection globally through mise"
+done
+pass "default agent installs and accepts every supported provider and alias"
+
+: >"$notification_history"
+omarchy-default-agent github-copilot
+mapfile -d '' -t notification_args <"$notification_log"
+[[ ${notification_args[0]} == "-g" && ${notification_args[2]} == "GitHub Copilot is now the default coding agent" ]] ||
+  fail "default agent sends a selection notification"
+mapfile -d '' -t notification_history_args <"$notification_history"
+[[ ${notification_history_args[2]} == "Installing GitHub Copilot with mise" && ${notification_history_args[3]} == "This might take a few minutes..." ]] ||
+  fail "default agent describes how long installation might take"
+pass "default agent sends installation and selection notifications"
+
+: >"$notification_history"
+OMARCHY_TEST_AGENT_INSTALLED=true omarchy-default-agent github-copilot
+mapfile -d '' -t notification_history_args <"$notification_history"
+[[ ${#notification_history_args[@]} == 3 && ${notification_history_args[2]} == "GitHub Copilot is now the default coding agent" ]] ||
+  fail "default agent skips installation notifications when the provider is already installed"
+mapfile -d '' -t mise_args <"$mise_log"
+[[ ${mise_args[0]} == "use" && ${mise_args[1]} == "-g" && ${mise_args[2]} == "copilot" ]] ||
+  fail "default agent still activates an installed provider globally through mise"
+pass "default agent only sends installation notifications for missing providers"
+
+if omarchy-default-agent unsupported >"$test_tmp/invalid-output" 2>&1; then
+  fail "default agent rejects unsupported providers"
+fi
+grep -F "Usage: omarchy-default-agent" "$test_tmp/invalid-output" >/dev/null ||
+  fail "default agent explains supported providers"
+[[ $(omarchy-default-agent) == "copilot" ]] || fail "invalid selection preserves the current default agent"
+pass "default agent rejects unsupported providers without changing the selection"
+
+if OMARCHY_TEST_MISE_FAIL=true omarchy-default-agent codex >"$test_tmp/install-failure-output" 2>&1; then
+  fail "default agent rejects a failed mise installation"
+fi
+[[ $(omarchy-default-agent) == "copilot" ]] || fail "failed installation preserves the current default agent"
+mapfile -d '' -t notification_args <"$notification_log"
+[[ ${notification_args[2]} == "Could not install Codex with mise" ]] ||
+  fail "default agent reports a failed mise installation"
+pass "default agent changes selection only after mise installs the provider"
+
+assert_launch() {
+  local agent=$1
+  shift
+  local expected=("$@")
+
+  printf '%s\n' "$agent" >"$test_home/.local/state/omarchy/defaults/agent"
+  omarchy-launch-agent "Review this" project
+  mapfile -d '' -t actual <"$launch_log"
+
+  (( ${#actual[@]} == ${#expected[@]} )) ||
+    fail "$agent launch has the expected argument count" "expected: ${expected[*]}\nactual: ${actual[*]}"
+
+  for ((index = 0; index < ${#expected[@]}; index++)); do
+    [[ ${actual[$index]} == ${expected[$index]} ]] ||
+      fail "$agent launch forwards the interactive prompt" "expected: ${expected[*]}\nactual: ${actual[*]}"
+  done
+}
+
+assert_launch pi pi -- "Review this project"
+assert_launch omp omp -- "Review this project"
+assert_launch opencode opencode --prompt "Review this project"
+assert_launch claude claude -- "Review this project"
+assert_launch codex codex -- "Review this project"
+assert_launch grok grok -- "Review this project"
+assert_launch gemini gemini --prompt-interactive "Review this project"
+assert_launch copilot copilot --interactive "Review this project"
+pass "agent launcher adapts initial prompts for every supported agent"
+
+mkdir -p "$test_home/.local/bin"
+touch "$test_home/.local/bin/gemini"
+chmod +x "$test_home/.local/bin/gemini"
+printf '%s\n' "gemini" >"$test_home/.local/state/omarchy/defaults/agent"
+OMARCHY_TEST_MISSING_COMMAND=gemini omarchy-launch-agent "Review this project"
+mapfile -d '' -t launch_args <"$launch_log"
+[[ ${launch_args[0]} == "gemini" && ${launch_args[1]} == "--prompt-interactive" ]] ||
+  fail "agent launcher finds a lazy wrapper outside the session PATH"
+pass "agent launcher finds lazy wrappers outside the session PATH"
+
+printf '%s\n' "opencode" >"$test_home/.local/state/omarchy/defaults/agent"
+omarchy-launch-agent
+mapfile -d '' -t launch_args <"$launch_log"
+[[ ${#launch_args[@]} == 1 && ${launch_args[0]} == "opencode" ]] ||
+  fail "agent launcher starts the selected agent without an initial prompt"
+pass "agent launcher starts the selected agent without an initial prompt"
+
+printf '%s\n' "missing" >"$test_home/.local/state/omarchy/defaults/agent"
+if OMARCHY_TEST_MISSING_COMMAND=missing omarchy-launch-agent >"$test_tmp/missing-output" 2>&1; then
+  fail "agent launcher rejects a missing default command"
+fi
+grep -F "missing is not installed" "$test_tmp/missing-output" >/dev/null ||
+  fail "agent launcher explains when the default command is missing"
+pass "agent launcher reports a missing default command"
diff --git a/test/shell.d/menu-test.sh b/test/shell.d/menu-test.sh
index 6ff4f015..4a5b0864 100644
--- a/test/shell.d/menu-test.sh
+++ b/test/shell.d/menu-test.sh
@@ -167,6 +167,16 @@ assertEqual(
   defaultItems.findIndex(item => item.id === 'setup.input') + 1,
   'menu lists Direct Boot immediately below Input'
 )
+assert(
+  ['pi', 'omp', 'opencode', 'claude', 'codex', 'grok', 'gemini', 'copilot'].every(agent => {
+    const entry = defaultById[`setup.default.agent.${agent}`]
+    return entry
+      && entry.action === `omarchy-default-agent ${agent}`
+      && !entry.when
+      && entry.checked.includes(`== \"${agent}\"`)
+  }),
+  'menu exposes every mise-installable coding agent under Defaults > Agent'
+)
 assert(
   defaultById['setup.security.passwordless-sudo'].action.includes('omarchy-sudo-passwordless'),
   'menu places Passwordless Sudo under Setup > Security'