@griffin-app/griffin-cli 1.0.18 → 1.0.19

package/dist/cli.js

@@ -5,15 +5,14 @@ import { executeValidate } from "./commands/validate.js";
 import { executeGenerateKey } from "./commands/generate-key.js";
 import { executeEnvList, executeEnvAdd, executeEnvRemove, } from "./commands/env.js";
 import { executeVariablesList, executeVariablesAdd, executeVariablesRemove, } from "./commands/variables.js";
-// Local commands
 import { executeRunLocal } from "./commands/local/run.js";
-// Hub commands
 import { executeConnect } from "./commands/hub/connect.js";
 import { executeStatus } from "./commands/hub/status.js";
 import { executeMetrics } from "./commands/hub/metrics.js";
 import { executeRuns } from "./commands/hub/runs.js";
 import { executePlan } from "./commands/hub/monitor.js";
 import { executeApply } from "./commands/hub/apply.js";
+import { executeDestroy } from "./commands/hub/destroy.js";
 import { executeRun } from "./commands/hub/run.js";
 import { executeLogin } from "./commands/hub/login.js";
 import { executeLogout } from "./commands/hub/logout.js";
@@ -24,7 +23,7 @@ import { executeIntegrationsList, executeIntegrationsShow, executeIntegrationsUp
 const program = new Command();
 program
     .name("griffin")
-    .description("Griffin CLI - Monitoring as Code")
+    .description("Griffin CLI - API Monitoring as Code")
     .version("1.0.0");
 // Top-level commands
 program
@@ -36,13 +35,112 @@ program
 });
 program
     .command("validate")
-    .description("Validate test monitor files without syncing")
+    .description("Check monitor files for errors")
     .action(async () => {
     await executeValidate();
 });
 program
+    .command("status")
+    .description("Show project and connection status")
+    .action(async () => {
+    await executeStatus();
+});
+program
+    .command("test")
+    .description("Run monitors locally")
+    .option("--env <name>", "Environment name", "default")
+    .action(async (options) => {
+    await executeRunLocal({ env: options.env });
+});
+program
+    .command("plan")
+    .description("Preview pending monitor changes")
+    .option("--env <name>", "Environment name", "default")
+    .option("--json", "Output in JSON format")
+    .action(async (options) => {
+    await executePlan({ ...options, env: options.env });
+});
+program
+    .command("apply")
+    .description("Push monitor changes to the platform")
+    .option("--env <name>", "Environment name", "default")
+    .option("--auto-approve", "Skip confirmation prompt")
+    .option("--dry-run", "Show what would be done without making changes")
+    .option("--prune", "Delete monitors on hub that don't exist locally")
+    .action(async (options) => {
+    await executeApply({ ...options, env: options.env });
+});
+program
+    .command("runs")
+    .description("List recent monitor runs")
+    .option("--env <name>", "Environment name", "default")
+    .option("--monitor <name>", "Filter by monitor name")
+    .option("--limit <number>", "Number of runs to show", "10")
+    .action(async (options) => {
+    await executeRuns({
+        ...options,
+        env: options.env,
+        limit: parseInt(options.limit, 10),
+    });
+});
+program
+    .command("run")
+    .description("Trigger a monitor run")
+    .option("--env <name>", "Environment name", "default")
+    .requiredOption("--monitor <name>", "Monitor name to run")
+    .option("--wait", "Wait for run to complete")
+    .option("--force", "Run even if local monitor differs from hub")
+    .action(async (options) => {
+    await executeRun({ ...options, env: options.env });
+});
+program
+    .command("metrics")
+    .description("Show monitor metrics summary")
+    .option("--env <name>", "Environment name", "default")
+    .option("--period <period>", "Time window: 1h, 6h, 24h, 7d, 30d", "24h")
+    .option("--json", "Output as JSON")
+    .action(async (options) => {
+    await executeMetrics({
+        period: options.period,
+        environment: options.env,
+        json: options.json,
+    });
+});
+program
+    .command("destroy")
+    .description("Destroy monitors on the hub")
+    .option("--env <name>", "Environment name", "default")
+    .option("--monitor <nameOrId>", "Specific monitor name or ID to destroy")
+    .option("--auto-approve", "Skip confirmation prompt")
+    .option("--dry-run", "Show what would be destroyed without making changes")
+    .action(async (env, options) => {
+    await executeDestroy({ ...options, env });
+});
+// Auth command group
+const auth = program.command("auth").description("Manage authentication");
+auth
+    .command("login")
+    .description("Authenticate with Griffin Cloud")
+    .action(async () => {
+    await executeLogin();
+});
+auth
+    .command("logout")
+    .description("Clear stored credentials")
+    .action(async (options) => {
+    await executeLogout(options);
+});
+auth
+    .command("connect")
+    .description("Set hub URL and API key for self-hosted deployments")
+    .requiredOption("--url <url>", "Hub URL")
+    .requiredOption("--token <token>", "API authentication token")
+    .action(async (options) => {
+    await executeConnect(options);
+});
+auth
     .command("generate-key")
