ctheme 0.1.6 → 0.1.7

package/README.md

@@ -42,8 +42,9 @@ Apply a bundled theme live:
 
 ```bash
 ctheme use solarized
-ctheme use solarized-dark
-ctheme use tide-light
+ctheme use tide
+ctheme use tide --dark
+ctheme use solarized --light
 ctheme use harbor --default
 ctheme use velvet --font "Space Mono"
 ```
@@ -59,6 +60,7 @@ See available themes:
 ```bash
 ctheme list
 ctheme preview solarized
+ctheme preview tide --dark
 ctheme status
 ```
 
@@ -107,8 +109,8 @@ Examples:
 
 ```bash
 ctheme term apple-terminal --theme noir --font "SF Mono"
-ctheme term ghostty --theme noir --font "JetBrains Mono" --font-size 15 --write
-ctheme term kitty --theme ember --font "Berkeley Mono" --font-size 14 --write
+ctheme term ghostty --theme tide --dark --font "JetBrains Mono" --font-size 15 --write
+ctheme term kitty --theme ember --light --font "Berkeley Mono" --font-size 14 --write
 ctheme term wezterm --theme paper --font "IBM Plex Mono" --font-size 14
 ```
 
@@ -161,6 +163,8 @@ Bundled themes intentionally vary their font pairings so they do not all feel th
 The npm install bootstrap preinstalls the curated font set those presets rely on, so the bundled themes render correctly immediately on macOS.
 The default code and terminal font choices are biased toward tighter, denser monospace faces rather than wide-spaced ones.
 Every bundled preset family now has both `-light` and `-dark` variants.
+Using the family name alone, like `tide`, follows your system appearance automatically.
+You can still override the mode manually with `--light` or `--dark`.
 
 ## Contributing
 

package/bin/ctheme.js

