@vizamodo/viza-cli 1.3.6 → 1.3.30

package/dist/bin/viza.js

@@ -1,35 +1,59 @@
 #!/usr/bin/env node
 import { Command } from "commander";
+import { fileURLToPath } from "node:url";
+import path from "node:path";
+import fs from "node:fs";
 import { handleError } from "../src/errors/handleError.js";
 import { bootstrapCommand } from "../src/commands/bootstrap/index.js";
-import { devCommand } from "../src/commands/dev/index.js";
-import fs from "node:fs";
-import path from "node:path";
-import { fileURLToPath } from "node:url";
+import { loginAwsCommand } from "../src/commands/login/aws.js";
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
+/**
+ * Helper: Gộp tất cả options từ root xuống sub-command
+ */
+function getResolvedOptions(command) {
+    let allOptions = {};
+    let current = command;
+    while (current) {
+        allOptions = { ...current.opts(), ...allOptions };
+        current = current.parent;
+    }
+    return allOptions;
+}
 function readCliVersion() {
     try {
         const pkgPath = path.resolve(__dirname, "../package.json");
-        const raw = fs.readFileSync(pkgPath, "utf8");
-        const json = JSON.parse(raw);
-        return typeof json.version === "string" && json.version.trim() ? json.version.trim() : "dev";
+        const json = JSON.parse(fs.readFileSync(pkgPath, "utf8"));
+        return json.version || "dev";
     }
     catch {
         return "dev";
     }
 }
-const CLI_VERSION = readCliVersion();
 const program = new Command();
 program
     .name("viza")
     .description("Viza CLI")
-    .version(CLI_VERSION);
-program.addCommand(devCommand());
+    .version(readCliVersion())
+    // Global Options
+    .option("--status", "Show status only (no execution)")
+    .option("--runner-label <label>", "Runner label", "native");
 program
     .command("bootstrap")
