@griffin-app/griffin-cli 1.0.8 → 1.0.10

package/dist/monitor-discovery.js

@@ -0,0 +1,25 @@
+import * as path from "path";
+import { glob } from "glob";
+/**
+ * Discovers test files in __griffin__ directories.
+ */
+export function findTestFiles(basePath = ".") {
+    const absolutePath = path.resolve(basePath);
+    // Find all __griffin__ directories
+    const griffinDirs = findgriffinDirectories(absolutePath);
+    // Find all .ts files in those directories
+    const testFiles = [];
+    for (const griffinDir of griffinDirs) {
+        const tsFiles = findTsFiles(griffinDir);
+        testFiles.push(...tsFiles);
+    }
+    return testFiles;
+}
+function findgriffinDirectories(basePath) {
+    const pattern = path.join(basePath, "**", "__griffin__");
+    return glob.sync(pattern, { absolute: true });
+}
+function findTsFiles(griffinDir) {
+    const pattern = path.join(griffinDir, "*.ts");
+    return glob.sync(pattern, { absolute: true });
+}

package/dist/monitor-runner.d.ts

@@ -0,0 +1,6 @@
+import "tsx";
+import { ExecutionResult } from "@griffin-app/griffin-plan-executor";
+/**
+ * Runs a TypeScript test file and executes the resulting JSON monitor.
+ */
+export declare function runTestFile(filePath: string, envName: string): Promise<ExecutionResult>;

package/dist/monitor-runner.js

@@ -0,0 +1,56 @@
+import "tsx";
+import { Value } from "typebox/value";
+import { executeMonitorV1, AxiosAdapter, } from "@griffin-app/griffin-plan-executor";
+import { MonitorDSLSchema } from "@griffin-app/griffin-ts/schema";
+import { randomUUID } from "crypto";
+import { loadVariables } from "./core/variables.js";
+import { getProjectId } from "./core/state.js";
+import { resolveMonitor } from "./resolve.js";
+import { terminal } from "./utils/terminal.js";
+import { createSecretsProviderForCLI } from "./core/secrets.js";
+function validateDsl(monitor) {
+    const errors = Value.Errors(MonitorDSLSchema, monitor);
+    if (errors.length > 0) {
+        throw new Error(`Invalid monitor: ${JSON.stringify([...errors], null, 2)}`);
+    }
+    return monitor;
+}
+/**
+ * Runs a TypeScript test file and executes the resulting JSON monitor.
+ */
+export async function runTestFile(filePath, envName) {
+    const variables = await loadVariables(envName);
+    const projectId = await getProjectId();
+    const defaultExport = await import(filePath);
+    const rawMonitor = validateDsl(defaultExport.default);
+    terminal.dim(`Project ID: ${projectId}`);
+    const resolvedMonitor = resolveMonitor(rawMonitor, projectId, envName, variables);
+    // Create secret provider from environment configuration
+    const secretProvider = await createSecretsProviderForCLI();
+    try {
+        const result = await executeMonitorV1({
+            ...resolvedMonitor,
+            id: randomUUID(),
+        }, "default-org", {
+            mode: "local",
+            httpClient: new AxiosAdapter(),
+            secretProvider,
+        });
+        return result;
+    }
+    catch (error) {
+        throw new Error(`Error executing monitor: ${error instanceof Error ? error.message : String(error)}`);
+    }
+}
+//function findWorkspaceRoot(): string {
+//  let current = process.cwd();
+//  while (current !== path.dirname(current)) {
+//    const testCliPath = path.join(current, "griffin-cli");
+//    const testSystemPath = path.join(current, "griffin-ts");
+//    if (fs.existsSync(testCliPath) && fs.existsSync(testSystemPath)) {
+//      return current;
+//    }
+//    current = path.dirname(current);
+//  }
+//  return process.cwd();
+//}

package/dist/schemas/state.d.ts

@@ -1,16 +1,12 @@
 import { Type, type Static } from "typebox";
