@storm-software/workspace-tools 1.72.3 → 1.73.1

package/src/utils/index.js

@@ -46588,8 +46588,8 @@ var require_pax = __commonJS({
         return len + s2;
       }
     };
-    Pax.parse = (string, ex, g4) => new Pax(merge2(parseKV(string), ex), g4);
-    var merge2 = (a2, b6) => b6 ? Object.keys(a2).reduce((s2, k4) => (s2[k4] = a2[k4], s2), b6) : a2;
+    Pax.parse = (string, ex, g4) => new Pax(merge3(parseKV(string), ex), g4);
+    var merge3 = (a2, b6) => b6 ? Object.keys(a2).reduce((s2, k4) => (s2[k4] = a2[k4], s2), b6) : a2;
     var parseKV = (string) => string.replace(/\n$/, "").split("\n").reduce(parseKVLine, /* @__PURE__ */ Object.create(null));
     var parseKVLine = (set2, line) => {
       const n = parseInt(line, 10);
@@ -66808,64 +66808,6 @@ var require_cjs = __commonJS({
   }
 });
 
-// packages/config-tools/src/config-file/get-config-file.ts
-var import_deepmerge, getConfigFileByName, getConfigFile;
-var init_get_config_file = __esm({
-  "packages/config-tools/src/config-file/get-config-file.ts"() {
-    init_find_workspace_root();
-    init_dist10();
-    import_deepmerge = __toESM(require_cjs());
-    getConfigFileByName = async (fileName, filePath) => {
-      const workspacePath = filePath ? filePath : findWorkspaceRoot(filePath);
-      return loadConfig({
-        cwd: workspacePath,
-        packageJson: true,
-        name: fileName,
-        envName: fileName?.toUpperCase(),
-        jitiOptions: {
-          debug: true,
-          cache: process.env.STORM_CACHE ? process.env.STORM_CACHE_DIRECTORY : false
-        }
-      });
-    };
-    getConfigFile = async (filePath, additionalFileNames = []) => {
-      const workspacePath = filePath ? filePath : findWorkspaceRoot(filePath);
-      let { config, configFile } = await loadConfig({
-        cwd: workspacePath,
-        name: "storm"
-      });
-      if (additionalFileNames && additionalFileNames.length > 0) {
-        const results = await Promise.all(
-          additionalFileNames.map(
-            (fileName) => loadConfig({
-              cwd: workspacePath,
-              name: fileName
-            })
-          )
-        );
-        for (const result of results) {
-          if (result) {
-            config = (0, import_deepmerge.default)(config ?? {}, result.config ?? {});
-          }
-        }
-      }
-      if (!config) {
-        return void 0;
-      }
-      config.configFile = configFile;
-      config.runtimeVersion = "0.0.1";
-      return config;
-    };
-  }
-});
-
-// packages/config-tools/src/config-file/index.ts
-var init_config_file = __esm({
-  "packages/config-tools/src/config-file/index.ts"() {
-    init_get_config_file();
-  }
-});
-
 // node_modules/.pnpm/zod@3.22.4/node_modules/zod/lib/index.mjs
 function setErrorMap(map) {
   overrideErrorMap = map;
@@ -70600,23 +70542,71 @@ var init_lib = __esm({
 });
 
 // packages/config/src/schema.ts
-var ColorConfigSchema, StormConfigSchema;
+var DarkColorSchema, LightColorSchema, PrimaryColorSchema, SecondaryColorSchema, TertiaryColorSchema, AccentColorSchema, SuccessColorSchema, InfoColorSchema, WarningColorSchema, ErrorColorSchema, FatalColorSchema, DarkThemeColorConfigSchema, LightThemeColorConfigSchema, MultiThemeColorConfigSchema, SingleThemeColorConfigSchema, ColorConfigSchema, ColorConfigMapSchema, StormConfigSchema;
 var init_schema = __esm({
   "packages/config/src/schema.ts"() {
     init_lib();
-    ColorConfigSchema = z2.object({
-      dark: z2.string().trim().toLowerCase().regex(/^#([0-9a-f]{3}){1,2}$/i).length(7).default("#1d232a").describe("The dark background color of the workspace"),
-      light: z2.string().trim().toLowerCase().regex(/^#([0-9a-f]{3}){1,2}$/i).length(7).default("#f4f4f5").describe("The light background color of the workspace"),
-      primary: z2.string().trim().toLowerCase().regex(/^#([0-9a-f]{3}){1,2}$/i).length(7).default("#1fb2a6").describe("The primary color of the workspace"),
-      secondary: z2.string().trim().toLowerCase().regex(/^#([0-9a-f]{3}){1,2}$/i).length(7).default("#0ea5e9").describe("The secondary color of the workspace"),
-      tertiary: z2.string().trim().toLowerCase().regex(/^#([0-9a-f]{3}){1,2}$/i).length(7).default("#ec5990").describe("The tertiary color of the workspace"),
-      accent: z2.string().trim().toLowerCase().regex(/^#([0-9a-f]{3}){1,2}$/i).length(7).default("#6366f1").describe("The accent color of the workspace"),
-      success: z2.string().trim().toLowerCase().regex(/^#([0-9a-f]{3}){1,2}$/i).length(7).default("#087f5b").describe("The success color of the workspace"),
-      info: z2.string().trim().toLowerCase().regex(/^#([0-9a-f]{3}){1,2}$/i).length(7).default("#0ea5e9").describe("The informational color of the workspace"),
-      warning: z2.string().trim().toLowerCase().regex(/^#([0-9a-f]{3}){1,2}$/i).length(7).default("#fcc419").describe("The warning color of the workspace"),
-      error: z2.string().trim().toLowerCase().regex(/^#([0-9a-f]{3}){1,2}$/i).length(7).default("#990000").describe("The error color of the workspace"),
-      fatal: z2.string().trim().toLowerCase().regex(/^#([0-9a-f]{3}){1,2}$/i).length(7).default("#7d1a1a").describe("The fatal color of the workspace")
-    }).describe("Colors used for various workspace elements");
+    DarkColorSchema = z2.string().trim().toLowerCase().regex(/^#([0-9a-f]{3}){1,2}$/i).length(7).default("#1d232a").describe("The dark background color of the workspace");
+    LightColorSchema = z2.string().trim().toLowerCase().regex(/^#([0-9a-f]{3}){1,2}$/i).length(7).default("#f4f4f5").describe("The light background color of the workspace");
+    PrimaryColorSchema = z2.string().trim().toLowerCase().regex(/^#([0-9a-f]{3}){1,2}$/i).length(7).default("#1fb2a6").describe("The primary color of the workspace");
+    SecondaryColorSchema = z2.string().trim().toLowerCase().regex(/^#([0-9a-f]{3}){1,2}$/i).length(7).default("#0ea5e9").describe("The secondary color of the workspace");
+    TertiaryColorSchema = z2.string().trim().toLowerCase().regex(/^#([0-9a-f]{3}){1,2}$/i).length(7).default("#ec5990").describe("The tertiary color of the workspace");
+    AccentColorSchema = z2.string().trim().toLowerCase().regex(/^#([0-9a-f]{3}){1,2}$/i).length(7).default("#6366f1").describe("The accent color of the workspace");
+    SuccessColorSchema = z2.string().trim().toLowerCase().regex(/^#([0-9a-f]{3}){1,2}$/i).length(7).default("#087f5b").describe("The success color of the workspace");
+    InfoColorSchema = z2.string().trim().toLowerCase().regex(/^#([0-9a-f]{3}){1,2}$/i).length(7).default("#0ea5e9").describe("The informational color of the workspace");
+    WarningColorSchema = z2.string().trim().toLowerCase().regex(/^#([0-9a-f]{3}){1,2}$/i).length(7).default("#fcc419").describe("The warning color of the workspace");
+    ErrorColorSchema = z2.string().trim().toLowerCase().regex(/^#([0-9a-f]{3}){1,2}$/i).length(7).default("#990000").describe("The error color of the workspace");
+    FatalColorSchema = z2.string().trim().toLowerCase().regex(/^#([0-9a-f]{3}){1,2}$/i).length(7).default("#7d1a1a").describe("The fatal color of the workspace");
+    DarkThemeColorConfigSchema = z2.object({
+      foreground: LightColorSchema,
+      background: DarkColorSchema,
+      primary: PrimaryColorSchema,
+      secondary: SecondaryColorSchema,
+      tertiary: TertiaryColorSchema,
+      accent: AccentColorSchema,
+      success: SuccessColorSchema,
+      info: InfoColorSchema,
+      warning: WarningColorSchema,
+      error: ErrorColorSchema,
+      fatal: FatalColorSchema
+    });
+    LightThemeColorConfigSchema = z2.object({
+      foreground: DarkColorSchema,
+      background: LightColorSchema,
+      primary: PrimaryColorSchema,
+      secondary: SecondaryColorSchema,
+      tertiary: TertiaryColorSchema,
+      accent: AccentColorSchema,
+      success: SuccessColorSchema,
+      info: InfoColorSchema,
+      warning: WarningColorSchema,
+      error: ErrorColorSchema,
+      fatal: FatalColorSchema
+    });
+    MultiThemeColorConfigSchema = z2.object({
+      dark: DarkThemeColorConfigSchema,
+      light: LightThemeColorConfigSchema
+    });
+    SingleThemeColorConfigSchema = z2.object({
+      dark: DarkColorSchema,
+      light: LightColorSchema,
+      primary: PrimaryColorSchema,
+      secondary: SecondaryColorSchema,
+      tertiary: TertiaryColorSchema,
+      accent: AccentColorSchema,
+      success: SuccessColorSchema,
+      info: InfoColorSchema,
+      warning: WarningColorSchema,
+      error: ErrorColorSchema,
+      fatal: FatalColorSchema
+    });
+    ColorConfigSchema = SingleThemeColorConfigSchema.or(
+      MultiThemeColorConfigSchema
+    ).describe("Colors used for various workspace elements");
+    ColorConfigMapSchema = z2.union([
+      z2.object({ "base": ColorConfigSchema }),
+      z2.record(z2.string(), ColorConfigSchema)
+    ]);
     StormConfigSchema = z2.object({
       extends: z2.string().trim().optional().describe(
         "The path to a base JSON file to use as a configuration preset file"
@@ -70667,7 +70657,7 @@ var init_schema = __esm({
       configFile: z2.string().trim().nullable().default(null).describe(
         "The filepath of the Storm config. When this field is null, no config file was found in the current workspace."
       ),
-      colors: ColorConfigSchema.describe(
+      colors: ColorConfigSchema.or(ColorConfigMapSchema).describe(
         "Storm theme config values used for styling various package elements"
       ),
       extensions: z2.record(z2.any()).optional().default({}).describe("Configuration of each used extension")
@@ -70678,8 +70668,22 @@ var init_schema = __esm({
 });
 
 // packages/config/src/types.ts
+var COLOR_KEYS;
 var init_types = __esm({
   "packages/config/src/types.ts"() {
+    COLOR_KEYS = [
+      "dark",
+      "light",
+      "primary",
+      "secondary",
+      "tertiary",
+      "accent",
+      "success",
+      "info",
+      "warning",
+      "error",
+      "fatal"
+    ];
   }
 });
 
@@ -72451,14 +72455,16 @@ var init_chalk = __esm({
 });
 
 // packages/config-tools/src/utilities/logger.ts
-var getLogFn, writeFatal, writeError, writeWarning, writeInfo, writeSuccess, writeDebug, writeTrace, writeSystem, getStopwatch;
+var getLogFn, writeFatal, writeError, writeWarning, writeInfo, writeSuccess, writeDebug, writeTrace, writeSystem, getStopwatch, formatLogMessage, _isFunction;
 var init_logger = __esm({
   "packages/config-tools/src/utilities/logger.ts"() {
     init_types2();
     init_get_log_level();
     init_chalk();
+    init_get_default_config();
     getLogFn = (logLevel = LogLevel.INFO, config = {}) => {
       let _chalk = getChalk();
+      const colors = !config.colors?.dark && !config.colors?.["base"] && !config.colors?.["base"]?.dark ? DEFAULT_COLOR_CONFIG : config.colors?.dark && typeof config.colors.dark === "string" ? config.colors : config.colors?.["base"]?.dark && typeof config.colors["base"].dark === "string" ? config.colors["base"].dark : config.colors?.["base"] ? config.colors?.["base"] : DEFAULT_COLOR_CONFIG;
       const configLogLevel = config.logLevel ?? process.env?.STORM_LOG_LEVEL ?? LogLevelLabel.INFO;
       if (typeof logLevel === "number" && (logLevel >= getLogLevel(configLogLevel) || logLevel <= LogLevel.SILENT) || typeof logLevel === "string" && getLogLevel(logLevel) >= getLogLevel(configLogLevel)) {
         return (_6) => {
@@ -72468,9 +72474,9 @@ var init_logger = __esm({
         return (message) => {
           console.error(
             `
-${_chalk.bold.hex(config?.colors?.error ? config.colors.error : "#7d1a1a")(">")} ${_chalk.bold.bgHex(config?.colors?.fatal ? config.colors.fatal : "#7d1a1a").whiteBright(" \u{1F480} Fatal ")}  ${_chalk.hex(
-              config?.colors?.error ? config.colors.error : "#1fb2a6"
-            )(message)}
+${_chalk.bold.hex(colors.error ?? "#f85149")(">")} ${_chalk.bold.bgHex(colors.fatal ?? "#b62324").whiteBright(
+              " \u{1F480} Fatal "
+            )}  ${_chalk.hex(colors.error ?? "#f85149")(formatLogMessage(message))}
 
 `
           );
@@ -72480,9 +72486,9 @@ ${_chalk.bold.hex(config?.colors?.error ? config.colors.error : "#7d1a1a")(">")}
         return (message) => {
           console.error(
             `
-${_chalk.bold.hex(config?.colors?.error ? config.colors.error : "#7d1a1a")(">")} ${_chalk.bold.bgHex(config?.colors?.error ? config.colors.error : "#7d1a1a").whiteBright(" \u2718 Error ")}  ${_chalk.hex(
-              config?.colors?.error ? config.colors.error : "#7d1a1a"
-            )(message)}
+${_chalk.bold.hex(colors.error ?? "#f85149")(">")} ${_chalk.bold.bgHex(colors.error ?? "#f85149").whiteBright(
+              " \u2718 Error "
+            )}  ${_chalk.hex(colors.error ?? "#f85149")(formatLogMessage(message))}
 `
           );
         };
@@ -72491,9 +72497,9 @@ ${_chalk.bold.hex(config?.colors?.error ? config.colors.error : "#7d1a1a")(">")}
         return (message) => {
           console.warn(
             `
-${_chalk.bold.hex(config?.colors?.warning ? config.colors.warning : "#fcc419")("> ")} ${_chalk.bold.bgHex(config?.colors?.warning ? config.colors.warning : "#fcc419").whiteBright("  \u26A0 Warn  ")}  ${_chalk.hex(
-              config?.colors?.warning ? config.colors.warning : "#fcc419"
-            )(message)}
+${_chalk.bold.hex(colors.warning ?? "#e3b341")("> ")} ${_chalk.bold.bgHex(colors.warning ?? "#e3b341").whiteBright(
+              "  \u26A0 Warn  "
+            )}  ${_chalk.hex(colors.warning ?? "#e3b341")(formatLogMessage(message))}
 `
           );
         };
@@ -72502,9 +72508,9 @@ ${_chalk.bold.hex(config?.colors?.warning ? config.colors.warning : "#fcc419")("
         return (message) => {
           console.info(
             `
-${_chalk.bold.hex(config?.colors?.success ? config.colors.success : "#087f5b")(">")} ${_chalk.bold.bgHex(config?.colors?.success ? config.colors.success : "#087f5b").whiteBright(" \u2713 Success ")}  ${_chalk.hex(
-              config?.colors?.success ? config.colors.success : "#087f5b"
-            )(message)}
+${_chalk.bold.hex(colors.success ?? "#56d364")(">")} ${_chalk.bold.bgHex(colors.success ?? "#56d364").whiteBright(
+              " \u2713 Success "
+            )}  ${_chalk.hex(colors.success ?? "#56d364")(formatLogMessage(message))}
 `
           );
         };
@@ -72513,9 +72519,9 @@ ${_chalk.bold.hex(config?.colors?.success ? config.colors.success : "#087f5b")("
         return (message) => {
           console.info(
             `
-${_chalk.bold.hex(config?.colors?.info ? config.colors.info : "#0ea5e9")(">")} ${_chalk.bold.bgHex(config?.colors?.info ? config.colors.info : "#0ea5e9").whiteBright("  \u2139 Info  ")}  ${_chalk.hex(
-              config?.colors?.info ? config.colors.info : "#0ea5e9"
-            )(message)}
+${_chalk.bold.hex(colors.info ?? "#58a6ff")(">")} ${_chalk.bold.bgHex(colors.info ?? "#58a6ff").whiteBright(
+              "  \u2139 Info  "
+            )}  ${_chalk.hex(colors.info ?? "#58a6ff")(formatLogMessage(message))}
 `
           );
         };
@@ -72524,9 +72530,9 @@ ${_chalk.bold.hex(config?.colors?.info ? config.colors.info : "#0ea5e9")(">")} $
         return (message) => {
           console.debug(
             `
-${_chalk.bold.hex(config?.colors?.primary ? config.colors.primary : "#1fb2a6")(">")} ${_chalk.bold.bgHex(config?.colors?.primary ? config.colors.primary : "#1fb2a6").whiteBright(" \u{1F6E0}  Debug ")}  ${_chalk.hex(
-              config?.colors?.primary ? config.colors.primary : "#1fb2a6"
-            )(message)}
+${_chalk.bold.hex(colors.primary ?? "#1fb2a6")(">")} ${_chalk.bold.bgHex(colors.primary ?? "#1fb2a6").whiteBright(
+              " \u{1F6E0}  Debug "
+            )}  ${_chalk.hex(colors.primary ?? "#1fb2a6")(formatLogMessage(message))}
 `
           );
         };
@@ -72534,9 +72540,9 @@ ${_chalk.bold.hex(config?.colors?.primary ? config.colors.primary : "#1fb2a6")("
       return (message) => {
         console.log(
           `
-${_chalk.bold.hex(config?.colors?.primary ? config.colors.primary : "#1fb2a6")(">")} ${_chalk.bold.bgHex(config?.colors?.primary ? config.colors.primary : "#1fb2a6").whiteBright(" \u2709 System ")}  ${_chalk.hex(
-            config?.colors?.primary ? config.colors.primary : "#1fb2a6"
-          )(message)}
+${_chalk.bold.hex(colors.primary ?? "#1fb2a6")(">")} ${_chalk.bold.bgHex(colors.primary ?? "#1fb2a6").whiteBright(
+            " \u2709 System "
+          )}  ${_chalk.hex(colors.primary ?? "#1fb2a6")(formatLogMessage(message))}
 `
         );
       };
@@ -72563,6 +72569,19 @@ ${_chalk.bold.hex(config?.colors?.primary ? config.colors.primary : "#1fb2a6")("
         );
       };
     };
+    formatLogMessage = (message, prefix = "-") => {
+      return typeof message === "string" ? message : typeof message === "object" ? Object.keys(message).map(
+        (key) => ` ${prefix} ${key} = ${_isFunction(message[key]) ? "<function>" : typeof message[key] === "object" ? `
+${formatLogMessage(message[key], `${prefix}-`)}` : message[key]}`
+      ).join("\n") : message;
+    };
+    _isFunction = (value2) => {
+      try {
+        return value2 instanceof Function || typeof value2 === "function" || !!(value2?.constructor && value2?.call && value2?.apply);
+      } catch (e2) {
+        return false;
+      }
+    };
   }
 });
 
@@ -72739,10 +72758,99 @@ var init_utilities = __esm({
   }
 });
 
+// packages/config-tools/src/config-file/get-config-file.ts
+var import_deepmerge, getConfigFileByName, getConfigFile;
+var init_get_config_file = __esm({
+  "packages/config-tools/src/config-file/get-config-file.ts"() {
+    init_find_workspace_root();
+    init_dist10();
+    import_deepmerge = __toESM(require_cjs());
+    init_utilities();
+    getConfigFileByName = async (fileName, filePath, options = {}) => {
+      const workspacePath = filePath ? filePath : findWorkspaceRoot(filePath);
+      let config = loadConfig({
+        cwd: workspacePath,
+        packageJson: true,
+        name: fileName,
+        envName: fileName?.toUpperCase(),
+        jitiOptions: {
+          debug: true,
+          cache: process.env.STORM_CACHE ? process.env.STORM_CACHE_DIRECTORY : false
+        },
+        ...options
+      });
+      if (!config || Object.keys(config).length === 0) {
+        config = loadConfig({
+          cwd: workspacePath,
+          packageJson: true,
+          name: fileName,
+          envName: fileName?.toUpperCase(),
+          jitiOptions: {
+            debug: true,
+            cache: process.env.STORM_CACHE ? process.env.STORM_CACHE_DIRECTORY : false
+          },
+          configFile: fileName,
+          ...options
+        });
+      }
+      return config;
+    };
+    getConfigFile = async (filePath, additionalFileNames = []) => {
+      const workspacePath = filePath ? filePath : findWorkspaceRoot(filePath);
+      let { config, configFile } = await getConfigFileByName(
+        "storm",
+        workspacePath
+      );
+      if (config && Object.keys(config).length > 0) {
+        writeTrace(
+          `Found Storm configuration file "${configFile}" at "${workspacePath}"`,
+          {
+            logLevel: "all"
+          }
+        );
+        writeTrace(config, { logLevel: "all" });
+      }
+      if (additionalFileNames && additionalFileNames.length > 0) {
+        const results = await Promise.all(
+          additionalFileNames.map(
+            (fileName) => getConfigFileByName(fileName, workspacePath)
+          )
+        );
+        for (const result of results) {
+          if (result?.config && Object.keys(result.config).length > 0) {
+            writeTrace(
+              `Found additional configuration file "${result.configFile}" at "${workspacePath}"`,
+              {
+                logLevel: "all"
+              }
+            );
+            writeTrace(result.config, { logLevel: "all" });
+            config = (0, import_deepmerge.default)(config ?? {}, result.config ?? {});
+          }
+        }
+      }
+      if (!config) {
+        return void 0;
+      }
+      config.configFile = configFile;
+      config.runtimeVersion = "0.0.1";
+      return config;
+    };
+  }
+});
+
+// packages/config-tools/src/config-file/index.ts
+var init_config_file = __esm({
+  "packages/config-tools/src/config-file/index.ts"() {
+    init_get_config_file();
+  }
+});
+
 // packages/config-tools/src/env/get-env.ts
-var getExtensionEnv, getConfigEnv;
+var getExtensionEnv, getConfigEnv, getThemeColorConfigEnv, getSingleThemeColorConfigEnv, getMultiThemeColorConfigEnv, getBaseThemeColorConfigEnv;
 var init_get_env = __esm({
   "packages/config-tools/src/env/get-env.ts"() {
+    init_src();
     init_utilities();
     init_correct_paths();
     getExtensionEnv = (extensionName) => {
@@ -72783,16 +72891,6 @@ var init_get_env = __esm({
         ci: process.env[`${prefix}CI`] !== void 0 ? Boolean(
           process.env[`${prefix}CI`] ?? process.env.CI ?? process.env.CONTINUOUS_INTEGRATION
         ) : void 0,
-        colors: {
-          primary: process.env[`${prefix}COLOR_PRIMARY`],
-          dark: process.env[`${prefix}COLOR_DARK`],
-          light: process.env[`${prefix}COLOR_LIGHT`],
-          success: process.env[`${prefix}COLOR_SUCCESS`],
-          info: process.env[`${prefix}COLOR_INFO`],
-          warning: process.env[`${prefix}COLOR_WARNING`],
-          error: process.env[`${prefix}COLOR_ERROR`],
-          fatal: process.env[`${prefix}COLOR_FATAL`]
-        },
         repository: process.env[`${prefix}REPOSITORY`],
         branch: process.env[`${prefix}BRANCH`],
         preid: process.env[`${prefix}PRE_ID`],
@@ -72803,6 +72901,18 @@ var init_get_env = __esm({
           Number.parseInt(process.env[`${prefix}LOG_LEVEL`])
         ) : process.env[`${prefix}LOG_LEVEL`] : void 0
       };
+      const themeNames = Object.keys(process.env).filter(
+        (envKey) => envKey.startsWith(`${prefix}COLOR_`) && COLOR_KEYS.every(
+          (colorKey) => !envKey.startsWith(`${prefix}COLOR_LIGHT_${colorKey}`) && !envKey.startsWith(`${prefix}COLOR_DARK_${colorKey}`)
+        )
+      );
+      config.colors = themeNames.length > 0 ? themeNames.reduce(
+        (ret, themeName) => {
+          ret[themeName] = getThemeColorConfigEnv(prefix, themeName);
+          return ret;
+        },
+        {}
+      ) : getThemeColorConfigEnv(prefix);
       const serializedConfig = process.env[`${prefix}CONFIG`];
       if (serializedConfig) {
         const parsed = JSON.parse(serializedConfig);
@@ -72815,11 +72925,53 @@ var init_get_env = __esm({
       }
       return config;
     };
+    getThemeColorConfigEnv = (prefix, theme) => {
+      const themeName = `COLOR_${theme && theme !== "base" ? `${theme}_` : ""}`.toUpperCase();
+      return process.env[`${prefix}${themeName}LIGHT_PRIMARY`] || process.env[`${prefix}${themeName}DARK_PRIMARY`] ? getMultiThemeColorConfigEnv(prefix + themeName) : getSingleThemeColorConfigEnv(prefix + themeName);
+    };
+    getSingleThemeColorConfigEnv = (prefix) => {
+      return {
+        dark: process.env[`${prefix}DARK`],
+        light: process.env[`${prefix}LIGHT`],
+        primary: process.env[`${prefix}PRIMARY`],
+        secondary: process.env[`${prefix}SECONDARY`],
+        tertiary: process.env[`${prefix}TERTIARY`],
+        accent: process.env[`${prefix}ACCENT`],
+        success: process.env[`${prefix}SUCCESS`],
+        info: process.env[`${prefix}INFO`],
+        warning: process.env[`${prefix}WARNING`],
+        error: process.env[`${prefix}ERROR`],
+        fatal: process.env[`${prefix}FATAL`]
+      };
+    };
+    getMultiThemeColorConfigEnv = (prefix) => {
+      return {
+        light: getBaseThemeColorConfigEnv(
+          `${prefix}_LIGHT_`
+        ),
+        dark: getBaseThemeColorConfigEnv(`${prefix}_DARK_`)
+      };
+    };
+    getBaseThemeColorConfigEnv = (prefix) => {
+      return {
+        foreground: process.env[`${prefix}FOREGROUND`],
+        background: process.env[`${prefix}BACKGROUND`],
+        primary: process.env[`${prefix}PRIMARY`],
+        secondary: process.env[`${prefix}SECONDARY`],
+        tertiary: process.env[`${prefix}TERTIARY`],
+        accent: process.env[`${prefix}ACCENT`],
+        success: process.env[`${prefix}SUCCESS`],
+        info: process.env[`${prefix}INFO`],
+        warning: process.env[`${prefix}WARNING`],
+        error: process.env[`${prefix}ERROR`],
+        fatal: process.env[`${prefix}FATAL`]
+      };
+    };
   }
 });
 
 // packages/config-tools/src/env/set-env.ts
-var setExtensionEnv, setConfigEnv;
+var setExtensionEnv, setConfigEnv, setThemeColorConfigEnv, setSingleThemeColorConfigEnv, setMultiThemeColorConfigEnv, setBaseThemeColorConfigEnv;
 var init_set_env = __esm({
   "packages/config-tools/src/env/set-env.ts"() {
     init_types2();
@@ -72935,29 +73087,15 @@ var init_set_env = __esm({
         process.env.CI = String(config.ci);
         process.env.CONTINUOUS_INTEGRATION = String(config.ci);
       }
-      if (config.colors.primary) {
-        process.env[`${prefix}COLOR_PRIMARY`] = config.colors.primary;
-      }
-      if (config.colors.dark) {
-        process.env[`${prefix}COLOR_DARK`] = config.colors.dark;
-      }
-      if (config.colors.light) {
-        process.env[`${prefix}COLOR_LIGHT`] = config.colors.light;
-      }
-      if (config.colors.success) {
-        process.env[`${prefix}COLOR_SUCCESS`] = config.colors.success;
-      }
-      if (config.colors.info) {
-        process.env[`${prefix}COLOR_INFO`] = config.colors.info;
-      }
-      if (config.colors.warning) {
-        process.env[`${prefix}COLOR_WARNING`] = config.colors.warning;
-      }
-      if (config.colors.error) {
-        process.env[`${prefix}COLOR_ERROR`] = config.colors.error;
-      }
-      if (config.colors.fatal) {
-        process.env[`${prefix}COLOR_FATAL`] = config.colors.fatal;
+      if (config.colors?.base?.light || config.colors?.base?.dark) {
+        for (const key of Object.keys(config.colors)) {
+          setThemeColorConfigEnv(`${prefix}COLOR_${key}_`, config.colors[key]);
+        }
+      } else {
+        setThemeColorConfigEnv(
+          `${prefix}COLOR_`,
+          config.colors
+        );
       }
       if (config.repository) {
         process.env[`${prefix}REPOSITORY`] = config.repository;
@@ -72986,11 +73124,90 @@ var init_set_env = __esm({
         config.extensions[key] && Object.keys(config.extensions[key]) && setExtensionEnv(key, config.extensions[key]);
       }
     };
+    setThemeColorConfigEnv = (prefix, config) => {
+      return config?.light?.primary || config?.dark?.primary ? setMultiThemeColorConfigEnv(prefix, config) : setSingleThemeColorConfigEnv(prefix, config);
+    };
+    setSingleThemeColorConfigEnv = (prefix, config) => {
+      if (config.dark) {
+        process.env[`${prefix}DARK`] = config.dark;
+      }
+      if (config.light) {
+        process.env[`${prefix}LIGHT`] = config.light;
+      }
+      if (config.primary) {
+        process.env[`${prefix}PRIMARY`] = config.primary;
+      }
+      if (config.secondary) {
+        process.env[`${prefix}SECONDARY`] = config.secondary;
+      }
+      if (config.tertiary) {
+        process.env[`${prefix}TERTIARY`] = config.tertiary;
+      }
+      if (config.accent) {
+        process.env[`${prefix}ACCENT`] = config.accent;
+      }
+      if (config.success) {
+        process.env[`${prefix}SUCCESS`] = config.success;
+      }
+      if (config.info) {
+        process.env[`${prefix}INFO`] = config.info;
+      }
+      if (config.warning) {
+        process.env[`${prefix}WARNING`] = config.warning;
+      }
+      if (config.error) {
+        process.env[`${prefix}ERROR`] = config.error;
+      }
+      if (config.fatal) {
+        process.env[`${prefix}FATAL`] = config.fatal;
+      }
+    };
+    setMultiThemeColorConfigEnv = (prefix, config) => {
+      return {
+        light: setBaseThemeColorConfigEnv(`${prefix}_LIGHT_`, config.light),
+        dark: setBaseThemeColorConfigEnv(`${prefix}_DARK_`, config.dark)
+      };
+    };
+    setBaseThemeColorConfigEnv = (prefix, config) => {
+      if (config.foreground) {
+        process.env[`${prefix}FOREGROUND`] = config.foreground;
+      }
+      if (config.background) {
+        process.env[`${prefix}BACKGROUND`] = config.background;
+      }
+      if (config.primary) {
+        process.env[`${prefix}PRIMARY`] = config.primary;
+      }
+      if (config.secondary) {
+        process.env[`${prefix}SECONDARY`] = config.secondary;
+      }
+      if (config.tertiary) {
+        process.env[`${prefix}TERTIARY`] = config.tertiary;
+      }
+      if (config.accent) {
+        process.env[`${prefix}ACCENT`] = config.accent;
+      }
+      if (config.success) {
+        process.env[`${prefix}SUCCESS`] = config.success;
+      }
+      if (config.info) {
+        process.env[`${prefix}INFO`] = config.info;
+      }
+      if (config.warning) {
+        process.env[`${prefix}WARNING`] = config.warning;
+      }
+      if (config.error) {
+        process.env[`${prefix}ERROR`] = config.error;
+      }
+      if (config.fatal) {
+        process.env[`${prefix}FATAL`] = config.fatal;
+      }
+    };
   }
 });
 
 // packages/config-tools/src/create-storm-config.ts
-var _extension_cache, _static_cache, createConfig, createStormConfig, createConfigExtension, loadStormConfig;
+var import_deepmerge2, _extension_cache, _static_cache, createConfig, createStormConfig, createConfigExtension, loadStormConfig;
 var init_create_storm_config = __esm({
   "packages/config-tools/src/create-storm-config.ts"() {
     init_get_config_file();
@@ -72999,6 +73216,7 @@ var init_create_storm_config = __esm({
     init_schema();
     init_utilities();
     init_get_default_config();
+    import_deepmerge2 = __toESM(require_cjs());
     _extension_cache = /* @__PURE__ */ new WeakMap();
     _static_cache = void 0;
     createConfig = (workspaceRoot3) => {
@@ -73047,7 +73265,9 @@ var init_create_storm_config = __esm({
       if (!_workspaceRoot) {
         _workspaceRoot = findWorkspaceRoot();
       }
-      const configFile = await getConfigFile(_workspaceRoot);
+      let configFile = await getConfigFile(
+        _workspaceRoot
+      );
       if (!configFile) {
         writeWarning(
           "No Storm config file found in the current workspace. Please ensure this is the expected behavior - you can add a `storm.json` file to the root of your workspace if it is not.\n",
@@ -73056,10 +73276,7 @@ var init_create_storm_config = __esm({
       }
       config = StormConfigSchema.parse(
         await getDefaultConfig(
-          {
-            ...getConfigEnv(),
-            ...configFile
-          },
+          (0, import_deepmerge2.default)(getConfigEnv(), configFile, {}),
           _workspaceRoot
         )
       );
@@ -73097,6 +73314,7 @@ __export(src_exports, {
   findFileName: () => findFileName,
   findWorkspaceRoot: () => findWorkspaceRoot,
   findWorkspaceRootSafe: () => findWorkspaceRootSafe,
+  formatLogMessage: () => formatLogMessage,
   getChalk: () => getChalk,
   getConfigEnv: () => getConfigEnv,
   getConfigFile: () => getConfigFile,
@@ -222415,7 +222633,7 @@ ${lanes.join("\n")}
           return true;
         }
         if (shouldReallyMerge(a2.node, b6.node, parent2)) {
-          merge2(a2, b6);
+          merge3(a2, b6);
           return true;
         }
         return false;
@@ -222449,7 +222667,7 @@ ${lanes.join("\n")}
         }
         return a2.body.kind === b6.body.kind && (a2.body.kind !== 267 || areSameModule(a2.body, b6.body));
       }
-      function merge2(target, source) {
+      function merge3(target, source) {
         target.additionalNodes = target.additionalNodes || [];
         target.additionalNodes.push(source.node);
         if (source.additionalNodes) {