@barnum/barnum 0.0.0-main-1b7a5ffd → 0.0.0-main-c9d44943

package/barnum-cli-schema.zod.ts

@@ -31,7 +31,6 @@ const Command = z.discriminatedUnion("kind", [
     initialState: z.string().nullable().optional().describe("Initial tasks (JSON string or path to file). Required if config has no `entrypoint`. Cannot be used with `--entrypoint-value`."),
     kind: z.literal("Run"),
     logFile: z.string().nullable().optional().describe("Log file path (logs emitted in addition to stderr)"),
-    pool: z.string().nullable().optional().describe("Agent pool ID (e.g., `abc123` resolves to `<root>/pools/abc123/`). Defaults to `default`."),
     resumeFrom: z.string().nullable().optional().describe("Resume from a previous state log file. Incompatible with `--config`, `--initial-state`, and `--entrypoint-value`."),
     stateLog: z.string().nullable().optional().describe("State log file path (NDJSON file for persistence/resume)"),
     wake: z.string().nullable().optional().describe("Wake script to call before starting"),
@@ -58,7 +57,6 @@ const LogLevel = z.union([
 export const cliSchema = z.object({
   command: Command.describe("Subcommand to run."),
   logLevel: LogLevel.describe("Log level (debug shows task return values)"),
-  root: z.string().nullable().optional().describe("Root directory. Pools live in `<root>/pools/<id>/`. Defaults to `/tmp/troupe` on Unix."),
 }).describe("Top-level CLI arguments for barnum.");
 
 export type Cli = z.infer<typeof cliSchema>;

package/barnum-config-schema.json

@@ -55,23 +55,18 @@
           "description": "Send the task to the agent pool for processing.",
           "type": "object",
           "required": [
-            "instructions",
-            "kind"
+            "kind",
+            "params"
           ],
           "properties": {
-            "instructions": {
-              "description": "Markdown prompt shown to the agent processing this task. This is the core of what tells the agent what to do. Use `{\"kind\": \"Inline\", \"value\": \"...\"}` to write the markdown directly, or `{\"kind\": \"Link\", \"path\": \"path/to/file.md\"}` to reference an external file.",
-              "allOf": [
-                {
-                  "$ref": "#/definitions/MaybeLinked_for_String"
-                }
-              ]
-            },
             "kind": {
               "type": "string",
               "enum": [
                 "Pool"
               ]
+            },
+            "params": {
+              "$ref": "#/definitions/PoolActionFile"
             }
           }
         },
@@ -80,7 +75,7 @@
           "type": "object",
           "required": [
             "kind",
-            "script"
+            "params"
           ],
           "properties": {
             "kind": {
@@ -89,23 +84,35 @@
                 "Command"
               ]
             },
-            "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"
+            "params": {
+              "$ref": "#/definitions/CommandActionFile"
             }
           }
         }
       ]
     },
+    "CommandActionFile": {
+      "description": "Run a local shell command instead of sending to an agent. Use this for deterministic transformations, fan-out, or glue logic.",
+      "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\", \"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\": \"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.",
       "oneOf": [
         {
           "description": "Run a shell command as the finally hook.",
           "type": "object",
           "required": [
             "kind",
-            "script"
+            "params"
           ],
           "properties": {
             "kind": {
@@ -114,14 +121,26 @@
                 "Command"
               ]
             },
-            "script": {
-              "description": "Shell script to execute.",
-              "type": "string"
+            "params": {
+              "$ref": "#/definitions/HookCommand"
             }
           }
         }
       ]
     },
+    "HookCommand": {
+      "description": "A shell command used as a hook.",
+      "type": "object",
+      "required": [
+        "script"
+      ],
+      "properties": {
+        "script": {
+          "description": "Shell script to execute.",
+          "type": "string"
+        }
+      }
+    },
     "MaybeLinked_for_String": {
       "description": "Content that can be inline or linked to a file.\n\nIn config files: - `{\"kind\": \"Inline\", \"value\": <content>}` → content provided directly in the config - `{\"kind\": \"Link\", \"path\": \"file.md\"}` → content loaded from a file (path relative to the config file)",
       "oneOf": [
@@ -211,6 +230,49 @@
       },
       "additionalProperties": false
     },