-/**
- * State file schema for tracking project configuration
- * Stored in .griffin/state.json
- *
- * Note: The hub is now the source of truth for monitors.
- * This file only stores configuration (project, environments, runner connection).
- */
 export declare const EnvironmentConfigSchema: Type.TObject<{}>;
 export type EnvironmentConfig = Static<typeof EnvironmentConfigSchema>;
+export declare const CloudConfigSchema: Type.TObject<{
+    authUrl: Type.TString;
+}>;
 export declare const HubConfigSchema: Type.TObject<{
     baseUrl: Type.TString;
-    clientId: Type.TString;
+    clientId: Type.TOptional<Type.TString>;
 }>;
 export type HubConfig = Static<typeof HubConfigSchema>;
 export declare const DiscoveryConfigSchema: Type.TObject<{
@@ -18,15 +14,22 @@ export declare const DiscoveryConfigSchema: Type.TObject<{
     ignore: Type.TOptional<Type.TArray<Type.TString>>;
 }>;
 export type DiscoveryConfig = Static<typeof DiscoveryConfigSchema>;
+export declare const EnvironmentsConfigSchema: Type.TIntersect<[Type.TObject<{
+    default: Type.TObject<{}>;
+}>, Type.TRecord<"^.*$", Type.TObject<{}>>]>;
 export declare const StateFileSchema: Type.TObject<{
     stateVersion: Type.TLiteral<1>;
     projectId: Type.TString;
-    environments: Type.TRecord<"^.*$", Type.TObject<{}>>;
-    defaultEnvironment: Type.TOptional<Type.TString>;
-    hub: Type.TOptional<Type.TObject<{
+    environments: Type.TIntersect<[Type.TObject<{
+        default: Type.TObject<{}>;
+    }>, Type.TRecord<"^.*$", Type.TObject<{}>>]>;
+    hub: Type.TObject<{
         baseUrl: Type.TString;
-        clientId: Type.TString;
-    }>>;
+        clientId: Type.TOptional<Type.TString>;
+    }>;
+    cloud: Type.TObject<{
+        authUrl: Type.TString;
+    }>;
     discovery: Type.TOptional<Type.TObject<{
         pattern: Type.TOptional<Type.TString>;
         ignore: Type.TOptional<Type.TArray<Type.TString>>;
@@ -37,7 +40,3 @@ export type StateFile = Static<typeof StateFileSchema>;
  * Create an empty state file
  */
 export declare function createEmptyState(projectId: string): StateFile;
-/**
- * Create state file with a default local environment
- */
-export declare function createStateWithDefaultEnv(projectId: string): StateFile;

package/dist/schemas/state.js

@@ -6,24 +6,35 @@ import { Type } from "typebox";
  * Note: The hub is now the source of truth for monitors.
  * This file only stores configuration (project, environments, runner connection).
  */
+const authUrl = "https://www.getgriffinapp.com/api/auth";
+const hubBaseUrl = "https://griffin-hub.fly.dev";
 export const EnvironmentConfigSchema = Type.Object({});
+export const CloudConfigSchema = Type.Object({
+    authUrl: Type.String(),
+});
 export const HubConfigSchema = Type.Object({
     baseUrl: Type.String(),
-    clientId: Type.String(),
+    clientId: Type.Optional(Type.String()),
 });
 export const DiscoveryConfigSchema = Type.Object({
     pattern: Type.Optional(Type.String()),
     ignore: Type.Optional(Type.Array(Type.String())),
 });
+export const EnvironmentsConfigSchema = Type.Intersect([
+    Type.Object({
+        default: EnvironmentConfigSchema,
+    }),
+    Type.Record(Type.String(), EnvironmentConfigSchema),
+]);
 // State schema (hub is source of truth for monitors)
 export const StateFileSchema = Type.Object({
     stateVersion: Type.Literal(1),
     projectId: Type.String(),
     // Environment configuration
-    environments: Type.Record(Type.String(), EnvironmentConfigSchema),
-    defaultEnvironment: Type.Optional(Type.String()),
+    environments: EnvironmentsConfigSchema,
     // Hub connection (for remote execution)
-    hub: Type.Optional(HubConfigSchema),
+    hub: HubConfigSchema,
+    cloud: CloudConfigSchema,
     // Discovery settings
     discovery: Type.Optional(DiscoveryConfigSchema),
 });
@@ -31,22 +42,17 @@ export const StateFileSchema = Type.Object({
  * Create an empty state file
  */
 export function createEmptyState(projectId) {
-    return {
-        stateVersion: 1,
-        projectId,
-        environments: {},
-    };
-}
-/**
- * Create state file with a default local environment
- */
-export function createStateWithDefaultEnv(projectId) {
     return {
         stateVersion: 1,
         projectId,
         environments: {
-            local: {},
+            default: {},
+        },
+        hub: {
+            baseUrl: hubBaseUrl,
+        },
+        cloud: {
+            authUrl: authUrl,
         },
-        defaultEnvironment: "local",
     };
 }

package/dist/test-runner.js

@@ -1,12 +1,13 @@
 import "tsx";
 import { Value } from "typebox/value";
-import { executeMonitorV1, AxiosAdapter, EnvSecretProvider, SecretProviderRegistry, } from "@griffin-app/griffin-plan-executor";
+import { executeMonitorV1, AxiosAdapter, } from "@griffin-app/griffin-plan-executor";
 import { MonitorDSLSchema } from "@griffin-app/griffin-ts/schema";
 import { randomUUID } from "crypto";
 import { loadVariables } from "./core/variables.js";
 import { getProjectId } from "./core/state.js";
 import { resolveMonitor } from "./resolve.js";
 import { terminal } from "./utils/terminal.js";
+import { createSecretsProviderForCLI } from "./core/secrets.js";
 function validateDsl(monitor) {
     const errors = Value.Errors(MonitorDSLSchema, monitor);
     if (errors.length > 0) {
@@ -24,8 +25,8 @@ export async function runTestFile(filePath, envName) {
     const rawMonitor = validateDsl(defaultExport.default);
     terminal.dim(`Project ID: ${projectId}`);
     const resolvedMonitor = resolveMonitor(rawMonitor, projectId, envName, variables);
-    const secretRegistry = new SecretProviderRegistry();
-    secretRegistry.register(new EnvSecretProvider());
+    // Create secret provider from environment configuration
+    const secretProvider = await createSecretsProviderForCLI();
     try {
         const result = await executeMonitorV1({
             ...resolvedMonitor,
@@ -33,7 +34,7 @@ export async function runTestFile(filePath, envName) {
         }, "default-org", {
             mode: "local",
             httpClient: new AxiosAdapter(),
-            secretRegistry: secretRegistry,
+            secretProvider,
         });
         return result;
     }

package/dist/utils/sdk-error.js

@@ -109,8 +109,6 @@ export async function withSDKErrorHandling(fn, context) {
         return await fn();
     }
     catch (error) {
-        console.error("error");
-        console.error(error);
         handleSDKError(error, context);
     }
 }

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@griffin-app/griffin-cli",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "description": "CLI tool for running and managing griffin API tests",
   "type": "module",
   "main": "dist/index.js",
   "bin": {
-    "griffin": "./dist/cli.js"
+    "griffin": "./dist/cli.js",
+    "gr": "./dist/cli.js"
   },
   "scripts": {
     "build": "tsc",
@@ -23,9 +24,9 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@griffin-app/griffin-hub-sdk": "1.0.8",
-    "@griffin-app/griffin-plan-executor": "0.1.14",
-    "@griffin-app/griffin-ts": "0.1.14",
+    "@griffin-app/griffin-hub-sdk": "1.0.13",
+    "@griffin-app/griffin-plan-executor": "0.1.18",
+    "@griffin-app/griffin-ts": "0.1.16",
     "better-auth": "^1.4.17",
     "cli-table3": "^0.6.5",
     "commander": "^12.1.0",