@griffin-app/griffin-plan-executor 0.1.13 → 0.1.15

package/src/executor.ts

@@ -4,7 +4,7 @@ import {
   UnaryPredicate,
   Assertions,
   Node,
-  PlanV1,
+  MonitorV1,
   Wait,
   HttpRequest,
 } from "@griffin-app/griffin-hub-sdk";
@@ -23,14 +23,14 @@ import { createStateGraph, graphStore, StateGraphRegistry } from "ts-edge";
 import type { ExecutionEvent, BaseEvent } from "./events/index.js";
 import { randomUUID } from "crypto";
 import {
-  resolveSecretsInPlan,
+  resolveSecretsInMonitor,
   planHasSecrets,
   SecretResolutionError,
 } from "./secrets/index.js";
 import { utcNow } from "./utils/dates.js";
 import {
   migrateToLatest,
-  CURRENT_PLAN_VERSION,
+  CURRENT_MONITOR_VERSION,
   isSupportedVersion,
 } from "@griffin-app/griffin-ts";
 
@@ -41,7 +41,7 @@ interface NodeExecuteContext {
 }
 
 /**
- * Execution context that tracks event emission state throughout a plan execution.
+ * Execution context that tracks event emission state throughout a monitor execution.
  * Maintains sequence counter and provides event creation helpers.
  */
 class ExecutionContext {
@@ -49,7 +49,7 @@ class ExecutionContext {
 
   constructor(
     public readonly executionId: string,
-    public readonly plan: PlanV1,
+    public readonly monitor: MonitorV1,
     public readonly organizationId: string,
     private readonly emitter?: ExecutionOptions["eventEmitter"],
   ) {}
@@ -62,7 +62,7 @@ class ExecutionContext {
       eventId: randomUUID(),
       seq: this.seq++,
       timestamp: Date.now(),
-      planId: this.plan.id,
+      monitorId: this.monitor.id,
       executionId: this.executionId,
       organizationId: this.organizationId,
     };
@@ -121,7 +121,7 @@ interface ExecutionState {
 }
 
 function buildNode(
-  plan: PlanV1,
+  monitor: MonitorV1,
   node: Node,
   options: ExecutionOptions,
 ): {
@@ -294,7 +294,7 @@ function buildNode(
 }
 
 function buildGraph(
-  plan: PlanV1,
+  monitor: MonitorV1,
   options: ExecutionOptions,
   executionContext: ExecutionContext,
 ): DynamicStateGraph {
@@ -317,23 +317,24 @@ function buildGraph(
     }) as DynamicStateGraph;
 
   // Add all nodes - cast back to DynamicStateGraph to maintain our dynamic type
-  const graphWithNodes = plan.nodes.reduce<DynamicStateGraph>(
-    (g, node) => g.addNode(buildNode(plan, node, options)) as DynamicStateGraph,
+  const graphWithNodes = monitor.nodes.reduce<DynamicStateGraph>(
+    (g, node) =>
+      g.addNode(buildNode(monitor, node, options)) as DynamicStateGraph,
     graph,
   );
 
   // Add all edges
   // Cast the edge method to accept string arguments since ts-edge expects literal types
-  // but we have runtime strings from the plan
-  const graphWithEdges = plan.edges.reduce<DynamicStateGraph>((g, edge) => {
+  // but we have runtime strings from the monitor
+  const graphWithEdges = monitor.edges.reduce<DynamicStateGraph>((g, edge) => {
     const addEdge = g.edge as (from: string, to: string) => DynamicStateGraph;
     return addEdge(edge.from, edge.to);
   }, graphWithNodes);
 
   return graphWithEdges;
 }
-export async function executePlanV1(
-  plan: PlanV1,
+export async function executeMonitorV1(
+  monitor: MonitorV1,
   organizationId: string,
   options: ExecutionOptions,
 ): Promise<ExecutionResult> {
@@ -342,34 +343,22 @@ export async function executePlanV1(
   // Generate or use provided executionId
   const executionId = options.executionId || randomUUID();
 
-  // Migrate plan to latest version if needed
-  let migratedPlan = plan;
-  if (plan.version !== CURRENT_PLAN_VERSION) {
-    if (!isSupportedVersion(plan.version)) {
-      throw new Error(
-        `Unsupported plan version: ${plan.version}. Supported versions: ${CURRENT_PLAN_VERSION}`,
-      );
-    }
-    // Migrate to latest version
-    migratedPlan = migrateToLatest(plan as any) as PlanV1;
-  }
-
   // Create execution context for event emission
   const executionContext = new ExecutionContext(
     executionId,
-    migratedPlan,
+    monitor,
     organizationId,
     options.eventEmitter,
   );
 
   try {
-    // Resolve secrets if the plan contains any
-    let resolvedPlan = migratedPlan;
-    if (planHasSecrets(plan)) {
+    // Resolve secrets if the monitor contains any
+    let resolvedMonitor = monitor;
+    if (planHasSecrets(monitor)) {
       if (!options.secretRegistry) {
         throw new SecretResolutionError(
-          "Plan contains secret references but no secret registry was provided",
-          { provider: "unknown", ref: "unknown" },
+          "Monitor contains secret references but no secret registry was provided",
+          { ref: "unknown" },
         );
       }
 
@@ -380,7 +369,10 @@ export async function executePlanV1(
       });
 
       try {
-        resolvedPlan = await resolveSecretsInPlan(plan, options.secretRegistry);
+        resolvedMonitor = await resolveSecretsInMonitor(
+          monitor,
+          options.secretRegistry,
+        );
 
         executionContext.emit({
           type: "NODE_END",
@@ -402,13 +394,13 @@ export async function executePlanV1(
       }
     }
 
-    // Emit PLAN_START event
+    // Emit MONITOR_START event
     executionContext.emit({
-      type: "PLAN_START",
-      planName: resolvedPlan.name,
-      planVersion: resolvedPlan.version,
-      nodeCount: resolvedPlan.nodes.length,
-      edgeCount: resolvedPlan.edges.length,
+      type: "MONITOR_START",
+      monitorName: resolvedMonitor.name,
+      monitorVersion: resolvedMonitor.version,
+      nodeCount: resolvedMonitor.nodes.length,
+      edgeCount: resolvedMonitor.edges.length,
     });
 
     // Call onStart callback if provided
@@ -422,7 +414,7 @@ export async function executePlanV1(
     }
 
     // Build execution graph (state-based)
-    const graph = buildGraph(resolvedPlan, options, executionContext);
+    const graph = buildGraph(resolvedMonitor, options, executionContext);
 
     // Compile and run the state graph
     const app = graph.compile(START, END);
@@ -436,9 +428,9 @@ export async function executePlanV1(
       const finalResults = graphResult.output?.results || [];
       const finalErrors = graphResult.output?.errors || [errorMessage];
 
-      // Emit PLAN_END event
+      // Emit MONITOR_END event
       executionContext.emit({
-        type: "PLAN_END",
+        type: "MONITOR_END",
         success: false,
         totalDuration_ms: Date.now() - startTime,
         nodeResultCount: finalResults.length,
@@ -477,9 +469,9 @@ export async function executePlanV1(
     const success = finalState.errors.length === 0;
     const duration = Date.now() - startTime;
 
-    // Emit PLAN_END event
+    // Emit MONITOR_END event
     executionContext.emit({
-      type: "PLAN_END",
+      type: "MONITOR_END",
       success,
       totalDuration_ms: duration,
       nodeResultCount: finalState.results.length,
@@ -519,9 +511,9 @@ export async function executePlanV1(
     const errorMessage = error instanceof Error ? error.message : String(error);
     const duration = Date.now() - startTime;
 
-    // Emit PLAN_END event
+    // Emit MONITOR_END event
     executionContext.emit({
-      type: "PLAN_END",
+      type: "MONITOR_END",
       success: false,
       totalDuration_ms: duration,
       nodeResultCount: 0,
@@ -572,12 +564,12 @@ async function executeHttpRequest(
   const path = endpoint.path;
   const url = `${baseUrl}${path}`;
 
-  // TODO: Add retry configuration from plan (node-level or plan-level)
+  // TODO: Add retry configuration from monitor (node-level or monitor-level)
   // For now, we always attempt once (attempt: 1)
   const attempt = 1;
 
   // After secret resolution, headers are guaranteed to be plain strings
-  // Cast is safe because resolveSecretsInPlan substitutes all SecretRefs
+  // Cast is safe because resolveSecretsInMonitor substitutes all SecretRefs
   const resolvedHeaders = endpoint.headers as
     | Record<string, string>
     | undefined;

package/src/index.ts

@@ -1,4 +1,4 @@
-export { executePlanV1 } from "./executor.js";
+export { executeMonitorV1 } from "./executor.js";
 export type {
   ExecutionOptions,
   ExecutionResult,
@@ -10,12 +10,12 @@ export type {
   StatusCallbacks,
 } from "./types.js";
 export type {
-  TestPlan,
+  TestMonitor,
   HttpRequest as HttpRequestNode,
   WaitNode,
   AssertionNode,
   Edge,
-} from "./test-plan-types.js";
+} from "./test-monitor-types.js";
 export {
   AxiosAdapter,
   StubAdapter,
@@ -31,8 +31,8 @@ export {
 export type {
   ExecutionEvent,
   BaseEvent,
-  PlanStartEvent,
-  PlanEndEvent,
+  MonitorStartEvent,
+  MonitorEndEvent,
   NodeStartEvent,
   NodeEndEvent,
   HttpRequestEvent,
@@ -62,8 +62,8 @@ export {
   // Registry
   SecretProviderRegistry,
   // Resolution utilities
-  resolveSecretsInPlan,
-  collectSecretsFromPlan,
+  resolveSecretsInMonitor,
+  collectSecretsFromMonitor,
   planHasSecrets,
   // Providers
   EnvSecretProvider,

package/src/secrets/index.ts

@@ -1,10 +1,10 @@
 /**
- * Secret management for griffin plan executor.
+ * Secret management for griffin monitor executor.
  *
  * This module provides:
  * - SecretProvider interface for implementing custom providers
- * - SecretProviderRegistry for managing multiple providers
- * - Secret resolution utilities for test plans
+ * - SecretProviderRegistry for the configured secret provider
+ * - Secret resolution utilities for test monitors
  * - Built-in providers: env, aws, vault
  */
 
@@ -24,8 +24,8 @@ export { SecretProviderRegistry } from "./registry.js";
 
 // Resolution utilities
 export {
-  resolveSecretsInPlan,
-  collectSecretsFromPlan,
+  resolveSecretsInMonitor,
+  collectSecretsFromMonitor,
   planHasSecrets,
 } from "./resolver.js";
 

package/src/secrets/providers/aws.ts

@@ -81,7 +81,7 @@ export class AwsSecretsManagerProvider implements SecretProvider {
       if (!response.SecretString) {
         throw new SecretResolutionError(
           `Secret "${secretId}" does not contain a string value (binary secrets are not supported)`,
-          { provider: this.name, ref },
+          { ref },
         );
       }
 
@@ -110,7 +110,6 @@ export class AwsSecretsManagerProvider implements SecretProvider {
       }
 
       throw new SecretResolutionError(message, {
-        provider: this.name,
         ref,
         cause: error,
       });
@@ -135,7 +134,7 @@ export class AwsSecretsManagerProvider implements SecretProvider {
       if (typeof parsed !== "object" || parsed === null) {
         throw new SecretResolutionError(
           `Secret "${ref}" is not a JSON object, cannot extract field "${field}"`,
-          { provider: this.name, ref },
+          { ref },
         );
       }
 
@@ -144,7 +143,7 @@ export class AwsSecretsManagerProvider implements SecretProvider {
       if (value === undefined) {
         throw new SecretResolutionError(
           `Field "${field}" not found in secret "${ref}"`,
-          { provider: this.name, ref },
+          { ref },
         );
       }
 
@@ -159,7 +158,7 @@ export class AwsSecretsManagerProvider implements SecretProvider {
         `Failed to parse secret "${ref}" as JSON for field extraction: ${
           error instanceof Error ? error.message : String(error)
         }`,
-        { provider: this.name, ref, cause: error },
+        { ref, cause: error },
       );
     }
   }

package/src/secrets/providers/env.ts

@@ -44,7 +44,7 @@ export class EnvSecretProvider implements SecretProvider {
     if (value === undefined) {
       throw new SecretResolutionError(
         `Environment variable "${envKey}" is not set`,
-        { provider: this.name, ref },
+        { ref },
       );
     }
 

package/src/secrets/providers/vault.ts

@@ -116,21 +116,21 @@ export class VaultProvider implements SecretProvider {
       if (response.status === 404) {
         throw new SecretResolutionError(
           `Secret "${secretPath}" not found in Vault`,
-          { provider: this.name, ref },
+          { ref },
         );
       }
 
       if (response.status === 403) {
         throw new SecretResolutionError(
           `Access denied to secret "${secretPath}". Check Vault policies.`,
-          { provider: this.name, ref },
+          { ref },
         );
       }
 
       if (response.status !== 200) {
         throw new SecretResolutionError(
           `Vault returned status ${response.status} for secret "${secretPath}"`,
-          { provider: this.name, ref },
+          { ref },
         );
       }
 
@@ -149,7 +149,7 @@ export class VaultProvider implements SecretProvider {
         if (!kvData?.data) {
           throw new SecretResolutionError(
             `Invalid KV v2 response structure for secret "${secretPath}"`,
-            { provider: this.name, ref },
+            { ref },
           );
         }
         secretData = kvData.data;
@@ -158,7 +158,7 @@ export class VaultProvider implements SecretProvider {
         if (!data?.data || typeof data.data !== "object") {
           throw new SecretResolutionError(
             `Invalid KV v1 response structure for secret "${secretPath}"`,
-            { provider: this.name, ref },
+            { ref },
           );
         }
         secretData = data.data as Record<string, unknown>;
@@ -180,7 +180,7 @@ export class VaultProvider implements SecretProvider {
         `Failed to retrieve secret "${secretPath}" from Vault: ${
           error instanceof Error ? error.message : String(error)
         }`,
-        { provider: this.name, ref, cause: error },
+        { ref, cause: error },
       );
     }
   }
@@ -204,7 +204,7 @@ export class VaultProvider implements SecretProvider {
     if (value === undefined) {
       throw new SecretResolutionError(
         `Field "${field}" not found in secret "${ref}"`,
-        { provider: this.name, ref },
+        { ref },
       );
     }