023021ad2d
* Add Remove > AI for the apps Install > AI offers Install > AI grew five entries and Remove grew one: Dictation, sitting on its own at the top level. Everything else installed from that menu had to come back out through Remove > Package by name. Mirror the install tree instead. Dictation moves under the new AI submenu where its installer already lives, and ChatGPT Desktop, Grok Bot, LM Studio, Ollama and T3 Code get removers beside it. Each entry is conditional on the thing actually being installed, so the submenu only ever lists what is there. What each remover deletes was read off a machine that had all five installed and launched, not guessed. That matters most for T3 Code, which bootstraps the agents it drives: ~/.claude.json, ~/.grok, ~/.npm and ~/.local/share/opencode all appear the first time it runs, and all of them outlive it, so it takes only ~/.config/t3code and ~/.t3. Grok Bot is the same trap in miniature -- ~/.grokbot is its own, ~/.grok belongs to the Grok CLI. Ollama drops every acceleration variant rather than the one the installer happened to pick, and disables the service before the package, since that is what holds the models open. 🤖 Generated by Opus 5 in Claude Code. * Remove only what these apps own, and only where removal works Three defects from an independent review of the previous commit. ChatGPT Desktop was deleting ~/.cache/codex-runtimes, which belongs to the Codex CLI rather than the desktop app: the `codex` binary resolves its runtime and plugins out of that directory, and it ships in a package this remover does not touch. Removing the desktop app took the CLI's prepared runtime with it, leaving a separate, still-installed tool to rebuild it -- and unable to, offline. Ollama's row appeared whenever the `ollama` command existed, but omarchy-pkg-drop removes exact package names. With ollama-bin, ollama-git or a hand-built binary the entry offered a removal it could not perform: the service went down, /var/lib/ollama and ~/.ollama were deleted, and it reported success with the program still installed. Every acceleration variant depends on the base package, so testing for that package covers each one the installer can produce and nothing it cannot remove. LM Studio keeps its models under a relocatable home, and ~/.lmstudio-home-pointer is the only record of where they went. The remover deleted the pointer and the default path, so a user who had moved their models kept every one of them while being told they were gone. Read the pointer before deleting it, and refuse one aimed at / or at the home directory itself, since following it there would take everything. Co-Authored-By: Codex XHigh <noreply@openai.com> --------- Co-authored-by: Codex XHigh <noreply@openai.com>
96 lines
3.7 KiB
Bash
96 lines
3.7 KiB
Bash
#!/bin/bash
|
|
|
|
set -euo pipefail
|
|
|
|
source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
|
|
|
|
tmp_dir="$(mktemp -d)"
|
|
trap 'rm -rf "$tmp_dir"' EXIT
|
|
|
|
mkdir -p "$tmp_dir/bin"
|
|
|
|
cat >"$tmp_dir/bin/omarchy-pkg-drop" <<'SCRIPT'
|
|
#!/bin/bash
|
|
printf 'drop:%s\n' "$*" >>"$TEST_LOG"
|
|
SCRIPT
|
|
chmod +x "$tmp_dir/bin/omarchy-pkg-drop"
|
|
|
|
export TEST_LOG="$tmp_dir/log"
|
|
export PATH="$tmp_dir/bin:$PATH"
|
|
|
|
fresh_home() {
|
|
rm -rf "$tmp_dir/home"
|
|
mkdir -p "$tmp_dir/home"
|
|
export HOME="$tmp_dir/home"
|
|
}
|
|
|
|
# The Codex CLI ships in its own package and resolves its runtime out of
|
|
# ~/.cache/codex-runtimes, so removing the desktop app must not take it.
|
|
fresh_home
|
|
mkdir -p "$HOME/.config/Codex" "$HOME/.cache/Codex" "$HOME/.cache/codex-runtimes/codex-primary-runtime" "$HOME/.codex"
|
|
"$ROOT/bin/omarchy-remove-ai-chatgpt" >/dev/null
|
|
|
|
[[ ! -e $HOME/.config/Codex ]] || fail "ChatGPT removal deletes the desktop app's config"
|
|
pass "ChatGPT removal deletes the desktop app's config"
|
|
|
|
[[ -d $HOME/.cache/codex-runtimes/codex-primary-runtime ]] || fail "ChatGPT removal keeps the Codex CLI's runtime cache"
|
|
pass "ChatGPT removal keeps the Codex CLI's runtime cache"
|
|
|
|
[[ -d $HOME/.codex ]] || fail "ChatGPT removal keeps the Codex CLI's config"
|
|
pass "ChatGPT removal keeps the Codex CLI's config"
|
|
|
|
# LM Studio's models follow a relocatable home, named only by the pointer file.
|
|
fresh_home
|
|
mkdir -p "$tmp_dir/relocated-models/models"
|
|
printf '%s' "$tmp_dir/relocated-models" >"$HOME/.lmstudio-home-pointer"
|
|
mkdir -p "$HOME/.config/LM Studio"
|
|
"$ROOT/bin/omarchy-remove-ai-lm-studio" >/dev/null
|
|
|
|
[[ ! -e $tmp_dir/relocated-models ]] || fail "LM Studio removal follows a relocated home pointer"
|
|
pass "LM Studio removal follows a relocated home pointer"
|
|
|
|
[[ ! -e "$HOME/.config/LM Studio" ]] || fail "LM Studio removal deletes its config"
|
|
pass "LM Studio removal deletes its config"
|
|
|
|
# A pointer that resolves to the home directory itself would take everything.
|
|
fresh_home
|
|
printf '%s' "$HOME" >"$HOME/.lmstudio-home-pointer"
|
|
mkdir -p "$HOME/Documents"
|
|
"$ROOT/bin/omarchy-remove-ai-lm-studio" >/dev/null
|
|
|
|
[[ -d $HOME/Documents ]] || fail "LM Studio removal refuses a pointer aimed at the home directory"
|
|
pass "LM Studio removal refuses a pointer aimed at the home directory"
|
|
|
|
# T3 Code bootstraps the agents it drives; their state outlives it.
|
|
fresh_home
|
|
mkdir -p "$HOME/.config/t3code" "$HOME/.t3" "$HOME/.grok" "$HOME/.local/share/opencode" "$HOME/.npm"
|
|
touch "$HOME/.claude.json"
|
|
"$ROOT/bin/omarchy-remove-ai-t3-code" >/dev/null
|
|
|
|
[[ ! -e $HOME/.t3 ]] || fail "T3 Code removal deletes its own data"
|
|
pass "T3 Code removal deletes its own data"
|
|
|
|
for kept in .grok .claude.json .npm .local/share/opencode; do
|
|
[[ -e $HOME/$kept ]] || fail "T3 Code removal keeps the agent state it bootstrapped" "$kept"
|
|
done
|
|
pass "T3 Code removal keeps the agent state it bootstrapped"
|
|
|
|
# ~/.grok belongs to the Grok CLI that omarchy-default-agent installs.
|
|
fresh_home
|
|
mkdir -p "$HOME/.config/Grok Bot" "$HOME/.grokbot" "$HOME/.grok"
|
|
"$ROOT/bin/omarchy-remove-ai-grok-bot" >/dev/null
|
|
|
|
[[ ! -e $HOME/.grokbot ]] || fail "Grok Bot removal deletes its own data"
|
|
pass "Grok Bot removal deletes its own data"
|
|
|
|
[[ -d $HOME/.grok ]] || fail "Grok Bot removal keeps the Grok CLI's state"
|
|
pass "Grok Bot removal keeps the Grok CLI's state"
|
|
|
|
# Every acceleration variant depends on the base package, so package presence is
|
|
# the test the remover can actually act on; the command alone is also provided by
|
|
# builds omarchy-pkg-drop will not touch.
|
|
ollama_row=$(grep '^ "remove.ai.ollama":' "$ROOT/default/omarchy/omarchy-menu.jsonc")
|
|
[[ $ollama_row == *'"when":"omarchy-pkg-present ollama"'* ]] ||
|
|
fail "Ollama removal is offered only where the package is installed" "$ollama_row"
|
|
pass "Ollama removal is offered only where the package is installed"
|