theamify-cli 1.1.0 → 2.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "theamify-cli",
-  "version": "1.1.0",
+  "version": "2.1.0",
   "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",
@@ -49,4 +49,4 @@
     "execa": "^8.0.1",
     "picocolors": "^1.1.1"
   }
-}
+}

package/src/cli.js

@@ -10,7 +10,7 @@ const require = createRequire(import.meta.url);
 const pkg = require('../package.json');
 
 /** Commands forwarded straight to the bash engine. */
-const ENGINE_COMMANDS = ['list', 'ls', 'info', 'show', 'get', 'fetch', 'download', 'remove', 'rm', 'uncache', 'add', 'del', 'delete', 'update', 'open', 'browse', 'clean', 'purge-cache', 'help', '-h', '-V', '--version'];
+const ENGINE_COMMANDS = ['list', 'ls', 'info', 'show', 'get', 'fetch', 'download', 'remove', 'rm', 'uncache', 'add', 'del', 'delete', 'update', 'open', 'clean', 'purge-cache'];
 
 /**
  * Forward argv to the bash engine and mirror its exit status onto this process.
@@ -78,6 +78,20 @@ const main = defineCommand({
       case 'wizard':
       case 'browse':
         return runThemeBrowser();
+      case 'install':
+        // Guided setup: companion tools → download all themes.
+        return runThemeBrowser();
+      case 'help':
+      case '-h':
+      case '--help':
+        printUsage();
+        return;
+      case 'version':
+      case '-v':
+      case '-V':
+      case '--version':
+        console.log(`theamify v${pkg.version}`);
+        return;
       case 'status':
         return runStatus();
       case 'doctor':

package/src/commands/manage.js

@@ -2,11 +2,11 @@ import fs from 'node:fs';
 import path from 'node:path';
 import * as p from '@clack/prompts';
 import pc from 'picocolors';
-import { execa } from 'execa';
+import { execa, execaSync } from 'execa';
 import {
   findInstalledRuntime,
   USER_DIR,
-  USER_BIN_LINK,
+  removeShadowBin,
   resolveEngine,
 } from '../core/engine.js';
 import { parseThemes, resolveConfPath } from '../lib/conf.js';
@@ -50,7 +50,7 @@ export async function runDoctor() {
 }
 
 function which(bin) {
-  try { return execa.sync('which', [bin], { reject: false }).stdout.trim(); } catch { return ''; }
+  try { return execaSync('which', [bin], { reject: false }).stdout.trim(); } catch { return ''; }
 }
 
 function grubDetectDir() {
@@ -80,7 +80,35 @@ export async function runStatus() {
   if (res.exitCode !== 0) process.exit(res.exitCode);
 }
 
-/** `theamify uninstall` — interactive, every destructive step confirmed. */
+/**
+ * Remove GRUB_THEME from /etc/default/grub and rebuild the boot menu so the
+ * system returns to the default theme. Requires sudo when not root.
+ * @returns {Promise<boolean>} true when GRUB was reset
+ */
+async function resetGrubTheme() {
+  const script = `
+GRUB=/etc/default/grub
+[ -f "$GRUB" ] || exit 0
+sed -i '/^GRUB_THEME=/d' "$GRUB"
+if command -v update-grub >/dev/null 2>&1; then
+  update-grub
+elif command -v grub-mkconfig >/dev/null 2>&1; then
+  grub-mkconfig -o /boot/grub/grub.cfg
+elif command -v grub2-mkconfig >/dev/null 2>&1; then
+  grub2-mkconfig -o /boot/grub2/grub.cfg
+fi
+`.trim();
+  if (process.getuid() === 0) {
+    const res = await execa('bash', ['-c', script], { stdio: 'inherit', reject: false });
+    return res.exitCode === 0;
+  }
+  // Release the terminal so the sudo password prompt is visible & interruptible.
+  console.log();
+  const res = await execa('sudo', ['bash', '-c', script], { stdio: 'inherit', reject: false });
+  return res.exitCode === 0;
+}
+
+/** `theamify uninstall` — removes theamify, ALL downloaded themes, and resets GRUB to default. */
 export async function runUninstallWizard() {
   p.intro(pc.bgRed(pc.black(' theamify Uninstaller ')));
   const found = findInstalledRuntime();
@@ -89,7 +117,7 @@ export async function runUninstallWizard() {
   let removed = false;
   if (found) {
     const confirm = await p.confirm({
-      message: `Remove theamify files at ${found.dir}/?`,
+      message: `Remove theamify files at ${found.dir}/? (this deletes ALL downloaded themes)`,
       initialValue: true,
     });
     if (!p.isCancel(confirm) && confirm) {
@@ -102,26 +130,28 @@ export async function runUninstallWizard() {
           fs.rmSync(dir, { recursive: true, force: true });
         }
         removed = true;
-        // remove the PATH symlink arm (never touches ~/.bashrc blocks without asking? leave PATH block — it's harmless)
-        if (USER_BIN_LINK.startsWith(USER_DIR)) {
-          fs.rmSync(USER_BIN_LINK, { force: true });
-        }
+        removeShadowBin();
       } catch {
         p.log.warn(`Could not remove ${found.dir}.`);
       }
     }
   }
 
-  const keepGrub = await p.confirm({
-    message: 'Keep your currently-applied GRUB theme? (recommended)',
+  // 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?',
     initialValue: true,
   });
-  if (p.isCancel(keepGrub)) { p.cancel('Aborted.'); process.exit(0); }
+  if (p.isCancel(resetGrub)) { p.cancel('Aborted.'); process.exit(0); }
+  const grubReset = resetGrub ? await resetGrubTheme() : false;
 
   // 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
+    ? '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.');
 
   p.outro(pc.green(
-    `Uninstalled.${removed ? ' Runtime removed.' : ''}${keepGrub ? ' Active GRUB theme left in place.' : ' To revert GRUB, remove GRUB_THEME= from /etc/default/grub and rebuild.'} Companion tools (chafa, grub-customizer) were kept for your use.`,
+    `Uninstalled.${removed ? ' Runtime + all downloaded themes removed.' : ''} ${themeNote} Companion tools (chafa, grub-customizer) were kept for your use.`,
   ));
 }

