@griffin-app/griffin-cli 1.0.3 → 1.0.5

package/dist/commands/env.js

@@ -1,121 +1,34 @@
-import { loadState, addEnvironment, removeEnvironment, setDefaultEnvironment, } from "../core/state.js";
+import { loadState } from "../core/state.js";
+import { terminal } from "../utils/terminal.js";
 /**
- * List all environments
+ * List all available environments
  */
 export async function executeEnvList() {
     try {
         const state = await loadState();
-        const envNames = Object.keys(state.environments);
-        if (envNames.length === 0) {
-            console.log("No environments configured.");
-            console.log("");
-            console.log("Add an environment with:");
-            console.log("  griffin env add <name> --base-url <url>");
+        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;
         }
-        console.log("Environments:");
-        console.log("");
-        envNames.forEach((name) => {
-            const config = state.environments[name];
-            const isDefault = name === state.defaultEnvironment;
-            const marker = isDefault ? " (default)" : "";
-            console.log(`  ${name}${marker}`);
-            console.log(`    URL: ${config.baseUrl}`);
-        });
-        console.log("");
-    }
-    catch (error) {
-        console.error(`Error: ${error.message}`);
-        process.exit(1);
-    }
-}
-/**
- * Add or update an environment
- */
-export async function executeEnvAdd(name, options) {
-    try {
-        const state = await loadState();
-        const isUpdate = name in state.environments;
-        await addEnvironment(name, { baseUrl: options.baseUrl });
-        if (isUpdate) {
-            console.log(`✓ Updated environment '${name}'`);
-        }
-        else {
-            console.log(`✓ Added environment '${name}'`);
-        }
-        console.log(`  URL: ${options.baseUrl}`);
-        // Show if this was set as default
-        const updatedState = await loadState();
-        if (updatedState.defaultEnvironment === name && !isUpdate) {
-            console.log("  (set as default - first environment)");
-        }
-        console.log("");
-    }
-    catch (error) {
-        console.error(`Error: ${error.message}`);
-        process.exit(1);
-    }
-}
-/**
- * Remove an environment
- */
-export async function executeEnvRemove(name) {
-    try {
-        const state = await loadState();
-        // Check if environment exists
-        if (!(name in state.environments)) {
-            console.error(`Error: Environment '${name}' does not exist`);
-            console.log("");
-            console.log("Available environments:");
-            Object.keys(state.environments).forEach((env) => {
-                console.log(`  - ${env}`);
-            });
-            process.exit(1);
-        }
-        // Warn if there are plans in this environment
-        const planCount = state.plans[name]?.length || 0;
-        if (planCount > 0) {
-            console.log(`Warning: Environment '${name}' has ${planCount} synced plan(s).`);
-            console.log("This will remove all plan state for this environment.");
-            console.log("");
-        }
-        await removeEnvironment(name);
-        console.log(`✓ Removed environment '${name}'`);
-        // Show new default if it changed
-        const updatedState = await loadState();
-        if (updatedState.defaultEnvironment &&
-            updatedState.defaultEnvironment !== name) {
-            console.log(`  New default: ${updatedState.defaultEnvironment}`);
-        }
-        console.log("");
-    }
-    catch (error) {
-        console.error(`Error: ${error.message}`);
-        process.exit(1);
-    }
-}
-/**
- * Set default environment
- */
-export async function executeEnvDefault(name) {
-    try {
-        const state = await loadState();
-        // Check if environment exists
-        if (!(name in state.environments)) {
-            console.error(`Error: Environment '${name}' does not exist`);
-            console.log("");
-            console.log("Available environments:");
-            Object.keys(state.environments).forEach((env) => {
-                console.log(`  - ${env}`);
-            });
-            process.exit(1);
+        terminal.info("Available environments:");
+        terminal.blank();
+        for (const envName of environments) {
+            const isDefault = state.defaultEnvironment === envName;
+            const marker = isDefault
+                ? terminal.colors.green("●")
+                : terminal.colors.dim("○");
+            const envDisplay = isDefault
+                ? terminal.colors.cyan(envName) + terminal.colors.dim(" (default)")
+                : envName;
+            terminal.log(`  ${marker} ${envDisplay}`);
         }
-        await setDefaultEnvironment(name);
-        console.log(`✓ Set '${name}' as default environment`);
-        console.log("");
+        terminal.blank();
     }
     catch (error) {
-        console.error(`Error: ${error.message}`);
-        process.exit(1);
+        terminal.error(error.message);
+        terminal.exit(1);
     }
 }

package/dist/commands/generate-key.js

@@ -1,4 +1,5 @@
 import { randomBytes } from "node:crypto";
+import { terminal } from "../utils/terminal.js";
 /**
  * Generate a cryptographically secure API key for griffin-runner authentication.
  *
@@ -14,14 +15,19 @@ export async function executeGenerateKey() {
     const keySecret = keyBytes.toString("hex");
     // Add prefix following the pattern: grfn_sk_<secret>
     const apiKey = `grfn_sk_${keySecret}`;
-    console.log("\n✓ Generated API key:\n");
-    console.log(`  ${apiKey}\n`);
-    console.log("⚠️  Store this key securely - it cannot be retrieved later.\n");
-    console.log("To use this key:");
-    console.log("  1. Add it to your runner's AUTH_API_KEYS environment variable:");
-    console.log(`     AUTH_API_KEYS=${apiKey}`);
-    console.log("  2. Or add it to your .griffinrc.json:");
-    console.log(`     { "runner": { "apiToken": "${apiKey}" } }`);
-    console.log("  3. Or pass it via environment variable:");
-    console.log(`     GRIFFIN_API_TOKEN=${apiKey}\n`);
+    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();
 }

package/dist/commands/hub/apply.js

@@ -2,7 +2,11 @@ import { loadState, resolveEnvironment } from "../../core/state.js";
 import { discoverPlans, formatDiscoveryErrors } from "../../core/discovery.js";
 import { computeDiff, formatDiff } from "../../core/diff.js";
 import { applyDiff, formatApplyResult } from "../../core/apply.js";
-import { createSdkClients } from "../../core/sdk.js";
+import { createSdkWithCredentials } from "../../core/sdk.js";
+import { terminal } from "../../utils/terminal.js";
+import { withSDKErrorHandling } from "../../utils/sdk-error.js";
+import { loadVariables } from "../../core/variables.js";
+import { resolvePlan } from "../../resolve.js";
 /**
  * Apply changes to the hub
  */
@@ -13,69 +17,89 @@ export async function executeApply(options) {
         // Resolve environment
         const envName = await resolveEnvironment(options.env);
         // Check if runner is configured
-        if (!state.runner?.baseUrl) {
-            console.error("Error: Hub connection not configured.");
-            console.log("Connect with:");
-            console.log("  griffin hub connect --url <url> --token <token>");
-            process.exit(1);
+        if (!state.hub?.baseUrl) {
+            terminal.error("Hub connection not configured.");
+            terminal.dim("Connect with:");
+            terminal.dim("  griffin hub connect --url <url> --token <token>");
+            terminal.exit(1);
         }
-        console.log(`Applying to '${envName}' environment`);
-        console.log("");
-        // Create SDK clients
-        const { planApi } = createSdkClients({
-            baseUrl: state.runner.baseUrl,
-            apiToken: state.runner.apiToken || undefined,
-        });
+        terminal.info(`Applying to ${terminal.colors.cyan(envName)} environment`);
+        terminal.blank();
+        // Create SDK clients with credentials
+        const sdk = await createSdkWithCredentials(state.hub.baseUrl);
         // Discover local plans
         const discoveryPattern = state.discovery?.pattern || "**/__griffin__/*.{ts,js}";
         const discoveryIgnore = state.discovery?.ignore || [
             "node_modules/**",
             "dist/**",
         ];
+        const spinner = terminal.spinner("Discovering local plans...").start();
         const { plans, errors } = await discoverPlans(discoveryPattern, discoveryIgnore);
         if (errors.length > 0) {
-            console.error(formatDiscoveryErrors(errors));
-            process.exit(1);
+            spinner.fail("Discovery failed");
+            terminal.error(formatDiscoveryErrors(errors));
+            terminal.exit(1);
         }
+        spinner.succeed(`Found ${plans.length} local plan(s)`);
         // Fetch remote plans for this project + environment
-        const response = await planApi.planGet(state.projectId, envName);
-        const remotePlans = response.data.data;
+        const fetchSpinner = terminal.spinner("Fetching remote plans...").start();
+        const response = await withSDKErrorHandling(() => sdk.getPlan({
+            query: {
+                projectId: state.projectId,
+                environment: envName,
+            },
+        }), "Failed to fetch remote plans");
+        const remotePlans = response?.data?.data;
+        fetchSpinner.succeed(`Found ${remotePlans.length} remote plan(s)`);
+        // Load variables and resolve local plans before computing diff
+        const variables = await loadVariables(envName);
+        const resolvedPlans = plans.map((p) => resolvePlan(p.plan, state.projectId, envName, variables));
         // Compute diff (include deletions if --prune)
-        const diff = computeDiff(plans.map((p) => p.plan), remotePlans, { includeDeletions: options.prune || false });
+        const diff = computeDiff(resolvedPlans, remotePlans, {
+            includeDeletions: options.prune || false,
+        });
         // Show plan
-        console.log(formatDiff(diff));
-        console.log("");
+        terminal.blank();
+        terminal.log(formatDiff(diff));
+        terminal.blank();
         // Check if there are changes
         if (diff.summary.creates + diff.summary.updates + diff.summary.deletes ===
             0) {
-            console.log("No changes to apply.");
+            terminal.success("No changes to apply.");
             return;
         }
         // Show deletions warning if --prune
         if (options.prune && diff.summary.deletes > 0) {
-            console.warn(`⚠️  --prune will DELETE ${diff.summary.deletes} plan(s) from the hub`);
-            console.log("");
+            terminal.warn(`--prune will DELETE ${diff.summary.deletes} plan(s) from the hub`);
+            terminal.blank();
         }
         // Ask for confirmation unless auto-approved
         if (!options.autoApprove && !options.dryRun) {
-            console.log("Do you want to perform these actions? (yes/no)");
-            // For now, just proceed - in a real implementation, we'd use readline
-            // to get user input
-            console.log("Note: Use --auto-approve flag to skip confirmation");
-            console.log("");
+            const confirmed = await terminal.confirm("Do you want to perform these actions?");
+            if (!confirmed) {
+                terminal.warn("Apply cancelled.");
+                return;
+            }
         }
         // Apply changes with environment injection
-        const result = await applyDiff(diff, planApi, state.projectId, envName, {
+        const applySpinner = terminal.spinner("Applying changes...").start();
+        const result = await applyDiff(diff, sdk, {
             dryRun: options.dryRun,
         });
-        console.log("");
-        console.log(formatApplyResult(result));
+        if (result.success) {
+            applySpinner.succeed("Changes applied successfully");
+        }
+        else {
+            applySpinner.fail("Apply failed");
+        }
+        terminal.blank();
+        terminal.log(formatApplyResult(result));
         if (!result.success) {
-            process.exit(1);
+            terminal.exit(1);
         }
     }
     catch (error) {
-        console.error(`Error: ${error.message}`);
-        process.exit(1);
+        terminal.error(error.message);
+        terminal.exit(1);
     }
 }

package/dist/commands/hub/connect.js

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

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

@@ -0,0 +1 @@
+export declare function executeLogin(): Promise<void>;

package/dist/commands/hub/login.js

@@ -0,0 +1,79 @@
+// CLI implementation
+import { createAuthClient } from "better-auth/client";
+import { deviceAuthorizationClient, jwtClient, } from "better-auth/client/plugins";
+import { loadState, saveState } from "../../core/state.js";
+import { saveHubCredentials } from "../../core/credentials.js";
+import { terminal } from "../../utils/terminal.js";
+import { randomBytes } from "crypto";
+const baseURL = "http://localhost:4000/api/auth";
+const hubBaseUrl = "http://localhost:3000";
+//const baseURL = "https://cloud.griffin.app"
+const oauthGrant = "urn:ietf:params:oauth:grant-type:device_code";
+const authClient = createAuthClient({
+    baseURL: baseURL,
+    plugins: [
+        deviceAuthorizationClient(),
+        jwtClient(),
+    ],
+});
+async function pollForToken(clientId, deviceCode, interval) {
+    const { data, error } = await authClient.device.token({
+        grant_type: oauthGrant,
+        device_code: deviceCode,
+        client_id: clientId,
+        fetchOptions: {
+            headers: {
+                "user-agent": `griffin-cli`,
+            },
+        },
+    });
+    if (data?.access_token)
+        return data.access_token;
+    switch (error?.error) {
+        case "slow_down":
+            await new Promise((resolve) => setTimeout(resolve, interval * 2));
+            return pollForToken(clientId, deviceCode, interval * 2);
+        case "authorization_pending":
+            await new Promise((resolve) => setTimeout(resolve, interval));
+            return pollForToken(clientId, deviceCode, interval);
+        default:
+            throw new Error(error?.error_description || "Unknown error");
+    }
+}
+export async function executeLogin() {
+    const state = await loadState();
+    let clientId = state.hub?.clientId;
+    if (!clientId) {
+        clientId = randomBytes(16).toString("hex");
+    }
+    //const clientId = state.hub?.clientId;
+    const { data } = await authClient.device.code({
+        client_id: clientId,
+    });
+    terminal.info(`Go to: ${data?.verification_uri_complete}`);
+    terminal.info(`Or enter code: ${data?.user_code}`);
+    // 2. Poll for authorization
+    const sessionToken = await pollForToken(clientId, data?.device_code, (data?.interval ?? 5) * 1000);
+    const { data: jwtData } = await authClient.token({
+        fetchOptions: {
+            headers: {
+                Authorization: `Bearer ${sessionToken}`,
+            },
+        },
+    });
+    // Save token to user-level credentials file
+    if (jwtData?.token) {
+        await saveHubCredentials(jwtData.token);
+        terminal.success("Login successful");
+        terminal.log(`  Token saved to user credentials`);
+    }
+    // Save hub config to project state (without token)
+    await saveState({
+        ...state,
+        hub: {
+            ...state.hub,
+            clientId: clientId,
+            baseUrl: hubBaseUrl,
+        },
+    });
+}

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

@@ -0,0 +1,6 @@
+export interface LogoutOptions {
+}
+/**
+ * Remove stored credentials for hub
+ */
+export declare function executeLogout(options: LogoutOptions): Promise<void>;

package/dist/commands/hub/logout.js

@@ -0,0 +1,16 @@
+import { removeHubCredentials } from "../../core/credentials.js";
+import { terminal } from "../../utils/terminal.js";
+/**
+ * Remove stored credentials for hub
+ */
+export async function executeLogout(options) {
+    try {
+        await removeHubCredentials();
+        terminal.success("Credentials removed.");
+        terminal.blank();
+    }
+    catch (error) {
+        terminal.error(error.message);
+        terminal.exit(1);
+    }
+}

package/dist/commands/hub/plan.js

@@ -1,7 +1,11 @@
 import { loadState, resolveEnvironment } from "../../core/state.js";
 import { discoverPlans, formatDiscoveryErrors } from "../../core/discovery.js";
-import { createSdkClients } from "../../core/sdk.js";
+import { createSdkWithCredentials } from "../../core/sdk.js";
 import { computeDiff, formatDiff, formatDiffJson } from "../../core/diff.js";
+import { terminal } from "../../utils/terminal.js";
+import { withSDKErrorHandling } from "../../utils/sdk-error.js";
+import { loadVariables } from "../../core/variables.js";
+import { resolvePlan } from "../../resolve.js";
 /**
  * Show what changes would be applied
  */
@@ -11,11 +15,11 @@ export async function executePlan(options) {
         const state = await loadState();
         // Resolve environment
         const envName = await resolveEnvironment(options.env);
-        if (!state.runner?.baseUrl) {
-            console.error("Error: Hub connection not configured.");
-            console.log("Connect with:");
-            console.log("  griffin hub connect --url <url> --token <token>");
-            process.exit(1);
+        if (!state.hub?.baseUrl) {
+            terminal.error("Hub connection not configured.");
+            terminal.dim("Connect with:");
+            terminal.dim("  griffin hub connect --url <url> --token <token>");
+            terminal.exit(1);
         }
         // Discover local plans
         const discoveryPattern = state.discovery?.pattern || "**/__griffin__/*.{ts,js}";
@@ -23,36 +27,49 @@ export async function executePlan(options) {
             "node_modules/**",
             "dist/**",
         ];
+        const spinner = terminal.spinner("Discovering local plans...").start();
         const { plans, errors } = await discoverPlans(discoveryPattern, discoveryIgnore);
         if (errors.length > 0) {
-            console.error(formatDiscoveryErrors(errors));
-            process.exit(1);
+            spinner.fail("Discovery failed");
+            terminal.error(formatDiscoveryErrors(errors));
+            terminal.exit(1);
         }
-        // Create SDK clients
-        const { planApi } = createSdkClients({
-            baseUrl: state.runner.baseUrl,
-            apiToken: state.runner.apiToken || undefined,
-        });
+        spinner.succeed(`Found ${plans.length} local plan(s)`);
+        // Create SDK clients with credentials
+        const sdk = await createSdkWithCredentials(state.hub.baseUrl);
         // Fetch remote plans for this project + environment
-        const response = await planApi.planGet(state.projectId, envName);
-        const remotePlans = response.data.data.map((p) => p);
+        const fetchSpinner = terminal.spinner("Fetching remote plans...").start();
+        const response = await withSDKErrorHandling(() => sdk.getPlan({
+            query: {
+                projectId: state.projectId,
+                environment: envName,
+            },
+        }), "Failed to fetch remote plans");
+        const remotePlans = response?.data?.data;
+        fetchSpinner.succeed(`Found ${remotePlans.length} remote plan(s)`);
+        // Load variables and resolve local plans before computing diff
+        const variables = await loadVariables(envName);
+        const resolvedPlans = plans.map((p) => resolvePlan(p.plan, state.projectId, envName, variables));
         // Compute diff (no deletions shown by default)
-        const diff = computeDiff(plans.map((p) => p.plan), remotePlans, { includeDeletions: false });
+        const diff = computeDiff(resolvedPlans, remotePlans, {
+            includeDeletions: false,
+        });
+        terminal.blank();
         // Output
         if (options.json) {
-            console.log(formatDiffJson(diff));
+            terminal.log(formatDiffJson(diff));
         }
         else {
-            console.log(formatDiff(diff));
+            terminal.log(formatDiff(diff));
         }
         // Exit with error code if there are changes
         if (diff.summary.creates + diff.summary.updates + diff.summary.deletes >
             0) {
-            process.exit(2); // Exit code 2 indicates changes pending
+            terminal.exit(2); // Exit code 2 indicates changes pending
         }
     }
     catch (error) {
-        console.error(`Error: ${error.message}`);
-        process.exit(1);
+        terminal.error(error.message);
+        terminal.exit(1);
     }
 }