dsh-openwrite 0.2.26 → 0.2.28

package/vendor/dsh-dog/lib/{core-BAlgZpLq.js → core--byUPJL8.js}

@@ -1,12 +1,138 @@
+import { spawn } from "node:child_process";
+import { appendFile, lstat, mkdir, mkdtemp, open, readFile, readdir, realpath, rename, rm, stat, writeFile } from "node:fs/promises";
 import { fileURLToPath } from "node:url";
 import { tmpdir } from "node:os";
 import { dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
-import { appendFile, lstat, mkdir, mkdtemp, open, readFile, readdir, realpath, rename, rm, stat, writeFile } from "node:fs/promises";
 import { createHash, randomUUID } from "node:crypto";
 import { existsSync, readFileSync, readdirSync } from "node:fs";
 import { c } from "tar";
 import Ajv2020 from "ajv/dist/2020.js";
 import addFormats from "ajv-formats";
+//#region src/owned-script.ts
+var ScriptExecutionError = class extends Error {
+	code;
+	diagnostics;
+	constructor(code, message, diagnostics) {
+		super(message);
+		this.code = code;
+		this.diagnostics = diagnostics;
+		this.name = "ScriptExecutionError";
+	}
+};
+function outputPreview(output) {
+	return new TextDecoder().decode(Buffer.from(output).subarray(0, 200), { stream: true });
+}
+/** Execute without blocking the host event loop; cancellation owns only this process tree. */
+async function runOwnedScript(script, input, signal) {
+	signal?.throwIfAborted();
+	try {
+		if (!(await stat(script)).isFile()) throw new Error("not a file");
+	} catch {
+		throw new ScriptExecutionError("SCRIPT_NOT_FOUND", `Verifier script was not found: ${script}`, { script });
+	}
+	signal?.throwIfAborted();
+	const js = /\.(?:c|m)?js$/.test(script);
+	const child = spawn(js ? process.execPath : script, js ? [script, input] : [input], {
+		detached: process.platform !== "win32",
+		windowsHide: true,
+		stdio: [
+			"ignore",
+			"pipe",
+			"pipe"
+		],
+		env: js ? {
+			...process.env,
+			ELECTRON_RUN_AS_NODE: "1"
+		} : process.env
+	});
+	let output = "";
+	let stderr = "";
+	let failure;
+	let escalation;
+	child.stdout.setEncoding("utf8");
+	child.stderr.setEncoding("utf8");
+	const stop = () => {
+		if (!child.pid || child.exitCode !== null || child.signalCode !== null) return;
+		if (process.platform === "win32") spawn("taskkill", [
+			"/pid",
+			String(child.pid),
+			"/T",
+			"/F"
+		], {
+			windowsHide: true,
+			stdio: "ignore"
+		}).once("error", () => child.kill());
+		else {
+			try {
+				process.kill(-child.pid, "SIGTERM");
+			} catch {
+				child.kill();
+			}
+			escalation ??= setTimeout(() => {
+				if (child.exitCode !== null || child.signalCode !== null) return;
+				try {
+					process.kill(-child.pid, "SIGKILL");
+				} catch {
+					child.kill("SIGKILL");
+				}
+			}, 3e3);
+		}
+	};
+	child.stdout.on("data", (chunk) => {
+		output += String(chunk);
+		if (Buffer.byteLength(output) > 32 * 1024 ** 2) {
+			output = outputPreview(output);
+			failure = new ScriptExecutionError("SCRIPT_OUTPUT_LIMIT", "Verifier output exceeds limit", { script });
+			stop();
+		}
+	});
+	child.stderr.on("data", (chunk) => {
+		stderr = Buffer.concat([Buffer.from(stderr), Buffer.from(chunk)]).subarray(-4096).toString("utf8");
+	});
+	signal?.addEventListener("abort", stop, { once: true });
+	const timer = setTimeout(() => {
+		failure = new ScriptExecutionError("SCRIPT_TIMEOUT", "Verifier timed out", { script });
+		stop();
+	}, 9e5);
+	try {
+		if (signal?.aborted) stop();
+		await new Promise((done, reject) => {
+			child.once("error", (error) => reject(new ScriptExecutionError("SCRIPT_START_FAILED", `Could not start verifier: ${error.message}`, {
+				script,
+				stderr,
+				outputPreview: outputPreview(output)
+			})));
+			child.once("close", (code, exitSignal) => {
+				const diagnostics = {
+					script,
+					exitCode: code,
+					signal: exitSignal,
+					stderr,
+					outputPreview: outputPreview(output)
+				};
+				if (failure instanceof ScriptExecutionError) Object.assign(failure.diagnostics, diagnostics);
+				code === 0 ? done() : reject(failure ?? new ScriptExecutionError("SCRIPT_EXIT_FAILED", `Verifier exited (${code ?? exitSignal})`, diagnostics));
+			});
+		});
+		signal?.throwIfAborted();
+		if (failure) throw failure;
+		return output;
+	} finally {
+		clearTimeout(timer);
+		if (escalation) clearTimeout(escalation);
+		signal?.removeEventListener("abort", stop);
+	}
+}
+//#endregion
+//#region src/model.ts
+function isJsonValue(value) {
+	if (value === null || typeof value === "string" || typeof value === "boolean") return true;
+	if (typeof value === "number") return Number.isFinite(value);
+	if (Array.isArray(value)) return value.every(isJsonValue);
+	if (typeof value !== "object") return false;
+	return Object.values(value).every(isJsonValue);
+}
+//#endregion
 //#region src/logic.ts
 /**
 * Parse and type-check the only expression language accepted by DoG.
@@ -169,15 +295,6 @@ function isRecord(value) {
 	return value !== null && typeof value === "object" && !Array.isArray(value);
 }
 //#endregion
-//#region src/model.ts
-function isJsonValue(value) {
-	if (value === null || typeof value === "string" || typeof value === "boolean") return true;
-	if (typeof value === "number") return Number.isFinite(value);
-	if (Array.isArray(value)) return value.every(isJsonValue);
-	if (typeof value !== "object") return false;
-	return Object.values(value).every(isJsonValue);
-}
-//#endregion
 //#region src/graph.ts
 /** Graph parser, structural validator, and cycle checker for DoG v0.2. */
 const ID_PATTERN = /^[A-Za-z0-9][A-Za-z0-9._:-]{0,127}$/u;
@@ -1935,7 +2052,7 @@ function resolveScriptPath(scriptsDirectory, script) {
 		const withJs = `${direct}.js`;
 		if (existsSync(withJs)) return withJs;
 	}
-	throw new Error(`programmatic script not found in library: ${direct}`);
+	throw new ScriptExecutionError("SCRIPT_NOT_FOUND", `programmatic script not found in library: ${direct}`, { script: direct });
 }
 function readScriptDigest(scriptPath) {
 	try {
@@ -2071,4 +2188,4 @@ function hasTraversal(value) {
 	return value.split(/[\\/]/u).some((segment) => segment === ".." || segment === ".");
 }
 //#endregion
-export { DogRepository as a, parseGraph as c, parseBoolExpr as d, runPlan as i, isJsonValue as l, resolveScriptPath as n, loadSchemaSet as o, WorkspaceManager as r, DogValidationError as s, DogEngine as t, evaluateBoolExpr as u };
+export { DogRepository as a, parseGraph as c, isJsonValue as d, ScriptExecutionError as f, runPlan as i, evaluateBoolExpr as l, runOwnedScript as m, resolveScriptPath as n, loadSchemaSet as o, outputPreview as p, WorkspaceManager as r, DogValidationError as s, DogEngine as t, parseBoolExpr as u };

package/vendor/dsh-dog/lib/core.js

@@ -1,2 +1,2 @@
-import { n as resolveScriptPath, t as DogEngine } from "./core-BAlgZpLq.js";
+import { n as resolveScriptPath, t as DogEngine } from "./core--byUPJL8.js";
 export { DogEngine, resolveScriptPath };

package/vendor/dsh-dog/lib/index.js

@@ -1,81 +1,64 @@
-import { a as DogRepository, c as parseGraph, d as parseBoolExpr, i as runPlan, l as isJsonValue, n as resolveScriptPath, o as loadSchemaSet, r as WorkspaceManager, s as DogValidationError, t as DogEngine, u as evaluateBoolExpr } from "./core-BAlgZpLq.js";
-import { spawn } from "node:child_process";
+import { a as DogRepository, c as parseGraph, d as isJsonValue, f as ScriptExecutionError, i as runPlan, l as evaluateBoolExpr, m as runOwnedScript, n as resolveScriptPath, o as loadSchemaSet, p as outputPreview, r as WorkspaceManager, s as DogValidationError, t as DogEngine, u as parseBoolExpr } from "./core--byUPJL8.js";
+import { mkdir, readFile, writeFile } from "node:fs/promises";
 import { fileURLToPath } from "node:url";
 import { homedir } from "node:os";
 import { isAbsolute, join, resolve } from "node:path";
-import { mkdir, readFile, writeFile } from "node:fs/promises";
 import z from "@deepseek-ai/schemastery";
-//#region src/owned-script.ts
-/** Execute without blocking the host event loop; cancellation owns only this process tree. */
-async function runOwnedScript(script, input, signal) {
-	signal?.throwIfAborted();
-	const js = /\.(?:c|m)?js$/.test(script);
-	const child = spawn(js ? process.execPath : script, js ? [script, input] : [input], {
-		detached: process.platform !== "win32",
-		windowsHide: true,
-		stdio: [
-			"ignore",
-			"pipe",
-			"pipe"
-		]
-	});
-	let output = "";
-	let failure;
-	let escalation;
-	const stop = () => {
-		if (!child.pid || child.exitCode !== null || child.signalCode !== null) return;
-		if (process.platform === "win32") spawn("taskkill", [
-			"/pid",
-			String(child.pid),
-			"/T",
-			"/F"
-		], {
-			windowsHide: true,
-			stdio: "ignore"
-		}).once("error", () => child.kill());
-		else {
-			try {
-				process.kill(-child.pid, "SIGTERM");
-			} catch {
-				child.kill();
-			}
-			escalation ??= setTimeout(() => {
-				if (child.exitCode !== null || child.signalCode !== null) return;
-				try {
-					process.kill(-child.pid, "SIGKILL");
-				} catch {
-					child.kill("SIGKILL");
-				}
-			}, 3e3);
+//#region src/script-verdict.ts
+function scriptFailureVerdict(error) {
+	const message = error instanceof Error ? error.message : String(error);
+	return {
+		state: "inconclusive",
+		reason: message,
+		evidence: error instanceof ScriptExecutionError ? {
+			code: error.code,
+			error: message,
+			...error.diagnostics
+		} : {
+			code: "SCRIPT_EXECUTION_FAILED",
+			error: message
 		}
 	};
-	child.stdout.on("data", (chunk) => {
-		output += String(chunk);
-		if (Buffer.byteLength(output) > 32 * 1024 ** 2) {
-			failure = /* @__PURE__ */ new Error("verifier output exceeds limit");
-			stop();
-		}
-	});
-	child.stderr.resume();
-	signal?.addEventListener("abort", stop, { once: true });
-	const timer = setTimeout(() => {
-		failure = /* @__PURE__ */ new Error("verifier timeout");
-		stop();
-	}, 9e5);
+}
+function parseVerdict(out) {
+	let value;
 	try {
-		if (signal?.aborted) stop();
-		await new Promise((done, reject) => {
-			child.once("error", reject);
-			child.once("close", (code) => code === 0 ? done() : reject(failure ?? /* @__PURE__ */ new Error(`verifier exited (${code})`)));
-		});
-		signal?.throwIfAborted();
-		if (failure) throw failure;
-		return output;
-	} finally {
-		clearTimeout(timer);
-		if (escalation) clearTimeout(escalation);
-		signal?.removeEventListener("abort", stop);
+		value = JSON.parse(out);
+	} catch {
+		return {
+			state: "inconclusive",
+			evidence: {
+				code: "SCRIPT_OUTPUT_NOT_JSON",
+				parseError: "script output was not JSON",
+				outputPreview: outputPreview(out)
+			},
+			reason: "script output was not JSON"
+		};
 	}
+	if (value === null || typeof value !== "object" || Array.isArray(value)) return {
+		state: "inconclusive",
+		evidence: {
+			code: "SCRIPT_OUTPUT_INVALID",
+			parseError: "script output was not an object",
+			outputPreview: outputPreview(out)
+		},
+		reason: "script output was not an object"
+	};
+	const record = value;
+	const verdict = record.verdict;
+	if (verdict !== "pass" && verdict !== "fail" && verdict !== "inconclusive") return {
+		state: "inconclusive",
+		evidence: {
+			code: "SCRIPT_OUTPUT_INVALID",
+			parseError: "invalid verdict",
+			outputPreview: outputPreview(out)
+		},
+		reason: "script returned an invalid verdict"
+	};
+	return {
+		state: verdict,
+		evidence: isJsonValue(record.evidence) ? record.evidence : { outcome: "no evidence supplied by script" }
+	};
 }
 //#endregion
 //#region src/host-shims.ts
@@ -1041,11 +1024,7 @@ async function apply(ctx, config) {
 		try {
 			out = await runOwnedScript(resolveScriptPath(scriptsDir, script), inputPath, env.signal);
 		} catch (error) {
-			return {
-				state: "inconclusive",
-				evidence: { error: String(error instanceof Error ? error.message : error) },
-				reason: "script execution failed"
-			};
+			return scriptFailureVerdict(error);
 		}
 		return parseVerdict(out);
 	};
@@ -1236,34 +1215,6 @@ function buildVerifierPrompt(instruction, inputPath, resultPath) {
 		"Create it (it does not exist yet); never write it as a relative path or to another location. After writing, stop."
 	].join("\n");
 }
-function parseVerdict(out) {
-	let value;
-	try {
-		value = JSON.parse(out);
-	} catch {
-		return {
-			state: "inconclusive",
-			evidence: { parseError: "script output was not JSON" },
-			reason: "script output was not JSON"
-		};
-	}
-	const record = value;
-	if (record === null || typeof record !== "object" || Array.isArray(record)) return {
-		state: "inconclusive",
-		evidence: { parseError: "script output was not an object" },
-		reason: "script output was not an object"
-	};
-	const verdict = record.verdict;
-	if (verdict !== "pass" && verdict !== "fail" && verdict !== "inconclusive") return {
-		state: "inconclusive",
-		evidence: { parseError: "invalid verdict" },
-		reason: "script returned an invalid verdict"
-	};
-	return {
-		state: verdict,
-		evidence: isJsonValue(record.evidence) ? record.evidence : { outcome: "no evidence supplied by script" }
-	};
-}
 /** Read the durable session id from a live Agent, or '' outside an agent boundary. */
 function readSessionId(parent) {
 	if (parent === void 0) return "";