@griffin-app/griffin-cli 1.0.11 → 1.0.13

package/dist/cli.js

@@ -3,7 +3,8 @@ import { Command } from "commander";
 import { executeInit } from "./commands/init.js";
 import { executeValidate } from "./commands/validate.js";
 import { executeGenerateKey } from "./commands/generate-key.js";
-import { executeEnvList } from "./commands/env.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
@@ -16,9 +17,10 @@ import { executeApply } from "./commands/hub/apply.js";
 import { executeRun } from "./commands/hub/run.js";
 import { executeLogin } from "./commands/hub/login.js";
 import { executeLogout } from "./commands/hub/logout.js";
+import { executeIntegrationsConnect } from "./commands/hub/integrations.js";
 import { executeNotificationsList, executeNotificationsTest, } from "./commands/hub/notifications.js";
 import { executeSecretsList, executeSecretsSet, executeSecretsGet, executeSecretsDelete, } from "./commands/hub/secrets.js";
-import { executeIntegrationsList, executeIntegrationsShow, executeIntegrationsAdd, executeIntegrationsUpdate, executeIntegrationsRemove, } from "./commands/hub/integrations.js";
+import { executeIntegrationsList, executeIntegrationsShow, executeIntegrationsUpdate, executeIntegrationsRemove, } from "./commands/hub/integrations.js";
 const program = new Command();
 program
     .name("griffin")
@@ -52,6 +54,43 @@ env
     .action(async () => {
     await executeEnvList();
 });
+env
+    .command("add <name>")
+    .description("Add a new environment")
+    .action(async (name) => {
+    await executeEnvAdd(name);
+});
+env
+    .command("remove <name>")
+    .description("Remove an environment")
+    .action(async (name) => {
+    await executeEnvRemove(name);
+});
+// Variables command group
+const variables = program
+    .command("variables")
+    .description("Manage environment variables");
+variables
+    .command("list")
+    .description("List all variables for an environment")
+    .requiredOption("--env <name>", "Environment name")
+    .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")
+    .action(async (keyValue, options) => {
+    await executeVariablesAdd(keyValue, options.env);
+});
+variables
+    .command("remove <key>")
+    .description("Remove a variable")
+    .requiredOption("--env <name>", "Environment name")
+    .action(async (key, options) => {
+    await executeVariablesRemove(key, options.env);
+});
 // Local command group
 const local = program.command("local").description("Local test execution");
 local
@@ -155,11 +194,15 @@ notifications
 });
 notifications
     .command("test")
-    .description("Test a webhook configuration")
-    .requiredOption("--webhook <url>", "Webhook URL to 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({
-        webhook: options.webhook,
+        integration: options.integration,
+        channel: options.channel,
+        toAddresses: options.toAddresses,
     });
 });
 // Integrations command group
@@ -170,14 +213,14 @@ integrations
     .command("list")
     .description("List integrations")
     .option("--category <cat>", "Filter by category: secrets, notifications, metrics")
