a62e34ea8e
* Add Cursor CLI as a coding agent choice * Launch Cursor CLI through its agent subcommand with --trust Cursor CLI still dispatches a one-word prompt that names one of its subcommands (update, login, help) even after a bare --, so name the agent subcommand outright and pass the prompt behind -- there, where it also keeps a prompt starting with a dash from being read as an option. --yolo only auto-allows commands; the workspace trust dialog is skipped only by --trust, and a launcher that must not stop to ask needs both. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * Leave an official Cursor CLI install alone Cursor's own installer symlinks ~/.local/bin/cursor-agent, the same path the mise wrapper takes. The migration now installs the wrapper only when no cursor-agent command exists, and Remove Preinstalls deletes the path only when it holds the wrapper omarchy-mise-install wrote, the way the Hermes wrapper is handled. Selecting the agent treats an executable at that path other than the wrapper as the user's own install and skips mise, since the mise shims precede ~/.local/bin on PATH and a mise copy would only shadow it. The wrapper resolves through mise's registry, which lists cursor-agent from 2026.8.15 on. The tests write a real cursor-agent stub before Remove Preinstalls runs, cover the preinstall opt-out for the new migration, and check that a symlinked official install survives removal and selection alike while a dead file at the same path still installs. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * Give Cursor its brand mark and one name in the menu Add Cursor's mark to the Omarchy icon font as U+E90D and point the agent entry and both editor entries at it, so one brand is drawn one way across the menu. Label the agent entry "Cursor CLI", the name the command and the manual already use, and spell it the same in the migration and the tests. Append the manual row after the others at the standard width. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * Keep an official Cursor CLI install through a user re-provision User setup writes every mise wrapper unconditionally, which is fine on a fresh install but replaces the symlink Cursor's own installer leaves at the same path when omarchy-provision-user runs again with --force. Guard that one line the way the migration does. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> --------- Co-authored-by: John Cavanaugh <59479+cavanaug@users.noreply.github.com> Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
93 lines
3.5 KiB
Bash
Executable File
93 lines
3.5 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
# omarchy:summary=Set and launch the default coding agent
|
|
# omarchy:args=[pi|omp|opencode|ori|claude|codex|grok|openclaw|agy|hermes|copilot|crush|cursor-agent]
|
|
# omarchy:examples=omarchy default agent | omarchy default agent codex | omarchy default agent claude
|
|
|
|
installing=false
|
|
if [[ ${1:-} == "--install" ]]; then
|
|
installing=true
|
|
shift
|
|
fi
|
|
|
|
agent_file="$HOME/.config/omarchy/defaults/agent"
|
|
|
|
if (($# == 0)); then
|
|
if [[ -f $agent_file ]]; then
|
|
read -r agent <"$agent_file"
|
|
fi
|
|
|
|
# Silent when unset rather than defaulting: Omarchy picks no agent for you, so
|
|
# the menu leaves every entry unchecked until one is chosen.
|
|
[[ -n ${agent:-} ]] && echo "$agent"
|
|
exit 0
|
|
fi
|
|
|
|
case "$1" in
|
|
pi) agent="pi"; name="Pi" ;;
|
|
omp | oh-my-pi) agent="omp"; name="Oh My Pi"; agent_package="github:can1357/oh-my-pi" ;;
|
|
opencode | open-code) agent="opencode"; name="OpenCode" ;;
|
|
ori | openrouter) agent="ori"; name="Ori"; agent_package="github:OpenRouterLabs/ori-releases" ;;
|
|
claude | claude-code) agent="claude"; name="Claude Code" ;;
|
|
codex) agent="codex"; name="Codex" ;;
|
|
crush) agent="crush"; name="Crush" ;;
|
|
grok) agent="grok"; name="Grok"; agent_package="npm:@xai-official/grok" ;;
|
|
openclaw) agent="openclaw"; name="OpenClaw"; agent_installer="omarchy-install-openclaw-cli" ;;
|
|
agy | antigravity | antigravity-cli | gemini | gemini-cli) agent="agy"; name="Antigravity"; agent_package="antigravity-cli" ;;
|
|
hermes) agent="hermes"; name="Hermes"; agent_installer="omarchy-install-hermes-cli" ;;
|
|
copilot | github-copilot) agent="copilot"; name="GitHub Copilot" ;;
|
|
cursor | cursor-agent) agent="cursor-agent"; name="Cursor CLI" ;;
|
|
*)
|
|
echo "Usage: omarchy-default-agent <pi|omp|opencode|ori|claude|codex|grok|openclaw|agy|hermes|copilot|crush|cursor-agent>"
|
|
exit 1
|
|
;;
|
|
esac
|
|
|
|
agent_package=${agent_package:-$agent}
|
|
|
|
# Hermes reaches mise through its own installer rather than straight from
|
|
# here: it needs its interpreter pinned, and a bare `mise use` has nowhere to
|
|
# say so. See omarchy-install-hermes-cli. OpenClaw comes from its pacman
|
|
# package the same way; see omarchy-install-openclaw-cli.
|
|
if [[ -n ${agent_installer:-} ]]; then
|
|
# Not omarchy-cmd-present: the stub is on PATH from first boot and says
|
|
# nothing about whether Hermes is installed behind it. Treating a cold stub
|
|
# as installed skips the floating terminal and runs the minute-long install
|
|
# inside the menu action instead.
|
|
agent_present() { "$agent_installer" --check; }
|
|
agent_install() { "$agent_installer" --now; }
|
|
else
|
|
# Anything at the wrapper's path other than the wrapper is the user's own
|
|
# install, such as the symlink Cursor's installer leaves. A mise copy would
|
|
# only shadow it, since the mise shims precede ~/.local/bin on PATH.
|
|
user_install() {
|
|
[[ -x $HOME/.local/bin/$agent ]] &&
|
|
{ [[ -L $HOME/.local/bin/$agent ]] || ! grep -q '^mise use -g' "$HOME/.local/bin/$agent"; }
|
|
}
|
|
agent_present() { user_install || mise where "$agent_package" &>/dev/null; }
|
|
agent_install() { user_install || mise use -g "$agent_package"; }
|
|
fi
|
|
|
|
if [[ $installing == "false" ]] && ! agent_present; then
|
|
exec omarchy-launch-floating-terminal-with-presentation omarchy-default-agent --install "$agent"
|
|
fi
|
|
|
|
if ! agent_install; then
|
|
if [[ $installing == "true" ]]; then
|
|
echo "Could not install $name with mise" >&2
|
|
else
|
|
echo "Could not set $name as the default coding agent" >&2
|
|
fi
|
|
exit 1
|
|
fi
|
|
|
|
mkdir -p "$(dirname "$agent_file")"
|
|
printf '%s\n' "$agent" >"$agent_file"
|
|
|
|
if [[ $installing == "true" ]]; then
|
|
printf '\033[2J\033[3J\033[H'
|
|
exec omarchy-agent --inline
|
|
else
|
|
exec omarchy-agent
|
|
fi
|