viza 1.9.20 → 1.9.22

package/dist/src/cli/options.js

@@ -2,7 +2,8 @@ export function getGlobalOptions() {
     return [
         { flags: "--status", description: "Show status only (no execution)" },
         { flags: "--keep-log", description: "Keep execution logs after completion" },
-        { flags: "--self-hosted", description: "Use self-hosted runner (viza-builder)" }
+        { flags: "--self-hosted", description: "Use self-hosted runner (viza-builder)" },
+        { flags: "--cancel", description: "Cancel current running command (logical cancel, does not kill underlying job)" }
     ];
 }
 export function registerGlobalOptions(program) {

package/dist/src/commands/age/bootstrap/bootstrap.js

@@ -33,7 +33,9 @@ export async function bootstrapAgeCommand(options) {
         flowGates: {
             secrets: true,
         },
-        payload: {}
+        payload: {
+            action: options.cancel ? "cancel" : "start"
+        }
     }, {
         status: options.status === true,
         log: "show",

package/dist/src/commands/aws/rolesanywhere/bootstrap/bootstrap.js

@@ -31,7 +31,9 @@ export async function bootstrapAwsRolesAnywhereCommand(options) {
         flowGates: {
             secrets: true,
         },
-        payload: {}
+        payload: {
+            action: options.cancel ? "cancel" : "start"
+        }
     }, {
         status: options.status === true,
         log: "show",

package/dist/src/commands/aws/rolesanywhere/rebootstrap/rebootstrap.js

@@ -31,7 +31,9 @@ export async function rebootstrapAwsRolesAnywhereCommand(options) {
         flowGates: {
             secrets: true,
         },
-        payload: {}
+        payload: {
+            action: options.cancel ? "cancel" : "start"
+        }
     }, {
         status: options.status === true,
         log: "show",

package/dist/src/commands/aws/rolesanywhere/rotate/rotate.js

@@ -31,7 +31,9 @@ export async function rotateAwsRolesAnywhereCommand(options) {
         flowGates: {
             secrets: true,
         },
-        payload: {}
+        payload: {
+            action: options.cancel ? "cancel" : "start"
+        }
     }, {
         status: options.status === true,
         log: "show",

package/dist/src/commands/aws/rolesanywhere/update-role/update-role.js

@@ -31,7 +31,9 @@ export async function updateAwsRolesAnywhereRoleCommand(options) {
         flowGates: {
             secrets: true,
         },
-        payload: {}
+        payload: {
+            action: options.cancel ? "cancel" : "start"
+        }
     }, {
         status: options.status === true,
         log: "show",

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

@@ -24,8 +24,8 @@ export async function loginBillingAwsCommand(options) {
         runType: "runtime",
         targetEnv: "prod",
         allowedTeams,
-        selfHosted: options.selfHosted === true,
-        keepLog: options.keepLog === true,
+        selfHosted: false,
+        keepLog: false,
         flowGates: {
             secrets: false,
         },

package/dist/src/commands/dispatch/logs/logs.js

@@ -24,8 +24,8 @@ export async function logsCommand(runId, options) {
         runType: "infra",
         targetEnv: env,
         allowedTeams,
-        selfHosted: options.selfHosted === true,
-        keepLog: options.keepLog === true,
+        selfHosted: false,
+        keepLog: false,
         flowGates: {
             secrets: false,
         },

package/dist/src/commands/dispatch/runs/runs.js

@@ -34,8 +34,8 @@ export async function runsCommand(options) {
         runType: "runtime",
         targetEnv: env,
         allowedTeams,
-        selfHosted: options.selfHosted === true,
-        keepLog: options.keepLog === true,
+        selfHosted: false,
+        keepLog: false,
         flowGates: {
             secrets: false,
         },

package/dist/src/commands/dispatch/runs/show-runs.js

@@ -1,38 +1,6 @@
 import chalk from "chalk";
 import { formatDateTime, renderCommandInline } from "../../../ui/primitives/render-command.js";
-function formatAge(iso) {
-    const diff = Date.now() - new Date(iso).getTime();
-    const sec = Math.floor(diff / 1000);
-    if (sec < 60)
-        return `${sec}s`;
-    const min = Math.floor(sec / 60);
-    const remSec = sec % 60;
-    // < 10 minutes → "Xm Ys"
-    if (min < 10)
-        return `${min}m ${remSec}s`;
-    // < 60 minutes → "Xm"
-    if (min < 60)
-        return `${min}m`;
-    const hr = Math.floor(min / 60);
-    const remMin = min % 60;
-    // < 10 hours → "Xh Ym"
-    if (hr < 10)
-        return `${hr}h ${remMin}m`;
-    // ≥ 10 hours → "Xh"
-    return `${hr}h`;
-}
-function formatDuration(start, end) {
-    const diff = new Date(end).getTime() - new Date(start).getTime();
-    const sec = Math.floor(diff / 1000);
-    if (sec < 60)
-        return `${sec}s`;
-    const min = Math.floor(sec / 60);
-    const rem = sec % 60;
-    return `${min}m ${rem}s`;
-}
-function pad(v, n) {
-    return v.padEnd(n, " ");
-}
+import { formatAge, formatDuration, pad } from "../../../ui/theme.js";
 export async function showDispatchRuns(result) {
     const env = result;
     if (env.status !== "success" ||

package/dist/src/commands/github/secrets/backup/backup.js

@@ -33,7 +33,9 @@ export async function backupGithubSecretsCommand(options) {
         flowGates: {
             secrets: true,
         },
-        payload: {}
+        payload: {
+            action: options.cancel ? "cancel" : "start"
+        }
     }, {
         status: options.status === true,
         log: "show",

package/dist/src/commands/github/secrets/restore/restore.js

@@ -50,14 +50,14 @@ export async function restoreGithubSecretsCommand(options) {
         runType: "runtime",
         targetEnv: env,
         allowedTeams,
-        selfHosted: options.selfHosted === true,
-        keepLog: options.keepLog === true,
+        selfHosted: false,
+        keepLog: false,
         flowGates: {
             secrets: true,
         },
         payload
     }, {
-        status: options.status === true,
+        status: false,
         log: "show",
     });
 }

package/dist/src/commands/infra/deploy/command-hub/command-hub.js

@@ -45,7 +45,8 @@ export async function deployCommandHubCommand(options) {
             secrets: true,
         },
         payload: {
-            workerIntent
+            workerIntent,
+            action: options.cancel ? "cancel" : "start"
         }
     }, {
         status: options.status === true,

package/dist/src/commands/insight/actions/usage/show-usage.js

@@ -1,144 +1,50 @@
 import chalk from "chalk";
-import { formatDateTime, renderCommandInline } from "../../../../ui/primitives/render-command.js";
-function formatAge(iso) {
-    const diff = Date.now() - new Date(iso).getTime();
-    const sec = Math.floor(diff / 1000);
-    if (sec < 60)
-        return `${sec}s`;
-    const min = Math.floor(sec / 60);
-    const remSec = sec % 60;
-    // < 10 minutes → "Xm Ys"
-    if (min < 10)
-        return `${min}m ${remSec}s`;
-    // < 60 minutes → "Xm"
-    if (min < 60)
-        return `${min}m`;
-    const hr = Math.floor(min / 60);
-    const remMin = min % 60;
-    // < 10 hours → "Xh Ym"
-    if (hr < 10)
-        return `${hr}h ${remMin}m`;
-    // ≥ 10 hours → "Xh"
-    return `${hr}h`;
-}
-function formatDuration(start, end) {
-    const diff = new Date(end).getTime() - new Date(start).getTime();
-    const sec = Math.floor(diff / 1000);
-    if (sec < 60)
-        return `${sec}s`;
-    const min = Math.floor(sec / 60);
-    const rem = sec % 60;
-    return `${min}m ${rem}s`;
-}
-function pad(v, n) {
-    return v.padEnd(n, " ");
-}
-export async function showUsage(result) {
+import { pad } from "../../../../ui/theme.js";
+export async function showRuntimeUsage(result) {
     const env = result;
     if (env.status !== "success" ||
         env.kind !== "runtime" ||
-        !env.data?.result) {
-        return;
-    }
-    const { runs } = env.data.result;
-    if (!Array.isArray(runs)) {
-        throw new Error("invalid_dispatch_runs_result_shape");
-    }
-    console.log("\n📋 Dispatch Runs");
-    console.log("─".repeat(131));
-    const header = [
-        pad("RUN", 15),
-        pad("STATUS", 18),
-        pad("CONCLUSION", 15),
-        pad("COMMITTER", 18),
-        pad("CREATED_AT", 22),
-        pad("AGE", 13),
-        pad("DURATION", 13),
-        "ATTEMPT",
-    ].join(" ");
-    console.log(header);
-    console.log("─".repeat(131));
-    if (runs.length === 0) {
-        const emptyRow = chalk.gray("   (no dispatch runs found)");
-        console.log(emptyRow);
-        console.log("─".repeat(131));
-        console.log();
+        !env.data) {
+        console.log("Invalid runtime response");
         return;
     }
-    for (const run of runs) {
-        let status;
-        let conclusion;
-        if (run.status === "completed") {
-            status = "completed";
-            switch (run.conclusion) {
-                case "success":
-                    conclusion = "✅ success";
-                    break;
-                case "failure":
-                    conclusion = "❌ failure";
-                    break;
-                case "cancelled":
-                    conclusion = "⚪ cancelled";
-                    break;
-                case "timed_out":
-                    conclusion = "⏱ timed_out";
-                    break;
-                case "skipped":
-                    conclusion = "⏭ skipped";
-                    break;
-                default:
-                    conclusion = run.conclusion ?? "-";
+    const { log, result: data } = env.data;
+    // ────────────────────────────────────────────────────────────────────────────────────────────────
+    // 1. Render usage by month
+    // ────────────────────────────────────────────────────────────────────────────────────────────────
+    if (data?.usage) {
+        console.log("\n📊 Usage by Month");
+        console.log("─".repeat(60));
+        for (const m of data.usage) {
+            console.log(`${pad(m.month, 10)} ${pad(String(m.totalMinutes) + " min", 15)}`);
+            if (Array.isArray(m.byOS)) {
+                for (const os of m.byOS) {
+                    console.log(chalk.gray(`   ↳ ${os.os}: ${os.minutes} min`));
+                }
             }
         }
-        else if (run.status === "in_progress") {
-            status = "⏳ in progress";
-            conclusion = "...";
-        }
-        else {
-            status = "⏳ queued";
-            conclusion = "-";
+        console.log("─".repeat(60));
+    }
+    // ────────────────────────────────────────────────────────────────────────────────────────────────
+    // 2. Render usage by org + month
+    // ────────────────────────────────────────────────────────────────────────────────────────────────
+    if (data?.byOrg) {
+        console.log("\n🏢 Usage by Organization");
+        console.log("─".repeat(60));
+        for (const org of data.byOrg) {
+            console.log(`\n${chalk.bold(org.org)}`);
+            for (const m of org.months || []) {
+                console.log(`   ${pad(m.month, 10)} ${pad(String(m.totalMinutes) + " min", 15)}`);
+            }
         }
-        const committer = run.committer
-            ? `${run.committer.name}`
-            : "unknown";
-        const age = formatAge(run.createdAt);
-        const duration = run.status === "completed"
-            ? formatDuration(run.createdAt, run.updatedAt)
-            : "-";
-        const row = [
-            pad(String(run.id), 15),
-            pad(status, 18),
-            pad(conclusion, 14),
-            pad(committer, 18),
-            pad(formatDateTime(run.createdAt), 22),
-            pad(age, 13),
-            pad(duration, 13),
-            `#${run.attempt}`,
-        ].join(" ");
-        console.log(row);
+        console.log("─".repeat(60));
     }
-    console.log("─".repeat(131));
-    console.log();
-    // Hint section
-    if (runs.length > 0) {
-        const [firstRun] = runs;
-        if (!firstRun)
-            return;
-        const firstRunId = firstRun.id;
-        // derive binary name from process.argv (fallback safe)
-        const bin = (process.argv[1] || "viza").split("/").pop();
-        const sampleCmd = `${bin} dispatch logs ${firstRunId}`;
-        console.log();
-        console.log("💡 " + "\x1b[1mQuick Hint\x1b[0m");
-        console.log();
-        console.log(chalk.gray("   👉 To quickly list fewer runs, use --limit:"));
-        console.log(`      ${renderCommandInline(`${bin} dispatch runs --limit <n>`)}`);
-        console.log();
-        console.log(chalk.gray("   👉 To view detailed logs for a specific run, use:"));
-        console.log(`      ${renderCommandInline(`${bin} dispatch logs <runId>`)}`);
-        console.log();
-        console.log(chalk.gray("   👉 Example:"));
-        console.log(`      ${renderCommandInline(sampleCmd)}`);
+    // ────────────────────────────────────────────────────────────────────────────────────────────────
+    // 4. Raw hint (optional)
+    // ────────────────────────────────────────────────────────────────────────────────────────────────
+    if (data?.raw?.usageItems) {
         console.log();
+        console.log(chalk.gray("💡 Raw usage items available (use debug mode if needed)"));
     }
+    console.log();
 }

package/dist/src/commands/insight/actions/usage/usage.js

@@ -2,6 +2,7 @@ import { getEnv } from "../../../../context/env.js";
 import { getRunner, RUNTIME_WORKER_CONTROL_INTENT } from "../../../../context/hubIntent.js";
 import { dispatchIntentAndWait } from "../../../../core/dispatch.js";
 import { policy } from "./policy.js";
+import { showRuntimeUsage } from "./show-usage.js";
 /**
  * viza dispatch runs
  *
@@ -25,8 +26,8 @@ export async function usageCommand(options) {
         runType: "runtime",
         targetEnv: env,
         allowedTeams,
-        selfHosted: options.selfHosted === true,
-        keepLog: options.keepLog === true,
+        selfHosted: false,
+        keepLog: false,
         flowGates: {
             secrets: false,
         },
@@ -37,7 +38,6 @@ export async function usageCommand(options) {
         status: false,
         log: "show",
     });
-    console.log(JSON.stringify(result, null, 2));
-    // await showUsage(result);
+    await showRuntimeUsage(result);
     return result;
 }

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

@@ -29,8 +29,8 @@ export async function loginAwsCommand(options) {
         runType: "runtime",
         targetEnv: env,
         allowedTeams,
-        selfHosted: options.selfHosted === true,
-        keepLog: options.keepLog === true,
+        selfHosted: false,
+        keepLog: false,
         flowGates: {
             secrets: false,
         },
@@ -38,7 +38,7 @@ export async function loginAwsCommand(options) {
             ...(options.ssm ? { intent: "ssm" } : {}),
         }
     }, {
-        status: options.status === true,
+        status: false,
         log: "show",
     });
     if (!result ||

package/dist/src/ui/theme.js

@@ -1 +1,34 @@
 export const theme = {};
+export function formatAge(iso) {
+    const diff = Date.now() - new Date(iso).getTime();
+    const sec = Math.floor(diff / 1000);
+    if (sec < 60)
+        return `${sec}s`;
+    const min = Math.floor(sec / 60);
+    const remSec = sec % 60;
+    // < 10 minutes → "Xm Ys"
+    if (min < 10)
+        return `${min}m ${remSec}s`;
+    // < 60 minutes → "Xm"
+    if (min < 60)
+        return `${min}m`;
+    const hr = Math.floor(min / 60);
+    const remMin = min % 60;
+    // < 10 hours → "Xh Ym"
+    if (hr < 10)
+        return `${hr}h ${remMin}m`;
+    // ≥ 10 hours → "Xh"
+    return `${hr}h`;
+}
+export function formatDuration(start, end) {
+    const diff = new Date(end).getTime() - new Date(start).getTime();
+    const sec = Math.floor(diff / 1000);
+    if (sec < 60)
+        return `${sec}s`;
+    const min = Math.floor(sec / 60);
+    const rem = sec % 60;
+    return `${min}m ${rem}s`;
+}
+export function pad(v, n) {
+    return v.padEnd(n, " ");
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "viza",
-  "version": "1.9.20",
+  "version": "1.9.22",
   "type": "module",
   "description": "Viza unified command line interface",
   "bin": {
@@ -28,7 +28,7 @@
     "release:full": "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.5.51",
+    "@vizamodo/viza-dispatcher": "^1.5.52",
     "adm-zip": "^0.5.16",
     "chalk": "^5.6.2",
     "clipboardy": "^5.3.1",