-    .option("--provider-type <type>", "Filter by provider type")
+    .option("--provider <provider>", "Filter by provider")
     .option("--environment <env>", "Filter by environment")
     .option("--enabled", "Filter by enabled status")
     .option("--json", "Output as JSON")
     .action(async (options) => {
     await executeIntegrationsList({
         category: options.category,
-        providerType: options.providerType,
+        provider: options.provider,
         environment: options.environment,
         enabled: options.enabled ? true : undefined,
         json: options.json,
@@ -191,24 +234,47 @@ integrations
     await executeIntegrationsShow({ id, 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")
+    .command("connect [type] [provider]")
+    .description("Connect an integration.")
+    .option("--name <name>", "Display name for the integration")
+    .option("--environment <env>", "Environment scope")
     .option("--json", "Output as JSON")
-    .action(async (options) => {
-    await executeIntegrationsAdd({
-        category: options.category,
-        providerType: options.providerType,
+    .action(async (category, provider, options) => {
+    await executeIntegrationsConnect({
+        category: category ?? "",
+        provider: provider ?? "",
         name: options.name,
         environment: options.environment,
-        enabled: options.enabled,
         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")
@@ -232,23 +298,6 @@ integrations
     .action(async (id) => {
     await executeIntegrationsRemove({ id });
 });
-integrations
-    .command("connect <provider>")
-    .description("Connect an OAuth integration (opens browser)")
-    .option("--name <name>", "Display name for the integration")
-    .option("--environment <env>", "Environment scope")
-    .option("--category <cat>", "Category (default: notifications)")
-    .option("--json", "Output integration ID as JSON")
-    .action(async (provider, options) => {
-    const { executeIntegrationsConnect } = await import("./commands/hub/integrations.js");
-    await executeIntegrationsConnect({
-        providerType: provider,
-        name: options.name,
-        environment: options.environment,
-        category: options.category,
-        json: options.json,
-    });
-});
 // Secrets command group
 const secrets = hub
     .command("secrets")

package/dist/commands/env.d.ts

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

package/dist/commands/env.js

@@ -1,4 +1,4 @@
-import { loadState } from "../core/state.js";
+import { loadState, addEnvironment, removeEnvironment } from "../core/state.js";
 import { terminal } from "../utils/terminal.js";
 /**
  * List all available environments
@@ -27,3 +27,33 @@ export async function executeEnvList() {
         terminal.exit(1);
     }
 }
+/**
+ * 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);
+    }
+}
+/**
+ * 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);
+    }
+}

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

@@ -1,6 +1,7 @@
+import type { IntegrationCategory, Provider } from "@griffin-app/griffin-ts/types";
 export interface IntegrationsListOptions {
-    category?: string;
-    providerType?: string;
+    category?: IntegrationCategory;
+    provider?: Provider;
     environment?: string;
     enabled?: boolean;
     json?: boolean;
@@ -12,8 +13,8 @@ export interface IntegrationsShowOptions {
 }
 export declare function executeIntegrationsShow(options: IntegrationsShowOptions): Promise<void>;
 export interface IntegrationsAddOptions {
-    category: string;
-    providerType: string;
+    category: IntegrationCategory;
+    provider: Provider;
     name: string;
     config?: Record<string, string>;
     environment?: string;
@@ -36,10 +37,11 @@ export interface IntegrationsRemoveOptions {
 }
 export declare function executeIntegrationsRemove(options: IntegrationsRemoveOptions): Promise<void>;
 export interface IntegrationsConnectOptions {
-    providerType: string;
+    category: IntegrationCategory;
+    provider: Provider;
     name?: string;
     environment?: string;
-    category?: string;
     json?: boolean;
 }
+export declare function printConnectHelp(): void;
 export declare function executeIntegrationsConnect(options: IntegrationsConnectOptions): Promise<void>;

package/dist/commands/hub/integrations.js

@@ -1,59 +1,21 @@
 import { exec } from "node:child_process";
 import { platform } from "node:os";
 import { loadState } from "../../core/state.js";
-import { getHubCredentials } from "../../core/credentials.js";
 import { terminal } from "../../utils/terminal.js";
-async function hubFetch(path, options = {}) {
+import { getProvider, getProviders, getCategories, getAllProvidersByCategory, } from "../../providers/registry.js";
+import { createSdkWithCredentials } from "../../core/sdk.js";
+export async function executeIntegrationsList(options) {
     const state = await loadState();
-    if (!state.hub?.baseUrl) {
-        terminal.error("Hub connection not configured.");
-        terminal.dim("Connect with: griffin hub connect --url <url> --token <token>");
-        process.exit(1);
-    }
-    const credentials = await getHubCredentials();
-    const url = `${state.hub.baseUrl.replace(/\/$/, "")}${path}`;
-    const headers = {
-        "Content-Type": "application/json",
-    };
-    if (credentials?.token) {
-        headers["Authorization"] = `Bearer ${credentials.token}`;
-    }
-    const res = await fetch(url, {
-        method: options.method ?? "GET",
-        headers,
-        body: options.body ? JSON.stringify(options.body) : undefined,
+    const sdk = await createSdkWithCredentials(state.hub.baseUrl);
+    const result = await sdk.getIntegrations({
+        query: {
+            category: options.category,
+            provider: options.provider,
+            environment: options.environment,
+            enabled: options.enabled,
+        },
     });
-    const text = await res.text();
-    let json;
-    try {
-        json = text ? JSON.parse(text) : {};
-    }
-    catch {
-        return { error: res.ok ? "Invalid response" : text || res.statusText };
-    }
-    if (!res.ok) {
-        return { error: json.error ?? res.statusText };
-    }
-    return json;
-}
-export async function executeIntegrationsList(options) {
-    const params = new URLSearchParams();
-    if (options.category)
-        params.set("category", options.category);
-    if (options.providerType)
-        params.set("providerType", options.providerType);
-    if (options.environment != null)
-        params.set("environment", options.environment);
-    if (options.enabled != null)
-        params.set("enabled", String(options.enabled));
-    const qs = params.toString();
-    const path = `/integrations${qs ? `?${qs}` : ""}`;
-    const result = await hubFetch(path);
-    if (result.error) {
-        terminal.error(result.error);
-        process.exit(1);
-    }
-    const list = result.data ?? [];
+    const list = result.data?.data ?? [];
     if (options.json) {
         terminal.log(JSON.stringify(list, null, 2));
         return;
@@ -69,9 +31,9 @@ export async function executeIntegrationsList(options) {
     });
     for (const i of list) {
         table.push([
-            i.id.substring(0, 12) + (i.id.length > 12 ? "…" : ""),
+            i.id,
             i.category,
-            i.providerType,
+            i.provider,
             i.name,
             i.environment ?? "(all)",
             i.enabled ? "✓" : "✗",
@@ -80,12 +42,12 @@ export async function executeIntegrationsList(options) {
     terminal.log(table.toString());
 }
 export async function executeIntegrationsShow(options) {
-    const result = await hubFetch(`/integrations/${encodeURIComponent(options.id)}`);
-    if (result.error) {
-        terminal.error(result.error);
-        process.exit(1);
-    }
-    const integration = result.data;
+    const state = await loadState();
+    const sdk = await createSdkWithCredentials(state.hub.baseUrl);
+    const result = await sdk.getIntegrationsById({
+        path: { id: options.id },
+    });
+    const integration = result.data?.data;
     if (!integration) {
         terminal.error("Integration not found.");
         process.exit(1);
@@ -97,7 +59,7 @@ export async function executeIntegrationsShow(options) {
     terminal.info(integration.name);
     terminal.dim(`ID: ${integration.id}`);
     terminal.log(`Category: ${integration.category}`);
-    terminal.log(`Provider: ${integration.providerType}`);
+    terminal.log(`Provider: ${integration.provider}`);
     terminal.log(`Environment: ${integration.environment ?? "(all)"}`);
     terminal.log(`Enabled: ${integration.enabled ? "Yes" : "No"}`);
     terminal.log(`Has credentials: ${integration.hasCredentials ? "Yes" : "No"}`);
@@ -108,23 +70,20 @@ export async function executeIntegrationsShow(options) {
 export async function executeIntegrationsAdd(options) {
     const body = {
         category: options.category,
-        providerType: options.providerType,
+        provider: options.provider,
         name: options.name,
         config: options.config ?? {},
         environment: options.environment ?? null,
         enabled: options.enabled ?? true,
     };
-    const result = await hubFetch("/integrations", {
-        method: "POST",
+    const state = await loadState();
+    const sdk = await createSdkWithCredentials(state.hub.baseUrl);
+    const result = await sdk.postIntegrations({
         body,
     });
-    if (result.error) {
-        terminal.error(result.error);
-        process.exit(1);
-    }
-    const integration = result.data;
+    const integration = result.data?.data;
     if (!integration) {
-        terminal.error("Create failed.");
+        terminal.error("Integration not found.");
         process.exit(1);
     }
     if (options.json) {
@@ -135,37 +94,44 @@ export async function executeIntegrationsAdd(options) {
 }
 export async function executeIntegrationsUpdate(options) {
     const body = {};
-    if (options.name !== undefined)
-        body.name = options.name;
-    if (options.config !== undefined)
-        body.config = options.config;
-    if (options.environment !== undefined)
-        body.environment = options.environment;
-    if (options.enabled !== undefined)
-        body.enabled = options.enabled;
-    const result = await hubFetch(`/integrations/${encodeURIComponent(options.id)}`, { method: "PATCH", body });
-    if (result.error) {
-        terminal.error(result.error);
-        process.exit(1);
-    }
-    const integration = result.data;
+    //if (options.name !== undefined) body.name = options.name;
+    //if (options.config !== undefined) body.config = options.config;
+    //if (options.environment !== undefined) body.environment = options.environment;
+    //if (options.enabled !== undefined) body.enabled = options.enabled;
+    const state = await loadState();
+    const sdk = await createSdkWithCredentials(state.hub.baseUrl);
+    const result = await sdk.patchIntegrationsById({
+        path: { id: options.id },
+        body: {
+            name: options.name,
+            config: options.config,
+            environment: options.environment,
+            enabled: options.enabled,
+        },
+    });
+    const integration = result.data?.data;
     if (!integration) {
-        terminal.error("Update failed.");
+        terminal.error("Integration not found.");
         process.exit(1);
     }
     if (options.json) {
         terminal.log(JSON.stringify(integration, null, 2));
         return;
     }
-    terminal.info(`Updated integration ${integration.name}`);
+    terminal.success(`Updated integration ${integration.name}`);
 }
 export async function executeIntegrationsRemove(options) {
-    const result = await hubFetch(`/integrations/${encodeURIComponent(options.id)}`, { method: "DELETE" });
-    if (result.error) {
-        terminal.error(result.error);
+    const state = await loadState();
+    const sdk = await createSdkWithCredentials(state.hub.baseUrl);
+    const result = await sdk.deleteIntegrationsById({
+        path: { id: options.id },
+    });
+    const integration = result.data?.data;
+    if (!integration) {
+        terminal.error("Integration not found.");
         process.exit(1);
     }
-    terminal.info("Integration removed.");
+    terminal.success(`Integration removed.`);
 }
 function openBrowser(url) {
     const cmd = platform() === "darwin"
@@ -182,19 +148,32 @@ function openBrowser(url) {
 const POLL_INITIAL_MS = 2000;
 const POLL_MAX_MS = 10000;
 const POLL_TIMEOUT_MS = 15 * 60 * 1000; // 15 minutes
-export async function executeIntegrationsConnect(options) {
-    const category = options.category ?? "notifications";
+export function printConnectHelp() {
+    terminal.log("Usage: griffin hub integrations connect <category> <provider> [options]");
+    terminal.blank();
+    terminal.log("Categories and Providers:");
+    const byCategory = getAllProvidersByCategory();
+    for (const category of getCategories()) {
+        const providers = byCategory.get(category) ?? [];
+        terminal.log(`  ${category}`);
+        for (const p of providers) {
+            terminal.log(`    ${p.provider.padEnd(14)} ${p.displayName}`);
+        }
+        terminal.blank();
+    }
+}
+async function connectOAuth(options, _provider) {
     const body = {
-        category,
-        providerType: options.providerType,
-        name: options.name ?? undefined,
+        category: options.category,
+        provider: options.provider,
+        name: options.name ?? options.provider,
         environment: options.environment ?? undefined,
     };
-    const result = await hubFetch("/integrations/oauth/initiate", { method: "POST", body });
-    if (result.error) {
-        terminal.error(result.error);
-        process.exit(1);
-    }
+    const state = await loadState();
+    const sdk = await createSdkWithCredentials(state.hub.baseUrl);
+    const result = await sdk.postIntegrationsOauthInitiate({
+        body,
+    });
     const data = result.data;
     if (!data) {
         terminal.error("Initiate failed.");
@@ -208,10 +187,9 @@ export async function executeIntegrationsConnect(options) {
     const start = Date.now();
     let interval = POLL_INITIAL_MS;
     const poll = async () => {
-        const statusResult = await hubFetch(`/integrations/oauth/status/${encodeURIComponent(data.transactionId)}`);
-        if (statusResult.error) {
-            throw new Error(statusResult.error);
-        }
+        const statusResult = await sdk.getIntegrationsOauthStatusByTransactionId({
+            path: { transactionId: data.transactionId },
+        });
         const status = statusResult.data;
         if (!status) {
             throw new Error("Invalid status response");
@@ -253,3 +231,78 @@ export async function executeIntegrationsConnect(options) {
         process.exit(1);
     }
 }
+async function connectCredentials(options, provider) {
+    const config = {};
+    for (const field of provider.configFields ?? []) {
+        const value = await terminal.input(`${field.label}${field.required ? " (required)" : ""}`, field.default);
+        if (field.required && !value?.trim()) {
+            terminal.error(`${field.label} is required`);
+            process.exit(1);
+        }
+        if (value?.trim())
+            config[field.key] = value.trim();
+    }
+    const credentials = {};
+    for (const field of provider.credentialFields ?? []) {
+        const value = field.secret
+            ? await terminal.password(`${field.label}${field.required ? " (required)" : ""}`)
+            : await terminal.input(`${field.label}${field.required ? " (required)" : ""}`, field.default);
+        if (field.required && !value?.trim()) {
+            terminal.error(`${field.label} is required`);
+            process.exit(1);
+        }
+        if (value?.trim())
+            credentials[field.key] = value.trim();
+    }
+    const body = {
+        category: options.category,
+        provider: options.provider,
+        name: options.name ?? provider.displayName,
+        config,
+        credentials: Object.keys(credentials).length > 0 ? credentials : undefined,
+        environment: options.environment ?? null,
+        enabled: true,
+    };
+    const state = await loadState();
+    const sdk = await createSdkWithCredentials(state.hub.baseUrl);
+    const result = await sdk.postIntegrations({
+        body,
+    });
+    const integration = result.data?.data;
+    if (!integration) {
+        terminal.error("Integration not found.");
+        process.exit(1);
+    }
+    if (options.json) {
+        terminal.log(JSON.stringify(integration, null, 2));
+        return;
+    }
+    terminal.success(`Integration connected: ${integration.name} (${integration.id})`);
+}
+export async function executeIntegrationsConnect(options) {
+    if (!options.category || !options.provider) {
+        printConnectHelp();
+        process.exit(0);
+    }
+    const providerDef = getProvider(options.category, options.provider);
+    if (!providerDef) {
+        terminal.error(`Unknown provider: ${options.category}/${options.provider}`);
+        const providersForCategory = getProviders(options.category);
+        if (providersForCategory.length > 0) {
+            terminal.info(`Available providers for ${options.category}:`);
+            for (const p of providersForCategory) {
+                terminal.log(`  - ${p.provider} (${p.displayName})`);
+            }
+        }
+        else {
+            terminal.info("Available categories: " + getCategories().join(", "));
+        }
+        process.exit(1);
+    }
+    if (providerDef.authMethod === "oauth") {
+        await connectOAuth(options, providerDef);
+    }
+    else {
+        await connectCredentials(options, providerDef);
+    }
+}

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

@@ -4,7 +4,12 @@ export interface NotificationsListOptions {
     json?: boolean;
 }
 export interface NotificationsTestOptions {
-    webhook: string;
+    /** Integration id or name. If omitted, wizard runs (select integration + provider options). */
+    integration?: string;
+    /** Slack channel (e.g. #alerts). Use with Slack integration. */
+    channel?: string;
+    /** Email recipients, comma-separated. Use with email integration. */
+    toAddresses?: string;
 }
 /**
  * List notification rules (read-only).
@@ -12,6 +17,7 @@ export interface NotificationsTestOptions {
  */
 export declare function executeNotificationsList(options: NotificationsListOptions): Promise<void>;
 /**
- * Test a webhook
+ * Test a notification integration. Without options, runs a wizard (select integration, then provider-specific prompts).
+ * With --integration and routing flags, runs non-interactively.
  */
 export declare function executeNotificationsTest(options: NotificationsTestOptions): Promise<void>;