theamify-cli 2.2.1 → 2.2.3

package/README.md

@@ -28,25 +28,47 @@ theamify doctor             # diagnose install, GRUB, tools & dependencies
 theamify upgrade            # check for & install the latest npm version
 theamify repair             # fix a broken install (re-provision the engine)
 theamify uninstall          # remove theamify entirely (incl. npm package)
+theamify version            # print the version
+theamify help               # show all commands
 ```
 
+> **Command aliases** — `ls` (list), `show` (info), `get`/`fetch`/`download`, `use`/`apply`/`set`, `rm`/`uncache` (remove), `del`/`delete`, `purge-cache` (clean), `browse`/`wizard`/`install` (wizard).  \
+> **Version flags** — `-v`, `-V`, `--version`  ·  **Help flags** — `-h`, `--help`
+
 > 💡 Upgrading is the same command — `npm install -g theamify-cli@latest`, and your downloaded themes & registry edits are preserved.  
 > 🧰 Zero-install run (no permanent install): `npx -y theamify-cli`
 
 ---
 
-## ✨ What's New (v1.1.0 — npm release)
+## ✨ What's New (v2.2.3 — complete uninstall)
+
+| Feature | Details |
+|---|---|
+| 🗑️ **Uninstall removes EVERYTHING** | `theamify uninstall` now removes **every** runtime tree (`~/.local/share/theamify` AND `/usr/local/share/theamify`), all downloaded themes, the applied GRUB theme, the `theamify-cli` npm package **and** `~/.local/bin/theamify` (legacy shadow, file or symlink) plus every PATH marker from `~/.bashrc`/`~/.zshrc` |
+| ✅ **`command not found` guaranteed** | After uninstall, `theamify` shadows nothing on PATH — typing it returns `bash: theamify: command not found`, exactly like any tool you never installed |
+| 🔒 **One confirmation** | A single confirmation covers the whole removal (no more piecemeal "keep the npm package?" prompts) |
+| 🩹 **Regression-tested** | `removeUserBin` (symlink + real-file shadow), runtime-tree removal and rc cleanup are all covered by tests |
+
+## ✨ What's New (v2.2.2 — uninstall crash hotfix)
+
+| Feature | Details |
+|---|---|
+| 🩹 **`ReferenceError: path is not defined` fixed** | The v2.2.1 uninstall crashed while stripping leftover PATH markers from `~/.bashrc`/`~/.zshrc` — `cleanRcMarkers` used `path`/`os`/`fs` without importing them. Now fixed with proper `node:` imports and guarded by regression tests. |
+| 🔄 **Engine lockstep to v2.2.2** | Bundled engine `VERSION` bumped to match the npm package — no more "update available" nag after a fresh install. |
+
+## ✨ What's New (v2.2.1 — release)
 
 | Feature | Details |
 |---|---|
 | 🧙 **Interactive wizard** | One command: detect companion tools → pick theme → **preview** → apply |
 | 🧩 **Auto-detected companion tools** | **chafa** (thumbnails) + **grub-customizer** (GUI) are detected first; installed if missing, or **option to update** if present — then it continues on its own |
-| 🖼️ **Terminal thumbnail preview** | See the boot-screen image inline via `chafa` before you commit |
+| 🖼️ **Thumbnail by default** | Selecting a cached theme renders its terminal thumbnail **automatically** (no separate “preview” item) |
 | 📦 **npm global install** | Engine provisions itself user-writable (no sudo for downloads) |
 | 🩺 **`theamify doctor`** | Diagnose install, GRUB, active theme, registry, tools & dependencies |
-| 🗑 **Safe uninstall** | Removes **only theamify** — leaves chafa & grub-customizer for later use |
+| 🗑 **Complete uninstall** | Deletes **ALL downloaded themes**, resets GRUB to default, removes the `theamify-cli` npm package **and** strips leftover PATH markers from `~/.bashrc`/`~/.zshrc` — after which `theamify` gives a normal `command not found` |
 | ⌨️ **Ctrl+C / Ctrl+Z safe** | Signal safety net; interactive `sudo` is never frozen |
 | 🔄 **Self-manage (v2.2+)** | `upgrade`, `repair`, auto-update check on every wizard run |
+| 🧹 **Install-flow download-all** | Wizard offers to download every theme up front so each one is instantly previewable/applicable |
 
 ---
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "theamify-cli",
-  "version": "2.2.1",
+  "version": "2.2.3",
   "description": "theamify — GRUB theme manager & interactive browser wizard. Browse, preview, download and apply GRUB boot themes from the terminal.",
   "type": "module",
   "main": "src/cli.js",

package/src/cli.js

@@ -73,6 +73,13 @@ const main = defineCommand({
   async run({ args }) {
     const [cmd, ...rest] = args._;
 
+    // citty parses `-V` as a boolean flag into args.V (never reached via args._);
+    // treat it as a version request like the other aliases.
+    if (args.V) {
+      console.log(`theamify v${pkg.version}`);
+      return undefined;
+    }
+
     // No arguments → the interactive theme browser wizard.
     if (!cmd) return runThemeBrowser();
 

package/src/commands/manage.js

@@ -5,8 +5,10 @@ import pc from 'picocolors';
 import { execa, execaSync } from 'execa';
 import {
   findInstalledRuntime,
+  SYSTEM_DIR,
   USER_DIR,
-  removeShadowBin,
+  BIN_NAME,
+  removeUserBin,
   repairRuntime,
   resolveEngine,
 } from '../core/engine.js';
@@ -160,46 +162,51 @@ export async function resetGrubTheme({ grubFile = '/etc/default/grub', asRoot =
   return res.exitCode === 0;
 }
 
-/** `theamify uninstall` — removes theamify, ALL downloaded themes, and resets GRUB to default. */
+/** `theamify uninstall` — remove EVERY trace of theamify so the command vanishes. */
 export async function runUninstallWizard() {
   p.intro(pc.bgRed(pc.black(' theamify Uninstaller ')));
+
   const found = findInstalledRuntime();
-  if (!found) p.log.info('No installed theamify runtime found (nothing to remove).');
-
-  let removed = false;
-  if (found) {
-    const confirm = await p.confirm({
-      message: `Remove theamify files at ${found.dir}/? (this deletes ALL downloaded themes)`,
-      initialValue: true,
-    });
-    if (!p.isCancel(confirm) && confirm) {
-      removed = await removeRuntimeDir(found.dir);
-      if (removed) removeShadowBin();
-      else p.log.warn(`Could not remove ${found.dir}.`);
-    }
-  }
+  if (found) p.note(found.dir, 'Installed runtime detected');
 
-  // Reset the boot menu back to the default (remove the applied GRUB theme).
-  const resetGrub = await p.confirm({
-    message: 'Remove your applied GRUB theme and reset to the default boot menu?',
+  const confirm = await p.confirm({
+    message: 'Uninstall theamify completely? This removes the runtime, ALL downloaded themes, the applied GRUB theme, the theamify-cli npm package, ~/.local/bin/theamify and every PATH marker.',
     initialValue: true,
   });
-  if (p.isCancel(resetGrub)) { p.cancel('Aborted.'); process.exit(0); }
-  const grubReset = resetGrub ? await resetGrubTheme() : false;
+  if (p.isCancel(confirm)) { p.cancel('Aborted.'); process.exit(0); }
+  if (!confirm) { p.outro('Nothing was removed.'); return; }
+
+  // 1. Remove EVERY runtime tree — user AND system. (removeRuntimeDir uses
+  //    sudo automatically for root-owned dirs like /usr/local/share/theamify.)
+  let removedCount = 0;
+  for (const dir of [SYSTEM_DIR, USER_DIR]) {
+    if (fs.existsSync(path.join(dir, BIN_NAME))) {
+      if (await removeRuntimeDir(dir)) removedCount++;
+      else p.log.warn(`Could not remove ${dir}.`);
+    }
+  }
+
+  // 2. Remove any legacy `~/.local/bin/theamify` shadow — symlink OR real file.
+  //    This is what KEEPS the command alive when `~/.local/bin` is on PATH.
+  if (removeUserBin()) p.log.success('Removed ~/.local/bin/theamify.');
+
+  // 3. Reset the boot menu back to the default (remove the applied GRUB theme).
+  const grubReset = await resetGrubTheme();
 
-  // Remove the npm package so the `theamify` command actually disappears.
+  // 4. Remove the npm package so the `theamify` command truly disappears.
   const npmRemoved = await selfUninstall();
 
-  // Remove leftover PATH markers from ~/.bashrc / ~/.zshrc so zero traces remain.
+  // 5. Remove leftover PATH markers from ~/.bashrc / ~/.zshrc so zero traces remain.
   await cleanRcMarkers();
 
   // Companion tools (chafa, grub-customizer) are intentionally LEFT in place —
-  // the user may want them for later; uninstall only removes theamify itself.
+  // they are not theamify; uninstall only removes theamify itself.
   const themeNote = grubReset
     ? 'Boot menu reset to the default theme.'
-    : (resetGrub ? 'GRUB reset could not be completed — remove GRUB_THEME= from /etc/default/grub and rebuild.' : 'Your applied GRUB theme was left in place.');
+    : 'GRUB reset could not be completed — remove GRUB_THEME= from /etc/default/grub and rebuild.';
 
   p.outro(pc.green(
-    `Uninstalled.${removed ? ' Runtime + all downloaded themes removed.' : ''} ${themeNote} ${npmRemoved ? 'theamify npm package removed — command no longer available.' : 'theamify npm package kept.'} Companion tools (chafa, grub-customizer) were kept for your use.`,
+    `Uninstalled.${removedCount ? ` ${removedCount} runtime tree(s) + all downloaded themes removed.` : ''} ${themeNote} ${npmRemoved ? 'theamify-cli npm package removed — the theamify command is gone.' : 'theamify-cli npm package could not be removed automatically — run: npm uninstall -g theamify-cli'} Companion tools (chafa, grub-customizer) were kept for your use.`,
   ));
+  p.log.message(pc.dim('After uninstall, `theamify` reports: bash: theamify: command not found'));
 }

package/src/core/engine.js

@@ -44,6 +44,24 @@ export function removeShadowBin() {
   } catch { /* nothing to remove */ }
 }
 
+/**
+ * Remove anything at `~/.local/bin/theamify` — a legacy shadow executable that
+ * keeps the `theamify` command alive and SHADOWS the npm CLI after uninstall
+ * (because `~/.local/bin` precedes the npm global bin on PATH). Removes BOTH a
+ * symlink and a plain-file engine copy left behind by old installs.
+ * @param {string} [binPath] override the path (used by tests)
+ * @returns {boolean} true when something was removed
+ */
+export function removeUserBin(binPath = USER_BIN_LINK) {
+  try {
+    if (fs.existsSync(binPath) || fs.lstatSync(binPath)) {
+      fs.rmSync(binPath, { force: true });
+      return !fs.existsSync(binPath);
+    }
+  } catch { /* nothing to remove */ }
+  return false;
+}
+
 /** Copy the vendored engine script + shared libs into a runtime dir. */
 function copyEngineTo(dir) {
   fs.mkdirSync(path.join(dir, 'lib'), { recursive: true });

package/src/lib/self.js

@@ -1,5 +1,8 @@
 import { execa } from 'execa';
 import pc from 'picocolors';
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
 import { createRequire } from 'node:module';
 
 const require = createRequire(import.meta.url);
@@ -34,13 +37,13 @@ export async function getLatestVersion() {
  * Remove any leftover `# theamify CLI PATH` + follow-up `export PATH=` line from
  * ~/.bashrc and ~/.zshrc (added by old installs). Called by uninstall so no
  * traces of the tool remain in shell startup files.
