npm - @prnv/tuck - Versions diffs - 1.4.1 → 1.5.0 - Mend

@prnv/tuck 1.4.1 → 1.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/dist/index.js CHANGED Viewed

@@ -9,85 +9,203 @@ var __export = (target, all) => {
     __defProp(target, name, { get: all[name], enumerable: true });
 };
-// src/ui/banner.ts
+// src/ui/theme.ts
 import chalk from "chalk";
+import figures from "figures";
+import logSymbols from "log-symbols";
+var DIVIDER_WIDTH, INDENT, colors, c, icons, categoryStyles, divider, indent, formatCount, formatStatus, boxStyles;
+var init_theme = __esm({
+  "src/ui/theme.ts"() {
+    "use strict";
+    DIVIDER_WIDTH = 60;
+    INDENT = "  ";
+    colors = {
+      // Brand
+      brand: chalk.cyan,
+      brandBold: chalk.bold.cyan,
+      brandDim: chalk.dim.cyan,
+      brandBg: chalk.bgCyan.black,
+      // Status
+      success: chalk.green,
+      warning: chalk.yellow,
+      error: chalk.red,
+      info: chalk.blue,
+      // Text
+      muted: chalk.dim,
+      bold: chalk.bold,
+      highlight: chalk.bold.white,
+      // Direct color aliases (for compatibility)
+      cyan: chalk.cyan,
+      green: chalk.green,
+      yellow: chalk.yellow,
+      red: chalk.red,
+      blue: chalk.blue,
+      dim: chalk.dim,
+      white: chalk.white
+    };
+    c = colors;
+    icons = {
+      // Status icons (colored, from log-symbols)
+      success: logSymbols.success,
+      error: logSymbols.error,
+      warning: logSymbols.warning,
+      info: logSymbols.info,
+      // Action icons (from figures - auto fallback)
+      tick: figures.tick,
+      cross: figures.cross,
+      pointer: figures.pointer,
+      arrowRight: figures.arrowRight,
+      arrowDown: figures.arrowDown,
+      arrowUp: figures.arrowUp,
+      // Progress icons
+      circle: figures.circle,
+      circleFilled: figures.circleFilled,
+      bullet: figures.bullet,
+      ellipsis: figures.ellipsis,
+      // File operations
+      add: c.success(figures.tick),
+      remove: c.error(figures.cross),
+      modify: c.warning("~"),
+      sync: c.brand(figures.arrowRight),
+      // Tree/structure
+      line: figures.line,
+      corner: figures.lineDownRight,
+      tee: figures.lineDownRightArc,
+      // Category icons
+      shell: "$",
+      git: figures.star,
+      editors: figures.pointer,
+      terminal: "#",
+      ssh: figures.warning,
+      misc: figures.bullet
+    };
+    categoryStyles = {
+      shell: { icon: "$", color: c.success },
+      git: { icon: figures.star, color: c.warning },
+      editors: { icon: figures.pointer, color: c.brand },
+      terminal: { icon: "#", color: c.info },
+      ssh: { icon: figures.warning, color: c.error },
+      misc: { icon: figures.bullet, color: c.muted }
+    };
+    divider = (width = DIVIDER_WIDTH) => c.muted("\u2500".repeat(width));
+    indent = (level = 1) => INDENT.repeat(level);
+    formatCount = (n, singular, plural) => {
+      const word = n === 1 ? singular : plural || `${singular}s`;
+      return `${c.bold(n.toString())} ${word}`;
+    };
+    formatStatus = (status) => {
+      switch (status) {
+        case "added":
+          return c.success(status);
+        case "modified":
+          return c.warning(status);
+        case "deleted":
+          return c.error(status);
+        default:
+          return c.muted(status);
+      }
+    };
+    boxStyles = {
+      /** Compact header box */
+      header: {
+        padding: { top: 0, bottom: 0, left: 1, right: 1 },
+        borderStyle: "round",
+        borderColor: "cyan"
+      },
+      /** Standard info box */
+      info: {
+        padding: 1,
+        margin: { top: 1, bottom: 1, left: 0, right: 0 },
+        borderStyle: "round",
+        borderColor: "cyan"
+      },
+      /** Success box */
+      success: {
+        padding: 1,
+        margin: { top: 1, bottom: 1, left: 0, right: 0 },
+        borderStyle: "round",
+        borderColor: "green"
+      },
+      /** Error box */
+      error: {
+        padding: 1,
+        margin: { top: 1, bottom: 1, left: 0, right: 0 },
+        borderStyle: "round",
+        borderColor: "red"
+      }
+    };
+  }
+});
+// src/ui/banner.ts
 import boxen from "boxen";
 var banner, miniBanner, customHelp, nextSteps;
 var init_banner = __esm({
   "src/ui/banner.ts"() {
     "use strict";
+    init_theme();
     banner = () => {
       const art = `
  \u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557\u2588\u2588\u2557   \u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2588\u2557\u2588\u2588\u2557  \u2588\u2588\u2557
  \u255A\u2550\u2550\u2588\u2588\u2554\u2550\u2550\u255D\u2588\u2588\u2551   \u2588\u2588\u2551\u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255D\u2588\u2588\u2551 \u2588\u2588\u2554\u255D
-    \u2588\u2588\u2551   \u2588\u2588\u2551   \u2588\u2588\u2551\u2588\u2588\u2551     \u2588\u2588\u2588\u2588\u2588\u2554\u255D
-    \u2588\u2588\u2551   \u2588\u2588\u2551   \u2588\u2588\u2551\u2588\u2588\u2551     \u2588\u2588\u2554\u2550\u2588\u2588\u2557
+    \u2588\u2588\u2551   \u2588\u2588\u2551   \u2588\u2588\u2551\u2588\u2588\u2551     \u2588\u2588\u2588\u2588\u2588\u2554\u255D
+    \u2588\u2588\u2551   \u2588\u2588\u2551   \u2588\u2588\u2551\u2588\u2588\u2551     \u2588\u2588\u2554\u2550\u2588\u2588\u2557
     \u2588\u2588\u2551   \u255A\u2588\u2588\u2588\u2588\u2588\u2588\u2554\u255D\u255A\u2588\u2588\u2588\u2588\u2588\u2588\u2557\u2588\u2588\u2551  \u2588\u2588\u2557
     \u255A\u2550\u255D    \u255A\u2550\u2550\u2550\u2550\u2550\u255D  \u255A\u2550\u2550\u2550\u2550\u2550\u255D\u255A\u2550\u255D  \u255A\u2550\u255D`;
-      console.log(chalk.cyan(art));
-      console.log(chalk.dim("    Modern Dotfiles Manager\n"));
+      console.log(colors.brand(art));
+      console.log(colors.muted("    Modern Dotfiles Manager\n"));
     };
     miniBanner = () => {
-      console.log(
-        boxen(chalk.cyan.bold("tuck") + chalk.dim(" \xB7 Modern Dotfiles Manager"), {
-          padding: { top: 0, bottom: 0, left: 1, right: 1 },
-          borderStyle: "round",
-          borderColor: "cyan"
-        })
-      );
+      console.log(boxen(colors.brandBold("tuck") + colors.muted(" \xB7 Modern Dotfiles Manager"), boxStyles.header));
       console.log();
     };
     customHelp = (version) => {
-      const title = boxen(chalk.cyan.bold("tuck") + chalk.dim(` v${version}`), {
-        padding: { top: 0, bottom: 0, left: 1, right: 1 },
-        borderStyle: "round",
-        borderColor: "cyan"
-      });
+      const title = boxen(colors.brandBold("tuck") + colors.muted(` v${version}`), boxStyles.header);
       const quickStart = `
-${chalk.bold.cyan("Quick Start:")}
-  ${chalk.cyan("tuck init")}          Set up tuck (auto-creates GitHub repo)
-  ${chalk.cyan("tuck add <file>")}    Start tracking a dotfile
-  ${chalk.cyan("tuck sync")}          Commit your changes
-  ${chalk.cyan("tuck push")}          Push to GitHub
+${colors.brandBold("Quick Start:")}
+${indent()}${colors.brand("tuck init")}          Set up tuck
+${indent()}${colors.brand("tuck add <file>")}    Track a dotfile
+${indent()}${colors.brand("tuck sync")}          Commit changes
+${indent()}${colors.brand("tuck push")}          Push to remote
-${chalk.bold.cyan("On a New Machine:")}
-  ${chalk.cyan("tuck apply <user>")}  Apply dotfiles from GitHub
+${colors.brandBold("New Machine:")}
+${indent()}${colors.brand("tuck apply <user>")}  Apply dotfiles from GitHub
 `;
       const commands = `
-${chalk.bold.cyan("Commands:")}
-  ${chalk.cyan("Getting Started")}
-    init              Initialize tuck repository
-    scan              Auto-detect and select dotfiles to track
-    apply <source>    Apply dotfiles from a repository
+${colors.brandBold("Commands:")}
+${indent()}${colors.brand("Getting Started")}
+${indent()}${indent()}init              Initialize tuck
+${indent()}${indent()}scan              Detect dotfiles
+${indent()}${indent()}apply <source>    Apply from repo
-  ${chalk.cyan("Managing Files")}
-    add <paths...>    Track dotfile(s)
-    remove <paths...> Stop tracking dotfile(s)
-    list              List all tracked files
-    status            Show repository status
+${indent()}${colors.brand("Managing Files")}
+${indent()}${indent()}add <paths...>    Track files
+${indent()}${indent()}remove <paths...> Untrack files
+${indent()}${indent()}list              List tracked
+${indent()}${indent()}status            Show status
-  ${chalk.cyan("Syncing")}
-    sync              Sync changes to repository
-    push              Push to remote
-    pull              Pull from remote
-    diff              Show pending changes
+${indent()}${colors.brand("Syncing")}
+${indent()}${indent()}sync              Commit changes
+${indent()}${indent()}push              Push to remote
+${indent()}${indent()}pull              Pull from remote
+${indent()}${indent()}diff              Show changes
-  ${chalk.cyan("Restoring")}
-    restore           Restore dotfiles to system
-    undo              Undo last apply (Time Machine backup)
+${indent()}${colors.brand("Restoring")}
+${indent()}${indent()}restore           Restore files
+${indent()}${indent()}undo              Undo last apply
-  ${chalk.cyan("Configuration")}
-    config            Manage tuck configuration
+${indent()}${colors.brand("Config")}
+${indent()}${indent()}config            Manage settings
 `;
       const footer = `
-${chalk.dim("Run")} ${chalk.cyan("tuck <command> --help")} ${chalk.dim("for detailed command info")}
-${chalk.dim("Documentation:")} ${chalk.cyan("https://github.com/Pranav-Karra-3301/tuck")}
+${colors.muted("Run")} ${colors.brand("tuck <command> --help")} ${colors.muted("for details")}
+${colors.muted("Docs:")} ${colors.brand("https://github.com/Pranav-Karra-3301/tuck")}
 `;
       return `${title}
 ${quickStart}${commands}${footer}`;
     };
     nextSteps = (steps) => {
-      const content = steps.map((step, i) => `${chalk.cyan(`${i + 1}.`)} ${step}`).join("\n");
+      const content = steps.map((step, i) => `${colors.brand(`${i + 1}.`)} ${step}`).join("\n");
       console.log(
         boxen(content, {
           padding: 1,
@@ -103,75 +221,65 @@ ${quickStart}${commands}${footer}`;
 });
 // src/ui/logger.ts
-import chalk2 from "chalk";
-var logger, formatCount, formatStatus;
+import logSymbols2 from "log-symbols";
+import figures2 from "figures";
+var fileIcons, logger;
 var init_logger = __esm({
   "src/ui/logger.ts"() {
     "use strict";
+    init_theme();
+    init_theme();
+    fileIcons = {
+      add: colors.success(figures2.tick),
+      modify: colors.warning("~"),
+      delete: colors.error(figures2.cross),
+      sync: colors.brand(figures2.arrowRight),
+      merge: colors.info("+")
+    };
     logger = {
       info: (msg) => {
-        console.log(chalk2.blue("i"), msg);
+        console.log(logSymbols2.info, msg);
       },
       success: (msg) => {
-        console.log(chalk2.green("ok"), msg);
+        console.log(logSymbols2.success, msg);
       },
       warning: (msg) => {
-        console.log(chalk2.yellow("!"), msg);
+        console.log(logSymbols2.warning, msg);
       },
       error: (msg) => {
-        console.log(chalk2.red("x"), msg);
+        console.log(logSymbols2.error, msg);
       },
       debug: (msg) => {
         if (process.env.DEBUG) {
-          console.log(chalk2.gray("*"), chalk2.gray(msg));
+          console.log(colors.muted(figures2.bullet), colors.muted(msg));
         }
       },
       step: (current, total, msg) => {
-        console.log(chalk2.dim(`[${current}/${total}]`), msg);
+        const counter = colors.muted(`[${current}/${total}]`);
+        console.log(counter, msg);
       },
       file: (action, path) => {
-        const icons = {
-          add: chalk2.green("+"),
-          modify: chalk2.yellow("~"),
-          delete: chalk2.red("-"),
-          sync: chalk2.blue("<>"),
-          merge: chalk2.magenta("+")
-        };
-        console.log(`  ${icons[action]} ${path}`);
+        const icon = fileIcons[action];
+        console.log(`${indent()}${icon} ${colors.brand(path)}`);
       },
       tree: (items) => {
-        items.forEach(({ name, isLast, indent = 0 }) => {
-          const indentation = "  ".repeat(indent);
-          const prefix = isLast ? "\u2514\u2500\u2500 " : "\u251C\u2500\u2500 ";
-          console.log(chalk2.dim(indentation + prefix) + name);
+        items.forEach(({ name, isLast, indent: indent2 = 0 }) => {
+          const indentation = indent(indent2);
+          const prefix = isLast ? figures2.lineUpRight : figures2.lineDownRightArc;
+          console.log(colors.muted(indentation + prefix + figures2.line), name);
         });
       },
       blank: () => {
         console.log();
       },
       dim: (msg) => {
-        console.log(chalk2.dim(msg));
+        console.log(colors.muted(msg));
       },
       heading: (msg) => {
-        console.log(chalk2.bold.cyan(msg));
-      }
-    };
-    formatCount = (count, singular, plural) => {
-      const word = count === 1 ? singular : plural || `${singular}s`;
-      return `${chalk2.bold(count.toString())} ${word}`;
-    };
-    formatStatus = (status) => {
-      switch (status) {
-        case "modified":
-          return chalk2.yellow("modified");
-        case "added":
-          return chalk2.green("added");
-        case "deleted":
-          return chalk2.red("deleted");
-        case "untracked":
-          return chalk2.gray("untracked");
-        default:
-          return status;
+        console.log(colors.brandBold(msg));
+      },
+      divider: () => {
+        console.log(divider(DIVIDER_WIDTH));
       }
     };
   }
@@ -179,18 +287,27 @@ var init_logger = __esm({
 // src/ui/prompts.ts
 import * as p from "@clack/prompts";
-import chalk3 from "chalk";
 var prompts;
 var init_prompts = __esm({
   "src/ui/prompts.ts"() {
     "use strict";
+    init_theme();
     prompts = {
+      /**
+       * Display command intro header
+       */
       intro: (title) => {
-        p.intro(chalk3.bgCyan(chalk3.black(` ${title} `)));
+        p.intro(colors.brandBg(` ${title} `));
       },
+      /**
+       * Display command outro/success message
+       */
       outro: (message) => {
-        p.outro(chalk3.green(message));
+        p.outro(colors.success(message));
       },
+      /**
+       * Confirm dialog (yes/no)
+       */
       confirm: async (message, initial = false) => {
         const result = await p.confirm({ message, initialValue: initial });
         if (p.isCancel(result)) {
@@ -198,6 +315,9 @@ var init_prompts = __esm({
         }
         return result;
       },
+      /**
+       * Single select from options
+       */
       select: async (message, options) => {
         const result = await p.select({
           message,
@@ -212,6 +332,9 @@ var init_prompts = __esm({
         }
         return result;
       },
+      /**
+       * Multi-select from options
+       */
       multiselect: async (message, options, config) => {
         const mappedOptions = options.map((opt) => ({
           value: opt.value,
@@ -220,8 +343,8 @@ var init_prompts = __esm({
         }));
         const result = await p.multiselect({
           message,
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
           options: mappedOptions,
-          // eslint-disable-line @typescript-eslint/no-explicit-any
           required: config?.required ?? false,
           initialValues: config?.initialValues
         });
@@ -230,6 +353,9 @@ var init_prompts = __esm({
         }
         return result;
       },
+      /**
+       * Text input
+       */
       text: async (message, options) => {
         const result = await p.text({
           message,
@@ -242,6 +368,9 @@ var init_prompts = __esm({
         }
         return result;
       },
+      /**
+       * Password input (hidden)
+       */
       password: async (message) => {
         const result = await p.password({ message });
         if (p.isCancel(result)) {
@@ -249,14 +378,26 @@ var init_prompts = __esm({
         }
         return result;
       },
+      /**
+       * Create a spinner for async operations
+       */
       spinner: () => p.spinner(),
+      /**
+       * Display a note/info box
+       */
       note: (message, title) => {
         p.note(message, title);
       },
+      /**
+       * Cancel operation and exit
+       */
       cancel: (message = "Operation cancelled") => {
         p.cancel(message);
         process.exit(0);
       },
+      /**
+       * Logging helpers
+       */
       log: {
         info: (message) => {
           p.log.info(message);
@@ -277,6 +418,9 @@ var init_prompts = __esm({
           p.log.message(message);
         }
       },
+      /**
+       * Group multiple prompts
+       */
       group: async (steps, options) => {
         const results = await p.group(steps, {
           onCancel: () => {
@@ -294,52 +438,78 @@ var init_prompts = __esm({
 });
 // src/ui/spinner.ts
-import ora from "ora";
-import chalk4 from "chalk";
+import * as p2 from "@clack/prompts";
+import logSymbols3 from "log-symbols";
 var createSpinner, withSpinner;
 var init_spinner = __esm({
   "src/ui/spinner.ts"() {
     "use strict";
+    init_theme();
     createSpinner = (initialText) => {
-      const spinner2 = ora({
-        text: initialText,
-        color: "cyan",
-        spinner: "dots"
-      });
+      const spinner4 = p2.spinner();
+      let currentText = initialText || "";
+      let started = false;
       return {
         start: (text2) => {
-          if (text2) spinner2.text = text2;
-          spinner2.start();
+          currentText = text2 || currentText || "Loading...";
+          spinner4.start(currentText);
+          started = true;
         },
         stop: () => {
-          spinner2.stop();
+          if (started) {
+            spinner4.stop(currentText);
+            started = false;
+          }
         },
         succeed: (text2) => {
-          spinner2.succeed(text2 ? chalk4.green(text2) : void 0);
+          if (started) {
+            spinner4.stop(colors.success(text2 || currentText));
+            started = false;
+          } else {
+            console.log(logSymbols3.success, colors.success(text2 || currentText));
+          }
         },
         fail: (text2) => {
-          spinner2.fail(text2 ? chalk4.red(text2) : void 0);
+          if (started) {
+            spinner4.stop(colors.error(text2 || currentText));
+            started = false;
+          } else {
+            console.log(logSymbols3.error, colors.error(text2 || currentText));
+          }
         },
         warn: (text2) => {
-          spinner2.warn(text2 ? chalk4.yellow(text2) : void 0);
+          if (started) {
+            spinner4.stop(colors.warning(text2 || currentText));
+            started = false;
+          } else {
+            console.log(logSymbols3.warning, colors.warning(text2 || currentText));
+          }
         },
         info: (text2) => {
-          spinner2.info(text2 ? chalk4.blue(text2) : void 0);
+          if (started) {
+            spinner4.stop(colors.info(text2 || currentText));
+            started = false;
+          } else {
+            console.log(logSymbols3.info, colors.info(text2 || currentText));
+          }
         },
         text: (text2) => {
-          spinner2.text = text2;
+          currentText = text2;
+          if (started) {
+            spinner4.message(text2);
+          }
         }
       };
     };
     withSpinner = async (text2, fn, options) => {
-      const spinner2 = createSpinner(text2);
-      spinner2.start();
+      const spinner4 = createSpinner(text2);
+      spinner4.start();
       try {
         const result = await fn();
-        spinner2.succeed(options?.successText || text2);
+        spinner4.succeed(options?.successText || text2);
         return result;
       } catch (error) {
-        spinner2.fail(options?.failText || text2);
+        spinner4.fail(options?.failText || text2);
         throw error;
       }
     };
@@ -347,26 +517,21 @@ var init_spinner = __esm({
 });
 // src/ui/table.ts
-import chalk5 from "chalk";
 var init_table = __esm({
   "src/ui/table.ts"() {
     "use strict";
+    init_theme();
   }
 });
 // src/ui/progress.ts
-import chalk6 from "chalk";
-import ora2 from "ora";
-var ICONS;
+import * as p3 from "@clack/prompts";
+import logSymbols4 from "log-symbols";
+import figures3 from "figures";
 var init_progress = __esm({
   "src/ui/progress.ts"() {
     "use strict";
-    ICONS = {
-      pending: chalk6.dim("\u25CB"),
-      in_progress: chalk6.cyan("\u25CF"),
-      completed: chalk6.green("\u2713"),
-      error: chalk6.red("\u2717")
-    };
+    init_theme();
   }
 });
@@ -374,6 +539,7 @@ var init_progress = __esm({
 var init_ui = __esm({
   "src/ui/index.ts"() {
     "use strict";
+    init_theme();
     init_banner();
     init_logger();
     init_prompts();
@@ -388,6 +554,7 @@ import { homedir } from "os";
 import { join, dirname } from "path";
 import { readFileSync } from "fs";
 import { fileURLToPath } from "url";
+import figures4 from "figures";
 var __dirname, packageJsonPath, VERSION_VALUE, VERSION, DESCRIPTION, HOME_DIR, DEFAULT_TUCK_DIR, MANIFEST_FILE, CONFIG_FILE, BACKUP_DIR, FILES_DIR, CATEGORIES;
 var init_constants = __esm({
   "src/constants.ts"() {
@@ -425,7 +592,7 @@ var init_constants = __esm({
       },
       git: {
         patterns: [".gitconfig", ".gitignore_global", ".gitmessage", ".gitattributes"],
-        icon: "*"
+        icon: figures4.star
       },
       editors: {
         patterns: [
@@ -437,7 +604,7 @@ var init_constants = __esm({
           ".ideavimrc",
           ".nanorc"
         ],
-        icon: ">"
+        icon: figures4.pointer
       },
       terminal: {
         patterns: [
@@ -453,11 +620,11 @@ var init_constants = __esm({
       },
       ssh: {
         patterns: [".ssh/config"],
-        icon: "!"
+        icon: figures4.warning
       },
       misc: {
         patterns: [],
-        icon: "-"
+        icon: figures4.bullet
       }
     };
   }
@@ -771,7 +938,7 @@ var init_config_schema = __esm({
 });
 // src/errors.ts
-import chalk7 from "chalk";
+import chalk2 from "chalk";
 var TuckError, NotInitializedError, AlreadyInitializedError, FileNotFoundError, FileNotTrackedError, FileAlreadyTrackedError, GitError, ConfigError, ManifestError, PermissionError, GitHubCliError, BackupError, SecretsDetectedError, handleError;
 var init_errors = __esm({
   "src/errors.ts"() {
@@ -886,22 +1053,22 @@ var init_errors = __esm({
     };
     handleError = (error) => {
       if (error instanceof TuckError) {
-        console.error(chalk7.red("x"), error.message);
+        console.error(chalk2.red("x"), error.message);
         if (error.suggestions && error.suggestions.length > 0) {
           console.error();
-          console.error(chalk7.dim("Suggestions:"));
-          error.suggestions.forEach((s) => console.error(chalk7.dim(`  \u2192 ${s}`)));
+          console.error(chalk2.dim("Suggestions:"));
+          error.suggestions.forEach((s) => console.error(chalk2.dim(`  \u2192 ${s}`)));
         }
         process.exit(1);
       }
       if (error instanceof Error) {
-        console.error(chalk7.red("x"), "An unexpected error occurred:", error.message);
+        console.error(chalk2.red("x"), "An unexpected error occurred:", error.message);
         if (process.env.DEBUG) {
           console.error(error.stack);
         }
         process.exit(1);
       }
-      console.error(chalk7.red("x"), "An unknown error occurred");
+      console.error(chalk2.red("x"), "An unknown error occurred");
       process.exit(1);
     };
   }
@@ -3191,8 +3358,8 @@ var init_files = __esm({
 });
 // src/lib/fileTracking.ts
-import chalk8 from "chalk";
-import ora3 from "ora";
+import chalk3 from "chalk";
+import ora from "ora";
 import { ensureDir as ensureDir2 } from "fs-extra";
 import { dirname as dirname4 } from "path";
 var SENSITIVE_FILE_PATTERNS, isSensitiveFile, trackFilesWithProgress;
@@ -3249,19 +3416,19 @@ var init_fileTracking = __esm({
       const sensitiveFiles = [];
       let succeeded = 0;
       console.log();
-      console.log(chalk8.bold.cyan(`${actionVerb} ${total} ${total === 1 ? "file" : "files"}...`));
-      console.log(chalk8.dim("\u2500".repeat(50)));
+      console.log(chalk3.bold.cyan(`${actionVerb} ${total} ${total === 1 ? "file" : "files"}...`));
+      console.log(chalk3.dim("\u2500".repeat(50)));
       console.log();
       for (let i = 0; i < files.length; i++) {
         const file = files[i];
         const expandedPath = expandPath(file.path);
-        const indexStr = chalk8.dim(`[${i + 1}/${total}]`);
+        const indexStr = chalk3.dim(`[${i + 1}/${total}]`);
         const category = file.category || detectCategory(expandedPath);
         const filename = sanitizeFilename(expandedPath);
         const categoryInfo = CATEGORIES[category];
         const icon = categoryInfo?.icon || "\u25CB";
-        const spinner2 = ora3({
-          text: `${indexStr} ${actionVerb} ${chalk8.cyan(collapsePath(file.path))}`,
+        const spinner4 = ora({
+          text: `${indexStr} ${actionVerb} ${chalk3.cyan(collapsePath(file.path))}`,
           color: "cyan",
           spinner: "dots",
           indent: 2
@@ -3291,9 +3458,9 @@ var init_fileTracking = __esm({
             modified: now,
             checksum
           });
-          spinner2.stop();
-          const categoryStr = showCategory ? chalk8.dim(` ${icon} ${category}`) : "";
-          console.log(`  ${chalk8.green("\u2713")} ${indexStr} ${collapsePath(file.path)}${categoryStr}`);
+          spinner4.stop();
+          const categoryStr = showCategory ? chalk3.dim(` ${icon} ${category}`) : "";
+          console.log(`  ${chalk3.green("\u2713")} ${indexStr} ${collapsePath(file.path)}${categoryStr}`);
           if (isSensitiveFile(collapsePath(file.path))) {
             sensitiveFiles.push(file.path);
           }
@@ -3305,30 +3472,30 @@ var init_fileTracking = __esm({
             await new Promise((resolve2) => setTimeout(resolve2, delayBetween));
           }
         } catch (error) {
-          spinner2.stop();
+          spinner4.stop();
           const errorObj = error instanceof Error ? error : new Error(String(error));
           errors.push({ path: file.path, error: errorObj });
-          console.log(`  ${chalk8.red("\u2717")} ${indexStr} ${collapsePath(file.path)} ${chalk8.red("- failed")}`);
+          console.log(`  ${chalk3.red("\u2717")} ${indexStr} ${collapsePath(file.path)} ${chalk3.red("- failed")}`);
         }
       }
       console.log();
       if (succeeded > 0) {
-        console.log(chalk8.green("\u2713"), chalk8.bold(`Tracked ${succeeded} ${succeeded === 1 ? "file" : "files"} successfully`));
+        console.log(chalk3.green("\u2713"), chalk3.bold(`Tracked ${succeeded} ${succeeded === 1 ? "file" : "files"} successfully`));
       }
       if (errors.length > 0) {
         console.log();
-        console.log(chalk8.red("\u2717"), chalk8.bold(`Failed to track ${errors.length} ${errors.length === 1 ? "file" : "files"}:`));
+        console.log(chalk3.red("\u2717"), chalk3.bold(`Failed to track ${errors.length} ${errors.length === 1 ? "file" : "files"}:`));
         for (const { path, error } of errors) {
-          console.log(chalk8.dim(`   \u2022 ${collapsePath(path)}: ${error.message}`));
+          console.log(chalk3.dim(`   \u2022 ${collapsePath(path)}: ${error.message}`));
         }
       }
       if (sensitiveFiles.length > 0) {
         console.log();
-        console.log(chalk8.yellow("\u26A0"), chalk8.yellow("Warning: Some files may contain sensitive data:"));
+        console.log(chalk3.yellow("\u26A0"), chalk3.yellow("Warning: Some files may contain sensitive data:"));
         for (const path of sensitiveFiles) {
-          console.log(chalk8.dim(`   \u2022 ${collapsePath(path)}`));
+          console.log(chalk3.dim(`   \u2022 ${collapsePath(path)}`));
         }
-        console.log(chalk8.dim("  Make sure your repository is private!"));
+        console.log(chalk3.dim("  Make sure your repository is private!"));
       }
       return {
         succeeded,
@@ -3385,7 +3552,7 @@ var init_backup = __esm({
 // src/lib/hooks.ts
 import { exec } from "child_process";
 import { promisify as promisify2 } from "util";
-import chalk9 from "chalk";
+import chalk4 from "chalk";
 var execAsync, runHook, runPreSyncHook, runPostSyncHook, runPreRestoreHook, runPostRestoreHook;
 var init_hooks = __esm({
   "src/lib/hooks.ts"() {
@@ -3405,19 +3572,19 @@ var init_hooks = __esm({
       }
       if (!options?.trustHooks) {
         console.log();
-        console.log(chalk9.yellow.bold("WARNING: Hook Execution"));
-        console.log(chalk9.dim("\u2500".repeat(50)));
-        console.log(chalk9.white(`Hook type: ${chalk9.cyan(hookType)}`));
-        console.log(chalk9.white("Command:"));
-        console.log(chalk9.red(`  ${command}`));
-        console.log(chalk9.dim("\u2500".repeat(50)));
+        console.log(chalk4.yellow.bold("WARNING: Hook Execution"));
+        console.log(chalk4.dim("\u2500".repeat(50)));
+        console.log(chalk4.white(`Hook type: ${chalk4.cyan(hookType)}`));
+        console.log(chalk4.white("Command:"));
+        console.log(chalk4.red(`  ${command}`));
+        console.log(chalk4.dim("\u2500".repeat(50)));
         console.log(
-          chalk9.yellow(
+          chalk4.yellow(
             "SECURITY: Hooks can execute arbitrary commands on your system."
           )
         );
         console.log(
-          chalk9.yellow(
+          chalk4.yellow(
             "Only proceed if you trust the source of this configuration."
           )
         );
@@ -3483,13 +3650,13 @@ __export(restore_exports, {
   runRestore: () => runRestore
 });
 import { Command } from "commander";
-import chalk10 from "chalk";
 import { join as join7 } from "path";
 import { chmod, stat as stat4 } from "fs/promises";
 var fixSSHPermissions, fixGPGPermissions, prepareFilesToRestore, restoreFiles, runInteractiveRestore, runRestore, runRestoreCommand, restoreCommand;
 var init_restore = __esm({
   "src/commands/restore.ts"() {
     "use strict";
+    init_theme();
     init_ui();
     init_paths();
     init_manifest();
@@ -3615,14 +3782,16 @@ var init_restore = __esm({
       }
       const fileOptions = files.map((file) => {
         const categoryConfig = CATEGORIES[file.category] || { icon: "\u{1F4C4}" };
-        const status = file.existsAtTarget ? chalk10.yellow("(exists, will backup)") : "";
+        const status = file.existsAtTarget ? colors.yellow("(exists, will backup)") : "";
         return {
           value: file.id,
           label: `${categoryConfig.icon} ${file.source} ${status}`,
           hint: file.category
         };
       });
-      const selectedIds = await prompts.multiselect("Select files to restore:", fileOptions, { required: true });
+      const selectedIds = await prompts.multiselect("Select files to restore:", fileOptions, {
+        required: true
+      });
       if (selectedIds.length === 0) {
         prompts.cancel("No files selected");
         return;
@@ -3634,7 +3803,7 @@ var init_restore = __esm({
         prompts.log.warning(
           `${existingFiles.length} file${existingFiles.length > 1 ? "s" : ""} will be backed up:`
         );
-        existingFiles.forEach((f) => console.log(chalk10.dim(`  ${f.source}`)));
+        existingFiles.forEach((f) => console.log(colors.dim(`  ${f.source}`)));
         console.log();
       }
       const useSymlink = await prompts.select("Restore method:", [
@@ -4389,7 +4558,7 @@ var init_patterns = __esm({
         low: 3
       };
       const minLevel = severityOrder[minSeverity];
-      return ALL_SECRET_PATTERNS.filter((p2) => severityOrder[p2.severity] <= minLevel);
+      return ALL_SECRET_PATTERNS.filter((p4) => severityOrder[p4.severity] <= minLevel);
     };
     createCustomPattern = (id, name, pattern, options) => {
       return {
@@ -4561,7 +4730,7 @@ var init_scanner = __esm({
       }
       if (options.excludePatternIds && options.excludePatternIds.length > 0) {
         const excludeSet = new Set(options.excludePatternIds);
-        patterns = patterns.filter((p2) => !excludeSet.has(p2.id));
+        patterns = patterns.filter((p4) => !excludeSet.has(p4.id));
       }
       for (const pattern of patterns) {
         if (Date.now() - scanStartTime > SCAN_TIMEOUT_MS) {
@@ -5094,10 +5263,10 @@ var init_external = __esm({
         "credential"
       ];
       const ruleIdLower = ruleId.toLowerCase();
-      if (criticalPatterns.some((p2) => ruleIdLower.includes(p2))) {
+      if (criticalPatterns.some((p4) => ruleIdLower.includes(p4))) {
         return "critical";
       }
-      if (highPatterns.some((p2) => ruleIdLower.includes(p2))) {
+      if (highPatterns.some((p4) => ruleIdLower.includes(p4))) {
         return "high";
       }
       return "medium";
@@ -5248,11 +5417,11 @@ var init_secrets = __esm({
         }
       }
       const customPatterns = (security.customPatterns || []).map(
-        (p2, i) => createCustomPattern(`config-${i}`, p2.name || `Custom Pattern ${i + 1}`, p2.pattern, {
-          severity: p2.severity,
-          description: p2.description,
-          placeholder: p2.placeholder,
-          flags: p2.flags
+        (p4, i) => createCustomPattern(`config-${i}`, p4.name || `Custom Pattern ${i + 1}`, p4.pattern, {
+          severity: p4.severity,
+          description: p4.description,
+          placeholder: p4.placeholder,
+          flags: p4.flags
         })
       );
       return scanFiles(filepaths, {
@@ -5317,7 +5486,6 @@ var init_secrets = __esm({
 // src/commands/secrets.ts
 import { Command as Command3 } from "commander";
-import chalk12 from "chalk";
 var runSecretsList, runSecretsSet, runSecretsUnset, runSecretsPath, runScanHistory, runScanFiles, displayScanResults, secretsCommand;
 var init_secrets2 = __esm({
   "src/commands/secrets.ts"() {
@@ -5345,19 +5513,19 @@ var init_secrets2 = __esm({
         return;
       }
       console.log();
-      console.log(chalk12.bold.cyan(`Stored Secrets (${secrets.length})`));
-      console.log(chalk12.dim("\u2500".repeat(50)));
+      console.log(colors.bold.cyan(`Stored Secrets (${secrets.length})`));
+      console.log(colors.dim("\u2500".repeat(50)));
       console.log();
       for (const secret of secrets) {
-        console.log(`  ${chalk12.green(secret.name)}`);
-        console.log(`    ${chalk12.dim("Placeholder:")} ${chalk12.cyan(secret.placeholder)}`);
+        console.log(`  ${colors.green(secret.name)}`);
+        console.log(`    ${colors.dim("Placeholder:")} ${colors.cyan(secret.placeholder)}`);
         if (secret.description) {
-          console.log(`    ${chalk12.dim("Type:")} ${secret.description}`);
+          console.log(`    ${colors.dim("Type:")} ${secret.description}`);
         }
         if (secret.source) {
-          console.log(`    ${chalk12.dim("Source:")} ${secret.source}`);
+          console.log(`    ${colors.dim("Source:")} ${secret.source}`);
         }
-        console.log(`    ${chalk12.dim("Added:")} ${new Date(secret.addedAt).toLocaleDateString()}`);
+        console.log(`    ${colors.dim("Added:")} ${new Date(secret.addedAt).toLocaleDateString()}`);
         console.log();
       }
       logger.dim(`Secrets file: ${getSecretsPath(tuckDir)}`);
@@ -5418,22 +5586,22 @@ var init_secrets2 = __esm({
       }
       const limit = options.limit ? parseInt(options.limit, 10) : 50;
       prompts.intro("tuck secrets scan-history");
-      const spinner2 = prompts.spinner();
-      spinner2.start("Scanning git history for secrets...");
+      const spinner4 = prompts.spinner();
+      spinner4.start("Scanning git history for secrets...");
       try {
         const logEntries = await getLog(tuckDir, {
           maxCount: limit,
           since: options.since
         });
         if (logEntries.length === 0) {
-          spinner2.stop("No commits found");
+          spinner4.stop("No commits found");
           return;
         }
         let simpleGit2;
         try {
           simpleGit2 = (await import("simple-git")).default;
         } catch (importError) {
-          spinner2.stop("Git integration is unavailable (simple-git module could not be loaded).");
+          spinner4.stop("Git integration is unavailable (simple-git module could not be loaded).");
           const errorMsg = importError instanceof Error ? importError.message : String(importError);
           logger.error(`Failed to load simple-git for scan-history: ${errorMsg}`);
           return;
@@ -5443,7 +5611,7 @@ var init_secrets2 = __esm({
         let scannedCommits = 0;
         for (const entry of logEntries) {
           scannedCommits++;
-          spinner2.message(`Scanning commit ${scannedCommits}/${logEntries.length}...`);
+          spinner4.message(`Scanning commit ${scannedCommits}/${logEntries.length}...`);
           try {
             const diff = await git.diff([`${entry.hash}^`, entry.hash]);
             if (diff) {
@@ -5478,7 +5646,7 @@ var init_secrets2 = __esm({
             continue;
           }
         }
-        spinner2.stop(`Scanned ${scannedCommits} commits`);
+        spinner4.stop(`Scanned ${scannedCommits} commits`);
         if (results.length === 0) {
           console.log();
           logger.success("No secrets found in git history");
@@ -5486,32 +5654,32 @@ var init_secrets2 = __esm({
           return;
         }
         console.log();
-        console.log(chalk12.bold.red(`Found potential secrets in ${results.length} commits`));
-        console.log(chalk12.dim("\u2500".repeat(60)));
+        console.log(colors.bold.red(`Found potential secrets in ${results.length} commits`));
+        console.log(colors.dim("\u2500".repeat(60)));
         console.log();
         for (const result of results) {
-          console.log(chalk12.yellow(`Commit: ${result.commit}`));
-          console.log(chalk12.dim(`  Author: ${result.author}`));
-          console.log(chalk12.dim(`  Date: ${result.date}`));
-          console.log(chalk12.dim(`  Message: ${result.message}`));
+          console.log(colors.yellow(`Commit: ${result.commit}`));
+          console.log(colors.dim(`  Author: ${result.author}`));
+          console.log(colors.dim(`  Date: ${result.date}`));
+          console.log(colors.dim(`  Message: ${result.message}`));
           console.log();
           for (const secret of result.secrets) {
-            const severityColor = secret.severity === "critical" ? chalk12.red : secret.severity === "high" ? chalk12.yellow : chalk12.dim;
+            const severityColor = secret.severity === "critical" ? colors.red : secret.severity === "high" ? colors.yellow : colors.dim;
             console.log(`    ${severityColor(`[${secret.severity}]`)} ${secret.pattern}`);
-            console.log(chalk12.dim(`      Value: ${secret.redactedValue}`));
+            console.log(colors.dim(`      Value: ${secret.redactedValue}`));
           }
           console.log();
         }
-        console.log(chalk12.dim("\u2500".repeat(60)));
+        console.log(colors.dim("\u2500".repeat(60)));
         console.log();
         logger.warning("If these secrets are still valid, rotate them immediately!");
         console.log();
         logger.dim("To remove secrets from git history, consider using:");
         logger.dim("  - git filter-branch");
         logger.dim("  - BFG Repo-Cleaner (https://rtyley.github.io/bfg-repo-cleaner/)");
-        prompts.outro(chalk12.red(`${results.length} commits with potential secrets`));
+        prompts.outro(colors.red(`${results.length} commits with potential secrets`));
       } catch (error) {
-        spinner2.stop("Scan failed");
+        spinner4.stop("Scan failed");
         throw error;
       }
     };
@@ -5527,7 +5695,7 @@ var init_secrets2 = __esm({
         logger.dim("Usage: tuck secrets scan <file> [files...]");
         return;
       }
-      const expandedPaths = paths.map((p2) => expandPath(p2));
+      const expandedPaths = paths.map((p4) => expandPath(p4));
       for (const path of expandedPaths) {
         if (!await pathExists(path)) {
           logger.warning(`File not found: ${path}`);
@@ -5543,10 +5711,10 @@ var init_secrets2 = __esm({
         logger.error("No valid files to scan");
         return;
       }
-      const spinner2 = prompts.spinner();
-      spinner2.start(`Scanning ${existingPaths.length} file(s)...`);
+      const spinner4 = prompts.spinner();
+      spinner4.start(`Scanning ${existingPaths.length} file(s)...`);
       const summary = await scanForSecrets(existingPaths, tuckDir);
-      spinner2.stop("Scan complete");
+      spinner4.stop("Scan complete");
       if (summary.filesWithSecrets === 0) {
         console.log();
         logger.success("No secrets detected");
@@ -5556,28 +5724,34 @@ var init_secrets2 = __esm({
     };
     displayScanResults = (summary) => {
       console.log();
-      console.log(chalk12.bold.red(`Found ${summary.totalSecrets} potential secret(s) in ${summary.filesWithSecrets} file(s)`));
-      console.log(chalk12.dim("\u2500".repeat(60)));
+      console.log(
+        colors.bold.red(
+          `Found ${summary.totalSecrets} potential secret(s) in ${summary.filesWithSecrets} file(s)`
+        )
+      );
+      console.log(colors.dim("\u2500".repeat(60)));
       console.log();
       if (summary.bySeverity.critical > 0) {
-        console.log(chalk12.red(`  Critical: ${summary.bySeverity.critical}`));
+        console.log(colors.red(`  Critical: ${summary.bySeverity.critical}`));
       }
       if (summary.bySeverity.high > 0) {
-        console.log(chalk12.yellow(`  High: ${summary.bySeverity.high}`));
+        console.log(colors.yellow(`  High: ${summary.bySeverity.high}`));
       }
       if (summary.bySeverity.medium > 0) {
-        console.log(chalk12.blue(`  Medium: ${summary.bySeverity.medium}`));
+        console.log(colors.blue(`  Medium: ${summary.bySeverity.medium}`));
       }
       if (summary.bySeverity.low > 0) {
-        console.log(chalk12.dim(`  Low: ${summary.bySeverity.low}`));
+        console.log(colors.dim(`  Low: ${summary.bySeverity.low}`));
       }
       console.log();
       for (const result of summary.results) {
-        console.log(chalk12.cyan(result.collapsedPath));
+        console.log(colors.cyan(result.collapsedPath));
         for (const match of result.matches) {
-          const severityColor = match.severity === "critical" ? chalk12.red : match.severity === "high" ? chalk12.yellow : match.severity === "medium" ? chalk12.blue : chalk12.dim;
-          console.log(`  ${chalk12.dim(`Line ${match.line}:`)} ${severityColor(`[${match.severity}]`)} ${match.patternName}`);
-          console.log(chalk12.dim(`    ${match.context}`));
+          const severityColor = match.severity === "critical" ? colors.red : match.severity === "high" ? colors.yellow : match.severity === "medium" ? colors.blue : colors.dim;
+          console.log(
+            `  ${colors.dim(`Line ${match.line}:`)} ${severityColor(`[${match.severity}]`)} ${match.patternName}`
+          );
+          console.log(colors.dim(`    ${match.context}`));
         }
         console.log();
       }
@@ -5590,9 +5764,7 @@ var init_secrets2 = __esm({
       new Command3("set").description("Set a secret value (prompts securely)").argument("<name>", "Secret name (e.g., GITHUB_TOKEN)").action(runSecretsSet)
     ).addCommand(
       new Command3("unset").description("Remove a secret").argument("<name>", "Secret name to remove").action(runSecretsUnset)
-    ).addCommand(
-      new Command3("path").description("Show path to secrets file").action(runSecretsPath)
-    ).addCommand(
+    ).addCommand(new Command3("path").description("Show path to secrets file").action(runSecretsPath)).addCommand(
       new Command3("scan").description("Scan files for secrets").argument("[paths...]", "Files to scan").action(runScanFiles)
     ).addCommand(
       new Command3("scan-history").description("Scan git history for leaked secrets").option("--since <date>", "Only scan commits after this date (e.g., 2024-01-01)").option("--limit <n>", "Maximum number of commits to scan", "50").action(runScanHistory)
@@ -5607,7 +5779,6 @@ __export(sync_exports, {
   syncCommand: () => syncCommand
 });
 import { Command as Command4 } from "commander";
-import chalk13 from "chalk";
 import { join as join12 } from "path";
 var detectChanges, pullIfBehind, detectNewDotfiles, generateCommitMessage, syncFiles, scanAndHandleSecrets, runInteractiveSync, pushWithSpinner, runSync, runSyncCommand, syncCommand;
 var init_sync = __esm({
@@ -5720,7 +5891,9 @@ var init_sync = __esm({
             changes.push(`\u2022 ${file}`);
           });
         } else {
-          changes.push(`${result.modified.length > 0 ? "\n" : ""}Deleted: ${result.deleted.length} files`);
+          changes.push(
+            `${result.modified.length > 0 ? "\n" : ""}Deleted: ${result.deleted.length} files`
+          );
         }
       }
       if (changes.length > 0) {
@@ -5794,14 +5967,14 @@ var init_sync = __esm({
       if (!scanningEnabled) {
         return true;
       }
-      const modifiedPaths = changes.filter((c) => c.status === "modified").map((c) => expandPath(c.source));
+      const modifiedPaths = changes.filter((c2) => c2.status === "modified").map((c2) => expandPath(c2.source));
       if (modifiedPaths.length === 0) {
         return true;
       }
-      const spinner2 = prompts.spinner();
-      spinner2.start("Scanning for secrets...");
+      const spinner4 = prompts.spinner();
+      spinner4.start("Scanning for secrets...");
       const summary = await scanForSecrets(modifiedPaths, tuckDir);
-      spinner2.stop("Scan complete");
+      spinner4.stop("Scan complete");
       if (summary.totalSecrets === 0) {
         return true;
       }
@@ -5817,14 +5990,18 @@ var init_sync = __esm({
       }
       if (action === "ignore") {
         for (const result of summary.results) {
-          const sourcePath = changes.find((c) => expandPath(c.source) === result.path)?.source;
+          const sourcePath = changes.find((c2) => expandPath(c2.source) === result.path)?.source;
           if (sourcePath) {
             await addToTuckignore(tuckDir, sourcePath);
             logger.dim(`Added ${collapsePath(result.path)} to .tuckignore`);
           }
         }
         const filesToRemove = new Set(summary.results.map((r) => r.path));
-        changes.splice(0, changes.length, ...changes.filter((c) => !filesToRemove.has(expandPath(c.source))));
+        changes.splice(
+          0,
+          changes.length,
+          ...changes.filter((c2) => !filesToRemove.has(expandPath(c2.source)))
+        );
         if (changes.length === 0) {
           prompts.log.info("No remaining changes to sync");
           return false;
@@ -5844,7 +6021,9 @@ var init_sync = __esm({
           pullSpinner.stop(`Could not pull: ${pullResult.error}`);
           prompts.log.warning("Continuing with local changes...");
         } else if (pullResult.pulled) {
-          pullSpinner.stop(`Pulled ${pullResult.behind} commit${pullResult.behind > 1 ? "s" : ""} from remote`);
+          pullSpinner.stop(
+            `Pulled ${pullResult.behind} commit${pullResult.behind > 1 ? "s" : ""} from remote`
+          );
         } else {
           pullSpinner.stop("Up to date with remote");
         }
@@ -5889,19 +6068,19 @@ var init_sync = __esm({
       }
       if (changes.length > 0) {
         console.log();
-        console.log(chalk13.bold("Changes to tracked files:"));
+        console.log(colors.bold("Changes to tracked files:"));
         for (const change of changes) {
           if (change.status === "modified") {
-            console.log(chalk13.yellow(`  ~ ${change.path}`));
+            console.log(colors.yellow(`  ~ ${change.path}`));
           } else if (change.status === "deleted") {
-            console.log(chalk13.red(`  - ${change.path}`));
+            console.log(colors.red(`  - ${change.path}`));
           }
         }
       }
       let filesToTrack = [];
       if (newFiles.length > 0) {
         console.log();
-        console.log(chalk13.bold(`New dotfiles found (${newFiles.length}):`));
+        console.log(colors.bold(`New dotfiles found (${newFiles.length}):`));
         const grouped = {};
         for (const file of newFiles) {
           if (!grouped[file.category]) grouped[file.category] = [];
@@ -5909,23 +6088,28 @@ var init_sync = __esm({
         }
         for (const [category, files] of Object.entries(grouped)) {
           const categoryInfo = DETECTION_CATEGORIES[category] || { icon: "-", name: category };
-          console.log(chalk13.cyan(`  ${categoryInfo.icon} ${categoryInfo.name}: ${files.length} file${files.length > 1 ? "s" : ""}`));
+          console.log(
+            colors.cyan(
+              `  ${categoryInfo.icon} ${categoryInfo.name}: ${files.length} file${files.length > 1 ? "s" : ""}`
+            )
+          );
         }
         console.log();
-        const trackNewFiles = await prompts.confirm("Would you like to track some of these new files?", true);
+        const trackNewFiles = await prompts.confirm(
+          "Would you like to track some of these new files?",
+          true
+        );
         if (trackNewFiles) {
           const selectOptions = newFiles.map((f) => ({
             value: f.path,
-            label: `${collapsePath(expandPath(f.path))}${f.sensitive ? chalk13.yellow(" [sensitive]") : ""}`,
+            label: `${collapsePath(expandPath(f.path))}${f.sensitive ? colors.yellow(" [sensitive]") : ""}`,
             hint: f.category
           }));
           const nonSensitiveFiles = newFiles.filter((f) => !f.sensitive);
           const initialValues = nonSensitiveFiles.map((f) => f.path);
-          const selected = await prompts.multiselect(
-            "Select files to track:",
-            selectOptions,
-            { initialValues }
-          );
+          const selected = await prompts.multiselect("Select files to track:", selectOptions, {
+            initialValues
+          });
           filesToTrack = selected.map((path) => ({ path }));
         }
       }
@@ -5945,12 +6129,12 @@ var init_sync = __esm({
       }
       if (largeFiles.length > 0) {
         console.log();
-        console.log(chalk13.yellow("Large files detected:"));
+        console.log(colors.yellow("Large files detected:"));
         for (const file of largeFiles) {
-          console.log(chalk13.yellow(`  ${file.path} (${file.size})`));
+          console.log(colors.yellow(`  ${file.path} (${file.size})`));
         }
         console.log();
-        console.log(chalk13.dim("GitHub has a 50MB warning and 100MB hard limit."));
+        console.log(colors.dim("GitHub has a 50MB warning and 100MB hard limit."));
         console.log();
         const hasBlockers = largeFiles.some((f) => f.sizeBytes >= SIZE_BLOCK_THRESHOLD);
         if (hasBlockers) {
@@ -5961,10 +6145,10 @@ var init_sync = __esm({
           ]);
           if (action === "ignore") {
             for (const file of largeFiles) {
-              const fullPath = changes.find((c) => c.path === file.path)?.source;
+              const fullPath = changes.find((c2) => c2.path === file.path)?.source;
               if (fullPath) {
                 await addToTuckignore(tuckDir, fullPath);
-                const index = changes.findIndex((c) => c.path === file.path);
+                const index = changes.findIndex((c2) => c2.path === file.path);
                 if (index > -1) changes.splice(index, 1);
               }
             }
@@ -5985,10 +6169,10 @@ var init_sync = __esm({
           ]);
           if (action === "ignore") {
             for (const file of largeFiles) {
-              const fullPath = changes.find((c) => c.path === file.path)?.source;
+              const fullPath = changes.find((c2) => c2.path === file.path)?.source;
               if (fullPath) {
                 await addToTuckignore(tuckDir, fullPath);
-                const index = changes.findIndex((c) => c.path === file.path);
+                const index = changes.findIndex((c2) => c2.path === file.path);
                 if (index > -1) changes.splice(index, 1);
               }
             }
@@ -6013,12 +6197,16 @@ var init_sync = __esm({
       let result = { modified: [], deleted: [] };
       if (changes.length > 0) {
         const message = options.message || generateCommitMessage({
-          modified: changes.filter((c) => c.status === "modified").map((c) => c.path),
-          deleted: changes.filter((c) => c.status === "deleted").map((c) => c.path)
+          modified: changes.filter((c2) => c2.status === "modified").map((c2) => c2.path),
+          deleted: changes.filter((c2) => c2.status === "deleted").map((c2) => c2.path)
         });
         console.log();
-        console.log(chalk13.dim("Commit message:"));
-        console.log(chalk13.cyan(message.split("\n").map((line) => `  ${line}`).join("\n")));
+        console.log(colors.dim("Commit message:"));
+        console.log(
+          colors.cyan(
+            message.split("\n").map((line) => `  ${line}`).join("\n")
+          )
+        );
         console.log();
         result = await syncFiles(tuckDir, changes, { ...options, message });
       } else if (filesToTrack.length > 0) {
@@ -6043,21 +6231,21 @@ var init_sync = __esm({
       }
     };
     pushWithSpinner = async (tuckDir, _options) => {
-      const spinner2 = prompts.spinner();
+      const spinner4 = prompts.spinner();
       try {
         const status = await getStatus(tuckDir);
         const needsUpstream = !status.tracking;
         const branch = status.branch;
-        spinner2.start("Pushing to remote...");
+        spinner4.start("Pushing to remote...");
         await push(tuckDir, {
           setUpstream: needsUpstream,
           branch: needsUpstream ? branch : void 0
         });
-        spinner2.stop("Pushed to remote");
+        spinner4.stop("Pushed to remote");
         return true;
       } catch (error) {
         const errorMsg = error instanceof Error ? error.message : String(error);
-        spinner2.stop(`Push failed: ${errorMsg}`);
+        spinner4.stop(`Push failed: ${errorMsg}`);
         prompts.log.warning("Run 'tuck push' to try again");
         return false;
       }
@@ -6090,7 +6278,7 @@ var init_sync = __esm({
       if (!options.force) {
         const scanningEnabled = await isSecretScanningEnabled(tuckDir);
         if (scanningEnabled) {
-          const modifiedPaths = changes.filter((c) => c.status === "modified").map((c) => expandPath(c.source));
+          const modifiedPaths = changes.filter((c2) => c2.status === "modified").map((c2) => expandPath(c2.source));
           if (modifiedPaths.length > 0) {
             const summary = await scanForSecrets(modifiedPaths, tuckDir);
             if (summary.totalSecrets > 0) {
@@ -6124,7 +6312,9 @@ var init_sync = __esm({
         }
       }
     };
-    syncCommand = new Command4("sync").description("Sync all dotfile changes (pull, detect changes, scan for new files, track, commit, push)").argument("[message]", "Commit message").option("-m, --message <msg>", "Commit message").option("--no-commit", "Stage changes but don't commit").option("--no-push", "Commit but don't push to remote").option("--no-pull", "Don't pull from remote first").option("--no-scan", "Don't scan for new dotfiles").option("--no-hooks", "Skip execution of pre/post sync hooks").option("--trust-hooks", "Trust and run hooks without confirmation (use with caution)").option("-f, --force", "Skip secret scanning (not recommended)").action(async (messageArg, options) => {
+    syncCommand = new Command4("sync").description(
+      "Sync all dotfile changes (pull, detect changes, scan for new files, track, commit, push)"
+    ).argument("[message]", "Commit message").option("-m, --message <msg>", "Commit message").option("--no-commit", "Stage changes but don't commit").option("--no-push", "Commit but don't push to remote").option("--no-pull", "Don't pull from remote first").option("--no-scan", "Don't scan for new dotfiles").option("--no-hooks", "Skip execution of pre/post sync hooks").option("--trust-hooks", "Trust and run hooks without confirmation (use with caution)").option("-f, --force", "Skip secret scanning (not recommended)").action(async (messageArg, options) => {
       await runSyncCommand(messageArg, options);
     });
   }
@@ -6132,7 +6322,7 @@ var init_sync = __esm({
 // src/index.ts
 import { Command as Command16 } from "commander";
-import chalk24 from "chalk";
+import chalk5 from "chalk";
 // src/commands/init.ts
 init_ui();
@@ -6150,7 +6340,6 @@ import { Command as Command2 } from "commander";
 import { join as join8 } from "path";
 import { writeFile as writeFile3 } from "fs/promises";
 import { ensureDir as ensureDir4 } from "fs-extra";
-import chalk11 from "chalk";
 import { copy as copy3 } from "fs-extra";
 import { tmpdir } from "os";
 import { readFile as readFile4, rm as rm2 } from "fs/promises";
@@ -6325,7 +6514,7 @@ var setupAlternativeAuth = async (tuckDir) => {
     const diagnosis = await diagnoseAuthIssue();
     prompts.log.warning(diagnosis.issue);
     for (const suggestion of diagnosis.suggestions) {
-      console.log(chalk11.dim(`  ${suggestion}`));
+      console.log(colors.muted(`  ${suggestion}`));
     }
     console.log();
   }
@@ -6395,7 +6584,7 @@ var setupAlternativeAuth = async (tuckDir) => {
       if (sshInfo.publicKey) {
         console.log();
         prompts.log.info("Your public key (copy this to GitHub):");
-        console.log(chalk11.cyan(sshInfo.publicKey));
+        console.log(colors.brand(sshInfo.publicKey));
         console.log();
       }
     }
@@ -6420,7 +6609,10 @@ var setupAlternativeAuth = async (tuckDir) => {
     return { remoteUrl: null, pushed: false };
   }
   if (authMethod === "fine-grained" || authMethod === "classic") {
-    return await setupTokenAuth(tuckDir, authMethod === "fine-grained" ? "fine-grained" : "classic");
+    return await setupTokenAuth(
+      tuckDir,
+      authMethod === "fine-grained" ? "fine-grained" : "classic"
+    );
   }
   return { remoteUrl: null, pushed: false };
 };
@@ -6481,7 +6673,9 @@ var setupTokenAuth = async (tuckDir, preferredType) => {
   const detectedType = detectTokenType(token);
   const finalType = detectedType !== "unknown" ? detectedType : tokenType;
   if (detectedType !== "unknown" && detectedType !== tokenType) {
-    prompts.log.info(`Detected ${detectedType === "fine-grained" ? "fine-grained" : "classic"} token`);
+    prompts.log.info(
+      `Detected ${detectedType === "fine-grained" ? "fine-grained" : "classic"} token`
+    );
   }
   const storeSpinner = prompts.spinner();
   storeSpinner.start("Storing credentials securely...");
@@ -6491,7 +6685,9 @@ var setupTokenAuth = async (tuckDir, preferredType) => {
     prompts.log.success("Authentication configured successfully");
   } catch (error) {
     storeSpinner.stop("Failed to store credentials");
-    prompts.log.warning(`Could not store credentials: ${error instanceof Error ? error.message : String(error)}`);
+    prompts.log.warning(
+      `Could not store credentials: ${error instanceof Error ? error.message : String(error)}`
+    );
     prompts.log.info("You may be prompted for credentials when pushing");
   }
   await configureGitCredentialHelper().catch((error) => {
@@ -6530,7 +6726,9 @@ var promptForManualRepoUrl = async (tuckDir, username, preferredProtocol = "http
     prompts.log.success("Remote configured");
     return { remoteUrl: repoUrl, pushed: false };
   } catch (error) {
-    prompts.log.error(`Failed to add remote: ${error instanceof Error ? error.message : String(error)}`);
+    prompts.log.error(
+      `Failed to add remote: ${error instanceof Error ? error.message : String(error)}`
+    );
     return { remoteUrl: null, pushed: false };
   }
 };
@@ -6576,7 +6774,9 @@ var setupGitHubRepo = async (tuckDir) => {
         return await setupAlternativeAuth(tuckDir);
       }
     } catch (error) {
-      prompts.log.warning(`Authentication failed: ${error instanceof Error ? error.message : String(error)}`);
+      prompts.log.warning(
+        `Authentication failed: ${error instanceof Error ? error.message : String(error)}`
+      );
       const useAlt = await prompts.confirm("Try alternative authentication?", true);
       if (useAlt) {
         return await setupAlternativeAuth(tuckDir);
@@ -6607,16 +6807,18 @@ var setupGitHubRepo = async (tuckDir) => {
   ]);
   let repo;
   try {
-    const spinner2 = prompts.spinner();
-    spinner2.start(`Creating repository ${user.login}/${repoName}...`);
+    const spinner4 = prompts.spinner();
+    spinner4.start(`Creating repository ${user.login}/${repoName}...`);
     repo = await createRepo({
       name: repoName,
       description: "My dotfiles managed with tuck",
       isPrivate: visibility === "private"
     });
-    spinner2.stop(`Repository created: ${repo.fullName}`);
+    spinner4.stop(`Repository created: ${repo.fullName}`);
   } catch (error) {
-    prompts.log.error(`Failed to create repository: ${error instanceof Error ? error.message : String(error)}`);
+    prompts.log.error(
+      `Failed to create repository: ${error instanceof Error ? error.message : String(error)}`
+    );
     return { remoteUrl: null, pushed: false };
   }
   const remoteUrl = await getPreferredRepoUrl(repo);
@@ -6625,14 +6827,14 @@ var setupGitHubRepo = async (tuckDir) => {
   const shouldPush = await prompts.confirm("Push initial commit to GitHub?", true);
   if (shouldPush) {
     try {
-      const spinner2 = prompts.spinner();
-      spinner2.start("Creating initial commit...");
+      const spinner4 = prompts.spinner();
+      spinner4.start("Creating initial commit...");
       await stageAll(tuckDir);
       await commit(tuckDir, "Initial commit: tuck dotfiles setup");
-      spinner2.stop("Initial commit created");
-      spinner2.start("Pushing to GitHub...");
+      spinner4.stop("Initial commit created");
+      spinner4.start("Pushing to GitHub...");
       await push(tuckDir, { remote: "origin", branch: "main", setUpstream: true });
-      spinner2.stop("Pushed to GitHub");
+      spinner4.stop("Pushed to GitHub");
       prompts.note(
         `Your dotfiles are now at:
 ${repo.url}
@@ -6643,7 +6845,9 @@ tuck apply ${user.login}`,
       );
       return { remoteUrl, pushed: true };
     } catch (error) {
-      prompts.log.error(`Failed to push: ${error instanceof Error ? error.message : String(error)}`);
+      prompts.log.error(
+        `Failed to push: ${error instanceof Error ? error.message : String(error)}`
+      );
       return { remoteUrl, pushed: false };
     }
   }
@@ -6685,7 +6889,9 @@ var analyzeRepository = async (repoDir) => {
       const categories = await readdir5(filesDir);
       for (const category of categories) {
         const categoryPath = join8(filesDir, category);
-        const categoryStats = await import("fs/promises").then((fs) => fs.stat(categoryPath).catch(() => null));
+        const categoryStats = await import("fs/promises").then(
+          (fs) => fs.stat(categoryPath).catch(() => null)
+        );
         if (categoryStats?.isDirectory()) {
           const files = await readdir5(categoryPath);
           foundFiles.push(...files);
@@ -6698,7 +6904,7 @@ var analyzeRepository = async (repoDir) => {
   try {
     const rootFiles = await readdir4(repoDir);
     for (const file of rootFiles) {
-      if (commonPatterns.some((p2) => file.includes(p2) || file.startsWith("."))) {
+      if (commonPatterns.some((p4) => file.includes(p4) || file.startsWith("."))) {
         foundFiles.push(file);
       }
     }
@@ -6730,10 +6936,10 @@ var importExistingRepo = async (tuckDir, repoName, analysis, repoDir) => {
   const remoteUrl = protocol === "ssh" ? `git@github.com:${repoName}.git` : `https://github.com/${repoName}.git`;
   if (analysis.type === "valid-tuck") {
     prompts.log.step("Importing tuck repository...");
-    const spinner2 = prompts.spinner();
-    spinner2.start("Copying repository...");
+    const spinner4 = prompts.spinner();
+    spinner4.start("Copying repository...");
     await copy3(repoDir, tuckDir, { overwrite: true });
-    spinner2.stop("Repository imported");
+    spinner4.stop("Repository imported");
     const fileCount = Object.keys(analysis.manifest.files).length;
     const grouped = {};
     for (const [_id, file] of Object.entries(analysis.manifest.files)) {
@@ -6746,7 +6952,11 @@ var importExistingRepo = async (tuckDir, repoName, analysis, repoDir) => {
     const { DETECTION_CATEGORIES: DETECTION_CATEGORIES2 } = await Promise.resolve().then(() => (init_detect(), detect_exports));
     for (const [category, files] of Object.entries(grouped)) {
       const categoryInfo = DETECTION_CATEGORIES2[category] || { icon: "-", name: category };
-      console.log(chalk11.cyan(`  ${categoryInfo.icon} ${categoryInfo.name}: ${files.length} file${files.length > 1 ? "s" : ""}`));
+      console.log(
+        colors.brand(
+          `  ${categoryInfo.icon} ${categoryInfo.name}: ${files.length} file${files.length > 1 ? "s" : ""}`
+        )
+      );
     }
     console.log();
     prompts.note(
@@ -6814,7 +7024,8 @@ var importExistingRepo = async (tuckDir, repoName, analysis, repoDir) => {
         let count = 0;
         const entries = await readdir4(dir);
         for (const entry of entries) {
-          if (entry === ".git" || entry === ".tuckmanifest.json" || entry === ".tuckrc.json") continue;
+          if (entry === ".git" || entry === ".tuckmanifest.json" || entry === ".tuckrc.json")
+            continue;
           const fullPath = join8(dir, entry);
           const stats = await stat11(fullPath).catch(() => null);
           if (stats?.isDirectory()) {
@@ -6868,7 +7079,9 @@ var importExistingRepo = async (tuckDir, repoName, analysis, repoDir) => {
   await addRemote(tuckDir, "origin", remoteUrl);
   if (action === "fresh") {
     prompts.log.info("Tuck initialized. When you push, it will replace the repository contents.");
-    prompts.log.info("Run 'tuck add' to track files, then 'tuck sync && tuck push --force' to update remote");
+    prompts.log.info(
+      "Run 'tuck add' to track files, then 'tuck sync && tuck push --force' to update remote"
+    );
   } else {
     prompts.log.info("Tuck initialized with remote configured");
     prompts.log.info("Run 'tuck add' to start tracking files");
@@ -6913,17 +7126,14 @@ var runInteractiveInit = async () => {
   const ghInstalled = await isGhInstalled();
   const ghAuth = ghInstalled && await isGhAuthenticated();
   if (ghAuth) {
-    const spinner2 = prompts.spinner();
-    spinner2.start("Checking for existing dotfiles repository on GitHub...");
+    const spinner4 = prompts.spinner();
+    spinner4.start("Checking for existing dotfiles repository on GitHub...");
     try {
       const user = await getAuthenticatedUser();
       const existingRepoName = await findDotfilesRepo(user.login);
       if (existingRepoName) {
-        spinner2.stop(`Found repository: ${existingRepoName}`);
-        const importRepo = await prompts.confirm(
-          `Import dotfiles from ${existingRepoName}?`,
-          true
-        );
+        spinner4.stop(`Found repository: ${existingRepoName}`);
+        const importRepo = await prompts.confirm(`Import dotfiles from ${existingRepoName}?`, true);
         if (importRepo) {
           const tempDir = join8(tmpdir(), `tuck-import-${Date.now()}`);
           const cloneSpinner = prompts.spinner();
@@ -6954,7 +7164,9 @@ var runInteractiveInit = async () => {
                 if (result.filesApplied > 0) {
                   prompts.log.info(`Applied ${result.filesApplied} files to your system`);
                 } else if (result.filesInRepo > 0) {
-                  prompts.log.info('Files are ready in ~/.tuck. Run "tuck restore" to apply them to your system');
+                  prompts.log.info(
+                    'Files are ready in ~/.tuck. Run "tuck restore" to apply them to your system'
+                  );
                 }
               } else {
                 prompts.log.success(`Tuck initialized with ${existingRepoName} as remote`);
@@ -6978,9 +7190,7 @@ var runInteractiveInit = async () => {
             } else if (phase === "importing") {
               prompts.log.warning(errorMessage);
             } else {
-              prompts.log.warning(
-                `Could not clone repository: ${errorMessage}`
-              );
+              prompts.log.warning(`Could not clone repository: ${errorMessage}`);
             }
             console.log();
             const useAsRemoteAnyway = await prompts.confirm(
@@ -7014,10 +7224,10 @@ var runInteractiveInit = async () => {
           skipExistingRepoQuestion = true;
         }
       } else {
-        spinner2.stop("No existing dotfiles repository found");
+        spinner4.stop("No existing dotfiles repository found");
       }
     } catch {
-      spinner2.stop("Could not check for existing repositories");
+      spinner4.stop("Could not check for existing repositories");
     }
   }
   if (!skipExistingRepoQuestion) {
@@ -7057,7 +7267,10 @@ var runInteractiveInit = async () => {
     console.log();
   }
   if (!remoteUrl) {
-    const wantsRemote = await prompts.confirm("Would you like to set up a remote repository?", true);
+    const wantsRemote = await prompts.confirm(
+      "Would you like to set up a remote repository?",
+      true
+    );
     if (wantsRemote) {
       const ghResult = await setupGitHubRepo(tuckDir);
       remoteUrl = ghResult.remoteUrl;
@@ -7147,7 +7360,7 @@ Example URLs:
         console.log();
         prompts.log.warning(`Found ${sensitiveFiles.length} sensitive file(s):`);
         for (const sf of sensitiveFiles) {
-          console.log(chalk11.yellow(`  ! ${collapsePath(sf.path)} - ${sf.description || sf.category}`));
+          console.log(colors.warning(`  ! ${collapsePath(sf.path)} - ${sf.description || sf.category}`));
         }
         console.log();
         const trackSensitive = await prompts.confirm(
@@ -7156,10 +7369,7 @@ Example URLs:
         );
         if (trackSensitive) {
           for (const sf of sensitiveFiles) {
-            const track = await prompts.confirm(
-              `Track ${collapsePath(sf.path)}?`,
-              false
-            );
+            const track = await prompts.confirm(`Track ${collapsePath(sf.path)}?`, false);
             if (track) {
               filesToTrack.push(sf.path);
             }
@@ -7177,7 +7387,7 @@ Example URLs:
     console.log();
     prompts.log.warning(`Found ${sensitiveFiles.length} sensitive file(s):`);
     for (const sf of sensitiveFiles) {
-      console.log(chalk11.yellow(`  ! ${collapsePath(sf.path)} - ${sf.description || sf.category}`));
+      console.log(colors.warning(`  ! ${collapsePath(sf.path)} - ${sf.description || sf.category}`));
     }
     console.log();
     const trackSensitive = await prompts.confirm(
@@ -7187,10 +7397,7 @@ Example URLs:
     if (trackSensitive) {
       const filesToTrack = [];
       for (const sf of sensitiveFiles) {
-        const track = await prompts.confirm(
-          `Track ${collapsePath(sf.path)}?`,
-          false
-        );
+        const track = await prompts.confirm(`Track ${collapsePath(sf.path)}?`, false);
         if (track) {
           filesToTrack.push(sf.path);
         }
@@ -7320,7 +7527,6 @@ init_constants();
 init_files();
 import { Command as Command5 } from "commander";
 import { basename as basename6 } from "path";
-import chalk14 from "chalk";
 // src/lib/binary.ts
 init_paths();
@@ -7533,13 +7739,10 @@ If you need to backup SSH keys, use a secure password manager.`
       logger.warning(
         `File ${path} is ${formatFileSize(sizeCheck.size)} (exceeds GitHub's 100MB limit)`
       );
-      const action = await prompts.select(
-        "How would you like to proceed?",
-        [
-          { value: "ignore", label: "Add to .tuckignore and skip" },
-          { value: "cancel", label: "Cancel operation" }
-        ]
-      );
+      const action = await prompts.select("How would you like to proceed?", [
+        { value: "ignore", label: "Add to .tuckignore and skip" },
+        { value: "cancel", label: "Cancel operation" }
+      ]);
       if (action === "ignore") {
         await addToTuckignore(tuckDir, collapsedPath);
         logger.success(`Added ${path} to .tuckignore`);
@@ -7552,14 +7755,11 @@ If you need to backup SSH keys, use a secure password manager.`
       logger.warning(
         `File ${path} is ${formatFileSize(sizeCheck.size)}. GitHub recommends files under 50MB.`
       );
-      const action = await prompts.select(
-        "How would you like to proceed?",
-        [
-          { value: "continue", label: "Track it anyway" },
-          { value: "ignore", label: "Add to .tuckignore and skip" },
-          { value: "cancel", label: "Cancel operation" }
-        ]
-      );
+      const action = await prompts.select("How would you like to proceed?", [
+        { value: "continue", label: "Track it anyway" },
+        { value: "ignore", label: "Add to .tuckignore and skip" },
+        { value: "cancel", label: "Cancel operation" }
+      ]);
       if (action === "ignore") {
         await addToTuckignore(tuckDir, collapsedPath);
         logger.success(`Added ${path} to .tuckignore`);
@@ -7599,14 +7799,16 @@ var addFiles = async (filesToAdd, tuckDir, options) => {
 };
 var displaySecretWarning = (summary) => {
   console.log();
-  console.log(chalk14.bold.red(`  Security Warning: Found ${summary.totalSecrets} potential secret(s)`));
+  console.log(
+    colors.error(colors.bold(`  Security Warning: Found ${summary.totalSecrets} potential secret(s)`))
+  );
   console.log();
   for (const result of summary.results) {
-    console.log(`  ${chalk14.cyan(result.collapsedPath)}`);
+    console.log(`  ${colors.brand(result.collapsedPath)}`);
     for (const match of result.matches) {
-      const severityColor = match.severity === "critical" ? chalk14.red : match.severity === "high" ? chalk14.yellow : match.severity === "medium" ? chalk14.blue : chalk14.dim;
+      const severityColor = match.severity === "critical" ? colors.error : match.severity === "high" ? colors.warning : match.severity === "medium" ? colors.info : colors.muted;
       console.log(
-        `    ${chalk14.dim(`Line ${match.line}:`)} ${match.redactedValue} ${severityColor(`[${match.severity}]`)}`
+        `    ${colors.muted(`Line ${match.line}:`)} ${match.redactedValue} ${severityColor(`[${match.severity}]`)}`
       );
     }
     console.log();
@@ -7678,7 +7880,7 @@ var handleSecretsDetected = async (summary, filesToAdd, tuckDir) => {
     }
     case "proceed": {
       const confirmed = await prompts.confirm(
-        chalk14.red("Are you SURE you want to track files containing secrets?"),
+        colors.error("Are you SURE you want to track files containing secrets?"),
         false
       );
       if (!confirmed) {
@@ -7908,7 +8110,6 @@ init_manifest();
 init_git();
 init_errors();
 import { Command as Command7 } from "commander";
-import chalk15 from "chalk";
 var runInteractivePush = async (tuckDir) => {
   prompts.intro("tuck push");
   const hasRemoteRepo = await hasRemote(tuckDir);
@@ -7937,13 +8138,13 @@ var runInteractivePush = async (tuckDir) => {
     return;
   }
   console.log();
-  console.log(chalk15.dim("Remote:"), remoteUrl);
-  console.log(chalk15.dim("Branch:"), branch);
+  console.log(colors.dim("Remote:"), remoteUrl);
+  console.log(colors.dim("Branch:"), branch);
   if (status.ahead > 0) {
-    console.log(chalk15.dim("Commits:"), chalk15.green(`\u2191 ${status.ahead} to push`));
+    console.log(colors.dim("Commits:"), colors.green(`\u2191 ${status.ahead} to push`));
   }
   if (status.behind > 0) {
-    console.log(chalk15.dim("Warning:"), chalk15.yellow(`\u2193 ${status.behind} commits behind remote`));
+    console.log(colors.dim("Warning:"), colors.yellow(`\u2193 ${status.behind} commits behind remote`));
     const pullFirst = await prompts.confirm("Pull changes first?", true);
     if (pullFirst) {
       prompts.log.info("Run 'tuck pull' first, then push");
@@ -7989,7 +8190,7 @@ var runInteractivePush = async (tuckDir) => {
       viewUrl = remoteUrl.replace("git@github.com:", "https://github.com/").replace(".git", "");
     }
     console.log();
-    console.log(chalk15.dim("View at:"), chalk15.cyan(viewUrl));
+    console.log(colors.dim("View at:"), colors.cyan(viewUrl));
   }
   prompts.outro("");
 };
@@ -8042,7 +8243,6 @@ init_manifest();
 init_git();
 init_errors();
 import { Command as Command8 } from "commander";
-import chalk16 from "chalk";
 var runInteractivePull = async (tuckDir) => {
   prompts.intro("tuck pull");
   const hasRemoteRepo = await hasRemote(tuckDir);
@@ -8058,23 +8258,23 @@ var runInteractivePull = async (tuckDir) => {
   const branch = await getCurrentBranch(tuckDir);
   const remoteUrl = await getRemoteUrl(tuckDir);
   console.log();
-  console.log(chalk16.dim("Remote:"), remoteUrl);
-  console.log(chalk16.dim("Branch:"), branch);
+  console.log(colors.dim("Remote:"), remoteUrl);
+  console.log(colors.dim("Branch:"), branch);
   if (status.behind === 0) {
     prompts.log.success("Already up to date");
     return;
   }
-  console.log(chalk16.dim("Commits:"), chalk16.yellow(`\u2193 ${status.behind} to pull`));
+  console.log(colors.dim("Commits:"), colors.yellow(`\u2193 ${status.behind} to pull`));
   if (status.ahead > 0) {
     console.log(
-      chalk16.dim("Note:"),
-      chalk16.yellow(`You also have ${status.ahead} local commit${status.ahead > 1 ? "s" : ""} to push`)
+      colors.dim("Note:"),
+      colors.yellow(`You also have ${status.ahead} local commit${status.ahead > 1 ? "s" : ""} to push`)
     );
   }
   if (status.modified.length > 0 || status.staged.length > 0) {
     console.log();
     prompts.log.warning("You have uncommitted changes");
-    console.log(chalk16.dim("Modified:"), status.modified.join(", "));
+    console.log(colors.dim("Modified:"), status.modified.join(", "));
     const continueAnyway = await prompts.confirm("Pull anyway? (may cause merge conflicts)");
     if (!continueAnyway) {
       prompts.cancel("Commit or stash your changes first with 'tuck sync'");
@@ -8128,6 +8328,7 @@ init_restore();
 // src/commands/status.ts
 init_ui();
+init_prompts();
 init_paths();
 init_manifest();
 init_git();
@@ -8136,8 +8337,9 @@ init_tuckignore();
 init_errors();
 init_constants();
 import { Command as Command9 } from "commander";
-import chalk17 from "chalk";
 import boxen2 from "boxen";
+import logSymbols5 from "log-symbols";
+import figures5 from "figures";
 var detectFileChanges = async (tuckDir) => {
   const files = await getAllTrackedFiles(tuckDir);
   const ignoredPaths = await loadTuckignore(tuckDir);
@@ -8217,44 +8419,50 @@ var getFullStatus = async (tuckDir) => {
     }
   };
 };
+var formatRemoteUrl = (url) => {
+  return url.replace(/^https?:\/\//, "").replace(/\.git$/, "").replace(/^github\.com\//, "");
+};
 var printStatus = (status) => {
   const headerLines = [
-    `${chalk17.bold.cyan("tuck")} ${chalk17.dim(`v${VERSION}`)}`,
+    `${colors.brandBold("tuck")} ${colors.muted(`v${VERSION}`)}`,
     "",
-    `${chalk17.dim("Repository:")} ${collapsePath(status.tuckDir)}`,
-    `${chalk17.dim("Branch:")}     ${chalk17.cyan(status.branch)}`
+    `${colors.muted("Repository:")} ${collapsePath(status.tuckDir)}`,
+    `${colors.muted("Branch:")}     ${colors.brand(status.branch)}`
   ];
   if (status.remote) {
-    const shortRemote = status.remote.length > 40 ? status.remote.replace(/^https?:\/\//, "").replace(/\.git$/, "") : status.remote;
-    headerLines.push(`${chalk17.dim("Remote:")}     ${shortRemote}`);
+    headerLines.push(`${colors.muted("Remote:")}     ${formatRemoteUrl(status.remote)}`);
   } else {
-    headerLines.push(`${chalk17.dim("Remote:")}     ${chalk17.yellow("not configured")}`);
+    headerLines.push(`${colors.muted("Remote:")}     ${colors.warning("not configured")}`);
   }
-  console.log(boxen2(headerLines.join("\n"), {
-    padding: { top: 0, bottom: 0, left: 1, right: 1 },
-    borderColor: "cyan",
-    borderStyle: "round"
-  }));
+  console.log(boxen2(headerLines.join("\n"), boxStyles.header));
   if (status.remote) {
-    let remoteInfo = "";
+    console.log();
     switch (status.remoteStatus) {
       case "up-to-date":
-        remoteInfo = chalk17.green("\u2713 Up to date with remote");
+        console.log(logSymbols5.success, colors.success("Up to date with remote"));
         break;
       case "ahead":
-        remoteInfo = chalk17.yellow(`\u2191 ${status.ahead} commit${status.ahead > 1 ? "s" : ""} ahead of remote`);
+        console.log(
+          colors.warning(figures5.arrowUp),
+          colors.warning(`${status.ahead} commit${status.ahead > 1 ? "s" : ""} ahead`)
+        );
         break;
       case "behind":
-        remoteInfo = chalk17.yellow(`\u2193 ${status.behind} commit${status.behind > 1 ? "s" : ""} behind remote`);
+        console.log(
+          colors.warning(figures5.arrowDown),
+          colors.warning(`${status.behind} commit${status.behind > 1 ? "s" : ""} behind`)
+        );
         break;
       case "diverged":
-        remoteInfo = chalk17.red(`\u26A0 Diverged (${status.ahead} ahead, ${status.behind} behind)`);
+        console.log(
+          logSymbols5.warning,
+          colors.error(`Diverged (${status.ahead} ahead, ${status.behind} behind)`)
+        );
         break;
     }
-    console.log("\n" + remoteInfo);
   }
   console.log();
-  console.log(chalk17.bold(`Tracked Files: ${status.trackedCount}`));
+  console.log(colors.bold(`${status.trackedCount} files tracked`));
   const categoryOrder = ["shell", "git", "editors", "terminal", "ssh", "misc"];
   const sortedCategories = Object.keys(status.categoryCounts).sort((a, b) => {
     const aIdx = categoryOrder.indexOf(a);
@@ -8265,66 +8473,74 @@ var printStatus = (status) => {
     return aIdx - bIdx;
   });
   if (sortedCategories.length > 0) {
-    for (const category of sortedCategories) {
-      const count = status.categoryCounts[category];
-      console.log(chalk17.dim(`  ${category}: ${count} file${count > 1 ? "s" : ""}`));
-    }
+    const categoryLine = sortedCategories.map((cat) => {
+      const style = categoryStyles[cat] || categoryStyles.misc;
+      const count = status.categoryCounts[cat];
+      return `${style.color(style.icon)} ${cat}: ${count}`;
+    }).join("  ");
+    console.log(colors.muted(indent() + categoryLine));
   }
   if (status.changes.length > 0) {
     console.log();
-    console.log(chalk17.bold("Changes detected:"));
+    console.log(colors.bold("Changes:"));
     for (const change of status.changes) {
       const statusText = formatStatus(change.status);
-      console.log(`  ${statusText}: ${chalk17.cyan(change.path)}`);
+      console.log(`${indent()}${statusText} ${colors.brand(change.path)}`);
     }
   }
   const hasGitChanges = status.gitChanges.staged.length > 0 || status.gitChanges.modified.length > 0 || status.gitChanges.untracked.length > 0;
   if (hasGitChanges) {
     console.log();
-    console.log(chalk17.bold("Repository changes:"));
+    console.log(colors.bold("Repository:"));
     if (status.gitChanges.staged.length > 0) {
-      console.log(chalk17.green("  Staged:"));
-      status.gitChanges.staged.forEach((f) => console.log(chalk17.green(`    + ${f}`)));
+      console.log(colors.success(`${indent()}Staged:`));
+      status.gitChanges.staged.forEach(
+        (f) => console.log(colors.success(`${indent()}${indent()}+ ${f}`))
+      );
     }
     if (status.gitChanges.modified.length > 0) {
-      console.log(chalk17.yellow("  Modified:"));
-      status.gitChanges.modified.forEach((f) => console.log(chalk17.yellow(`    ~ ${f}`)));
+      console.log(colors.warning(`${indent()}Modified:`));
+      status.gitChanges.modified.forEach(
+        (f) => console.log(colors.warning(`${indent()}${indent()}~ ${f}`))
+      );
     }
     if (status.gitChanges.untracked.length > 0) {
-      console.log(chalk17.dim("  Untracked:"));
-      status.gitChanges.untracked.forEach((f) => console.log(chalk17.dim(`    ? ${f}`)));
+      console.log(colors.muted(`${indent()}Untracked:`));
+      status.gitChanges.untracked.forEach(
+        (f) => console.log(colors.muted(`${indent()}${indent()}? ${f}`))
+      );
     }
   }
   console.log();
   if (status.changes.length > 0) {
-    prompts.note("Run 'tuck sync' to commit changes", "Next step");
+    prompts.note("Run 'tuck sync' to commit changes", "Next");
   } else if (status.remoteStatus === "ahead") {
-    prompts.note("Run 'tuck push' to push changes to remote", "Next step");
+    prompts.note("Run 'tuck push' to push changes", "Next");
   } else if (status.remoteStatus === "behind") {
-    prompts.note("Run 'tuck pull' to pull changes from remote", "Next step");
+    prompts.note("Run 'tuck pull' to pull changes", "Next");
   } else if (status.trackedCount === 0) {
-    prompts.note("Run 'tuck add <path>' to start tracking files", "Next step");
+    prompts.note("Run 'tuck add <path>' to start tracking", "Next");
   } else {
-    prompts.outro("Everything is up to date");
+    prompts.outro("Everything up to date");
   }
 };
 var printShortStatus = (status) => {
   const parts = [];
   parts.push(`[${status.branch}]`);
   if (status.remoteStatus === "ahead") {
-    parts.push(`\u2191${status.ahead}`);
+    parts.push(colors.warning(`${figures5.arrowUp}${status.ahead}`));
   } else if (status.remoteStatus === "behind") {
-    parts.push(`\u2193${status.behind}`);
+    parts.push(colors.warning(`${figures5.arrowDown}${status.behind}`));
   } else if (status.remoteStatus === "diverged") {
-    parts.push(`\u2191${status.ahead}\u2193${status.behind}`);
+    parts.push(colors.error(`${figures5.arrowUp}${status.ahead}${figures5.arrowDown}${status.behind}`));
   }
   if (status.changes.length > 0) {
-    const modified = status.changes.filter((c) => c.status === "modified").length;
-    const deleted = status.changes.filter((c) => c.status === "deleted").length;
-    if (modified > 0) parts.push(`~${modified}`);
-    if (deleted > 0) parts.push(`-${deleted}`);
+    const modified = status.changes.filter((ch) => ch.status === "modified").length;
+    const deleted = status.changes.filter((ch) => ch.status === "deleted").length;
+    if (modified > 0) parts.push(colors.warning(`~${modified}`));
+    if (deleted > 0) parts.push(colors.error(`-${deleted}`));
   }
-  parts.push(`(${status.trackedCount} tracked)`);
+  parts.push(colors.muted(`(${status.trackedCount} tracked)`));
   console.log(parts.join(" "));
 };
 var printJsonStatus = (status) => {
@@ -8357,7 +8573,6 @@ init_manifest();
 init_errors();
 init_constants();
 import { Command as Command10 } from "commander";
-import chalk18 from "chalk";
 var groupByCategory2 = async (tuckDir) => {
   const files = await getAllTrackedFiles(tuckDir);
   const groups = /* @__PURE__ */ new Map();
@@ -8396,15 +8611,15 @@ var printList = (groups) => {
     totalFiles += fileCount;
     console.log();
     console.log(
-      chalk18.bold(`${group2.icon} ${group2.name}`) + chalk18.dim(` (${formatCount(fileCount, "file")})`)
+      colors.bold(`${group2.icon} ${group2.name}`) + colors.dim(` (${formatCount(fileCount, "file")})`)
     );
     group2.files.forEach((file, index) => {
       const isLast = index === group2.files.length - 1;
       const prefix = isLast ? "\u2514\u2500\u2500 " : "\u251C\u2500\u2500 ";
       const name = file.source.split("/").pop() || file.source;
-      const arrow = chalk18.dim(" \u2192 ");
-      const dest = chalk18.dim(file.source);
-      console.log(chalk18.dim(prefix) + chalk18.cyan(name) + arrow + dest);
+      const arrow = colors.dim(" \u2192 ");
+      const dest = colors.dim(file.source);
+      console.log(colors.dim(prefix) + colors.cyan(name) + arrow + dest);
     });
   }
   console.log();
@@ -8465,9 +8680,15 @@ init_git();
 init_files();
 init_errors();
 import { Command as Command11 } from "commander";
-import chalk19 from "chalk";
 import { join as join14 } from "path";
+init_tuckignore();
 import { readFile as readFile9 } from "fs/promises";
+var isBinary = async (path) => {
+  if (!await pathExists(path)) {
+    return false;
+  }
+  return await isBinaryExecutable(path);
+};
 var getFileDiff = async (tuckDir, source) => {
   const tracked = await getTrackedFileBySource(tuckDir, source);
   if (!tracked) {
@@ -8483,15 +8704,60 @@ var getFileDiff = async (tuckDir, source) => {
   if (!await pathExists(systemPath)) {
     diff.hasChanges = true;
     if (await pathExists(repoPath)) {
-      diff.repoContent = await readFile9(repoPath, "utf-8");
+      const repoContent = await readFile9(repoPath, "utf-8");
+      diff.repoContent = repoContent;
+      diff.repoSize = repoContent.length;
     }
     return diff;
   }
   if (!await pathExists(repoPath)) {
     diff.hasChanges = true;
-    diff.systemContent = await readFile9(systemPath, "utf-8");
+    const systemContent = await readFile9(systemPath, "utf-8");
+    diff.systemContent = systemContent;
+    diff.systemSize = systemContent.length;
     return diff;
   }
+  const systemIsBinary = await isBinary(systemPath);
+  const repoIsBinary = await isBinary(repoPath);
+  if (systemIsBinary || repoIsBinary) {
+    diff.isBinary = true;
+    try {
+      const systemBuffer = await readFile9(systemPath);
+      diff.systemSize = systemBuffer.length;
+    } catch {
+    }
+    try {
+      const repoBuffer = await readFile9(repoPath);
+      diff.repoSize = repoBuffer.length;
+    } catch {
+    }
+    const systemChecksum2 = await getFileChecksum(systemPath);
+    const repoChecksum2 = await getFileChecksum(repoPath);
+    diff.hasChanges = systemChecksum2 !== repoChecksum2;
+    return diff;
+  }
+  const systemIsDir = await isDirectory(systemPath);
+  const repoIsDir = await isDirectory(repoPath);
+  if (systemIsDir || repoIsDir) {
+    diff.isDirectory = true;
+    diff.hasChanges = true;
+    if (systemIsDir) {
+      const files = await getDirectoryFiles(systemPath);
+      diff.fileCount = files.length;
+    }
+    if (repoIsDir) {
+      const files = await getDirectoryFiles(repoPath);
+      diff.fileCount = (diff.fileCount || 0) + files.length;
+    }
+    return diff;
+  }
+  try {
+    const systemSizeCheck = await checkFileSizeThreshold(systemPath);
+    const repoSizeCheck = await checkFileSizeThreshold(repoPath);
+    diff.systemSize = systemSizeCheck.size;
+    diff.repoSize = repoSizeCheck.size;
+  } catch {
+  }
   const systemChecksum = await getFileChecksum(systemPath);
   const repoChecksum = await getFileChecksum(repoPath);
   if (systemChecksum !== repoChecksum) {
@@ -8501,28 +8767,45 @@ var getFileDiff = async (tuckDir, source) => {
   }
   return diff;
 };
-var formatUnifiedDiff = (source, systemContent, repoContent) => {
+var formatUnifiedDiff = (diff) => {
   const lines = [];
-  lines.push(chalk19.bold(`--- a/${source} (system)`));
-  lines.push(chalk19.bold(`+++ b/${source} (repository)`));
+  lines.push(colors.bold(`--- a/${diff.source} (system)`));
+  lines.push(colors.bold(`+++ b/${diff.source} (repository)`));
+  if (diff.isBinary) {
+    const sysSize = diff.systemSize ? formatFileSize(diff.systemSize) : "0 B";
+    const repoSize = diff.repoSize ? formatFileSize(diff.repoSize) : "0 B";
+    lines.push(colors.dim("Binary files differ"));
+    lines.push(colors.dim(`  System:  ${sysSize}`));
+    lines.push(colors.dim(`  Repo:    ${repoSize}`));
+    return lines.join("\n");
+  }
+  if (diff.isDirectory) {
+    const fileCount = diff.fileCount || 0;
+    lines.push(colors.dim("Directory content changed"));
+    lines.push(colors.dim(`  Contains ${fileCount} file${fileCount > 1 ? "s" : ""}`));
+    return lines.join("\n");
+  }
+  const { systemContent, repoContent } = diff;
   if (!systemContent && repoContent) {
-    lines.push(chalk19.red("File missing on system"));
-    lines.push(chalk19.dim("Repository content:"));
+    lines.push(colors.red("File missing on system"));
+    lines.push(colors.dim("Repository content:"));
     repoContent.split("\n").forEach((line) => {
-      lines.push(chalk19.green(`+ ${line}`));
+      lines.push(colors.green(`+ ${line}`));
     });
   } else if (systemContent && !repoContent) {
-    lines.push(chalk19.yellow("File not yet synced to repository"));
-    lines.push(chalk19.dim("System content:"));
+    lines.push(colors.yellow("File not yet synced to repository"));
+    lines.push(colors.dim("System content:"));
     systemContent.split("\n").forEach((line) => {
-      lines.push(chalk19.red(`- ${line}`));
+      lines.push(colors.red(`- ${line}`));
     });
   } else if (systemContent && repoContent) {
+    const CONTEXT_LINES = 3;
     const systemLines = systemContent.split("\n");
     const repoLines = repoContent.split("\n");
     const maxLines = Math.max(systemLines.length, repoLines.length);
     let inDiff = false;
     let diffStart = 0;
+    let contextCount = 0;
     for (let i = 0; i < maxLines; i++) {
       const sysLine = systemLines[i];
       const repoLine = repoLines[i];
@@ -8530,17 +8813,25 @@ var formatUnifiedDiff = (source, systemContent, repoContent) => {
         if (!inDiff) {
           inDiff = true;
           diffStart = i;
-          lines.push(chalk19.cyan(`@@ -${i + 1} +${i + 1} @@`));
+          const startLine = Math.max(0, diffStart - CONTEXT_LINES + 1);
+          const endLine = Math.min(maxLines, diffStart + CONTEXT_LINES);
+          lines.push(
+            colors.cyan(
+              `@@ -${startLine + 1},${endLine - startLine} +${startLine + 1},${endLine - startLine} @@`
+            )
+          );
         }
         if (sysLine !== void 0) {
-          lines.push(chalk19.red(`- ${sysLine}`));
+          lines.push(colors.red(`- ${sysLine}`));
         }
         if (repoLine !== void 0) {
-          lines.push(chalk19.green(`+ ${repoLine}`));
+          lines.push(colors.green(`+ ${repoLine}`));
         }
+        contextCount = 0;
       } else if (inDiff) {
-        lines.push(chalk19.dim(`  ${sysLine || ""}`));
-        if (i - diffStart > 3) {
+        lines.push(colors.dim(`  ${sysLine || ""}`));
+        contextCount++;
+        if (contextCount > CONTEXT_LINES * 2) {
           inDiff = false;
         }
       }
@@ -8564,54 +8855,77 @@ var runDiff = async (paths, options) => {
     }
     return;
   }
-  if (paths.length === 0) {
-    const allFiles = await getAllTrackedFiles(tuckDir);
-    const changedFiles = [];
-    for (const [, file] of Object.entries(allFiles)) {
+  const allFiles = await getAllTrackedFiles(tuckDir);
+  const changedFiles = [];
+  const filesToCheck = paths.length === 0 ? Object.values(allFiles) : paths.map((path) => {
+    const expandedPath = expandPath(path);
+    const collapsedPath = collapsePath(expandedPath);
+    const tracked = Object.entries(allFiles).find(([, f]) => f.source === collapsedPath);
+    if (!tracked) {
+      throw new FileNotFoundError(`Not tracked: ${path}`);
+    }
+    return tracked[1];
+  });
+  for (const file of filesToCheck) {
+    if (options.category && file.category !== options.category) {
+      continue;
+    }
+    if (await isIgnored(tuckDir, file.source)) {
+      continue;
+    }
+    try {
       const diff = await getFileDiff(tuckDir, file.source);
-      if (diff.hasChanges) {
+      if (diff && diff.hasChanges) {
         changedFiles.push(diff);
       }
+    } catch (error) {
+      if (error instanceof FileNotFoundError) {
+        logger.warning(`File not found: ${file.source}`);
+      } else if (error instanceof PermissionError) {
+        logger.warning(`Permission denied: ${file.source}`);
+      } else {
+        throw error;
+      }
     }
-    if (changedFiles.length === 0) {
+  }
+  if (changedFiles.length === 0) {
+    if (paths.length > 0) {
       logger.success("No differences found");
-      return;
-    }
-    if (options.stat) {
+    } else {
       prompts.intro("tuck diff");
       console.log();
-      console.log(chalk19.bold(`${changedFiles.length} file${changedFiles.length > 1 ? "s" : ""} changed:`));
-      console.log();
-      for (const diff of changedFiles) {
-        console.log(chalk19.yellow(`  ~ ${diff.source}`));
-      }
+      logger.success("No differences found");
       console.log();
-      return;
     }
+    return;
+  }
+  prompts.intro("tuck diff");
+  console.log();
+  if (options.stat || options.nameOnly) {
+    const label = options.nameOnly ? "Changed files:" : `${changedFiles.length} file${changedFiles.length > 1 ? "s" : ""} changed:`;
+    console.log(colors.bold(label));
+    console.log();
     for (const diff of changedFiles) {
-      console.log();
-      console.log(formatUnifiedDiff(diff.source, diff.systemContent, diff.repoContent));
-      console.log();
+      const status = diff.isDirectory ? colors.dim("[dir]") : diff.isBinary ? colors.dim("[bin]") : "";
+      console.log(`  ${colors.yellow("~")} ${diff.source} ${status}`);
     }
+    console.log();
+    prompts.outro(`Found ${changedFiles.length} changed file(s)`);
     return;
   }
-  for (const path of paths) {
-    const expandedPath = expandPath(path);
-    const collapsedPath = collapsePath(expandedPath);
-    const diff = await getFileDiff(tuckDir, collapsedPath);
-    if (!diff.hasChanges) {
-      logger.info(`No changes: ${path}`);
-      continue;
-    }
-    if (options.stat) {
-      console.log(chalk19.yellow(`~ ${path}`));
-    } else {
-      console.log(formatUnifiedDiff(path, diff.systemContent, diff.repoContent));
-      console.log();
-    }
+  for (const diff of changedFiles) {
+    console.log(formatUnifiedDiff(diff));
+    console.log();
+  }
+  prompts.outro(`Found ${changedFiles.length} changed file(s)`);
+  if (options.exitCode) {
+    process.exit(1);
   }
 };
-var diffCommand = new Command11("diff").description("Show differences between system and repository").argument("[paths...]", "Specific files to diff").option("--staged", "Show staged git changes").option("--stat", "Show diffstat only").action(async (paths, options) => {
+var diffCommand = new Command11("diff").description("Show differences between system and repository").argument("[paths...]", "Specific files to diff").option("--staged", "Show staged git changes").option("--stat", "Show diffstat only").option(
+  "--category <category>",
+  "Filter by file category (shell, git, editors, terminal, ssh, misc)"
+).option("--name-only", "Show only changed file names").option("--exit-code", "Return exit code 1 if differences found").action(async (paths, options) => {
   await runDiff(paths, options);
 });
@@ -8622,41 +8936,106 @@ init_config();
 init_manifest();
 init_errors();
 import { Command as Command12 } from "commander";
-import chalk20 from "chalk";
 import { spawn } from "child_process";
 var CONFIG_KEYS = [
   // Repository settings
-  { path: "repository.defaultBranch", type: "string", description: "Default git branch name", section: "repository" },
-  { path: "repository.autoCommit", type: "boolean", description: "Auto-commit changes on sync", section: "repository" },
-  { path: "repository.autoPush", type: "boolean", description: "Auto-push after commit", section: "repository" },
+  {
+    path: "repository.defaultBranch",
+    type: "string",
+    description: "Default git branch name",
+    section: "repository"
+  },
+  {
+    path: "repository.autoCommit",
+    type: "boolean",
+    description: "Auto-commit changes on sync",
+    section: "repository"
+  },
+  {
+    path: "repository.autoPush",
+    type: "boolean",
+    description: "Auto-push after commit",
+    section: "repository"
+  },
   // File settings
-  { path: "files.strategy", type: "enum", description: "File copy strategy", section: "files", options: ["copy", "symlink"] },
-  { path: "files.backupOnRestore", type: "boolean", description: "Create backups before restore", section: "files" },
-  { path: "files.backupDir", type: "string", description: "Backup directory path", section: "files" },
+  {
+    path: "files.strategy",
+    type: "enum",
+    description: "File copy strategy",
+    section: "files",
+    options: ["copy", "symlink"]
+  },
+  {
+    path: "files.backupOnRestore",
+    type: "boolean",
+    description: "Create backups before restore",
+    section: "files"
+  },
+  {
+    path: "files.backupDir",
+    type: "string",
+    description: "Backup directory path",
+    section: "files"
+  },
   // UI settings
   { path: "ui.colors", type: "boolean", description: "Enable colored output", section: "ui" },
   { path: "ui.emoji", type: "boolean", description: "Enable emoji in output", section: "ui" },
   { path: "ui.verbose", type: "boolean", description: "Enable verbose logging", section: "ui" },
   // Hook settings
-  { path: "hooks.preSync", type: "string", description: "Command to run before sync", section: "hooks" },
-  { path: "hooks.postSync", type: "string", description: "Command to run after sync", section: "hooks" },
-  { path: "hooks.preRestore", type: "string", description: "Command to run before restore", section: "hooks" },
-  { path: "hooks.postRestore", type: "string", description: "Command to run after restore", section: "hooks" },
+  {
+    path: "hooks.preSync",
+    type: "string",
+    description: "Command to run before sync",
+    section: "hooks"
+  },
+  {
+    path: "hooks.postSync",
+    type: "string",
+    description: "Command to run after sync",
+    section: "hooks"
+  },
+  {
+    path: "hooks.preRestore",
+    type: "string",
+    description: "Command to run before restore",
+    section: "hooks"
+  },
+  {
+    path: "hooks.postRestore",
+    type: "string",
+    description: "Command to run after restore",
+    section: "hooks"
+  },
   // Template settings
-  { path: "templates.enabled", type: "boolean", description: "Enable template processing", section: "templates" },
+  {
+    path: "templates.enabled",
+    type: "boolean",
+    description: "Enable template processing",
+    section: "templates"
+  },
   // Encryption settings
-  { path: "encryption.enabled", type: "boolean", description: "Enable file encryption", section: "encryption" },
-  { path: "encryption.gpgKey", type: "string", description: "GPG key for encryption", section: "encryption" }
+  {
+    path: "encryption.enabled",
+    type: "boolean",
+    description: "Enable file encryption",
+    section: "encryption"
+  },
+  {
+    path: "encryption.gpgKey",
+    type: "string",
+    description: "GPG key for encryption",
+    section: "encryption"
+  }
 ];
 var getKeyInfo = (path) => {
   return CONFIG_KEYS.find((k) => k.path === path);
 };
 var formatConfigValue = (value) => {
-  if (value === void 0 || value === null) return chalk20.dim("(not set)");
-  if (typeof value === "boolean") return value ? chalk20.green("true") : chalk20.yellow("false");
-  if (Array.isArray(value)) return value.length ? chalk20.cyan(value.join(", ")) : chalk20.dim("[]");
-  if (typeof value === "object") return chalk20.dim(JSON.stringify(value));
-  return chalk20.white(String(value));
+  if (value === void 0 || value === null) return colors.dim("(not set)");
+  if (typeof value === "boolean") return value ? colors.green("true") : colors.yellow("false");
+  if (Array.isArray(value)) return value.length ? colors.cyan(value.join(", ")) : colors.dim("[]");
+  if (typeof value === "object") return colors.dim(JSON.stringify(value));
+  return colors.white(String(value));
 };
 var printConfig = (config) => {
   console.log(JSON.stringify(config, null, 2));
@@ -8722,7 +9101,7 @@ var runConfigList = async () => {
   const config = await loadConfig(tuckDir);
   prompts.intro("tuck config");
   console.log();
-  console.log(chalk20.dim("Configuration file:"), collapsePath(getConfigPath(tuckDir)));
+  console.log(colors.dim("Configuration file:"), collapsePath(getConfigPath(tuckDir)));
   console.log();
   printConfig(config);
 };
@@ -8750,7 +9129,10 @@ var runConfigEdit = async () => {
 };
 var runConfigReset = async () => {
   const tuckDir = getTuckDir();
-  const confirm2 = await prompts.confirm("Reset configuration to defaults? This cannot be undone.", false);
+  const confirm2 = await prompts.confirm(
+    "Reset configuration to defaults? This cannot be undone.",
+    false
+  );
   if (!confirm2) {
     prompts.cancel("Operation cancelled");
     return;
@@ -8771,15 +9153,15 @@ var showConfigView = async (config) => {
   for (const section of sections) {
     const sectionConfig = configObj[section.key];
     if (!sectionConfig || typeof sectionConfig !== "object") continue;
-    console.log(chalk20.bold.cyan(`${section.icon} ${section.title}`));
-    console.log(chalk20.dim("-".repeat(40)));
+    console.log(colors.bold.cyan(`${section.icon} ${section.title}`));
+    console.log(colors.dim("-".repeat(40)));
     for (const [key, value] of Object.entries(sectionConfig)) {
       const keyInfo = getKeyInfo(`${section.key}.${key}`);
       const displayValue = formatConfigValue(value);
       const description = keyInfo?.description || "";
-      console.log(`  ${chalk20.white(key)}: ${displayValue}`);
+      console.log(`  ${colors.white(key)}: ${displayValue}`);
       if (description) {
-        console.log(chalk20.dim(`    ${description}`));
+        console.log(colors.dim(`    ${description}`));
       }
     }
     console.log();
@@ -8788,7 +9170,7 @@ var showConfigView = async (config) => {
 var runConfigWizard = async (config, tuckDir) => {
   prompts.log.info("Let's configure tuck for your workflow");
   console.log();
-  console.log(chalk20.bold.cyan("* Repository Behavior"));
+  console.log(colors.bold.cyan("* Repository Behavior"));
   const autoCommit = await prompts.confirm(
     "Auto-commit changes when running sync?",
     config.repository.autoCommit ?? true
@@ -8798,7 +9180,7 @@ var runConfigWizard = async (config, tuckDir) => {
     config.repository.autoPush ?? false
   );
   console.log();
-  console.log(chalk20.bold.cyan("> File Strategy"));
+  console.log(colors.bold.cyan("> File Strategy"));
   const rawStrategy = await prompts.select("How should tuck manage files?", [
     { value: "copy", label: "Copy files", hint: "Safe, independent copies" },
     { value: "symlink", label: "Symlink files", hint: "Real-time updates, single source of truth" }
@@ -8809,8 +9191,8 @@ var runConfigWizard = async (config, tuckDir) => {
     config.files.backupOnRestore ?? true
   );
   console.log();
-  console.log(chalk20.bold.cyan("# User Interface"));
-  const colors = await prompts.confirm("Enable colored output?", config.ui.colors ?? true);
+  console.log(colors.bold.cyan("# User Interface"));
+  const colors2 = await prompts.confirm("Enable colored output?", config.ui.colors ?? true);
   const emoji = await prompts.confirm("Enable emoji in output?", config.ui.emoji ?? true);
   const verbose = await prompts.confirm("Enable verbose logging?", config.ui.verbose ?? false);
   const updatedConfig = {
@@ -8826,7 +9208,7 @@ var runConfigWizard = async (config, tuckDir) => {
       backupOnRestore
     },
     ui: {
-      colors,
+      colors: colors2,
       emoji,
       verbose
     }
@@ -8979,7 +9361,6 @@ import { join as join16 } from "path";
 import { readFile as readFile12, rm as rm4, chmod as chmod3, stat as stat10 } from "fs/promises";
 import { ensureDir as ensureDir7, pathExists as fsPathExists } from "fs-extra";
 import { tmpdir as tmpdir2 } from "os";
-import chalk21 from "chalk";
 // src/lib/timemachine.ts
 init_paths();
@@ -9537,7 +9918,10 @@ var applyWithMerge = async (files, dryRun) => {
     if (isShellFile(file.source) && await pathExists(file.destination)) {
       const mergeResult = await smartMerge(file.destination, fileContent);
       if (dryRun) {
-        logger.file("merge", `${collapsePath(file.destination)} (${mergeResult.preservedBlocks} blocks preserved)`);
+        logger.file(
+          "merge",
+          `${collapsePath(file.destination)} (${mergeResult.preservedBlocks} blocks preserved)`
+        );
       } else {
         const { writeFile: writeFile8 } = await import("fs/promises");
         const { ensureDir: ensureDir8 } = await import("fs-extra");
@@ -9557,10 +9941,7 @@ var applyWithMerge = async (files, dryRun) => {
         const fileExists = await pathExists(file.destination);
         await copyFileOrDir(file.repoPath, file.destination, { overwrite: true });
         await fixSecurePermissions(file.destination);
-        logger.file(
-          fileExists ? "modify" : "add",
-          collapsePath(file.destination)
-        );
+        logger.file(fileExists ? "modify" : "add", collapsePath(file.destination));
       }
     }
     result.appliedCount++;
@@ -9591,10 +9972,7 @@ var applyWithReplace = async (files, dryRun) => {
       const fileExists = await pathExists(file.destination);
       await copyFileOrDir(file.repoPath, file.destination, { overwrite: true });
       await fixSecurePermissions(file.destination);
-      logger.file(
-        fileExists ? "modify" : "add",
-        collapsePath(file.destination)
-      );
+      logger.file(fileExists ? "modify" : "add", collapsePath(file.destination));
     }
     result.appliedCount++;
   }
@@ -9603,14 +9981,14 @@ var applyWithReplace = async (files, dryRun) => {
 var displayPlaceholderWarnings = (filesWithPlaceholders) => {
   if (filesWithPlaceholders.length === 0) return;
   console.log();
-  console.log(chalk21.yellow("\u26A0 Warning: Some files contain unresolved placeholders:"));
+  console.log(colors.yellow("\u26A0 Warning: Some files contain unresolved placeholders:"));
   console.log();
   for (const { path, placeholders } of filesWithPlaceholders) {
-    console.log(chalk21.dim(`  ${path}:`));
+    console.log(colors.dim(`  ${path}:`));
     const maxToShow = 5;
     if (placeholders.length <= maxToShow) {
       for (const placeholder of placeholders) {
-        console.log(chalk21.yellow(`    {{${placeholder}}}`));
+        console.log(colors.yellow(`    {{${placeholder}}}`));
       }
     } else {
       const firstCount = 3;
@@ -9618,23 +9996,23 @@ var displayPlaceholderWarnings = (filesWithPlaceholders) => {
       const firstPlaceholders = placeholders.slice(0, firstCount);
       const lastPlaceholders = placeholders.slice(-lastCount);
       for (const placeholder of firstPlaceholders) {
-        console.log(chalk21.yellow(`    {{${placeholder}}}`));
+        console.log(colors.yellow(`    {{${placeholder}}}`));
       }
-      console.log(chalk21.dim("    ..."));
+      console.log(colors.dim("    ..."));
       for (const placeholder of lastPlaceholders) {
-        console.log(chalk21.yellow(`    {{${placeholder}}}`));
+        console.log(colors.yellow(`    {{${placeholder}}}`));
       }
       const shownCount = firstPlaceholders.length + lastPlaceholders.length;
       const hiddenCount = placeholders.length - shownCount;
       if (hiddenCount > 0) {
-        console.log(chalk21.dim(`    ... and ${hiddenCount} more not shown`));
+        console.log(colors.dim(`    ... and ${hiddenCount} more not shown`));
       }
     }
   }
   console.log();
-  console.log(chalk21.dim("  These placeholders need to be replaced with actual values."));
-  console.log(chalk21.dim("  Use `tuck secrets set <NAME> <value>` to configure secrets,"));
-  console.log(chalk21.dim("  then re-apply to populate them."));
+  console.log(colors.dim("  These placeholders need to be replaced with actual values."));
+  console.log(colors.dim("  Use `tuck secrets set <NAME> <value>` to configure secrets,"));
+  console.log(colors.dim("  then re-apply to populate them."));
 };
 var runInteractiveApply = async (source, options) => {
   banner();
@@ -9651,10 +10029,10 @@ var runInteractiveApply = async (source, options) => {
   }
   let repoDir;
   try {
-    const spinner2 = prompts.spinner();
-    spinner2.start("Cloning repository...");
+    const spinner4 = prompts.spinner();
+    spinner4.start("Cloning repository...");
     repoDir = await cloneSource(repoId, isUrl);
-    spinner2.stop("Repository cloned");
+    spinner4.stop("Repository cloned");
   } catch (error) {
     prompts.log.error(`Failed to clone: ${error instanceof Error ? error.message : String(error)}`);
     return;
@@ -9685,11 +10063,11 @@ var runInteractiveApply = async (source, options) => {
     }
     for (const [category, categoryFiles] of Object.entries(byCategory)) {
       const categoryConfig = CATEGORIES[category] || { icon: "\u{1F4C4}" };
-      console.log(chalk21.bold(`  ${categoryConfig.icon} ${category}`));
+      console.log(colors.bold(`  ${categoryConfig.icon} ${category}`));
       for (const file of categoryFiles) {
         const exists = await pathExists(file.destination);
-        const status = exists ? chalk21.yellow("(will update)") : chalk21.green("(new)");
-        console.log(chalk21.dim(`    ${collapsePath(file.destination)} ${status}`));
+        const status = exists ? colors.yellow("(will update)") : colors.green("(new)");
+        console.log(colors.dim(`    ${collapsePath(file.destination)} ${status}`));
       }
     }
     console.log();
@@ -9746,10 +10124,10 @@ var runInteractiveApply = async (source, options) => {
       }
     }
     if (existingPaths.length > 0 && !options.dryRun) {
-      const spinner2 = prompts.spinner();
-      spinner2.start("Creating backup snapshot...");
+      const spinner4 = prompts.spinner();
+      spinner4.start("Creating backup snapshot...");
       const snapshot = await createPreApplySnapshot(existingPaths, repoId);
-      spinner2.stop(`Backup created: ${snapshot.id}`);
+      spinner4.stop(`Backup created: ${snapshot.id}`);
       console.log();
     }
     if (options.dryRun) {
@@ -9855,7 +10233,6 @@ var applyCommand = new Command13("apply").description("Apply dotfiles from a rep
 init_ui();
 init_paths();
 import { Command as Command14 } from "commander";
-import chalk22 from "chalk";
 var showSnapshotList = async () => {
   const snapshots = await listSnapshots();
   if (snapshots.length === 0) {
@@ -9868,11 +10245,11 @@ var showSnapshotList = async () => {
   for (const snapshot of snapshots) {
     const date = formatSnapshotDate(snapshot.id);
     const fileCount = snapshot.files.filter((f) => f.existed).length;
-    console.log(chalk22.cyan(`  ${snapshot.id}`));
-    console.log(chalk22.dim(`    Date:    ${date}`));
-    console.log(chalk22.dim(`    Reason:  ${snapshot.reason}`));
-    console.log(chalk22.dim(`    Files:   ${fileCount} file(s) backed up`));
-    console.log(chalk22.dim(`    Machine: ${snapshot.machine}`));
+    console.log(colors.cyan(`  ${snapshot.id}`));
+    console.log(colors.dim(`    Date:    ${date}`));
+    console.log(colors.dim(`    Reason:  ${snapshot.reason}`));
+    console.log(colors.dim(`    Files:   ${fileCount} file(s) backed up`));
+    console.log(colors.dim(`    Machine: ${snapshot.machine}`));
     console.log();
   }
   const totalSize = await getSnapshotsSize();
@@ -9883,18 +10260,18 @@ var showSnapshotList = async () => {
 };
 var showSnapshotDetails = (snapshot) => {
   console.log();
-  console.log(chalk22.bold("Snapshot Details:"));
-  console.log(chalk22.dim(`  ID:      ${snapshot.id}`));
-  console.log(chalk22.dim(`  Date:    ${formatSnapshotDate(snapshot.id)}`));
-  console.log(chalk22.dim(`  Reason:  ${snapshot.reason}`));
-  console.log(chalk22.dim(`  Machine: ${snapshot.machine}`));
+  console.log(colors.bold("Snapshot Details:"));
+  console.log(colors.dim(`  ID:      ${snapshot.id}`));
+  console.log(colors.dim(`  Date:    ${formatSnapshotDate(snapshot.id)}`));
+  console.log(colors.dim(`  Reason:  ${snapshot.reason}`));
+  console.log(colors.dim(`  Machine: ${snapshot.machine}`));
   console.log();
-  console.log(chalk22.bold("Files in snapshot:"));
+  console.log(colors.bold("Files in snapshot:"));
   for (const file of snapshot.files) {
     if (file.existed) {
-      console.log(chalk22.dim(`  ok ${collapsePath(file.originalPath)}`));
+      console.log(colors.dim(`  ok ${collapsePath(file.originalPath)}`));
     } else {
-      console.log(chalk22.dim(`  - ${collapsePath(file.originalPath)} (did not exist)`));
+      console.log(colors.dim(`  - ${collapsePath(file.originalPath)} (did not exist)`));
     }
   }
   console.log();
@@ -9989,10 +10366,7 @@ var runInteractiveUndo = async () => {
     label: `${s.id} - ${s.reason.slice(0, 40)}${s.reason.length > 40 ? "..." : ""}`,
     hint: `${s.files.filter((f) => f.existed).length} files`
   }));
-  const selectedId = await prompts.select(
-    "Select a snapshot to restore:",
-    snapshotOptions
-  );
+  const selectedId = await prompts.select("Select a snapshot to restore:", snapshotOptions);
   const snapshot = await getSnapshot(selectedId);
   if (!snapshot) {
     prompts.log.error("Snapshot not found");
@@ -10002,11 +10376,11 @@ var runInteractiveUndo = async () => {
   prompts.log.info("Files in this snapshot:");
   for (const file of snapshot.files.slice(0, 10)) {
     if (file.existed) {
-      console.log(chalk22.dim(`  ${collapsePath(file.originalPath)}`));
+      console.log(colors.dim(`  ${collapsePath(file.originalPath)}`));
     }
   }
   if (snapshot.files.length > 10) {
-    console.log(chalk22.dim(`  ... and ${snapshot.files.length - 10} more`));
+    console.log(colors.dim(`  ... and ${snapshot.files.length - 10} more`));
   }
   console.log();
   const confirmed = await prompts.confirm("Restore these files?", true);
@@ -10014,10 +10388,10 @@ var runInteractiveUndo = async () => {
     prompts.cancel("Restore cancelled");
     return;
   }
-  const spinner2 = prompts.spinner();
-  spinner2.start("Restoring files...");
+  const spinner4 = prompts.spinner();
+  spinner4.start("Restoring files...");
   const restoredFiles = await restoreSnapshot(selectedId);
-  spinner2.stop(`Restored ${restoredFiles.length} files`);
+  spinner4.stop(`Restored ${restoredFiles.length} files`);
   prompts.outro("Done!");
 };
 var runUndo = async (snapshotId, options) => {
@@ -10060,7 +10434,6 @@ init_detect();
 init_errors();
 init_fileTracking();
 import { Command as Command15 } from "commander";
-import chalk23 from "chalk";
 init_tuckignore();
 var groupSelectableByCategory = (files) => {
   const grouped = {};
@@ -10085,18 +10458,18 @@ var displayGroupedFiles = (files, showAll) => {
     const trackedFiles = categoryFiles.filter((f) => f.alreadyTracked);
     console.log();
     console.log(
-      chalk23.bold(`${config.icon} ${config.name}`) + chalk23.dim(` (${newFiles.length} new, ${trackedFiles.length} tracked)`)
+      colors.bold(`${config.icon} ${config.name}`) + colors.dim(` (${newFiles.length} new, ${trackedFiles.length} tracked)`)
     );
-    console.log(chalk23.dim("\u2500".repeat(50)));
+    console.log(colors.dim("\u2500".repeat(50)));
     for (const file of categoryFiles) {
       if (!showAll && file.alreadyTracked) continue;
-      const status = file.selected ? chalk23.green("[x]") : chalk23.dim("[ ]");
+      const status = file.selected ? colors.green("[x]") : colors.dim("[ ]");
       const name = file.path;
-      const tracked = file.alreadyTracked ? chalk23.dim(" (tracked)") : "";
-      const sensitive = file.sensitive ? chalk23.yellow(" [!]") : "";
-      const dir = file.isDirectory ? chalk23.cyan(" [dir]") : "";
+      const tracked = file.alreadyTracked ? colors.dim(" (tracked)") : "";
+      const sensitive = file.sensitive ? colors.yellow(" [!]") : "";
+      const dir = file.isDirectory ? colors.cyan(" [dir]") : "";
       console.log(`  ${status} ${name}${dir}${sensitive}${tracked}`);
-      console.log(chalk23.dim(`      ${file.description}`));
+      console.log(colors.dim(`      ${file.description}`));
     }
   }
 };
@@ -10111,16 +10484,16 @@ var runInteractiveSelection = async (files) => {
   for (const [category, categoryFiles] of Object.entries(grouped)) {
     const config = DETECTION_CATEGORIES[category] || { icon: "-", name: category };
     console.log();
-    console.log(chalk23.bold(`${config.icon} ${config.name}`));
-    console.log(chalk23.dim(config.description || ""));
+    console.log(colors.bold(`${config.icon} ${config.name}`));
+    console.log(colors.dim(config.description || ""));
     console.log();
     const options = categoryFiles.map((file) => {
       let label = file.path;
       if (file.sensitive) {
-        label += chalk23.yellow(" [!]");
+        label += colors.yellow(" [!]");
       }
       if (file.isDirectory) {
-        label += chalk23.cyan(" [dir]");
+        label += colors.cyan(" [dir]");
       }
       return {
         value: file.path,
@@ -10149,11 +10522,11 @@ var runQuickScan = async (files) => {
   const trackedFiles = files.filter((f) => f.alreadyTracked);
   console.log();
   console.log(
-    chalk23.bold.cyan("Detected Dotfiles: ") + chalk23.white(`${newFiles.length} new, ${trackedFiles.length} already tracked`)
+    colors.bold.cyan("Detected Dotfiles: ") + colors.white(`${newFiles.length} new, ${trackedFiles.length} already tracked`)
   );
   displayGroupedFiles(files, false);
   console.log();
-  console.log(chalk23.dim("\u2500".repeat(60)));
+  console.log(colors.dim("\u2500".repeat(60)));
   console.log();
   if (newFiles.length > 0) {
     logger.info(`Found ${newFiles.length} new dotfiles to track`);
@@ -10169,23 +10542,23 @@ var showSummary = (selected) => {
     return;
   }
   console.log();
-  console.log(chalk23.bold.cyan(`Selected ${selected.length} files to track:`));
-  console.log(chalk23.dim("\u2500".repeat(50)));
+  console.log(colors.bold.cyan(`Selected ${selected.length} files to track:`));
+  console.log(colors.dim("\u2500".repeat(50)));
   console.log();
   const grouped = groupSelectableByCategory(selected);
   for (const [category, files] of Object.entries(grouped)) {
     const config = DETECTION_CATEGORIES[category] || { icon: "-", name: category };
-    console.log(chalk23.bold(`${config.icon} ${config.name}`));
+    console.log(colors.bold(`${config.icon} ${config.name}`));
     for (const file of files) {
-      const sensitive = file.sensitive ? chalk23.yellow(" \u26A0") : "";
-      console.log(chalk23.dim(`  \u2022 ${collapsePath(file.path)}${sensitive}`));
+      const sensitive = file.sensitive ? colors.yellow(" \u26A0") : "";
+      console.log(colors.dim(`  \u2022 ${collapsePath(file.path)}${sensitive}`));
     }
     console.log();
   }
   const sensitiveFiles = selected.filter((f) => f.sensitive);
   if (sensitiveFiles.length > 0) {
-    console.log(chalk23.yellow("\u26A0 Warning: Some files may contain sensitive data"));
-    console.log(chalk23.dim("  Make sure your repository is private!"));
+    console.log(colors.yellow("\u26A0 Warning: Some files may contain sensitive data"));
+    console.log(colors.dim("  Make sure your repository is private!"));
     console.log();
   }
 };
@@ -10207,10 +10580,10 @@ var runScan = async (options) => {
   } catch {
     throw new NotInitializedError();
   }
-  const spinner2 = prompts.spinner();
-  spinner2.start("Scanning for dotfiles...");
+  const spinner4 = prompts.spinner();
+  spinner4.start("Scanning for dotfiles...");
   const detected = await detectDotfiles();
-  spinner2.stop(`Found ${detected.length} dotfiles on this system`);
+  spinner4.stop(`Found ${detected.length} dotfiles on this system`);
   if (detected.length === 0) {
     logger.warning("No common dotfiles detected on this system");
     return;
@@ -10238,7 +10611,7 @@ var runScan = async (options) => {
       logger.warning(`No dotfiles found in category: ${options.category}`);
       logger.info("Available categories:");
       for (const [key, config] of Object.entries(DETECTION_CATEGORIES)) {
-        console.log(chalk23.dim(`  ${config.icon} ${key} - ${config.name}`));
+        console.log(colors.dim(`  ${config.icon} ${key} - ${config.name}`));
       }
       return;
     }
@@ -10296,10 +10669,7 @@ var runScan = async (options) => {
     return;
   }
   showSummary(selected);
-  const confirmed = await prompts.confirm(
-    `Track these ${selected.length} files?`,
-    true
-  );
+  const confirmed = await prompts.confirm(`Track these ${selected.length} files?`, true);
   if (!confirmed) {
     prompts.cancel("Operation cancelled");
     return;
@@ -10335,7 +10705,7 @@ init_manifest();
 init_git();
 var program = new Command16();
 program.name("tuck").description(DESCRIPTION).version(VERSION, "-v, --version", "Display version number").configureOutput({
-  outputError: (str, write) => write(chalk24.red(str))
+  outputError: (str, write) => write(chalk5.red(str))
 }).addHelpText("beforeAll", customHelp(VERSION)).helpOption("-h, --help", "Display this help message").showHelpAfterError(false);
 program.configureHelp({
   formatHelp: () => ""
@@ -10359,12 +10729,12 @@ var runDefaultAction = async () => {
   const tuckDir = getTuckDir();
   if (!await pathExists(tuckDir)) {
     miniBanner();
-    console.log(chalk24.bold("Get started with tuck:\n"));
-    console.log(chalk24.cyan("  tuck init") + chalk24.dim("   - Set up tuck and create a GitHub repo"));
-    console.log(chalk24.cyan("  tuck scan") + chalk24.dim("   - Find dotfiles to track"));
+    console.log(chalk5.bold("Get started with tuck:\n"));
+    console.log(chalk5.cyan("  tuck init") + chalk5.dim("   - Set up tuck and create a GitHub repo"));
+    console.log(chalk5.cyan("  tuck scan") + chalk5.dim("   - Find dotfiles to track"));
     console.log();
-    console.log(chalk24.dim("On a new machine:"));
-    console.log(chalk24.cyan("  tuck apply <username>") + chalk24.dim(" - Apply your dotfiles"));
+    console.log(chalk5.dim("On a new machine:"));
+    console.log(chalk5.cyan("  tuck apply <username>") + chalk5.dim(" - Apply your dotfiles"));
     console.log();
     return;
   }
@@ -10373,38 +10743,38 @@ var runDefaultAction = async () => {
     const trackedCount = Object.keys(manifest.files).length;
     const gitStatus = await getStatus(tuckDir);
     miniBanner();
-    console.log(chalk24.bold("Status:\n"));
-    console.log(`  Tracked files: ${chalk24.cyan(trackedCount.toString())}`);
+    console.log(chalk5.bold("Status:\n"));
+    console.log(`  Tracked files: ${chalk5.cyan(trackedCount.toString())}`);
     const pendingChanges = gitStatus.modified.length + gitStatus.staged.length;
     if (pendingChanges > 0) {
-      console.log(`  Pending changes: ${chalk24.yellow(pendingChanges.toString())}`);
+      console.log(`  Pending changes: ${chalk5.yellow(pendingChanges.toString())}`);
     } else {
-      console.log(`  Pending changes: ${chalk24.dim("none")}`);
+      console.log(`  Pending changes: ${chalk5.dim("none")}`);
     }
     if (gitStatus.ahead > 0) {
-      console.log(`  Commits to push: ${chalk24.yellow(gitStatus.ahead.toString())}`);
+      console.log(`  Commits to push: ${chalk5.yellow(gitStatus.ahead.toString())}`);
     }
     console.log();
-    console.log(chalk24.bold("Next steps:\n"));
+    console.log(chalk5.bold("Next steps:\n"));
     if (trackedCount === 0) {
-      console.log(chalk24.cyan("  tuck scan") + chalk24.dim("  - Find dotfiles to track"));
-      console.log(chalk24.cyan("  tuck add <file>") + chalk24.dim(" - Track a specific file"));
+      console.log(chalk5.cyan("  tuck scan") + chalk5.dim("  - Find dotfiles to track"));
+      console.log(chalk5.cyan("  tuck add <file>") + chalk5.dim(" - Track a specific file"));
     } else if (pendingChanges > 0) {
-      console.log(chalk24.cyan("  tuck sync") + chalk24.dim("  - Commit and push your changes"));
-      console.log(chalk24.cyan("  tuck diff") + chalk24.dim("  - Preview what changed"));
+      console.log(chalk5.cyan("  tuck sync") + chalk5.dim("  - Commit and push your changes"));
+      console.log(chalk5.cyan("  tuck diff") + chalk5.dim("  - Preview what changed"));
     } else if (gitStatus.ahead > 0) {
-      console.log(chalk24.cyan("  tuck push") + chalk24.dim("  - Push commits to GitHub"));
+      console.log(chalk5.cyan("  tuck push") + chalk5.dim("  - Push commits to GitHub"));
     } else {
-      console.log(chalk24.dim("  All synced! Your dotfiles are up to date."));
+      console.log(chalk5.dim("  All synced! Your dotfiles are up to date."));
       console.log();
-      console.log(chalk24.cyan("  tuck scan") + chalk24.dim("  - Find more dotfiles to track"));
-      console.log(chalk24.cyan("  tuck list") + chalk24.dim("  - See tracked files"));
+      console.log(chalk5.cyan("  tuck scan") + chalk5.dim("  - Find more dotfiles to track"));
+      console.log(chalk5.cyan("  tuck list") + chalk5.dim("  - See tracked files"));
     }
     console.log();
   } catch {
     miniBanner();
-    console.log(chalk24.yellow("Tuck directory exists but may be corrupted."));
-    console.log(chalk24.dim("Run `tuck init` to reinitialize."));
+    console.log(chalk5.yellow("Tuck directory exists but may be corrupted."));
+    console.log(chalk5.dim("Run `tuck init` to reinitialize."));
     console.log();
   }
 };