@griffin-app/griffin-cli 1.0.25 → 1.0.28

package/dist/cli.js

@@ -24,33 +24,34 @@ const program = new Command();
 program
     .name("griffin")
     .description("Griffin CLI - API Monitoring as Code")
-    .version("1.0.0");
+    .version("1.0.0")
+    .option("--json", "Output as JSON (for scripts and AI agents)");
 // Top-level commands
 program
     .command("init")
     .description("Initialize griffin in the current directory")
     .option("--project <name>", "Project ID (defaults to package.json name or directory name)")
     .action(async (options) => {
-    await executeInit(options);
+    await executeInit({ ...options, json: program.opts().json });
 });
 program
     .command("validate")
     .description("Check monitor files for errors")
     .action(async () => {
-    await executeValidate();
+    await executeValidate({ json: program.opts().json });
 });
 program
     .command("status")
     .description("Show project and connection status")
     .action(async () => {
-    await executeStatus();
+    await executeStatus({ json: program.opts().json });
 });
 program
     .command("test")
     .description("Run monitors locally")
     .option("--env <name>", "Environment name", "default")
     .action(async (options) => {
-    await executeRunLocal({ env: options.env });
+    await executeRunLocal({ env: options.env, json: program.opts().json });
 });
 program
     .command("plan")
@@ -58,7 +59,7 @@ program
     .option("--env <name>", "Environment name", "default")
     .option("--json", "Output in JSON format")
     .action(async (options) => {
-    await executePlan({ ...options, env: options.env });
+    await executePlan({ ...options, env: options.env, json: program.opts().json ?? options.json });
 });
 program
     .command("apply")
@@ -68,7 +69,7 @@ program
     .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 });
+    await executeApply({ ...options, env: options.env, json: program.opts().json });
 });
 program
     .command("runs")
@@ -81,6 +82,7 @@ program
         ...options,
         env: options.env,
         limit: parseInt(options.limit, 10),
+        json: program.opts().json,
     });
 });
 program
@@ -91,7 +93,7 @@ program
     .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 });
+    await executeRun({ ...options, env: options.env, json: program.opts().json });
 });
 program
     .command("metrics")
@@ -103,7 +105,7 @@ program
     await executeMetrics({
         period: options.period,
         environment: options.env,
-        json: options.json,
+        json: program.opts().json ?? options.json,
     });
 });
 program
@@ -114,21 +116,27 @@ program
     .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 });
+    await executeDestroy({ ...options, env, json: program.opts().json });
 });
 // Auth command group
 const auth = program.command("auth").description("Manage authentication");
 auth
     .command("login")
     .description("Authenticate with Griffin Cloud")
