3d1914a8cd
* Place a bar widget on a bar without the widget it names 'omarchy bar put X --after Y' refused outright when Y was not on the bar, so migration 1786279107 failed for every user whose clock is their own clone of omarchy.clock rather than the built-in, and took the rest of the migration chain down with it. put is the verb a migration or an install reaches for precisely because it cannot know what the bar it places into looks like, so it now falls back to the widget's usual spot instead of failing. 'plugin enable', which someone types, still says when it cannot find the target. A clone also answers as a placement target now, whether it is the widget the placement named or the anchor the fallback lands against: cloning the clock leaves a bar carrying your id where omarchy.clock used to be, and a caller naming the source means the clone that took its place, the way resolveEnabledId already routes calls to it. So the widget sits next to that clock rather than at the end of the section. Fixes #6678 Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * Keep asking a shell that is still starting An 'omarchy update' landing while the shell restarts failed migration 1786279107 twice over. Quickshell answers a call made before it finishes loading with "Not ready to accept queries yet." on stdout and exits 0, so a caller polling with a ping read a starting shell as up and then took that sentence for the answer to its real call; report it as unreachable, which every caller already knows how to handle, and omarchy-restart-shell stops cutting its readiness loop short on it too. Reading the plugin manifests is a subprocess behind that, so IPC starts answering before the registry knows the widget it is being asked to place, and put refused it as unknown. Say which of the two it is and let put keep asking. Only a shell that was never there is nothing to fail over. One that never finishes starting, one that stops responding, one too old to know the call at all: each has to fail, since omarchy-migrate records a migration that returns 0 as done, and the widget is then never placed and never asked for again. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * Fall back for the shell an update has not restarted yet omarchy-update runs its migrations before omarchy-update-restart, so the shell answering migration 1786279107 on the update that carries this fix is still the one that shipped without it, and it refuses the placement exactly as before. The users this is for would have watched one more update go wrong. put owns the fallback it documents, so let the command carry it: asked again without the neighbour the shell says it cannot find, that shell places the widget. A restarted shell never answers this way — it falls back itself, and knows to look for a clone of the widget the placement named, which the command cannot. Having answered once is now remembered across both asks. A shell that speaks and is then gone has stopped mid-request, and reading that as a machine that never had one would leave the migration recorded as done. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * Wait for a shell that has not appeared yet A shell being spawned has no socket to answer on, and nothing tells the command a launch is under way, so a put landing in that window read the silence as a machine without a shell and carried on — leaving the migration recorded as done with nothing placed. Give one three seconds to turn up first. A machine that genuinely has no shell still carries on, three seconds later. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * Leave a clone of the widget being put where it is A clone is the widget it was cloned from wearing its owner's name, so a bar carrying one already has what put is being asked to place. put only saw the literal id, and enabling a first-party source whose clone is active is how you switch back to the built-in — so a migration placing omarchy.keyboard-layout would have handed a user's own copy back for the shipped one, and called it done. Targeting learned to read a clone as its source; presence had not. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * Trim the comments on the bar put path Roughly a line of comment per line of code, most of it restating what the code and the assertion messages already say. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
83 lines
2.7 KiB
Bash
Executable File
83 lines
2.7 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
# omarchy:summary=Send an IPC call to the running Omarchy shell
|
|
# omarchy:args=[-q] <target> <method> [args...]
|
|
# omarchy:examples=omarchy shell shell ping | omarchy-shell shell toggle omarchy.menu '{"menu":"root"}'
|
|
|
|
QUIET=0
|
|
if [[ ${1:-} == "-q" ]]; then
|
|
QUIET=1
|
|
shift
|
|
fi
|
|
|
|
fail() {
|
|
(( QUIET )) && exit 0
|
|
echo "$1" >&2
|
|
exit 1
|
|
}
|
|
|
|
if (( $# == 0 )) || [[ $1 == "-h" || $1 == "--help" ]]; then
|
|
cat <<USAGE
|
|
Usage: omarchy-shell [-q] <target> <method> [args...]
|
|
|
|
Forwards an IPC call to the running Omarchy shell. The shell is expected
|
|
to already be running; this command does not start it.
|
|
|
|
Options:
|
|
-q Quiet best-effort mode. Suppress output and return success even when
|
|
the shell, target, method, or arguments are unavailable.
|
|
|
|
Examples:
|
|
omarchy-shell shell ping
|
|
omarchy-shell -q omarchy.indicators refresh
|
|
omarchy-shell shell listPlugins
|
|
omarchy-shell shell toggle omarchy.menu '{"menu":"root"}'
|
|
USAGE
|
|
exit 0
|
|
fi
|
|
|
|
(( $# >= 2 )) || fail "Usage: omarchy-shell <target> <method> [args...]"
|
|
[[ -n ${OMARCHY_PATH:-} ]] || fail "OMARCHY_PATH is not set"
|
|
[[ -f $OMARCHY_PATH/shell/shell.qml ]] || fail "omarchy-shell config not found: $OMARCHY_PATH/shell/shell.qml"
|
|
|
|
# qs matches instances by display, and a caller from outside the session (an
|
|
# ssh or TTY omarchy-restart-shell, and the migrations it runs for) has none,
|
|
# so recover it from the compositor socket.
|
|
if [[ -z ${WAYLAND_DISPLAY:-} ]]; then
|
|
socket=$(ls -t "${XDG_RUNTIME_DIR:-/run/user/$UID}"/wayland-[0-9]* 2>/dev/null | grep -v '\.lock$' | head -n1)
|
|
[[ -n $socket ]] && export WAYLAND_DISPLAY=${socket##*/}
|
|
fi
|
|
|
|
if [[ $1 == "shell" && ( $2 == "summon" || $2 == "toggle" ) ]] && (( $# == 3 )); then
|
|
set -- "$1" "$2" "$3" "{}"
|
|
fi
|
|
|
|
# The -- keeps function names that shadow qs subcommands (e.g. show) as
|
|
# positionals. qs reports connection failures with a nonzero exit, but IPC-level
|
|
# failures (unknown target/function, bad arguments) go to stdout with exit 0.
|
|
ipc_timeout=${OMARCHY_SHELL_IPC_TIMEOUT:-2s}
|
|
output=$(timeout --kill-after=1s "$ipc_timeout" qs ipc -n -p "$OMARCHY_PATH/shell" call -- "$@" 2>/dev/null)
|
|
ipc_status=$?
|
|
|
|
if (( ipc_status == 124 || ipc_status == 137 )); then
|
|
fail "omarchy-shell is not responding"
|
|
elif (( ipc_status != 0 )); then
|
|
fail "omarchy-shell is not running"
|
|
fi
|
|
|
|
case $output in
|
|
"Target not found." | "Function not found." | "Too few arguments provided"* | "Too many arguments provided"*)
|
|
fail "$output"
|
|
;;
|
|
# A starting shell answers on stdout and exits 0, so a ping reads it as up
|
|
# and the next call's answer as a result. It is as unreachable as none.
|
|
"Not ready to accept queries yet"*)
|
|
fail "omarchy-shell is not ready"
|
|
;;
|
|
esac
|
|
|
|
if (( !QUIET )) && [[ -n $output ]]; then
|
|
echo "$output"
|
|
fi
|
|
exit 0
|