@rulvar/executor 1.91.0 → 1.93.0

package/dist/index.js

@@ -254,7 +254,7 @@ function subprocessExecutor(options = {}) {
 			});
 			throw new ExecutorError("ledger", `tool '${request.tool}' was not dispatched: the two-phase ledger intent write failed (${err instanceof Error ? err.message : String(err)})`);
 		}
-		let outcome = "ok";
+		let outcome = "error";
 		let exitCode = null;
 		let signal = null;
 		try {
@@ -296,7 +296,6 @@ function subprocessExecutor(options = {}) {
 					signal: request.ctx.signal
 				});
 			} catch (err) {
-				outcome = "error";
 				throw new ExecutorError("spawn", `tool '${request.tool}' could not be spawned: ${err instanceof Error ? err.message : String(err)}`);
 			}
 			exitCode = child.code;
@@ -305,25 +304,15 @@ function subprocessExecutor(options = {}) {
 				outcome = "timeout";
 				throw new ExecutorError("timeout", `tool '${request.tool}' exceeded ${timeoutMs}ms and was killed`);
 			}
-			if (child.stopped && child.reason === "aborted") {
-				outcome = "error";
-				throw new ExecutorError("aborted", `tool '${request.tool}' was cancelled`);
-			}
-			if (child.stopped && child.reason === "output-cap") {
-				outcome = "error";
-				throw new ExecutorError("output-cap", `tool '${request.tool}' wrote more than ${maxOutputBytes} bytes and was killed`);
-			}
+			if (child.stopped && child.reason === "aborted") throw new ExecutorError("aborted", `tool '${request.tool}' was cancelled`);
+			if (child.stopped && child.reason === "output-cap") throw new ExecutorError("output-cap", `tool '${request.tool}' wrote more than ${maxOutputBytes} bytes and was killed`);
 			if (child.code !== 0) {
-				outcome = "error";
 				const tail = child.stderr.trim().slice(-500);
 				throw new ExecutorError("exit", `tool '${request.tool}' exited ${child.code ?? "null"}${child.signal === null ? "" : ` (signal ${child.signal})`}${tail === "" ? "" : `: ${tail}`}`);
 			}
-			try {
-				return parseToolResult(child.stdout, request.tool);
-			} catch (err) {
-				outcome = "error";
-				throw err;
-			}
+			const result = parseToolResult(child.stdout, request.tool);
+			outcome = "ok";
+			return result;
 		} finally {
 			const durationMs = now() - startedAt;
 			if (options.ledger !== void 0) await options.ledger.record({
@@ -453,7 +442,7 @@ function containerExecutor(options) {
 			});
 			throw new ExecutorError("ledger", `container tool '${request.tool}' was not dispatched: the two-phase ledger intent write failed (${err instanceof Error ? err.message : String(err)})`);
 		}
-		let outcome = "ok";
+		let outcome = "error";
 		let exitCode = null;
 		let signal = null;
 		try {
@@ -515,7 +504,6 @@ function containerExecutor(options) {
 					signal: request.ctx.signal
 				});
 			} catch (err) {
-				outcome = "error";
 				throw new ExecutorError("spawn", `container tool '${request.tool}' could not launch '${docker}': ${err instanceof Error ? err.message : String(err)}`);
 			}
 			exitCode = child.code;
@@ -524,25 +512,15 @@ function containerExecutor(options) {
 				outcome = "timeout";
 				throw new ExecutorError("timeout", `container tool '${request.tool}' exceeded ${timeoutMs}ms and was killed`);
 			}
-			if (child.stopped && child.reason === "aborted") {
-				outcome = "error";
-				throw new ExecutorError("aborted", `container tool '${request.tool}' was cancelled`);
-			}
-			if (child.stopped && child.reason === "output-cap") {
-				outcome = "error";
-				throw new ExecutorError("output-cap", `container tool '${request.tool}' wrote more than ${maxOutputBytes} bytes and was killed`);
-			}
+			if (child.stopped && child.reason === "aborted") throw new ExecutorError("aborted", `container tool '${request.tool}' was cancelled`);
+			if (child.stopped && child.reason === "output-cap") throw new ExecutorError("output-cap", `container tool '${request.tool}' wrote more than ${maxOutputBytes} bytes and was killed`);
 			if (child.code !== 0) {
-				outcome = "error";
 				const tail = child.stderr.trim().slice(-500);
 				throw new ExecutorError("exit", `container tool '${request.tool}' exited ${child.code ?? "null"}${tail === "" ? "" : `: ${tail}`}`);
 			}
-			try {
-				return parseToolResult(child.stdout, request.tool);
-			} catch (err) {
-				outcome = "error";
-				throw err;
-			}
+			const result = parseToolResult(child.stdout, request.tool);
+			outcome = "ok";
+			return result;
 		} finally {
 			const durationMs = now() - startedAt;
 			if (options.ledger !== void 0) await options.ledger.record({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rulvar/executor",
-  "version": "1.91.0",
+  "version": "1.93.0",
   "description": "Rulvar isolated tool executors: reference ToolExecutorProvider adapters that run tool work out of process (subprocess and container) so hostile or model-generated scripts cannot reach host capabilities.",
   "type": "module",
   "license": "Apache-2.0",
@@ -22,13 +22,13 @@
     "access": "public"
   },
   "dependencies": {
-    "@rulvar/core": "1.91.0"
+    "@rulvar/core": "1.93.0"
   },
   "devDependencies": {
     "@types/node": "^22.20.1",
     "tsdown": "^0.22.14",
     "typescript": "~6.0.3",
-    "@rulvar/testing": "1.91.0"
+    "@rulvar/testing": "1.93.0"
   },
   "repository": {
     "type": "git",