package/src/core/engine.js

@@ -14,6 +14,7 @@ export const ENGINE_SCRIPT = path.join(VENDOR_DIR, 'theamify');
 export const SYSTEM_DIR = '/usr/local/share/theamify';
 export const USER_DIR = path.join(os.homedir(), '.local', 'share', 'theamify');
 export const BIN_NAME = 'theamify';
+/** Legacy self-shadowing symlink that used to point at the bundled bash engine. */
 export const USER_BIN_LINK = path.join(os.homedir(), '.local', 'bin', BIN_NAME);
 
 /**
@@ -27,53 +28,72 @@ export function findInstalledRuntime() {
   return null;
 }
 
+/**
+ * Remove the legacy `~/.local/bin/theamify` symlink if it exists. It was created
+ * by old installs to point at the bundled bash engine, which SHADOWS the npm CLI
+ * (because `~/.local/bin` precedes the npm global bin on PATH — so `theamify`,
+ * `theamify uninstall`, `theamify doctor`, etc. silently ran the old engine).
+ * The npm package already installs `theamify -> bin/theamify.js` in the npm
+ * global bin, which is on PATH, so the symlink is unnecessary and harmful.
+ * Only ever removes a symlink — never a real file the user owns.
+ */
+export function removeShadowBin() {
+  try {
+    const st = fs.lstatSync(USER_BIN_LINK);
+    if (st.isSymbolicLink()) fs.rmSync(USER_BIN_LINK, { force: true });
+  } catch { /* nothing to remove */ }
+}
+
+/** Copy the vendored engine script + shared libs into a runtime dir. */
+function copyEngineTo(dir) {
+  fs.mkdirSync(path.join(dir, 'lib'), { recursive: true });
+  fs.copyFileSync(path.join(VENDOR_DIR, BIN_NAME), path.join(dir, BIN_NAME));
+  fs.chmodSync(path.join(dir, BIN_NAME), 0o755);
+  for (const lib of ['colors', 'utils', 'grub', 'themes']) {
+    fs.copyFileSync(path.join(VENDOR_DIR, 'lib', `${lib}.sh`), path.join(dir, 'lib', `${lib}.sh`));
+  }
+}
+
+/**
+ * Refreshes an existing installed runtime's engine script + libs to match the
+ * bundled package (so the disk engine is never a stale older version). User
+ * registry edits in config/themes.conf are preserved.
+ */
+function syncEngineTo(dir) {
+  const installed = path.join(dir, BIN_NAME);
+  const vendored = path.join(VENDOR_DIR, BIN_NAME);
+  try {
+    if (fs.existsSync(installed) && fs.readFileSync(installed, 'utf8') !== fs.readFileSync(vendored, 'utf8')) {
+      copyEngineTo(dir);
+    }
+  } catch {
+    copyEngineTo(dir);
+  }
+}
+
 /**
  * Provision a user-owned install of the engine under ~/.local/share/theamify so
  * it is writable without root (downloads write into themes/ and .repo_cache/).
- * Preserves an existing config/themes.conf (user registry edits). Returns the
+ * Preserves an existing config/themes.conf (user registry edits). Does NOT create
+ * a PATH shadow symlink — the npm global bin is already on PATH. Returns the
  * runtime dir.
  */
 export async function installUserRuntime() {
-  const { execaSync } = await import('execa');
-  fs.mkdirSync(path.join(USER_DIR, 'lib'), { recursive: true });
   fs.mkdirSync(path.join(USER_DIR, 'config'), { recursive: true });
   fs.mkdirSync(path.join(USER_DIR, 'themes'), { recursive: true });
   fs.mkdirSync(path.join(USER_DIR, '.repo_cache'), { recursive: true });
 
-  fs.copyFileSync(path.join(VENDOR_DIR, BIN_NAME), path.join(USER_DIR, BIN_NAME));
-  fs.chmodSync(path.join(USER_DIR, BIN_NAME), 0o755);
-  for (const lib of ['colors', 'utils', 'grub', 'themes']) {
-    fs.copyFileSync(path.join(VENDOR_DIR, 'lib', `${lib}.sh`), path.join(USER_DIR, 'lib', `${lib}.sh`));
-  }
+  copyEngineTo(USER_DIR);
   const confSrc = path.join(VENDOR_DIR, 'config', 'themes.conf');
   const confDst = path.join(USER_DIR, 'config', 'themes.conf');
   if (!fs.existsSync(confDst)) {
     fs.copyFileSync(confSrc, confDst);
   }
 
-  // The installed engine expects a wrapping bin symlink so `sudo theamify` works.
-  fs.mkdirSync(path.dirname(USER_BIN_LINK), { recursive: true });
-  fs.rmSync(USER_BIN_LINK, { force: true });
-  fs.symlinkSync(path.join(USER_DIR, BIN_NAME), USER_BIN_LINK);
-
-  // Ensure a PATH marker so the command is reachable from a fresh shell.
-  await ensureOnPath(path.dirname(USER_BIN_LINK));
+  removeShadowBin();
   return USER_DIR;
 }
 