-    .description("Generate a cryptographically secure API key for authentication")
+    .description("Generate an API key")
     .action(async () => {
     await executeGenerateKey();
 });
@@ -50,13 +148,13 @@ program
 const env = program.command("env").description("Manage environments");
 env
     .command("list")
-    .description("List all available environments")
+    .description("List configured environments")
     .action(async () => {
     await executeEnvList();
 });
 env
     .command("add <name>")
-    .description("Add a new environment")
+    .description("Add an environment")
     .action(async (name) => {
     await executeEnvAdd(name);
 });
@@ -72,156 +170,93 @@ const variables = program
     .description("Manage environment variables");
 variables
     .command("list")
-    .description("List all variables for an environment")
-    .requiredOption("--env <name>", "Environment name")
+    .description("List variables for an environment")
+    .option("--env <name>", "Environment name", "default")
     .action(async (options) => {
     await executeVariablesList(options.env);
 });
 variables
     .command("add <keyValue>")
-    .description("Add or update a variable (format: KEY=VALUE)")
-    .requiredOption("--env <name>", "Environment name")
+    .description("Set a variable (KEY=VALUE)")
+    .option("--env <name>", "Environment name", "default")
     .action(async (keyValue, options) => {
     await executeVariablesAdd(keyValue, options.env);
 });
 variables
     .command("remove <key>")
     .description("Remove a variable")
-    .requiredOption("--env <name>", "Environment name")
+    .option("--env <name>", "Environment name", "default")
     .action(async (key, options) => {
     await executeVariablesRemove(key, options.env);
 });
-// Local command group
-const local = program.command("local").description("Local test execution");
-local
-    .command("run [env]")
-    .description("Run tests locally against an environment")
-    .action(async (env, options) => {
-    await executeRunLocal({ env });
-});
-// Hub command group
-const hub = program.command("hub").description("Griffin Hub operations");
-hub
-    .command("connect")
-    .description("Configure hub connection")
-    .requiredOption("--url <url>", "Hub URL")
-    .option("--token <token>", "API authentication token")
-    .action(async (options) => {
-    await executeConnect(options);
-});
-hub
-    .command("status")
-    .description("Show hub connection status")
-    .action(async () => {
-    await executeStatus();
-});
-hub
-    .command("metrics [env]")
-    .description("Show metrics summary from the hub")
-    .option("--period <period>", "Time window: 1h, 6h, 24h, 7d, 30d", "24h")
+// Secrets command group
+const secrets = program
+    .command("secrets")
+    .description("Manage encrypted secrets");
+secrets
+    .command("list")
+    .description("List secrets for an environment")
+    .option("--env <name>", "Environment name", "default")
     .option("--json", "Output as JSON")
