@kill-switch/cli 0.2.0 → 0.3.1

package/dist/commands/alerts.js

@@ -1,6 +1,5 @@
-import { apiRequest } from "../api-client.js";
-import { outputJson, formatTable, outputError } from "../output.js";
-export function registerAlertCommands(program) {
+import { outputJson, formatTable, handleError, spinner, success } from "../output.js";
+export function registerAlertCommands(program, createClient) {
     const alerts = program.command("alerts").description("Manage alert channels");
     alerts
         .command("list")
@@ -9,22 +8,120 @@ export function registerAlertCommands(program) {
         .action(async () => {
         const json = program.opts().json;
         try {
-            const data = await apiRequest("/alerts/channels");
-            const channels = data.channels || data;
+            const client = createClient();
+            const channels = await client.alerts.channels();
             if (json) {
                 outputJson(channels);
             }
             else {
-                formatTable(Array.isArray(channels) ? channels : [], [
+                formatTable(channels, [
                     { key: "type", header: "Type" },
                     { key: "name", header: "Name" },
                     { key: "enabled", header: "Enabled" },
+                    { key: "configPreview", header: "Config" },
                 ]);
             }
         }
         catch (err) {
-            outputError(err.message, json);
-            process.exit(1);
+            handleError(err, json);
+        }
+    });
+    alerts
+        .command("add")
+        .description("Add an alert channel")
+        .requiredOption("--type <type>", "Channel type: pagerduty | slack | discord | webhook | email | github")
+        .option("--name <name>", "Display name for this channel")
+        .option("--routing-key <key>", "PagerDuty Events API v2 routing key")
+        .option("--webhook-url <url>", "Webhook URL (Slack, Discord, or custom webhook)")
+        .option("--email <address>", "Email address")
+        // GitHub options
+        .option("--token <token>", "GitHub Personal Access Token (repo + workflow scopes)")
+        .option("--repo-owner <owner>", "GitHub repository owner / org")
+        .option("--repo-name <name>", "GitHub repository name")
+        .option("--workflow <file>", "Workflow filename (default: kill-switch-remediate.yml)")
+        .option("--branch <ref>", "Branch to dispatch on (default: main)")
+        .action(async (opts) => {
+        const json = program.opts().json;
+        const s = json ? null : spinner("Adding alert channel...").start();
+        try {
+            const type = opts.type;
+            const validTypes = ["pagerduty", "slack", "discord", "webhook", "email", "github"];
+            if (!validTypes.includes(type)) {
+                throw new Error(`Unknown type "${type}". Valid types: ${validTypes.join(", ")}`);
+            }
+            // Build config and validate required fields per type
+            const config = {};
+            if (type === "pagerduty") {
+                if (!opts.routingKey)
+                    throw new Error("--routing-key is required for pagerduty");
+                config.routingKey = opts.routingKey;
+            }
+            else if (type === "slack" || type === "discord" || type === "webhook") {
+                if (!opts.webhookUrl)
+                    throw new Error(`--webhook-url is required for ${type}`);
+                config.webhookUrl = opts.webhookUrl;
+            }
+            else if (type === "email") {
+                if (!opts.email)
+                    throw new Error("--email is required for email");
+                config.email = opts.email;
+            }
+            else if (type === "github") {
+                if (!opts.token)
+                    throw new Error("--token is required for github");
+                if (!opts.repoOwner)
+                    throw new Error("--repo-owner is required for github");
+                if (!opts.repoName)
+                    throw new Error("--repo-name is required for github");
+                config.githubToken = opts.token;
+                config.repoOwner = opts.repoOwner;
+                config.repoName = opts.repoName;
+                config.workflowFile = opts.workflow || "kill-switch-remediate.yml";
+                config.branchRef = opts.branch || "main";
+            }
+            const channel = {
+                type,
+                name: opts.name || type.charAt(0).toUpperCase() + type.slice(1),
+                enabled: true,
+                config,
+            };
+            const client = createClient();
+            const result = await client.alerts.addChannel(channel);
+            s?.stop();
+            if (json) {
+                outputJson(result);
+            }
+            else {
+                success(`Channel added. You now have ${result.channelCount} alert channel(s).`);
+            }
+        }
+        catch (err) {
+            s?.stop();
+            handleError(err, json);
+        }
+    });
+    alerts
+        .command("remove")
+        .alias("rm")
+        .description("Remove an alert channel by name")
+        .argument("<name>", "Channel name to remove")
+        .action(async (name) => {
+        const json = program.opts().json;
+        const s = json ? null : spinner(`Removing channel "${name}"...`).start();
+        try {
+            const client = createClient();
+            const result = await client.alerts.removeChannel(name);
+            s?.stop();
+            if (json) {
+                outputJson(result);
+            }
+            else {
+                success(`Channel removed. ${result.channelCount} channel(s) remaining.`);
+            }
+        }
+        catch (err) {
+            s?.stop();
+            handleError(err, json);
         }
     });
     alerts
@@ -32,18 +129,21 @@ export function registerAlertCommands(program) {
         .description("Send a test alert to all channels")
         .action(async () => {
         const json = program.opts().json;
+        const s = json ? null : spinner("Sending test alert...").start();
         try {
-            const data = await apiRequest("/alerts/test", { method: "POST" });
+            const client = createClient();
+            const data = await client.alerts.test();
+            s?.stop();
             if (json) {
                 outputJson(data);
             }
             else {
-                console.log("Test alert sent to all configured channels.");
+                success(`Test alert sent to ${data.channelsSent} channel(s).`);
             }
         }
         catch (err) {
-            outputError(err.message, json);
-            process.exit(1);
+            s?.stop();
+            handleError(err, json);
         }
     });
 }

package/dist/commands/analytics.d.ts

@@ -1,2 +1,3 @@
 import { Command } from "commander";
-export declare function registerAnalyticsCommands(program: Command): void;
+import type { ClientFactory } from "../types.js";
+export declare function registerAnalyticsCommands(program: Command, createClient: ClientFactory): void;

package/dist/commands/analytics.js

@@ -1,35 +1,57 @@
-import { apiRequest } from "../api-client.js";
-import { outputJson, formatTable, outputError } from "../output.js";
-export function registerAnalyticsCommands(program) {
+import { outputJson, formatTable, handleError, spinner, colors as c } from "../output.js";
+export function registerAnalyticsCommands(program, createClient) {
     program
         .command("analytics")
         .description("FinOps analytics overview")
         .option("--days <n>", "Days to analyze", "30")
         .action(async (opts) => {
         const json = program.opts().json;
+        const s = json ? null : spinner("Loading analytics...").start();
         try {
-            const data = await apiRequest(`/analytics/overview?days=${opts.days}`);
+            const client = createClient();
+            const data = await client.analytics.overview();
+            s?.stop();
             if (json) {
                 outputJson(data);
             }
             else {
-                console.log(`Analytics (last ${opts.days} days)\n`);
-                if (data.dailyCosts) {
+                console.log(c.bold(`\nAnalytics Overview\n`));
+                // Summary stats
+                const totalSpend = data.totalSpendPeriod ?? 0;
+                const avgDaily = data.avgDailyCost ?? 0;
+                const projected = data.projectedMonthlyCost ?? 0;
+                const savings = data.savingsEstimate ?? 0;
+                const actions = data.killSwitchActions ?? 0;
+                console.log(`  ${c.bold("Total spend:")}        $${totalSpend.toFixed(2)}`);
+                console.log(`  ${c.bold("Avg daily cost:")}     $${avgDaily.toFixed(2)}`);
+                console.log(`  ${c.bold("Projected monthly:")}  $${projected.toFixed(2)}`);
+                console.log(`  ${c.bold("Savings estimate:")}   ${c.green("$" + savings.toFixed(2))}`);
+                console.log(`  ${c.bold("Kill switch actions:")} ${actions > 0 ? c.yellow(String(actions)) : c.dim("0")}`);
+                // Last 7 days cost table
+                if (data.dailyCosts?.length) {
+                    console.log(c.bold("\nLast 7 Days:\n"));
                     formatTable(data.dailyCosts.slice(-7), [
-                        { key: "date", header: "Date" },
-                        { key: "totalUsd", header: "Cost (USD)" },
-                        { key: "violations", header: "Violations" },
-                        { key: "actions", header: "Actions" },
+                        { key: "date", header: "Date", width: 12 },
+                        { key: "cost", header: "Cost (USD)", width: 12 },
+                        { key: "services", header: "Services", width: 10 },
+                        { key: "violations", header: "Violations", width: 12 },
                     ]);
                 }
-                if (data.totalSavingsUsd !== undefined) {
-                    console.log(`\nEstimated savings: $${data.totalSavingsUsd}`);
+                // Per-account breakdown
+                if (data.accountBreakdown?.length) {
+                    console.log(c.bold("\nAccount Breakdown:\n"));
+                    formatTable(data.accountBreakdown, [
+                        { key: "provider", header: "Provider", width: 14 },
+                        { key: "totalCost", header: "Total Cost", width: 12 },
+                        { key: "avgDailyCost", header: "Avg Daily", width: 12 },
+                    ]);
                 }
+                console.log();
             }
         }
         catch (err) {
-            outputError(err.message, json);
-            process.exit(1);
+            s?.stop();
+            handleError(err, json);
         }
     });
 }

package/dist/commands/auth.d.ts

@@ -1,2 +1,3 @@
 import { Command } from "commander";
-export declare function registerAuthCommands(program: Command): void;
+import type { ClientFactory } from "../types.js";
+export declare function registerAuthCommands(program: Command, createClient: ClientFactory): void;

package/dist/commands/auth.js

@@ -1,35 +1,41 @@
+import { KillSwitchClient } from "@kill-switch/sdk";
 import { saveConfig, deleteConfig, resolveApiKey, resolveApiUrl } from "../config.js";
-import { apiRequest } from "../api-client.js";
-import { outputJson, formatObject, outputError } from "../output.js";
-import { createInterface } from "readline";
+import { outputJson, formatObject, outputError, handleError, spinner, success } from "../output.js";
+import { ask } from "../prompts.js";
 import { execFile } from "child_process";
-function ask(question) {
-    const rl = createInterface({ input: process.stdin, output: process.stdout });
-    return new Promise((resolve) => {
-        rl.question(question, (answer) => {
-            rl.close();
-            resolve(answer.trim());
-        });
-    });
-}
+import { CLI_VERSION } from "../version.js";
+import { runDeviceFlow, defaultDeviceFlowDeps } from "../device-flow.js";
 function openBrowser(url) {
     const cmd = process.platform === "darwin" ? "open" : process.platform === "win32" ? "start" : "xdg-open";
     execFile(cmd, [url], () => { });
 }
-export function registerAuthCommands(program) {
+// Wires the device-flow helper to this command's spinner + console output.
+// Kept here (not in device-flow.ts) so the helper stays free of CLI-specific
+// presentation concerns and remains pure for unit testing.
+function deviceFlowWithSpinner() {
+    let sp = null;
+    return defaultDeviceFlowDeps({
+        log: (line) => console.log(line),
+        spinnerStart: (label) => { sp = spinner(label).start(); },
+        spinnerStop: () => { sp?.stop(); sp = null; },
+    });
+}
+export function registerAuthCommands(program, createClient) {
     const auth = program.command("auth").description("Manage authentication");
     auth
         .command("setup")
-        .description("Create an API key (opens browser to sign in, then paste the key)")
-        .action(async () => {
+        .description("Authenticate via your browser (opens a one-time approval page)")
+        .option("--manual", "Manual flow: open Settings page, paste the key yourself")
+        .action(async (opts) => {
         const json = program.opts().json;
         const existing = resolveApiKey();
         if (existing) {
             try {
-                const result = await apiRequest("/accounts/me");
+                const client = createClient();
+                const result = await client.account.me();
                 if (!json) {
                     console.log(`Already authenticated as ${result.name || result._id}.`);
-                    const proceed = await ask("Create a new API key anyway? (y/N): ");
+                    const proceed = await ask("Re-authenticate anyway? (y/N): ");
                     if (proceed.toLowerCase() !== "y")
                         return;
                 }
@@ -38,70 +44,103 @@ export function registerAuthCommands(program) {
                 // Key invalid, proceed
             }
         }
-        if (!json) {
-            console.log("\n\u26a1 Kill Switch CLI Setup\n");
-            console.log("Opening app.kill-switch.net in your browser...");
-            console.log("1. Sign in (or create an account)");
-            console.log("2. Go to Settings > API Keys");
-            console.log("3. Click 'Create API Key'");
-            console.log("4. Copy the key and paste it below\n");
-        }
-        openBrowser("https://app.kill-switch.net/settings");
-        const key = await ask("Paste your API key (ks_live_...): ");
-        if (!key.startsWith("ks_")) {
-            outputError("API key must start with 'ks_'. Try again.", json);
-            process.exit(1);
+        const apiUrl = resolveApiUrl();
+        // Manual flow \u2014 original copy/paste path for offline / scripted setups
+        if (opts.manual) {
+            if (!json) {
+                console.log("\n\u26a1 Kill Switch CLI Setup (manual)\n");
+                console.log("1. Sign in at app.kill-switch.net");
+                console.log("2. Go to Settings > API Keys");
+                console.log("3. Click 'Create API Key'");
+                console.log("4. Copy the key and paste it below\n");
+            }
+            openBrowser("https://app.kill-switch.net/settings");
+            const key = await ask("Paste your API key (ks_live_...): ");
+            if (!key.startsWith("ks_")) {
+                outputError("API key must start with 'ks_'.", json);
+                process.exit(1);
+            }
+            try {
+                const client = new KillSwitchClient({ apiKey: key, baseUrl: apiUrl });
+                const result = await client.account.me();
+                saveConfig({ apiKey: key, apiUrl });
+                if (json)
+                    outputJson({ authenticated: true, account: result.name || result._id });
+                else {
+                    success(`Authenticated as ${result.name || result._id}`);
+                    console.log("API key saved to ~/.kill-switch/config.json");
+                }
+            }
+            catch (err) {
+                handleError(err, json);
+            }
+            return;
         }
+        // Device flow \u2014 default path
         try {
-            const result = await apiRequest("/accounts/me", { apiKey: key });
-            saveConfig({ apiKey: key, apiUrl: resolveApiUrl() });
+            const apiKey = await runDeviceFlow(apiUrl, CLI_VERSION, json, deviceFlowWithSpinner());
+            const client = new KillSwitchClient({ apiKey, baseUrl: apiUrl });
+            const result = await client.account.me();
+            saveConfig({ apiKey, apiUrl });
             if (json) {
                 outputJson({ authenticated: true, account: result.name || result._id });
             }
             else {
-                console.log(`\n\u2713 Authenticated as ${result.name || result._id}`);
+                success(`Authenticated as ${result.name || result._id}`);
                 console.log("API key saved to ~/.kill-switch/config.json\n");
-                console.log("Next: ks onboard --provider cloudflare --help-provider cloudflare");
+                console.log("Next: ks onboard --help-provider mongodb");
             }
         }
         catch (err) {
-            outputError(`Authentication failed: ${err.message}`, json);
-            process.exit(2);
+            handleError(err, json);
         }
     });
     auth
         .command("login")
-        .description("Authenticate with an existing API key")
-        .option("--api-key <key>", "Personal API key (starts with ks_)")
+        .description("Authenticate (browser device flow by default, or pass --api-key for direct)")
+        .option("--api-key <key>", "Personal API key (starts with ks_) — skips browser flow")
         .action(async (opts) => {
         const json = program.opts().json;
+        const apiUrl = resolveApiUrl();
         let key = opts.apiKey;
+        // Device flow when no --api-key. JSON mode requires --api-key (no browser).
         if (!key) {
             if (json) {
                 outputError("--api-key is required in JSON mode", json);
                 process.exit(1);
             }
-            key = await ask("API key (ks_live_...): ");
+            try {
+                key = await runDeviceFlow(apiUrl, CLI_VERSION, json, deviceFlowWithSpinner());
+            }
+            catch (err) {
+                handleError(err, json);
+                return;
+            }
         }
         if (!key.startsWith("ks_")) {
             outputError("API key must start with 'ks_'. Create one at app.kill-switch.net or run: ks auth setup", json);
             process.exit(1);
         }
-        // Validate the key by calling the API
+        const s = json ? null : spinner("Validating API key...").start();
         try {
-            const result = await apiRequest("/accounts/me", { apiKey: key });
-            saveConfig({ apiKey: key, apiUrl: resolveApiUrl() });
+            const client = new KillSwitchClient({
+                apiKey: key,
+                baseUrl: apiUrl,
+            });
+            const result = await client.account.me();
+            s?.stop();
+            saveConfig({ apiKey: key, apiUrl });
             if (json) {
                 outputJson({ authenticated: true, account: result.name || result._id });
             }
             else {
-                console.log(`Authenticated as ${result.name || result._id}`);
+                success(`Authenticated as ${result.name || result._id}`);
                 console.log("API key saved to ~/.kill-switch/config.json");
             }
         }
         catch (err) {
-            outputError(`Authentication failed: ${err.message}`, json);
-            process.exit(2);
+            s?.stop();
+            handleError(err, json);
         }
     });
     auth
@@ -133,7 +172,8 @@ export function registerAuthCommands(program) {
             return;
         }
         try {
-            const result = await apiRequest("/accounts/me");
+            const client = createClient();
+            const result = await client.account.me();
             if (json) {
                 outputJson({ authenticated: true, ...result });
             }

package/dist/commands/check.d.ts

@@ -1,2 +1,3 @@
 import { Command } from "commander";
-export declare function registerCheckCommands(program: Command): void;
+import type { ClientFactory } from "../types.js";
+export declare function registerCheckCommands(program: Command, createClient: ClientFactory): void;

package/dist/commands/check.js

@@ -1,37 +1,50 @@
-import { apiRequest } from "../api-client.js";
-import { outputJson, formatTable, outputError } from "../output.js";
-export function registerCheckCommands(program) {
+import { outputJson, formatTable, handleError, spinner, colors as c } from "../output.js";
+export function registerCheckCommands(program, createClient) {
     program
         .command("check")
         .description("Run monitoring check on all connected accounts")
         .action(async () => {
         const json = program.opts().json;
+        const s = json ? null : spinner("Running monitoring check...").start();
         try {
-            const data = await apiRequest("/check", { method: "POST" });
+            const client = createClient();
+            const data = await client.monitoring.checkAll();
+            s?.stop();
             if (json) {
                 outputJson(data);
             }
             else {
                 const results = data.results || [];
-                console.log(`Checked ${results.length} account(s)\n`);
+                const totalViolations = results.reduce((n, r) => n + (r.violations?.length || 0), 0);
+                console.log(`Checked ${c.bold(String(results.length))} account(s) — ${totalViolations === 0 ? c.green("all clear") : c.red(totalViolations + " violation(s)")}\n`);
                 for (const r of results) {
-                    console.log(`${r.provider || "unknown"}: ${r.name || r.cloudAccountId}`);
+                    const statusMark = r.status === "violation" ? c.red("✗") : r.status === "error" ? c.yellow("⚠") : c.green("✓");
+                    console.log(`${statusMark} ${c.bold((r.provider || "unknown").padEnd(12))} ${r.name || r.cloudAccountId}`);
                     if (r.violations?.length) {
-                        formatTable(r.violations, [
-                            { key: "metric", header: "Metric" },
-                            { key: "value", header: "Value" },
-                            { key: "threshold", header: "Threshold" },
+                        // Compute multiplier for each violation inline
+                        const rows = r.violations.map((v) => ({
+                            ...v,
+                            multiplier: v.threshold > 0 ? `${Math.round(v.currentValue / v.threshold)}x` : "—",
+                        }));
+                        formatTable(rows, [
+                            { key: "serviceName", header: "Service", width: 28 },
+                            { key: "metricName", header: "Metric", width: 22 },
+                            { key: "currentValue", header: "Current", width: 14 },
+                            { key: "threshold", header: "Threshold", width: 12 },
+                            { key: "multiplier", header: "Over", width: 8 },
+                            { key: "severity", header: "Severity", width: 10 },
                         ]);
+                        if (r.actionsTaken?.length) {
+                            console.log(c.dim(`  Actions: ${r.actionsTaken.join(", ")}`));
+                        }
                     }
-                    else {
-                        console.log("  All clear\n");
-                    }
+                    console.log();
                 }
             }
         }
         catch (err) {
-            outputError(err.message, json);
-            process.exit(1);
+            s?.stop();
+            handleError(err, json);
         }
     });
 }

package/dist/commands/config-cmd.js

@@ -1,5 +1,16 @@
 import { loadConfig, saveConfig, CONFIG_FILE, DEFAULT_API_URL } from "../config.js";
 import { outputJson } from "../output.js";
+/** Mask a secret so it never lands in logs / CI output in full. */
+function maskKey(v) {
+    const s = String(v ?? "");
+    return s.length > 12 ? `${s.slice(0, 12)}…${s.slice(-2)}` : "****";
+}
+/** Return a copy of the config with secret values masked unless `reveal`. */
+function redactConfig(cfg, reveal) {
+    if (reveal || !cfg.apiKey)
+        return cfg;
+    return { ...cfg, apiKey: maskKey(cfg.apiKey) };
+}
 export function registerConfigCommands(program) {
     const config = program.command("config").description("Manage CLI configuration");
     config
@@ -19,10 +30,13 @@ export function registerConfigCommands(program) {
     config
         .command("get <key>")
         .description("Get a config value")
-        .action((key) => {
+        .option("--reveal", "Show secret values (e.g. apiKey) in full")
+        .action((key, opts) => {
         const json = program.opts().json;
         const cfg = loadConfig();
-        const value = cfg[key];
+        let value = cfg[key];
+        if (key === "apiKey" && value && !opts.reveal)
+            value = maskKey(value);
         if (json) {
             outputJson({ [key]: value ?? null });
         }
@@ -49,11 +63,12 @@ export function registerConfigCommands(program) {
         .command("list")
         .alias("ls")
         .description("Show all config values")
-        .action(() => {
+        .option("--reveal", "Show secret values (e.g. apiKey) in full")
+        .action((opts) => {
         const json = program.opts().json;
         const cfg = loadConfig();
         if (json) {
-            outputJson(cfg);
+            outputJson(redactConfig(cfg, !!opts?.reveal));
         }
         else {
             const entries = Object.entries(cfg);
@@ -62,7 +77,7 @@ export function registerConfigCommands(program) {
             }
             else {
                 for (const [k, v] of entries) {
-                    const display = k === "apiKey" ? String(v).substring(0, 16) + "..." : String(v);
+                    const display = k === "apiKey" && !opts?.reveal ? maskKey(v) : String(v);
                     console.log(`${k.padEnd(12)} ${display}`);
                 }
             }

package/dist/commands/kill.d.ts

@@ -1,2 +1,3 @@
 import { Command } from "commander";
-export declare function registerKillCommands(program: Command): void;
+import type { ClientFactory } from "../types.js";
+export declare function registerKillCommands(program: Command, createClient: ClientFactory): void;