@maestro-js/cli 1.0.0-alpha.19 → 1.0.0-alpha.2

package/dist/bin.js

@@ -196,10 +196,9 @@ async function createDockerDb() {
 }
 var DATABASE_CONFIGS = {
   mysql: {
-    image: "mysql:8.0",
+    image: "mysql:8",
     defaultPort: 3306,
-    envFlags: (dbName, password) => ["-e", `MYSQL_ROOT_PASSWORD=${password}`, "-e", `MYSQL_DATABASE=${dbName}`],
-    cmdArgs: ["--default-authentication-plugin=mysql_native_password"]
+    envFlags: (dbName, password) => ["-e", `MYSQL_ROOT_PASSWORD=${password}`, "-e", `MYSQL_DATABASE=${dbName}`]
   },
   postgres: {
     image: "postgres:17",
@@ -296,8 +295,7 @@ function run(config, db) {
     "-p",
     `${config.port}:${db.defaultPort}`,
     ...db.envFlags(config.dbName, config.password),
-    db.image,
-    ...db.cmdArgs ?? []
+    db.image
   ];
   try {
     execSync(args.join(" "), { stdio: "pipe" });
@@ -320,20 +318,12 @@ Container "${config.containerName}" is running.`);
 
 // src/commands/agent.ts
 import { execSync as execSync2 } from "child_process";
+import { AgentContainer } from "@maestro-js/agent-container";
 import prompts3 from "prompts";
 
-// src/utils/require-peer.ts
-function requirePeer(pkg) {
-  console.error(`This command requires "${pkg}". Install it with:
-
-  pnpm add ${pkg}
-`);
-  process.exit(1);
-}
-
 // src/utils/agent.ts
+import { Config } from "@maestro-js/config";
 async function resolveAgentConfig(opts) {
-  const { Config } = await import("@maestro-js/config").catch(() => requirePeer("@maestro-js/config"));
   const config = await Config.getConfig({
     rootDir: process.cwd(),
     configName: "agent-container",
@@ -344,16 +334,12 @@ async function resolveAgentConfig(opts) {
     memory: opts.memory ?? process.env.AGENT_MEMORY ?? config.AGENT_MEMORY,
     cpus: opts.cpus ?? (process.env.AGENT_CPUS ?? config.AGENT_CPUS ? Number(process.env.AGENT_CPUS ?? config.AGENT_CPUS) : void 0),
     workDir: process.env.AGENT_WORK_DIR ?? config.AGENT_WORK_DIR,
-    dockerfile: config.AGENT_DOCKERFILE,
-    network: opts.network ?? process.env.AGENT_NETWORK ?? config.AGENT_NETWORK,
-    setup: config.AGENT_SETUP
+    dockerfile: config.AGENT_DOCKERFILE
   };
 }
 
 // src/commands/agent.ts
-var loadModule = () => import("@maestro-js/agent-container").catch(() => requirePeer("@maestro-js/agent-container"));
 async function agentMake(name, opts) {
-  const { AgentContainer } = await loadModule();
   const repoPath = opts.repo ?? findGitRoot();
   const env = parseEnv(opts.env);
   const agentConfig = await resolveAgentConfig(opts);
@@ -361,26 +347,22 @@ async function agentMake(name, opts) {
   console.log(`Make container: ${container.id}`);
 }
 async function agentKill(name) {
-  const { AgentContainer } = await loadModule();
   const target = name ?? await selectContainer("Select a container to kill");
   if (!target) return;
   await AgentContainer.kill(target);
   console.log(`Killed container: ${target}`);
 }
 async function agentShell(name) {
-  const { AgentContainer } = await loadModule();
   const target = name ?? await selectContainer("Select a container to shell into");
   if (!target) return;
   await AgentContainer.shell(target);
 }
 async function agentOpen(name) {
-  const { AgentContainer } = await loadModule();
   const target = name ?? await selectContainer("Select a container to open in VS Code");
   if (!target) return;
   await AgentContainer.open(target);
 }
 async function agentPull(name, opts) {
-  const { AgentContainer } = await loadModule();
   const target = name ?? await selectContainer("Select a container to pull from");
   if (!target) return;
   const repoPath = opts.repo ?? findGitRoot();
@@ -392,7 +374,6 @@ async function agentPull(name, opts) {
   }
 }
 async function selectContainer(message) {
-  const { AgentContainer } = await loadModule();
   const containers = await AgentContainer.list();
   if (containers.length === 0) {
     console.log("No running agent containers.");
@@ -430,11 +411,13 @@ function parseEnv(env) {
 
 // src/commands/db-migrations.ts
 import { join } from "path";
+import { DbMigrations } from "@maestro-js/db-migrate";
 
 // src/utils/db.ts
+import { Config as Config2 } from "@maestro-js/config";
+import { Db } from "@maestro-js/db";
 async function resolveDbConfig(opts) {
-  const { Config } = await import("@maestro-js/config").catch(() => requirePeer("@maestro-js/config"));
-  const config = await Config.getConfig({
+  const config = await Config2.getConfig({
     rootDir: process.cwd(),
     configName: "db-migrate",
     envName: null,
@@ -456,10 +439,10 @@ async function resolveDbConfig(opts) {
     password,
     database
   };
+  console.log(resolved);
   return resolved;
 }
 async function createDb(config) {
-  const { Db } = await import("@maestro-js/db").catch(() => requirePeer("@maestro-js/db"));
   return Db.Provider.create({
     driver: Db.drivers.mysql({
       host: config.host,
@@ -473,9 +456,7 @@ async function createDb(config) {
 }
 
 // src/commands/db-migrations.ts
-var loadModule2 = () => import("@maestro-js/db-migrate").catch(() => requirePeer("@maestro-js/db-migrate"));
 async function dbMakeMigration(name) {
-  const { DbMigrations } = await loadModule2();
   const dir = join(process.cwd(), "infrastructure", "db-migrations");
   const files = await DbMigrations.scaffold({ name, dir });
   const cwd = process.cwd();
@@ -485,7 +466,6 @@ async function dbMakeMigration(name) {
   console.log(`  ${files.downSql.replace(cwd + "/", "")}`);
 }
 async function dbMigrate(opts) {
-  const { DbMigrations } = await loadModule2();
   const config = await resolveDbConfig(opts);
   const db = await createDb(config);
   try {
@@ -507,7 +487,6 @@ async function dbMigrate(opts) {
   }
 }
 async function dbRollback(opts) {
-  const { DbMigrations } = await loadModule2();
   const config = await resolveDbConfig(opts);
   const db = await createDb(config);
   try {
@@ -529,7 +508,6 @@ async function dbRollback(opts) {
   }
 }
 async function dbStatus(opts) {
-  const { DbMigrations } = await loadModule2();
   const config = await resolveDbConfig(opts);
   const db = await createDb(config);
   try {
@@ -552,41 +530,40 @@ async function dbStatus(opts) {
 }
 
 // src/commands/env.ts
-var loadModule3 = () => import("@maestro-js/config").catch(() => requirePeer("@maestro-js/config"));
-async function envGenKey() {
-  const { Config } = await loadModule3();
-  const key = Config.generateEncryptionKey();
+import { Config as Config3 } from "@maestro-js/config";
+function envGenKey() {
+  const key = Config3.generateEncryptionKey();
   console.log(key);
 }
-async function envEncrypt(envName, opts) {
-  const { Config } = await loadModule3();
+function envEncrypt(opts) {
   const encryptionKey = opts.key || process.env.MAESTRO_ENV_ENCRYPTION_KEY;
   if (!encryptionKey) {
     console.error("Encryption key is required. Use --key or set MAESTRO_ENV_ENCRYPTION_KEY.");
     process.exit(1);
   }
-  Config.generateEncryptedEnvFile({
+  const envName = opts.env || null;
+  Config3.generateEncryptedEnvFile({
     rootDir: process.cwd(),
     envName,
     encryptionKey
   });
-  const base = `.env.${envName}`;
+  const base = envName ? `.env.${envName}` : ".env";
   console.log(`Encrypted ${base} \u2192 ${base}.encrypted`);
 }
-async function envDecrypt(envName, opts) {
-  const { Config } = await loadModule3();
+function envDecrypt(opts) {
   const encryptionKey = opts.key || process.env.MAESTRO_ENV_ENCRYPTION_KEY;
   if (!encryptionKey) {
     console.error("Encryption key is required. Use --key or set MAESTRO_ENV_ENCRYPTION_KEY.");
     process.exit(1);
   }
-  Config.generateDecryptedEnvFile({
+  const envName = opts.env || null;
+  Config3.generateDecryptedEnvFile({
     rootDir: process.cwd(),
     envName,
     encryptionKey,
     force: opts.force
   });
-  const base = `.env.${envName}`;
+  const base = envName ? `.env.${envName}` : ".env";
   console.log(`Decrypted ${base}.encrypted \u2192 ${base}`);
 }
 
@@ -606,21 +583,17 @@ function hashMakeKey() {
 
 // src/commands/config.ts
 import { execSync as execSync3 } from "child_process";
+import { Config as Config4 } from "@maestro-js/config";
 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 Config4.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,21 +601,19 @@ async function configRun(opts) {
   }
   execSync3(command, {
     stdio: "inherit",
-    env: { ...process.env, ...merged }
+    env: { ...process.env, ...config }
   });
 }
 
 // src/commands/components.ts
-var loadModule4 = () => import("@maestro-js/components").catch(() => requirePeer("@maestro-js/components"));
+import { Components } from "@maestro-js/components";
 async function componentsList() {
-  const { Components } = await loadModule4();
   const names = await Components.list();
   for (const name of names) {
     console.log(name);
   }
 }
 async function componentsAdd(name, opts) {
-  const { Components } = await loadModule4();
   const components = opts.all ? await Components.list() : [name, ...opts._ || []];
   const directory = opts.directory || process.cwd();
   const written = await Components.add({ components, directory, overwrite: opts.overwrite });
@@ -651,37 +622,15 @@ async function componentsAdd(name, opts) {
   }
 }
 
-// src/commands/skills.ts
+// src/commands/upgrade.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()}`];
-  if (opts.interactive) args.push("--interactive");
-  if (opts.copy) args.push("--copy");
-  try {
-    execSync4(args.join(" "), { stdio: "inherit" });
-  } catch {
-    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 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,15 +649,15 @@ 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;
 }
 function fetchAvailableVersions() {
   try {
-    const raw = execSync5("npm view @maestro-js/cli versions --json", { encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] });
+    const raw = execSync4("npm view @maestro-js/cli versions --json", { encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] });
     const parsed = JSON.parse(raw);
     if (typeof parsed === "string") return [parsed];
     if (Array.isArray(parsed)) return parsed;
@@ -767,19 +716,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 +751,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;
 }
@@ -812,7 +761,7 @@ async function runInstall() {
   console.log(`
 Running ${pm} install...`);
   try {
-    execSync5(`${pm} install`, { stdio: "inherit", cwd: process.cwd() });
+    execSync4(`${pm} install`, { stdio: "inherit", cwd: process.cwd() });
     console.log("Done.");
   } catch {
     console.warn(`
@@ -822,7 +771,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 +779,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) {
@@ -872,25 +821,6 @@ function compareSemver(a, b) {
   return 0;
 }
 
-// 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" });
-  } 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);
 var { version } = require2("../package.json");
@@ -901,18 +831,16 @@ prog.command("db:make-container").describe("Create a Docker database container")
 prog.command("db:migrate").describe("Run pending database migrations").option("--host", "Database host (env: DB_HOST)").option("--port", "Database port (env: DB_PORT)").option("--user", "Database user (env: DB_USER)").option("--password", "Database password (env: DB_PASSWORD)").option("--database", "Database name (env: DB_DATABASE)").option("--dry-run", "Preview migrations without executing").option("--count", "Number of migrations to run").action(dbMigrate);
 prog.command("db:rollback").describe("Rollback database migrations").option("--host", "Database host (env: DB_HOST)").option("--port", "Database port (env: DB_PORT)").option("--user", "Database user (env: DB_USER)").option("--password", "Database password (env: DB_PASSWORD)").option("--database", "Database name (env: DB_DATABASE)").option("--dry-run", "Preview rollback without executing").option("--count", "Number of migrations to rollback", 1).action(dbRollback);
 prog.command("db:status").describe("Show database migration status").option("--host", "Database host (env: DB_HOST)").option("--port", "Database port (env: DB_PORT)").option("--user", "Database user (env: DB_USER)").option("--password", "Database password (env: DB_PASSWORD)").option("--database", "Database name (env: DB_DATABASE)").action(dbStatus);
-prog.command("env:gen-key").describe("Generate an encryption key").action(envGenKey);
+prog.command("env:generate-key").describe("Generate an encryption key").action(envGenKey);
 prog.command("crypt:make-key").describe("Generate an encryption key for use with @maestro-js/crypt").action(cryptMakeKey);
 prog.command("hash:make-key").describe("Generate a signing key for use with @maestro-js/hash").action(hashMakeKey);
-prog.command("env:encrypt <env>").describe("Encrypt a .env file").option("--key <value>", "Encryption key (env: MAESTRO_ENV_ENCRYPTION_KEY)").action(envEncrypt);
-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("env:encrypt").describe("Encrypt a .env file").option("--env", "Environment name (e.g. production)").option("--key", "Encryption key (env: MAESTRO_ENV_ENCRYPTION_KEY)").action(envEncrypt);
+prog.command("env:decrypt").describe("Decrypt a .env.encrypted file").option("--env", "Environment name (e.g. production)").option("--key", "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("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("config:run").describe("Resolve config and run a command with the config values as environment variables").option("--config", "Config name (required)").option("--root", "Project root directory (default: cwd)").option("--env", "Environment name (e.g. production)").option("--key", "Encryption key (env: MAESTRO_ENV_ENCRYPTION_KEY)").action(configRun);
 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);
-prog.command("agent:make [name]").describe("Launch an interactive shell in an isolated Docker agent container").option("--repo", "Path to the repository (default: cwd)").option("--env", "Environment variable as KEY=VALUE (repeatable)").option("--memory", "Memory limit (env: AGENT_MEMORY)").option("--cpus", "Number of CPUs (env: AGENT_CPUS)").option("--network", "Docker network to attach to (env: AGENT_NETWORK)").action(agentMake);
+prog.command("agent:make [name]").describe("Launch an interactive shell in an isolated Docker agent container").option("--repo", "Path to the repository (default: cwd)").option("--env", "Environment variable as KEY=VALUE (repeatable)").option("--memory", "Memory limit (env: AGENT_MEMORY)").option("--cpus", "Number of CPUs (env: AGENT_CPUS)").action(agentMake);
 prog.command("agent:kill [name]").describe("Kill an agent container (prompts if no name given)").action(agentKill);
 prog.command("agent:shell [name]").describe("Shell into an agent container (prompts if no name given)").action(agentShell);
 prog.command("agent:pull [name]").describe("Pull container changes onto the host working tree (prompts if no name given)").option("--repo", "Path to the repository (default: cwd git root)").action(agentPull);

package/package.json

@@ -10,25 +10,18 @@
     "@aws-sdk/client-ssm": "^3.750.0",
     "@aws-sdk/client-sts": "^3.993.0",
     "prompts": "^2.4.2",
-    "sade": "^1.8.1"
-  },
-  "peerDependencies": {
-    "@maestro-js/agent-container": "1.0.0-alpha.19",
-    "@maestro-js/components": "1.0.0-alpha.19",
-    "@maestro-js/db-migrate": "1.0.0-alpha.19",
-    "@maestro-js/config": "1.0.0-alpha.19",
-    "@maestro-js/db": "1.0.0-alpha.19"
+    "sade": "^1.8.1",
+    "@maestro-js/components": "1.0.0-alpha.2",
+    "@maestro-js/agent-container": "1.0.0-alpha.2",
+    "@maestro-js/config": "1.0.0-alpha.2",
+    "@maestro-js/db": "1.0.0-alpha.2",
+    "@maestro-js/db-migrate": "1.0.0-alpha.2"
   },
   "devDependencies": {
     "@types/node": "^22.19.11",
-    "@types/prompts": "^2.4.9",
-    "@maestro-js/agent-container": "1.0.0-alpha.19",
-    "@maestro-js/config": "1.0.0-alpha.19",
-    "@maestro-js/db": "1.0.0-alpha.19",
-    "@maestro-js/db-migrate": "1.0.0-alpha.19",
-    "@maestro-js/components": "1.0.0-alpha.19"
+    "@types/prompts": "^2.4.9"
   },
-  "version": "1.0.0-alpha.19",
+  "version": "1.0.0-alpha.2",
   "publishConfig": {
     "access": "restricted"
   },