@karmaniverous/jeeves-runner 0.7.3 → 0.7.4

package/dist/cli/jeeves-runner/index.js

@@ -1006,11 +1006,25 @@ function parseResultLines(stdout) {
     }
     return { tokens, resultMeta };
 }
-/** TypeScript file extensions that should be executed via tsRunner. */
-const TS_EXTENSIONS = new Set(['.ts', '.tsx', '.mts', '.cts']);
-/** Resolve the command and arguments for a script based on its file extension. */
-function resolveCommand(script, tsRunner = 'tsx') {
+/** Resolve the command and arguments for a script based on its file extension.
+ *  Custom runners (keyed by extension) take priority over built-in defaults.
+ *  The runner string is split on whitespace: first token is the command,
+ *  remaining tokens are prefix args inserted before the script path. */
+function resolveCommand(script, runners = {}) {
     const ext = extname(script).toLowerCase();
+    const key = ext.replace(/^\./, '');
+    // Check custom runners first
+    const customRunner = runners[key];
+    if (customRunner) {
+        const parts = customRunner.trim().split(/\s+/);
+        if (parts[0]) {
+            return {
+                command: parts[0],
+                args: [...parts.slice(1), script],
+            };
+        }
+    }
+    // Built-in defaults
     switch (ext) {
         case '.ps1':
             return {
@@ -1021,9 +1035,6 @@ function resolveCommand(script, tsRunner = 'tsx') {
         case '.bat':
             return { command: 'cmd.exe', args: ['/c', script] };
         default:
-            if (TS_EXTENSIONS.has(ext)) {
-                return { command: tsRunner, args: [script] };
-            }
             // .js, .mjs, .cjs, or anything else: run with node
             return { command: 'node', args: [script] };
     }
@@ -1032,7 +1043,7 @@ function resolveCommand(script, tsRunner = 'tsx') {
  * Execute a job script as a child process. Captures output, parses metadata, enforces timeout.
  */
 function executeJob(options) {
-    const { script, dbPath, jobId, runId, timeoutMs, commandResolver, sourceType = 'path', tsRunner, } = options;
+    const { script, dbPath, jobId, runId, timeoutMs, commandResolver, sourceType = 'path', runners, } = options;
     const startTime = Date.now();
     // For inline scripts, write to a temp file and clean up after.
     let tempFile = null;
@@ -1048,7 +1059,7 @@ function executeJob(options) {
         const stderrBuffer = new RingBuffer(100);
         const { command, args } = commandResolver
             ? commandResolver(effectiveScript)
-            : resolveCommand(effectiveScript, tsRunner);
+            : resolveCommand(effectiveScript, runners);
         const child = spawn(command, args, {
             env: {
                 ...process.env,
@@ -1450,7 +1461,7 @@ function createScheduler(deps) {
                     runId,
                     timeoutMs: timeout_ms ?? undefined,
                     sourceType: source_type ?? 'path',
-                    tsRunner: config.tsRunner,
+                    runners: config.runners,
                 });
             }
             runRepository.finishRun(runId, result);
@@ -1718,8 +1729,8 @@ const runnerConfigSchema = z.object({
     log: logSchema.default({ level: 'info' }),
     /** Gateway configuration for session-type jobs. */
     gateway: gatewaySchema.default({ url: 'http://127.0.0.1:18789' }),
-    /** Command used to execute .ts/.tsx/.mts/.cts scripts. Defaults to 'tsx'. Can be an absolute path. */
-    tsRunner: z.string().default('tsx'),
+    /** Custom command runners keyed by file extension. The command string is split on whitespace; first token is the executable, rest are prefix args before the script path. Falls back to built-in defaults for unconfigured extensions. */
+    runners: z.record(z.string(), z.string().trim().min(1)).default({}),
 });
 
 /**

package/dist/index.d.ts

@@ -38,7 +38,7 @@ declare const runnerConfigSchema: z.ZodObject<{
         url: z.ZodDefault<z.ZodString>;
         tokenPath: z.ZodOptional<z.ZodString>;
     }, z.core.$strip>>;
-    tsRunner: z.ZodDefault<z.ZodString>;
+    runners: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodString>>;
 }, z.core.$strip>;
 /** Inferred runner configuration type. */
 type RunnerConfig = z.infer<typeof runnerConfigSchema>;
@@ -290,13 +290,14 @@ interface ExecutionOptions {
     commandResolver?: (script: string) => ResolvedCommand;
     /** Source type: 'path' uses script as file path, 'inline' writes script content to a temp file. */
     sourceType?: 'path' | 'inline';
-    /** Command used to execute TypeScript files. Defaults to 'tsx'. */
-    tsRunner?: string;
+    /** Custom command runners keyed by file extension (e.g. { ".ts": "node /path/to/tsx/cli.mjs" }). */
+    runners?: Record<string, string>;
 }
-/** TypeScript file extensions that should be executed via tsRunner. */
-declare const TS_EXTENSIONS: Set<string>;
-/** Resolve the command and arguments for a script based on its file extension. */
-declare function resolveCommand(script: string, tsRunner?: string): ResolvedCommand;
+/** Resolve the command and arguments for a script based on its file extension.
+ *  Custom runners (keyed by extension) take priority over built-in defaults.
+ *  The runner string is split on whitespace: first token is the command,
+ *  remaining tokens are prefix args inserted before the script path. */
+declare function resolveCommand(script: string, runners?: Record<string, string>): ResolvedCommand;
 /**
  * Execute a job script as a child process. Captures output, parses metadata, enforces timeout.
  */
@@ -551,5 +552,5 @@ declare function createMaintenance(db: DatabaseSync, config: MaintenanceConfig,
  */
 declare function runMigrations(db: DatabaseSync): void;
 
-export { TS_EXTENSIONS, closeConnection, createClient, createConnection, createGatewayClient, createMaintenance, createNotifier, createRunner, createScheduler, executeJob, executeSession, getNextFireTime, jobSchema, queueSchema, resolveCommand, runMigrations, runSchema, runStatusSchema, runTriggerSchema, runnerConfigSchema, validateSchedule };
+export { closeConnection, createClient, createConnection, createGatewayClient, createMaintenance, createNotifier, createRunner, createScheduler, executeJob, executeSession, getNextFireTime, jobSchema, queueSchema, resolveCommand, runMigrations, runSchema, runStatusSchema, runTriggerSchema, runnerConfigSchema, validateSchedule };
 export type { ExecutionOptions, ExecutionResult, GatewayClient, GatewayClientOptions, Job, Maintenance, MaintenanceConfig, Notifier, NotifyConfig, NotifyLogger, Queue, QueueItem, ResolvedCommand, Run, RunStatus, RunTrigger, Runner, RunnerClient, RunnerConfig, RunnerDeps, ScheduleInvalid, ScheduleValid, ScheduleValidation, Scheduler, SchedulerDeps, SessionExecutionOptions, SessionInfo, SessionMessage, SpawnSessionOptions, SpawnSessionResult };

package/dist/mjs/index.js

@@ -71,8 +71,8 @@ const runnerConfigSchema = z.object({
     log: logSchema.default({ level: 'info' }),
     /** Gateway configuration for session-type jobs. */
     gateway: gatewaySchema.default({ url: 'http://127.0.0.1:18789' }),
-    /** Command used to execute .ts/.tsx/.mts/.cts scripts. Defaults to 'tsx'. Can be an absolute path. */
-    tsRunner: z.string().default('tsx'),
+    /** Custom command runners keyed by file extension. The command string is split on whitespace; first token is the executable, rest are prefix args before the script path. Falls back to built-in defaults for unconfigured extensions. */
+    runners: z.record(z.string(), z.string().trim().min(1)).default({}),
 });
 
 /**
@@ -1167,11 +1167,25 @@ function parseResultLines(stdout) {
     }
     return { tokens, resultMeta };
 }
-/** TypeScript file extensions that should be executed via tsRunner. */
-const TS_EXTENSIONS = new Set(['.ts', '.tsx', '.mts', '.cts']);
-/** Resolve the command and arguments for a script based on its file extension. */
-function resolveCommand(script, tsRunner = 'tsx') {
+/** Resolve the command and arguments for a script based on its file extension.
+ *  Custom runners (keyed by extension) take priority over built-in defaults.
+ *  The runner string is split on whitespace: first token is the command,
+ *  remaining tokens are prefix args inserted before the script path. */
+function resolveCommand(script, runners = {}) {
     const ext = extname(script).toLowerCase();
+    const key = ext.replace(/^\./, '');
+    // Check custom runners first
+    const customRunner = runners[key];
+    if (customRunner) {
+        const parts = customRunner.trim().split(/\s+/);
+        if (parts[0]) {
+            return {
+                command: parts[0],
+                args: [...parts.slice(1), script],
+            };
+        }
+    }
+    // Built-in defaults
     switch (ext) {
         case '.ps1':
             return {
@@ -1182,9 +1196,6 @@ function resolveCommand(script, tsRunner = 'tsx') {
         case '.bat':
             return { command: 'cmd.exe', args: ['/c', script] };
         default:
-            if (TS_EXTENSIONS.has(ext)) {
-                return { command: tsRunner, args: [script] };
-            }
             // .js, .mjs, .cjs, or anything else: run with node
             return { command: 'node', args: [script] };
     }
@@ -1193,7 +1204,7 @@ function resolveCommand(script, tsRunner = 'tsx') {
  * Execute a job script as a child process. Captures output, parses metadata, enforces timeout.
  */
 function executeJob(options) {
-    const { script, dbPath, jobId, runId, timeoutMs, commandResolver, sourceType = 'path', tsRunner, } = options;
+    const { script, dbPath, jobId, runId, timeoutMs, commandResolver, sourceType = 'path', runners, } = options;
     const startTime = Date.now();
     // For inline scripts, write to a temp file and clean up after.
     let tempFile = null;
@@ -1209,7 +1220,7 @@ function executeJob(options) {
         const stderrBuffer = new RingBuffer(100);
         const { command, args } = commandResolver
             ? commandResolver(effectiveScript)
-            : resolveCommand(effectiveScript, tsRunner);
+            : resolveCommand(effectiveScript, runners);
         const child = spawn(command, args, {
             env: {
                 ...process.env,
@@ -1611,7 +1622,7 @@ function createScheduler(deps) {
                     runId,
                     timeoutMs: timeout_ms ?? undefined,
                     sourceType: source_type ?? 'path',
-                    tsRunner: config.tsRunner,
+                    runners: config.runners,
                 });
             }
             runRepository.finishRun(runId, result);
@@ -2060,4 +2071,4 @@ function createClient(dbPath) {
     };
 }
 
-export { TS_EXTENSIONS, closeConnection, createClient, createConnection, createGatewayClient, createMaintenance, createNotifier, createRunner, createScheduler, executeJob, executeSession, getNextFireTime, jobSchema, queueSchema, resolveCommand, runMigrations, runSchema, runStatusSchema, runTriggerSchema, runnerConfigSchema, validateSchedule };
+export { closeConnection, createClient, createConnection, createGatewayClient, createMaintenance, createNotifier, createRunner, createScheduler, executeJob, executeSession, getNextFireTime, jobSchema, queueSchema, resolveCommand, runMigrations, runSchema, runStatusSchema, runTriggerSchema, runnerConfigSchema, validateSchedule };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@karmaniverous/jeeves-runner",
-  "version": "0.7.3",
+  "version": "0.7.4",
   "author": "Jason Williscroft",
   "description": "Graph-aware job execution engine with SQLite state. Part of the Jeeves platform.",
   "license": "BSD-3-Clause",