-/** Add a PATH export marker to ~/.bashrc and ~/.zshrc (idempotent). */
-export function ensureOnPath(binDir) {
-  const marker = '# theamify CLI PATH';
-  const rcs = ['.bashrc', '.zshrc'].map((f) => path.join(os.homedir(), f));
-  for (const rc of rcs) {
-    try {
-      const content = fs.existsSync(rc) ? fs.readFileSync(rc, 'utf8') : '';
-      if (content.includes(marker)) continue;
-      fs.appendFileSync(rc, `\n${marker}\nexport PATH="${binDir}:$PATH"\n`);
-    } catch { /* skip */ }
-  }
-}
-
 /**
  * Resolve the path to the engine to run for a subcommand.
  * Prefers an installed runtime; otherwise provisions the bundled one in the
@@ -82,8 +102,13 @@ export function ensureOnPath(binDir) {
  */
 export async function resolveEngine() {
   const found = findInstalledRuntime();
-  if (found) return path.join(found.dir, BIN_NAME);
+  if (found) {
+    syncEngineTo(found.dir);
+    removeShadowBin();
+    return path.join(found.dir, BIN_NAME);
+  }
   const dir = await installUserRuntime();
+  removeShadowBin();
   return path.join(dir, BIN_NAME);
 }
 
