keytec-ai-cli 0.4.0 → 0.5.0

package/dist/cli.js

@@ -10426,14 +10426,48 @@ function resolveConfigPath(path2 = ".keytec-ai.yml") {
   }
   throw new Error(`${path2}: not found in ${process.cwd()} or any parent directory`);
 }
-function loadConfig(path2 = ".keytec-ai.yml") {
-  const resolved = resolveConfigPath(path2);
-  const doc = $parse(readFileSync2(resolved, "utf8"));
+function readConfigFile(path2) {
+  const doc = $parse(readFileSync2(path2, "utf8"));
   if (!doc || typeof doc !== "object" || Array.isArray(doc)) {
-    throw new Error(`${resolved}: not a valid YAML object`);
+    throw new Error(`${path2}: not a valid YAML object`);
   }
   return doc;
 }
+function isPlainObject(v) {
+  return typeof v === "object" && v !== null && !Array.isArray(v);
+}
+function deepMerge(base, overlay) {
+  const out = { ...base };
+  for (const [k, v] of Object.entries(overlay)) {
+    if (v === undefined)
+      continue;
+    if (isPlainObject(v) && isPlainObject(out[k])) {
+      out[k] = deepMerge(out[k], v);
+    } else {
+      out[k] = v;
+    }
+  }
+  return out;
+}
+function resolveOverlayPath(root, kind, name) {
+  const rel = `.keytec-ai/${kind}/${name}.yml`;
+  const abs = resolve(root, ".keytec-ai", kind, `${name}.yml`);
+  if (!existsSync2(abs))
+    throw new Error(`${rel}: not found`);
+  return abs;
+}
+function loadConfig(opts = {}) {
+  const basePath = resolveConfigPath(opts.config);
+  const root = dirname(basePath);
+  let config = readConfigFile(basePath);
+  if (opts.site) {
+    config = deepMerge(config, readConfigFile(resolveOverlayPath(root, "sites", opts.site)));
+  }
+  if (opts.feature) {
+    config = deepMerge(config, readConfigFile(resolveOverlayPath(root, "features", opts.feature)));
+  }
+  return config;
+}
 function flatten(obj, prefix, out) {
   for (const [k, v] of Object.entries(obj)) {
     const key = prefix ? `${prefix}_${k}` : k;
@@ -10464,8 +10498,10 @@ function toEnv(config) {
 // src/commands/config/index.ts
 function registerConfig(program2) {
   const group = program2.command("config").description("Inspect and export .keytec-ai.yml");
-  group.command("to-env").description("Render the config as flat UPPER_SNAKE env vars").option("--config <path>", "config file path (default: .keytec-ai.yml, searched upward)").option("--to-file <path>", "write the env vars to this file instead of stdout").action((o) => {
-    const env = toEnv(loadConfig(o.config));
+  group.command("to-env").description("Render the config as flat UPPER_SNAKE env vars").option("--config <path>", "config file path (default: .keytec-ai.yml, searched upward)").option("--site <name>", "apply the .keytec-ai/sites/<name>.yml overlay (env: KEYTEC_AI_SITE)").option("--feature <name>", "apply the .keytec-ai/features/<name>.yml overlay (env: KEYTEC_AI_FEATURE)").option("--to-file <path>", "write the env vars to this file instead of stdout").action((o) => {
+    const site = o.site ?? (process.env.KEYTEC_AI_SITE || undefined);
+    const feature = o.feature ?? (process.env.KEYTEC_AI_FEATURE || undefined);
+    const env = toEnv(loadConfig({ config: o.config, site, feature }));
     if (o.toFile) {
       writeFileSync(o.toFile, `${env}
 `);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "keytec-ai-cli",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "keytec-ai: one CLI for .keytec-ai.yml operations (deploy, env) — used by GitLab CI, the DDEV addon and the deploy skill",
   "type": "module",
   "bin": {