* 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>
141 lines
4.3 KiB
Bash
Executable File
141 lines
4.3 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
# omarchy:summary=Launch the default coding agent in a terminal
|
|
# omarchy:args=[--inline] [--pick]
|
|
# omarchy:examples=omarchy agent | omarchy agent --inline
|
|
|
|
inline=false
|
|
pick=false
|
|
|
|
# Flags only. A bare prompt would shadow the subcommands under this group, so
|
|
# prompts go through omarchy-agent-prompt, which passes one here as --prompt.
|
|
while (($#)); do
|
|
case "$1" in
|
|
--inline)
|
|
inline=true
|
|
shift
|
|
;;
|
|
--pick)
|
|
pick=true
|
|
shift
|
|
;;
|
|
--prompt)
|
|
prompt=${2:?--prompt needs a value}
|
|
shift 2
|
|
;;
|
|
*)
|
|
echo "Unexpected argument: $1" >&2
|
|
echo "To pass a prompt: omarchy agent prompt \"$*\"" >&2
|
|
exit 1
|
|
;;
|
|
esac
|
|
done
|
|
|
|
# Agents refuse to remember trust for $HOME, so launches from the keybinding or
|
|
# menu start in the work directory instead of re-asking on every session.
|
|
[[ $PWD == "$HOME" && -d $HOME/Work ]] && cd "$HOME/Work"
|
|
|
|
agent=$(omarchy-default-agent)
|
|
|
|
# Omarchy ships without a default, so there is nothing to launch until one is
|
|
# picked. --pick offers the choice instead of the error, which is what the
|
|
# keybinding wants: a keypress that opens nothing explains nothing.
|
|
if [[ -z $agent ]]; then
|
|
[[ $pick == "true" ]] && exec omarchy-menu summon setup.default.agent
|
|
echo "Choose default agent with: omarchy default agent <name>" >&2
|
|
exit 1
|
|
fi
|
|
|
|
if omarchy-cmd-missing "$agent"; then
|
|
echo "$agent is not installed. Choose an installed agent with: omarchy default agent <name>" >&2
|
|
exit 1
|
|
fi
|
|
|
|
# Agents launched from the keybinding or menu run unattended, so each one starts
|
|
# with its own spelling of "don't stop to ask". Pi and Ori have none to skip.
|
|
case "$agent" in
|
|
opencode)
|
|
command=(opencode --auto)
|
|
[[ -n ${prompt:-} ]] && command+=(--prompt "$prompt")
|
|
;;
|
|
agy)
|
|
command=(agy --dangerously-skip-permissions)
|
|
[[ -n ${prompt:-} ]] && command+=(--prompt-interactive "$prompt")
|
|
;;
|
|
copilot)
|
|
command=(copilot --allow-all)
|
|
[[ -n ${prompt:-} ]] && command+=(--interactive "$prompt")
|
|
;;
|
|
crush)
|
|
# --yolo belongs to the interactive command only; `crush run` never prompts.
|
|
if [[ -n ${prompt:-} ]]; then
|
|
command=(crush run "$prompt")
|
|
else
|
|
command=(crush --yolo)
|
|
fi
|
|
;;
|
|
claude)
|
|
command=(claude --permission-mode auto)
|
|
[[ -n ${prompt:-} ]] && command+=(-- "$prompt")
|
|
;;
|
|
grok)
|
|
command=(grok --permission-mode bypassPermissions)
|
|
[[ -n ${prompt:-} ]] && command+=(-- "$prompt")
|
|
;;
|
|
openclaw)
|
|
# The launcher owns onboarding and the gateway dance: OpenClaw's terminal UI
|
|
# must attach to the running gateway (the embedded `openclaw chat` refuses to
|
|
# start while the gateway owns the state directory). It has no permission
|
|
# prompts to skip, and --message seeds the session while keeping it
|
|
# interactive.
|
|
command=(omarchy-launch-openclaw --tui)
|
|
[[ -n ${prompt:-} ]] && command+=(--message "$prompt")
|
|
;;
|
|
codex)
|
|
command=(codex --approve-for-me)
|
|
[[ -n ${prompt:-} ]] && command+=(-- "$prompt")
|
|
;;
|
|
cursor-agent)
|
|
# --yolo covers commands only; the workspace trust dialog has its own flag.
|
|
# A one-word prompt naming a subcommand (update, login, help) still runs that
|
|
# subcommand after a bare --, so the agent subcommand is named outright, and
|
|
# -- after it keeps a prompt starting with a dash from being read as an option.
|
|
command=(cursor-agent --yolo --trust)
|
|
[[ -n ${prompt:-} ]] && command+=(agent -- "$prompt")
|
|
;;
|
|
hermes)
|
|
if [[ -n ${prompt:-} ]]; then
|
|
command=(env -u HERMES_SESSION_SOURCE hermes chat --yolo --tui "--query=$prompt")
|
|
else
|
|
command=(hermes --yolo)
|
|
fi
|
|
;;
|
|
omp)
|
|
command=(omp --auto-approve)
|
|
[[ -n ${prompt:-} ]] && command+=(-- "$prompt")
|
|
;;
|
|
ori)
|
|
# Ori is a harness launcher, and `ori code` is the agent it runs itself.
|
|
# A prompt alone means one headless turn there, printed after the turn ends,
|
|
# so --interactive is what seeds the session with it and keeps the window.
|
|
command=(ori code)
|
|
[[ -n ${prompt:-} ]] && command+=(--interactive --prompt "$prompt")
|
|
;;
|
|
pi)
|
|
command=(pi)
|
|
[[ -n ${prompt:-} ]] && command+=("$prompt")
|
|
;;
|
|
*)
|
|
echo "Unsupported default agent: $agent" >&2
|
|
exit 1
|
|
;;
|
|
esac
|
|
|
|
if [[ $inline == "true" ]]; then
|
|
exec "${command[@]}"
|
|
else
|
|
# A fixed app-id rather than the default org.omarchy.<binary>, so every agent
|
|
# window shares one class for window rules and themes to single out.
|
|
exec omarchy-launch-tui --app-id=org.omarchy.agent "${command[@]}"
|
|
fi
|