@@ -97,4 +122,4 @@ export async function runEngine(args = []) {
   const { execa } = await import('execa');
   const engine = await resolveEngine();
   return execa('bash', [engine, ...args], { stdio: 'inherit', reject: false });
-}
+}

package/src/wizard/browse.js

@@ -2,6 +2,7 @@ import * as p from '@clack/prompts';
 import pc from 'picocolors';
 import fs from 'node:fs';
 import path from 'node:path';
+import { execa } from 'execa';
 import { parseThemes, resolveConfPath } from '../lib/conf.js';
 import { ensureManagedTools } from '../lib/tools.js';
 import { resolveEngine, USER_DIR } from '../core/engine.js';
@@ -35,6 +36,11 @@ const statusColor = (status) => ({
   remote: pc.dim,
 }[status] || pc.dim);
 
+/** True when a theme has been downloaded into the local user cache. */
+function isCached(name) {
+  return fs.existsSync(path.join(USER_THEMES, name));
+}
+
 /**
  * Render a terminal "thumbnail" preview of a cached theme via chafa (or any
  * terminal image renderer the user has). Silently nops when unsatisfiable.
@@ -50,7 +56,6 @@ export async function showThemePreview({ name, width = 40, height = 12 }) {
     .sort()[0];
   if (!image) return false;
 
-  const { execa } = await import('execa');
   for (const tool of ['chafa', 'timg', 'viu', 'jp2a']) {
     const args = tool === 'chafa'
       ? ['--size', `${width}x${height}`, image]
@@ -63,104 +68,157 @@ export async function showThemePreview({ name, width = 40, height = 12 }) {
       }
     } catch { /* try next */ }
   }
-  p.log.message(pc.dim('Install `chafa` (: sudo apt install chafa) for terminal theme previews.'));
+  p.log.message(pc.dim('Install `chafa` (sudo apt install chafa) for terminal theme previews.'));
   return false;
 }
 