@@ -496,7 +496,7 @@ async function main() {
         runUse(args[1], parseFlags(args.slice(2)));
         return;
       case "preview":
-        runPreview(args[1]);
+        runPreview(args[1], parseFlags(args.slice(2)));
         return;
       case "make":
         await runMake(args[1], parseFlags(args.slice(2)));
@@ -538,7 +538,7 @@ Commands:
   status                           Show ctheme paths and saved terminal restore state
   reset [--target <name>]          Restore the terminal UI back to its original state
   use <name> [flags]               Apply a theme to the actual terminal immediately
-  preview <name>                   Preview a theme palette in the terminal
+  preview <name> [flags]           Preview a theme palette in the terminal
   make [name] [flags]              Create a custom theme or launch the theme wizard
   wizard [name] [flags]            Launch the interactive theme wizard directly
   init <name> [flags]              Create an editable starter JSON file
@@ -549,17 +549,18 @@ Commands:
 Examples:
   ctheme reset
   ctheme use solarized
+  ctheme use tide --dark
   ctheme use harbor --default
   ctheme make
   ctheme wizard
   ctheme make arjun --from velvet --accent "#ff4d6d"
   ctheme init custom-light --preset harbor
   ctheme live neon
-  ctheme live solarized --font "Space Mono"
+  ctheme live solarized --light --font "JetBrains Mono"
   ctheme font install "Manrope"
   ctheme font list
   ctheme term apple-terminal --theme noir --font "SF Mono"
-  ctheme term ghostty --font "JetBrains Mono" --font-size 15
+  ctheme term ghostty --theme tide --dark --font "JetBrains Mono" --font-size 15
 
 Flags for make:
   --preset <name>                  Base preset name
@@ -589,8 +590,10 @@ Font subcommands:
 
 Flags for term:
   Targets: apple-terminal, current, ghostty, kitty, wezterm
+  --dark                          Force the dark variant for bundled theme families
   --font <family>
   --font-size <number>
+  --light                         Force the light variant for bundled theme families
   --theme <name>
   --opacity <number>
   --write                         Write snippet into your terminal config location when supported
@@ -598,10 +601,16 @@ Flags for term:
   --default                       Apple Terminal: set as default and startup profile
 
 Flags for use:
+  --dark                          Force the dark variant for bundled theme families
   --font <family>
   --font-size <number>
+  --light                         Force the light variant for bundled theme families
   --default                       Apple Terminal: set as default and startup profile
 
+Flags for preview:
+  --dark                          Force the dark variant for bundled theme families
+  --light                         Force the light variant for bundled theme families
+
 Flags for reset:
   --target <name>                 current, apple-terminal, ghostty, kitty, wezterm
 `);
@@ -668,7 +677,8 @@ function derivePaletteVariant(palette, targetMode) {
 
 function runList() {
   const paths = getThemePaths();
-  const custom = new Set(Object.keys(PRESETS));
+  const bundled = getBundledThemeFamilies();
+  const custom = new Set();
 
   if (fs.existsSync(paths.paletteDir)) {
     for (const entry of fs.readdirSync(paths.paletteDir)) {
@@ -678,9 +688,12 @@ function runList() {
     }
   }
 
+  for (const name of bundled) {
+    console.log(`${name}  (bundled, auto light/dark)`);
+  }
+
   for (const name of [...custom].sort()) {
-    const source = Object.hasOwn(PRESETS, name) ? "bundled-custom" : "custom";
-    console.log(`${name}  (${source})`);
+    console.log(`${name}  (custom)`);
   }
 }
 
@@ -740,9 +753,9 @@ function runReset(flags) {
   fail(`Unsupported reset target: ${target}`);
 }
 
-function runPreview(themeName) {
-  assertThemeName(themeName);
-  const theme = buildTheme(themeName, getBasePalette(themeName));
+function runPreview(themeName, flags) {
+  const resolvedThemeName = resolveThemeName(themeName, flags || {});
+  const theme = buildTheme(resolvedThemeName, getBasePalette(resolvedThemeName));
 
   const palette = [
     ["accent", theme.colors.accent],
@@ -767,7 +780,8 @@ async function runMake(name, flags) {
     return;
   }
 
-  const preset = getBasePalette(flags.from || flags.preset || "noir");
+  const presetName = resolveBaseThemeName(flags.from || flags.preset || "noir", flags || {});
+  const preset = getBasePalette(presetName);
 
   const customized = {
     ...preset,
@@ -800,7 +814,8 @@ function runInit(name, flags) {
     fail(`Theme already exists: ${filePath}. Re-run with --force to overwrite.`);
   }
 
-  const palette = getBasePalette(flags.from || flags.preset || "noir");
+  const presetName = resolveBaseThemeName(flags.from || flags.preset || "noir", flags || {});
+  const palette = getBasePalette(presetName);
   writeThemeAssets(paths, name, palette);
   console.log(`Created starter theme at ${filePath}`);
   console.log("Edit the JSON, then run: ctheme make " + name + " --from " + name);
@@ -813,7 +828,7 @@ async function runMakeWizard(initialName, flags) {
   });
 
   try {
-    const availablePresets = Object.keys(PRESETS).sort();
+    const availablePresets = getBundledThemeFamilies();
     console.log("Theme wizard");
     console.log("Press Enter to keep the default shown in brackets.");
     console.log(`Presets: ${availablePresets.join(", ")}`);
@@ -826,7 +841,8 @@ async function runMakeWizard(initialName, flags) {
       "Base preset",
       flags.from || flags.preset || "noir"
     );
-    const preset = getBasePalette(basePresetName);
+    const resolvedBasePresetName = resolveBaseThemeName(basePresetName, flags || {});
+    const preset = getBasePalette(resolvedBasePresetName);
     const defaultName = initialName || `${basePresetName}-custom`;
     const themeName = await promptWithDefault(rl, "Theme name", defaultName);
 
@@ -865,7 +881,7 @@ async function runMakeWizard(initialName, flags) {
     console.log("\nTheme summary:");
     printThemeSummary({
       name: themeName,
-      preset: basePresetName,
+      preset: resolvedBasePresetName,
       accent,
       bg,
       surface,
@@ -973,10 +989,9 @@ function runTerminal(target, flags) {
   }
 
   const normalizedTarget = normalizeTerminalTarget(target);
-  const themeName = flags.theme || "noir";
-  assertThemeName(themeName);
-  const theme = buildTheme(themeName, getBasePalette(themeName));
-  const presetFonts = getThemeFonts(themeName);
+  const resolvedThemeName = resolveThemeName(flags.theme || "noir", flags || {});
+  const theme = buildTheme(resolvedThemeName, getBasePalette(resolvedThemeName));
+  const presetFonts = getThemeFonts(resolvedThemeName);
   const font = flags.font || presetFonts.terminal || "JetBrains Mono";
   const fontSize = Number(flags["font-size"] || 15);
   const opacity = flags.opacity ? Number(flags.opacity) : null;
@@ -1290,6 +1305,86 @@ function detectCurrentTerminalTarget() {
   return "";
 }
 
+function getBundledThemeFamilies() {
+  return Object.keys(BASE_PRESETS)
+    .map((name) => name.replace(/-(light|dark)$/, ""))
+    .filter((name, index, list) => list.indexOf(name) === index)
+    .sort();
+}
+
+function resolveBaseThemeName(name, flags) {
+  return resolveThemeName(name, flags);
+}
+
+function resolveThemeName(themeName, flags) {
+  assertThemeName(themeName);
+
+  const wantsDark = Boolean(flags.dark);
+  const wantsLight = Boolean(flags.light);
+  if (wantsDark && wantsLight) {
+    fail("Choose either --dark or --light, not both.");
+  }
+
+  if (themeExists(themeName) && /-(light|dark)$/.test(themeName)) {
+    return themeName;
+  }
+
+  const desiredMode = wantsDark ? "dark" : wantsLight ? "light" : detectSystemAppearanceMode();
+  const desiredVariant = `${themeName}-${desiredMode}`;
+  if (themeExists(desiredVariant)) {
+    return desiredVariant;
+  }
+
+  if (themeExists(themeName)) {
+    return themeName;
+  }
+
+  const fallbackVariant = `${themeName}-${desiredMode === "dark" ? "light" : "dark"}`;
+  if (themeExists(fallbackVariant)) {
+    return fallbackVariant;
+  }
+
+  fail(`Theme not found: ${themeName}`);
+}
+
+function themeExists(name) {
+  if (PRESETS[name]) return true;
+  const paths = getThemePaths();
+  return fs.existsSync(path.join(paths.paletteDir, `${name}.json`));
+}
+
+function detectSystemAppearanceMode() {
+  const envMode = String(process.env.CTHEME_MODE || "").trim().toLowerCase();
+  if (envMode === "dark" || envMode === "light") {
+    return envMode;
+  }
+
+  if (process.platform === "darwin") {
+    try {
+      const result = execFileSync("defaults", ["read", "-g", "AppleInterfaceStyle"], { encoding: "utf8" }).trim();
+      return result.toLowerCase() === "dark" ? "dark" : "light";
+    } catch (_error) {
+      return "light";
+    }
+  }
+
+  if (process.platform === "win32") {
+    try {
+      const result = execFileSync("reg", [
+        "query",
+        "HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize",
+        "/v",
+        "AppsUseLightTheme"
+      ], { encoding: "utf8" });
+      return /0x0\b/i.test(result) ? "dark" : "light";
+    } catch (_error) {
+      return "dark";
+    }
+  }
+
+  return "dark";
+}
+
 function getThemeFonts(name) {
   if (PRESETS[name] && PRESETS[name].fonts) {
     return PRESETS[name].fonts;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ctheme",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "Theme manager for making terminals look better with colors, fonts, and live profile switching",
   "license": "MIT",
   "repository": {