-    .action(async () => {
-    await executeLogin();
+    .option("--no-poll", "Only output auth URL and exit; run again with --poll after completing authorization")
+    .option("--poll", "Poll for completion after user has authorized in browser (use after --no-poll)")
+    .action(async (options) => {
+    await executeLogin({
+        json: program.opts().json,
+        noPoll: options.noPoll,
+        poll: options.poll,
+    });
 });
 auth
     .command("logout")
     .description("Clear stored credentials")
     .action(async (options) => {
-    await executeLogout(options);
+    await executeLogout({ ...options, json: program.opts().json });
 });
 auth
     .command("connect")
@@ -136,13 +144,13 @@ auth
     .requiredOption("--url <url>", "Hub URL")
     .requiredOption("--token <token>", "API authentication token")
     .action(async (options) => {
-    await executeConnect(options);
+    await executeConnect({ ...options, json: program.opts().json });
 });
 auth
     .command("generate-key")
     .description("Generate an API key")
     .action(async () => {
-    await executeGenerateKey();
+    await executeGenerateKey({ json: program.opts().json });
 });
 // Environment command group
 const env = program.command("env").description("Manage environments");
@@ -150,19 +158,19 @@ env
     .command("list")
     .description("List configured environments")
     .action(async () => {
-    await executeEnvList();
+    await executeEnvList({ json: program.opts().json });
 });
 env
     .command("add <name>")
     .description("Add an environment")
     .action(async (name) => {
-    await executeEnvAdd(name);
+    await executeEnvAdd({ name, json: program.opts().json });
 });
 env
     .command("remove <name>")
     .description("Remove an environment")
     .action(async (name) => {
-    await executeEnvRemove(name);
+    await executeEnvRemove({ name, json: program.opts().json });
 });
 // Variables command group
 const variables = program
@@ -173,21 +181,29 @@ variables
     .description("List variables for an environment")
     .option("--env <name>", "Environment name", "default")
     .action(async (options) => {
-    await executeVariablesList(options.env);
+    await executeVariablesList({ env: options.env, json: program.opts().json });
 });
 variables
     .command("add <keyValue>")
     .description("Set a variable (KEY=VALUE)")
     .option("--env <name>", "Environment name", "default")
     .action(async (keyValue, options) => {
-    await executeVariablesAdd(keyValue, options.env);
+    await executeVariablesAdd({
+        keyValue,
+        env: options.env,
+        json: program.opts().json,
+    });
 });
 variables
     .command("remove <key>")
     .description("Remove a variable")
     .option("--env <name>", "Environment name", "default")
     .action(async (key, options) => {
-    await executeVariablesRemove(key, options.env);
+    await executeVariablesRemove({
+        key,
+        env: options.env,
+        json: program.opts().json,
+    });
 });
 // Secrets command group
 const secrets = program
@@ -201,7 +217,7 @@ secrets
     .action(async (options) => {
     await executeSecretsList({
         environment: options.env,
-        json: options.json,
+        json: program.opts().json ?? options.json,
     });
 });
 secrets
@@ -214,6 +230,7 @@ secrets
         name,
         environment: options.env,
         value: options.value,
+        json: program.opts().json,
     });
 });
 secrets
@@ -225,7 +242,7 @@ secrets
     await executeSecretsGet({
         name,
         environment: options.env,
-        json: options.json,
+        json: program.opts().json ?? options.json,
     });
 });
 secrets
@@ -238,6 +255,7 @@ secrets
         name,
         environment: options.env,
         force: options.force,
+        json: program.opts().json,
     });
 });
 // Integrations command group
@@ -258,7 +276,7 @@ integrations
         provider: options.provider,
         environment: options.env,
         enabled: options.enabled ? true : undefined,
-        json: options.json,
+        json: program.opts().json ?? options.json,
     });
 });
 integrations
@@ -266,7 +284,7 @@ integrations
     .description("Show integration details")
     .option("--json", "Output as JSON")
     .action(async (id, options) => {
-    await executeIntegrationsShow({ id, json: options.json });
+    await executeIntegrationsShow({ id, json: program.opts().json ?? options.json });
 });
 integrations
     .command("connect [type] [provider]")
@@ -280,7 +298,7 @@ integrations
         provider: provider ?? "",
         name: options.name,
         environment: options.env,
-        json: options.json,
+        json: program.opts().json ?? options.json,
     });
 });
 integrations
@@ -296,7 +314,7 @@ integrations
         name: options.name,
         environment: options.env,
         enabled: options.enabled,
-        json: options.json,
+        json: program.opts().json ?? options.json,
     });
 });
 integrations
@@ -304,7 +322,7 @@ integrations
     .description("Remove an integration")
     .option("--force", "Skip confirmation")
     .action(async (id, options) => {
-    await executeIntegrationsRemove({ id, force: options.force });
+    await executeIntegrationsRemove({ id, force: options.force, json: program.opts().json });
 });
 // Notifications command group
 const notifications = program
@@ -320,7 +338,7 @@ notifications
     await executeNotificationsList({
         monitor: options.monitor,
         enabled: options.enabled ? true : undefined,
-        json: options.json,
+        json: program.opts().json ?? options.json,
     });
 });
 notifications
