@griffin-app/griffin-plan-executor 0.1.0 → 0.1.3

package/src/executor.test.ts

@@ -1,14 +1,12 @@
 import { describe, it, expect, beforeEach } from "vitest";
 import { executePlanV1 } from "./executor.js";
 import { StubAdapter } from "./adapters/stub.js";
-import { NodeType, HttpMethod, ResponseFormat } from "griffin/schema";
-import { TestPlanV1 } from "griffin/types";
+import { NodeType, HttpMethod, ResponseFormat } from "@griffin-app/griffin-ts/schema";
+import { TestPlanV1 } from "@griffin-app/griffin-ts/types";
 import { START, END, type ExecutionOptions } from "./types.js";
 import { LocalEventEmitter, type ExecutionEvent } from "./events";
-
-function stubTargetResolver(key: string): Promise<string | undefined> {
-  return Promise.resolve(`https://${key}.example.com`);
-}
+import { SecretProviderRegistry } from "./secrets/registry.js";
+import { EnvSecretProvider } from "./secrets/providers/env.js";
 
 describe("executePlanV1", () => {
   let stubClient: StubAdapter;
@@ -16,11 +14,13 @@ describe("executePlanV1", () => {
 
   beforeEach(() => {
     stubClient = new StubAdapter();
+    const secretRegistry = new SecretProviderRegistry();
+    secretRegistry.register(new EnvSecretProvider());
     options = {
       mode: "local",
       httpClient: stubClient,
       timeout: 5000,
-      targetResolver: stubTargetResolver,
+      secretRegistry: secretRegistry,
     };
   });
 
@@ -37,7 +37,7 @@ describe("executePlanV1", () => {
             type: NodeType.ENDPOINT,
             method: HttpMethod.GET,
             path: "/users",
-            base: { type: "target", key: "api" },
+            base: "https://api.example.com",
             response_format: ResponseFormat.JSON,
           },
         ],
@@ -86,7 +86,7 @@ describe("executePlanV1", () => {
             id: "create-user",
             type: NodeType.ENDPOINT,
             method: HttpMethod.POST,
-            base: { type: "target", key: "api" },
+            base: "https://api.example.com",
             path: "/users",
             headers: {
               "Content-Type": "application/json",
@@ -140,7 +140,7 @@ describe("executePlanV1", () => {
             type: NodeType.ENDPOINT,
             method: HttpMethod.GET,
             path: "/data",
-            base: { type: "target", key: "api" },
+            base: "https://api.example.com",
             response_format: ResponseFormat.JSON,
           },
         ],
@@ -182,7 +182,7 @@ describe("executePlanV1", () => {
             id: "get-users",
             type: NodeType.ENDPOINT,
             method: HttpMethod.GET,
-            base: { type: "target", key: "api" },
+            base: "https://api.example.com",
             path: "/users",
             response_format: ResponseFormat.JSON,
           },
@@ -227,7 +227,7 @@ describe("executePlanV1", () => {
             type: NodeType.ENDPOINT,
             method: HttpMethod.PUT,
             path: "/users/1",
-            base: { type: "target", key: "api" },
+            base: "https://api.example.com",
             body: { name: "Updated Name" },
             response_format: ResponseFormat.JSON,
           },
@@ -274,7 +274,7 @@ describe("executePlanV1", () => {
             type: NodeType.ENDPOINT,
             method: HttpMethod.DELETE,
             path: "/users/1",
-            base: { type: "target", key: "api" },
+            base: "https://api.example.com",
             response_format: ResponseFormat.JSON,
           },
         ],
@@ -317,7 +317,7 @@ describe("executePlanV1", () => {
             type: NodeType.ENDPOINT,
             method: HttpMethod.PATCH,
             path: "/users/1",
-            base: { type: "target", key: "api" },
+            base: "https://api.example.com",
             body: { email: "newemail@example.com" },
             response_format: ResponseFormat.JSON,
           },
@@ -362,7 +362,7 @@ describe("executePlanV1", () => {
             type: NodeType.ENDPOINT,
             method: HttpMethod.GET,
             path: "/first",
-            base: { type: "target", key: "api" },
+            base: "https://api.example.com",
             response_format: ResponseFormat.JSON,
           },
           {
@@ -370,7 +370,7 @@ describe("executePlanV1", () => {
             type: NodeType.ENDPOINT,
             method: HttpMethod.GET,
             path: "/second",
-            base: { type: "target", key: "api" },
+            base: "https://api.example.com",
             response_format: ResponseFormat.JSON,
           },
         ],
@@ -430,7 +430,7 @@ describe("executePlanV1", () => {
             type: NodeType.ENDPOINT,
             method: HttpMethod.GET,
             path: "/step1",
-            base: { type: "target", key: "api" },
+            base: "https://api.example.com",
             response_format: ResponseFormat.JSON,
           },
           {
@@ -438,7 +438,7 @@ describe("executePlanV1", () => {
             type: NodeType.ENDPOINT,
             method: HttpMethod.GET,
             path: "/step2",
-            base: { type: "target", key: "api" },
+            base: "https://api.example.com",
             response_format: ResponseFormat.JSON,
           },
           {
@@ -446,7 +446,7 @@ describe("executePlanV1", () => {
             type: NodeType.ENDPOINT,
             method: HttpMethod.GET,
             path: "/step3",
-            base: { type: "target", key: "api" },
+            base: "https://api.example.com",
             response_format: ResponseFormat.JSON,
           },
           {
@@ -454,7 +454,7 @@ describe("executePlanV1", () => {
             type: NodeType.ENDPOINT,
             method: HttpMethod.GET,
             path: "/step4",
-            base: { type: "target", key: "api" },
+            base: "https://api.example.com",
             response_format: ResponseFormat.JSON,
           },
         ],
@@ -561,7 +561,7 @@ describe("executePlanV1", () => {
             type: NodeType.ENDPOINT,
             method: HttpMethod.GET,
             path: "/first",
-            base: { type: "target", key: "api" },
+            base: "https://api.example.com",
             response_format: ResponseFormat.JSON,
           },
           {
@@ -574,7 +574,7 @@ describe("executePlanV1", () => {
             type: NodeType.ENDPOINT,
             method: HttpMethod.GET,
             path: "/second",
-            base: { type: "target", key: "api" },
+            base: "https://api.example.com",
             response_format: ResponseFormat.JSON,
           },
         ],
@@ -630,7 +630,7 @@ describe("executePlanV1", () => {
             type: NodeType.ENDPOINT,
             method: HttpMethod.GET,
             path: "/data",
-            base: { type: "target", key: "api" },
+            base: "https://api.example.com",
             response_format: ResponseFormat.JSON,
           },
           {
@@ -686,7 +686,7 @@ describe("executePlanV1", () => {
             type: NodeType.ENDPOINT,
             method: HttpMethod.GET,
             path: "/fail",
-            base: { type: "target", key: "api" },
+            base: "https://api.example.com",
             response_format: ResponseFormat.JSON,
           },
         ],
@@ -726,7 +726,7 @@ describe("executePlanV1", () => {
             type: NodeType.ENDPOINT,
             method: HttpMethod.GET,
             path: "/path",
-            base: { type: "target", key: "api" },
+            base: "https://api.example.com",
             response_format: ResponseFormat.JSON,
           },
           {
@@ -734,7 +734,7 @@ describe("executePlanV1", () => {
             type: NodeType.ENDPOINT,
             method: HttpMethod.GET,
             path: "/path",
-            base: { type: "target", key: "api" },
+            base: "https://api.example.com",
             response_format: ResponseFormat.JSON,
           },
         ],
@@ -773,7 +773,7 @@ describe("executePlanV1", () => {
             type: NodeType.ENDPOINT,
             method: HttpMethod.GET,
             path: "/success",
-            base: { type: "target", key: "api" },
+            base: "https://api.example.com",
             response_format: ResponseFormat.JSON,
           },
           {
@@ -781,7 +781,7 @@ describe("executePlanV1", () => {
             type: NodeType.ENDPOINT,
             method: HttpMethod.GET,
             path: "/fail",
-            base: { type: "target", key: "api" },
+            base: "https://api.example.com",
             response_format: ResponseFormat.JSON,
           },
         ],
@@ -829,7 +829,7 @@ describe("executePlanV1", () => {
             type: NodeType.ENDPOINT,
             method: HttpMethod.GET,
             path: "/user",
-            base: { type: "target", key: "api" },
+            base: "https://api.example.com",
             response_format: ResponseFormat.JSON,
           },
           {
@@ -837,7 +837,7 @@ describe("executePlanV1", () => {
             type: NodeType.ENDPOINT,
             method: HttpMethod.GET,
             path: "/profile",
-            base: { type: "target", key: "api" },
+            base: "https://api.example.com",
             response_format: ResponseFormat.JSON,
           },
         ],
@@ -894,7 +894,7 @@ describe("executePlanV1", () => {
             type: NodeType.ENDPOINT,
             method: HttpMethod.GET,
             path: "/fail",
-            base: { type: "target", key: "api" },
+            base: "https://api.example.com",
             response_format: ResponseFormat.JSON,
           },
         ],
@@ -932,7 +932,7 @@ describe("executePlanV1", () => {
             type: NodeType.ENDPOINT,
             method: HttpMethod.GET,
             path: "/data",
-            base: { type: "target", key: "api" },
+            base: "https://api.example.com",
             response_format: ResponseFormat.JSON,
           },
         ],
@@ -977,7 +977,7 @@ describe("executePlanV1", () => {
             type: NodeType.ENDPOINT,
             method: HttpMethod.GET,
             path: "/1",
-            base: { type: "target", key: "api" },
+            base: "https://api.example.com",
             response_format: ResponseFormat.JSON,
           },
           {
@@ -990,7 +990,7 @@ describe("executePlanV1", () => {
             type: NodeType.ENDPOINT,
             method: HttpMethod.GET,
             path: "/2",
-            base: { type: "target", key: "api" },
+            base: "https://api.example.com",
             response_format: ResponseFormat.JSON,
           },
         ],
@@ -1070,7 +1070,7 @@ describe("executePlanV1", () => {
             type: NodeType.ENDPOINT,
             method: HttpMethod.GET,
             path: "/single",
-            base: { type: "target", key: "api" },
+            base: "https://api.example.com",
             response_format: ResponseFormat.JSON,
           },
         ],
@@ -1113,7 +1113,7 @@ describe("executePlanV1", () => {
             type: NodeType.ENDPOINT,
             method: HttpMethod.GET,
             path: "/complex",
-            base: { type: "target", key: "api" },
+            base: "https://api.example.com",
             response_format: ResponseFormat.JSON,
           },
         ],
@@ -1180,7 +1180,7 @@ describe("executePlanV1", () => {
             type: NodeType.ENDPOINT,
             method: HttpMethod.GET,
             path: "/test",
-            base: { type: "target", key: "api" },
+            base: "https://api.example.com",
             response_format: ResponseFormat.JSON,
           },
         ],
@@ -1243,7 +1243,7 @@ describe("executePlanV1", () => {
             type: NodeType.ENDPOINT,
             method: HttpMethod.GET,
             path: "/first",
-            base: { type: "target", key: "api" },
+            base: "https://api.example.com",
             response_format: ResponseFormat.JSON,
           },
           {
@@ -1256,7 +1256,7 @@ describe("executePlanV1", () => {
             type: NodeType.ENDPOINT,
             method: HttpMethod.GET,
             path: "/second",
-            base: { type: "target", key: "api" },
+            base: "https://api.example.com",
             response_format: ResponseFormat.JSON,
           },
         ],
@@ -1328,7 +1328,7 @@ describe("executePlanV1", () => {
             type: NodeType.ENDPOINT,
             method: HttpMethod.POST,
             path: "/create",
-            base: { type: "target", key: "api" },
+            base: "https://api.example.com",
             headers: { "Content-Type": "application/json" },
             body: { name: "test" },
             response_format: ResponseFormat.JSON,
@@ -1441,7 +1441,7 @@ describe("executePlanV1", () => {
             type: NodeType.ENDPOINT,
             method: HttpMethod.GET,
             path: "/fail",
-            base: { type: "target", key: "api" },
+            base: "https://api.example.com",
             response_format: ResponseFormat.JSON,
           },
         ],
@@ -1482,7 +1482,7 @@ describe("executePlanV1", () => {
             type: NodeType.ENDPOINT,
             method: HttpMethod.GET,
             path: "/test",
-            base: { type: "target", key: "api" },
+            base: "https://api.example.com",
             response_format: ResponseFormat.JSON,
           },
         ],
@@ -1536,7 +1536,7 @@ describe("executePlanV1", () => {
             type: NodeType.ENDPOINT,
             method: HttpMethod.GET,
             path: "/test",
-            base: { type: "target", key: "api" },
+            base: "https://api.example.com",
             response_format: ResponseFormat.JSON,
           },
         ],
@@ -1581,7 +1581,7 @@ describe("executePlanV1", () => {
             type: NodeType.ENDPOINT,
             method: HttpMethod.GET,
             path: "/test",
-            base: { type: "target", key: "api" },
+            base: "https://api.example.com",
             response_format: ResponseFormat.JSON,
           },
         ],
@@ -1630,7 +1630,7 @@ describe("executePlanV1", () => {
             type: NodeType.ENDPOINT,
             method: HttpMethod.GET,
             path: "/fail",
-            base: { type: "target", key: "api" },
+            base: "https://api.example.com",
             response_format: ResponseFormat.JSON,
           },
         ],

package/src/executor.ts

@@ -6,11 +6,11 @@ import {
   Assertions,
   JSONAssertion,
   Assertion,
-} from "griffin/types";
+} from "@griffin-app/griffin-ts/types";
 
-import { HttpMethod, ResponseFormat, NodeType } from "griffin/schema";
+import { HttpMethod, ResponseFormat, NodeType } from "@griffin-app/griffin-ts/schema";
 
-import { UnaryPredicate, BinaryPredicateOperator } from "griffin";
+import { UnaryPredicate, BinaryPredicateOperator } from "@griffin-app/griffin-ts";
 
 import type {
   ExecutionOptions,
@@ -514,14 +514,10 @@ async function executeEndpoint(
     );
   }
 
-  const baseUrl = await options.targetResolver(endpoint.base.key);
-  if (!baseUrl) {
-    throw new Error(
-      `Failed to resolve target "${endpoint.base.key}". Target not found in runner configuration.`,
-    );
-  }
-
-  const url = `${baseUrl}${endpoint.path}`;
+  // endpoint.base and endpoint.path are already resolved strings
+  const baseUrl = endpoint.base;
+  const path = endpoint.path;
+  const url = `${baseUrl}${path}`;
 
   // TODO: Add retry configuration from plan (node-level or plan-level)
   // For now, we always attempt once (attempt: 1)

package/src/secrets/resolver.ts

@@ -2,8 +2,8 @@
  * Secret resolution utilities for test plans.
  */
 
-import { TestPlanV1, Node } from "griffin/types";
-import { NodeType } from "griffin/schema";
+import { TestPlanV1, Node } from "@griffin-app/griffin-ts/types";
+import { NodeType } from "@griffin-app/griffin-ts/schema";
 import type { SecretProviderRegistry } from "./registry.js";
 import type { SecretRef, SecretRefData } from "./types.js";
 import { isSecretRef } from "./types.js";

package/src/secrets/secrets.test.ts

@@ -7,8 +7,8 @@ import {
   collectSecretsFromPlan,
   planHasSecrets,
 } from "./resolver.js";
-import { NodeType, ResponseFormat, HttpMethod } from "griffin/schema";
-import { TestPlanV1 } from "griffin/types";
+import { NodeType, ResponseFormat, HttpMethod } from "@griffin-app/griffin-ts/schema";
+import { TestPlanV1 } from "@griffin-app/griffin-ts/types";
 
 // Helper to create a secret ref (mirrors the DSL's secret function)
 function createSecretRef(path: string) {
@@ -127,7 +127,7 @@ describe("Plan Secret Resolution", () => {
         type: NodeType.ENDPOINT,
         method: HttpMethod.GET,
         path: "/api/test",
-        base: { type: "target", key: "api-gateway" },
+        base: { $variable: { key: "api-gateway" } },
         response_format: ResponseFormat.JSON,
         headers,
         body,

package/src/types.ts

@@ -51,18 +51,7 @@ export interface ExecutionOptions {
   /** Unique execution ID for correlating events (generated if not provided) */
   executionId?: string;
 
-  /**
-   * Optional secret provider registry for resolving secret references.
-   * If provided, secrets in the plan will be resolved before execution.
-   * If not provided, any secret references in the plan will cause an error.
-   */
-  secretRegistry?: SecretProviderRegistry;
-
-  /**
-   * Target resolver for mapping target keys to base URLs.
-   * Required when plan contains target references.
-   */
-  targetResolver: (key: string) => Promise<string | undefined>;
+  secretRegistry: SecretProviderRegistry;
 }
 
 export interface NodeResult {