theamify-cli 2.2.0 → 2.2.2

package/README.md

@@ -16,46 +16,65 @@ npm install -g theamify-cli
 The `-g` flag puts the `theamify` command on your system `PATH` (or provisions a user-local runtime under `~/.local/share/theamify`), so you can call it from **any folder and any terminal**:
 
 ```bash
-theamify                    # ✨ interactive wizard (detects tools → browse → preview → apply)
+theamify                    # ✨ interactive wizard (self-check → tools → download → browse → apply)
 theamify list               # list all themes with status
 theamify info <name>        # details + terminal preview
 theamify get <name>         # download & cache a theme
+theamify get --all          # download every theme up front
 sudo theamify use <name>    # apply to GRUB + rebuild
 theamify update             # update tools (chafa, grub-customizer) + re-download themes
 theamify status             # GRUB & dependency status
 theamify doctor             # diagnose install, GRUB, tools & dependencies
-theamify uninstall          # remove only theamify (keeps chafa & grub-customizer)
+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.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 |
 
 ---
 
 ## 🧭 Wizard Sequence (every `theamify` run)
 
-1. **Detect companion tools** — `chafa` then `grub-customizer`. For each:  
+1. **Self-check** — checks npm for a newer `theamify-cli`; offers to update if found. Also self-repairs the engine/runtime.
+2. **Detect companion tools** — `chafa` then `grub-customizer`. For each:  
    - **Already installed?** → *“Update it now? (or just continue)”* — Continue moves on.  
    - **Missing?** → *“Install `<name>`? Yes/No”* → installs via your package manager (`sudo`), then continues.  
-2. **Show the theme picker** — every registry theme with status (`[REMOTE]`/`[CACHED]`/`[ACTIVE]`).
-3. **Pick a theme** → optional **terminal thumbnail preview** (needs `chafa`).
-4. **Act** — download, apply to GRUB, or open in browser.
+3. **Download all themes** — asks *“Download all themes now?”* (default Yes) → fetches the whole registry so every theme is instantly previewable/applicable.
+4. **Show the theme picker** — every registry theme with status (`[REMOTE]`/`[CACHED]`/`[ACTIVE]`).
+5. **Pick a theme** → the **terminal thumbnail renders automatically** below the selection (no separate “preview” menu item).
+6. **Act** — download/update, apply to GRUB, or open in browser. Choose `← Back to theme list` to keep browsing (the wizard never hard-exits until you pick **Quit**).
 
-> Companion tools are installed strictly **before** the browser, so previews are ready when you need them.
+> Companion tools and themes are ready **before** the browser, so thumbnails & applies are instant when you need them.
 
 ---
 
@@ -79,11 +98,12 @@ theamify/
 ├── bin/theamify.js         # npm bin entry → src/cli.js
 ├── src/
 │   ├── cli.js              # command router + signal safety net
-│   ├── core/engine.js      # runtime provisioning & engine forwarding
-│   ├── commands/manage.js  # doctor / status / uninstall
-│   ├── wizard/browse.js    # interactive wizard (browse → preview → apply)
+│   ├── core/engine.js      # runtime provisioning, repair & engine forwarding
+│   ├── commands/manage.js  # doctor / status / upgrade / repair / uninstall
+│   ├── wizard/browse.js    # interactive wizard (self-check → browse → preview → apply)
 │   └── lib/
 │       ├── conf.js         # themes.conf registry parser
+│       ├── self.js         # version-check / self-update / self-uninstall / rc cleanup
 │       └── tools.js        # companion tools: chafa + grub-customizer
 ├── vendor/                 # bundled bash engine (theamify + lib/ + config/)
 ├── test/                   # unit tests (node:test)
@@ -122,7 +142,10 @@ The wizard manages two companion tools as first-class:
 - **Detect** → if present, offer to update; if absent, install (with your consent).  
 - **Continue** regardless of Yes/No — the wizard proceeds to the theme picker.  
 - **`theamify update`** updates tools then re-downloads themes.
-- **`theamify uninstall`** removes **only** theamify — chafa and grub-customizer stay on the system for later use.
+- **`theamify uninstall`** removes **everything theamify owns**: the runtime + all downloaded themes, resets GRUB to the default boot menu, removes the `theamify-cli` npm package, and strips leftover PATH markers from `~/.bashrc` / `~/.zshrc`. Companion tools **chafa** and **grub-customizer** stay on the system for later use — run the command after that and you get a normal `command not found`.
+- **`theamify upgrade`** checks the npm registry and, if a newer version exists, offers to `npm install -g theamify-cli@latest`.
+- **`theamify repair`** re-provisions the engine from the bundled package — the fix for a broken/missing install.
+- Every `theamify` (wizard) run also **auto-checks for updates** and **self-repairs** before showing the theme picker.
 
 ---
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "theamify-cli",
-  "version": "2.2.0",
+  "version": "2.2.2",
   "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

@@ -12,7 +12,7 @@ import {
 } from '../core/engine.js';
 import { parseThemes, resolveConfPath } from '../lib/conf.js';
 import { companionToolStatus } from '../lib/tools.js';
-import { checkForUpdate, promptSelfUpdate, selfUninstall } from '../lib/self.js';
+import { checkForUpdate, promptSelfUpdate, selfUninstall, cleanRcMarkers } from '../lib/self.js';
 
 /** `theamify doctor` — installation, GRUB and dependency health. */
 export async function runDoctor() {
@@ -190,6 +190,9 @@ export async function runUninstallWizard() {
   // Remove the npm package so the `theamify` command actually disappears.
   const npmRemoved = await selfUninstall();
 
+  // 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.
   const themeNote = grubReset

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);
@@ -30,6 +33,33 @@ 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(homeDir = os.homedir()) {
+  const rcs = ['.bashrc', '.zshrc'].map((f) => path.join(homeDir, f));
+  const marker = '# theamify CLI PATH';
+  for (const rc of rcs) {
+    try {
+      if (!fs.existsSync(rc)) continue;
+      const lines = fs.readFileSync(rc, 'utf8').split('\n');
+      const out = [];
+      for (let i = 0; i < lines.length; i++) {
+        if (lines[i].includes(marker)) {
+          // Also drop the immediately-following `export PATH=` line.
+          if (lines[i + 1] && /^\s*export PATH=/.test(lines[i + 1])) i++;
+          continue;
+        }
+        out.push(lines[i]);
+      }
+      fs.writeFileSync(rc, out.join('\n'));
+    } catch { /* rc not writable — skip */ }
+  }
+}
+
 /**
  * Check whether the running local version is behind the latest published one.
  * @returns {Promise<{outdated:boolean, latest:string|null, current:string}>}

package/vendor/theamify

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