@barnum/barnum 0.0.0-main-68fd94ca → 0.0.0-main-ccc32185

package/index.ts

@@ -1,6 +1,6 @@
 export * from "./barnum-config-schema.zod.js";
 export * from "./barnum-cli-schema.zod.js";
-export { BarnumConfig, type RunOptions } from "./run.js";
+export { BarnumConfig, type RunOptions, type ConfigInput, type StepInput } from "./run.js";
 export { Handler, createHandler, isHandler } from "./types.js";
 export type {
   HandlerDefinition,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@barnum/barnum",
-  "version": "0.0.0-main-68fd94ca",
+  "version": "0.0.0-main-ccc32185",
   "type": "module",
   "description": "Barnum CLI - workflow engine for agents.",
   "main": "index.ts",

package/run.ts

@@ -4,6 +4,7 @@ import { createRequire } from "node:module";
 import { dirname, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import { configSchema } from "./barnum-config-schema.zod.js";
+import { Handler, isHandler } from "./types.js";
 import { z } from "zod";
 import { zodToJsonSchema } from "zod-to-json-schema";
 
@@ -100,63 +101,72 @@ function assertSerializableZod(schema: z.ZodType, stepName: string): void {
   if (def.valueType) assertSerializableZod(def.valueType, stepName);
 }
 
-// ==================== BarnumConfig ====================
-
-export class BarnumConfig {
-  private readonly config: z.output<typeof configSchema>;
-
-  private constructor(config: z.output<typeof configSchema>) {
-    this.config = config;
-  }
+// ==================== Config input types ====================
 
-  static fromConfig(config: z.input<typeof configSchema>): BarnumConfig {
-    return new BarnumConfig(configSchema.parse(config));
-  }
+type ZodConfigInput = z.input<typeof configSchema>;
+type ZodStepInput = ZodConfigInput["steps"][number];
 
-  private async resolveConfig(): Promise<z.output<typeof configSchema>> {
-    const config = structuredClone(this.config);
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export type StepInput = Omit<ZodStepInput, "action"> & {
+  action: { kind: "Bash"; script: string } | Handler<any, any>;
+  stepConfig?: unknown;
+};
 
-    for (const step of config.steps) {
-      if (step.action.kind !== "TypeScript") continue;
-      const action = step.action;
+export type ConfigInput = Omit<ZodConfigInput, "steps"> & {
+  steps: StepInput[];
+};
 
-      // Import the handler module
-      const mod = await import(action.path);
-      const handler = mod[action.exportedAs ?? "default"];
+function resolveHandlers(config: ConfigInput): ZodConfigInput {
+  return {
+    ...config,
+    steps: config.steps.map((step) => {
+      const { stepConfig, action, ...stepRest } = step;
 
-      if (!handler?.stepConfigValidator || !handler?.getStepValueValidator) {
-        throw new Error(
-          `Step "${step.name}": handler at "${action.path}" is missing required ` +
-            `"stepConfigValidator" or "getStepValueValidator". ` +
-            `See HandlerDefinition interface.`,
-        );
+      if (!isHandler(action)) {
+        return { ...stepRest, action } as ZodStepInput;
       }
 
-      // Validate step config
-      const parsedStepConfig = handler.stepConfigValidator.parse(
-        action.stepConfig ?? {},
-      );
+      const def = action.__definition;
+      const parsedStepConfig = def.stepConfigValidator.parse(stepConfig ?? null);
 
-      // Get value validator
-      const valueValidator = handler.getStepValueValidator(parsedStepConfig);
-
-      // Reject non-serializable Zod features
+      const valueValidator = def.getStepValueValidator(parsedStepConfig);
       assertSerializableZod(valueValidator, step.name);
-
-      // Convert Zod → JSON Schema and embed in config
-      action.valueSchema = zodToJsonSchema(valueValidator, {
+      const valueSchema = zodToJsonSchema(valueValidator, {
         target: "jsonSchema7",
       });
-    }
 
-    return config;
+      return {
+        ...stepRest,
+        action: {
+          kind: "TypeScript" as const,
+          path: action.__filePath,
+          exportedAs: "default",
+          stepConfig: parsedStepConfig,
+          valueSchema,
+        },
+      };
+    }),
+  };
+}
+
+// ==================== BarnumConfig ====================
+
+export class BarnumConfig {
+  private readonly config: z.output<typeof configSchema>;
+
+  private constructor(config: z.output<typeof configSchema>) {
+    this.config = config;
+  }
+
+  static fromConfig(config: ConfigInput): BarnumConfig {
+    const resolved = resolveHandlers(config);
+    return new BarnumConfig(configSchema.parse(resolved));
   }
 
-  async run(opts?: RunOptions): Promise<ChildProcess> {
-    const config = await this.resolveConfig();
+  run(opts?: RunOptions): ChildProcess {
     const args = opts?.resumeFrom
       ? ["run", "--resume-from", opts.resumeFrom]
-      : ["run", "--config", JSON.stringify(config)];
+      : ["run", "--config", JSON.stringify(this.config)];
     if (opts?.entrypointValue != null)
       args.push("--entrypoint-value", JSON.stringify(opts.entrypointValue));
     if (opts?.logLevel) args.push("--log-level", opts.logLevel);