From 6cb5396dc7cf9235dcd596a80e554553cd4314e3 Mon Sep 17 00:00:00 2001 From: Spencer Bull Date: Sat, 5 Sep 2026 21:39:10 -0500 Subject: [PATCH] Merge pull request #9625 from spencerbull/t3code/add-perplexity-ai-app Add the Perplexity desktop app to Install > AI (cherry picked from commit f1b065c2923ee7255c89cf812c40c5e391f03f4b) (cherry picked from commit 680930915eaba8c3741980c56ad160a40c50bcb9) --- bin/omarchy-remove-ai-perplexity | 49 +++++++++++++++ default/fonts/omarchy/README.md | 3 +- default/fonts/omarchy/omarchy.ttf | Bin 4712 -> 4880 bytes default/omarchy/omarchy-menu.jsonc | 2 + manual/17-ai.md | 2 +- test/shell.d/menu-test.sh | 2 +- test/shell.d/remove-ai-test.sh | 98 +++++++++++++++++++++++++++++ 7 files changed, 153 insertions(+), 3 deletions(-) create mode 100755 bin/omarchy-remove-ai-perplexity diff --git a/bin/omarchy-remove-ai-perplexity b/bin/omarchy-remove-ai-perplexity new file mode 100755 index 00000000..93859484 --- /dev/null +++ b/bin/omarchy-remove-ai-perplexity @@ -0,0 +1,49 @@ +#!/bin/bash + +# omarchy:summary=Remove the Perplexity desktop app along with its runtime caches. +# omarchy:requires-sudo=true + +# -u so an unset HOME is an error rather than a set of rm -rf paths rooted at /. +set -euo pipefail + +omarchy-pkg-drop perplexity + +# The runtime the app downloads for itself: llama.cpp builds and local models +# under ~/.local/share, the older download location under ~/.cache. Of the +# perplexity-* dirs these are the only ones the desktop app owns; the rest +# belong to Perplexity products that outlive it. +rm -rf \ + "$HOME/.cache/Perplexity" \ + "$HOME/.cache/perplexity-rpc-server" \ + "$HOME/.local/share/perplexity-rpc-server" + +# What is left is the user's: the logins and session in ~/.config/Perplexity, +# the secret vault and device identity in ~/.local/state/perplexity, and the +# launcher flags. Keeping them stays the default -- they are small, and being +# signed in after a reinstall is the better surprise -- but a removal meant to +# be complete should not leave credentials behind either, so the choice is put +# in front of the user, default no. Without a terminal to ask in, keeping it +# is the answer -- and gum draws the prompt on stderr, so a redirected stderr +# would block on a question nobody can see. +data_removed=false +if [[ -t 0 && -t 2 ]]; then + # du answers non-zero when a directory is missing, and pipefail would turn + # that into an aborted removal; the size is worth no such thing. + size=$(du -shc "$HOME/.config/Perplexity" "$HOME/.local/state/perplexity" 2>/dev/null | tail -1 | cut -f1 || true) + if gum confirm --default=false "Also delete your Perplexity data ($size: logins, settings, secret vault and device identity)?"; then + rm -rf \ + "$HOME/.config/Perplexity" \ + "$HOME/.local/state/perplexity" + rm -f "$HOME/.config/perplexity-flags.conf" + data_removed=true + fi +fi + +echo "" +echo "Perplexity has been removed." +if [[ $data_removed == "true" ]]; then + echo "Its logins, settings, secret vault, and device identity are gone too." +else + echo "Nothing of yours was touched: not the logins in ~/.config/Perplexity," + echo "nor the secret vault and device identity in ~/.local/state/perplexity." +fi diff --git a/default/fonts/omarchy/README.md b/default/fonts/omarchy/README.md index d4689d58..c6f0ee34 100644 --- a/default/fonts/omarchy/README.md +++ b/default/fonts/omarchy/README.md @@ -13,7 +13,8 @@ The private-use glyphs in `omarchy.ttf` are: - `U+E908` — T3 Code, traced from the app icon in , since upstream publishes no monochrome SVG - `U+E90A` — Hermes, Font Awesome's staff-snake (CC BY 4.0) from , the mark Hermes serves as its favicon: their app icon is a portrait that reads as a smudge at menu size -- `U+E90C` — OpenClaw, traced from the lobster mascot the openclaw package ships as `dist/control-ui/favicon.svg`, since upstream publishes no monochrome SVG; `E90B` is left for the Perplexity mark already in flight on another branch +- `U+E90B` — Perplexity, from +- `U+E90C` — OpenClaw, traced from the lobster mascot the openclaw package ships as `dist/control-ui/favicon.svg`, since upstream publishes no monochrome SVG The agent marks are monochrome so the menu can render them using the active theme's foreground and selection colors. diff --git a/default/fonts/omarchy/omarchy.ttf b/default/fonts/omarchy/omarchy.ttf index 7220179c0b4f7fc8b11f079fb5bf6899ffa53f3e..f3e147458bee75dfb6a224375d85ad8b2af5ee1c 100644 GIT binary patch delta 389 zcmW-dK}!N*5Qb-VSJO&zt8EJ+l6AF6Li*aebSUZ+K?Tt{Gt0wTQXUk9E)pG+?LUN_ z0>L_T@ZceeE)ggN1tA%g5Y?p)AB|mxd1mIF;hh)nf$t!=o3y7?0Ne+F^9?h#K6)`( z0uW{ZT*YW4v^Kog`UBvWs6Q5^f&(Rmc!Jm)jU|#nkhY0eh!@PQa0p=TmiUBtDHck` z(T9}F4SoM+C>FV{Js%Q#>E=~@YsZ-Y7qy`MBYXDP(ohXRKSXi4tAv9T-_dV# zsCGchBlPBjg5lb2f;3Eu8Lov2O9VxKx;KcS2V+BXfl&+22*sId6;2ie$g2B z$hzF5D7s%(J3Okw#Ei*#fOFGCA%NY>{Pcpm3x%O7zsKn^-j&NHzpqXq`>Z|H>R*^a zXTA1X=fB=u?uf%|mESa@y%NrTSNK;E->S2Kb`3$4->(qsVve@5ZS2?9QoHwXl>f@Fj@a|yCB F0RU-sG}Hh9 diff --git a/default/omarchy/omarchy-menu.jsonc b/default/omarchy/omarchy-menu.jsonc index 65799abb..78bc564a 100644 --- a/default/omarchy/omarchy-menu.jsonc +++ b/default/omarchy/omarchy-menu.jsonc @@ -240,6 +240,7 @@ "install.ai.t3-code": {"icon":"","iconFont":"omarchy","label":"T3 Code","when":"! omarchy-pkg-present t3code-bin","action":"omarchy-install-and-launch 'T3 Code' t3code-bin t3code"}, "install.ai.hermes": {"icon":"","iconFont":"omarchy","label":"Hermes Desktop","when":"! omarchy-pkg-present hermes-desktop","action":"omarchy-launch-floating-terminal-with-presentation omarchy-install-ai-hermes"}, "install.ai.openclaw": {"icon":"","iconFont":"omarchy","label":"OpenClaw","when":"! omarchy-pkg-present openclaw","action":"omarchy-launch-floating-terminal-with-presentation omarchy-install-ai-openclaw"}, + "install.ai.perplexity": {"icon":"","iconFont":"omarchy","label":"Perplexity","when":"! omarchy-pkg-present perplexity","action":"omarchy-install-and-launch Perplexity perplexity perplexity"}, "install.gaming.steam": {"icon":"","label":"Steam","when":"! omarchy-pkg-present steam","action":"omarchy-launch-floating-terminal-with-presentation omarchy-install-gaming-steam"}, "install.gaming.retroarch": {"icon":"󰯉","label":"RetroArch","when":"! omarchy-pkg-present retroarch","action":"omarchy-launch-floating-terminal-with-presentation omarchy-install-gaming-retroarch"}, "install.gaming.minecraft": {"icon":"󰍳","label":"Minecraft","when":"! omarchy-pkg-present minecraft-launcher","action":"omarchy-install-and-launch Minecraft minecraft-launcher minecraft-launcher"}, @@ -332,6 +333,7 @@ "remove.ai": {"icon":"󱚤","label":"AI","title":"Remove"}, "remove.ai.t3-code": {"icon":"","iconFont":"omarchy","label":"T3 Code","when":"omarchy-pkg-present t3code-bin","action":"omarchy-launch-floating-terminal-with-presentation omarchy-remove-ai-t3-code"}, "remove.ai.openclaw": {"icon":"","iconFont":"omarchy","label":"OpenClaw","when":"omarchy-pkg-present openclaw","action":"omarchy-launch-floating-terminal-with-presentation omarchy-remove-ai-openclaw"}, + "remove.ai.perplexity": {"icon":"","iconFont":"omarchy","label":"Perplexity","when":"omarchy-pkg-present perplexity","action":"omarchy-launch-floating-terminal-with-presentation omarchy-remove-ai-perplexity"}, // Update "update.omarchy": {"icon":"","iconFont":"omarchy","label":"Omarchy","action":"omarchy-launch-floating-terminal-with-presentation omarchy-update"}, diff --git a/manual/17-ai.md b/manual/17-ai.md index 017b6a18..b35aae98 100644 --- a/manual/17-ai.md +++ b/manual/17-ai.md @@ -40,7 +40,7 @@ The watching is on by default. Turn it off under _Trigger > Toggle > Crash Captu ### Desktop apps -The _Install > AI_ menu also carries a few graphical AI apps: the ChatGPT desktop app, Grok Bot for chatting with xAI's models, Hermes Desktop, and OpenClaw. +The _Install > AI_ menu also carries a few graphical AI apps: the ChatGPT desktop app, Grok Bot for chatting with xAI's models, Hermes Desktop, OpenClaw, and the Perplexity desktop app. Hermes Desktop is the one to know about, because there is only ever one Hermes on a machine. The app only runs against a runtime built from its own commit, so it installs one of its own under `~/.hermes` on first launch, which takes a few minutes and shows its own progress. From then on that is the Hermes the terminal `hermes` command and the default agent use too, whichever order you installed them in. Removing the app under _Remove > AI_ takes that runtime with it, and keeps your chats, memories, and the skills Hermes wrote for itself unless you tell it otherwise: it asks, defaulting to no, whether that data and your connection settings should go too. diff --git a/test/shell.d/menu-test.sh b/test/shell.d/menu-test.sh index 47d51a89..f5d051f7 100644 --- a/test/shell.d/menu-test.sh +++ b/test/shell.d/menu-test.sh @@ -516,5 +516,5 @@ assert( JS font_charset=$(fc-query --format='%{charset}' "$ROOT/default/fonts/omarchy/omarchy.ttf") -[[ $font_charset == *"e900-e908 e90a e90c"* ]] || fail "Omarchy icon font includes every custom menu glyph" +[[ $font_charset == *"e900-e908 e90a-e90c"* ]] || fail "Omarchy icon font includes every custom menu glyph" pass "Omarchy icon font includes the official agent marks" diff --git a/test/shell.d/remove-ai-test.sh b/test/shell.d/remove-ai-test.sh index 2d871477..111f7f19 100644 --- a/test/shell.d/remove-ai-test.sh +++ b/test/shell.d/remove-ai-test.sh @@ -15,6 +15,22 @@ printf 'drop:%s\n' "$*" >>"$TEST_LOG" SCRIPT chmod +x "$tmp_dir/bin/omarchy-pkg-drop" +# omarchy-remove-ai-perplexity asks through gum whether the user's data goes +# too. The stub answers "no" unless a test says otherwise and logs the call: a +# real gum would hang the run, and one that answered "yes" on its own would be +# the data loss the default-no exists to prevent. It logs to its own file +# because the OpenClaw section below greps TEST_LOG to prove gum was never +# reached, and the pty runs here call it on purpose. +cat >"$tmp_dir/bin/gum" <<'SCRIPT' +#!/bin/bash +printf 'gum:%s\n' "$*" >>"$TEST_GUM_LOG" +exit "${TEST_GUM_STATUS:-1}" +SCRIPT +chmod +x "$tmp_dir/bin/gum" + +export TEST_GUM_LOG="$tmp_dir/gum-log" +touch "$TEST_GUM_LOG" + export TEST_LOG="$tmp_dir/log" export PATH="$tmp_dir/bin:$PATH" @@ -38,6 +54,88 @@ for kept in .grok .claude.json .npm .local/share/opencode; do done pass "T3 Code removal keeps the agent state it bootstrapped" +# Perplexity's other products (the CLI, Comet) share the perplexity-* prefix; +# the desktop app owns only its rpc-server runtime and Electron caches. The +# logins, vault, and flags are the user's and only go when a terminal said so. +seed_perplexity() { + fresh_home + mkdir -p "$HOME/.config/Perplexity" "$HOME/.cache/Perplexity" \ + "$HOME/.cache/perplexity-rpc-server" "$HOME/.local/share/perplexity-rpc-server" \ + "$HOME/.local/state/perplexity" "$HOME/.cache/perplexity-personal-computer-poc" + touch "$HOME/.config/perplexity-flags.conf" +} + +# /dev/null + +for gone in .cache/Perplexity .cache/perplexity-rpc-server .local/share/perplexity-rpc-server; do + [[ ! -e $HOME/$gone ]] || fail "Perplexity removal deletes the app's runtime and caches" "$gone" +done +pass "Perplexity removal deletes the app's runtime and caches" + +for kept in .config/Perplexity .local/state/perplexity .config/perplexity-flags.conf .cache/perplexity-personal-computer-poc; do + [[ -e $HOME/$kept ]] || fail "Perplexity removal keeps the user's data and other products' caches" "$kept" +done +pass "Perplexity removal keeps the user's data and other products' caches" + +grep -qx 'drop:perplexity' "$TEST_LOG" || fail "Perplexity removal drops the perplexity package" +pass "Perplexity removal drops the perplexity package" + +# Without a terminal there is nobody to ask, so gum must not even be reached: +# one that answered "yes" on its own would be a data loss. +! grep -q '^gum:' "$TEST_GUM_LOG" || fail "Perplexity removal keeps the user's data unasked when there is no terminal" +pass "Perplexity removal keeps the user's data unasked when there is no terminal" + +# script(1) puts the remover on a pty, the only way -t 0 answers true in a +# test; the stubbed gum then supplies the answer. +seed_perplexity +script -qec "'$ROOT/bin/omarchy-remove-ai-perplexity'" /dev/null >/dev/null 2>&1 + +[[ -d $HOME/.config/Perplexity && -d $HOME/.local/state/perplexity && -f $HOME/.config/perplexity-flags.conf ]] || + fail "Perplexity removal keeps the user's data when the answer is no" +pass "Perplexity removal keeps the user's data when the answer is no" + +# The stub answers "no" on its own, so only the logged arguments prove the +# real gum would not default to yes on a bare Enter. +grep -q '^gum:confirm --default=false ' "$TEST_GUM_LOG" || + fail "Perplexity removal asks with the destructive answer defaulted off" +pass "Perplexity removal asks with the destructive answer defaulted off" + +# A partial install has no user data to measure; du failing must not abort +# the removal between the package and the prompt. +seed_perplexity +rm -rf "$HOME/.config/Perplexity" "$HOME/.local/state/perplexity" +script -qec "'$ROOT/bin/omarchy-remove-ai-perplexity'" /dev/null >/dev/null 2>&1 || + fail "Perplexity removal survives user-data directories that are already gone" +pass "Perplexity removal survives user-data directories that are already gone" + +# gum draws its prompt on stderr; with stderr redirected the question would be +# invisible, so the remover must keep the data instead of blocking on it. +seed_perplexity +gum_calls_before=$(wc -l <"$TEST_GUM_LOG") +script -qec "'$ROOT/bin/omarchy-remove-ai-perplexity' 2>/dev/null" /dev/null >/dev/null 2>&1 || + fail "Perplexity removal completes when stderr is not a terminal" +[[ -d $HOME/.config/Perplexity ]] && (( $(wc -l <"$TEST_GUM_LOG") == gum_calls_before )) || + fail "Perplexity removal keeps the user's data unasked when stderr is not a terminal" +pass "Perplexity removal keeps the user's data unasked when stderr is not a terminal" + +seed_perplexity +TEST_GUM_STATUS=0 script -qec "'$ROOT/bin/omarchy-remove-ai-perplexity'" /dev/null >/dev/null 2>&1 + +for gone in .config/Perplexity .local/state/perplexity .config/perplexity-flags.conf; do + [[ ! -e $HOME/$gone ]] || fail "Perplexity removal deletes the user's data on an explicit yes" "$gone" +done +pass "Perplexity removal deletes the user's data on an explicit yes" + +# Without HOME the rm -rf paths would degrade to /-rooted ones; -u makes that a +# refusal instead. +if env -u HOME "$ROOT/bin/omarchy-remove-ai-perplexity" /dev/null 2>&1; then + fail "Perplexity removal refuses to run without HOME" +fi +pass "Perplexity removal refuses to run without HOME" + # OpenClaw's gateway unit and web app launcher are the app's own; the agent # state in ~/.openclaw is the user's. systemctl and openclaw are stubbed so the # sandbox never reaches the real user manager or a real gateway.