+    "PoolActionFile": {
+      "description": "Send the task to the agent pool. An AI agent receives the task's `value` along with the `instructions` (markdown prompt) and produces a JSON array of follow-up tasks.",
+      "type": "object",
+      "required": [
+        "instructions"
+      ],
+      "properties": {
+        "instructions": {
+          "description": "Markdown prompt shown to the agent processing this task. This is the core of what tells the agent what to do. Use `{\"kind\": \"Inline\", \"value\": \"...\"}` to write the markdown directly, or `{\"kind\": \"Link\", \"path\": \"path/to/file.md\"}` to reference an external file.",
+          "allOf": [
+            {
+              "$ref": "#/definitions/MaybeLinked_for_String"
+            }
+          ]
+        },
+        "pool": {
+          "description": "Pool name (e.g., `\"demo\"`, `\"reviewers\"`). If omitted, the pool infrastructure uses its own default.",
+          "default": null,
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "root": {
+          "description": "Pool root directory. If omitted, the pool infrastructure uses its own default.",
+          "default": null,
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "timeout": {
+          "description": "Agent timeout in seconds. Passed to the pool as `timeout_seconds` in the task payload. Controls how long the agent gets to work. Separate from the step-level `timeout` which controls barnum's worker timeout.",
+          "default": null,
+          "type": [
+            "integer",
+            "null"
+          ],
+          "format": "uint64",
+          "minimum": 0.0
+        }
+      }
+    },
     "SchemaLink": {
       "description": "Reference to an external JSON Schema file.",
       "type": "object",

package/barnum-config-schema.zod.ts

@@ -11,23 +11,38 @@ const MaybeLinked_for_String = z.discriminatedUnion("kind", [
   }).describe("Link to a file whose contents will be loaded at runtime."),
 ]).describe("Content that can be inline or linked to a file.\n\nIn config files: - `{\"kind\": \"Inline\", \"value\": <content>}` → content provided directly in the config - `{\"kind\": \"Link\", \"path\": \"file.md\"}` → content loaded from a file (path relative to the config file)");
 
+const PoolActionFile = z.object({
+  instructions: MaybeLinked_for_String.describe("Markdown prompt shown to the agent processing this task. This is the core of what tells the agent what to do. Use `{\"kind\": \"Inline\", \"value\": \"...\"}` to write the markdown directly, or `{\"kind\": \"Link\", \"path\": \"path/to/file.md\"}` to reference an external file."),
+  pool: z.string().nullable().optional().default(null).describe("Pool name (e.g., `\"demo\"`, `\"reviewers\"`). If omitted, the pool infrastructure uses its own default."),
+  root: z.string().nullable().optional().default(null).describe("Pool root directory. If omitted, the pool infrastructure uses its own default."),
+  timeout: z.number().int().nonnegative().nullable().optional().default(null).describe("Agent timeout in seconds. Passed to the pool as `timeout_seconds` in the task payload. Controls how long the agent gets to work. Separate from the step-level `timeout` which controls barnum's worker timeout."),
+}).describe("Send the task to the agent pool. An AI agent receives the task's `value` along with the `instructions` (markdown prompt) and produces a JSON array of follow-up tasks.");
+
+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 local shell command instead of sending to an agent. Use this for deterministic transformations, fan-out, or glue logic.");
+
 const ActionFile = z.discriminatedUnion("kind", [
   z.object({
-    instructions: MaybeLinked_for_String.describe("Markdown prompt shown to the agent processing this task. This is the core of what tells the agent what to do. Use `{\"kind\": \"Inline\", \"value\": \"...\"}` to write the markdown directly, or `{\"kind\": \"Link\", \"path\": \"path/to/file.md\"}` to reference an external file."),
     kind: z.literal("Pool"),
+    params: PoolActionFile,
   }).describe("Send the task to the agent pool for processing."),
   z.object({
     kind: z.literal("Command"),
-    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."),
+    params: CommandActionFile,
   }).describe("Run a local shell command."),
 ]).describe("How a step processes tasks. Set `\"kind\": \"Pool\"` to send tasks to AI agents, or `\"kind\": \"Command\"` to run a local shell script.");
 
+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"),
-    script: z.string().describe("Shell script to execute."),
+    params: HookCommand,
   }).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\", \"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\": \"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.");
 
 const Options = z.object({
   max_concurrency: z.number().int().nonnegative().nullable().optional().default(null).describe("Maximum concurrent tasks (None = unlimited)."),
@@ -71,7 +86,10 @@ export const configFileSchema = z.object({
 
 export type ConfigFile = z.infer<typeof configFileSchema>;
 export type MaybeLinked_for_String = z.infer<typeof MaybeLinked_for_String>;
+export type PoolActionFile = z.infer<typeof PoolActionFile>;
+export type CommandActionFile = z.infer<typeof CommandActionFile>;
 export type ActionFile = z.infer<typeof ActionFile>;
+export type HookCommand = z.infer<typeof HookCommand>;
 export type FinallyHook = z.infer<typeof FinallyHook>;
 export type Options = z.infer<typeof Options>;
 export type SchemaLink = z.infer<typeof SchemaLink>;

package/package.json

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

package/run.ts

@@ -15,10 +15,8 @@ function spawnBarnum(args: string[]): ChildProcess {
 }
 
 export interface RunOptions {
-  pool?: string;
   entrypointValue?: string;
   resumeFrom?: string;
-  root?: string;
   logLevel?: string;
   logFile?: string;
   stateLog?: string;
@@ -40,9 +38,7 @@ export class BarnumConfig {
     const args = opts?.resumeFrom
       ? ["run", "--resume-from", opts.resumeFrom]
       : ["run", "--config", JSON.stringify(this.config)];
-    if (opts?.pool) args.push("--pool", opts.pool);
     if (opts?.entrypointValue) args.push("--entrypoint-value", opts.entrypointValue);
-    if (opts?.root) args.push("--root", opts.root);
     if (opts?.logLevel) args.push("--log-level", opts.logLevel);
     if (opts?.logFile) args.push("--log-file", opts.logFile);
     if (opts?.stateLog) args.push("--state-log", opts.stateLog);