@barnum/barnum 0.0.0-main-5c9fe8f2 → 0.0.0-main-5a6a8bee

package/barnum-config-schema.json

@@ -1,20 +1,12 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "ConfigFile",
-  "description": "Top-level Barnum configuration file format.\n\nDefines a workflow as a directed graph of steps. Each step processes tasks and can spawn follow-up tasks on other steps.",
+  "title": "Config",
+  "description": "Top-level Barnum configuration.\n\nDefines a workflow as a directed graph of steps. Each step processes tasks and can spawn follow-up tasks on other steps.",
   "type": "object",
   "required": [
     "steps"
   ],
   "properties": {
-    "$schema": {
-      "description": "Optional JSON Schema URL for editor validation (e.g., `\"./node_modules/@barnum/barnum/barnum-config-schema.json\"`). Ignored at runtime.",
-      "writeOnly": true,
-      "type": [
-        "string",
-        "null"
-      ]
-    },
     "entrypoint": {
       "description": "Name of the step that starts the workflow. When set, the CLI accepts `--entrypoint-value` to provide the initial task value (defaults to `{}`). When omitted, `--initial-state` must provide explicit `[{\"kind\": \"StepName\", \"value\": ...}]` tasks.",
       "default": null,
@@ -26,10 +18,10 @@
     "options": {
       "description": "Global runtime options (timeout, retries, concurrency). Individual steps can override these via their own `options` field.",
       "default": {
-        "max_concurrency": null,
-        "max_retries": 0,
-        "retry_on_invalid_response": true,
-        "retry_on_timeout": true,
+        "maxConcurrency": null,
+        "maxRetries": 0,
+        "retryOnInvalidResponse": true,
+        "retryOnTimeout": true,
         "timeout": null
       },
       "allOf": [
@@ -42,13 +34,13 @@
       "description": "The steps that make up this workflow. Each step defines how to process a task and which steps it can spawn follow-up tasks on.",
       "type": "array",
       "items": {
-        "$ref": "#/definitions/StepFile"
+        "$ref": "#/definitions/Step"
       }
     }
   },
   "additionalProperties": false,
   "definitions": {
-    "ActionFile": {
+    "ActionKind": {
       "description": "How a step processes tasks.",
       "oneOf": [
         {
@@ -56,77 +48,53 @@
           "type": "object",
           "required": [
             "kind",
-            "params"
+            "script"
           ],
           "properties": {
             "kind": {
               "type": "string",
               "enum": [
-                "Command"
+                "Bash"
               ]
             },
-            "params": {
-              "$ref": "#/definitions/CommandActionFile"
+            "script": {
+              "description": "Shell script to execute.\n\n**Input (stdin):** JSON object: `{\"kind\": \"<step name>\", \"value\": <payload>}`. Use `jq '.value'` to extract the payload, or `jq -r '.value.fieldName'` for a specific field.\n\n**Output (stdout):** JSON array of follow-up tasks to spawn: `[{\"kind\": \"NextStep\", \"value\": {...}}, ...]`. Each `kind` must be a step name listed in this step's `next` array. Return `[]` to spawn no follow-ups.",
+              "type": "string"
             }
           }
         }
       ]
     },
-    "CommandActionFile": {
-      "description": "Run a shell command to process tasks.",
-      "type": "object",
-      "required": [
-        "script"
-      ],
-      "properties": {
-        "script": {
-          "description": "Shell script to execute.\n\n**Input (stdin):** JSON object: `{\"kind\": \"<step name>\", \"value\": <payload>}`. Use `jq '.value'` to extract the payload, or `jq -r '.value.fieldName'` for a specific field.\n\n**Output (stdout):** JSON array of follow-up tasks to spawn: `[{\"kind\": \"NextStep\", \"value\": {...}}, ...]`. Each `kind` must be a step name listed in this step's `next` array. Return `[]` to spawn no follow-ups.",
-          "type": "string"
-        }
-      }
-    },
     "FinallyHook": {
-      "description": "Finally hook. Runs after a task and all its descendants complete.\n\nIn JSON: `{\"kind\": \"Command\", \"params\": {\"script\": \"./finally-hook.sh\"}}`\n\n**stdin:** JSON object: `{\"kind\": \"<step name>\", \"value\": <payload>}`. **stdout:** JSON array of follow-up tasks: `[{\"kind\": \"StepName\", \"value\": {...}}, ...]`. Return `[]` for no follow-ups.",
+      "description": "Finally hook. Runs after a task and all its descendants complete.\n\nIn JSON: `{\"kind\": \"Bash\", \"script\": \"./finally-hook.sh\"}`\n\n**stdin:** JSON object: `{\"kind\": \"<step name>\", \"value\": <payload>}`. **stdout:** JSON array of follow-up tasks: `[{\"kind\": \"StepName\", \"value\": {...}}, ...]`. Return `[]` for no follow-ups.",
       "oneOf": [
         {
           "description": "Run a shell command as the finally hook.",
           "type": "object",
           "required": [
             "kind",
-            "params"
+            "script"
           ],
           "properties": {
             "kind": {
               "type": "string",
               "enum": [
-                "Command"
+                "Bash"
               ]
             },
-            "params": {
-              "$ref": "#/definitions/HookCommand"
+            "script": {
+              "description": "Shell script to execute.",
+              "type": "string"
             }
           }
         }
       ]
     },
-    "HookCommand": {
-      "description": "A shell command used as a hook.",
-      "type": "object",
-      "required": [
-        "script"
-      ],
-      "properties": {
-        "script": {
-          "description": "Shell script to execute.",
-          "type": "string"
-        }
-      }
-    },
     "Options": {
       "description": "Global runtime options for task execution. All fields have sensible defaults.",
       "type": "object",
       "properties": {
-        "max_concurrency": {
+        "maxConcurrency": {
           "description": "Maximum concurrent tasks (None = unlimited).",
           "default": null,
           "type": [
@@ -136,19 +104,19 @@
           "format": "uint",
           "minimum": 0.0
         },
-        "max_retries": {
+        "maxRetries": {
           "description": "Maximum retries per task (default: 0).",
           "default": 0,
           "type": "integer",
           "format": "uint32",
           "minimum": 0.0
         },
-        "retry_on_invalid_response": {
+        "retryOnInvalidResponse": {
           "description": "Whether to retry when agent returns invalid response (default: true).",
           "default": true,
           "type": "boolean"
         },
-        "retry_on_timeout": {
+        "retryOnTimeout": {
           "description": "Whether to retry when agent times out (default: true).",
           "default": true,
           "type": "boolean"
@@ -166,7 +134,7 @@
       },
       "additionalProperties": false
     },
-    "StepFile": {
+    "Step": {
       "description": "A named step in the workflow. Steps are the nodes of the task graph.\n\nThe `finally` hook runs after the task **and all of its descendant tasks** complete.",
       "type": "object",
       "required": [
@@ -178,7 +146,7 @@
           "description": "How this step processes tasks.",
           "allOf": [
             {
-              "$ref": "#/definitions/ActionFile"
+              "$ref": "#/definitions/ActionKind"
             }
           ]
         },
@@ -209,9 +177,9 @@
         "options": {
           "description": "Per-step options that override the global `options`. Only the fields you set here take effect; everything else falls through to the global defaults.",
           "default": {
-            "max_retries": null,
-            "retry_on_invalid_response": null,
-            "retry_on_timeout": null,
+            "maxRetries": null,
+            "retryOnInvalidResponse": null,
+            "retryOnTimeout": null,
             "timeout": null
           },
           "allOf": [
@@ -227,7 +195,7 @@
       "description": "Per-step option overrides. Only set the fields you want to override; omitted fields inherit from the global `options`.",
       "type": "object",
       "properties": {
-        "max_retries": {
+        "maxRetries": {
           "description": "Maximum retries for tasks on this step (overrides global `max_retries`).",
           "default": null,
           "type": [
@@ -237,7 +205,7 @@
           "format": "uint32",
           "minimum": 0.0
         },
-        "retry_on_invalid_response": {
+        "retryOnInvalidResponse": {
           "description": "Whether to retry when an agent returns an invalid response on this step (overrides global `retry_on_invalid_response`).",
           "default": null,
           "type": [
@@ -245,7 +213,7 @@
             "null"
           ]
         },
-        "retry_on_timeout": {
+        "retryOnTimeout": {
           "description": "Whether to retry when an agent times out on this step (overrides global `retry_on_timeout`).",
           "default": null,
           "type": [

package/barnum-config-schema.zod.ts

@@ -1,66 +1,55 @@
 import { z } from "zod";
 
-const CommandActionFile = z.object({
-  script: z.string().describe("Shell script to execute.\n\n**Input (stdin):** JSON object: `{\"kind\": \"<step name>\", \"value\": <payload>}`. Use `jq '.value'` to extract the payload, or `jq -r '.value.fieldName'` for a specific field.\n\n**Output (stdout):** JSON array of follow-up tasks to spawn: `[{\"kind\": \"NextStep\", \"value\": {...}}, ...]`. Each `kind` must be a step name listed in this step's `next` array. Return `[]` to spawn no follow-ups."),
-}).describe("Run a shell command to process tasks.");
-
-const ActionFile = z.discriminatedUnion("kind", [
+const ActionKind = z.discriminatedUnion("kind", [
   z.object({
-    kind: z.literal("Command"),
-    params: CommandActionFile,
+    kind: z.literal("Bash"),
+    script: z.string().describe("Shell script to execute.\n\n**Input (stdin):** JSON object: `{\"kind\": \"<step name>\", \"value\": <payload>}`. Use `jq '.value'` to extract the payload, or `jq -r '.value.fieldName'` for a specific field.\n\n**Output (stdout):** JSON array of follow-up tasks to spawn: `[{\"kind\": \"NextStep\", \"value\": {...}}, ...]`. Each `kind` must be a step name listed in this step's `next` array. Return `[]` to spawn no follow-ups."),
   }).describe("Run a shell command."),
 ]).describe("How a step processes tasks.");
 
-const HookCommand = z.object({
-  script: z.string().describe("Shell script to execute."),
-}).describe("A shell command used as a hook.");
-
 const FinallyHook = z.discriminatedUnion("kind", [
   z.object({
-    kind: z.literal("Command"),
-    params: HookCommand,
+    kind: z.literal("Bash"),
+    script: z.string().describe("Shell script to execute."),
   }).describe("Run a shell command as the finally hook."),
-]).describe("Finally hook. Runs after a task and all its descendants complete.\n\nIn JSON: `{\"kind\": \"Command\", \"params\": {\"script\": \"./finally-hook.sh\"}}`\n\n**stdin:** JSON object: `{\"kind\": \"<step name>\", \"value\": <payload>}`. **stdout:** JSON array of follow-up tasks: `[{\"kind\": \"StepName\", \"value\": {...}}, ...]`. Return `[]` for no follow-ups.");
+]).describe("Finally hook. Runs after a task and all its descendants complete.\n\nIn JSON: `{\"kind\": \"Bash\", \"script\": \"./finally-hook.sh\"}`\n\n**stdin:** JSON object: `{\"kind\": \"<step name>\", \"value\": <payload>}`. **stdout:** JSON array of follow-up tasks: `[{\"kind\": \"StepName\", \"value\": {...}}, ...]`. Return `[]` for no follow-ups.");
 
 const Options = z.object({
-  max_concurrency: z.number().int().nonnegative().nullable().optional().default(null).describe("Maximum concurrent tasks (None = unlimited)."),
-  max_retries: z.number().int().nonnegative().optional().default(0).describe("Maximum retries per task (default: 0)."),
-  retry_on_invalid_response: z.boolean().optional().default(true).describe("Whether to retry when agent returns invalid response (default: true)."),
-  retry_on_timeout: z.boolean().optional().default(true).describe("Whether to retry when agent times out (default: true)."),
+  maxConcurrency: z.number().int().nonnegative().nullable().optional().default(null).describe("Maximum concurrent tasks (None = unlimited)."),
+  maxRetries: z.number().int().nonnegative().optional().default(0).describe("Maximum retries per task (default: 0)."),
+  retryOnInvalidResponse: z.boolean().optional().default(true).describe("Whether to retry when agent returns invalid response (default: true)."),
+  retryOnTimeout: z.boolean().optional().default(true).describe("Whether to retry when agent times out (default: true)."),
   timeout: z.number().int().nonnegative().nullable().optional().default(null).describe("Timeout in seconds for each task (None = no timeout)."),
 }).strict().describe("Global runtime options for task execution. All fields have sensible defaults.");
 
 const StepOptions = z.object({
-  max_retries: z.number().int().nonnegative().nullable().optional().default(null).describe("Maximum retries for tasks on this step (overrides global `max_retries`)."),
-  retry_on_invalid_response: z.boolean().nullable().optional().default(null).describe("Whether to retry when an agent returns an invalid response on this step (overrides global `retry_on_invalid_response`)."),
-  retry_on_timeout: z.boolean().nullable().optional().default(null).describe("Whether to retry when an agent times out on this step (overrides global `retry_on_timeout`)."),
+  maxRetries: z.number().int().nonnegative().nullable().optional().default(null).describe("Maximum retries for tasks on this step (overrides global `max_retries`)."),
+  retryOnInvalidResponse: z.boolean().nullable().optional().default(null).describe("Whether to retry when an agent returns an invalid response on this step (overrides global `retry_on_invalid_response`)."),
+  retryOnTimeout: z.boolean().nullable().optional().default(null).describe("Whether to retry when an agent times out on this step (overrides global `retry_on_timeout`)."),
   timeout: z.number().int().nonnegative().nullable().optional().default(null).describe("Timeout in seconds for tasks on this step (overrides global `timeout`)."),
 }).strict().describe("Per-step option overrides. Only set the fields you want to override; omitted fields inherit from the global `options`.");
 
-const StepFile = z.object({
-  action: ActionFile.describe("How this step processes tasks."),
+const Step = z.object({
+  action: ActionKind.describe("How this step processes tasks."),
   finally: FinallyHook.nullable().optional().default(null).describe("Shell script that runs after this task **and all tasks it spawned (recursively)** have completed.\n\n**stdin:** JSON object: `{\"kind\": \"<step name>\", \"value\": <payload>}`. Same envelope format as command action scripts.\n\n**stdout:** A JSON array of follow-up tasks to spawn: `[{\"kind\": \"StepName\", \"value\": {...}}, ...]`. Each `kind` must be a valid step name. Return `[]` to spawn no follow-ups.\n\nUse this for cleanup, aggregation, or spawning a final summarization step after an entire subtree of work completes."),
   name: z.string().describe("Unique name for this step (e.g., `\"Analyze\"`, `\"Implement\"`, `\"Review\"`). This is the string used as `kind` when creating tasks: `{\"kind\": \"ThisStepName\", \"value\": {...}}`."),
   next: z.array(z.string()).optional().default([]).describe("Step names this step is allowed to spawn follow-up tasks on. Each string must match the `name` of another step in this config. An empty array means this is a terminal step (no follow-ups)."),
-  options: StepOptions.optional().default({"max_retries": null, "retry_on_invalid_response": null, "retry_on_timeout": null, "timeout": null}).describe("Per-step options that override the global `options`. Only the fields you set here take effect; everything else falls through to the global defaults."),
+  options: StepOptions.optional().default({"maxRetries": null, "retryOnInvalidResponse": null, "retryOnTimeout": null, "timeout": null}).describe("Per-step options that override the global `options`. Only the fields you set here take effect; everything else falls through to the global defaults."),
 }).strict().describe("A named step in the workflow. Steps are the nodes of the task graph.\n\nThe `finally` hook runs after the task **and all of its descendant tasks** complete.");
 
-export const configFileSchema = z.object({
-  "$schema": z.string().nullable().optional().describe("Optional JSON Schema URL for editor validation (e.g., `\"./node_modules/@barnum/barnum/barnum-config-schema.json\"`). Ignored at runtime."),
+export const configSchema = z.object({
   entrypoint: z.string().nullable().optional().default(null).describe("Name of the step that starts the workflow. When set, the CLI accepts `--entrypoint-value` to provide the initial task value (defaults to `{}`). When omitted, `--initial-state` must provide explicit `[{\"kind\": \"StepName\", \"value\": ...}]` tasks."),
-  options: Options.optional().default({"max_concurrency": null, "max_retries": 0, "retry_on_invalid_response": true, "retry_on_timeout": true, "timeout": null}).describe("Global runtime options (timeout, retries, concurrency). Individual steps can override these via their own `options` field."),
-  steps: z.array(StepFile).describe("The steps that make up this workflow. Each step defines how to process a task and which steps it can spawn follow-up tasks on."),
-}).strict().describe("Top-level Barnum configuration file format.\n\nDefines a workflow as a directed graph of steps. Each step processes tasks and can spawn follow-up tasks on other steps.");
+  options: Options.optional().default({"maxConcurrency": null, "maxRetries": 0, "retryOnInvalidResponse": true, "retryOnTimeout": true, "timeout": null}).describe("Global runtime options (timeout, retries, concurrency). Individual steps can override these via their own `options` field."),
+  steps: z.array(Step).describe("The steps that make up this workflow. Each step defines how to process a task and which steps it can spawn follow-up tasks on."),
+}).strict().describe("Top-level Barnum configuration.\n\nDefines a workflow as a directed graph of steps. Each step processes tasks and can spawn follow-up tasks on other steps.");
 
-export type ConfigFile = z.infer<typeof configFileSchema>;
-export type CommandActionFile = z.infer<typeof CommandActionFile>;
-export type ActionFile = z.infer<typeof ActionFile>;
-export type HookCommand = z.infer<typeof HookCommand>;
+export type Config = z.infer<typeof configSchema>;
+export type ActionKind = z.infer<typeof ActionKind>;
 export type FinallyHook = z.infer<typeof FinallyHook>;
 export type Options = z.infer<typeof Options>;
 export type StepOptions = z.infer<typeof StepOptions>;
-export type StepFile = z.infer<typeof StepFile>;
+export type Step = z.infer<typeof Step>;
 
-export function defineConfig(config: z.input<typeof configFileSchema>): ConfigFile {
-  return configFileSchema.parse(config);
+export function defineConfig(config: z.input<typeof configSchema>): Config {
+  return configSchema.parse(config);
 }

package/package.json

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

package/run.ts

@@ -1,17 +1,17 @@
 import { spawn, type ChildProcess } from "node:child_process";
 import { chmodSync } from "node:fs";
 import { createRequire } from "node:module";
-import { configFileSchema } from "./barnum-config-schema.zod.js";
+import { configSchema } from "./barnum-config-schema.zod.js";
 import type { z } from "zod";
 
 const require = createRequire(import.meta.url);
 const binaryPath: string = process.env.BARNUM ?? require("./index.cjs");
 
-function spawnBarnum(args: string[]): ChildProcess {
+function spawnBarnum(args: string[], cwd?: string): ChildProcess {
   try {
     chmodSync(binaryPath, 0o755);
   } catch {}
-  return spawn(binaryPath, args, { stdio: "inherit" });
+  return spawn(binaryPath, args, { stdio: "inherit", cwd });
 }
 
 export interface RunOptions {
@@ -21,17 +21,18 @@ export interface RunOptions {
   logFile?: string;
   stateLog?: string;
   wake?: string;
+  cwd?: string;
 }
 
 export class BarnumConfig {
-  private readonly config: z.output<typeof configFileSchema>;
+  private readonly config: z.output<typeof configSchema>;
 
-  private constructor(config: z.output<typeof configFileSchema>) {
+  private constructor(config: z.output<typeof configSchema>) {
     this.config = config;
   }
 
-  static fromConfig(config: z.input<typeof configFileSchema>): BarnumConfig {
-    return new BarnumConfig(configFileSchema.parse(config));
+  static fromConfig(config: z.input<typeof configSchema>): BarnumConfig {
+    return new BarnumConfig(configSchema.parse(config));
   }
 
   run(opts?: RunOptions): ChildProcess {
@@ -43,6 +44,6 @@ export class BarnumConfig {
     if (opts?.logFile) args.push("--log-file", opts.logFile);
     if (opts?.stateLog) args.push("--state-log", opts.stateLog);
     if (opts?.wake) args.push("--wake", opts.wake);
-    return spawnBarnum(args);
+    return spawnBarnum(args, opts?.cwd);
   }
 }