Simplify bar plugin management (#6435)

test/shell.d/plugin-clone-test.sh

@@ -24,19 +24,14 @@ elif [[ $* == *"listPlugins"* ]]; then
     find "$HOME/.config/omarchy/plugins" -mindepth 2 -maxdepth 2 -name manifest.json -print0 |
       xargs -0 -r jq -s 'map({id: .id, enabled: true})'
   fi
+elif [[ $* == *"setPluginEnabled"* ]]; then
+  printf 'omarchy-shell %s\n' "$*" >>"$FAKE_CALLS"
+  printf 'ok\n'
 fi
 exit 0
 SH
 
-for command in omarchy-bar omarchy-bar-plugin; do
-  cat >"$TMPDIR/bin/$command" <<'SH'
-#!/bin/bash
-printf '%s %s\n' "${0##*/}" "$*" >>"$FAKE_CALLS"
-exec "$OMARCHY_TEST_ROOT/bin/${0##*/}" "$@"
-SH
-done
-
-for command in omarchy-plugin-enable omarchy-plugin-disable omarchy-notification-send; do
+for command in omarchy-plugin-enable omarchy-notification-send; do
   cat >"$TMPDIR/bin/$command" <<'SH'
 #!/bin/bash
 printf '%s %s\n' "${0##*/}" "$*" >>"$FAKE_CALLS"
@@ -87,36 +82,16 @@ jq -e '
 ' "$clock/manifest.json" >/dev/null || fail "clock clone manifest is incorrect"
 pass "clone updates identity without replacing the manifest"
 
-grep -qx 'omarchy-bar-plugin replace omarchy.clock local.clock' "$CALLS" ||
-  fail "clone does not replace an active bar widget"
+grep -qx 'omarchy-plugin-enable local.clock' "$CALLS" ||
+  fail "clone does not enable the editable copy"
 grep -qx 'omarchy-notification-send -g 󰐱 Editing Cloned Plugin Original plugin has been replace by clone.' "$CALLS" ||
   fail "clone does not notify that the editable clone is active"
-jq -e '
-  any(.bar.layout.center[];
-    .id == "local.clock" and
-    .format == "dddd HH:mm" and
-    .formatAlt == "d MMMM \u0027W\u0027ww yyyy")
-' "$TMPDIR/home/.config/omarchy/shell.json" >/dev/null ||
-  fail "clone does not preserve the active widget's placement and settings"
-pass "clone switches bar widgets in place and confirms the editable clone"
+pass "clone enables bar widgets and confirms the editable clone"
 
-jq '.bar.layout.center += ["omarchy.keyboard-layout"]' \
-  "$TMPDIR/home/.config/omarchy/shell.json" >"$TMPDIR/shell.json"
-mv "$TMPDIR/shell.json" "$TMPDIR/home/.config/omarchy/shell.json"
-FAKE_CLONE_CONFIG='{
-  "bar": {
-    "layout": {
-      "left": [],
-      "center": ["omarchy.keyboard-layout"],
-      "right": []
-    }
-  }
-}' clone_plugin omarchy.keyboard-layout >/dev/null
-jq -e '
-  any(.bar.layout.center[]; .id == "local.keyboard-layout")
-' "$TMPDIR/home/.config/omarchy/shell.json" >/dev/null ||
-  fail "clone does not replace a string-form bar entry"
-pass "clone replaces legacy string-form bar entries"
+clone_plugin omarchy.keyboard-layout >/dev/null
+grep -qx 'omarchy-plugin-enable local.keyboard-layout' "$CALLS" ||
+  fail "clone does not enable a clone of a legacy string-form bar entry"
+pass "clone enables clones of legacy string-form bar entries"
 
 clone_plugin omarchy.menu >/dev/null
 menu="$TMPDIR/home/.config/omarchy/plugins/local.menu"
@@ -130,29 +105,26 @@ jq -e '
   .entryPoints.menu == "Menu.qml" and
   .entryPoints.barWidget == "BarWidget.qml"
 ' "$menu/manifest.json" >/dev/null || fail "menu clone loses plugin kinds"
-grep -qx 'omarchy-plugin-disable omarchy.menu' "$CALLS" ||
-  fail "clone leaves the built-in half of a multi-kind plugin enabled"
-pass "clone preserves multi-kind plugins"
+grep -qx 'omarchy-plugin-enable local.menu' "$CALLS" ||
+  fail "clone does not enable a multi-kind plugin"
+pass "clone preserves and enables multi-kind plugins"
 
-HOME="$TMPDIR/home" OMARCHY_PATH="$ROOT" PATH="$TMPDIR/bin:$ROOT/bin:$PATH" \
+remove_output=$(HOME="$TMPDIR/home" OMARCHY_PATH="$ROOT" PATH="$TMPDIR/bin:$ROOT/bin:$PATH" \
   FAKE_CALLS="$CALLS" OMARCHY_TEST_ROOT="$ROOT" \
-  omarchy-plugin-remove local.menu --yes >/dev/null
-grep -qx 'omarchy-bar-plugin replace local.menu omarchy.menu' "$CALLS" &&
-  grep -qx 'omarchy-plugin-enable omarchy.menu' "$CALLS" ||
-  fail "removing a clone does not restore its built-in source"
-pass "removing a clone restores its built-in source"
+  omarchy-plugin-remove local.menu --yes)
+grep -qx 'omarchy-shell shell setPluginEnabled local.menu false' "$CALLS" ||
+  fail "removing an enabled clone does not disable it first"
+grep -q 'Restored omarchy.menu.' <<<"$remove_output" ||
+  fail "removing a clone does not report its restored source"
+pass "removing an enabled clone goes through plugin disable and reports its source"
 
 clone_plugin omarchy.active-window >/dev/null
 [[ -f $TMPDIR/home/.config/omarchy/plugins/local.active-window/ActiveWindow.qml ]] ||
   fail "flat bar plugin clone is incomplete"
 pass "flat bar plugins clone from adjacent manifests"
 
-grep -qx 'omarchy-bar-plugin add local.active-window' "$CALLS" ||
+grep -qx 'omarchy-plugin-enable local.active-window' "$CALLS" ||
   fail "clone does not activate a bar widget whose source is absent"
-jq -e '
-  any(.bar.layout.left[]; .id == "local.active-window")
-' "$TMPDIR/home/.config/omarchy/shell.json" >/dev/null ||
-  fail "clone does not add the absent widget using its default placement"
 pass "clone activates an absent bar widget"
 
 clone_plugin omarchy.indicators >/dev/null
@@ -170,17 +142,13 @@ clone_plugin omarchy.tray >/dev/null
 pass "flat bar plugins keep local script dependencies"
 
 clone_plugin omarchy.bar >/dev/null
-grep -qx 'omarchy-bar use local.bar' "$CALLS" ||
+grep -qx 'omarchy-plugin-enable local.bar' "$CALLS" ||
   fail "clone does not select a cloned bar"
-jq -e '.bar.id == "local.bar"' "$TMPDIR/home/.config/omarchy/shell.json" >/dev/null ||
-  fail "clone does not persist the cloned bar as active"
 pass "clone switches full bars"
 
 clone_plugin omarchy.background >/dev/null
 grep -qx 'omarchy-plugin-enable local.background' "$CALLS" ||
   fail "clone does not enable an ordinary cloned plugin"
-grep -qx 'omarchy-plugin-disable omarchy.background' "$CALLS" ||
-  fail "clone does not disable the ordinary source plugin"
 pass "clone switches ordinary plugins"
 
 mkdir -p "$TMPDIR/home/.config/omarchy/plugins/acme.example"