@codeworksh/harness 0.3.0-dev.20261019181702 → 0.4.0-canary.50.1.g9fe7a616

package/effect.mjs

@@ -6450,8 +6450,10 @@ const windowBytes = (limits) => limits.maxBytes * 2;
 */
 const script = (command, file, limits, pipeline, report) => [
 	`f=${(0, shell_exports.quote)(file)}`,
+	`c=${(0, shell_exports.quote)(command)}`,
+	"if command -v bash >/dev/null 2>&1; then s=bash; else s=sh; fi",
 	"run() (",
-	command,
+	"	if [ \"$s\" = bash ]; then bash -c \"$c\"; else eval \"$c\"; fi",
 	")",
 	`if mkdir -p ${(0, shell_exports.quote)(posix.dirname(file))} 2>/dev/null && (umask 077 2>/dev/null; set -C && : > "$f" && : > "$f.rc" && : > "$f.pid") 2>/dev/null; then`,
 	"	echo \"$$ $(ps -o pgid= -p $$ 2>/dev/null)\" > \"$f.pid\"",
@@ -6468,18 +6470,19 @@ const script = (command, file, limits, pipeline, report) => [
 	`printf '%s\\n' ${(0, shell_exports.quote)(unsaved(file))}`,
 	"run 2>&1"
 ].join("\n");
-const header = new RegExp(`^${HEADER} (\\d+) (\\d+) ([01])(?: (\\d+))?$`, "m");
+const header = new RegExp(`^${HEADER} (\\d+) (\\d+) ([01]) (bash|sh)(?: (\\d+))?$`, "m");
 const parse$4 = (match) => ({
 	bytes: Number(match[1]),
 	newlines: Number(match[2]),
-	kept: match[3] === "1"
+	kept: match[3] === "1",
+	shell: match[4] === "sh" ? "sh" : "bash"
 });
 /**
 * For a backend that streams: all output still flows back as it is produced, and
 * a copy lands in the file. The report rides on stderr, the wrapper's own channel
 * since the command's is folded into stdout.
 */
-const streaming = (command, file, limits) => script(command, file, limits, (source) => `${source} | tee -a "$f"`, [`printf '${HEADER} %s %s %s\\n' "$b" "$n" "$keep" >&2`]);
+const streaming = (command, file, limits) => script(command, file, limits, (source) => `${source} | tee -a "$f"`, [`printf '${HEADER} %s %s %s %s\\n' "$b" "$n" "$keep" "$s" >&2`]);
 /** Read {@link streaming}'s stderr: the report, if it got that far, and anything else the wrapper said. */
 const report = (stderr) => {
 	const match = header.exec(stderr);
@@ -6501,7 +6504,7 @@ const buffered = (command, file, limits) => {
 	const tail = `tail -n ${limits.maxLines} "$f" | tail -c ${windowBytes(limits)}`;
 	return script(command, file, limits, (source) => `{ ${source} | cat; } >> "$f"`, [
 		`w=$(${tail} | wc -c | awk '{ print $1 }')`,
-		`printf '${HEADER} %s %s %s %s\\n' "$b" "$n" "$keep" "$w"`,
+		`printf '${HEADER} %s %s %s %s %s\\n' "$b" "$n" "$keep" "$s" "$w"`,
 		tail
 	]);
 };
@@ -6509,11 +6512,11 @@ const buffered = (command, file, limits) => {
 const window = (stdout) => {
 	const newline = stdout.indexOf("\n");
 	const match = header.exec(newline === -1 ? stdout : stdout.slice(0, newline));
-	if (match === null || match[4] === void 0) return void 0;
+	if (match === null || match[5] === void 0) return void 0;
 	return {
 		...parse$4(match),
 		text: stdout.slice(newline + 1),
-		textBytes: Number(match[4])
+		textBytes: Number(match[5])
 	};
 };
 /**
@@ -6661,7 +6664,9 @@ const BashSuccess = Schema.Struct({
 /** Non-zero exit — expected, model-visible. Carries the same shape as success. */
 var BashFailed = class extends Schema.TaggedError()("BashFailed", {
 	...outputFields,
-	exitCode: Schema.Finite
+	exitCode: Schema.Finite,
+	/** The shell that ran the command, when the sandbox reported it. */
+	shell: Schema.optional(Schema.Literals(["bash", "sh"]))
 }) {};
 /** Deadline exceeded — expected, model-visible. Carries the partial output produced so far. */
 var BashTimedOut = class extends Schema.TaggedError()("BashTimedOut", {
@@ -6671,7 +6676,7 @@ var BashTimedOut = class extends Schema.TaggedError()("BashTimedOut", {
 const BashFailure = Schema.Union([BashFailed, BashTimedOut]);
 /** The reason for a failure, after any output: the model sees nothing else of `details`. */
 const withStatus = (failure) => {
-	const status = failure._tag === "BashTimedOut" ? `Command timed out after ${failure.timeoutSeconds} seconds` : failure.exitCode === -1 ? "Command terminated without an exit code" : `Command exited with code ${failure.exitCode}`;
+	const status = failure._tag === "BashTimedOut" ? `Command timed out after ${failure.timeoutSeconds} seconds` : failure.exitCode === -1 ? "Command terminated without an exit code" : `Command exited with code ${failure.exitCode}${failure.shell === "sh" ? " (ran under sh: bash is not on PATH in this sandbox)" : ""}`;
 	return failure.output ? `${failure.output.replace(/\n$/, "")}\n\n${status}` : status;
 };
 const bashDef = tool_exports.define({
@@ -6725,6 +6730,7 @@ const present = (snap, lastLineBytes, saved) => {
 	};
 };
 const utf8 = new TextEncoder();
+const shellOf = (report) => report !== void 0 ? { shell: report.shell } : {};
 /**
 * A command cut off by its deadline never reached the wrapper's own cleanup: kill
 * what is left of it and remove its side files, keeping the output file only when
@@ -6758,7 +6764,8 @@ const runBuffered = (shell, params, file) => Effect.gen(function* () {
 	const presented = present(acc.snapshot(), acc.getLastLineBytes(), window$1?.kept === true ? file : void 0);
 	if (result.exitCode !== 0) return yield* new BashFailed({
 		exitCode: result.exitCode,
-		...presented
+		...presented,
+		...shellOf(window$1)
 	});
 	return {
 		exitCode: result.exitCode,
@@ -6816,7 +6823,8 @@ const runStreaming = (shell, stream, params, file) => Effect.gen(function* () {
 	const code = yield* Ref.get(exitCode);
 	if (code === null || code !== 0) return yield* new BashFailed({
 		exitCode: code ?? -1,
-		...presented
+		...presented,
+		...shellOf(report$1)
 	});
 	return {
 		exitCode: code,