@karmaniverous/jeeves-runner 0.7.2 → 0.7.3

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

@@ -1006,8 +1006,10 @@ 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) {
+function resolveCommand(script, tsRunner = 'tsx') {
     const ext = extname(script).toLowerCase();
     switch (ext) {
         case '.ps1':
@@ -1019,6 +1021,9 @@ function resolveCommand(script) {
         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] };
     }
@@ -1027,7 +1032,7 @@ function resolveCommand(script) {
  * 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', } = options;
+    const { script, dbPath, jobId, runId, timeoutMs, commandResolver, sourceType = 'path', tsRunner, } = options;
     const startTime = Date.now();
     // For inline scripts, write to a temp file and clean up after.
     let tempFile = null;
@@ -1043,7 +1048,7 @@ function executeJob(options) {
         const stderrBuffer = new RingBuffer(100);
         const { command, args } = commandResolver
             ? commandResolver(effectiveScript)
-            : resolveCommand(effectiveScript);
+            : resolveCommand(effectiveScript, tsRunner);
         const child = spawn(command, args, {
             env: {
                 ...process.env,
@@ -1445,6 +1450,7 @@ function createScheduler(deps) {
                     runId,
                     timeoutMs: timeout_ms ?? undefined,
                     sourceType: source_type ?? 'path',
+                    tsRunner: config.tsRunner,
                 });
             }
             runRepository.finishRun(runId, result);
@@ -1712,6 +1718,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'),
 });
 
 /**

package/dist/index.d.ts

@@ -25,11 +25,11 @@ declare const runnerConfigSchema: z.ZodObject<{
     }, z.core.$strip>>;
     log: z.ZodDefault<z.ZodObject<{
         level: z.ZodDefault<z.ZodEnum<{
-            error: "error";
             trace: "trace";
             debug: "debug";
             info: "info";
             warn: "warn";
+            error: "error";
             fatal: "fatal";
         }>>;
         file: z.ZodOptional<z.ZodString>;
@@ -38,6 +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>;
 }, z.core.$strip>;
 /** Inferred runner configuration type. */
 type RunnerConfig = z.infer<typeof runnerConfigSchema>;
@@ -102,10 +103,10 @@ type Queue = z.infer<typeof queueSchema>;
 
 /** Run status enumeration schema (pending, running, ok, error, timeout, skipped). */
 declare const runStatusSchema: z.ZodEnum<{
+    error: "error";
     pending: "pending";
     running: "running";
     ok: "ok";
-    error: "error";
     timeout: "timeout";
     skipped: "skipped";
 }>;
@@ -120,10 +121,10 @@ declare const runSchema: z.ZodObject<{
     id: z.ZodNumber;
     jobId: z.ZodString;
     status: z.ZodEnum<{
+        error: "error";
         pending: "pending";
         running: "running";
         ok: "ok";
-        error: "error";
         timeout: "timeout";
         skipped: "skipped";
     }>;
@@ -289,7 +290,13 @@ 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;
 }
+/** 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;
 /**
  * Execute a job script as a child process. Captures output, parses metadata, enforces timeout.
  */
@@ -544,5 +551,5 @@ declare function createMaintenance(db: DatabaseSync, config: MaintenanceConfig,
  */
 declare function runMigrations(db: DatabaseSync): void;
 
-export { closeConnection, createClient, createConnection, createGatewayClient, createMaintenance, createNotifier, createRunner, createScheduler, executeJob, executeSession, getNextFireTime, jobSchema, queueSchema, runMigrations, runSchema, runStatusSchema, runTriggerSchema, runnerConfigSchema, validateSchedule };
+export { TS_EXTENSIONS, 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,6 +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'),
 });
 
 /**
@@ -1165,8 +1167,10 @@ 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) {
+function resolveCommand(script, tsRunner = 'tsx') {
     const ext = extname(script).toLowerCase();
     switch (ext) {
         case '.ps1':
@@ -1178,6 +1182,9 @@ function resolveCommand(script) {
         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] };
     }
@@ -1186,7 +1193,7 @@ function resolveCommand(script) {
  * 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', } = options;
+    const { script, dbPath, jobId, runId, timeoutMs, commandResolver, sourceType = 'path', tsRunner, } = options;
     const startTime = Date.now();
     // For inline scripts, write to a temp file and clean up after.
     let tempFile = null;
@@ -1202,7 +1209,7 @@ function executeJob(options) {
         const stderrBuffer = new RingBuffer(100);
         const { command, args } = commandResolver
             ? commandResolver(effectiveScript)
-            : resolveCommand(effectiveScript);
+            : resolveCommand(effectiveScript, tsRunner);
         const child = spawn(command, args, {
             env: {
                 ...process.env,
@@ -1604,6 +1611,7 @@ function createScheduler(deps) {
                     runId,
                     timeoutMs: timeout_ms ?? undefined,
                     sourceType: source_type ?? 'path',
+                    tsRunner: config.tsRunner,
                 });
             }
             runRepository.finishRun(runId, result);
@@ -2052,4 +2060,4 @@ function createClient(dbPath) {
     };
 }
 
-export { closeConnection, createClient, createConnection, createGatewayClient, createMaintenance, createNotifier, createRunner, createScheduler, executeJob, executeSession, getNextFireTime, jobSchema, queueSchema, runMigrations, runSchema, runStatusSchema, runTriggerSchema, runnerConfigSchema, validateSchedule };
+export { TS_EXTENSIONS, 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.2",
+  "version": "0.7.3",
   "author": "Jason Williscroft",
   "description": "Graph-aware job execution engine with SQLite state. Part of the Jeeves platform.",
   "license": "BSD-3-Clause",