-    .description("Bootstrap Viza configuration")
-    .action(async () => {
+    .description("Bootstrap configuration")
+    .action(async (_options) => {
     await bootstrapCommand();
 });
+program
+    .command("login")
+    .description("Login to cloud providers")
+    .command("aws")
+    .description("Login to AWS")
+    .option("--prod", "Use production environment")
+    .option("--dev", "Use development environment")
+    .option("--keep-log", "Keep execution logs", false)
+    .action(async (_options, command) => {
+    const fullOpts = getResolvedOptions(command);
+    await loginAwsCommand(fullOpts);
+});
 program.parseAsync(process.argv).catch(handleError);

package/dist/src/commands/login/aws.js

@@ -0,0 +1,56 @@
+import { resolveEnv } from "../../context/env.js";
+import { resolveHubIntent } from "../../context/hubIntent.js";
+import { dispatchIntentAndWait } from "../../core/dispatch.js";
+/**
+ * Target teams for `viza login aws`.
+ * This is a CLI-only UX constraint for fail-fast validation.
+ * NOT a policy and MUST NOT be sent to gateway.
+ */
+const TARGET_TEAMS = {
+    dev: [
+        "viza-deployer",
+        "viza-billing",
+        "viza-manager",
+        "viza-admin",
+        "viza-super",
+    ],
+    prod: [
+        "viza-publisher",
+        "viza-billing",
+        "viza-admin",
+        "viza-super",
+    ],
+};
+/**
+ * viza login aws
+ *
+ * Flow:
+ * 1) Resolve env (deterministic)
+ * 2) Resolve user identity (trusted via gh auth)
+ * 3) CLI pre-check against target teams (fail-fast UX)
+ * 4) Derive ONE valid team (deterministic)
+ * 5) Dispatch frozen intent to gateway
+ */
+export async function loginAwsCommand(options) {
+    // 1) Resolve environment
+    const env = resolveEnv(options);
+    const intent = resolveHubIntent(env);
+    // 5) Dispatch intent (freeze)
+    await dispatchIntentAndWait({
+        intent,
+        commandType: "viza.aws.login",
+        infraKey: "aws",
+        env,
+        targetTeams: TARGET_TEAMS[env],
+        runnerLabel: options.runnerLabel,
+        keepLog: options.keepLog === true,
+        flowGates: {
+            secrets: false,
+            encVars: false,
+        },
+        payload: {}
+    }, {
+        mode: options.status ? "status" : "dispatch",
+        log: "show",
+    });
+}

package/dist/src/context/env.js

@@ -0,0 +1,13 @@
+export function resolveEnv(flags) {
+    // Fail fast on conflicting deterministic flags
+    if (flags.prod && flags.dev) {
+        throw new Error("Conflicting flags: --prod and --dev cannot be used together");
+    }
+    // Deterministic environment resolution
+    if (flags.prod)
+        return "prod";
+    if (flags.dev)
+        return "dev";
+    // Default fallback
+    return "dev";
+}

package/dist/src/context/hubIntent.js

@@ -0,0 +1,8 @@
+// src/commands/_shared/hubIntent.ts
+export const HUB_INTENT_BY_ENV = {
+    dev: "hub-dev",
+    prod: "hub",
+};
+export function resolveHubIntent(env) {
+    return HUB_INTENT_BY_ENV[env];
+}

package/dist/src/core/dispatch.js

@@ -25,11 +25,13 @@ async function dispatchIntent(input, mode = "dispatch") {
         infraKey: input.infraKey,
         payload: input.payload,
         runnerLabel: input.runnerLabel,
-        keepLog: input.keepLog
+        keepLog: input.keepLog,
+        flowGates: input.flowGates,
     };
     const handle = await dispatcherDispatch(dispatchInput, {
         auth: {
-            targetTeam: input.targetTeam,
+            env: input.env,
+            targetTeams: input.targetTeams,
         },
     }, mode);
     return handle;

package/dist/src/ui/banner.js

@@ -1,38 +1,16 @@
 import chalk from "chalk";
 import figlet from "figlet";
-const TEAM_BANNER_CONFIG = {
-    "viza-deployer": { title: "Viza Deployer", color: "cyanBright", env: "dev" },
-    "viza-designer": { title: "Viza Designer", color: "greenBright", env: "dev" },
-    "viza-billing": { title: "Viza Billing", color: "yellowBright", env: "dev" },
-    "viza-publisher": { title: "Viza Publisher", color: "redBright", env: "prod" },
-    "viza-manager": { title: "Viza Manager", color: "cyanBright", env: "dev" },
-    "viza-admin": { title: "Viza Administrator", color: "yellowBright", env: "sys" },
-    "viza-super": { title: "Viza Supervisor", color: "redBright", env: "sys" },
+const ENV_BANNER_CONFIG = {
+    "dev": { title: "Viza Development", color: "cyanBright" },
+    "prod": { title: "Viza Production", color: "yellowBright" },
 };
-function formatEnvLabelForTeam(team) {
-    // Keep env values constrained to BannerOptions, while giving a clear mapping.
-    // dev: Development/Designer/Billing/Manager
-    // prod: Production
-    // sys: System/Root
-    if (team === "viza-publisher")
-        return "prod";
-    if (team === "viza-admin" || team === "viza-super")
-        return "sys";
-    return "dev";
-}
-function pickBannerConfig(targetTeam) {
-    const cfg = TEAM_BANNER_CONFIG[targetTeam];
+function pickBannerConfig(env) {
+    const cfg = ENV_BANNER_CONFIG[env];
     if (cfg)
         return cfg;
-    // Default: derive something reasonable and safe.
-    const prettyTitle = targetTeam
-        .split("-")
-        .map((x) => (x ? x[0].toUpperCase() + x.slice(1) : x))
-        .join(" ");
     return {
-        title: prettyTitle || "Viza",
-        color: "cyanBright",
-        env: formatEnvLabelForTeam(targetTeam) ?? "dev",
+        title: `Viza Environment: ${env}` || "unknown",
+        color: "cyanBright"
     };
 }
 /**
@@ -40,14 +18,13 @@ function pickBannerConfig(targetTeam) {
  * Maps targetTeam -> title/color/env, and renders meta (github login + viza-cli version).
  */
 export function showDispatchBanner(input, meta) {
-    const cfg = pickBannerConfig(input.targetTeam);
+    const cfg = pickBannerConfig(input.env);
     // Default subtitle: commandType (or caller-provided subtitle)
     const subtitle = `Command: ${input.commandType}`;
     showBanner({
         title: cfg.title,
         subtitle,
         color: cfg.color,
-        env: cfg.env,
         runner: input.runnerLabel === "native"
             ? { type: "github" }
             : {
@@ -60,20 +37,20 @@ export function showDispatchBanner(input, meta) {
     });
 }
 export function showBanner(opts) {
-    const { title, subtitle, color = "cyanBright", env, runner, meta } = opts;
+    const { title, subtitle, color = "cyanBright", runner, meta } = opts;
     process.stdout.write("\u001b[2J\u001b[3J\u001b[H");
     const bannerText = figlet.textSync(title, { font: "Standard" });
     console.log(chalk[color](bannerText));
     if (subtitle) {
-        console.log(chalk.gray("Command:"), chalk.magenta(subtitle));
+        console.log(chalk.gray("Command:"), chalk.magentaBright(subtitle));
     }
     // Environment line removed; replaced by user-friendly info line below
     if (runner) {
         if (runner.type === "github") {
-            console.log(chalk.gray("Runner:"), chalk.yellow("GitHub-hosted"));
+            console.log(chalk.gray("Runner:"), chalk.yellowBright("GitHub-hosted"));
         }
         else {
-            console.log(chalk.gray("Runner:"), chalk.yellow("self-hosted"), runner.label ? chalk.gray("| label:") : "", runner.label ? chalk.cyan(runner.label) : "");
+            console.log(chalk.gray("Runner:"), chalk.yellowBright("self-hosted"), runner.label ? chalk.gray("| label:") : "", runner.label ? chalk.cyan(runner.label) : "");
         }
     }
     // User-friendly info line
@@ -82,12 +59,6 @@ export function showBanner(opts) {
         if (meta?.version) {
             parts.push(`Version: ${chalk.cyan(meta.version)}`);
         }
-        if (env) {
-            const envColor = env === "prod" ? chalk.redBright :
-                env === "dev" ? chalk.greenBright :
-                    chalk.yellowBright;
-            parts.push(`Environment: ${envColor(env.toUpperCase())}`);
-        }
         if (parts.length) {
             console.log(chalk.gray(parts.join(chalk.gray("         |         "))));
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vizamodo/viza-cli",
-  "version": "1.3.6",
+  "version": "1.3.30",
   "type": "module",
   "description": "Viza unified command line interface",
   "bin": {
@@ -16,16 +16,16 @@
     "release:prod": "rm -rf dist && npx npm-check-updates -u && npm install && git add package.json package-lock.json && git commit -m 'chore(deps): auto update dependencies before release' || echo 'No changes' && node versioning.js && npm login && npm publish --tag latest --access public && git push"
   },
   "dependencies": {
-    "@vizamodo/viza-dispatcher": "^1.4.56",
+    "@vizamodo/viza-dispatcher": "^1.4.61",
     "adm-zip": "^0.5.16",
     "chalk": "^5.6.2",
     "commander": "^14.0.2",
-    "figlet": "^1.9.4"
+    "figlet": "^1.10.0"
   },
   "devDependencies": {
     "@types/adm-zip": "^0.5.7",
     "@types/figlet": "^1.7.0",
-    "@types/node": "^25.0.10",
+    "@types/node": "^25.1.0",
     "ts-node": "^10.9.2",
     "typescript": "^5.9.3"
   }

package/dist/src/commands/admin/index.js

@@ -1,5 +0,0 @@
-export const adminCommand = {
-    name: "admin",
-    description: "admin commands",
-    children: []
-};

package/dist/src/commands/billing/index.js

@@ -1,5 +0,0 @@
-export const billingCommand = {
-    name: "billing",
-    description: "billing commands",
-    children: []
-};

package/dist/src/commands/design/index.js

@@ -1,5 +0,0 @@
-export const designCommand = {
-    name: "design",
-    description: "design commands",
-    children: []
-};

package/dist/src/commands/dev/index.js

@@ -1,12 +0,0 @@
-// src/commands/dev/index.ts
-import { Command } from "commander";
-import { devLoginCommand } from "./login/index.js";
-const DEV_CTX = {
-    targetTeam: "viza-deployer",
-};
-export function devCommand(ctx = DEV_CTX) {
-    const cmd = new Command("dev");
-    cmd.description("Development commands");
-    cmd.addCommand(devLoginCommand(ctx));
-    return cmd;
-}

package/dist/src/commands/dev/login/aws/index.js

@@ -1,32 +0,0 @@
-// src/commands/dev/aws/index.ts
-import { Command } from "commander";
-import { awsLogin, awsCreateSsoUrl } from "../../../../platforms/aws/login.js";
-export function devLoginAwsCommand(ctx) {
-    const aws = new Command("aws");
-    aws
-        .description("Login AWS via remote dispatcher (SSO/session bootstrap)")
-        .option("--status", "Check status only (do not dispatch new run)")
-        .option("--keep-log", "Keep source workflow logs for debugging")
-        .action(async (opts) => {
-        await awsLogin({
-            intent: "hub-dev",
-            targetTeam: ctx.targetTeam,
-            mode: opts.status ? "status" : "dispatch",
-            keepLog: opts.keepLog === true,
-        });
-    });
-    aws
-        .command("sso-url")
-        .description("Create AWS SSO login URL via remote dispatcher")
-        .option("--status", "Check status only (do not dispatch new run)")
-        .option("--keep-log", "Keep source workflow logs for debugging")
-        .action(async (opts) => {
-        await awsCreateSsoUrl({
-            intent: "hub-dev",
-            targetTeam: ctx.targetTeam,
-            mode: opts.status ? "status" : "dispatch",
-            keepLog: opts.keepLog === true,
-        });
-    });
-    return aws;
-}

package/dist/src/commands/dev/login/index.js

@@ -1,8 +0,0 @@
-import { Command } from "commander";
-import { devLoginAwsCommand } from "./aws/index.js";
-export function devLoginCommand(ctx) {
-    const cmd = new Command("login");
-    cmd.description("Login commands");
-    cmd.addCommand(devLoginAwsCommand(ctx));
-    return cmd;
-}

package/dist/src/commands/manage/index.js

@@ -1,5 +0,0 @@
-export const manageCommand = {
-    name: "manage",
-    description: "manage commands",
-    children: []
-};

package/dist/src/commands/prod/index.js

@@ -1,5 +0,0 @@
-export const prodCommand = {
-    name: "prod",
-    description: "production commands",
-    children: []
-};

package/dist/src/commands/super/index.js

@@ -1,5 +0,0 @@
-export const superCommand = {
-    name: "super",
-    description: "super commands",
-    children: []
-};

package/dist/src/platforms/aws/deploy.js

@@ -1 +0,0 @@
-export {};

package/dist/src/platforms/aws/login.js

@@ -1,33 +0,0 @@
-// src/platforms/aws/login.ts
-import { dispatchIntentAndWait } from "../../core/dispatch.js";
-export async function awsLogin(ctx) {
-    const plainPayload = {
-        action: "login",
-        provider: "aws",
-        type: "sso",
-    };
-    await dispatchIntentAndWait({
-        intent: ctx.intent,
-        infraKey: "aws",
-        commandType: "viza.aws.login",
-        targetTeam: ctx.targetTeam,
-        runnerLabel: "native",
-        keepLog: ctx.keepLog === true,
-        payload: plainPayload,
-    }, { log: "show", mode: ctx.mode ?? "dispatch" });
-}
-export async function awsCreateSsoUrl(ctx) {
-    const plainPayload = {
-        action: "sso-url",
-        provider: "aws",
-    };
-    await dispatchIntentAndWait({
-        intent: ctx.intent,
-        infraKey: "aws",
-        commandType: "viza.aws.sso-url",
-        targetTeam: ctx.targetTeam,
-        runnerLabel: "native",
-        keepLog: ctx.keepLog === true,
-        payload: plainPayload,
-    }, { log: "show", mode: ctx.mode ?? "dispatch" });
-}

package/dist/src/platforms/aws/secret.js

@@ -1 +0,0 @@
-export {};

package/dist/src/platforms/cloudflare/bootstrap.js

@@ -1 +0,0 @@
-export {};

package/dist/src/platforms/cloudflare/deploy.js

@@ -1 +0,0 @@
-export {};

package/dist/src/platforms/cloudflare/login.js

@@ -1 +0,0 @@
-export {};

package/dist/src/platforms/registry.js

@@ -1,9 +0,0 @@
-// src/platforms/registry.ts
-import { awsLogin } from "./aws/login.js";
-export const registry = {
-    aws: {
-        login: awsLogin,
-        // deploy: awsDeploy,
-    },
-    // cloudflare: { login: cfLogin }
-};

package/dist/src/policy/confirmDangerous.js

@@ -1,3 +0,0 @@
-export async function confirmDangerous(message) {
-    console.log(message);
-}

package/dist/src/policy/requireEnv.js

@@ -1,3 +0,0 @@
-export function requireEnv(env) {
-    // enforced later
-}

package/dist/src/policy/requireRole.js

@@ -1,3 +0,0 @@
-export function requireRole(role) {
-    // enforced later
-}