@barnum/barnum 0.0.0-main-5a6a8bee → 0.0.0-main-630ee5dd

package/actions/run-handler.ts

@@ -0,0 +1 @@
+// Placeholder: will be implemented by ADD_RUN_HANDLER refactor.

package/barnum-cli-schema.zod.ts

@@ -28,11 +28,12 @@ const Command = z.discriminatedUnion("kind", [
   z.object({
     config: z.string().nullable().optional().describe("Config (JSON string or path to file). Required unless `--resume-from` is used."),
     entrypointValue: z.string().nullable().optional().describe("Initial value for the entrypoint step (JSON string or path to file). Only valid when config has an `entrypoint`. Defaults to `{}` if not provided."),
-    executor: z.string().nullable().optional().describe("Internal: executor command injected by cli.cjs. Not user-facing — hidden from --help."),
+    executor: z.string().describe("Executor command for TypeScript handlers, injected by cli.cjs and run.ts."),
     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)"),
     resumeFrom: z.string().nullable().optional().describe("Resume from a previous state log file. Incompatible with `--config`, `--initial-state`, and `--entrypoint-value`."),
+    runHandlerPath: z.string().describe("Path to run-handler.ts, injected by cli.cjs and run.ts."),
     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"),
   }).describe("Run the task queue"),

package/barnum-config-schema.json

@@ -62,6 +62,35 @@
               "type": "string"
             }
           }
+        },
+        {
+          "description": "Run a TypeScript handler.",
+          "type": "object",
+          "required": [
+            "kind",
+            "path"
+          ],
+          "properties": {
+            "exportedAs": {
+              "description": "Named export to invoke from the handler module.",
+              "default": "default",
+              "type": "string"
+            },
+            "kind": {
+              "type": "string",
+              "enum": [
+                "TypeScript"
+              ]
+            },
+            "path": {
+              "description": "Path to the handler file (absolute — JS layer resolves before passing to Rust).",
+              "type": "string"
+            },
+            "stepConfig": {
+              "description": "Step configuration passed through to the handler. Rust stores this as-is and includes it in the envelope.",
+              "default": null
+            }
+          }
         }
       ]
     },

package/barnum-config-schema.zod.ts

@@ -5,6 +5,12 @@ const ActionKind = z.discriminatedUnion("kind", [
     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."),
+  z.object({
+    exportedAs: z.string().optional().default("default").describe("Named export to invoke from the handler module."),
+    kind: z.literal("TypeScript"),
+    path: z.string().describe("Path to the handler file (absolute — JS layer resolves before passing to Rust)."),
+    stepConfig: z.any().optional().default(null).describe("Step configuration passed through to the handler. Rust stores this as-is and includes it in the envelope."),
+  }).describe("Run a TypeScript handler."),
 ]).describe("How a step processes tasks.");
 
 const FinallyHook = z.discriminatedUnion("kind", [

package/cli.cjs

@@ -23,14 +23,18 @@ if (process.platform === 'darwin' && process.arch === 'x64') {
   );
 }
 
-// --executor is internal. Error if the user passed it directly.
+// --executor and --run-handler-path are internal. Error if the user passed them directly.
 var userArgs = process.argv.slice(2);
-if (userArgs.includes('--executor')) {
-  console.error('Error: --executor is an internal flag and cannot be passed directly.');
-  process.exit(1);
+var internalFlags = ['--executor', '--run-handler-path'];
+for (var flag of internalFlags) {
+  if (userArgs.includes(flag)) {
+    console.error('Error: ' + flag + ' is an internal flag and cannot be passed directly.');
+    process.exit(1);
+  }
 }
 
 var executorPath = path.resolve(__dirname, 'actions', 'executor.ts');
+var runHandlerPath = path.resolve(__dirname, 'actions', 'run-handler.ts');
 
 function resolveExecutorCommand() {
   if (typeof Bun !== 'undefined') {
@@ -43,7 +47,7 @@ function resolveExecutorCommand() {
 }
 
 var executor = resolveExecutorCommand();
-var args = userArgs.concat('--executor', executor);
+var args = userArgs.concat('--executor', executor, '--run-handler-path', runHandlerPath);
 
 try {
   chmodSync(bin, 0o755);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@barnum/barnum",
-  "version": "0.0.0-main-5a6a8bee",
+  "version": "0.0.0-main-630ee5dd",
   "type": "module",
   "description": "Barnum CLI - workflow engine for agents.",
   "main": "index.ts",
@@ -39,7 +39,8 @@
     "barnum-config-schema.json",
     "barnum-config-schema.zod.ts",
     "barnum-cli-schema.zod.ts",
-    "run.ts"
+    "run.ts",
+    "actions/**/*.ts"
   ],
   "scripts": {
     "typecheck": "tsc --noEmit"

package/run.ts

@@ -1,12 +1,28 @@
 import { spawn, type ChildProcess } from "node:child_process";
 import { chmodSync } from "node:fs";
 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 type { z } from "zod";
 
+const __dirname = dirname(fileURLToPath(import.meta.url));
 const require = createRequire(import.meta.url);
 const binaryPath: string = process.env.BARNUM ?? require("./index.cjs");
 
+function resolveExecutor(): string {
+  // @ts-expect-error Bun global
+  if (typeof Bun !== "undefined") {
+    return process.execPath;
+  }
+  // Resolve tsx from the calling script's node_modules
+  const callerRequire = createRequire(process.argv[1] || import.meta.url);
+  const tsxPath = callerRequire.resolve("tsx/cli");
+  return `node ${tsxPath}`;
+}
+
+const runHandlerPath = resolve(__dirname, "actions", "run-handler.ts");
+
 function spawnBarnum(args: string[], cwd?: string): ChildProcess {
   try {
     chmodSync(binaryPath, 0o755);
@@ -44,6 +60,8 @@ 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);
+    args.push("--executor", resolveExecutor());
+    args.push("--run-handler-path", runHandlerPath);
     return spawnBarnum(args, opts?.cwd);
   }
 }