-    .action(async (env, options) => {
-    await executeMetrics({
-        period: options.period,
-        environment: env,
+    .action(async (options) => {
+    await executeSecretsList({
+        environment: options.env,
         json: options.json,
     });
 });
-hub
-    .command("runs")
-    .description("Show recent runs from the hub")
-    .option("--monitor <name>", "Filter by monitor name")
-    .option("--limit <number>", "Number of runs to show", "10")
-    .action(async (options) => {
-    await executeRuns({
-        ...options,
-        limit: parseInt(options.limit, 10),
+secrets
+    .command("set <name>")
+    .description("Create or update a secret")
+    .option("--env <name>", "Environment name", "default")
+    .option("--value <value>", "Secret value (avoid for sensitive data)")
+    .action(async (name, options) => {
+    await executeSecretsSet({
+        name,
+        environment: options.env,
+        value: options.value,
     });
 });
-hub
-    .command("plan [env]")
-    .description("Show what changes would be applied")
-    .option("--json", "Output in JSON format")
-    .action(async (env, options) => {
-    await executePlan({ ...options, env });
-});
-hub
-    .command("apply [env]")
-    .description("Apply changes to the hub")
-    .option("--auto-approve", "Skip confirmation prompt")
-    .option("--dry-run", "Show what would be done without making changes")
-    .option("--prune", "Delete monitors on hub that don't exist locally")
-    .action(async (env, options) => {
-    await executeApply({ ...options, env });
-});
-hub
-    .command("run [env]")
-    .description("Trigger a monitor run on the hub")
-    .requiredOption("--monitor <name>", "Monitor name to run")
-    .option("--wait", "Wait for run to complete")
-    .option("--force", "Run even if local monitor differs from hub")
-    .action(async (env, options) => {
-    await executeRun({ ...options, env });
-});
-hub
-    .command("login")
-    .description("Login to the hub")
-    .action(async () => {
-    await executeLogin();
-});
-hub
-    .command("logout")
-    .description("Remove stored credentials")
-    .action(async (options) => {
-    await executeLogout(options);
-});
-// Notifications command group
-const notifications = hub
-    .command("notifications")
-    .description("View notification rules (rules are defined in monitor DSL and synced via griffin hub apply)");
-notifications
-    .command("list")
-    .description("List notification rules")
-    .option("--monitor <id>", "Filter by monitor ID")
-    .option("--enabled", "Filter by enabled status")
+secrets
+    .command("get <name>")
+    .description("Show secret metadata")
+    .option("--env <name>", "Environment name", "default")
     .option("--json", "Output as JSON")
-    .action(async (options) => {
-    await executeNotificationsList({
-        monitor: options.monitor,
-        enabled: options.enabled ? true : undefined,
+    .action(async (name, options) => {
+    await executeSecretsGet({
+        name,
+        environment: options.env,
         json: options.json,
     });
 });
-notifications
-    .command("test")
-    .description("Send a test notification (interactive wizard, or use flags for scripts)")
-    .option("--integration <id|name>", "Integration id or name; omit to choose from a list")
-    .option("--channel <channel>", "Slack channel (e.g. #alerts); use with Slack integration")
-    .option("--to-addresses <emails>", "Email recipients, comma-separated; use with email integration")
-    .action(async (options) => {
-    await executeNotificationsTest({
-        integration: options.integration,
-        channel: options.channel,
-        toAddresses: options.toAddresses,
+secrets
+    .command("delete <name>")
+    .description("Delete a secret")
+    .option("--env <name>", "Environment name", "default")
+    .option("--force", "Skip confirmation prompt")
+    .action(async (name, options) => {
+    await executeSecretsDelete({
+        name,
+        environment: options.env,
+        force: options.force,
     });
 });
 // Integrations command group
-const integrations = hub
+const integrations = program
     .command("integrations")
-    .description("Manage integrations (notifications, secrets, metrics)");
+    .description("Manage integrations");
 integrations
     .command("list")
-    .description("List integrations")
+    .description("List connected integrations")
     .option("--category <cat>", "Filter by category: secrets, notifications, metrics")
     .option("--provider <provider>", "Filter by provider")
-    .option("--environment <env>", "Filter by environment")
+    .option("--env <name>", "Filter by environment", "default")
     .option("--enabled", "Filter by enabled status")
     .option("--json", "Output as JSON")
     .action(async (options) => {
     await executeIntegrationsList({
         category: options.category,
         provider: options.provider,
-        environment: options.environment,
+        environment: options.env,
         enabled: options.enabled ? true : undefined,
         json: options.json,
     });
@@ -235,58 +270,31 @@ integrations
 });
 integrations
     .command("connect [type] [provider]")
-    .description("Connect an integration.")
+    .description("Connect a new integration")
     .option("--name <name>", "Display name for the integration")
-    .option("--environment <env>", "Environment scope")
+    .option("--env <name>", "Environment scope", "default")
     .option("--json", "Output as JSON")
     .action(async (category, provider, options) => {
     await executeIntegrationsConnect({
         category: category ?? "",
         provider: provider ?? "",
         name: options.name,
-        environment: options.environment,
+        environment: options.env,
         json: options.json,
     });
 });
-//integrations
-//  .command("add")
-//  .description(
-//    "Add an integration (no credentials in Phase 1; use API for credentials)",
-//  )
-//  .requiredOption(
-//    "--category <cat>",
-//    "Category: secrets, notifications, metrics",
-//  )
-//  .requiredOption(
-//    "--provider-type <type>",
-//    "Provider type (e.g. slack_webhook, datadog)",
-//  )
-//  .requiredOption("--name <name>", "Display name")
-//  .option("--environment <env>", "Environment scope (omit for org-wide)")
-//  .option("--enabled", "Enabled")
-//  .option("--json", "Output as JSON")
-//  .action(async (options) => {
-//    await executeIntegrationsAdd({
-//      category: options.category,
-//      providerType: options.providerType,
-//      name: options.name,
-//      environment: options.environment,
-//      enabled: options.enabled,
-//      json: options.json,
-//    });
-//  });
 integrations
     .command("update <id>")
     .description("Update an integration")
     .option("--name <name>", "Display name")
-    .option("--environment <env>", "Environment scope")
+    .option("--env <name>", "Environment scope", "default")
     .option("--enabled", "Enabled")
     .option("--json", "Output as JSON")
     .action(async (id, options) => {
     await executeIntegrationsUpdate({
         id,
         name: options.name,
-        environment: options.environment,
+        environment: options.env,
         enabled: options.enabled,
         json: options.json,
     });
@@ -295,58 +303,37 @@ integrations
     .command("remove <id>")
     .description("Remove an integration")
     .option("--force", "Skip confirmation")
-    .action(async (id) => {
-    await executeIntegrationsRemove({ id });
+    .action(async (id, options) => {
+    await executeIntegrationsRemove({ id, force: options.force });
 });
-// Secrets command group
-const secrets = hub
-    .command("secrets")
-    .description("Manage secrets (platform storage)");
-secrets
+// Notifications command group
+const notifications = program
+    .command("notifications")
+    .description("Manage notification rules");
+notifications
     .command("list")
-    .description("List secrets for an environment")
-    .option("--environment <env>", "Environment name", "default")
+    .description("List notification rules")
+    .option("--monitor <id>", "Filter by monitor ID")
+    .option("--enabled", "Filter by enabled status")
     .option("--json", "Output as JSON")
     .action(async (options) => {
-    await executeSecretsList({
-        environment: options.environment,
-        json: options.json,
-    });
-});
-secrets
-    .command("set <name>")
-    .description("Create or update a secret (prompts for value)")
-    .option("--environment <env>", "Environment name", "default")
-    .option("--value <value>", "Secret value (avoid for sensitive data)")
-    .action(async (name, options) => {
-    await executeSecretsSet({
-        name,
-        environment: options.environment,
-        value: options.value,
-    });
-});
-secrets
-    .command("get <name>")
-    .description("Show secret metadata (not the value)")
-    .option("--environment <env>", "Environment name", "default")
-    .option("--json", "Output as JSON")
-    .action(async (name, options) => {
-    await executeSecretsGet({
-        name,
-        environment: options.environment,
+    await executeNotificationsList({
+        monitor: options.monitor,
+        enabled: options.enabled ? true : undefined,
         json: options.json,
     });
 });
-secrets
-    .command("delete <name>")
-    .description("Delete a secret")
-    .option("--environment <env>", "Environment name", "default")
-    .option("--force", "Skip confirmation prompt")
-    .action(async (name, options) => {
-    await executeSecretsDelete({
-        name,
-        environment: options.environment,
-        force: options.force,
+notifications
+    .command("test")
+    .description("Send a test notification")
+    .option("--integration <id|name>", "Integration id or name; omit to choose from a list")
+    .option("--channel <channel>", "Slack channel (e.g. #alerts); use with Slack integration")
+    .option("--to-addresses <emails>", "Email recipients, comma-separated; use with email integration")
+    .action(async (options) => {
+    await executeNotificationsTest({
+        integration: options.integration,
+        channel: options.channel,
+        toAddresses: options.toAddresses,
     });
 });
 // Parse arguments

package/dist/commands/env.d.ts

@@ -1,12 +1,12 @@
 /**
  * List all available environments
  */
-export declare function executeEnvList(): Promise<void>;
+export declare const executeEnvList: () => Promise<void>;
 /**
  * Add a new environment
  */
-export declare function executeEnvAdd(name: string): Promise<void>;
+export declare const executeEnvAdd: (name: string) => Promise<void>;
 /**
  * Remove an environment
  */
-export declare function executeEnvRemove(name: string): Promise<void>;
+export declare const executeEnvRemove: (name: string) => Promise<void>;

package/dist/commands/env.js

@@ -1,59 +1,42 @@
 import { loadState, addEnvironment, removeEnvironment } from "../core/state.js";
 import { terminal } from "../utils/terminal.js";
+import { withCommandErrorHandler } from "../utils/command-wrapper.js";
 /**
  * List all available environments
  */
-export async function executeEnvList() {
-    try {
-        const state = await loadState();
-        const environments = Object.keys(state.environments);
-        if (environments.length === 0) {
-            terminal.warn("No environments configured.");
-            terminal.blank();
-            terminal.dim("Run 'griffin init' to set up your project.");
-            return;
-        }
-        terminal.info("Available environments:");
-        terminal.blank();
-        for (const envName of environments) {
-            const marker = terminal.colors.green("●");
-            const envDisplay = terminal.colors.cyan(envName);
-            terminal.log(`  ${marker} ${envDisplay}`);
-        }
+export const executeEnvList = withCommandErrorHandler(async () => {
+    const state = await loadState();
+    const environments = Object.keys(state.environments);
+    if (environments.length === 0) {
+        terminal.warn("No environments configured.");
         terminal.blank();
+        terminal.dim("Run 'griffin init' to set up your project.");
+        return;
     }
-    catch (error) {
-        terminal.error(error.message);
-        terminal.exit(1);
+    terminal.info("Available environments:");
+    terminal.blank();
+    for (const envName of environments) {
+        const marker = terminal.colors.green("●");
+        const envDisplay = terminal.colors.cyan(envName);
+        terminal.log(`  ${marker} ${envDisplay}`);
     }
-}
+    terminal.blank();
+});
 /**
  * Add a new environment
  */
-export async function executeEnvAdd(name) {
-    try {
-        await addEnvironment(name, {});
-        terminal.success(`Environment '${name}' added successfully.`);
-        terminal.blank();
-        terminal.dim(`Add variables with: griffin variables add KEY=VALUE --env ${name}`);
-        terminal.blank();
-    }
-    catch (error) {
-        terminal.error(error.message);
-        terminal.exit(1);
-    }
-}
+export const executeEnvAdd = withCommandErrorHandler(async (name) => {
+    await addEnvironment(name, {});
+    terminal.success(`Environment '${name}' added successfully.`);
+    terminal.blank();
+    terminal.dim(`Add variables with: griffin variables add KEY=VALUE --env ${name}`);
+    terminal.blank();
+});
 /**
  * Remove an environment
  */
-export async function executeEnvRemove(name) {
-    try {
-        await removeEnvironment(name);
-        terminal.success(`Environment '${name}' removed successfully.`);
-        terminal.blank();
-    }
-    catch (error) {
-        terminal.error(error.message);
-        terminal.exit(1);
-    }
-}
+export const executeEnvRemove = withCommandErrorHandler(async (name) => {
+    await removeEnvironment(name);
+    terminal.success(`Environment '${name}' removed successfully.`);
+    terminal.blank();
+});

package/dist/commands/hub/apply.d.ts

@@ -7,4 +7,4 @@ export interface ApplyOptions {
 /**
  * Apply changes to the hub
  */
-export declare function executeApply(options: ApplyOptions): Promise<void>;
+export declare const executeApply: (options: ApplyOptions) => Promise<void>;