@maestro-js/cli 1.0.0-alpha.23 → 1.0.0-alpha.3

package/dist/bin.js

@@ -456,6 +456,7 @@ async function resolveDbConfig(opts) {
     password,
     database
   };
+  console.log(resolved);
   return resolved;
 }
 async function createDb(config) {
@@ -608,19 +609,15 @@ function hashMakeKey() {
 import { execSync as execSync3 } from "child_process";
 async function configRun(opts) {
   const { Config } = await import("@maestro-js/config").catch(() => requirePeer("@maestro-js/config"));
-  const configNames = opts.config ? Array.isArray(opts.config) ? opts.config : [opts.config] : [];
-  if (configNames.length === 0) {
+  const configName = opts.config;
+  if (!configName) {
     console.error("Missing required --config <name> option");
     process.exit(1);
   }
   const rootDir = opts.root ?? process.cwd();
   const envName = opts.env ?? null;
   const encryptionKey = opts.key ?? process.env["MAESTRO_ENV_ENCRYPTION_KEY"] ?? null;
-  const merged = {};
-  for (const configName of configNames) {
-    const config = await Config.getConfig({ rootDir, configName, envName, encryptionKey });
-    Object.assign(merged, config);
-  }
+  const config = await Config.getConfig({ rootDir, configName, envName, encryptionKey });
   const command = opts._.join(" ");
   if (!command) {
     console.error("No command provided. Usage: maestro config:run --config <name> [options] -- <command>");
@@ -628,7 +625,7 @@ async function configRun(opts) {
   }
   execSync3(command, {
     stdio: "inherit",
-    env: { ...process.env, ...merged }
+    env: { ...process.env, ...config }
   });
 }
 
@@ -653,11 +650,8 @@ async function componentsAdd(name, opts) {
 
 // src/commands/skills.ts
 import { execSync as execSync4 } from "child_process";
-import fs from "fs";
-import path from "path";
-import { fileURLToPath } from "url";
 function skillsInstall(opts) {
-  const args = ["npx", "--yes", `@maestro-js/agent-skills@${getCurrentVersion()}`];
+  const args = ["npx", "--yes", "@maestro-js/agent-skills"];
   if (opts.interactive) args.push("--interactive");
   if (opts.copy) args.push("--copy");
   try {
@@ -666,22 +660,16 @@ function skillsInstall(opts) {
     process.exit(1);
   }
 }
-function getCurrentVersion() {
-  const dir = path.dirname(fileURLToPath(import.meta.url));
-  const raw = fs.readFileSync(path.join(dir, "../package.json"), "utf-8");
-  const pkg = JSON.parse(raw);
-  return pkg.version;
-}
 
 // src/commands/upgrade.ts
 import { execSync as execSync5 } from "child_process";
-import fs2 from "fs";
-import path2 from "path";
-import { fileURLToPath as fileURLToPath2 } from "url";
+import fs from "fs";
+import path from "path";
+import { fileURLToPath } from "url";
 import prompts4 from "prompts";
 var onCancel2 = () => process.exit(0);
 async function upgrade() {
-  const current = getCurrentVersion2();
+  const current = getCurrentVersion();
   console.log(`Current @maestro-js version: ${current}`);
   const versions = fetchAvailableVersions();
   const newer = filterNewerVersions(versions, current);
@@ -700,9 +688,9 @@ async function upgrade() {
 Updated ${updated} package.json file${updated === 1 ? "" : "s"}.`);
   await runInstall();
 }
-function getCurrentVersion2() {
-  const dir = path2.dirname(fileURLToPath2(import.meta.url));
-  const raw = fs2.readFileSync(path2.join(dir, "../package.json"), "utf-8");
+function getCurrentVersion() {
+  const dir = path.dirname(fileURLToPath(import.meta.url));
+  const raw = fs.readFileSync(path.join(dir, "../package.json"), "utf-8");
   const pkg = JSON.parse(raw);
   return pkg.version;
 }
@@ -767,19 +755,19 @@ function findAndUpdatePackageJsonFiles(targetVersion) {
 function findPackageJsonFiles(dir) {
   const results = [];
   const skipDirs = /* @__PURE__ */ new Set(["node_modules", ".git", "dist", ".next", ".nuxt"]);
-  for (const entry of fs2.readdirSync(dir, { withFileTypes: true })) {
+  for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
     if (entry.isDirectory()) {
       if (!skipDirs.has(entry.name)) {
-        results.push(...findPackageJsonFiles(path2.join(dir, entry.name)));
+        results.push(...findPackageJsonFiles(path.join(dir, entry.name)));
       }
     } else if (entry.name === "package.json") {
-      results.push(path2.join(dir, entry.name));
+      results.push(path.join(dir, entry.name));
     }
   }
   return results;
 }
 function updateMaestroDependencies(filePath, targetVersion) {
-  const raw = fs2.readFileSync(filePath, "utf-8");
+  const raw = fs.readFileSync(filePath, "utf-8");
   const pkg = JSON.parse(raw);
   let changed = false;
   for (const depKey of ["dependencies", "devDependencies", "peerDependencies", "optionalDependencies"]) {
@@ -802,8 +790,8 @@ function updateMaestroDependencies(filePath, targetVersion) {
     const trailingNewline = raw.endsWith("\n");
     let output = JSON.stringify(pkg, null, indent);
     if (trailingNewline) output += "\n";
-    fs2.writeFileSync(filePath, output, "utf-8");
-    console.log(`  Updated ${path2.relative(process.cwd(), filePath)}`);
+    fs.writeFileSync(filePath, output, "utf-8");
+    console.log(`  Updated ${path.relative(process.cwd(), filePath)}`);
   }
   return changed;
 }
@@ -822,7 +810,7 @@ ${pm} install failed. package.json files have been updated \u2014 run install ma
 function detectPackageManager() {
   const root = process.cwd();
   try {
-    const raw = fs2.readFileSync(path2.join(root, "package.json"), "utf-8");
+    const raw = fs.readFileSync(path.join(root, "package.json"), "utf-8");
     const pkg = JSON.parse(raw);
     if (pkg.packageManager) {
       const name = pkg.packageManager.split("@")[0];
@@ -830,8 +818,8 @@ function detectPackageManager() {
     }
   } catch {
   }
-  if (fs2.existsSync(path2.join(root, "pnpm-lock.yaml"))) return "pnpm";
-  if (fs2.existsSync(path2.join(root, "yarn.lock"))) return "yarn";
+  if (fs.existsSync(path.join(root, "pnpm-lock.yaml"))) return "pnpm";
+  if (fs.existsSync(path.join(root, "yarn.lock"))) return "yarn";
   return "npm";
 }
 function detectIndent(json) {
@@ -874,22 +862,13 @@ function compareSemver(a, b) {
 
 // src/commands/init.ts
 import { execSync as execSync6 } from "child_process";
-import fs3 from "fs";
-import path3 from "path";
-import { fileURLToPath as fileURLToPath3 } from "url";
 function init(name) {
   try {
-    execSync6(`npx --yes @maestro-js/init@${getCurrentVersion3()} ${name}`, { stdio: "inherit" });
+    execSync6(`npx --yes @maestro-js/init ${name}`, { stdio: "inherit" });
   } catch {
     process.exit(1);
   }
 }
-function getCurrentVersion3() {
-  const dir = path3.dirname(fileURLToPath3(import.meta.url));
-  const raw = fs3.readFileSync(path3.join(dir, "../package.json"), "utf-8");
-  const pkg = JSON.parse(raw);
-  return pkg.version;
-}
 
 // src/bin.ts
 var require2 = createRequire(import.meta.url);
@@ -908,7 +887,7 @@ prog.command("env:encrypt <env>").describe("Encrypt a .env file").option("--key
 prog.command("env:decrypt <env>").describe("Decrypt a .env.encrypted file").option("--key <value>", "Encryption key (env: MAESTRO_ENV_ENCRYPTION_KEY)").option("--force", "Overwrite existing .env file").action(envDecrypt);
 prog.command("components:list").describe("List available components").action(componentsList);
 prog.command("components:add [name]").describe("Add components to the current project").option("--directory", "Target directory (default: cwd)").option("--overwrite", "Overwrite existing files").option("--all", "Add all available components").action(componentsAdd);
-prog.command("config:run").describe("Resolve config and run a command with the config values as environment variables").option("--config <name>", "Config name (required, repeatable; later configs override earlier)").option("--root <path>", "Project root directory (default: cwd)").option("--env <name>", "Environment name (e.g. production)").option("--key <value>", "Encryption key (env: MAESTRO_ENV_ENCRYPTION_KEY)").action(configRun);
+prog.command("config:run").describe("Resolve config and run a command with the config values as environment variables").option("--config <name>", "Config name (required)").option("--root <path>", "Project root directory (default: cwd)").option("--env <name>", "Environment name (e.g. production)").option("--key <value>", "Encryption key (env: MAESTRO_ENV_ENCRYPTION_KEY)").action(configRun);
 prog.command("skills:install").describe("Install agent skills from @maestro-js/agent-skills").option("--interactive", "Run in interactive mode (select skills manually)").option("--copy", "Copy skill files instead of symlinking").action(skillsInstall);
 prog.command("upgrade").describe("Upgrade @maestro-js/* packages to a newer version").action(upgrade);
 prog.command("init <name>").describe("Scaffold a new Maestro project").action(init);

package/package.json

@@ -13,22 +13,22 @@
     "sade": "^1.8.1"
   },
   "peerDependencies": {
-    "@maestro-js/components": "1.0.0-alpha.23",
-    "@maestro-js/agent-container": "1.0.0-alpha.23",
-    "@maestro-js/db": "1.0.0-alpha.23",
-    "@maestro-js/config": "1.0.0-alpha.23",
-    "@maestro-js/db-migrate": "1.0.0-alpha.23"
+    "@maestro-js/agent-container": "1.0.0-alpha.3",
+    "@maestro-js/components": "1.0.0-alpha.3",
+    "@maestro-js/config": "1.0.0-alpha.3",
+    "@maestro-js/db": "1.0.0-alpha.3",
+    "@maestro-js/db-migrate": "1.0.0-alpha.3"
   },
   "devDependencies": {
     "@types/node": "^22.19.11",
     "@types/prompts": "^2.4.9",
-    "@maestro-js/agent-container": "1.0.0-alpha.23",
-    "@maestro-js/components": "1.0.0-alpha.23",
-    "@maestro-js/config": "1.0.0-alpha.23",
-    "@maestro-js/db": "1.0.0-alpha.23",
-    "@maestro-js/db-migrate": "1.0.0-alpha.23"
+    "@maestro-js/agent-container": "1.0.0-alpha.3",
+    "@maestro-js/components": "1.0.0-alpha.3",
+    "@maestro-js/config": "1.0.0-alpha.3",
+    "@maestro-js/db": "1.0.0-alpha.3",
+    "@maestro-js/db-migrate": "1.0.0-alpha.3"
   },
-  "version": "1.0.0-alpha.23",
+  "version": "1.0.0-alpha.3",
   "publishConfig": {
     "access": "restricted"
   },