@@ -334,6 +352,7 @@ notifications
         integration: options.integration,
         channel: options.channel,
         toAddresses: options.toAddresses,
+        json: program.opts().json,
     });
 });
 // Parse arguments

package/dist/commands/env.d.ts

@@ -1,12 +1,23 @@
+export interface EnvListOptions {
+    json?: boolean;
+}
 /**
  * List all available environments
  */
-export declare const executeEnvList: () => Promise<void>;
+export declare const executeEnvList: (options: EnvListOptions) => Promise<void>;
+export interface EnvAddOptions {
+    name: string;
+    json?: boolean;
+}
 /**
  * Add a new environment
  */
-export declare const executeEnvAdd: (name: string) => Promise<void>;
+export declare const executeEnvAdd: (options: EnvAddOptions) => Promise<void>;
+export interface EnvRemoveOptions {
+    name: string;
+    json?: boolean;
+}
 /**
  * Remove an environment
  */
-export declare const executeEnvRemove: (name: string) => Promise<void>;
+export declare const executeEnvRemove: (options: EnvRemoveOptions) => Promise<void>;

package/dist/commands/env.js

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

package/dist/commands/generate-key.d.ts

@@ -1,9 +1,8 @@
+export interface GenerateKeyOptions {
+    json?: boolean;
+}
 /**
  * Generate a cryptographically secure API key for griffin-runner authentication.
- *
- * The key format is: grfn_sk_<48-character-hex-string>
- * - grfn: Griffin prefix
- * - sk: Secret Key
- * - 48 hex chars: 24 random bytes = 192 bits of entropy
+ * Format: grfn_sk_<48-character-hex-string>
  */
-export declare function executeGenerateKey(): Promise<void>;
+export declare const executeGenerateKey: (options: GenerateKeyOptions) => Promise<void>;

package/dist/commands/generate-key.js

@@ -1,33 +1,27 @@
 import { randomBytes } from "node:crypto";
-import { terminal } from "../utils/terminal.js";
+import { createCommandHandler } from "../utils/command-wrapper.js";
 /**
  * Generate a cryptographically secure API key for griffin-runner authentication.
- *
- * The key format is: grfn_sk_<48-character-hex-string>
- * - grfn: Griffin prefix
- * - sk: Secret Key
- * - 48 hex chars: 24 random bytes = 192 bits of entropy
+ * Format: grfn_sk_<48-character-hex-string>
  */
-export async function executeGenerateKey() {
-    // Generate 24 random bytes (192 bits of entropy)
+export const executeGenerateKey = createCommandHandler("generate-key", async (_options, output) => {
     const keyBytes = randomBytes(24);
-    // Convert to hex string
     const keySecret = keyBytes.toString("hex");
-    // Add prefix following the pattern: grfn_sk_<secret>
     const apiKey = `grfn_sk_${keySecret}`;
-    terminal.blank();
-    terminal.success("Generated API key:");
-    terminal.blank();
-    terminal.log(`  ${terminal.colors.cyan(apiKey)}`);
-    terminal.blank();
-    terminal.warn("Store this key securely - it cannot be retrieved later.");
-    terminal.blank();
-    terminal.info("To use this key:");
-    terminal.dim("  1. Add it to your runner's AUTH_API_KEYS environment variable:");
-    terminal.dim(`     AUTH_API_KEYS=${apiKey}`);
-    terminal.dim("  2. Or add it to your .griffinrc.json:");
-    terminal.dim(`     { "runner": { "apiToken": "${apiKey}" } }`);
-    terminal.dim("  3. Or pass it via environment variable:");
-    terminal.dim(`     GRIFFIN_API_TOKEN=${apiKey}`);
-    terminal.blank();
-}
+    output.setData({ apiKey });
+    output.blank();
+    output.success("Generated API key:");
+    output.blank();
+    output.log(`  ${output.colors.cyan(apiKey)}`);
+    output.blank();
+    output.warn("Store this key securely - it cannot be retrieved later.");
+    output.blank();
+    output.info("To use this key:");
+    output.dim("  1. Add it to your runner's AUTH_API_KEYS environment variable:");
+    output.dim(`     AUTH_API_KEYS=${apiKey}`);
+    output.dim("  2. Or add it to your .griffinrc.json:");
+    output.dim(`     { "runner": { "apiToken": "${apiKey}" } }`);
+    output.dim("  3. Or pass it via environment variable:");
+    output.dim(`     GRIFFIN_API_TOKEN=${apiKey}`);
+    output.blank();
+});

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