+ * @param {string} [homeDir] override the home directory (used by tests)
  */
-export async function cleanRcMarkers() {
-  const rcs = ['.bashrc', '.zshrc'].map((f) => path.join(require('node:os').homedir(), f));
+export async function cleanRcMarkers(homeDir = os.homedir()) {
+  const rcs = ['.bashrc', '.zshrc'].map((f) => path.join(homeDir, f));
   const marker = '# theamify CLI PATH';
   for (const rc of rcs) {
     try {
-      const fs = require('node:fs');
       if (!fs.existsSync(rc)) continue;
       const lines = fs.readFileSync(rc, 'utf8').split('\n');
       const out = [];
@@ -98,18 +101,12 @@ export async function promptSelfUpdate() {
 
 /**
  * Fully remove the npm package so the `theamify` command disappears from PATH.
+ * Uninstall is non-interactive about this — removing the npm package is a core
+ * part of "remove everything", not an optional extra.
  * @returns {Promise<boolean>} true when uninstalled
  */
 export async function selfUninstall() {
   const p = await import('@clack/prompts');
-  const want = await p.confirm({
-    message: `Also remove the ${NPM_NAME} npm package, so the ${pc.cyan(BIN_NAME)} command is gone from your system?`,
-    initialValue: true,
-  });
-  if (p.isCancel(want) || !want) {
-    p.log.message(pc.dim(`Keeping the npm package — the ${BIN_NAME} command will remain.`));
-    return false;
-  }
   console.log();
   const res = await execa('npm', ['uninstall', '-g', NPM_NAME], { stdio: 'inherit', reject: false });
   if (res.exitCode === 0) {

package/vendor/theamify

@@ -10,7 +10,7 @@ set -euo pipefail
 # -----------------------------------------------------------------------------
 # VERSION & TOOL NAME
 # -----------------------------------------------------------------------------
-readonly VERSION="2.2.1"
+readonly VERSION="2.2.3"
 readonly TOOL="theamify"
 
 # -----------------------------------------------------------------------------