-/** Interactive GRUB-theme browser wizard (mirrors GitSwitch's look & feel). */
+/**
+ * Make sure a theme is present in the local cache, downloading on demand.
+ * @returns {Promise<boolean>} true when the theme is cached (ready to preview/apply)
+ */
+async function ensureCached(engine, name) {
+  if (isCached(name)) return true;
+  p.log.warn(`${name} isn't downloaded yet. Fetching first…`);
+  const s = p.spinner();
+  s.start(`Downloading ${name}…`);
+  try {
+    await execa('bash', [engine, 'get', name], { stdio: 'inherit', reject: true });
+    s.stop(pc.green(`Downloaded ${name}.`));
+    return true;
+  } catch (e) {
+    s.stop(pc.red(`Download failed: ${e.message}`));
+    return false;
+  }
+}
+
+/**
+ * Download every registry theme into the local cache during setup. Runs the
+ * engine's `get --all`, which skips anything already cached and never prompts
+ * per-theme. Returns the number cached afterwards.
+ */
+async function ensureAllThemes(engine, { prompt = true } = {}) {
+  if (prompt) {
+    const want = await p.confirm({
+      message: 'Download all themes now (so every theme has an instant preview)?',
+      initialValue: true,
+    });
+    if (p.isCancel(want) || !want) {
+      p.log.message(pc.dim('Skipped — you can download individual themes from the menu.'));
+      return;
+    }
+  }
+
+  const s = p.spinner();
+  s.start('Downloading all themes…');
+  try {
+    await execa('bash', [engine, 'get', '--all'], { stdio: 'inherit', reject: true });
+    s.stop(pc.green('All themes downloaded.'));
+  } catch (e) {
+    s.stop(pc.red(`Theme download incomplete: ${e.message}`));
+  }
+}
+
+/**
+ * Interactive GRUB-theme browser wizard (mirrors GitSwitch's look & feel).
+ * Stays in a menu loop: pick a theme → preview / download / apply / open →
+ * back to the theme list — it NEVER hard-exits until you choose Quit.
+ */
 export async function runThemeBrowser() {
   // Step 1: ensure companion tools (chafa, grub-customizer) — detect, install
   // or update, then continue BEFORE showing the theme picker.
   await ensureManagedTools();
 
-  const themes = parseThemes(resolveConfPath());
-  const active = activeTheme();
-
-  const selected = await p.select({
-    message: pc.bold('Pick a GRUB theme'),
-    options: themes.map((t) => {
-      const status = themeStatus(t.name);
-      const color = statusColor(status);
-      return {
-        value: t,
-        label: `${t.name}  ${color(`[${status.toUpperCase()}]`)}${t.name === active ? '  ⭐' : ''}`,
-        hint: t.tags.slice(0, 3).join(', '),
-      };
-    }),
-  });
-  if (p.isCancel(selected)) { p.cancel('Bye! 👋'); process.exit(0); }
-
-  p.log.step(`${pc.bold(selected.name)} — ${selected.desc}`);
-  p.log.message(pc.dim(selected.url));
-
-  if (fs.existsSync(path.join(USER_THEMES, selected.name))) {
-    await showThemePreview({ name: selected.name });
-  }
+  const engine = await resolveEngine();
 
-  const action = await p.select({
-    message: `What do you want to do with ${pc.cyan(selected.name)}?`,
-    options: [
-      { value: 'preview', label: 'Show terminal thumbnail preview', hint: 'requires chafa + cached theme' },
-      { value: 'get', label: 'Download / update it', hint: 'git clone into local cache' },
-      { value: 'use', label: 'Apply to GRUB', hint: 'needs sudo; rebuilds GRUB' },
-      { value: 'open', label: 'Open source page in browser' },
-      { value: 'back', label: 'Cancel' },
-    ],
-  });
-  if (p.isCancel(action) || action === 'back') { p.outro('Bye! 👋'); process.exit(0); }
+  // Step 2: install-flow — make all themes downloadable/previewable up front so
+  // the user never has to fetch one just to see it.
+  await ensureAllThemes(engine, { prompt: true });
+
+  let quit = false;
+
+  while (!quit) {
+    const themes = parseThemes(resolveConfPath());
+    const active = activeTheme();
+
+    const picked = await p.select({
+      message: pc.bold('Pick a GRUB theme'),
+      options: themes.map((t) => {
+        const status = themeStatus(t.name);
+        const color = statusColor(status);
+        return {
+          value: t,
+          label: `${t.name}  ${color(`[${status.toUpperCase()}]`)}${t.name === active ? '  ⭐' : ''}`,
+          hint: (isCached(t.name) ? '🖼 ' : '') + t.tags.slice(0, 3).join(', '),
+        };
+      }),
+    });
+    if (p.isCancel(picked)) { quit = true; break; }
+
+    p.log.step(`${pc.bold(picked.name)} — ${picked.desc}`);
+    p.log.message(pc.dim(picked.url));
+
+    // Thumbnails render by default: show the preview whenever the theme is
+    // cached, otherwise point the user at Download to unlock it.
+    const cached = isCached(picked.name);
+    if (cached) {
+      await showThemePreview({ name: picked.name });
+    } else {
+      p.log.message(pc.dim('Not cached yet — choose “Download / update it” below to preview it.'));
+    }
 
-  const engine = await resolveEngine();
-  const { execa } = await import('execa');
-
-  if (action === 'preview') {
-    await showThemePreview({ name: selected.name, width: 80, height: 20 });
-    p.outro(pc.green('Preview above.'));
-  } else if (action === 'get') {
-    const s = p.spinner();
-    s.start(`Downloading ${selected.name}…`);
-    try {
-      await execa('bash', [engine, 'get', selected.name], { stdio: 'inherit', reject: true });
-      s.stop(pc.green(`Downloaded ${selected.name}.`));
-    } catch (e) {
-      s.stop(pc.red(`Download failed: ${e.message}`));
+    // Per-theme action loop: runs until the user goes back to the list or quits.
+    let backToMenu = false;
+    while (!quit && !backToMenu) {
+      const action = await p.select({
+        message: `What do you want to do with ${pc.cyan(picked.name)}?`,
+        options: [
+          { value: 'get', label: 'Download / update it', hint: 'git clone into local cache' },
+          { value: 'use', label: 'Apply to GRUB', hint: 'needs sudo; rebuilds GRUB' },
+          { value: 'open', label: 'Open source page in browser' },
+          { value: 'menu', label: '← Back to theme list' },
+          { value: 'quit', label: 'Quit browser' },
+        ],
+      });
+
+      if (p.isCancel(action) || action === 'quit') { quit = true; break; }
+      if (action === 'menu') { backToMenu = true; break; }
+
+      if (action === 'get') {
+        await ensureCached(engine, picked.name);
+      } else if (action === 'use') {
+        await runUse(engine, picked.name);
+      } else if (action === 'open') {
+        await execa('bash', [engine, 'open', picked.name], { stdio: 'inherit', reject: false });
+      }
     }
-  } else if (action === 'use') {
-    await runUse(engine, selected.name);
-  } else if (action === 'open') {
-    await execa('bash', [engine, 'open', selected.name], { stdio: 'inherit', reject: false });
   }
+
+  p.outro(pc.cyan('Bye! 👋'));
 }
 
-/** Apply a theme to GRUB, re-invoking with sudo, spinner released for the prompt. */
+/**
+ * Apply a theme to GRUB, re-invoking with sudo, spinner released for the prompt.
+ * Returns true when the apply was attempted/succeeded (false if aborted).
+ */
 export async function runUse(engine, name) {
-  const cached = path.join(USER_THEMES, name);
-  if (!fs.existsSync(cached)) {
-    p.log.warn(`${name} isn't downloaded yet. Fetching first…`);
-    const s = p.spinner();
-    s.start(`Downloading ${name}…`);
-    try {
-      await execa('bash', [engine, 'get', name], { stdio: 'inherit', reject: true });
-      s.stop();
-    } catch (e) {
-      s.stop(pc.red(`Download failed: ${e.message}`));
-      return;
-    }
-  }
+  if (!(await ensureCached(engine, name))) { p.cancel('Aborted — theme not downloaded.'); return false; }
 
   const confirmApply = await p.confirm({ message: `Apply ${pc.cyan(name)} to GRUB and rebuild? (sudo)`, initialValue: true });
-  if (p.isCancel(confirmApply) || !confirmApply) { p.outro('Skipped.'); return; }
+  if (p.isCancel(confirmApply) || !confirmApply) {
+    p.log.message(pc.dim('Skipped — theme not applied.'));
+    return false;
+  }
 
-  const { execa } = await import('execa');
   if (process.getuid() !== 0) {
     // Release spinner, then prompt sudo on a clean terminal so Ctrl+C works.
     console.log();
     const res = await execa('sudo', ['bash', engine, 'use', name], { stdio: 'inherit', reject: false });
-    return res.exitCode === 0
-      ? p.outro(pc.green(`${name} is now your GRUB theme! 🎉`))
-      : p.cancel('GRUB apply failed.');
+    if (res.exitCode === 0) { p.log.success(`${name} is now your GRUB theme! 🎉`); return true; }
+    p.cancel('GRUB apply failed.');
+    return false;
   }
   const res = await execa('bash', [engine, 'use', name], { stdio: 'inherit', reject: false });
-  res.exitCode === 0
-    ? p.outro(pc.green(`${name} is now your GRUB theme! 🎉`))
-    : p.cancel('GRUB apply failed.');
-}
+  if (res.exitCode === 0) { p.log.success(`${name} is now your GRUB theme! 🎉`); return true; }
+  p.cancel('GRUB apply failed.');
+  return false;
+}

package/vendor/theamify

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