@@ -3,6 +3,7 @@ export interface ApplyOptions {
     dryRun?: boolean;
     env: string;
     prune?: boolean;
+    json?: boolean;
 }
 /**
  * Apply changes to the hub

package/dist/commands/hub/apply.js

@@ -2,53 +2,54 @@ import { resolveEnvironment } from "../../core/state.js";
 import { computeDiff, formatDiff } from "../../core/diff.js";
 import { applyDiff, formatApplyResult } from "../../core/apply.js";
 import { createSdkAndState } from "../../core/sdk.js";
-import { terminal } from "../../utils/terminal.js";
-import { withCommandErrorHandler } from "../../utils/command-wrapper.js";
+import { createCommandHandler } from "../../utils/command-wrapper.js";
 import { discoverLocalMonitors, fetchRemoteMonitors, resolveLocalMonitors, } from "../../core/monitor-helpers.js";
 /**
  * Apply changes to the hub
  */
-export const executeApply = withCommandErrorHandler(async (options) => {
+export const executeApply = createCommandHandler("apply", async (options, output) => {
     const { sdk, state } = await createSdkAndState();
-    // Resolve environment
     const envName = await resolveEnvironment(options.env);
-    terminal.info(`Applying to ${terminal.colors.cyan(envName)} environment`);
-    terminal.blank();
-    // Discover local monitors
+    output.info(`Applying to ${output.colors.cyan(envName)} environment`);
+    output.blank();
     const { monitors } = await discoverLocalMonitors(state);
-    // Fetch remote monitors for this project + environment
     const remoteMonitors = await fetchRemoteMonitors(sdk, state.projectId, envName);
-    // Load variables and resolve local monitors before computing diff
     const resolvedMonitors = await resolveLocalMonitors(monitors, state.projectId, envName);
-    // Compute diff (include deletions if --prune)
     const diff = computeDiff(resolvedMonitors, remoteMonitors, {
         includeDeletions: options.prune || false,
     });
-    // Show monitor
-    terminal.blank();
-    terminal.log(formatDiff(diff));
-    terminal.blank();
-    // Check if there are changes
-    if (diff.summary.creates + diff.summary.updates + diff.summary.deletes ===
-        0) {
-        terminal.success("No changes to apply.");
+    output.blank();
+    output.log(formatDiff(diff));
+    output.blank();
+    const changeCount = diff.summary.creates + diff.summary.updates + diff.summary.deletes;
+    if (changeCount === 0) {
+        output.success("No changes to apply.");
+        output.setData({
+            summary: diff.summary,
+            applied: [],
+            success: true,
+            message: "No changes to apply.",
+        });
         return;
     }
-    // Show deletions warning if --prune
     if (options.prune && diff.summary.deletes > 0) {
-        terminal.warn(`--prune will DELETE ${diff.summary.deletes} monitor(s) from the hub`);
-        terminal.blank();
+        output.warn(`--prune will DELETE ${diff.summary.deletes} monitor(s) from the hub`);
+        output.blank();
     }
-    // Ask for confirmation unless auto-approved
     if (!options.autoApprove && !options.dryRun) {
-        const confirmed = await terminal.confirm("Do you want to perform these actions?");
+        const confirmed = await output.confirm("Do you want to perform these actions?");
         if (!confirmed) {
-            terminal.warn("Apply cancelled.");
+            output.warn("Apply cancelled.");
+            output.setData({
+                summary: diff.summary,
+                applied: [],
+                success: false,
+                message: "Apply cancelled.",
+            });
             return;
         }
     }
-    // Apply changes with environment injection
-    const applySpinner = terminal.spinner("Applying changes...").start();
+    const applySpinner = output.spinner("Applying changes...").start();
     const result = await applyDiff(diff, sdk, {
         dryRun: options.dryRun,
     });
@@ -58,9 +59,23 @@ export const executeApply = withCommandErrorHandler(async (options) => {
     else {
         applySpinner.fail("Apply failed");
     }
-    terminal.blank();
-    terminal.log(formatApplyResult(result));
+    output.setData({
+        summary: diff.summary,
+        applied: result.applied.map((a) => ({
+            type: a.type,
+            monitorName: a.monitorName,
+            success: a.success,
+            error: a.error,
+        })),
+        errors: result.errors.map((e) => ({
+            action: e.action.type,
+            error: e.error.message,
+        })),
+        success: result.success,
+    });
+    output.blank();
+    output.log(formatApplyResult(result));
     if (!result.success) {
-        terminal.exit(1);
+        output.exit(1);
     }
 });

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

@@ -1,8 +1,9 @@
 export interface ConnectOptions {
     url: string;
     token: string;
+    json?: boolean;
 }
 /**
  * Configure hub connection settings
  */
-export declare function executeConnect(options: ConnectOptions): Promise<void>;
+export declare const executeConnect: (options: ConnectOptions) => Promise<void>;

package/dist/commands/hub/connect.js

@@ -1,28 +1,24 @@
 import { randomBytes } from "crypto";
 import { loadState, saveState } from "../../core/state.js";
 import { saveHubCredentials } from "../../core/credentials.js";
-import { terminal } from "../../utils/terminal.js";
+import { createCommandHandler } from "../../utils/command-wrapper.js";
 /**
  * Configure hub connection settings
  */
-export async function executeConnect(options) {
-    try {
-        const state = await loadState();
-        // Save token to user-level credentials file if provided
-        await saveHubCredentials(options.token);
-        // Update hub config in project state (without token)
-        state.hub = {
-            baseUrl: options.url,
-            clientId: randomBytes(16).toString("hex"),
-        };
-        await saveState(state);
-        terminal.success("Hub connection configured");
-        terminal.log(`  URL: ${terminal.colors.cyan(options.url)}`);
-        terminal.log(`  API Token: ${terminal.colors.dim("***")} (saved to user credentials)`);
-        terminal.blank();
-    }
-    catch (error) {
-        terminal.error(error.message);
-        terminal.exit(1);
-    }
-}
+export const executeConnect = createCommandHandler("auth connect", async (options, output) => {
+    const state = await loadState();
+    await saveHubCredentials(options.token);
+    state.hub = {
+        baseUrl: options.url,
+        clientId: randomBytes(16).toString("hex"),
+    };
+    await saveState(state);
+    output.setData({
+        url: options.url,
+        configured: true,
+    });
+    output.success("Hub connection configured");
+    output.log(`  URL: ${output.colors.cyan(options.url)}`);
+    output.log(`  API Token: ${output.colors.dim("***")} (saved to user credentials)`);
+    output.blank();
+});

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

@@ -3,8 +3,9 @@ export interface DestroyOptions {
     dryRun?: boolean;
     env: string;
     monitor?: string;
+    json?: boolean;
 }
 /**
  * Destroy monitors on the hub
  */
-export declare function executeDestroy(options: DestroyOptions): Promise<void>;
+export declare const executeDestroy: (options: DestroyOptions) => Promise<void>;