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

package/src/events/adapters/in-memory.test.ts

@@ -19,11 +19,11 @@ describe("InMemoryAdapter", () => {
       eventId: `event-${seq}`,
       seq,
       timestamp: Date.now(),
-      planId: "plan-1",
+      monitorId: "monitor-1",
       executionId,
       organizationId: "org-1",
-      planName: "Test Plan",
-      planVersion: "1.0.0",
+      monitorName: "Test Monitor",
+      monitorVersion: "1.0.0",
       nodeCount: 1,
       edgeCount: 1,
     }) as ExecutionEvent;
@@ -31,28 +31,28 @@ describe("InMemoryAdapter", () => {
   describe("publish", () => {
     it("should store events", async () => {
       const events = [
-        createMockEvent("PLAN_START", "exec-1", 0),
-        createMockEvent("PLAN_END", "exec-1", 1),
+        createMockEvent("MONITOR_START", "exec-1", 0),
+        createMockEvent("MONITOR_END", "exec-1", 1),
       ];
 
       await adapter.publish(events);
 
       const stored = adapter.getEvents();
       expect(stored).toHaveLength(2);
-      expect(stored[0].type).toBe("PLAN_START");
-      expect(stored[1].type).toBe("PLAN_END");
+      expect(stored[0].type).toBe("MONITOR_START");
+      expect(stored[1].type).toBe("MONITOR_END");
     });
 
     it("should track publish count", async () => {
-      await adapter.publish([createMockEvent("PLAN_START", "exec-1", 0)]);
-      await adapter.publish([createMockEvent("PLAN_END", "exec-1", 1)]);
+      await adapter.publish([createMockEvent("MONITOR_START", "exec-1", 0)]);
+      await adapter.publish([createMockEvent("MONITOR_END", "exec-1", 1)]);
 
       expect(adapter.getPublishCount()).toBe(2);
     });
 
     it("should append events across multiple publishes", async () => {
-      await adapter.publish([createMockEvent("PLAN_START", "exec-1", 0)]);
-      await adapter.publish([createMockEvent("PLAN_END", "exec-1", 1)]);
+      await adapter.publish([createMockEvent("MONITOR_START", "exec-1", 0)]);
+      await adapter.publish([createMockEvent("MONITOR_END", "exec-1", 1)]);
 
       const events = adapter.getEvents();
       expect(events).toHaveLength(2);
@@ -62,25 +62,27 @@ describe("InMemoryAdapter", () => {
   describe("getEventsByType", () => {
     it("should filter events by type", async () => {
       const events = [
-        createMockEvent("PLAN_START", "exec-1", 0),
-        createMockEvent("PLAN_END", "exec-1", 1),
-        createMockEvent("PLAN_START", "exec-2", 2),
+        createMockEvent("MONITOR_START", "exec-1", 0),
+        createMockEvent("MONITOR_END", "exec-1", 1),
+        createMockEvent("MONITOR_START", "exec-2", 2),
       ];
 
       await adapter.publish(events);
 
-      const planStartEvents = adapter.getEventsByType("PLAN_START");
+      const planStartEvents = adapter.getEventsByType("MONITOR_START");
       expect(planStartEvents).toHaveLength(2);
-      expect(planStartEvents.every((e) => e.type === "PLAN_START")).toBe(true);
+      expect(planStartEvents.every((e) => e.type === "MONITOR_START")).toBe(
+        true,
+      );
     });
   });
 
   describe("getEventsForExecution", () => {
     it("should filter events by executionId", async () => {
       const events = [
-        createMockEvent("PLAN_START", "exec-1", 0),
-        createMockEvent("PLAN_END", "exec-1", 1),
-        createMockEvent("PLAN_START", "exec-2", 2),
+        createMockEvent("MONITOR_START", "exec-1", 0),
+        createMockEvent("MONITOR_END", "exec-1", 1),
+        createMockEvent("MONITOR_START", "exec-2", 2),
       ];
 
       await adapter.publish(events);
@@ -93,7 +95,7 @@ describe("InMemoryAdapter", () => {
 
   describe("clear", () => {
     it("should clear all events and reset counters", async () => {
-      await adapter.publish([createMockEvent("PLAN_START", "exec-1", 0)]);
+      await adapter.publish([createMockEvent("MONITOR_START", "exec-1", 0)]);
 
       adapter.clear();
 
@@ -108,7 +110,7 @@ describe("InMemoryAdapter", () => {
       const start = Date.now();
 
       await adapterWithLatency.publish([
-        createMockEvent("PLAN_START", "exec-1", 0),
+        createMockEvent("MONITOR_START", "exec-1", 0),
       ]);
 
       const duration = Date.now() - start;
@@ -124,7 +126,7 @@ describe("InMemoryAdapter", () => {
 
       await expect(
         adapterWithFailures.publish([
-          createMockEvent("PLAN_START", "exec-1", 0),
+          createMockEvent("MONITOR_START", "exec-1", 0),
         ]),
       ).rejects.toThrow("Simulated publish failure");
     });
@@ -135,7 +137,9 @@ describe("InMemoryAdapter", () => {
       });
 
       await expect(
-        adapterNoFailures.publish([createMockEvent("PLAN_START", "exec-1", 0)]),
+        adapterNoFailures.publish([
+          createMockEvent("MONITOR_START", "exec-1", 0),
+        ]),
       ).resolves.not.toThrow();
     });
   });

package/src/events/adapters/kinesis.test.ts

@@ -15,11 +15,11 @@ describe("KinesisAdapter", () => {
       eventId: `event-${seq}`,
       seq,
       timestamp: Date.now(),
-      planId: "plan-1",
+      monitorId: "monitor-1",
       executionId,
       organizationId,
-      planName: "Test Plan",
-      planVersion: "1.0.0",
+      monitorName: "Test Monitor",
+      monitorVersion: "1.0.0",
       nodeCount: 1,
       edgeCount: 1,
     }) as ExecutionEvent;
@@ -40,7 +40,7 @@ describe("KinesisAdapter", () => {
         streamName: "test-stream",
       });
 
-      const events = [createMockEvent("PLAN_START", "exec-1", "org-1", 0)];
+      const events = [createMockEvent("MONITOR_START", "exec-1", "org-1", 0)];
 
       await adapter.publish(events);
 
@@ -83,7 +83,7 @@ describe("KinesisAdapter", () => {
 
       // Create 1250 events (should result in 3 batches: 500, 500, 250)
       const events = Array.from({ length: 1250 }, (_, i) =>
-        createMockEvent("PLAN_START", "exec-1", "org-1", i),
+        createMockEvent("MONITOR_START", "exec-1", "org-1", i),
       );
 
       await adapter.publish(events);
@@ -111,7 +111,9 @@ describe("KinesisAdapter", () => {
         streamName: "test-stream",
       });
 
-      const events = [createMockEvent("PLAN_START", "exec-123", "org-456", 0)];
+      const events = [
+        createMockEvent("MONITOR_START", "exec-123", "org-456", 0),
+      ];
 
       await adapter.publish(events);
 
@@ -135,7 +137,9 @@ describe("KinesisAdapter", () => {
         partitionKeyStrategy: "organizationId",
       });
 
-      const events = [createMockEvent("PLAN_START", "exec-123", "org-456", 0)];
+      const events = [
+        createMockEvent("MONITOR_START", "exec-123", "org-456", 0),
+      ];
 
       await adapter.publish(events);
 
@@ -159,7 +163,9 @@ describe("KinesisAdapter", () => {
         partitionKeyStrategy: "composite",
       });
 
-      const events = [createMockEvent("PLAN_START", "exec-123", "org-456", 0)];
+      const events = [
+        createMockEvent("MONITOR_START", "exec-123", "org-456", 0),
+      ];
 
       await adapter.publish(events);
 
@@ -177,9 +183,7 @@ describe("KinesisAdapter", () => {
           // First call: one record fails
           return Promise.resolve({
             FailedRecordCount: 1,
-            Records: [
-              { ErrorCode: "ProvisionedThroughputExceededException" },
-            ],
+            Records: [{ ErrorCode: "ProvisionedThroughputExceededException" }],
           });
         }
         // Second call: success
@@ -200,7 +204,7 @@ describe("KinesisAdapter", () => {
         retryDelayMs: 10, // Short delay for testing
       });
 
-      const events = [createMockEvent("PLAN_START", "exec-1", "org-1", 0)];
+      const events = [createMockEvent("MONITOR_START", "exec-1", "org-1", 0)];
 
       await adapter.publish(events);
 
@@ -210,9 +214,7 @@ describe("KinesisAdapter", () => {
     it("should stop retrying after max attempts", async () => {
       const mockSend = vi.fn().mockResolvedValue({
         FailedRecordCount: 1,
-        Records: [
-          { ErrorCode: "ProvisionedThroughputExceededException" },
-        ],
+        Records: [{ ErrorCode: "ProvisionedThroughputExceededException" }],
       });
 
       const mockClient = {
@@ -226,7 +228,7 @@ describe("KinesisAdapter", () => {
         retryDelayMs: 10,
       });
 
-      const events = [createMockEvent("PLAN_START", "exec-1", "org-1", 0)];
+      const events = [createMockEvent("MONITOR_START", "exec-1", "org-1", 0)];
 
       // Should not throw, but log errors
       await adapter.publish(events);
@@ -258,7 +260,7 @@ describe("KinesisAdapter", () => {
         retryDelayMs: 10,
       });
 
-      const events = [createMockEvent("PLAN_START", "exec-1", "org-1", 0)];
+      const events = [createMockEvent("MONITOR_START", "exec-1", "org-1", 0)];
 
       await adapter.publish(events);
 
@@ -279,7 +281,7 @@ describe("KinesisAdapter", () => {
         retryDelayMs: 10,
       });
 
-      const events = [createMockEvent("PLAN_START", "exec-1", "org-1", 0)];
+      const events = [createMockEvent("MONITOR_START", "exec-1", "org-1", 0)];
 
       await expect(adapter.publish(events)).rejects.toThrow("Network error");
       expect(mockSend).toHaveBeenCalledTimes(3); // Initial + 2 retries
@@ -302,18 +304,18 @@ describe("KinesisAdapter", () => {
         streamName: "test-stream",
       });
 
-      const event = createMockEvent("PLAN_START", "exec-1", "org-1", 0);
+      const event = createMockEvent("MONITOR_START", "exec-1", "org-1", 0);
       await adapter.publish([event]);
 
       const records = mockSend.mock.calls[0][0].input.Records;
       const data = records[0].Data;
-      
+
       // Decode the Uint8Array back to JSON
       const decoder = new TextDecoder();
       const json = decoder.decode(data);
       const parsed = JSON.parse(json);
 
-      expect(parsed.type).toBe("PLAN_START");
+      expect(parsed.type).toBe("MONITOR_START");
       expect(parsed.executionId).toBe("exec-1");
       expect(parsed.organizationId).toBe("org-1");
     });

package/src/events/adapters/kinesis.ts

@@ -69,7 +69,10 @@ export class KinesisAdapter implements DurableEventBusAdapter {
   private readonly streamName: string;
   private readonly maxRetries: number;
   private readonly retryDelayMs: number;
-  private readonly partitionKeyStrategy: "executionId" | "organizationId" | "composite";
+  private readonly partitionKeyStrategy:
+    | "executionId"
+    | "organizationId"
+    | "composite";
   private static readonly KINESIS_MAX_BATCH = 500;
 
   constructor(options: KinesisAdapterOptions) {
@@ -124,7 +127,7 @@ export class KinesisAdapter implements DurableEventBusAdapter {
           console.warn(
             `Retrying ${failedRecords.length} failed records (attempt ${attempt + 1}/${this.maxRetries}) after ${delay}ms`,
           );
-          
+
           await this.sleep(delay);
           await this.publishBatchWithRetry(failedRecords, attempt + 1);
         } else {
@@ -141,7 +144,7 @@ export class KinesisAdapter implements DurableEventBusAdapter {
           `Kinesis publish error, retrying (attempt ${attempt + 1}/${this.maxRetries}) after ${delay}ms:`,
           error,
         );
-        
+
         await this.sleep(delay);
         await this.publishBatchWithRetry(records, attempt + 1);
       } else {

package/src/events/emitter.test.ts

@@ -18,15 +18,15 @@ describe("LocalEventEmitter", () => {
     emitter.subscribe((event) => events.push(event));
 
     const testEvent: ExecutionEvent = {
-      type: "PLAN_START",
+      type: "MONITOR_START",
       eventId: "123",
       seq: 0,
       timestamp: Date.now(),
       organizationId: "test-org",
-      planId: "plan-1",
+      monitorId: "monitor-1",
       executionId: "exec-1",
-      planName: "Test Plan",
-      planVersion: "1.0",
+      monitorName: "Test Monitor",
+      monitorVersion: "1.0",
       nodeCount: 2,
       edgeCount: 1,
     };
@@ -49,7 +49,7 @@ describe("LocalEventEmitter", () => {
       eventId: "456",
       seq: 1,
       timestamp: Date.now(),
-      planId: "plan-1",
+      monitorId: "monitor-1",
       executionId: "exec-1",
       organizationId: "test-org",
       nodeId: "node-1",
@@ -73,7 +73,7 @@ describe("LocalEventEmitter", () => {
       eventId: "789",
       seq: 2,
       timestamp: Date.now(),
-      planId: "plan-1",
+      monitorId: "monitor-1",
       executionId: "exec-1",
       organizationId: "test-org",
       nodeId: "node-1",
@@ -103,11 +103,11 @@ describe("LocalEventEmitter", () => {
     emitter.subscribe((event) => events.push(event));
 
     const testEvent: ExecutionEvent = {
-      type: "PLAN_END",
+      type: "MONITOR_END",
       eventId: "abc",
       seq: 3,
       timestamp: Date.now(),
-      planId: "plan-1",
+      monitorId: "monitor-1",
       executionId: "exec-1",
       organizationId: "test-org",
       success: true,
@@ -155,7 +155,7 @@ describe("DurableEventEmitter", () => {
       eventId: "1",
       seq: 0,
       timestamp: Date.now(),
-      planId: "plan-1",
+      monitorId: "monitor-1",
       executionId: "exec-1",
       organizationId: "test-org",
       nodeId: "node-1",
@@ -167,7 +167,7 @@ describe("DurableEventEmitter", () => {
       eventId: "2",
       seq: 1,
       timestamp: Date.now(),
-      planId: "plan-1",
+      monitorId: "monitor-1",
       executionId: "exec-1",
       organizationId: "test-org",
       nodeId: "node-2",
@@ -179,7 +179,7 @@ describe("DurableEventEmitter", () => {
       eventId: "3",
       seq: 2,
       timestamp: Date.now(),
-      planId: "plan-1",
+      monitorId: "monitor-1",
       executionId: "exec-1",
       organizationId: "test-org",
       nodeId: "node-3",
@@ -210,7 +210,7 @@ describe("DurableEventEmitter", () => {
       eventId: "1",
       seq: 0,
       timestamp: Date.now(),
-      planId: "plan-1",
+      monitorId: "monitor-1",
       executionId: "exec-1",
       organizationId: "test-org",
       nodeId: "node-1",
@@ -239,7 +239,7 @@ describe("DurableEventEmitter", () => {
       eventId: "1",
       seq: 0,
       timestamp: Date.now(),
-      planId: "plan-1",
+      monitorId: "monitor-1",
       executionId: "exec-1",
       organizationId: "test-org",
       nodeId: "node-1",
@@ -273,7 +273,7 @@ describe("DurableEventEmitter", () => {
       eventId: "1",
       seq: 0,
       timestamp: Date.now(),
-      planId: "plan-1",
+      monitorId: "monitor-1",
       executionId: "exec-1",
       organizationId: "test-org",
       errorName: "TestError",
@@ -308,7 +308,7 @@ describe("DurableEventEmitter", () => {
       eventId: "1",
       seq: 0,
       timestamp: Date.now(),
-      planId: "plan-1",
+      monitorId: "monitor-1",
       executionId: "exec-1",
       organizationId: "test-org",
       nodeId: "wait-1",

package/src/events/types.ts

@@ -1,5 +1,5 @@
 /**
- * Event types for test plan execution.
+ * Event types for test monitor execution.
  *
  * All events are JSON-serializable for compatibility with various event buses.
  * Events include stable identifiers (executionId, eventId) and monotonic sequence
@@ -15,26 +15,26 @@ export interface BaseEvent {
   seq: number;
   /** Unix timestamp in milliseconds */
   timestamp: number;
-  /** ID of the test plan being executed */
-  planId: string;
+  /** ID of the test monitor being executed */
+  monitorId: string;
   /** Unique identifier for this execution run */
   executionId: string;
 
-  /** ID of the organization that the plan belongs to */
+  /** ID of the organization that the monitor belongs to */
   organizationId: string;
 }
 
-/** Plan-level events */
-export interface PlanStartEvent extends BaseEvent {
-  type: "PLAN_START";
-  planName: string;
-  planVersion: string;
+/** Monitor-level events */
+export interface MonitorStartEvent extends BaseEvent {
+  type: "MONITOR_START";
+  monitorName: string;
+  monitorVersion: string;
   nodeCount: number;
   edgeCount: number;
 }
 
-export interface PlanEndEvent extends BaseEvent {
-  type: "PLAN_END";
+export interface MonitorEndEvent extends BaseEvent {
+  type: "MONITOR_END";
   success: boolean;
   totalDuration_ms: number;
   nodeResultCount: number;
@@ -123,8 +123,8 @@ export interface ErrorEvent extends BaseEvent {
 
 /** Union type of all execution events */
 export type ExecutionEvent =
-  | PlanStartEvent
-  | PlanEndEvent
+  | MonitorStartEvent
+  | MonitorEndEvent
   | NodeStartEvent
   | NodeEndEvent
   | HttpRequestEvent